From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 7 Jan 2010 22:30:42 +0000 (+0000)
Subject: Monster whitespace patch in the same vein of changesets 14577 and 14578.  Viewing... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=9ddf3230a4c897a40e0214d29e0f1ebf6ea6438d;p=Evergreen.git

Monster whitespace patch in the same vein of changesets 14577 and 14578.  Viewing the diff in TRAC will take forever :)

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@15273 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/src/cgi-bin/support/dtree.js b/Open-ILS/src/cgi-bin/support/dtree.js
index 57dd30d07c..f4ed6a863c 100644
--- a/Open-ILS/src/cgi-bin/support/dtree.js
+++ b/Open-ILS/src/cgi-bin/support/dtree.js
@@ -10,315 +10,315 @@
 |--------------------------------------------------*/
 
 function Node(id, pid, name, url, title, target, icon, iconOpen, open) {
-	this.id = id;
-	this.pid = pid;
-	this.name = name;
-	this.url = url;
-	this.title = title;
-	this.target = target;
-	this.icon = icon;
-	this.iconOpen = iconOpen;
-	this._io = open || false;
-	this._is = false;
-	this._ls = false;
-	this._hc = false;
-	this._ai = 0;
-	this._p;
+ this.id = id;
+ this.pid = pid;
+ this.name = name;
+ this.url = url;
+ this.title = title;
+ this.target = target;
+ this.icon = icon;
+ this.iconOpen = iconOpen;
+ this._io = open || false;
+ this._is = false;
+ this._ls = false;
+ this._hc = false;
+ this._ai = 0;
+ this._p;
 };
 
 function dTree(objName) {
-	this.config = {
-		target					: null,
-		folderLinks			: true,
-		useSelection		: true,
-		useCookies			: true,
-		useLines				: true,
-		useIcons				: true,
-		useStatusText		: false,
-		closeSameLevel	: false,
-		inOrder					: false
-	}
-	this.icon = {
-		root				: 'support/base.gif',
-		folder			: 'support/folder.gif',
-		folderOpen		: 'support/folderopen.gif',
-		node				: 'support/page.gif',
-		empty				: 'support/empty.gif',
-		line				: 'support/line.gif',
-		join				: 'support/join.gif',
-		joinBottom		: 'support/joinbottom.gif',
-		plus				: 'support/plus.gif',
-		plusBottom		: 'support/plusbottom.gif',
-		minus				: 'support/minus.gif',
-		minusBottom		: 'support/minusbottom.gif',
-		nlPlus			: 'support/nolines_plus.gif',
-		nlMinus			: 'support/nolines_minus.gif'
-	};
-	this.obj = objName;
-	this.aNodes = [];
-	this.aIndent = [];
-	this.root = new Node(-1);
-	this.selectedNode = null;
-	this.selectedFound = false;
-	this.completed = false;
+ this.config = {
+  target     : null,
+  folderLinks   : true,
+  useSelection  : true,
+  useCookies   : true,
+  useLines    : true,
+  useIcons    : true,
+  useStatusText  : false,
+  closeSameLevel : false,
+  inOrder     : false
+ }
+ this.icon = {
+  root    : 'support/base.gif',
+  folder   : 'support/folder.gif',
+  folderOpen  : 'support/folderopen.gif',
+  node    : 'support/page.gif',
+  empty    : 'support/empty.gif',
+  line    : 'support/line.gif',
+  join    : 'support/join.gif',
+  joinBottom  : 'support/joinbottom.gif',
+  plus    : 'support/plus.gif',
+  plusBottom  : 'support/plusbottom.gif',
+  minus    : 'support/minus.gif',
+  minusBottom  : 'support/minusbottom.gif',
+  nlPlus   : 'support/nolines_plus.gif',
+  nlMinus   : 'support/nolines_minus.gif'
+ };
+ this.obj = objName;
+ this.aNodes = [];
+ this.aIndent = [];
+ this.root = new Node(-1);
+ this.selectedNode = null;
+ this.selectedFound = false;
+ this.completed = false;
 };
 
 dTree.prototype.add = function(id, pid, name, url, title, target, icon, iconOpen, open) {
-	this.aNodes[this.aNodes.length] = new Node(id, pid, name, url, title, target, icon, iconOpen, open);
+ this.aNodes[this.aNodes.length] = new Node(id, pid, name, url, title, target, icon, iconOpen, open);
 };
 
 dTree.prototype.openAll = function() {
-	this.oAll(true);
+ this.oAll(true);
 };
 dTree.prototype.closeAll = function() {
-	this.oAll(false);
+ this.oAll(false);
 };
 
 dTree.prototype.toString = function() {
-	var str = '<div class="dtree">\n';
-	if (document.getElementById) {
-		if (this.config.useCookies) this.selectedNode = this.getSelected();
-		str += this.addNode(this.root);
-	} else str += 'Browser not supported.';
-	str += '</div>';
-	if (!this.selectedFound) this.selectedNode = null;
-	this.completed = true;
-	return str;
+ var str = '<div class="dtree">\n';
+ if (document.getElementById) {
+  if (this.config.useCookies) this.selectedNode = this.getSelected();
+  str += this.addNode(this.root);
+ } else str += 'Browser not supported.';
+ str += '</div>';
+ if (!this.selectedFound) this.selectedNode = null;
+ this.completed = true;
+ return str;
 };
 
 dTree.prototype.addNode = function(pNode) {
-	var str = '';
-	var n=0;
-	if (this.config.inOrder) n = pNode._ai;
-	for (n; n<this.aNodes.length; n++) {
-		if (this.aNodes[n].pid == pNode.id) {
-			var cn = this.aNodes[n];
-			cn._p = pNode;
-			cn._ai = n;
-			this.setCS(cn);
-			if (!cn.target && this.config.target) cn.target = this.config.target;
-			if (cn._hc && !cn._io && this.config.useCookies) cn._io = this.isOpen(cn.id);
-			if (!this.config.folderLinks && cn._hc) cn.url = null;
-			if (this.config.useSelection && cn.id == this.selectedNode && !this.selectedFound) {
-					cn._is = true;
-					this.selectedNode = n;
-					this.selectedFound = true;
-			}
-			str += this.node(cn, n);
-			if (cn._ls) break;
-		}
-	}
-	return str;
+ var str = '';
+ var n=0;
+ if (this.config.inOrder) n = pNode._ai;
+ for (n; n<this.aNodes.length; n++) {
+  if (this.aNodes[n].pid == pNode.id) {
+   var cn = this.aNodes[n];
+   cn._p = pNode;
+   cn._ai = n;
+   this.setCS(cn);
+   if (!cn.target && this.config.target) cn.target = this.config.target;
+   if (cn._hc && !cn._io && this.config.useCookies) cn._io = this.isOpen(cn.id);
+   if (!this.config.folderLinks && cn._hc) cn.url = null;
+   if (this.config.useSelection && cn.id == this.selectedNode && !this.selectedFound) {
+     cn._is = true;
+     this.selectedNode = n;
+     this.selectedFound = true;
+   }
+   str += this.node(cn, n);
+   if (cn._ls) break;
+  }
+ }
+ return str;
 };
 
 dTree.prototype.node = function(node, nodeId) {
-	var str = '<div class="dTreeNode">' + this.indent(node, nodeId);
-	if (this.config.useIcons) {
-		if (!node.icon) node.icon = (this.root.id == node.pid) ? this.icon.root : ((node._hc) ? this.icon.folder : this.icon.node);
-		if (!node.iconOpen) node.iconOpen = (node._hc) ? this.icon.folderOpen : this.icon.node;
-		if (this.root.id == node.pid) {
-			node.icon = this.icon.root;
-			node.iconOpen = this.icon.root;
-		}
-		str += '<img id="i' + this.obj + nodeId + '" src="' + ((node._io) ? node.iconOpen : node.icon) + '" alt="" />';
-	}
-	if (node.url) {
-		str += '<a id="s' + this.obj + nodeId + '" class="' + ((this.config.useSelection) ? ((node._is ? 'nodeSel' : 'node')) : 'node') + '" href="' + node.url + '"';
-		if (node.title) str += ' title="' + node.title + '"';
-		if (node.target) str += ' target="' + node.target + '"';
-		if (this.config.useStatusText) str += ' onmouseover="window.status=\'' + node.name + '\';return true;" onmouseout="window.status=\'\';return true;" ';
-		if (this.config.useSelection && ((node._hc && this.config.folderLinks) || !node._hc))
-			str += ' onclick="javascript: ' + this.obj + '.s(' + nodeId + ');"';
-		str += '>';
-	}
-	else if ((!this.config.folderLinks || !node.url) && node._hc && node.pid != this.root.id)
-		str += '<a href="javascript: ' + this.obj + '.o(' + nodeId + ');" class="node">';
-	str += node.name;
-	if (node.url || ((!this.config.folderLinks || !node.url) && node._hc)) str += '</a>';
-	str += '</div>';
-	if (node._hc) {
-		str += '<div id="d' + this.obj + nodeId + '" class="clip" style="display:' + ((this.root.id == node.pid || node._io) ? 'block' : 'none') + ';">';
-		str += this.addNode(node);
-		str += '</div>';
-	}
-	this.aIndent.pop();
-	return str;
+ var str = '<div class="dTreeNode">' + this.indent(node, nodeId);
+ if (this.config.useIcons) {
+  if (!node.icon) node.icon = (this.root.id == node.pid) ? this.icon.root : ((node._hc) ? this.icon.folder : this.icon.node);
+  if (!node.iconOpen) node.iconOpen = (node._hc) ? this.icon.folderOpen : this.icon.node;
+  if (this.root.id == node.pid) {
+   node.icon = this.icon.root;
+   node.iconOpen = this.icon.root;
+  }
+  str += '<img id="i' + this.obj + nodeId + '" src="' + ((node._io) ? node.iconOpen : node.icon) + '" alt="" />';
+ }
+ if (node.url) {
+  str += '<a id="s' + this.obj + nodeId + '" class="' + ((this.config.useSelection) ? ((node._is ? 'nodeSel' : 'node')) : 'node') + '" href="' + node.url + '"';
+  if (node.title) str += ' title="' + node.title + '"';
+  if (node.target) str += ' target="' + node.target + '"';
+  if (this.config.useStatusText) str += ' onmouseover="window.status=\'' + node.name + '\';return true;" onmouseout="window.status=\'\';return true;" ';
+  if (this.config.useSelection && ((node._hc && this.config.folderLinks) || !node._hc))
+   str += ' onclick="javascript: ' + this.obj + '.s(' + nodeId + ');"';
+  str += '>';
+ }
+ else if ((!this.config.folderLinks || !node.url) && node._hc && node.pid != this.root.id)
+  str += '<a href="javascript: ' + this.obj + '.o(' + nodeId + ');" class="node">';
+ str += node.name;
+ if (node.url || ((!this.config.folderLinks || !node.url) && node._hc)) str += '</a>';
+ str += '</div>';
+ if (node._hc) {
+  str += '<div id="d' + this.obj + nodeId + '" class="clip" style="display:' + ((this.root.id == node.pid || node._io) ? 'block' : 'none') + ';">';
+  str += this.addNode(node);
+  str += '</div>';
+ }
+ this.aIndent.pop();
+ return str;
 };
 
 dTree.prototype.indent = function(node, nodeId) {
-	var str = '';
-	if (this.root.id != node.pid) {
-		for (var n=0; n<this.aIndent.length; n++)
-			str += '<img src="' + ( (this.aIndent[n] == 1 && this.config.useLines) ? this.icon.line : this.icon.empty ) + '" alt="" />';
-		(node._ls) ? this.aIndent.push(0) : this.aIndent.push(1);
-		if (node._hc) {
-			str += '<a href="javascript: ' + this.obj + '.o(' + nodeId + ');"><img  id="j' + this.obj + nodeId + '" src="';
-			if (!this.config.useLines) str += (node._io) ? this.icon.nlMinus : this.icon.nlPlus;
-			else str += ( (node._io) ? ((node._ls && this.config.useLines) ? this.icon.minusBottom : this.icon.minus) : ((node._ls && this.config.useLines) ? this.icon.plusBottom : this.icon.plus ) );
-			str += '" alt="" /></a>';
-		} else str += '<img src="' + ( (this.config.useLines) ? ((node._ls) ? this.icon.joinBottom : this.icon.join ) : this.icon.empty) + '" alt="" />';
-	}
-	return str;
+ var str = '';
+ if (this.root.id != node.pid) {
+  for (var n=0; n<this.aIndent.length; n++)
+   str += '<img src="' + ( (this.aIndent[n] == 1 && this.config.useLines) ? this.icon.line : this.icon.empty ) + '" alt="" />';
+  (node._ls) ? this.aIndent.push(0) : this.aIndent.push(1);
+  if (node._hc) {
+   str += '<a href="javascript: ' + this.obj + '.o(' + nodeId + ');"><img  id="j' + this.obj + nodeId + '" src="';
+   if (!this.config.useLines) str += (node._io) ? this.icon.nlMinus : this.icon.nlPlus;
+   else str += ( (node._io) ? ((node._ls && this.config.useLines) ? this.icon.minusBottom : this.icon.minus) : ((node._ls && this.config.useLines) ? this.icon.plusBottom : this.icon.plus ) );
+   str += '" alt="" /></a>';
+  } else str += '<img src="' + ( (this.config.useLines) ? ((node._ls) ? this.icon.joinBottom : this.icon.join ) : this.icon.empty) + '" alt="" />';
+ }
+ return str;
 };
 
 dTree.prototype.setCS = function(node) {
-	var lastId;
-	for (var n=0; n<this.aNodes.length; n++) {
-		if (this.aNodes[n].pid == node.id) node._hc = true;
-		if (this.aNodes[n].pid == node.pid) lastId = this.aNodes[n].id;
-	}
-	if (lastId==node.id) node._ls = true;
+ var lastId;
+ for (var n=0; n<this.aNodes.length; n++) {
+  if (this.aNodes[n].pid == node.id) node._hc = true;
+  if (this.aNodes[n].pid == node.pid) lastId = this.aNodes[n].id;
+ }
+ if (lastId==node.id) node._ls = true;
 };
 
 dTree.prototype.getSelected = function() {
-	var sn = this.getCookie('cs' + this.obj);
-	return (sn) ? sn : null;
+ var sn = this.getCookie('cs' + this.obj);
+ return (sn) ? sn : null;
 };
 
 dTree.prototype.s = function(id) {
-	if (!this.config.useSelection) return;
-	var cn = this.aNodes[id];
-	if (cn._hc && !this.config.folderLinks) return;
-	if (this.selectedNode != id) {
-		if (this.selectedNode || this.selectedNode==0) {
-			eOld = document.getElementById("s" + this.obj + this.selectedNode);
-			eOld.className = "node";
-		}
-		eNew = document.getElementById("s" + this.obj + id);
-		eNew.className = "nodeSel";
-		this.selectedNode = id;
-		if (this.config.useCookies) this.setCookie('cs' + this.obj, cn.id);
-	}
+ if (!this.config.useSelection) return;
+ var cn = this.aNodes[id];
+ if (cn._hc && !this.config.folderLinks) return;
+ if (this.selectedNode != id) {
+  if (this.selectedNode || this.selectedNode==0) {
+   eOld = document.getElementById("s" + this.obj + this.selectedNode);
+   eOld.className = "node";
+  }
+  eNew = document.getElementById("s" + this.obj + id);
+  eNew.className = "nodeSel";
+  this.selectedNode = id;
+  if (this.config.useCookies) this.setCookie('cs' + this.obj, cn.id);
+ }
 };
 
 dTree.prototype.o = function(id) {
-	var cn = this.aNodes[id];
-	this.nodeStatus(!cn._io, id, cn._ls);
-	cn._io = !cn._io;
-	if (this.config.closeSameLevel) this.closeLevel(cn);
-	if (this.config.useCookies) this.updateCookie();
+ var cn = this.aNodes[id];
+ this.nodeStatus(!cn._io, id, cn._ls);
+ cn._io = !cn._io;
+ if (this.config.closeSameLevel) this.closeLevel(cn);
+ if (this.config.useCookies) this.updateCookie();
 };
 
 dTree.prototype.oAll = function(status) {
-	for (var n=0; n<this.aNodes.length; n++) {
-		if (this.aNodes[n]._hc && this.aNodes[n].pid != this.root.id) {
-			this.nodeStatus(status, n, this.aNodes[n]._ls)
-			this.aNodes[n]._io = status;
-		}
-	}
-	if (this.config.useCookies) this.updateCookie();
+ for (var n=0; n<this.aNodes.length; n++) {
+  if (this.aNodes[n]._hc && this.aNodes[n].pid != this.root.id) {
+   this.nodeStatus(status, n, this.aNodes[n]._ls)
+   this.aNodes[n]._io = status;
+  }
+ }
+ if (this.config.useCookies) this.updateCookie();
 };
 
 dTree.prototype.openTo = function(nId, bSelect, bFirst) {
-	if (!bFirst) {
-		for (var n=0; n<this.aNodes.length; n++) {
-			if (this.aNodes[n].id == nId) {
-				nId=n;
-				break;
-			}
-		}
-	}
-	var cn=this.aNodes[nId];
-	if (cn.pid==this.root.id || !cn._p) return;
-	cn._io = true;
-	cn._is = bSelect;
-	if (this.completed && cn._hc) this.nodeStatus(true, cn._ai, cn._ls);
-	if (this.completed && bSelect) this.s(cn._ai);
-	else if (bSelect) this._sn=cn._ai;
-	this.openTo(cn._p._ai, false, true);
+ if (!bFirst) {
+  for (var n=0; n<this.aNodes.length; n++) {
+   if (this.aNodes[n].id == nId) {
+    nId=n;
+    break;
+   }
+  }
+ }
+ var cn=this.aNodes[nId];
+ if (cn.pid==this.root.id || !cn._p) return;
+ cn._io = true;
+ cn._is = bSelect;
+ if (this.completed && cn._hc) this.nodeStatus(true, cn._ai, cn._ls);
+ if (this.completed && bSelect) this.s(cn._ai);
+ else if (bSelect) this._sn=cn._ai;
+ this.openTo(cn._p._ai, false, true);
 };
 
 dTree.prototype.closeLevel = function(node) {
-	for (var n=0; n<this.aNodes.length; n++) {
-		if (this.aNodes[n].pid == node.pid && this.aNodes[n].id != node.id && this.aNodes[n]._hc) {
-			this.nodeStatus(false, n, this.aNodes[n]._ls);
-			this.aNodes[n]._io = false;
-			this.closeAllChildren(this.aNodes[n]);
-		}
-	}
+ for (var n=0; n<this.aNodes.length; n++) {
+  if (this.aNodes[n].pid == node.pid && this.aNodes[n].id != node.id && this.aNodes[n]._hc) {
+   this.nodeStatus(false, n, this.aNodes[n]._ls);
+   this.aNodes[n]._io = false;
+   this.closeAllChildren(this.aNodes[n]);
+  }
+ }
 }
 
 dTree.prototype.closeAllChildren = function(node) {
-	for (var n=0; n<this.aNodes.length; n++) {
-		if (this.aNodes[n].pid == node.id && this.aNodes[n]._hc) {
-			if (this.aNodes[n]._io) this.nodeStatus(false, n, this.aNodes[n]._ls);
-			this.aNodes[n]._io = false;
-			this.closeAllChildren(this.aNodes[n]);		
-		}
-	}
+ for (var n=0; n<this.aNodes.length; n++) {
+  if (this.aNodes[n].pid == node.id && this.aNodes[n]._hc) {
+   if (this.aNodes[n]._io) this.nodeStatus(false, n, this.aNodes[n]._ls);
+   this.aNodes[n]._io = false;
+   this.closeAllChildren(this.aNodes[n]);  
+  }
+ }
 }
 
 dTree.prototype.nodeStatus = function(status, id, bottom) {
-	eDiv	= document.getElementById('d' + this.obj + id);
-	eJoin	= document.getElementById('j' + this.obj + id);
-	if (this.config.useIcons) {
-		eIcon	= document.getElementById('i' + this.obj + id);
-		eIcon.src = (status) ? this.aNodes[id].iconOpen : this.aNodes[id].icon;
-	}
-	eJoin.src = (this.config.useLines)?
-	((status)?((bottom)?this.icon.minusBottom:this.icon.minus):((bottom)?this.icon.plusBottom:this.icon.plus)):
-	((status)?this.icon.nlMinus:this.icon.nlPlus);
-	eDiv.style.display = (status) ? 'block': 'none';
+ eDiv = document.getElementById('d' + this.obj + id);
+ eJoin = document.getElementById('j' + this.obj + id);
+ if (this.config.useIcons) {
+  eIcon = document.getElementById('i' + this.obj + id);
+  eIcon.src = (status) ? this.aNodes[id].iconOpen : this.aNodes[id].icon;
+ }
+ eJoin.src = (this.config.useLines)?
+ ((status)?((bottom)?this.icon.minusBottom:this.icon.minus):((bottom)?this.icon.plusBottom:this.icon.plus)):
+ ((status)?this.icon.nlMinus:this.icon.nlPlus);
+ eDiv.style.display = (status) ? 'block': 'none';
 };
 
 
 dTree.prototype.clearCookie = function() {
-	var now = new Date();
-	var yesterday = new Date(now.getTime() - 1000 * 60 * 60 * 24);
-	this.setCookie('co'+this.obj, 'cookieValue', yesterday);
-	this.setCookie('cs'+this.obj, 'cookieValue', yesterday);
+ var now = new Date();
+ var yesterday = new Date(now.getTime() - 1000 * 60 * 60 * 24);
+ this.setCookie('co'+this.obj, 'cookieValue', yesterday);
+ this.setCookie('cs'+this.obj, 'cookieValue', yesterday);
 };
 
 dTree.prototype.setCookie = function(cookieName, cookieValue, expires, path, domain, secure) {
-	document.cookie =
-		escape(cookieName) + '=' + escape(cookieValue)
-		+ (expires ? '; expires=' + expires.toGMTString() : '')
-		+ (path ? '; path=' + path : '')
-		+ (domain ? '; domain=' + domain : '')
-		+ (secure ? '; secure' : '');
+ document.cookie =
+  escape(cookieName) + '=' + escape(cookieValue)
+  + (expires ? '; expires=' + expires.toGMTString() : '')
+  + (path ? '; path=' + path : '')
+  + (domain ? '; domain=' + domain : '')
+  + (secure ? '; secure' : '');
 };
 
 dTree.prototype.getCookie = function(cookieName) {
-	var cookieValue = '';
-	var posName = document.cookie.indexOf(escape(cookieName) + '=');
-	if (posName != -1) {
-		var posValue = posName + (escape(cookieName) + '=').length;
-		var endPos = document.cookie.indexOf(';', posValue);
-		if (endPos != -1) cookieValue = unescape(document.cookie.substring(posValue, endPos));
-		else cookieValue = unescape(document.cookie.substring(posValue));
-	}
-	return (cookieValue);
+ var cookieValue = '';
+ var posName = document.cookie.indexOf(escape(cookieName) + '=');
+ if (posName != -1) {
+  var posValue = posName + (escape(cookieName) + '=').length;
+  var endPos = document.cookie.indexOf(';', posValue);
+  if (endPos != -1) cookieValue = unescape(document.cookie.substring(posValue, endPos));
+  else cookieValue = unescape(document.cookie.substring(posValue));
+ }
+ return (cookieValue);
 };
 
 dTree.prototype.updateCookie = function() {
-	var str = '';
-	for (var n=0; n<this.aNodes.length; n++) {
-		if (this.aNodes[n]._io && this.aNodes[n].pid != this.root.id) {
-			if (str) str += '.';
-			str += this.aNodes[n].id;
-		}
-	}
-	this.setCookie('co' + this.obj, str);
+ var str = '';
+ for (var n=0; n<this.aNodes.length; n++) {
+  if (this.aNodes[n]._io && this.aNodes[n].pid != this.root.id) {
+   if (str) str += '.';
+   str += this.aNodes[n].id;
+  }
+ }
+ this.setCookie('co' + this.obj, str);
 };
 
 dTree.prototype.isOpen = function(id) {
-	var aOpen = this.getCookie('co' + this.obj).split('.');
-	for (var n=0; n<aOpen.length; n++)
-		if (aOpen[n] == id) return true;
-	return false;
+ var aOpen = this.getCookie('co' + this.obj).split('.');
+ for (var n=0; n<aOpen.length; n++)
+  if (aOpen[n] == id) return true;
+ return false;
 };
 
 if (!Array.prototype.push) {
-	Array.prototype.push = function array_push() {
-		for(var i=0;i<arguments.length;i++)
-			this[this.length]=arguments[i];
-		return this.length;
-	}
+ Array.prototype.push = function array_push() {
+  for(var i=0;i<arguments.length;i++)
+   this[this.length]=arguments[i];
+  return this.length;
+ }
 };
 if (!Array.prototype.pop) {
-	Array.prototype.pop = function array_pop() {
-		lastElement = this[this.length-1];
-		this.length = Math.max(this.length-1,0);
-		return lastElement;
-	}
+ Array.prototype.pop = function array_pop() {
+  lastElement = this[this.length-1];
+  this.length = Math.max(this.length-1,0);
+  return lastElement;
+ }
 };
diff --git a/Open-ILS/src/extras/marc2html b/Open-ILS/src/extras/marc2html
index f367c70680..79e44519a7 100755
--- a/Open-ILS/src/extras/marc2html
+++ b/Open-ILS/src/extras/marc2html
@@ -11,16 +11,16 @@ use FileHandle;
 
 my ($split,$enc,$marc,$out,$bad) = (100);
 GetOptions(
-	'split=i' => \$split,
-	'marc=s'  => \$marc,
-	'encoding=s'  => \$enc,
-	'out_dir=s'  => \$out,
-	'bad=s'  => \$bad,
+ 'split=i' => \$split,
+ 'marc=s'  => \$marc,
+ 'encoding=s'  => \$enc,
+ 'out_dir=s'  => \$out,
+ 'bad=s'  => \$bad,
 );
 
 if ($enc) {
-	MARC::Charset->ignore_errors(1);
-	MARC::Charset->assume_encoding($enc);
+ MARC::Charset->ignore_errors(1);
+ MARC::Charset->assume_encoding($enc);
 }
 
 die "gimme some marc!\n" unless $marc;
@@ -45,49 +45,49 @@ $marc->strict_off;
 $marc->warnings_off;
 
 while (my $r = $marc->next) {
-	my $rxml = entityize(MARC::File::XML::record($r));
-	$rxml =~ s/[\x00-\x1f]//go;
-
-	try { $doc = $parser->parse_string($rxml); }
-	catch Error with {
-		my $e = shift;
-		warn "arg ... bad record $current, skipping: $e\n";
-		$current++;
-		print $bad $r->as_usmarc if ($bad);
-		$r = undef;
-	};
-	next unless ($r);
-
-	$xml .= $rxml;
-
-	unless ($current % $split) {
-		$xml = <<"		XML";
-			<collection xmlns="http://www.loc.gov/MARC21/slim">
-				$xml
-			</collection>
-		XML
-
-		my $doc;
-		try { $doc = $parser->parse_string($xml); }
-		catch Error with { my $e = shift; warn "ARG! Doc failed to parse:\n$e\n-------------------------------------------\n$xml\n"; };
-		die unless $doc;
-
-		$xml = '';
-
-		my $results = $stylesheet->transform($doc, prev => "'$prev'", next => "'$next'");
-		$prev++;
-		$next++;
-
-		open OUT, ">$out/$prev.html";
-		print OUT $results->toString;
-		close OUT;
-	}
-	$current++;
+ my $rxml = entityize(MARC::File::XML::record($r));
+ $rxml =~ s/[\x00-\x1f]//go;
+
+ try { $doc = $parser->parse_string($rxml); }
+ catch Error with {
+  my $e = shift;
+  warn "arg ... bad record $current, skipping: $e\n";
+  $current++;
+  print $bad $r->as_usmarc if ($bad);
+  $r = undef;
+ };
+ next unless ($r);
+
+ $xml .= $rxml;
+
+ unless ($current % $split) {
+  $xml = <<"  XML";
+   <collection xmlns="http://www.loc.gov/MARC21/slim">
+    $xml
+   </collection>
+  XML
+
+  my $doc;
+  try { $doc = $parser->parse_string($xml); }
+  catch Error with { my $e = shift; warn "ARG! Doc failed to parse:\n$e\n-------------------------------------------\n$xml\n"; };
+  die unless $doc;
+
+  $xml = '';
+
+  my $results = $stylesheet->transform($doc, prev => "'$prev'", next => "'$next'");
+  $prev++;
+  $next++;
+
+  open OUT, ">$out/$prev.html";
+  print OUT $results->toString;
+  close OUT;
+ }
+ $current++;
 }
 
 my $doc = $parser->parse_string(<<XML);
 <marc:collection xmlns:marc="http://www.loc.gov/MARC21/slim">
-	$xml
+ $xml
 </marc:collection>
 XML
 
@@ -117,122 +117,122 @@ sub entityize {
 __DATA__
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-	<xsl:output method="html"/>
-	
-	<xsl:template match="/">
-		<html>
-			<head>
-
-				<style>
-
-					.marc_table {}
-					.marc_tag_row {}
-					.marc_tag_data {}
-					.marc_tag_col {}
-					.marc_tag_ind {}
-					.marc_subfields {}
-					.marc_subfield_code { 
-						color: blue; 
-						padding-left: 5px;
-						padding-right: 5px; 
-					}
-
-				</style>
-
-				<link href='/css/opac_marc.css' rel='stylesheet' type='text/css'></link>
-			</head>
-			<body>
-				<xsl:if test="$prev &gt; 0">
-					<a>
-						<xsl:attribute name="href">
-							<xsl:value-of select="concat( $prev, '.html')"/>
-						</xsl:attribute>
-						<xsl:text>Previous page</xsl:text>
-					</a>
-				</xsl:if>
-				<span> | </span>
-				<xsl:if test="$next &gt; 0">
-					<a>
-						<xsl:attribute name="href">
-							<xsl:value-of select="concat( $next, '.html')"/>
-						</xsl:attribute>
-						<xsl:text>Next page</xsl:text>
-					</a>
-				</xsl:if>
-				<hr/>
-				<xsl:apply-templates select="//marc:record"/>
-				<xsl:if test="$prev &gt; 0">
-					<a>
-						<xsl:attribute name="href">
-							<xsl:value-of select="concat( $prev, '.html')"/>
-						</xsl:attribute>
-						<xsl:text>Previous page</xsl:text>
-					</a>
-				</xsl:if>
-				<span> | </span>
-				<xsl:if test="$next &gt; 0">
-					<a>
-						<xsl:attribute name="href">
-							<xsl:value-of select="concat( $next, '.html')"/>
-						</xsl:attribute>
-						<xsl:text>Next page</xsl:text>
-					</a>
-				</xsl:if>
-			</body>
-		</html>
-	</xsl:template>
-	
-	<xsl:template match="marc:record">
-		<table class='marc_table'>
-			<tr class='marc_tag_row'>
-				<th class='marc_tag_col' NOWRAP="TRUE" ALIGN="RIGHT" VALIGN="middle">
-					LDR
-				</th>
-				<td class='marc_tag_data' COLSPAN='3'>
-					<xsl:value-of select="marc:leader"/>
-				</td>
-			</tr>
-			<xsl:apply-templates select="marc:datafield|marc:controlfield"/>
-		</table>
-		<hr/>
-	</xsl:template>
-	
-	<xsl:template match="marc:controlfield">
-		<tr class='marc_tag_row'>
-			<th class='marc_tag_col' NOWRAP="TRUE" ALIGN="RIGHT" VALIGN="middle">
-				<xsl:value-of select="@tag"/>
-			</th>
-			<td class='marc_tag_data' COLSPAN='3'>
-				<xsl:value-of select="."/>
-			</td>
-		</tr>
-	</xsl:template>
-	
-	<xsl:template match="marc:datafield">
-		<tr class='marc_tag_row'>
-			<th class='marc_tag_col' NOWRAP="TRUE" ALIGN="RIGHT" VALIGN="middle">
-				<xsl:value-of select="@tag"/>
-			</th>
-			<td class='marc_tag_ind'>
-				<xsl:value-of select="@ind1"/>
-			</td>
-
-			<td class='marc_tag_ind' style='border-left: 1px solid #A0A0A0; padding-left: 3px;'>
-				<xsl:value-of select="@ind2"/>
-				<span style='color:#FFF'>.</span> 
-			</td>
-
-			<td class='marc_subfields'>
-				<xsl:apply-templates select="marc:subfield"/>
-			</td>
-		</tr>
-	</xsl:template>
-	
-	<xsl:template match="marc:subfield">
-		<span class='marc_subfield_code' > 
-			&#8225;<xsl:value-of select="@code"/>
-		</span><xsl:value-of select="."/>	
-	</xsl:template>
+ <xsl:output method="html"/>
+ 
+ <xsl:template match="/">
+  <html>
+   <head>
+
+    <style>
+
+     .marc_table {}
+     .marc_tag_row {}
+     .marc_tag_data {}
+     .marc_tag_col {}
+     .marc_tag_ind {}
+     .marc_subfields {}
+     .marc_subfield_code { 
+      color: blue; 
+      padding-left: 5px;
+      padding-right: 5px; 
+     }
+
+    </style>
+
+    <link href='/css/opac_marc.css' rel='stylesheet' type='text/css'></link>
+   </head>
+   <body>
+    <xsl:if test="$prev &gt; 0">
+     <a>
+      <xsl:attribute name="href">
+       <xsl:value-of select="concat( $prev, '.html')"/>
+      </xsl:attribute>
+      <xsl:text>Previous page</xsl:text>
+     </a>
+    </xsl:if>
+    <span> | </span>
+    <xsl:if test="$next &gt; 0">
+     <a>
+      <xsl:attribute name="href">
+       <xsl:value-of select="concat( $next, '.html')"/>
+      </xsl:attribute>
+      <xsl:text>Next page</xsl:text>
+     </a>
+    </xsl:if>
+    <hr/>
+    <xsl:apply-templates select="//marc:record"/>
+    <xsl:if test="$prev &gt; 0">
+     <a>
+      <xsl:attribute name="href">
+       <xsl:value-of select="concat( $prev, '.html')"/>
+      </xsl:attribute>
+      <xsl:text>Previous page</xsl:text>
+     </a>
+    </xsl:if>
+    <span> | </span>
+    <xsl:if test="$next &gt; 0">
+     <a>
+      <xsl:attribute name="href">
+       <xsl:value-of select="concat( $next, '.html')"/>
+      </xsl:attribute>
+      <xsl:text>Next page</xsl:text>
+     </a>
+    </xsl:if>
+   </body>
+  </html>
+ </xsl:template>
+ 
+ <xsl:template match="marc:record">
+  <table class='marc_table'>
+   <tr class='marc_tag_row'>
+    <th class='marc_tag_col' NOWRAP="TRUE" ALIGN="RIGHT" VALIGN="middle">
+     LDR
+    </th>
+    <td class='marc_tag_data' COLSPAN='3'>
+     <xsl:value-of select="marc:leader"/>
+    </td>
+   </tr>
+   <xsl:apply-templates select="marc:datafield|marc:controlfield"/>
+  </table>
+  <hr/>
+ </xsl:template>
+ 
+ <xsl:template match="marc:controlfield">
+  <tr class='marc_tag_row'>
+   <th class='marc_tag_col' NOWRAP="TRUE" ALIGN="RIGHT" VALIGN="middle">
+    <xsl:value-of select="@tag"/>
+   </th>
+   <td class='marc_tag_data' COLSPAN='3'>
+    <xsl:value-of select="."/>
+   </td>
+  </tr>
+ </xsl:template>
+ 
+ <xsl:template match="marc:datafield">
+  <tr class='marc_tag_row'>
+   <th class='marc_tag_col' NOWRAP="TRUE" ALIGN="RIGHT" VALIGN="middle">
+    <xsl:value-of select="@tag"/>
+   </th>
+   <td class='marc_tag_ind'>
+    <xsl:value-of select="@ind1"/>
+   </td>
+
+   <td class='marc_tag_ind' style='border-left: 1px solid #A0A0A0; padding-left: 3px;'>
+    <xsl:value-of select="@ind2"/>
+    <span style='color:#FFF'>.</span> 
+   </td>
+
+   <td class='marc_subfields'>
+    <xsl:apply-templates select="marc:subfield"/>
+   </td>
+  </tr>
+ </xsl:template>
+ 
+ <xsl:template match="marc:subfield">
+  <span class='marc_subfield_code' > 
+   &#8225;<xsl:value-of select="@code"/>
+  </span><xsl:value-of select="."/> 
+ </xsl:template>
 
 </xsl:stylesheet>
 
diff --git a/Open-ILS/src/extras/opensearchportal.html b/Open-ILS/src/extras/opensearchportal.html
index 44ce1adde1..45422a1cf8 100644
--- a/Open-ILS/src/extras/opensearchportal.html
+++ b/Open-ILS/src/extras/opensearchportal.html
@@ -1,126 +1,126 @@
 <html>
-	<head>
-		<title>mikers experimental opensearch portal</title>
-		<style>
+ <head>
+  <title>mikers experimental opensearch portal</title>
+  <style>
 
 * {
-	font-family: verdana,arial,helvetica,sans-serif;
-	font-size: small;
+ font-family: verdana,arial,helvetica,sans-serif;
+ font-size: small;
 }
 
 #result_sources a {
-	font-size: 8px;
-	color: grey;
-	text-decoration: none;
+ font-size: 8px;
+ color: grey;
+ text-decoration: none;
 }
 
 td {
-	vertical-align: top;
+ vertical-align: top;
 }
 
 caption {
-	border: solid black 1px;
+ border: solid black 1px;
 }
 
 .header {
-	border: solid lightblue 1px;
-	background-color: lightblue;
+ border: solid lightblue 1px;
+ background-color: lightblue;
 }
 
 a {
-	color: blue;
-	text-decoration: none;
+ color: blue;
+ text-decoration: none;
 }
 
 a:hover {
-	color: blue;
-	text-decoration: underline;
+ color: blue;
+ text-decoration: underline;
 }
 
 a:active {
-	color: red;
-	text-decoration: underline;
+ color: red;
+ text-decoration: underline;
 }
 
 a:visited {
-	color: blue;
-	text-decoration: none;
+ color: blue;
+ text-decoration: none;
 }
 
 .title_link {
-	font-size: medium;
-	font-weight: bold;
+ font-size: medium;
+ font-weight: bold;
 }
 
 .desc_text {
-	font-size: small;
+ font-size: small;
 }
 
 .hide {
-	color: lightgray;
+ color: lightgray;
 }
 
 .col_tab {
-	border-collapse: collapse;
-	border: solid gray 1px;
+ border-collapse: collapse;
+ border: solid gray 1px;
 }
 
 .res_table {
-	border-collapse: collapse;
+ border-collapse: collapse;
 }
 
 #col_res {
-	max-width: 300px !important;
-	min-width: 200px !important;
+ max-width: 300px !important;
+ min-width: 200px !important;
 }
 
 #int_res {
-	max-width: 100% !important;
+ max-width: 100% !important;
 }
 
 #int_res_hide {
-	max-width: 100% !important;
-	min-width: 400px !important;
+ max-width: 100% !important;
+ min-width: 400px !important;
 }
 
 .res_tr {
-	border-bottom: 1px dashed darkgrey;
+ border-bottom: 1px dashed darkgrey;
 }
 
 .noshow {
-	display: none;
-	visibility: hidden;
+ display: none;
+ visibility: hidden;
 }
 
-		</style>
-		<script>
+  </style>
+  <script>
 
 var isIE = false;
 
 function create_requestor () {
-	var req;
-	try { 
-		req = new ActiveXObject("Msxml2.XMLHTTP");
-		isIE = true;
-	} catch (e) {
-		try { 
-			req = new ActiveXObject("Microsoft.XMLHTTP");
-			isIE = true;
-		} catch (E) {
-			req = false;
-		}
-	}
-
-	if (!req && typeof XMLHttpRequest!='undefined') {
-		req = new XMLHttpRequest();
-	}
+ var req;
+ try { 
+  req = new ActiveXObject("Msxml2.XMLHTTP");
+  isIE = true;
+ } catch (e) {
+  try { 
+   req = new ActiveXObject("Microsoft.XMLHTTP");
+   isIE = true;
+  } catch (E) {
+   req = false;
+  }
+ }
+
+ if (!req && typeof XMLHttpRequest!='undefined') {
+  req = new XMLHttpRequest();
+ }
         
-	if(!req) {
-		alert("NEEDS NEWER JAVASCRIPT for XMLHTTPRequest()");
-		return null;
-	}
+ if(!req) {
+  alert("NEEDS NEWER JAVASCRIPT for XMLHTTPRequest()");
+  return null;
+ }
 
-	return req;
+ return req;
 }
 
 var proxy = 'http://dev.gapines.org/opac/extras/opensearch/?fetch=';
@@ -139,238 +139,238 @@ var current_count = 5;
 function opensearch ( term, reset, single_source ) {
 
 
-	if (reset) {
-		current_startPage = 1;
-		rel_scales = {};
-	}
-
-	if (single_source) {
-
-		create_search(single_source);
-		var turi = search_templates[single_source].replace(/\{searchTerms\}/,encodeURIComponent(term));
-		turi = turi.replace(/\{startPage\}/,current_startPage);
-		turi = turi.replace(/\{startIndex\}/,current_startIndex);
-		turi = turi.replace(/\{count\}/,current_count);
-		turi = turi.replace(/\{relevanceScale}/,'0');
-		search_urls[single_source] = proxy + encodeURIComponent(turi);
-
-		rel_scales
-		var cur_src = document.getElementById('result_sources');
-		for (var i = 1; i < cur_src.childNodes.length; i++) {
-			if (cur_src.childNodes[i].nodeValue == turi)
-				return;
-		}
-		cur_src.innerHTML += '<a name="' + single_source + '" href="' + turi + '">' + turi + '</a><br>';
-		perform_search(single_source);
-		return;
-	}
-
-	document.getElementById('next_button').className = 'hide';
-
-	if (current_startPage == 1)
-		document.getElementById('prev_button').className = 'hide';
-	else 
-		document.getElementById('prev_button').className = '';
-
-	var tot = document.getElementById('total');
-	while (tot.lastChild)
-			tot.removeChild(tot.lastChild);
-
-	var src = document.getElementById('result_sources');
-	while (src.lastChild)
-			src.removeChild(src.lastChild);
-
-	document.getElementById('int_res_hide').className = 'noshow';
-	document.getElementById('col_res_hide').className = 'noshow';
-
-	var tab = document.getElementById('int_res');
-	while (tab.lastChild)
-			tab.removeChild(tab.lastChild);
-
-	tab = document.getElementById('col_res');
-	while (tab.lastChild)
-			tab.removeChild(tab.lastChild);
-
-	search_count = 0;
-
-	var sources = new Array();
-	var selector = document.getElementsByName('source');
-	for (var i = 0; i < selector.length; i++) {
-		if (selector[i].checked) {
-			sources.push(selector[i].value);
-		}
-	}
-
-	search_templates = [];
-	for (var i in sources) {
-		create_search( sources[i] );
-	}
-
-	current_startIndex = (current_count * (current_startPage - 1)) + 1; 
-
-	search_urls = [];
-	for (var i in search_templates) {
-		if (!search_templates[i])
-			continue;
-
-		if (!rel_scales[i])
-			rel_scales[i] = 0;
-
-		var url = search_templates[i].replace(/\{searchTerms\}/,encodeURIComponent(term));
-		url = url.replace(/\{startPage\}/,current_startPage);
-		url = url.replace(/\{startIndex\}/,current_startIndex);
-		url = url.replace(/\{count\}/,current_count);
-		url = url.replace(/\{relevanceScale}/,rel_scales[i]);
-		search_urls[i] = proxy + encodeURIComponent(url);
-
-		src.innerHTML += '<a name="' + i + '" href="' + url + '">' + url + '</a><br>';
-	}
-
-	for (var i in search_urls) {
-		if (!search_templates[i])
-			continue;
-
-		perform_search(i);
-	}
-
-	document.getElementById('page_label').innerHTML = current_startPage;
+ if (reset) {
+  current_startPage = 1;
+  rel_scales = {};
+ }
+
+ if (single_source) {
+
+  create_search(single_source);
+  var turi = search_templates[single_source].replace(/\{searchTerms\}/,encodeURIComponent(term));
+  turi = turi.replace(/\{startPage\}/,current_startPage);
+  turi = turi.replace(/\{startIndex\}/,current_startIndex);
+  turi = turi.replace(/\{count\}/,current_count);
+  turi = turi.replace(/\{relevanceScale}/,'0');
+  search_urls[single_source] = proxy + encodeURIComponent(turi);
+
+  rel_scales
+  var cur_src = document.getElementById('result_sources');
+  for (var i = 1; i < cur_src.childNodes.length; i++) {
+   if (cur_src.childNodes[i].nodeValue == turi)
+    return;
+  }
+  cur_src.innerHTML += '<a name="' + single_source + '" href="' + turi + '">' + turi + '</a><br>';
+  perform_search(single_source);
+  return;
+ }
+
+ document.getElementById('next_button').className = 'hide';
+
+ if (current_startPage == 1)
+  document.getElementById('prev_button').className = 'hide';
+ else 
+  document.getElementById('prev_button').className = '';
+
+ var tot = document.getElementById('total');
+ while (tot.lastChild)
+   tot.removeChild(tot.lastChild);
+
+ var src = document.getElementById('result_sources');
+ while (src.lastChild)
+   src.removeChild(src.lastChild);
+
+ document.getElementById('int_res_hide').className = 'noshow';
+ document.getElementById('col_res_hide').className = 'noshow';
+
+ var tab = document.getElementById('int_res');
+ while (tab.lastChild)
+   tab.removeChild(tab.lastChild);
+
+ tab = document.getElementById('col_res');
+ while (tab.lastChild)
+   tab.removeChild(tab.lastChild);
+
+ search_count = 0;
+
+ var sources = new Array();
+ var selector = document.getElementsByName('source');
+ for (var i = 0; i < selector.length; i++) {
+  if (selector[i].checked) {
+   sources.push(selector[i].value);
+  }
+ }
+
+ search_templates = [];
+ for (var i in sources) {
+  create_search( sources[i] );
+ }
+
+ current_startIndex = (current_count * (current_startPage - 1)) + 1; 
+
+ search_urls = [];
+ for (var i in search_templates) {
+  if (!search_templates[i])
+   continue;
+
+  if (!rel_scales[i])
+   rel_scales[i] = 0;
+
+  var url = search_templates[i].replace(/\{searchTerms\}/,encodeURIComponent(term));
+  url = url.replace(/\{startPage\}/,current_startPage);
+  url = url.replace(/\{startIndex\}/,current_startIndex);
+  url = url.replace(/\{count\}/,current_count);
+  url = url.replace(/\{relevanceScale}/,rel_scales[i]);
+  search_urls[i] = proxy + encodeURIComponent(url);
+
+  src.innerHTML += '<a name="' + i + '" href="' + url + '">' + url + '</a><br>';
+ }
+
+ for (var i in search_urls) {
+  if (!search_templates[i])
+   continue;
+
+  perform_search(i);
+ }
+
+ document.getElementById('page_label').innerHTML = current_startPage;
 }
 
 function perform_search ( source ) {
-	var req = create_requestor();
+ var req = create_requestor();
 
-	var func = function () {
-		if (req.readyState != 4)
-			return;
+ var func = function () {
+  if (req.readyState != 4)
+   return;
 
-		var xml = req.responseXML;
-
-		var desc  = getElementTextNS('','description',xml,0);
-		var xml_link  = getElementTextNS('','link',xml,0);
+  var xml = req.responseXML;
 
-		var total  = getElementFloatNS('openSearch','totalResults',xml,0);
-		var integratible = (getElementNS('openIll','relevance',xml,0) != null);
-		var scale = getElementFloatNS('openIll','relevanceScale',xml,0);
-
-		rel_scales[source]  = scale;
-		
-		var tot = document.getElementById('total');
-		var current_tot = 0;
-		if (tot.childNodes.length)
-			current_tot = parseFloat(tot.childNodes[0].nodeValue);
-
-		var res_type = document.getElementById('res_type');
-
-		if (res_type.options[res_type.selectedIndex].value == 'col')
-			integratible = 0;
-
-		if (!current_tot)
-			current_tot = 0;
-
-		if (total > (current_startPage * current_count))
-			document.getElementById('next_button').className = '';
-
-		current_tot += total
-		tot.innerHTML = current_tot;
-
-		var list = xml.getElementsByTagName('item');
-		for (var i = 0; i < list.length; i++) {
-
-			if ( typeof list[i] != 'object')
-					continue;
-
-			var tab;
-			if (!integratible) {
-
-				tab = document.getElementById('col_res');
-				document.getElementById('col_res_hide').className = '';
-
-				var col = document.getElementById(encodeURI(source));
-				if (col) {
-					if (col.nodeName != 'TABLE')
-						col = null;
-				}
-
-				if (!col) {
-					var row = tab.rows[0];
-					if (!row)
-						row = tab.insertRow(0);
-
-					col = document.createElement('td');
-					row.appendChild(col);
-
-					tab = document.createElement('table');
-					tab.id = encodeURI(source);
-					tab.name = encodeURI(source);
-					tab.setAttribute('id',encodeURI(source));
-					tab.setAttribute('name',encodeURI(source));
-
-					tab.setAttribute('valign','top');
-					tab.className ='col_tab';
-
-					if(!isIE) {
-						var cap = document.createElement('caption');
-						tab.appendChild(cap);
-						cap.innerHTML = desc + ' -- <a href="' + xml_link + '">XML</a>';
-					}
-
-					col.appendChild(tab);
-
-					var per = parseInt(100 / (search_urls.length * 2)) - 1;
-					col.setAttribute('valign','top');
-					col.setAttribute('width', + per + '%');
-
-				} else {
-					tab = col;
-				}
-			} else {
-				tab = document.getElementById('int_res');
-				document.getElementById('int_res_hide').className = '';
-			}
-
-			if (tab.nodeName != 'TABLE')
-				alert(tab.href);
-
-			if (!tab.rows || !tab.rows.length) {
-				add_result_row(tab, 0, list[i], source);
-			} else {
-				for (var j = 0; j < tab.rows.length; j++) {
-					if ( typeof tab.rows[j] != 'object')
-						continue;
-
-					var rank;
-					try {
-						rank = getElementFloatNS('openIll','relevance',list[i],0);
-					} catch (e) {
-						alert("error getting float relevance: " + e);
-						rank = 0;
-					}
-
-					var curr_rank;
-					if (tab.rows[j] && tab.rows[j].firstChild && tab.rows[j].firstChild.firstChild) {
-						if (tab.rows[j].firstChild.firstChild.childNodes.length)
-							curr_rank = parseFloat(tab.rows[j].firstChild.firstChild.childNodes[0].nodeValue);
-					} else {
-						curr_rank = 0.0;
-					}
-
-					if ( rank < curr_rank ) {
-						if ( (j + 1) == tab.rows.length) {
-							add_result_row(tab, tab.rows.length, list[i], source);
-							break
-						}
-						continue;
-					}
-					add_result_row(tab, j, list[i], source);
-					break;
-				}
-			}
-		}
-	};
-
-	req.onreadystatechange = func;
-	req.open('GET', proxy + encodeURIComponent(search_urls[source]), true);
-	req.send(null);
+  var desc  = getElementTextNS('','description',xml,0);
+  var xml_link  = getElementTextNS('','link',xml,0);
+
+  var total  = getElementFloatNS('openSearch','totalResults',xml,0);
+  var integratible = (getElementNS('openIll','relevance',xml,0) != null);
+  var scale = getElementFloatNS('openIll','relevanceScale',xml,0);
+
+  rel_scales[source]  = scale;
+  
+  var tot = document.getElementById('total');
+  var current_tot = 0;
+  if (tot.childNodes.length)
+   current_tot = parseFloat(tot.childNodes[0].nodeValue);
+
+  var res_type = document.getElementById('res_type');
+
+  if (res_type.options[res_type.selectedIndex].value == 'col')
+   integratible = 0;
+
+  if (!current_tot)
+   current_tot = 0;
+
+  if (total > (current_startPage * current_count))
+   document.getElementById('next_button').className = '';
+
+  current_tot += total
+  tot.innerHTML = current_tot;
+
+  var list = xml.getElementsByTagName('item');
+  for (var i = 0; i < list.length; i++) {
+
+   if ( typeof list[i] != 'object')
+     continue;
+
+   var tab;
+   if (!integratible) {
+
+    tab = document.getElementById('col_res');
+    document.getElementById('col_res_hide').className = '';
+
+    var col = document.getElementById(encodeURI(source));
+    if (col) {
+     if (col.nodeName != 'TABLE')
+      col = null;
+    }
+
+    if (!col) {
+     var row = tab.rows[0];
+     if (!row)
+      row = tab.insertRow(0);
+
+     col = document.createElement('td');
+     row.appendChild(col);
+
+     tab = document.createElement('table');
+     tab.id = encodeURI(source);
+     tab.name = encodeURI(source);
+     tab.setAttribute('id',encodeURI(source));
+     tab.setAttribute('name',encodeURI(source));
+
+     tab.setAttribute('valign','top');
+     tab.className ='col_tab';
+
+     if(!isIE) {
+      var cap = document.createElement('caption');
+      tab.appendChild(cap);
+      cap.innerHTML = desc + ' -- <a href="' + xml_link + '">XML</a>';
+     }
+
+     col.appendChild(tab);
+
+     var per = parseInt(100 / (search_urls.length * 2)) - 1;
+     col.setAttribute('valign','top');
+     col.setAttribute('width', + per + '%');
+
+    } else {
+     tab = col;
+    }
+   } else {
+    tab = document.getElementById('int_res');
+    document.getElementById('int_res_hide').className = '';
+   }
+
+   if (tab.nodeName != 'TABLE')
+    alert(tab.href);
+
+   if (!tab.rows || !tab.rows.length) {
+    add_result_row(tab, 0, list[i], source);
+   } else {
+    for (var j = 0; j < tab.rows.length; j++) {
+     if ( typeof tab.rows[j] != 'object')
+      continue;
+
+     var rank;
+     try {
+      rank = getElementFloatNS('openIll','relevance',list[i],0);
+     } catch (e) {
+      alert("error getting float relevance: " + e);
+      rank = 0;
+     }
+
+     var curr_rank;
+     if (tab.rows[j] && tab.rows[j].firstChild && tab.rows[j].firstChild.firstChild) {
+      if (tab.rows[j].firstChild.firstChild.childNodes.length)
+       curr_rank = parseFloat(tab.rows[j].firstChild.firstChild.childNodes[0].nodeValue);
+     } else {
+      curr_rank = 0.0;
+     }
+
+     if ( rank < curr_rank ) {
+      if ( (j + 1) == tab.rows.length) {
+       add_result_row(tab, tab.rows.length, list[i], source);
+       break
+      }
+      continue;
+     }
+     add_result_row(tab, j, list[i], source);
+     break;
+    }
+   }
+  }
+ };
+
+ req.onreadystatechange = func;
+ req.open('GET', proxy + encodeURIComponent(search_urls[source]), true);
+ req.send(null);
 }
 
 
@@ -384,7 +384,7 @@ function getElementFloatNS(prefix, local, parentElem, index) {
         if (result.childNodes.length > 1) {
             return parseFloat(result.childNodes[1].nodeValue);
         } else {
-            return parseFloat(result.childNodes[0].nodeValue);    		
+            return parseFloat(result.childNodes[0].nodeValue);      
         }
     } else {
         return 0;
@@ -417,7 +417,7 @@ function getElementTextNS(prefix, local, parentElem, index) {
         if (result.childNodes.length > 1) {
             return result.childNodes[1].nodeValue;
         } else {
-            return result.firstChild.nodeValue;    		
+            return result.firstChild.nodeValue;      
         }
     } else {
         return '';
@@ -425,395 +425,395 @@ function getElementTextNS(prefix, local, parentElem, index) {
 }
 
 function add_result_row (tab, index, xml, source) {
-	var img = images[source];
-	var rank,title,tlink,desc;
-
-	try {
-		rank = getElementFloatNS('openIll','relevance',xml,0);
-	} catch (e) {
-		alert("error getting relevance: " + e);
-		rank = '0';
-	}
-	
-	try {
-		title = getElementTextNS('','title',xml,0);
-	} catch (e) {
-		title = '';
-	}
-	
-	try {
-		tlink = getElementTextNS('','link',xml,0);
-	} catch (e) {
-		tlink = '';
-	}
-
-	try {
-		description = getElementTextNS('','description',xml,0);
-	} catch (e) {
-		description = '';
-	}
-
-	var row = tab.insertRow(index);
-
-	row.name = encodeURI(source);
-	row.setAttribute('name',encodeURI(source));
-	row.className = 'res_tr';
-
-	var c1 = row.insertCell(0);
-	c1.style.padding = "4px";
-
-	var d1 = document.createElement('div');
-	d1.style.display = "none";
-	d1.style.visibility = "hidden";
-	d1.appendChild(document.createTextNode(rank));
-
-	c1.appendChild(d1);
-
-	var s1 = document.createElement('span');
-	s1.className='title_link';
-
-	var a1 = document.createElement('a');
-	a1.href=tlink;
-	a1.appendChild(document.createTextNode(title));
-
-	s1.appendChild(a1);
-	c1.appendChild(s1);
-	c1.appendChild(document.createElement('br'));
-	
-	var s2 = document.createElement('span');
-	s2.className='desc_text';
-	s2.innerHTML = description;
-
-	c1.appendChild(s2);
-
-	var c2 = row.insertCell(1);
-	
-	var i1 = document.createElement('img');
-	i1.title= parseInt(rank) + '% Relevant';
-	i1.src=img;
-	i1.setAttribute('width','32');
-	i1.setAttribute('height','32');
-	i1.width=32;
-	i1.height=32;
-
-	c2.appendChild(i1);
+ var img = images[source];
+ var rank,title,tlink,desc;
+
+ try {
+  rank = getElementFloatNS('openIll','relevance',xml,0);
+ } catch (e) {
+  alert("error getting relevance: " + e);
+  rank = '0';
+ }
+ 
+ try {
+  title = getElementTextNS('','title',xml,0);
+ } catch (e) {
+  title = '';
+ }
+ 
+ try {
+  tlink = getElementTextNS('','link',xml,0);
+ } catch (e) {
+  tlink = '';
+ }
+
+ try {
+  description = getElementTextNS('','description',xml,0);
+ } catch (e) {
+  description = '';
+ }
+
+ var row = tab.insertRow(index);
+
+ row.name = encodeURI(source);
+ row.setAttribute('name',encodeURI(source));
+ row.className = 'res_tr';
+
+ var c1 = row.insertCell(0);
+ c1.style.padding = "4px";
+
+ var d1 = document.createElement('div');
+ d1.style.display = "none";
+ d1.style.visibility = "hidden";
+ d1.appendChild(document.createTextNode(rank));
+
+ c1.appendChild(d1);
+
+ var s1 = document.createElement('span');
+ s1.className='title_link';
+
+ var a1 = document.createElement('a');
+ a1.href=tlink;
+ a1.appendChild(document.createTextNode(title));
+
+ s1.appendChild(a1);
+ c1.appendChild(s1);
+ c1.appendChild(document.createElement('br'));
+ 
+ var s2 = document.createElement('span');
+ s2.className='desc_text';
+ s2.innerHTML = description;
+
+ c1.appendChild(s2);
+
+ var c2 = row.insertCell(1);
+ 
+ var i1 = document.createElement('img');
+ i1.title= parseInt(rank) + '% Relevant';
+ i1.src=img;
+ i1.setAttribute('width','32');
+ i1.setAttribute('height','32');
+ i1.width=32;
+ i1.height=32;
+
+ c2.appendChild(i1);
 }
 
 function create_search ( s ) {
-	var req = create_requestor();
+ var req = create_requestor();
 
 
-	req.open('GET',proxy +  encodeURIComponent(s),false);
-	req.send(null);
+ req.open('GET',proxy +  encodeURIComponent(s),false);
+ req.send(null);
 
-	try {
-		var xml = req.responseXML;
-		var u = xml.getElementsByTagName('Url');
-		if (u.length)
-			search_templates[s] = u[0].childNodes[0].nodeValue;
+ try {
+  var xml = req.responseXML;
+  var u = xml.getElementsByTagName('Url');
+  if (u.length)
+   search_templates[s] = u[0].childNodes[0].nodeValue;
 
-		var i =  xml.getElementsByTagName('Image');
-		if (i.length)
-			images[s] = i[0].childNodes[0].nodeValue;
+  var i =  xml.getElementsByTagName('Image');
+  if (i.length)
+   images[s] = i[0].childNodes[0].nodeValue;
 
-		return search_templates[s];
-	} catch (e) {
-		alert('BAD XML!\n\n' + e + '\n\n' + req.responseText);
-		search_templates[s] = null;
-		images[s] = null;
-	}
+  return search_templates[s];
+ } catch (e) {
+  alert('BAD XML!\n\n' + e + '\n\n' + req.responseText);
+  search_templates[s] = null;
+  images[s] = null;
+ }
 
 }
 
 function remove_by_name( src ) {
-	var list = document.getElementsByName(encodeURI(src));
+ var list = document.getElementsByName(encodeURI(src));
 
-	var len = list.length;
+ var len = list.length;
 
-	while (list.length)
-		list[0].parentNode.removeChild(list[0]);
+ while (list.length)
+  list[0].parentNode.removeChild(list[0]);
 }
 
 function do_submit(evt) {
-	evt = (evt) ? evt : ((window.event) ? event : null);
-	var obj = (evt && evt.srcElement)? evt.srcElement : evt.target;
-	var code = grabCharCode(evt);
-	if(code==13||code==3) {
-		insearch=true;
-		opensearch(obj.form['term'].value, true);
-	}
-	return false;
+ evt = (evt) ? evt : ((window.event) ? event : null);
+ var obj = (evt && evt.srcElement)? evt.srcElement : evt.target;
+ var code = grabCharCode(evt);
+ if(code==13||code==3) {
+  insearch=true;
+  opensearch(obj.form['term'].value, true);
+ }
+ return false;
 }
 
 
 function attach_listeners () {
-	for (var i in listening_elements) {
-		if (document.firstChild.addEventListener)
-			document.getElementById(listening_elements[i]).addEventListener('keydown',do_submit,true);
-		else
-			document.getElementById(listening_elements[i]).attachEvent('onkeydown',do_submit,true);
-	}
+ for (var i in listening_elements) {
+  if (document.firstChild.addEventListener)
+   document.getElementById(listening_elements[i]).addEventListener('keydown',do_submit,true);
+  else
+   document.getElementById(listening_elements[i]).attachEvent('onkeydown',do_submit,true);
+ }
 }
 
 function grabCharCode(evt) {
-	evt = (evt) ? evt : ((window.event) ? event : null); /* for mozilla and IE */
-	if( evt ) {
-		return (evt.charCode ? evt.charCode : ((evt.which) ? evt.which : evt.keyCode ));
-	} else {
-		return -1;
-	}
+ evt = (evt) ? evt : ((window.event) ? event : null); /* for mozilla and IE */
+ if( evt ) {
+  return (evt.charCode ? evt.charCode : ((evt.which) ? evt.which : evt.keyCode ));
+ } else {
+  return -1;
+ }
 }
 
 var listening_elements = ['term','gobutton','res_count_per','res_type'];
 
-		</script>
-	</head>
-	<body onload="attach_listeners();">
-		<br/>
-		<form>
-		<table style="border-collapse: collapse; margin: 5px;" width="100%">
-			<tr style="border-bottom: dotted black 1px;" valign="top">
-				<td align="right">Keyword Search: </td>
-				<td align="left">
-					<input type="text" name="term" id="term" value="javascript"/>
-					<input type="button" id="gobutton" value="Go!" onclick="insearch=true; opensearch(document.getElementById('term').value, true); return false;"/>
-				</td>
-				<td align="left">Hits per Source for each page: 
-					<select onchange="current_count=this.options[this.selectedIndex].value;" id="res_count_per">
-						<option value="5" selected>5</option>
-						<option value="10">10</option>
-						<option value="25">25</option>
-					</select>
-				</td>
-				<td align="left">Display style: 
-					<select id="res_type">
-						<option value="int" selected>Merged Results</option>
-						<option value="col">Separate Columns</option>
-					</select>
-				</td>
-			</tr>
-			<tr style="border-bottom: dotted black 1px;" valign="top">
-				<td align="right">Sources: </td>
-				<td colspan=3>
-					<table width="100%" style="border-collapse: collapse;">
-						<tr>
-							<td>
-								<label class="source_input">
-									<input
-										onclick="
-											if(insearch) {
-												if(this.checked) {
-													opensearch(document.getElementById('term').value, false, this.value);
-												} else {
-													remove_by_name(this.value);
-												}
-											}"
-										name="source"
-										type="checkbox"
-										value="http://gapines.org/opensearch.xml"
-										checked>GPLS Pines
-								</label>
-							</td>
-							<td>
-								<label class="source_input">
-									<input
-										onclick="
-											if(insearch) {
-												if(this.checked) {
-													opensearch(document.getElementById('term').value, false, this.value);
-												} else {
-													remove_by_name(this.value);
-												}
-											}"
-										name="source"
-										type="checkbox"
-										value="http://search.athenscounty.lib.oh.us/cgi-bin/koha/opensearchdescription">NPL/Koha
-								</label>
-							</td>
-							<td>
-								<label class="source_input">
-									<input
-										onclick="
-											if(insearch) {
-												if(this.checked) {
-													opensearch(document.getElementById('term').value, false, this.value);
-												} else {
-													remove_by_name(this.value);
-												}
-											}"
-										name="source"
-										type="checkbox"
-										value="http://www.koders.com/search/KodersSourceCodeSearchDescription.xml">Koders Source Code
-								</label>
-							</td>
-							<td>
-						</tr>
-						<tr>
-							<td>
-								<label class="source_input">
-									<input
-										onclick="
-											if(insearch) {
-												if(this.checked) {
-													opensearch(document.getElementById('term').value, false, this.value);
-												} else {
-													remove_by_name(this.value);
-												}
-											}"
-										name="source"
-										type="checkbox"
-										value="http://search.library.gatech.edu/opensearch/osdd-gil.xml"
-										checked>GIL Universal Catalog
-								</label>
-							</td>
-							<td>
-								<label class="source_input">
-									<input
-										onclick="
-											if(insearch) {
-												if(this.checked) {
-													opensearch(document.getElementById('term').value, false, this.value);
-												} else {
-													remove_by_name(this.value);
-												}
-											}"
-										name="source"
-										type="checkbox"
-										value="http://redlightgreen.com/ucwprod/web/opensearchDescription.xml">RedLightGreen
-								</label>
-							</td>
-							<td>
-								<label class="source_input">
-									<input
-										onclick="
-											if(insearch) {
-												if(this.checked) {
-													opensearch(document.getElementById('term').value, false, this.value);
-												} else {
-													remove_by_name(this.value);
-												}
-											}"
-										name="source"
-										type="checkbox"
-										value="http://www.itpapers.com/itpaperssearchdescription.xml">ITPapers
-								</label>
-							</td>
-					<!-- <input name="source" type="checkbox" value="http://www.webdevref.com/blog/opensearchdescription.xml">WebDefRef -->
-						</tr>
-						<tr>
-							<td>
-								<label class="source_input">
-									<input
-										onclick="
-											if(insearch) {
-												if(this.checked) {
-													opensearch(document.getElementById('term').value, false, this.value);
-												} else {
-													remove_by_name(this.value);
-												}
-											}"
-										name="source"
-										checked
-										type="checkbox"
-										value="http://search.library.gatech.edu/opensearch/osdd.xml">Georgia Tech Catalog
-								</label>
-							</td>
-							<td>
-								<label class="source_input">
-									<input
-										onclick="
-											if(insearch) {
-												if(this.checked) {
-													opensearch(document.getElementById('term').value, false, this.value);
-												} else {
-													remove_by_name(this.value);
-												}
-											}"
-										name="source"
-										type="checkbox"
-										value="http://cnx.rice.edu/content/opensearchdescription">rice.edu Connexions
-								</label>
-							</td>
-							<td>
-								<label class="source_input">
-									<input
-										onclick="
-											if(insearch) {
-												if(this.checked) {
-													opensearch(document.getElementById('term').value, false, this.value);
-												} else {
-													remove_by_name(this.value);
-												}
-											}"
-										name="source"
-										type="checkbox"
-										value="http://lib-cufts.lib.sfu.ca/CUFTS/opensearchjournal.xml">SFU CUFTS
-								</label>
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
-			<tr>
-				<td>Total results: </td>
-				<td colspan=2 id="total"></td>
-			</tr>
-			<tr>
-				<td>Current page: </td>
-				<td id="page_label"></td>
-				<td>
-					<button
-						class='hide'
-						id='prev_button'
-						onclick="
-							if (this.className != 'hide') {
-								current_startPage -= 1;
-								opensearch(document.getElementById('term').value);
-							}
-							return false;">Previous Page
-					</button> ...
-					<button
-						class='hide'
-						id='next_button'
-						onclick="
-							if (this.className != 'hide') {
-								current_startPage += 1;
-								opensearch(document.getElementById('term').value);
-							}
-							return false;">Next Page
-					</button>
-				</td>
-			</tr>
-		</table>
-		</form>
-
-		<hr/>
-		<br/>
-		<table id="results" width="100%">
-			<tr>
-				<td id="int_res_hide" class="noshow" width="100%">
-					<table width="100%">
-						<caption class="header">Merged search results</caption>
-						<tr>
-							<td width="100%">
-								<table id='int_res' class="res_table" width="100%"></table>
-							</td>
-						</tr>
-					</table>
-				</td>
-				<td id='col_res_hide' class="noshow">
-					<table>
-						<caption class="header">Unranked search results</caption>
-						<tr>
-							<td>
-								<table id='col_res' class="res_table"></table>
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
-		</table>
-		<div id="result_sources"></div>
-		<br/>
-	</body>
+  </script>
+ </head>
+ <body onload="attach_listeners();">
+  <br/>
+  <form>
+  <table style="border-collapse: collapse; margin: 5px;" width="100%">
+   <tr style="border-bottom: dotted black 1px;" valign="top">
+    <td align="right">Keyword Search: </td>
+    <td align="left">
+     <input type="text" name="term" id="term" value="javascript"/>
+     <input type="button" id="gobutton" value="Go!" onclick="insearch=true; opensearch(document.getElementById('term').value, true); return false;"/>
+    </td>
+    <td align="left">Hits per Source for each page: 
+     <select onchange="current_count=this.options[this.selectedIndex].value;" id="res_count_per">
+      <option value="5" selected>5</option>
+      <option value="10">10</option>
+      <option value="25">25</option>
+     </select>
+    </td>
+    <td align="left">Display style: 
+     <select id="res_type">
+      <option value="int" selected>Merged Results</option>
+      <option value="col">Separate Columns</option>
+     </select>
+    </td>
+   </tr>
+   <tr style="border-bottom: dotted black 1px;" valign="top">
+    <td align="right">Sources: </td>
+    <td colspan=3>
+     <table width="100%" style="border-collapse: collapse;">
+      <tr>
+       <td>
+        <label class="source_input">
+         <input
+          onclick="
+           if(insearch) {
+            if(this.checked) {
+             opensearch(document.getElementById('term').value, false, this.value);
+            } else {
+             remove_by_name(this.value);
+            }
+           }"
+          name="source"
+          type="checkbox"
+          value="http://gapines.org/opensearch.xml"
+          checked>GPLS Pines
+        </label>
+       </td>
+       <td>
+        <label class="source_input">
+         <input
+          onclick="
+           if(insearch) {
+            if(this.checked) {
+             opensearch(document.getElementById('term').value, false, this.value);
+            } else {
+             remove_by_name(this.value);
+            }
+           }"
+          name="source"
+          type="checkbox"
+          value="http://search.athenscounty.lib.oh.us/cgi-bin/koha/opensearchdescription">NPL/Koha
+        </label>
+       </td>
+       <td>
+        <label class="source_input">
+         <input
+          onclick="
+           if(insearch) {
+            if(this.checked) {
+             opensearch(document.getElementById('term').value, false, this.value);
+            } else {
+             remove_by_name(this.value);
+            }
+           }"
+          name="source"
+          type="checkbox"
+          value="http://www.koders.com/search/KodersSourceCodeSearchDescription.xml">Koders Source Code
+        </label>
+       </td>
+       <td>
+      </tr>
+      <tr>
+       <td>
+        <label class="source_input">
+         <input
+          onclick="
+           if(insearch) {
+            if(this.checked) {
+             opensearch(document.getElementById('term').value, false, this.value);
+            } else {
+             remove_by_name(this.value);
+            }
+           }"
+          name="source"
+          type="checkbox"
+          value="http://search.library.gatech.edu/opensearch/osdd-gil.xml"
+          checked>GIL Universal Catalog
+        </label>
+       </td>
+       <td>
+        <label class="source_input">
+         <input
+          onclick="
+           if(insearch) {
+            if(this.checked) {
+             opensearch(document.getElementById('term').value, false, this.value);
+            } else {
+             remove_by_name(this.value);
+            }
+           }"
+          name="source"
+          type="checkbox"
+          value="http://redlightgreen.com/ucwprod/web/opensearchDescription.xml">RedLightGreen
+        </label>
+       </td>
+       <td>
+        <label class="source_input">
+         <input
+          onclick="
+           if(insearch) {
+            if(this.checked) {
+             opensearch(document.getElementById('term').value, false, this.value);
+            } else {
+             remove_by_name(this.value);
+            }
+           }"
+          name="source"
+          type="checkbox"
+          value="http://www.itpapers.com/itpaperssearchdescription.xml">ITPapers
+        </label>
+       </td>
+     <!-- <input name="source" type="checkbox" value="http://www.webdevref.com/blog/opensearchdescription.xml">WebDefRef -->
+      </tr>
+      <tr>
+       <td>
+        <label class="source_input">
+         <input
+          onclick="
+           if(insearch) {
+            if(this.checked) {
+             opensearch(document.getElementById('term').value, false, this.value);
+            } else {
+             remove_by_name(this.value);
+            }
+           }"
+          name="source"
+          checked
+          type="checkbox"
+          value="http://search.library.gatech.edu/opensearch/osdd.xml">Georgia Tech Catalog
+        </label>
+       </td>
+       <td>
+        <label class="source_input">
+         <input
+          onclick="
+           if(insearch) {
+            if(this.checked) {
+             opensearch(document.getElementById('term').value, false, this.value);
+            } else {
+             remove_by_name(this.value);
+            }
+           }"
+          name="source"
+          type="checkbox"
+          value="http://cnx.rice.edu/content/opensearchdescription">rice.edu Connexions
+        </label>
+       </td>
+       <td>
+        <label class="source_input">
+         <input
+          onclick="
+           if(insearch) {
+            if(this.checked) {
+             opensearch(document.getElementById('term').value, false, this.value);
+            } else {
+             remove_by_name(this.value);
+            }
+           }"
+          name="source"
+          type="checkbox"
+          value="http://lib-cufts.lib.sfu.ca/CUFTS/opensearchjournal.xml">SFU CUFTS
+        </label>
+       </td>
+      </tr>
+     </table>
+    </td>
+   </tr>
+   <tr>
+    <td>Total results: </td>
+    <td colspan=2 id="total"></td>
+   </tr>
+   <tr>
+    <td>Current page: </td>
+    <td id="page_label"></td>
+    <td>
+     <button
+      class='hide'
+      id='prev_button'
+      onclick="
+       if (this.className != 'hide') {
+        current_startPage -= 1;
+        opensearch(document.getElementById('term').value);
+       }
+       return false;">Previous Page
+     </button> ...
+     <button
+      class='hide'
+      id='next_button'
+      onclick="
+       if (this.className != 'hide') {
+        current_startPage += 1;
+        opensearch(document.getElementById('term').value);
+       }
+       return false;">Next Page
+     </button>
+    </td>
+   </tr>
+  </table>
+  </form>
+
+  <hr/>
+  <br/>
+  <table id="results" width="100%">
+   <tr>
+    <td id="int_res_hide" class="noshow" width="100%">
+     <table width="100%">
+      <caption class="header">Merged search results</caption>
+      <tr>
+       <td width="100%">
+        <table id='int_res' class="res_table" width="100%"></table>
+       </td>
+      </tr>
+     </table>
+    </td>
+    <td id='col_res_hide' class="noshow">
+     <table>
+      <caption class="header">Unranked search results</caption>
+      <tr>
+       <td>
+        <table id='col_res' class="res_table"></table>
+       </td>
+      </tr>
+     </table>
+    </td>
+   </tr>
+  </table>
+  <div id="result_sources"></div>
+  <br/>
+ </body>
 </html>
diff --git a/Open-ILS/src/javascript/backend/catalog/biblio_fingerprint.js b/Open-ILS/src/javascript/backend/catalog/biblio_fingerprint.js
index 83992c239c..3a061a47f2 100644
--- a/Open-ILS/src/javascript/backend/catalog/biblio_fingerprint.js
+++ b/Open-ILS/src/javascript/backend/catalog/biblio_fingerprint.js
@@ -21,89 +21,89 @@ var t = '';
 var a = '';
 
 try {
-	// first, related items entries (700t)
-	var t = marcdoc.datafield.( @tag == '700' ).subfield.( @code == 't');
-	if (!t.length()) throw "No title in related item added entry (700)";
-	
-	a = t.parent().subfield.( @code == 'a' );
+ // first, related items entries (700t)
+ var t = marcdoc.datafield.( @tag == '700' ).subfield.( @code == 't');
+ if (!t.length()) throw "No title in related item added entry (700)";
+ 
+ a = t.parent().subfield.( @code == 'a' );
 
-	quality += 10;
+ quality += 10;
 
-	log_debug("title: " + t);
-	log_debug("author: " + a);
+ log_debug("title: " + t);
+ log_debug("author: " + a);
 } catch(e) {
-	log_debug(e);
-	log_debug("Looking in main entries");
-
-	var _t = '';
-	try {
-		try { 
-			try { // uniform title
-				_t = marcdoc.datafield.( @tag == '240' ).subfield.( @code == 'a' );
-				if (!_t.length()) throw "No title in 240";
-			} catch(e) { // translation of title
-				log_debug(e);
-				_t = marcdoc.datafield.( @tag == '242' ).subfield.( @code == 'a' );
-				if (!_t.length()) throw "No title in 242";
-			}
-		} catch(e) { // alternate title (not as note) 
-			log_debug(e);
-			_t = marcdoc.datafield.( @tag == '246' && !(@ind1.match(/0|1/)) ).subfield.( @code == 'a' );
-			if (!_t.length()) throw "No title in 246";
-		}
-
-		t = _t[0];
-		log_debug("Title: " + t);
-		quality += 25;
-
-	} catch(e) {
-		log_debug(e);
-		log_debug("Using title proper (245a)");
-		t = marcdoc.datafield.( @tag == '245' ).subfield.( @code == 'a' );
-		t = t[0];
-		quality += 10;
-	}
-
-	try {
-		var _a = marcdoc.datafield.( @tag == '100' || @tag == '110' || @tag == '111').subfield.( @code == 'a' );
-		if (!_a.length()) throw "No author in 100, 110, 111";
-		
-		a = _a[0];
-		log_debug("Author: " + a);
-
-	} catch(e) {
-		log_debug(e);
-		log_debug("Trying to find a publisher (260b)");
-		a = marcdoc.datafield.( @tag == '260' ).subfield.( @code == 'b' );
-		a = a[0];
-	}
+ log_debug(e);
+ log_debug("Looking in main entries");
+
+ var _t = '';
+ try {
+  try { 
+   try { // uniform title
+    _t = marcdoc.datafield.( @tag == '240' ).subfield.( @code == 'a' );
+    if (!_t.length()) throw "No title in 240";
+   } catch(e) { // translation of title
+    log_debug(e);
+    _t = marcdoc.datafield.( @tag == '242' ).subfield.( @code == 'a' );
+    if (!_t.length()) throw "No title in 242";
+   }
+  } catch(e) { // alternate title (not as note) 
+   log_debug(e);
+   _t = marcdoc.datafield.( @tag == '246' && !(@ind1.match(/0|1/)) ).subfield.( @code == 'a' );
+   if (!_t.length()) throw "No title in 246";
+  }
+
+  t = _t[0];
+  log_debug("Title: " + t);
+  quality += 25;
+
+ } catch(e) {
+  log_debug(e);
+  log_debug("Using title proper (245a)");
+  t = marcdoc.datafield.( @tag == '245' ).subfield.( @code == 'a' );
+  t = t[0];
+  quality += 10;
+ }
+
+ try {
+  var _a = marcdoc.datafield.( @tag == '100' || @tag == '110' || @tag == '111').subfield.( @code == 'a' );
+  if (!_a.length()) throw "No author in 100, 110, 111";
+  
+  a = _a[0];
+  log_debug("Author: " + a);
+
+ } catch(e) {
+  log_debug(e);
+  log_debug("Trying to find a publisher (260b)");
+  a = marcdoc.datafield.( @tag == '260' ).subfield.( @code == 'b' );
+  a = a[0];
+ }
 }
 
 if (rtype != 'BKS') {
-	quality += marcdoc.datafield.length() / 2;
+ quality += marcdoc.datafield.length() / 2;
 } else {
-	quality += 40 + marcdoc.datafield.length();
+ quality += 40 + marcdoc.datafield.length();
 }
 
 var title = t;
 if (!title) {
-	log_debug("no title found");
-	title = '';
+ log_debug("no title found");
+ title = '';
 } else {
-	title = title.toString();
+ title = title.toString();
 }
 
 title = title
-	.toLowerCase()
-	.replace(/\[.+?\]/,'')
-	.replace(/\bthe\b|\ban?d?\b|\W+/g,'');
+ .toLowerCase()
+ .replace(/\[.+?\]/,'')
+ .replace(/\bthe\b|\ban?d?\b|\W+/g,'');
 
 
 var author = a;
 if (!author) {
-	author = '';
+ author = '';
 } else {
-	author = author.toString();
+ author = author.toString();
 }
 
 author = author.toLowerCase().replace(/^\s*(\w+).*?$/,"$1");
@@ -111,26 +111,26 @@ author = author.toLowerCase().replace(/^\s*(\w+).*?$/,"$1");
 environment.result.fingerprint = title + author;
 
 if (marcdoc.datafield.(@tag == '040').subfield.(@code == 'a').toString().match(/DLC/)) {
-	quality += 5;
-	log_debug( 'got DLC bump' );
+ quality += 5;
+ log_debug( 'got DLC bump' );
 }
 
 if (marcdoc.datafield.(@tag == '039').subfield.(@code == 'b').toString().match(/oclc/i)) {
-	quality += 10;
-	log_debug( 'got OCLC source bump' );
-	
+ quality += 10;
+ log_debug( 'got OCLC source bump' );
+ 
 } else if (marcdoc.datafield.(@tag == '039').subfield.(@code == 'b').toString().match(/isxn/i)) {
-	quality += 5;
-	log_debug( 'got ISxN source bump' );
-	
+ quality += 5;
+ log_debug( 'got ISxN source bump' );
+ 
 } else if (marcdoc.datafield.(@tag == '039').subfield.(@code == 'b').toString().match(/local/i)) {
-	quality += 1;
-	log_debug( 'got Local source bump' );
+ quality += 1;
+ log_debug( 'got Local source bump' );
 }
 
 if (extractFixedField(marcdoc, 'Lang') == 'eng') {
-	quality += 100;
-	log_debug( 'got language bump for ' + extractFixedField(marcdoc, 'Lang') );
+ quality += 100;
+ log_debug( 'got language bump for ' + extractFixedField(marcdoc, 'Lang') );
 }
 
 
diff --git a/Open-ILS/src/javascript/backend/catalog/fixed_fields.js b/Open-ILS/src/javascript/backend/catalog/fixed_fields.js
index 4e7871c882..4eb0321a45 100644
--- a/Open-ILS/src/javascript/backend/catalog/fixed_fields.js
+++ b/Open-ILS/src/javascript/backend/catalog/fixed_fields.js
@@ -1,277 +1,277 @@
 
 var rec_type = {
-        BKS : { Type : /[at]{1}/,	BLvl : /[acdm]{1}/ },
-	SER : { Type : /[a]{1}/,	BLvl : /[bsi]{1}/ },
-	VIS : { Type : /[gkro]{1}/,	BLvl : /[abcdmsi]{1}/ },
-	MIX : { Type : /[p]{1}/,	BLvl : /[cdi]{1}/ },
-	MAP : { Type : /[ef]{1}/,	BLvl : /[abcdmsi]{1}/ },
-	SCO : { Type : /[cd]{1}/,	BLvl : /[abcdmsi]{1}/ },
-	REC : { Type : /[ij]{1}/,	BLvl : /[abcdmsi]{1}/ },
-	COM : { Type : /[m]{1}/,	BLvl : /[abcdmsi]{1}/ }
+        BKS : { Type : /[at]{1}/, BLvl : /[acdm]{1}/ },
+ SER : { Type : /[a]{1}/, BLvl : /[bsi]{1}/ },
+ VIS : { Type : /[gkro]{1}/, BLvl : /[abcdmsi]{1}/ },
+ MIX : { Type : /[p]{1}/, BLvl : /[cdi]{1}/ },
+ MAP : { Type : /[ef]{1}/, BLvl : /[abcdmsi]{1}/ },
+ SCO : { Type : /[cd]{1}/, BLvl : /[abcdmsi]{1}/ },
+ REC : { Type : /[ij]{1}/, BLvl : /[abcdmsi]{1}/ },
+ COM : { Type : /[m]{1}/, BLvl : /[abcdmsi]{1}/ }
 };
 
 var ff_pos = {
-	Ctry : {
-		_8 : {
-			BKS : {start : 15, len : 3, def : ' ' },
-			SER : {start : 15, len : 3, def : ' ' },
-			VIS : {start : 15, len : 3, def : ' ' },
-			MIX : {start : 15, len : 3, def : ' ' },
-			MAP : {start : 15, len : 3, def : ' ' },
-			SCO : {start : 15, len : 3, def : ' ' },
-			REC : {start : 15, len : 3, def : ' ' },
-			COM : {start : 15, len : 3, def : ' ' },
-		}
-	},
-	Lang : {
-		_8 : {
-			BKS : {start : 35, len : 3, def : ' ' },
-			SER : {start : 35, len : 3, def : ' ' },
-			VIS : {start : 35, len : 3, def : ' ' },
-			MIX : {start : 35, len : 3, def : ' ' },
-			MAP : {start : 35, len : 3, def : ' ' },
-			SCO : {start : 35, len : 3, def : ' ' },
-			REC : {start : 35, len : 3, def : ' ' },
-			COM : {start : 35, len : 3, def : ' ' },
-		}
-	},
-	MRec : {
-		_8 : {
-			BKS : {start : 38, len : 1, def : ' ' },
-			SER : {start : 38, len : 1, def : ' ' },
-			VIS : {start : 38, len : 1, def : ' ' },
-			MIX : {start : 38, len : 1, def : ' ' },
-			MAP : {start : 38, len : 1, def : ' ' },
-			SCO : {start : 38, len : 1, def : ' ' },
-			REC : {start : 38, len : 1, def : ' ' },
-			COM : {start : 38, len : 1, def : ' ' },
-		}
-	},
-	DtSt : {
-		_8 : {
-			BKS : {start : 6, len : 1, def : ' ' },
-			SER : {start : 6, len : 1, def : 'c' },
-			VIS : {start : 6, len : 1, def : ' ' },
-			MIX : {start : 6, len : 1, def : ' ' },
-			MAP : {start : 6, len : 1, def : ' ' },
-			SCO : {start : 6, len : 1, def : ' ' },
-			REC : {start : 6, len : 1, def : ' ' },
-			COM : {start : 6, len : 1, def : ' ' },
-		}
-	},
-	Type : {
-		ldr : {
-			BKS : {start : 6, len : 1, def : 'a' },
-			SER : {start : 6, len : 1, def : 'a' },
-			VIS : {start : 6, len : 1, def : 'g' },
-			MIX : {start : 6, len : 1, def : 'p' },
-			MAP : {start : 6, len : 1, def : 'e' },
-			SCO : {start : 6, len : 1, def : 'c' },
-			REC : {start : 6, len : 1, def : 'i' },
-			COM : {start : 6, len : 1, def : 'm' },
-		}
-	},
-	Ctrl : {
-		ldr : {
-			BKS : {start : 8, len : 1, def : ' ' },
-			SER : {start : 8, len : 1, def : ' ' },
-			VIS : {start : 8, len : 1, def : ' ' },
-			MIX : {start : 8, len : 1, def : ' ' },
-			MAP : {start : 8, len : 1, def : ' ' },
-			SCO : {start : 8, len : 1, def : ' ' },
-			REC : {start : 8, len : 1, def : ' ' },
-			COM : {start : 8, len : 1, def : ' ' },
-		}
-	},
-	BLvl : {
-		ldr : {
-			BKS : {start : 7, len : 1, def : 'm' },
-			SER : {start : 7, len : 1, def : 's' },
-			VIS : {start : 7, len : 1, def : 'm' },
-			MIX : {start : 7, len : 1, def : 'c' },
-			MAP : {start : 7, len : 1, def : 'm' },
-			SCO : {start : 7, len : 1, def : 'm' },
-			REC : {start : 7, len : 1, def : 'm' },
-			COM : {start : 7, len : 1, def : 'm' },
-		}
-	},
-	Desc : {
-		ldr : {
-			BKS : {start : 18, len : 1, def : ' ' },
-			SER : {start : 18, len : 1, def : ' ' },
-			VIS : {start : 18, len : 1, def : ' ' },
-			MIX : {start : 18, len : 1, def : ' ' },
-			MAP : {start : 18, len : 1, def : ' ' },
-			SCO : {start : 18, len : 1, def : ' ' },
-			REC : {start : 18, len : 1, def : ' ' },
-			COM : {start : 18, len : 1, def : ' ' },
-		}
-	},
-	ELvl : {
-		ldr : {
-			BKS : {start : 17, len : 1, def : ' ' },
-			SER : {start : 17, len : 1, def : ' ' },
-			VIS : {start : 17, len : 1, def : ' ' },
-			MIX : {start : 17, len : 1, def : ' ' },
-			MAP : {start : 17, len : 1, def : ' ' },
-			SCO : {start : 17, len : 1, def : ' ' },
-			REC : {start : 17, len : 1, def : ' ' },
-			COM : {start : 17, len : 1, def : ' ' },
-		}
-	},
-	TMat : {
-		_8 : {
-			VIS : {start : 33, len : 1, def : ' ' },
-		},
-		_6 : {
-			VIS : {start : 16, len : 1, def : ' ' },
-		}
-	},
-	Indx : {
-		_8 : {
-			BKS : {start : 31, len : 1, def : '0' },
-			MAP : {start : 31, len : 1, def : '0' },
-		},
-		_6 : {
-			BKS : {start : 14, len : 1, def : '0' },
-			MAP : {start : 14, len : 1, def : '0' },
-		}
-	},
-	Date1 : {
-		_8 : {
-			BKS : {start : 7, len : 4, def : ' ' },
-			SER : {start : 7, len : 4, def : ' ' },
-			VIS : {start : 7, len : 4, def : ' ' },
-			MIX : {start : 7, len : 4, def : ' ' },
-			MAP : {start : 7, len : 4, def : ' ' },
-			SCO : {start : 7, len : 4, def : ' ' },
-			REC : {start : 7, len : 4, def : ' ' },
-			COM : {start : 7, len : 4, def : ' ' },
-		},
-	},
-	Date2 : {
-		_8 : {
-			BKS : {start : 11, len : 4, def : ' ' },
-			SER : {start : 11, len : 4, def : '9' },
-			VIS : {start : 11, len : 4, def : ' ' },
-			MIX : {start : 11, len : 4, def : ' ' },
-			MAP : {start : 11, len : 4, def : ' ' },
-			SCO : {start : 11, len : 4, def : ' ' },
-			REC : {start : 11, len : 4, def : ' ' },
-			COM : {start : 11, len : 4, def : ' ' },
-		},
-	},
-	LitF : {
-		_8 : {
-			BKS : {start : 33, len : 1, def : '0' },
-		},
-		_6 : {
-			BKS : {start : 16, len : 1, def : '0' },
-		}
-	},
-	Biog : {
-		_8 : {
-			BKS : {start : 34, len : 1, def : ' ' },
-		},
-		_6 : {
-			BKS : {start : 17, len : 1, def : ' ' },
-		}
-	},
-	Ills : {
-		_8 : {
-			BKS : {start : 18, len : 4, def : ' ' },
-		},
-		_6 : {
-			BKS : {start : 1, len : 4, def : ' ' },
-		}
-	},
-	Fest : {
-		_8 : {
-			BKS : {start : 30, len : 1, def : '0' },
-		},
-		_6 : {
-			BKS : {start : 13, len : 1, def : '0' },
-		}
-	},
-	Conf : {
-		_8 : {
-			BKS : {start : 24, len : 4, def : ' ' },
-			SER : {start : 25, len : 3, def : ' ' },
-		},
-		_6 : {
-			BKS : {start : 7, len : 4, def : ' ' },
-			SER : {start : 8, len : 3, def : ' ' },
-		}
-	},
-	GPub : {
-		_8 : {
-			BKS : {start : 28, len : 1, def : ' ' },
-			SER : {start : 28, len : 1, def : ' ' },
-			VIS : {start : 28, len : 1, def : ' ' },
-			MAP : {start : 28, len : 1, def : ' ' },
-			COM : {start : 28, len : 1, def : ' ' },
-		},
-		_6 : {
-			BKS : {start : 11, len : 1, def : ' ' },
-			SER : {start : 11, len : 1, def : ' ' },
-			VIS : {start : 11, len : 1, def : ' ' },
-			MAP : {start : 11, len : 1, def : ' ' },
-			COM : {start : 11, len : 1, def : ' ' },
-		}
-	},
-	Audn : {
-		_8 : {
-			BKS : {start : 22, len : 1, def : ' ' },
-			SER : {start : 22, len : 1, def : ' ' },
-			VIS : {start : 22, len : 1, def : ' ' },
-			SCO : {start : 22, len : 1, def : ' ' },
-			REC : {start : 22, len : 1, def : ' ' },
-			COM : {start : 22, len : 1, def : ' ' },
-		},
-		_6 : {
-			BKS : {start : 5, len : 1, def : ' ' },
-			SER : {start : 5, len : 1, def : ' ' },
-			VIS : {start : 5, len : 1, def : ' ' },
-			SCO : {start : 5, len : 1, def : ' ' },
-			REC : {start : 5, len : 1, def : ' ' },
-			COM : {start : 5, len : 1, def : ' ' },
-		}
-	},
-	Form : {
-		_8 : {
-			BKS : {start : 23, len : 1, def : ' ' },
-			SER : {start : 23, len : 1, def : ' ' },
-			VIS : {start : 29, len : 1, def : ' ' },
-			MIX : {start : 23, len : 1, def : ' ' },
-			MAP : {start : 29, len : 1, def : ' ' },
-			SCO : {start : 23, len : 1, def : ' ' },
-			REC : {start : 23, len : 1, def : ' ' },
-		},
-		_6 : {
-			BKS : {start : 6, len : 1, def : ' ' },
-			SER : {start : 6, len : 1, def : ' ' },
-			VIS : {start : 12, len : 1, def : ' ' },
-			MIX : {start : 6, len : 1, def : ' ' },
-			MAP : {start : 12, len : 1, def : ' ' },
-			SCO : {start : 6, len : 1, def : ' ' },
-			REC : {start : 6, len : 1, def : ' ' },
-		}
-	},
-	'S/L' : {
-		_8 : {
-			SER : {start : 34, len : 1, def : '0' },
-		},
-		_6 : {
-			SER : {start : 17, len : 1, def : '0' },
-		}
-	},
-	'Alph' : {
-		_8 : {
-			SER : {start : 33, len : 1, def : ' ' },
-		},
-		_6 : {
-			SER : {start : 16, len : 1, def : ' ' },
-		}
-	},
+ Ctry : {
+  _8 : {
+   BKS : {start : 15, len : 3, def : ' ' },
+   SER : {start : 15, len : 3, def : ' ' },
+   VIS : {start : 15, len : 3, def : ' ' },
+   MIX : {start : 15, len : 3, def : ' ' },
+   MAP : {start : 15, len : 3, def : ' ' },
+   SCO : {start : 15, len : 3, def : ' ' },
+   REC : {start : 15, len : 3, def : ' ' },
+   COM : {start : 15, len : 3, def : ' ' },
+  }
+ },
+ Lang : {
+  _8 : {
+   BKS : {start : 35, len : 3, def : ' ' },
+   SER : {start : 35, len : 3, def : ' ' },
+   VIS : {start : 35, len : 3, def : ' ' },
+   MIX : {start : 35, len : 3, def : ' ' },
+   MAP : {start : 35, len : 3, def : ' ' },
+   SCO : {start : 35, len : 3, def : ' ' },
+   REC : {start : 35, len : 3, def : ' ' },
+   COM : {start : 35, len : 3, def : ' ' },
+  }
+ },
+ MRec : {
+  _8 : {
+   BKS : {start : 38, len : 1, def : ' ' },
+   SER : {start : 38, len : 1, def : ' ' },
+   VIS : {start : 38, len : 1, def : ' ' },
+   MIX : {start : 38, len : 1, def : ' ' },
+   MAP : {start : 38, len : 1, def : ' ' },
+   SCO : {start : 38, len : 1, def : ' ' },
+   REC : {start : 38, len : 1, def : ' ' },
+   COM : {start : 38, len : 1, def : ' ' },
+  }
+ },
+ DtSt : {
+  _8 : {
+   BKS : {start : 6, len : 1, def : ' ' },
+   SER : {start : 6, len : 1, def : 'c' },
+   VIS : {start : 6, len : 1, def : ' ' },
+   MIX : {start : 6, len : 1, def : ' ' },
+   MAP : {start : 6, len : 1, def : ' ' },
+   SCO : {start : 6, len : 1, def : ' ' },
+   REC : {start : 6, len : 1, def : ' ' },
+   COM : {start : 6, len : 1, def : ' ' },
+  }
+ },
+ Type : {
+  ldr : {
+   BKS : {start : 6, len : 1, def : 'a' },
+   SER : {start : 6, len : 1, def : 'a' },
+   VIS : {start : 6, len : 1, def : 'g' },
+   MIX : {start : 6, len : 1, def : 'p' },
+   MAP : {start : 6, len : 1, def : 'e' },
+   SCO : {start : 6, len : 1, def : 'c' },
+   REC : {start : 6, len : 1, def : 'i' },
+   COM : {start : 6, len : 1, def : 'm' },
+  }
+ },
+ Ctrl : {
+  ldr : {
+   BKS : {start : 8, len : 1, def : ' ' },
+   SER : {start : 8, len : 1, def : ' ' },
+   VIS : {start : 8, len : 1, def : ' ' },
+   MIX : {start : 8, len : 1, def : ' ' },
+   MAP : {start : 8, len : 1, def : ' ' },
+   SCO : {start : 8, len : 1, def : ' ' },
+   REC : {start : 8, len : 1, def : ' ' },
+   COM : {start : 8, len : 1, def : ' ' },
+  }
+ },
+ BLvl : {
+  ldr : {
+   BKS : {start : 7, len : 1, def : 'm' },
+   SER : {start : 7, len : 1, def : 's' },
+   VIS : {start : 7, len : 1, def : 'm' },
+   MIX : {start : 7, len : 1, def : 'c' },
+   MAP : {start : 7, len : 1, def : 'm' },
+   SCO : {start : 7, len : 1, def : 'm' },
+   REC : {start : 7, len : 1, def : 'm' },
+   COM : {start : 7, len : 1, def : 'm' },
+  }
+ },
+ Desc : {
+  ldr : {
+   BKS : {start : 18, len : 1, def : ' ' },
+   SER : {start : 18, len : 1, def : ' ' },
+   VIS : {start : 18, len : 1, def : ' ' },
+   MIX : {start : 18, len : 1, def : ' ' },
+   MAP : {start : 18, len : 1, def : ' ' },
+   SCO : {start : 18, len : 1, def : ' ' },
+   REC : {start : 18, len : 1, def : ' ' },
+   COM : {start : 18, len : 1, def : ' ' },
+  }
+ },
+ ELvl : {
+  ldr : {
+   BKS : {start : 17, len : 1, def : ' ' },
+   SER : {start : 17, len : 1, def : ' ' },
+   VIS : {start : 17, len : 1, def : ' ' },
+   MIX : {start : 17, len : 1, def : ' ' },
+   MAP : {start : 17, len : 1, def : ' ' },
+   SCO : {start : 17, len : 1, def : ' ' },
+   REC : {start : 17, len : 1, def : ' ' },
+   COM : {start : 17, len : 1, def : ' ' },
+  }
+ },
+ TMat : {
+  _8 : {
+   VIS : {start : 33, len : 1, def : ' ' },
+  },
+  _6 : {
+   VIS : {start : 16, len : 1, def : ' ' },
+  }
+ },
+ Indx : {
+  _8 : {
+   BKS : {start : 31, len : 1, def : '0' },
+   MAP : {start : 31, len : 1, def : '0' },
+  },
+  _6 : {
+   BKS : {start : 14, len : 1, def : '0' },
+   MAP : {start : 14, len : 1, def : '0' },
+  }
+ },
+ Date1 : {
+  _8 : {
+   BKS : {start : 7, len : 4, def : ' ' },
+   SER : {start : 7, len : 4, def : ' ' },
+   VIS : {start : 7, len : 4, def : ' ' },
+   MIX : {start : 7, len : 4, def : ' ' },
+   MAP : {start : 7, len : 4, def : ' ' },
+   SCO : {start : 7, len : 4, def : ' ' },
+   REC : {start : 7, len : 4, def : ' ' },
+   COM : {start : 7, len : 4, def : ' ' },
+  },
+ },
+ Date2 : {
+  _8 : {
+   BKS : {start : 11, len : 4, def : ' ' },
+   SER : {start : 11, len : 4, def : '9' },
+   VIS : {start : 11, len : 4, def : ' ' },
+   MIX : {start : 11, len : 4, def : ' ' },
+   MAP : {start : 11, len : 4, def : ' ' },
+   SCO : {start : 11, len : 4, def : ' ' },
+   REC : {start : 11, len : 4, def : ' ' },
+   COM : {start : 11, len : 4, def : ' ' },
+  },
+ },
+ LitF : {
+  _8 : {
+   BKS : {start : 33, len : 1, def : '0' },
+  },
+  _6 : {
+   BKS : {start : 16, len : 1, def : '0' },
+  }
+ },
+ Biog : {
+  _8 : {
+   BKS : {start : 34, len : 1, def : ' ' },
+  },
+  _6 : {
+   BKS : {start : 17, len : 1, def : ' ' },
+  }
+ },
+ Ills : {
+  _8 : {
+   BKS : {start : 18, len : 4, def : ' ' },
+  },
+  _6 : {
+   BKS : {start : 1, len : 4, def : ' ' },
+  }
+ },
+ Fest : {
+  _8 : {
+   BKS : {start : 30, len : 1, def : '0' },
+  },
+  _6 : {
+   BKS : {start : 13, len : 1, def : '0' },
+  }
+ },
+ Conf : {
+  _8 : {
+   BKS : {start : 24, len : 4, def : ' ' },
+   SER : {start : 25, len : 3, def : ' ' },
+  },
+  _6 : {
+   BKS : {start : 7, len : 4, def : ' ' },
+   SER : {start : 8, len : 3, def : ' ' },
+  }
+ },
+ GPub : {
+  _8 : {
+   BKS : {start : 28, len : 1, def : ' ' },
+   SER : {start : 28, len : 1, def : ' ' },
+   VIS : {start : 28, len : 1, def : ' ' },
+   MAP : {start : 28, len : 1, def : ' ' },
+   COM : {start : 28, len : 1, def : ' ' },
+  },
+  _6 : {
+   BKS : {start : 11, len : 1, def : ' ' },
+   SER : {start : 11, len : 1, def : ' ' },
+   VIS : {start : 11, len : 1, def : ' ' },
+   MAP : {start : 11, len : 1, def : ' ' },
+   COM : {start : 11, len : 1, def : ' ' },
+  }
+ },
+ Audn : {
+  _8 : {
+   BKS : {start : 22, len : 1, def : ' ' },
+   SER : {start : 22, len : 1, def : ' ' },
+   VIS : {start : 22, len : 1, def : ' ' },
+   SCO : {start : 22, len : 1, def : ' ' },
+   REC : {start : 22, len : 1, def : ' ' },
+   COM : {start : 22, len : 1, def : ' ' },
+  },
+  _6 : {
+   BKS : {start : 5, len : 1, def : ' ' },
+   SER : {start : 5, len : 1, def : ' ' },
+   VIS : {start : 5, len : 1, def : ' ' },
+   SCO : {start : 5, len : 1, def : ' ' },
+   REC : {start : 5, len : 1, def : ' ' },
+   COM : {start : 5, len : 1, def : ' ' },
+  }
+ },
+ Form : {
+  _8 : {
+   BKS : {start : 23, len : 1, def : ' ' },
+   SER : {start : 23, len : 1, def : ' ' },
+   VIS : {start : 29, len : 1, def : ' ' },
+   MIX : {start : 23, len : 1, def : ' ' },
+   MAP : {start : 29, len : 1, def : ' ' },
+   SCO : {start : 23, len : 1, def : ' ' },
+   REC : {start : 23, len : 1, def : ' ' },
+  },
+  _6 : {
+   BKS : {start : 6, len : 1, def : ' ' },
+   SER : {start : 6, len : 1, def : ' ' },
+   VIS : {start : 12, len : 1, def : ' ' },
+   MIX : {start : 6, len : 1, def : ' ' },
+   MAP : {start : 12, len : 1, def : ' ' },
+   SCO : {start : 6, len : 1, def : ' ' },
+   REC : {start : 6, len : 1, def : ' ' },
+  }
+ },
+ 'S/L' : {
+  _8 : {
+   SER : {start : 34, len : 1, def : '0' },
+  },
+  _6 : {
+   SER : {start : 17, len : 1, def : '0' },
+  }
+ },
+ 'Alph' : {
+  _8 : {
+   SER : {start : 33, len : 1, def : ' ' },
+  },
+  _6 : {
+   SER : {start : 16, len : 1, def : ' ' },
+  }
+ },
 };
 
diff --git a/Open-ILS/src/javascript/backend/catalog/phys_char.js b/Open-ILS/src/javascript/backend/catalog/phys_char.js
index 4a6ba8d1db..7abfb849a4 100644
--- a/Open-ILS/src/javascript/backend/catalog/phys_char.js
+++ b/Open-ILS/src/javascript/backend/catalog/phys_char.js
@@ -1,1062 +1,1062 @@
 var physical_characteristics  = {
-	c : {
-		label     : "Electronic Resource",
-		subfields : {
-			b : {	start : 1,
-				len   : 1,
-				label : "SMD",
-				values: {	a : "Tape Cartridge",
-						b : "Chip cartridge",
-						c : "Computer optical disk cartridge",
-						f : "Tape cassette",
-						h : "Tape reel",
-						j : "Magnetic disk",
-						m : "Magneto-optical disk",
-						o : "Optical disk",
-						r : "Remote",
-						u : "Unspecified",
-						z : "Other",
-				},
-			},
-			d : {	start : 3,
-				len   : 1,
-				label : "Color",
-				values: {	a : "One color",
-						b : "Black-and-white",
-						c : "Multicolored",
-						g : "Gray scale",
-						m : "Mixed",
-						n : "Not applicable",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			e : {	start : 4,
-				len   : 1,
-				label : "Dimensions",
-				values: {	a : "3 1/2 in.",
-						e : "12 in.",
-						g : "4 3/4 in. or 12 cm.",
-						i : "1 1/8 x 2 3/8 in.",
-						j : "3 7/8 x 2 1/2 in.",
-						n : "Not applicable",
-						o : "5 1/4 in.",
-						u : "Unknown",
-						v : "8 in.",
-						z : "Other",
-				},
-			},
-			f : {	start : 5,
-				len   : 1,
-				label : "Sound",
-				values: {	' ' : "No sound (Silent)",
-						a   : "Sound",
-						u   : "Unknown",
-				},
-			},
-			g : {	start : 6,
-				len   : 3,
-				label : "Image bit depth",
-				values: {	mmm   : "Multiple",
-						nnn   : "Not applicable",
-						'---' : "Unknown",
-				},
-			},
-			h : {	start : 9,
-				len   : 1,
-				label : "File formats",
-				values: {	a : "One file format",
-						m : "Multiple file formats",
-						u : "Unknown",
-				},
-			},
-			i : {	start : 10,
-				len   : 1,
-				label : "Quality assurance target(s)",
-				values: {	a : "Absent",
-						n : "Not applicable",
-						p : "Present",
-						u : "Unknown",
-				},
-			},
-			j : {	start : 11,
-				len   : 1,
-				label : "Antecedent/Source",
-				values: {	a : "File reproduced from original",
-						b : "File reproduced from microform",
-						c : "File reproduced from electronic resource",
-						d : "File reproduced from an intermediate (not microform)",
-						m : "Mixed",
-						n : "Not applicable",
-						u : "Unknown",
-				},
-			},
-			k : {	start : 12,
-				len   : 1,
-				label : "Level of compression",
-				values: {	a : "Uncompressed",
-						b : "Lossless",
-						d : "Lossy",
-						m : "Mixed",
-						u : "Unknown",
-				},
-			},
-			l : {	start : 13,
-				len   : 1,
-				label : "Reformatting quality",
-				values: {	a : "Access",
-						n : "Not applicable",
-						p : "Preservation",
-						r : "Replacement",
-						u : "Unknown",
-				},
-			},
-		},
-	},
-	d : {
-		label     : "Globe",
-		subfields : {
-			b : {	start : 1,
-				len   : 1,
-				label : "SMD",
-				values: {	a : "Celestial globe",
-						b : "Planetary or lunar globe",
-						c : "Terrestrial globe",
-						e : "Earth moon globe",
-						u : "Unspecified",
-						z : "Other",
-				},
-			},
-			d : {	start : 3,
-				len   : 1,
-				label : "Color",
-				values: {	a : "One color",
-						c : "Multicolored",
-				},
-			},
-			e : {	start : 4,
-				len   : 1,
-				label : "Physical medium",
-				values: {	a : "Paper",
-						b : "Wood",
-						c : "Stone",
-						d : "Metal",
-						e : "Synthetics",
-						f : "Skins",
-						g : "Textile",
-						p : "Plaster",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			f : {	start : 5,
-				len   : 1,
-				label : "Type of reproduction",
-				values: {	f : "Facsimile",
-						n : "Not applicable",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-		},
-	},
-	a : {
-		label     : "Map",
-		subfields : {
-			b : {	start : 1,
-				len   : 1,
-				label : "SMD",
-				values: {	d : "Atlas",
-						g : "Diagram",
-						j : "Map",
-						k : "Profile",
-						q : "Model",
-						r : "Remote-sensing image",
-						s : "Section",
-						u : "Unspecified",
-						y : "View",
-						z : "Other",
-				},
-			},
-			d : {	start : 3,
-				len   : 1,
-				label : "Color",
-				values: {	a : "One color",
-						c : "Multicolored",
-				},
-			},
-			e : {	start : 4,
-				len   : 1,
-				label : "Physical medium",
-				values: {	a : "Paper",
-						b : "Wood",
-						c : "Stone",
-						d : "Metal",
-						e : "Synthetics",
-						f : "Skins",
-						g : "Textile",
-						p : "Plaster",
-						q : "Flexible base photographic medium, positive",
-						r : "Flexible base photographic medium, negative",
-						s : "Non-flexible base photographic medium, positive",
-						t : "Non-flexible base photographic medium, negative",
-						u : "Unknown",
-						y : "Other photographic medium",
-						z : "Other",
-				},
-			},
-			f : {	start : 5,
-				len   : 1,
-				label : "Type of reproduction",
-				values: {	f : "Facsimile",
-						n : "Not applicable",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			g : {	start : 6,
-				len   : 1,
-				label : "Production/reproduction details",
-				values: {	a : "Photocopy, blueline print",
-						b : "Photocopy",
-						c : "Pre-production",
-						d : "Film",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			h : {	start : 7,
-				len   : 1,
-				label : "Positive/negative",
-				values: {	a : "Positive",
-						b : "Negative",
-						m : "Mixed",
-						n : "Not applicable",
-				},
-			},
-		},
-	},
-	h : {
-		label     : "Microform",
-		subfields : {
-			b : {	start : 1,
-				len   : 1,
-				label : "SMD",
-				values: {	a : "Aperture card",
-						b : "Microfilm cartridge",
-						c : "Microfilm cassette",
-						d : "Microfilm reel",
-						e : "Microfiche",
-						f : "Microfiche cassette",
-						g : "Microopaque",
-						u : "Unspecified",
-						z : "Other",
-				},
-			},
-			d : {	start : 3,
-				len   : 1,
-				label : "Positive/negative",
-				values: {	a : "Positive",
-						b : "Negative",
-						m : "Mixed",
-						u : "Unknown",
-				},
-			},
-			e : {	start : 4,
-				len   : 1,
-				label : "Dimensions",
-				values: {	a : "8 mm.",
-						e : "16 mm.",
-						f : "35 mm.",
-						g : "70mm.",
-						h : "105 mm.",
-						l : "3 x 5 in. (8 x 13 cm.)",
-						m : "4 x 6 in. (11 x 15 cm.)",
-						o : "6 x 9 in. (16 x 23 cm.)",
-						p : "3 1/4 x 7 3/8 in. (9 x 19 cm.)",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			f : {	start : 5,
-				len   : 4,
-				label : "Reduction ratio range/Reduction ratio",
-				values: {	a : "Low (1-16x)",
-						b : "Normal (16-30x)",
-						c : "High (31-60x)",
-						d : "Very high (61-90x)",
-						e : "Ultra (90x-)",
-						u : "Unknown",
-						v : "Reduction ratio varies",
-				},
-			},
-			g : {	start : 9,
-				len   : 1,
-				label : "Color",
-				values: {	b : "Black-and-white",
-						c : "Multicolored",
-						m : "Mixed",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			h : {	start : 10,
-				len   : 1,
-				label : "Emulsion on film",
-				values: {	a : "Silver halide",
-						b : "Diazo",
-						c : "Vesicular",
-						m : "Mixed",
-						n : "Not applicable",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			i : {	start : 11,
-				len   : 1,
-				label : "Quality assurance target(s)",
-				values: {	a : "1st gen. master",
-						b : "Printing master",
-						c : "Service copy",
-						m : "Mixed generation",
-						u : "Unknown",
-				},
-			},
-			j : {	start : 12,
-				len   : 1,
-				label : "Base of film",
-				values: {	a : "Safety base, undetermined",
-						c : "Safety base, acetate undetermined",
-						d : "Safety base, diacetate",
-						l : "Nitrate base",
-						m : "Mixed base",
-						n : "Not applicable",
-						p : "Safety base, polyester",
-						r : "Safety base, mixed",
-						t : "Safety base, triacetate",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-		},
-	},
-	m : {
-		label     : "Motion Picture",
-		subfields : {
-			b : {	start : 1,
-				len   : 1,
-				label : "SMD",
-				values: {	a : "Film cartridge",
-						f : "Film cassette",
-						r : "Film reel",
-						u : "Unspecified",
-						z : "Other",
-				},
-			},
-			d : {	start : 3,
-				len   : 1,
-				label : "Color",
-				values: {	b : "Black-and-white",
-						c : "Multicolored",
-						h : "Hand-colored",
-						m : "Mixed",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			e : {	start : 4,
-				len   : 1,
-				label : "Motion picture presentation format",
-				values: {	a : "Standard sound aperture, reduced frame",
-						b : "Nonanamorphic (wide-screen)",
-						c : "3D",
-						d : "Anamorphic (wide-screen)",
-						e : "Other-wide screen format",
-						f : "Standard. silent aperture, full frame",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			f : {	start : 5,
-				len   : 1,
-				label : "Sound on medium or separate",
-				values: {	a : "Sound on medium",
-						b : "Sound separate from medium",
-						u : "Unknown",
-				},
-			},
-			g : {	start : 6,
-				len   : 1,
-				label : "Medium for sound",
-				values: {	a : "Optical sound track on motion picture film",
-						b : "Magnetic sound track on motion picture film",
-						c : "Magnetic audio tape in cartridge",
-						d : "Sound disc",
-						e : "Magnetic audio tape on reel",
-						f : "Magnetic audio tape in cassette",
-						g : "Optical and magnetic sound track on film",
-						h : "Videotape",
-						i : "Videodisc",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			h : {	start : 7,
-				len   : 1,
-				label : "Dimensions",
-				values: {	a : "Standard 8 mm.",
-						b : "Super 8 mm./single 8 mm.",
-						c : "9.5 mm.",
-						d : "16 mm.",
-						e : "28 mm.",
-						f : "35 mm.",
-						g : "70 mm.",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			i : {	start : 8,
-				len   : 1,
-				label : "Configuration of playback channels",
-				values: {	k : "Mixed",
-						m : "Monaural",
-						n : "Not applicable",
-						q : "Multichannel, surround or quadraphonic",
-						s : "Stereophonic",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			j : {	start : 9,
-				len   : 1,
-				label : "Production elements",
-				values: {	a : "Work print",
-						b : "Trims",
-						c : "Outtakes",
-						d : "Rushes",
-						e : "Mixing tracks",
-						f : "Title bands/inter-title rolls",
-						g : "Production rolls",
-						n : "Not applicable",
-						z : "Other",
-				},
-			},
-		},
-	},
-	k : {
-		label     : "Non-projected Graphic",
-		subfields : {
-			b : {	start : 1,
-				len   : 1,
-				label : "SMD",
-				values: {	c : "Collage",
-						d : "Drawing",
-						e : "Painting",
-						f : "Photo-mechanical print",
-						g : "Photonegative",
-						h : "Photoprint",
-						i : "Picture",
-						j : "Print",
-						l : "Technical drawing",
-						n : "Chart",
-						o : "Flash/activity card",
-						u : "Unspecified",
-						z : "Other",
-				},
-			},
-			d : {	start : 3,
-				len   : 1,
-				label : "Color",
-				values: {	a : "One color",
-						b : "Black-and-white",
-						c : "Multicolored",
-						h : "Hand-colored",
-						m : "Mixed",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			e : {	start : 4,
-				len   : 1,
-				label : "Primary support material",
-				values: {	a : "Canvas",
-						b : "Bristol board",
-						c : "Cardboard/illustration board",
-						d : "Glass",
-						e : "Synthetics",
-						f : "Skins",
-						g : "Textile",
-						h : "Metal",
-						m : "Mixed collection",
-						o : "Paper",
-						p : "Plaster",
-						q : "Hardboard",
-						r : "Porcelain",
-						s : "Stone",
-						t : "Wood",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			f : {	start : 5,
-				len   : 1,
-				label : "Secondary support material",
-				values: {	a : "Canvas",
-						b : "Bristol board",
-						c : "Cardboard/illustration board",
-						d : "Glass",
-						e : "Synthetics",
-						f : "Skins",
-						g : "Textile",
-						h : "Metal",
-						m : "Mixed collection",
-						o : "Paper",
-						p : "Plaster",
-						q : "Hardboard",
-						r : "Porcelain",
-						s : "Stone",
-						t : "Wood",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-		},
-	},
-	g : {
-		label     : "Projected Graphic",
-		subfields : {
-			b : {	start : 1,
-				len   : 1,
-				label : "SMD",
-				values: {	c : "Film cartridge",
-						d : "Filmstrip",
-						f : "Film filmstrip type",
-						o : "Filmstrip roll",
-						s : "Slide",
-						t : "Transparency",
-						z : "Other",
-				},
-			},
-			d : {	start : 3,
-				len   : 1,
-				label : "Color",
-				values: {	b : "Black-and-white",
-						c : "Multicolored",
-						h : "Hand-colored",
-						m : "Mixed",
-						n : "Not applicable",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			e : {	start : 4,
-				len   : 1,
-				label : "Base of emulsion",
-				values: {	d : "Glass",
-						e : "Synthetics",
-						j : "Safety film",
-						k : "Film base, other than safety film",
-						m : "Mixed collection",
-						o : "Paper",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			f : {	start : 5,
-				len   : 1,
-				label : "Sound on medium or separate",
-				values: {	a : "Sound on medium",
-						b : "Sound separate from medium",
-						u : "Unknown",
-				},
-			},
-			g : {	start : 6,
-				len   : 1,
-				label : "Medium for sound",
-				values: {	a : "Optical sound track on motion picture film",
-						b : "Magnetic sound track on motion picture film",
-						c : "Magnetic audio tape in cartridge",
-						d : "Sound disc",
-						e : "Magnetic audio tape on reel",
-						f : "Magnetic audio tape in cassette",
-						g : "Optical and magnetic sound track on film",
-						h : "Videotape",
-						i : "Videodisc",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			h : {	start : 7,
-				len   : 1,
-				label : "Dimensions",
-				values: {	a : "Standard 8 mm.",
-						b : "Super 8 mm./single 8 mm.",
-						c : "9.5 mm.",
-						d : "16 mm.",
-						e : "28 mm.",
-						f : "35 mm.",
-						g : "70 mm.",
-						j : "2 x 2 in. (5 x 5 cm.)",
-						k : "2 1/4 x 2 1/4 in. (6 x 6 cm.)",
-						s : "4 x 5 in. (10 x 13 cm.)",
-						t : "5 x 7 in. (13 x 18 cm.)",
-						v : "8 x 10 in. (21 x 26 cm.)",
-						w : "9 x 9 in. (23 x 23 cm.)",
-						x : "10 x 10 in. (26 x 26 cm.)",
-						y : "7 x 7 in. (18 x 18 cm.)",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			i : {	start : 8,
-				len   : 1,
-				label : "Secondary support material",
-				values: {	c : "Cardboard",
-						d : "Glass",
-						e : "Synthetics",
-						h : "metal",
-						j : "Metal and glass",
-						k : "Synthetics and glass",
-						m : "Mixed collection",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-		},
-	},
-	r : {
-		label     : "Remote-sensing Image",
-		subfields : {
-			b : {	start : 1,
-				len   : 1,
-				label : "SMD",
-				values: { u : "Unspecified" },
-			},
-			d : {	start : 3,
-				len   : 1,
-				label : "Altitude of sensor",
-				values: {	a : "Surface",
-						b : "Airborne",
-						c : "Spaceborne",
-						n : "Not applicable",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			e : {	start : 4,
-				len   : 1,
-				label : "Attitude of sensor",
-				values: {	a : "Low oblique",
-						b : "High oblique",
-						c : "Vertical",
-						n : "Not applicable",
-						u : "Unknown",
-				},
-			},
-			f : {	start : 5,
-				len   : 1,
-				label : "Cloud cover",
-				values: {	0 : "0-09%",
-						1 : "10-19%",
-						2 : "20-29%",
-						3 : "30-39%",
-						4 : "40-49%",
-						5 : "50-59%",
-						6 : "60-69%",
-						7 : "70-79%",
-						8 : "80-89%",
-						9 : "90-100%",
-						n : "Not applicable",
-						u : "Unknown",
-				},
-			},
-			g : {	start : 6,
-				len   : 1,
-				label : "Platform construction type",
-				values: {	a : "Balloon",
-						b : "Aircraft-low altitude",
-						c : "Aircraft-medium altitude",
-						d : "Aircraft-high altitude",
-						e : "Manned spacecraft",
-						f : "Unmanned spacecraft",
-						g : "Land-based remote-sensing device",
-						h : "Water surface-based remote-sensing device",
-						i : "Submersible remote-sensing device",
-						n : "Not applicable",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			h : {	start : 7,
-				len   : 1,
-				label : "Platform use category",
-				values: {	a : "Meteorological",
-						b : "Surface observing",
-						c : "Space observing",
-						m : "Mixed uses",
-						n : "Not applicable",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			i : {	start : 8,
-				len   : 1,
-				label : "Sensor type",
-				values: {	a : "Active",
-						b : "Passive",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			j : {	start : 9,
-				len   : 2,
-				label : "Data type",
-				values: {	nn : "Not applicable",
-						uu : "Unknown",
-						zz : "Other",
-						aa : "Visible light",
-						da : "Near infrared",
-						db : "Middle infrared",
-						dc : "Far infrared",
-						dd : "Thermal infrared",
-						de : "Shortwave infrared (SWIR)",
-						df : "Reflective infrared",
-						dv : "Combinations",
-						dz : "Other infrared data",
-						ga : "Sidelooking airborne radar (SLAR)",
-						gb : "Synthetic aperture radar (SAR-single frequency)",
-						gc : "SAR-multi-frequency (multichannel)",
-						gd : "SAR-like polarization",
-						ge : "SAR-cross polarization",
-						gf : "Infometric SAR",
-						gg : "Polarmetric SAR",
-						gu : "Passive microwave mapping",
-						gz : "Other microwave data",
-						ja : "Far ultraviolet",
-						jb : "Middle ultraviolet",
-						jc : "Near ultraviolet",
-						jv : "Ultraviolet combinations",
-						jz : "Other ultraviolet data",
-						ma : "Multi-spectral, multidata",
-						mb : "Multi-temporal",
-						mm : "Combination of various data types",
-						pa : "Sonar-water depth",
-						pb : "Sonar-bottom topography images, sidescan",
-						pc : "Sonar-bottom topography, near-surface",
-						pd : "Sonar-bottom topography, near-bottom",
-						pe : "Seismic surveys",
-						pz : "Other acoustical data",
-						ra : "Gravity anomales (general)",
-						rb : "Free-air",
-						rc : "Bouger",
-						rd : "Isostatic",
-						sa : "Magnetic field",
-						ta : "Radiometric surveys",
-				},
-			},
-		},
-	},
-	s : {
-		label     : "Sound Recording",
-		subfields : {
-			b : {	start : 1,
-				len   : 1,
-				label : "SMD",
-				values: {	d : "Sound disc",
-						e : "Cylinder",
-						g : "Sound cartridge",
-						i : "Sound-track film",
-						q : "Roll",
-						s : "Sound cassette",
-						t : "Sound-tape reel",
-						u : "Unspecified",
-						w : "Wire recording",
-						z : "Other",
-				},
-			},
-			d : {	start : 3,
-				len   : 1,
-				label : "Speed",
-				values: {	a : "16 rpm",
-						b : "33 1/3 rpm",
-						c : "45 rpm",
-						d : "78 rpm",
-						e : "8 rpm",
-						f : "1.4 mps",
-						h : "120 rpm",
-						i : "160 rpm",
-						k : "15/16 ips",
-						l : "1 7/8 ips",
-						m : "3 3/4 ips",
-						o : "7 1/2 ips",
-						p : "15 ips",
-						r : "30 ips",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			e : {	start : 4,
-				len   : 1,
-				label : "Configuration of playback channels",
-				values: {	m : "Monaural",
-						q : "Quadraphonic",
-						s : "Stereophonic",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			f : {	start : 5,
-				len   : 1,
-				label : "Groove width or pitch",
-				values: {	m : "Microgroove/fine",
-						n : "Not applicable",
-						s : "Coarse/standard",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			g : {	start : 6,
-				len   : 1,
-				label : "Dimensions",
-				values: {	a : "3 in.",
-						b : "5 in.",
-						c : "7 in.",
-						d : "10 in.",
-						e : "12 in.",
-						f : "16 in.",
-						g : "4 3/4 in. (12 cm.)",
-						j : "3 7/8 x 2 1/2 in.",
-						o : "5 1/4 x 3 7/8 in.",
-						s : "2 3/4 x 4 in.",
-						n : "Not applicable",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			h : {	start : 7,
-				len   : 1,
-				label : "Tape width",
-				values: {	l : "1/8 in.",
-						m : "1/4in.",
-						n : "Not applicable",
-						o : "1/2 in.",
-						p : "1 in.",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			i : {	start : 8,
-				len   : 1,
-				label : "Tape configuration ",
-				values: {	a : "Full (1) track",
-						b : "Half (2) track",
-						c : "Quarter (4) track",
-						d : "8 track",
-						e : "12 track",
-						f : "16 track",
-						n : "Not applicable",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			m : {	start : 12,
-				len   : 1,
-				label : "Special playback",
-				values: {	a : "NAB standard",
-						b : "CCIR standard",
-						c : "Dolby-B encoded, standard Dolby",
-						d : "dbx encoded",
-						e : "Digital recording",
-						f : "Dolby-A encoded",
-						g : "Dolby-C encoded",
-						h : "CX encoded",
-						n : "Not applicable",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			n : {	start : 13,
-				len   : 1,
-				label : "Capture and storage",
-				values: {	a : "Acoustical capture, direct storage",
-						b : "Direct storage, not acoustical",
-						d : "Digital storage",
-						e : "Analog electrical storage",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-		},
-	},
-	f : {
-		label     : "Tactile Material",
-		subfields : {
-			b : {	start : 1,
-				len   : 1,
-				label : "SMD",
-				values: {	a : "Moon",
-						b : "Braille",
-						c : "Combination",
-						d : "Tactile, with no writing system",
-						u : "Unspecified",
-						z : "Other",
-				},
-			},
-			d : {	start : 3,
-				len   : 2,
-				label : "Class of braille writing",
-				values: {	a : "Literary braille",
-						b : "Format code braille",
-						c : "Mathematics and scientific braille",
-						d : "Computer braille",
-						e : "Music braille",
-						m : "Multiple braille types",
-						n : "Not applicable",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			e : {	start : 4,
-				len   : 1,
-				label : "Level of contraction",
-				values: {	a : "Uncontracted",
-						b : "Contracted",
-						m : "Combination",
-						n : "Not applicable",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			f : {	start : 6,
-				len   : 3,
-				label : "Braille music format",
-				values: {	a : "Bar over bar",
-						b : "Bar by bar",
-						c : "Line over line",
-						d : "Paragraph",
-						e : "Single line",
-						f : "Section by section",
-						g : "Line by line",
-						h : "Open score",
-						i : "Spanner short form scoring",
-						j : "Short form scoring",
-						k : "Outline",
-						l : "Vertical score",
-						n : "Not applicable",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			g : {	start : 9,
-				len   : 1,
-				label : "Special physical characteristics",
-				values: {	a : "Print/braille",
-						b : "Jumbo or enlarged braille",
-						n : "Not applicable",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-		},
-	},
-	v : {
-		label     : "Videorecording",
-		subfields : {
-			b : {	start : 1,
-				len   : 1,
-				label : "SMD",
-				values: { 	c : "Videocartridge",
-						d : "Videodisc",
-						f : "Videocassette",
-						r : "Videoreel",
-						u : "Unspecified",
-						z : "Other",
-				},
-			},
-			d : {	start : 3,
-				len   : 1,
-				label : "Color",
-				values: {	b : "Black-and-white",
-						c : "Multicolored",
-						m : "Mixed",
-						n : "Not applicable",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			e : {	start : 4,
-				len   : 1,
-				label : "Videorecording format",
-				values: {	a : "Beta",
-						b : "VHS",
-						c : "U-matic",
-						d : "EIAJ",
-						e : "Type C",
-						f : "Quadruplex",
-						g : "Laserdisc",
-						h : "CED",
-						i : "Betacam",
-						j : "Betacam SP",
-						k : "Super-VHS",
-						m : "M-II",
-						o : "D-2",
-						p : "8 mm.",
-						q : "Hi-8 mm.",
-						u : "Unknown",
-						v : "DVD",
-						z : "Other",
-				},
-			},
-			f : {	start : 5,
-				len   : 1,
-				label : "Sound on medium or separate",
-				values: {	a : "Sound on medium",
-						b : "Sound separate from medium",
-						u : "Unknown",
-				},
-			},
-			g : {	start : 6,
-				len   : 1,
-				label : "Medium for sound",
-				values: {	a : "Optical sound track on motion picture film",
-						b : "Magnetic sound track on motion picture film",
-						c : "Magnetic audio tape in cartridge",
-						d : "Sound disc",
-						e : "Magnetic audio tape on reel",
-						f : "Magnetic audio tape in cassette",
-						g : "Optical and magnetic sound track on motion picture film",
-						h : "Videotape",
-						i : "Videodisc",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			h : {	start : 7,
-				len   : 1,
-				label : "Dimensions",
-				values: {	a : "8 mm.",
-						m : "1/4 in.",
-						o : "1/2 in.",
-						p : "1 in.",
-						q : "2 in.",
-						r : "3/4 in.",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-			i : {	start : 8,
-				len   : 1,
-				label : "Configuration of playback channel",
-				values: {	k : "Mixed",
-						m : "Monaural",
-						n : "Not applicable",
-						q : "Multichannel, surround or quadraphonic",
-						s : "Stereophonic",
-						u : "Unknown",
-						z : "Other",
-				},
-			},
-		},
-	},
+ c : {
+  label     : "Electronic Resource",
+  subfields : {
+   b : { start : 1,
+    len   : 1,
+    label : "SMD",
+    values: { a : "Tape Cartridge",
+      b : "Chip cartridge",
+      c : "Computer optical disk cartridge",
+      f : "Tape cassette",
+      h : "Tape reel",
+      j : "Magnetic disk",
+      m : "Magneto-optical disk",
+      o : "Optical disk",
+      r : "Remote",
+      u : "Unspecified",
+      z : "Other",
+    },
+   },
+   d : { start : 3,
+    len   : 1,
+    label : "Color",
+    values: { a : "One color",
+      b : "Black-and-white",
+      c : "Multicolored",
+      g : "Gray scale",
+      m : "Mixed",
+      n : "Not applicable",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   e : { start : 4,
+    len   : 1,
+    label : "Dimensions",
+    values: { a : "3 1/2 in.",
+      e : "12 in.",
+      g : "4 3/4 in. or 12 cm.",
+      i : "1 1/8 x 2 3/8 in.",
+      j : "3 7/8 x 2 1/2 in.",
+      n : "Not applicable",
+      o : "5 1/4 in.",
+      u : "Unknown",
+      v : "8 in.",
+      z : "Other",
+    },
+   },
+   f : { start : 5,
+    len   : 1,
+    label : "Sound",
+    values: { ' ' : "No sound (Silent)",
+      a   : "Sound",
+      u   : "Unknown",
+    },
+   },
+   g : { start : 6,
+    len   : 3,
+    label : "Image bit depth",
+    values: { mmm   : "Multiple",
+      nnn   : "Not applicable",
+      '---' : "Unknown",
+    },
+   },
+   h : { start : 9,
+    len   : 1,
+    label : "File formats",
+    values: { a : "One file format",
+      m : "Multiple file formats",
+      u : "Unknown",
+    },
+   },
+   i : { start : 10,
+    len   : 1,
+    label : "Quality assurance target(s)",
+    values: { a : "Absent",
+      n : "Not applicable",
+      p : "Present",
+      u : "Unknown",
+    },
+   },
+   j : { start : 11,
+    len   : 1,
+    label : "Antecedent/Source",
+    values: { a : "File reproduced from original",
+      b : "File reproduced from microform",
+      c : "File reproduced from electronic resource",
+      d : "File reproduced from an intermediate (not microform)",
+      m : "Mixed",
+      n : "Not applicable",
+      u : "Unknown",
+    },
+   },
+   k : { start : 12,
+    len   : 1,
+    label : "Level of compression",
+    values: { a : "Uncompressed",
+      b : "Lossless",
+      d : "Lossy",
+      m : "Mixed",
+      u : "Unknown",
+    },
+   },
+   l : { start : 13,
+    len   : 1,
+    label : "Reformatting quality",
+    values: { a : "Access",
+      n : "Not applicable",
+      p : "Preservation",
+      r : "Replacement",
+      u : "Unknown",
+    },
+   },
+  },
+ },
+ d : {
+  label     : "Globe",
+  subfields : {
+   b : { start : 1,
+    len   : 1,
+    label : "SMD",
+    values: { a : "Celestial globe",
+      b : "Planetary or lunar globe",
+      c : "Terrestrial globe",
+      e : "Earth moon globe",
+      u : "Unspecified",
+      z : "Other",
+    },
+   },
+   d : { start : 3,
+    len   : 1,
+    label : "Color",
+    values: { a : "One color",
+      c : "Multicolored",
+    },
+   },
+   e : { start : 4,
+    len   : 1,
+    label : "Physical medium",
+    values: { a : "Paper",
+      b : "Wood",
+      c : "Stone",
+      d : "Metal",
+      e : "Synthetics",
+      f : "Skins",
+      g : "Textile",
+      p : "Plaster",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   f : { start : 5,
+    len   : 1,
+    label : "Type of reproduction",
+    values: { f : "Facsimile",
+      n : "Not applicable",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+  },
+ },
+ a : {
+  label     : "Map",
+  subfields : {
+   b : { start : 1,
+    len   : 1,
+    label : "SMD",
+    values: { d : "Atlas",
+      g : "Diagram",
+      j : "Map",
+      k : "Profile",
+      q : "Model",
+      r : "Remote-sensing image",
+      s : "Section",
+      u : "Unspecified",
+      y : "View",
+      z : "Other",
+    },
+   },
+   d : { start : 3,
+    len   : 1,
+    label : "Color",
+    values: { a : "One color",
+      c : "Multicolored",
+    },
+   },
+   e : { start : 4,
+    len   : 1,
+    label : "Physical medium",
+    values: { a : "Paper",
+      b : "Wood",
+      c : "Stone",
+      d : "Metal",
+      e : "Synthetics",
+      f : "Skins",
+      g : "Textile",
+      p : "Plaster",
+      q : "Flexible base photographic medium, positive",
+      r : "Flexible base photographic medium, negative",
+      s : "Non-flexible base photographic medium, positive",
+      t : "Non-flexible base photographic medium, negative",
+      u : "Unknown",
+      y : "Other photographic medium",
+      z : "Other",
+    },
+   },
+   f : { start : 5,
+    len   : 1,
+    label : "Type of reproduction",
+    values: { f : "Facsimile",
+      n : "Not applicable",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   g : { start : 6,
+    len   : 1,
+    label : "Production/reproduction details",
+    values: { a : "Photocopy, blueline print",
+      b : "Photocopy",
+      c : "Pre-production",
+      d : "Film",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   h : { start : 7,
+    len   : 1,
+    label : "Positive/negative",
+    values: { a : "Positive",
+      b : "Negative",
+      m : "Mixed",
+      n : "Not applicable",
+    },
+   },
+  },
+ },
+ h : {
+  label     : "Microform",
+  subfields : {
+   b : { start : 1,
+    len   : 1,
+    label : "SMD",
+    values: { a : "Aperture card",
+      b : "Microfilm cartridge",
+      c : "Microfilm cassette",
+      d : "Microfilm reel",
+      e : "Microfiche",
+      f : "Microfiche cassette",
+      g : "Microopaque",
+      u : "Unspecified",
+      z : "Other",
+    },
+   },
+   d : { start : 3,
+    len   : 1,
+    label : "Positive/negative",
+    values: { a : "Positive",
+      b : "Negative",
+      m : "Mixed",
+      u : "Unknown",
+    },
+   },
+   e : { start : 4,
+    len   : 1,
+    label : "Dimensions",
+    values: { a : "8 mm.",
+      e : "16 mm.",
+      f : "35 mm.",
+      g : "70mm.",
+      h : "105 mm.",
+      l : "3 x 5 in. (8 x 13 cm.)",
+      m : "4 x 6 in. (11 x 15 cm.)",
+      o : "6 x 9 in. (16 x 23 cm.)",
+      p : "3 1/4 x 7 3/8 in. (9 x 19 cm.)",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   f : { start : 5,
+    len   : 4,
+    label : "Reduction ratio range/Reduction ratio",
+    values: { a : "Low (1-16x)",
+      b : "Normal (16-30x)",
+      c : "High (31-60x)",
+      d : "Very high (61-90x)",
+      e : "Ultra (90x-)",
+      u : "Unknown",
+      v : "Reduction ratio varies",
+    },
+   },
+   g : { start : 9,
+    len   : 1,
+    label : "Color",
+    values: { b : "Black-and-white",
+      c : "Multicolored",
+      m : "Mixed",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   h : { start : 10,
+    len   : 1,
+    label : "Emulsion on film",
+    values: { a : "Silver halide",
+      b : "Diazo",
+      c : "Vesicular",
+      m : "Mixed",
+      n : "Not applicable",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   i : { start : 11,
+    len   : 1,
+    label : "Quality assurance target(s)",
+    values: { a : "1st gen. master",
+      b : "Printing master",
+      c : "Service copy",
+      m : "Mixed generation",
+      u : "Unknown",
+    },
+   },
+   j : { start : 12,
+    len   : 1,
+    label : "Base of film",
+    values: { a : "Safety base, undetermined",
+      c : "Safety base, acetate undetermined",
+      d : "Safety base, diacetate",
+      l : "Nitrate base",
+      m : "Mixed base",
+      n : "Not applicable",
+      p : "Safety base, polyester",
+      r : "Safety base, mixed",
+      t : "Safety base, triacetate",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+  },
+ },
+ m : {
+  label     : "Motion Picture",
+  subfields : {
+   b : { start : 1,
+    len   : 1,
+    label : "SMD",
+    values: { a : "Film cartridge",
+      f : "Film cassette",
+      r : "Film reel",
+      u : "Unspecified",
+      z : "Other",
+    },
+   },
+   d : { start : 3,
+    len   : 1,
+    label : "Color",
+    values: { b : "Black-and-white",
+      c : "Multicolored",
+      h : "Hand-colored",
+      m : "Mixed",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   e : { start : 4,
+    len   : 1,
+    label : "Motion picture presentation format",
+    values: { a : "Standard sound aperture, reduced frame",
+      b : "Nonanamorphic (wide-screen)",
+      c : "3D",
+      d : "Anamorphic (wide-screen)",
+      e : "Other-wide screen format",
+      f : "Standard. silent aperture, full frame",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   f : { start : 5,
+    len   : 1,
+    label : "Sound on medium or separate",
+    values: { a : "Sound on medium",
+      b : "Sound separate from medium",
+      u : "Unknown",
+    },
+   },
+   g : { start : 6,
+    len   : 1,
+    label : "Medium for sound",
+    values: { a : "Optical sound track on motion picture film",
+      b : "Magnetic sound track on motion picture film",
+      c : "Magnetic audio tape in cartridge",
+      d : "Sound disc",
+      e : "Magnetic audio tape on reel",
+      f : "Magnetic audio tape in cassette",
+      g : "Optical and magnetic sound track on film",
+      h : "Videotape",
+      i : "Videodisc",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   h : { start : 7,
+    len   : 1,
+    label : "Dimensions",
+    values: { a : "Standard 8 mm.",
+      b : "Super 8 mm./single 8 mm.",
+      c : "9.5 mm.",
+      d : "16 mm.",
+      e : "28 mm.",
+      f : "35 mm.",
+      g : "70 mm.",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   i : { start : 8,
+    len   : 1,
+    label : "Configuration of playback channels",
+    values: { k : "Mixed",
+      m : "Monaural",
+      n : "Not applicable",
+      q : "Multichannel, surround or quadraphonic",
+      s : "Stereophonic",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   j : { start : 9,
+    len   : 1,
+    label : "Production elements",
+    values: { a : "Work print",
+      b : "Trims",
+      c : "Outtakes",
+      d : "Rushes",
+      e : "Mixing tracks",
+      f : "Title bands/inter-title rolls",
+      g : "Production rolls",
+      n : "Not applicable",
+      z : "Other",
+    },
+   },
+  },
+ },
+ k : {
+  label     : "Non-projected Graphic",
+  subfields : {
+   b : { start : 1,
+    len   : 1,
+    label : "SMD",
+    values: { c : "Collage",
+      d : "Drawing",
+      e : "Painting",
+      f : "Photo-mechanical print",
+      g : "Photonegative",
+      h : "Photoprint",
+      i : "Picture",
+      j : "Print",
+      l : "Technical drawing",
+      n : "Chart",
+      o : "Flash/activity card",
+      u : "Unspecified",
+      z : "Other",
+    },
+   },
+   d : { start : 3,
+    len   : 1,
+    label : "Color",
+    values: { a : "One color",
+      b : "Black-and-white",
+      c : "Multicolored",
+      h : "Hand-colored",
+      m : "Mixed",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   e : { start : 4,
+    len   : 1,
+    label : "Primary support material",
+    values: { a : "Canvas",
+      b : "Bristol board",
+      c : "Cardboard/illustration board",
+      d : "Glass",
+      e : "Synthetics",
+      f : "Skins",
+      g : "Textile",
+      h : "Metal",
+      m : "Mixed collection",
+      o : "Paper",
+      p : "Plaster",
+      q : "Hardboard",
+      r : "Porcelain",
+      s : "Stone",
+      t : "Wood",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   f : { start : 5,
+    len   : 1,
+    label : "Secondary support material",
+    values: { a : "Canvas",
+      b : "Bristol board",
+      c : "Cardboard/illustration board",
+      d : "Glass",
+      e : "Synthetics",
+      f : "Skins",
+      g : "Textile",
+      h : "Metal",
+      m : "Mixed collection",
+      o : "Paper",
+      p : "Plaster",
+      q : "Hardboard",
+      r : "Porcelain",
+      s : "Stone",
+      t : "Wood",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+  },
+ },
+ g : {
+  label     : "Projected Graphic",
+  subfields : {
+   b : { start : 1,
+    len   : 1,
+    label : "SMD",
+    values: { c : "Film cartridge",
+      d : "Filmstrip",
+      f : "Film filmstrip type",
+      o : "Filmstrip roll",
+      s : "Slide",
+      t : "Transparency",
+      z : "Other",
+    },
+   },
+   d : { start : 3,
+    len   : 1,
+    label : "Color",
+    values: { b : "Black-and-white",
+      c : "Multicolored",
+      h : "Hand-colored",
+      m : "Mixed",
+      n : "Not applicable",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   e : { start : 4,
+    len   : 1,
+    label : "Base of emulsion",
+    values: { d : "Glass",
+      e : "Synthetics",
+      j : "Safety film",
+      k : "Film base, other than safety film",
+      m : "Mixed collection",
+      o : "Paper",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   f : { start : 5,
+    len   : 1,
+    label : "Sound on medium or separate",
+    values: { a : "Sound on medium",
+      b : "Sound separate from medium",
+      u : "Unknown",
+    },
+   },
+   g : { start : 6,
+    len   : 1,
+    label : "Medium for sound",
+    values: { a : "Optical sound track on motion picture film",
+      b : "Magnetic sound track on motion picture film",
+      c : "Magnetic audio tape in cartridge",
+      d : "Sound disc",
+      e : "Magnetic audio tape on reel",
+      f : "Magnetic audio tape in cassette",
+      g : "Optical and magnetic sound track on film",
+      h : "Videotape",
+      i : "Videodisc",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   h : { start : 7,
+    len   : 1,
+    label : "Dimensions",
+    values: { a : "Standard 8 mm.",
+      b : "Super 8 mm./single 8 mm.",
+      c : "9.5 mm.",
+      d : "16 mm.",
+      e : "28 mm.",
+      f : "35 mm.",
+      g : "70 mm.",
+      j : "2 x 2 in. (5 x 5 cm.)",
+      k : "2 1/4 x 2 1/4 in. (6 x 6 cm.)",
+      s : "4 x 5 in. (10 x 13 cm.)",
+      t : "5 x 7 in. (13 x 18 cm.)",
+      v : "8 x 10 in. (21 x 26 cm.)",
+      w : "9 x 9 in. (23 x 23 cm.)",
+      x : "10 x 10 in. (26 x 26 cm.)",
+      y : "7 x 7 in. (18 x 18 cm.)",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   i : { start : 8,
+    len   : 1,
+    label : "Secondary support material",
+    values: { c : "Cardboard",
+      d : "Glass",
+      e : "Synthetics",
+      h : "metal",
+      j : "Metal and glass",
+      k : "Synthetics and glass",
+      m : "Mixed collection",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+  },
+ },
+ r : {
+  label     : "Remote-sensing Image",
+  subfields : {
+   b : { start : 1,
+    len   : 1,
+    label : "SMD",
+    values: { u : "Unspecified" },
+   },
+   d : { start : 3,
+    len   : 1,
+    label : "Altitude of sensor",
+    values: { a : "Surface",
+      b : "Airborne",
+      c : "Spaceborne",
+      n : "Not applicable",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   e : { start : 4,
+    len   : 1,
+    label : "Attitude of sensor",
+    values: { a : "Low oblique",
+      b : "High oblique",
+      c : "Vertical",
+      n : "Not applicable",
+      u : "Unknown",
+    },
+   },
+   f : { start : 5,
+    len   : 1,
+    label : "Cloud cover",
+    values: { 0 : "0-09%",
+      1 : "10-19%",
+      2 : "20-29%",
+      3 : "30-39%",
+      4 : "40-49%",
+      5 : "50-59%",
+      6 : "60-69%",
+      7 : "70-79%",
+      8 : "80-89%",
+      9 : "90-100%",
+      n : "Not applicable",
+      u : "Unknown",
+    },
+   },
+   g : { start : 6,
+    len   : 1,
+    label : "Platform construction type",
+    values: { a : "Balloon",
+      b : "Aircraft-low altitude",
+      c : "Aircraft-medium altitude",
+      d : "Aircraft-high altitude",
+      e : "Manned spacecraft",
+      f : "Unmanned spacecraft",
+      g : "Land-based remote-sensing device",
+      h : "Water surface-based remote-sensing device",
+      i : "Submersible remote-sensing device",
+      n : "Not applicable",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   h : { start : 7,
+    len   : 1,
+    label : "Platform use category",
+    values: { a : "Meteorological",
+      b : "Surface observing",
+      c : "Space observing",
+      m : "Mixed uses",
+      n : "Not applicable",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   i : { start : 8,
+    len   : 1,
+    label : "Sensor type",
+    values: { a : "Active",
+      b : "Passive",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   j : { start : 9,
+    len   : 2,
+    label : "Data type",
+    values: { nn : "Not applicable",
+      uu : "Unknown",
+      zz : "Other",
+      aa : "Visible light",
+      da : "Near infrared",
+      db : "Middle infrared",
+      dc : "Far infrared",
+      dd : "Thermal infrared",
+      de : "Shortwave infrared (SWIR)",
+      df : "Reflective infrared",
+      dv : "Combinations",
+      dz : "Other infrared data",
+      ga : "Sidelooking airborne radar (SLAR)",
+      gb : "Synthetic aperture radar (SAR-single frequency)",
+      gc : "SAR-multi-frequency (multichannel)",
+      gd : "SAR-like polarization",
+      ge : "SAR-cross polarization",
+      gf : "Infometric SAR",
+      gg : "Polarmetric SAR",
+      gu : "Passive microwave mapping",
+      gz : "Other microwave data",
+      ja : "Far ultraviolet",
+      jb : "Middle ultraviolet",
+      jc : "Near ultraviolet",
+      jv : "Ultraviolet combinations",
+      jz : "Other ultraviolet data",
+      ma : "Multi-spectral, multidata",
+      mb : "Multi-temporal",
+      mm : "Combination of various data types",
+      pa : "Sonar-water depth",
+      pb : "Sonar-bottom topography images, sidescan",
+      pc : "Sonar-bottom topography, near-surface",
+      pd : "Sonar-bottom topography, near-bottom",
+      pe : "Seismic surveys",
+      pz : "Other acoustical data",
+      ra : "Gravity anomales (general)",
+      rb : "Free-air",
+      rc : "Bouger",
+      rd : "Isostatic",
+      sa : "Magnetic field",
+      ta : "Radiometric surveys",
+    },
+   },
+  },
+ },
+ s : {
+  label     : "Sound Recording",
+  subfields : {
+   b : { start : 1,
+    len   : 1,
+    label : "SMD",
+    values: { d : "Sound disc",
+      e : "Cylinder",
+      g : "Sound cartridge",
+      i : "Sound-track film",
+      q : "Roll",
+      s : "Sound cassette",
+      t : "Sound-tape reel",
+      u : "Unspecified",
+      w : "Wire recording",
+      z : "Other",
+    },
+   },
+   d : { start : 3,
+    len   : 1,
+    label : "Speed",
+    values: { a : "16 rpm",
+      b : "33 1/3 rpm",
+      c : "45 rpm",
+      d : "78 rpm",
+      e : "8 rpm",
+      f : "1.4 mps",
+      h : "120 rpm",
+      i : "160 rpm",
+      k : "15/16 ips",
+      l : "1 7/8 ips",
+      m : "3 3/4 ips",
+      o : "7 1/2 ips",
+      p : "15 ips",
+      r : "30 ips",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   e : { start : 4,
+    len   : 1,
+    label : "Configuration of playback channels",
+    values: { m : "Monaural",
+      q : "Quadraphonic",
+      s : "Stereophonic",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   f : { start : 5,
+    len   : 1,
+    label : "Groove width or pitch",
+    values: { m : "Microgroove/fine",
+      n : "Not applicable",
+      s : "Coarse/standard",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   g : { start : 6,
+    len   : 1,
+    label : "Dimensions",
+    values: { a : "3 in.",
+      b : "5 in.",
+      c : "7 in.",
+      d : "10 in.",
+      e : "12 in.",
+      f : "16 in.",
+      g : "4 3/4 in. (12 cm.)",
+      j : "3 7/8 x 2 1/2 in.",
+      o : "5 1/4 x 3 7/8 in.",
+      s : "2 3/4 x 4 in.",
+      n : "Not applicable",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   h : { start : 7,
+    len   : 1,
+    label : "Tape width",
+    values: { l : "1/8 in.",
+      m : "1/4in.",
+      n : "Not applicable",
+      o : "1/2 in.",
+      p : "1 in.",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   i : { start : 8,
+    len   : 1,
+    label : "Tape configuration ",
+    values: { a : "Full (1) track",
+      b : "Half (2) track",
+      c : "Quarter (4) track",
+      d : "8 track",
+      e : "12 track",
+      f : "16 track",
+      n : "Not applicable",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   m : { start : 12,
+    len   : 1,
+    label : "Special playback",
+    values: { a : "NAB standard",
+      b : "CCIR standard",
+      c : "Dolby-B encoded, standard Dolby",
+      d : "dbx encoded",
+      e : "Digital recording",
+      f : "Dolby-A encoded",
+      g : "Dolby-C encoded",
+      h : "CX encoded",
+      n : "Not applicable",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   n : { start : 13,
+    len   : 1,
+    label : "Capture and storage",
+    values: { a : "Acoustical capture, direct storage",
+      b : "Direct storage, not acoustical",
+      d : "Digital storage",
+      e : "Analog electrical storage",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+  },
+ },
+ f : {
+  label     : "Tactile Material",
+  subfields : {
+   b : { start : 1,
+    len   : 1,
+    label : "SMD",
+    values: { a : "Moon",
+      b : "Braille",
+      c : "Combination",
+      d : "Tactile, with no writing system",
+      u : "Unspecified",
+      z : "Other",
+    },
+   },
+   d : { start : 3,
+    len   : 2,
+    label : "Class of braille writing",
+    values: { a : "Literary braille",
+      b : "Format code braille",
+      c : "Mathematics and scientific braille",
+      d : "Computer braille",
+      e : "Music braille",
+      m : "Multiple braille types",
+      n : "Not applicable",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   e : { start : 4,
+    len   : 1,
+    label : "Level of contraction",
+    values: { a : "Uncontracted",
+      b : "Contracted",
+      m : "Combination",
+      n : "Not applicable",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   f : { start : 6,
+    len   : 3,
+    label : "Braille music format",
+    values: { a : "Bar over bar",
+      b : "Bar by bar",
+      c : "Line over line",
+      d : "Paragraph",
+      e : "Single line",
+      f : "Section by section",
+      g : "Line by line",
+      h : "Open score",
+      i : "Spanner short form scoring",
+      j : "Short form scoring",
+      k : "Outline",
+      l : "Vertical score",
+      n : "Not applicable",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   g : { start : 9,
+    len   : 1,
+    label : "Special physical characteristics",
+    values: { a : "Print/braille",
+      b : "Jumbo or enlarged braille",
+      n : "Not applicable",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+  },
+ },
+ v : {
+  label     : "Videorecording",
+  subfields : {
+   b : { start : 1,
+    len   : 1,
+    label : "SMD",
+    values: {  c : "Videocartridge",
+      d : "Videodisc",
+      f : "Videocassette",
+      r : "Videoreel",
+      u : "Unspecified",
+      z : "Other",
+    },
+   },
+   d : { start : 3,
+    len   : 1,
+    label : "Color",
+    values: { b : "Black-and-white",
+      c : "Multicolored",
+      m : "Mixed",
+      n : "Not applicable",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   e : { start : 4,
+    len   : 1,
+    label : "Videorecording format",
+    values: { a : "Beta",
+      b : "VHS",
+      c : "U-matic",
+      d : "EIAJ",
+      e : "Type C",
+      f : "Quadruplex",
+      g : "Laserdisc",
+      h : "CED",
+      i : "Betacam",
+      j : "Betacam SP",
+      k : "Super-VHS",
+      m : "M-II",
+      o : "D-2",
+      p : "8 mm.",
+      q : "Hi-8 mm.",
+      u : "Unknown",
+      v : "DVD",
+      z : "Other",
+    },
+   },
+   f : { start : 5,
+    len   : 1,
+    label : "Sound on medium or separate",
+    values: { a : "Sound on medium",
+      b : "Sound separate from medium",
+      u : "Unknown",
+    },
+   },
+   g : { start : 6,
+    len   : 1,
+    label : "Medium for sound",
+    values: { a : "Optical sound track on motion picture film",
+      b : "Magnetic sound track on motion picture film",
+      c : "Magnetic audio tape in cartridge",
+      d : "Sound disc",
+      e : "Magnetic audio tape on reel",
+      f : "Magnetic audio tape in cassette",
+      g : "Optical and magnetic sound track on motion picture film",
+      h : "Videotape",
+      i : "Videodisc",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   h : { start : 7,
+    len   : 1,
+    label : "Dimensions",
+    values: { a : "8 mm.",
+      m : "1/4 in.",
+      o : "1/2 in.",
+      p : "1 in.",
+      q : "2 in.",
+      r : "3/4 in.",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+   i : { start : 8,
+    len   : 1,
+    label : "Configuration of playback channel",
+    values: { k : "Mixed",
+      m : "Monaural",
+      n : "Not applicable",
+      q : "Multichannel, surround or quadraphonic",
+      s : "Stereophonic",
+      u : "Unknown",
+      z : "Other",
+    },
+   },
+  },
+ },
 };
 
diff --git a/Open-ILS/src/javascript/backend/catalog/record_type.js b/Open-ILS/src/javascript/backend/catalog/record_type.js
index 0a6988b734..689500bfda 100644
--- a/Open-ILS/src/javascript/backend/catalog/record_type.js
+++ b/Open-ILS/src/javascript/backend/catalog/record_type.js
@@ -5,86 +5,86 @@ load_lib('JSON_v1.js');
 
 function recordType (rec) {
 
-	var marcns = new Namespace("http://www.loc.gov/MARC21/slim");
-	var _l = rec.marcns::leader.toString();
+ var marcns = new Namespace("http://www.loc.gov/MARC21/slim");
+ var _l = rec.marcns::leader.toString();
 
-	var _t = _l.substr(ff_pos.Type.ldr.BKS.start, ff_pos.Type.ldr.BKS.len);
-	var _b = _l.substr(ff_pos.BLvl.ldr.BKS.start, ff_pos.BLvl.ldr.BKS.len);
+ var _t = _l.substr(ff_pos.Type.ldr.BKS.start, ff_pos.Type.ldr.BKS.len);
+ var _b = _l.substr(ff_pos.BLvl.ldr.BKS.start, ff_pos.BLvl.ldr.BKS.len);
 
-	for (var t in rec_type) {
-		if (_t.match(rec_type[t].Type) && _b.match(rec_type[t].BLvl)) {
-			return t;
-		}
-	}
+ for (var t in rec_type) {
+  if (_t.match(rec_type[t].Type) && _b.match(rec_type[t].BLvl)) {
+   return t;
+  }
+ }
 }
 
 function videorecordingFormatName (rec) {
-	var marcns = new Namespace("http://www.loc.gov/MARC21/slim");
-	var _7 = rec.marcns::controlfield.(@tag.match(/007/)).text().toString();
+ var marcns = new Namespace("http://www.loc.gov/MARC21/slim");
+ var _7 = rec.marcns::controlfield.(@tag.match(/007/)).text().toString();
 
-	if (_7.match(/^v/)) {
-		var _v_e = _7.substr(
-			physical_characteristics.v.subfields.e.start,
-			physical_characteristics.v.subfields.e.len
-		);
+ if (_7.match(/^v/)) {
+  var _v_e = _7.substr(
+   physical_characteristics.v.subfields.e.start,
+   physical_characteristics.v.subfields.e.len
+  );
 
-		return physical_characteristics.v.subfields.e.values[ _v_e ];
-	}
+  return physical_characteristics.v.subfields.e.values[ _v_e ];
+ }
 
-	return null;
+ return null;
 }
 
 function videorecordingFormatCode (rec) {
-	var marcns = new Namespace("http://www.loc.gov/MARC21/slim");
-	var _7 = rec.marcns::controlfield.(@tag.match(/007/)).text().toString();
+ var marcns = new Namespace("http://www.loc.gov/MARC21/slim");
+ var _7 = rec.marcns::controlfield.(@tag.match(/007/)).text().toString();
 
-	if (_7.match(/^v/)) {
-		return _7.substr(
-			physical_characteristics.v.subfields.e.start,
-			physical_characteristics.v.subfields.e.len
-		);
-	}
+ if (_7.match(/^v/)) {
+  return _7.substr(
+   physical_characteristics.v.subfields.e.start,
+   physical_characteristics.v.subfields.e.len
+  );
+ }
 
-	return null;
+ return null;
 }
 
 
 function extractFixedField (rec, field) {
 
-	var marcns = new Namespace("http://www.loc.gov/MARC21/slim");
-	var _l = rec.marcns::leader.toString();
-	var _8 = rec.marcns::controlfield.(@tag.match(/008/)).text().toString();
-	var _6 = rec.marcns::controlfield.(@tag.match(/006/)).text().toString();
-
-	var rtype = recordType(rec);
-
-	var val;
-
-	if (ff_pos[field].ldr) {
-		if (ff_pos[field].ldr[rtype]) {
-			val = _l.substr(
-				ff_pos[field].ldr[rtype].start,
-				ff_pos[field].ldr[rtype].len
-			);
-		}
-	} else if (ff_pos[field]._8) {
-		if (ff_pos[field]._8[rtype]) {
-			val = _8.substr(
-				ff_pos[field]._8[rtype].start,
-				ff_pos[field]._8[rtype].len
-			);
-		}
-	}
-
-	if (!val && ff_pos[field]._6) {
-		if (ff_pos[field]._6[rtype]) {
-			val = _6.substr(
-				ff_pos[field]._6[rtype].start,
-				ff_pos[field]._6[rtype].len
-			);
-		}
-	}
-		
-	return val;
+ var marcns = new Namespace("http://www.loc.gov/MARC21/slim");
+ var _l = rec.marcns::leader.toString();
+ var _8 = rec.marcns::controlfield.(@tag.match(/008/)).text().toString();
+ var _6 = rec.marcns::controlfield.(@tag.match(/006/)).text().toString();
+
+ var rtype = recordType(rec);
+
+ var val;
+
+ if (ff_pos[field].ldr) {
+  if (ff_pos[field].ldr[rtype]) {
+   val = _l.substr(
+    ff_pos[field].ldr[rtype].start,
+    ff_pos[field].ldr[rtype].len
+   );
+  }
+ } else if (ff_pos[field]._8) {
+  if (ff_pos[field]._8[rtype]) {
+   val = _8.substr(
+    ff_pos[field]._8[rtype].start,
+    ff_pos[field]._8[rtype].len
+   );
+  }
+ }
+
+ if (!val && ff_pos[field]._6) {
+  if (ff_pos[field]._6[rtype]) {
+   val = _6.substr(
+    ff_pos[field]._6[rtype].start,
+    ff_pos[field]._6[rtype].len
+   );
+  }
+ }
+  
+ return val;
 }
 
diff --git a/Open-ILS/src/javascript/backend/circ/circ_duration.js b/Open-ILS/src/javascript/backend/circ/circ_duration.js
index 6f6a3d4b34..aa5148ab54 100644
--- a/Open-ILS/src/javascript/backend/circ/circ_duration.js
+++ b/Open-ILS/src/javascript/backend/circ/circ_duration.js
@@ -7,35 +7,35 @@ log_vars('circ_duration');
 
 /* treat pre-cat copies like vanilla books */
 if( isTrue(isPrecat) ) {
-	log_info("pre-cat copy getting duration defaults...");
-	result.durationRule			= 'default';
-	result.recurringFinesRule	= 'default';
-	result.maxFine	   			= 'default'
-	return;
+ log_info("pre-cat copy getting duration defaults...");
+ result.durationRule   = 'default';
+ result.recurringFinesRule = 'default';
+ result.maxFine       = 'default'
+ return;
 }
 
 
 /* grab the config from the config script */
 var config = getItemConfig();
-var itemForm	= (marcXMLDoc) ? extractFixedField(marcXMLDoc,'Form') : "";
+var itemForm = (marcXMLDoc) ? extractFixedField(marcXMLDoc,'Form') : "";
 
 
 /* ----------------------------------------------------------------------------- 
-	Now set the rule values based on the config.  If there is no configured info
-	on this copy, fall back on defaults.
-	----------------------------------------------------------------------------- */
+ Now set the rule values based on the config.  If there is no configured info
+ on this copy, fall back on defaults.
+ ----------------------------------------------------------------------------- */
 if( config ) {
 
-	log_debug("circ_duration found a config for the copy");
-	result.durationRule			= config.durationRule;
-	result.recurringFinesRule	= config.recurringFinesRule;
-	result.maxFine			    = config.maxFine;
+ log_debug("circ_duration found a config for the copy");
+ result.durationRule   = config.durationRule;
+ result.recurringFinesRule = config.recurringFinesRule;
+ result.maxFine       = config.maxFine;
 
 } else {
 
-	result.durationRule = 'default';
-	result.recurringFinesRule = 'default';
-	result.maxFine = 'default';
+ result.durationRule = 'default';
+ result.recurringFinesRule = 'default';
+ result.maxFine = 'default';
 }
 
 
diff --git a/Open-ILS/src/javascript/backend/circ/circ_groups.js b/Open-ILS/src/javascript/backend/circ/circ_groups.js
index 036d56e0f1..6023eaa416 100644
--- a/Open-ILS/src/javascript/backend/circ/circ_groups.js
+++ b/Open-ILS/src/javascript/backend/circ/circ_groups.js
@@ -1,21 +1,21 @@
 /* ---------------------------------------------------------------------
-	Set up the limits for the various profiles (aka permission groups).
-	Values of -1 mean there is no limit 
+ Set up the limits for the various profiles (aka permission groups).
+ Values of -1 mean there is no limit 
 
-	maxItemsOut			- the maximum number of items the user can have out
-	fineThreshold		- the fine threshold. 
-	overdueThreshold	- the overdue items threshold.
-	maxHolds				- The maximum number of holds the user can have
+ maxItemsOut   - the maximum number of items the user can have out
+ fineThreshold  - the fine threshold. 
+ overdueThreshold - the overdue items threshold.
+ maxHolds    - The maximum number of holds the user can have
 
-	A user exceeds the fineThreshold and/or overdueThreshold if they are 
-	equal to or exceed the threshold
-	--------------------------------------------------------------------- */
+ A user exceeds the fineThreshold and/or overdueThreshold if they are 
+ equal to or exceed the threshold
+ --------------------------------------------------------------------- */
 
 var GROUP_CONFIG = {
-	'Patron' : {
-		maxItemsOut         : 50,
-		fineThreshold       : 10,
-		overdueThreshold    : 10,
-		maxHolds            : -1
-	},
+ 'Patron' : {
+  maxItemsOut         : 50,
+  fineThreshold       : 10,
+  overdueThreshold    : 10,
+  maxHolds            : -1
+ },
 }
diff --git a/Open-ILS/src/javascript/backend/circ/circ_item_config.js b/Open-ILS/src/javascript/backend/circ/circ_item_config.js
index c54d0cc5e2..e6228ca80d 100644
--- a/Open-ILS/src/javascript/backend/circ/circ_item_config.js
+++ b/Open-ILS/src/javascript/backend/circ/circ_item_config.js
@@ -18,19 +18,19 @@ log_debug('loading circ_item_config.js ...');
 */
 
 /* ----------------------------------------------------------------------------- 
-	Configure the duration rules for the various item types and circ modifiers
-	MARC Fixed Field info:
-	http://www.oclc.org/bibformats/en/fixedfield/
-	----------------------------------------------------------------------------- */
+ Configure the duration rules for the various item types and circ modifiers
+ MARC Fixed Field info:
+ http://www.oclc.org/bibformats/en/fixedfield/
+ ----------------------------------------------------------------------------- */
 
 var MARC_ITEM_TYPE_MAP = {
-	a : { /* Language material [Books] */
-		SIPMediaType			: '001',
-		magneticMedia			: 'f',
-		durationRule			: 'default',
-		recurringFinesRule	    : 'default',
-		maxFine					: 'default'
-	},
+ a : { /* Language material [Books] */
+  SIPMediaType   : '001',
+  magneticMedia   : 'f',
+  durationRule   : 'default',
+  recurringFinesRule     : 'default',
+  maxFine     : 'default'
+ },
     /* add more MARC item type configs as needed... */
 }
 
@@ -39,13 +39,13 @@ MARC_ITEM_TYPE_MAP.t = MARC_ITEM_TYPE_MAP.a;
 
 
 var CIRC_MOD_MAP = {
-	'bestseller'				: {
-		SIPMediaType			: '001',
-		magneticMedia			: 'f',
-		durationRule			: 'default',
-		recurringFinesRule	    : 'default',
-		maxFine					: 'default'
-	},
+ 'bestseller'    : {
+  SIPMediaType   : '001',
+  magneticMedia   : 'f',
+  durationRule   : 'default',
+  recurringFinesRule     : 'default',
+  maxFine     : 'default'
+ },
 }
 
 
@@ -56,9 +56,9 @@ result.item_config = getItemConfig();
 
 function getItemConfig() {
 
-	var config = null;
-	var marcType	= getMARCItemType();
-	var circMod		= copy.circ_modifier;
+ var config = null;
+ var marcType = getMARCItemType();
+ var circMod  = copy.circ_modifier;
 
     if( circMod ) {
         config = CIRC_MOD_MAP[circMod];
@@ -67,15 +67,15 @@ function getItemConfig() {
     }
 
     if(!config)
-		config = MARC_ITEM_TYPE_MAP[marcType];
+  config = MARC_ITEM_TYPE_MAP[marcType];
 
     if(!config) {
         config = {};
-		config.SIPMediaType = '001';
-		config.magneticMedia = 'f';
-		config.durationRule	= 'default';
-		config.recurringFinesRule = 'default';
-		config.maxFine = 'default';
+  config.SIPMediaType = '001';
+  config.magneticMedia = 'f';
+  config.durationRule = 'default';
+  config.recurringFinesRule = 'default';
+  config.maxFine = 'default';
     }
 
     return config
diff --git a/Open-ILS/src/javascript/backend/circ/circ_lib.js b/Open-ILS/src/javascript/backend/circ/circ_lib.js
index 64923ed67e..bd8963eff0 100644
--- a/Open-ILS/src/javascript/backend/circ/circ_lib.js
+++ b/Open-ILS/src/javascript/backend/circ/circ_lib.js
@@ -4,43 +4,43 @@ load_lib('JSON_v1.js');
 
 
 try {
-	if( environment.copy ) {
-		environment.copy.fetchBestHold = function() {
-			var key = scratchKey();
-			environment.copy.__OILS_FUNC_fetch_best_hold(scratchPad(key));
-			var val = getScratch(key);
-			return (val) ? val : null;
-		}
-	}
+ if( environment.copy ) {
+  environment.copy.fetchBestHold = function() {
+   var key = scratchKey();
+   environment.copy.__OILS_FUNC_fetch_best_hold(scratchPad(key));
+   var val = getScratch(key);
+   return (val) ? val : null;
+  }
+ }
 } catch(e) {}
 
 
 /* ----------------------------------------------------------------------------- 
-	Collect all of the global variables
-	----------------------------------------------------------------------------- */
+ Collect all of the global variables
+ ----------------------------------------------------------------------------- */
 
 /* the global result object.  Any data returned to the 
-	caller must be put into this object.  */
-var result				= environment.result = {};
-result.event			= 'SUCCESS';
-result.events			= [];
-result.fatalEvents	= [];
-result.infoEvents		= [];
+ caller must be put into this object.  */
+var result    = environment.result = {};
+result.event   = 'SUCCESS';
+result.events   = [];
+result.fatalEvents = [];
+result.infoEvents  = [];
 
 
 /* Pull in any variables passed in from the calling process */
-var copy					= environment.copy;
-var volume				= environment.volume;
-var title				= environment.title;
-var recDescriptor		= environment.titleDescriptor;
-var patron				= environment.patron;
-var patronItemsOut	= environment.patronItemsOut;
-var patronOverdueCount	= environment.patronOverdueCount;
-var patronFines		= environment.patronFines;
-var isRenewal			= environment.isRenewal;
-var isPrecat			= environment.isPrecat;
-var currentLocation	= environment.location;
-var holdRequestLib	= environment.requestLib;
+var copy     = environment.copy;
+var volume    = environment.volume;
+var title    = environment.title;
+var recDescriptor  = environment.titleDescriptor;
+var patron    = environment.patron;
+var patronItemsOut = environment.patronItemsOut;
+var patronOverdueCount = environment.patronOverdueCount;
+var patronFines  = environment.patronFines;
+var isRenewal   = environment.isRenewal;
+var isPrecat   = environment.isPrecat;
+var currentLocation = environment.location;
+var holdRequestLib = environment.requestLib;
 var holdPickupLib       = environment.pickupLib; /* hold pickup lib */
 var requestor = environment.requestor || patron;
 var newHold = environment.newHold;
@@ -53,18 +53,18 @@ var copyStatus;
 var marcXMLDoc;
 
 if( patron && patron.profile ) 
-	patronProfile = patron.profile.name;
+ patronProfile = patron.profile.name;
 if( copy && copy.status ) 
-	copyStatus = copy.status.name;
+ copyStatus = copy.status.name;
 if( title && title.marc )
-	marcXMLDoc = new XML(title.marc);
+ marcXMLDoc = new XML(title.marc);
 
 
 
 /* copy the group tree into some other useful data structures */
-var groupTree		= environment.groupTree;
-var groupList		= {};
-var groupIDList	= {};
+var groupTree  = environment.groupTree;
+var groupList  = {};
+var groupIDList = {};
 flattenGroupTree(groupTree);
 
 
@@ -73,34 +73,34 @@ flattenGroupTree(groupTree);
 
 
 /* ----------------------------------------------------------------------------- 
-	Define all of the utility functions
-	----------------------------------------------------------------------------- */
+ Define all of the utility functions
+ ----------------------------------------------------------------------------- */
 
 
 
 /* useful functions for creating wrappers around system functions */
 var __scratchKey = 0;
 var __SCRATCH = {};
-function scratchKey()		{ return '_' + __scratchKey++; };
-function scratchPad(key)	{ return '__SCRATCH.'+ key; }
-function getScratch(key)	{ return __SCRATCH[ key ]; }
-function scratchClear()		{ for( var o in __SCRATCH ) __SCRATCH[o] = null; }
+function scratchKey()  { return '_' + __scratchKey++; };
+function scratchPad(key) { return '__SCRATCH.'+ key; }
+function getScratch(key) { return __SCRATCH[ key ]; }
+function scratchClear()  { for( var o in __SCRATCH ) __SCRATCH[o] = null; }
 
 
 /* note: returns false if the value is 'f' or 'F' ... */
 function isTrue(d) {
-	if(	d && 
-			d != "0" && 
-			d != "f" &&
-			d != "F" )
-			return true;
-	return false;
+ if( d && 
+   d != "0" && 
+   d != "f" &&
+   d != "F" )
+   return true;
+ return false;
 }
 
 /* Utility function for iterating over array */
 function iterate( arr, callback ) {
-	for( var i = 0; i < arr.length; i++ ) 
-		callback(arr[i]);
+ for( var i = 0; i < arr.length; i++ ) 
+  callback(arr[i]);
 }
 
 
@@ -109,29 +109,29 @@ function iterate( arr, callback ) {
   * 'func' returned true returns null if none were found
   */
 function grep( arr, func ) {
-	var results = [];
-	iterate( arr, 
-		function(d) {
-			if( func(d) ) 
-				results.push(d);
-		}
-	);
-	if(results.length > 0)	
-		return results;
-	return null;
+ var results = [];
+ iterate( arr, 
+  function(d) {
+   if( func(d) ) 
+    results.push(d);
+  }
+ );
+ if(results.length > 0) 
+  return results;
+ return null;
 }
 
 
 
 function flattenGroupTree(node) {
-	if(!node) return null;
-	groupList[node.name] = node;
-	groupIDList[node.id] = node;
-	iterate( node.children,
-		function(n) {
-			flattenGroupTree(n);
-		}
-	);
+ if(!node) return null;
+ groupList[node.name] = node;
+ groupIDList[node.id] = node;
+ iterate( node.children,
+  function(n) {
+   flattenGroupTree(n);
+  }
+ );
 }
 
 
@@ -142,17 +142,17 @@ function flattenGroupTree(node) {
   * @param child The name of the child group
   */
 function isGroupDescendant( parent, child ) {
-	log_debug("checking descendant p="+parent + " c=" + child);
-	return __isGroupDescendant(
-		groupList[parent],
-		groupList[child]);
+ log_debug("checking descendant p="+parent + " c=" + child);
+ return __isGroupDescendant(
+  groupList[parent],
+  groupList[child]);
 }
 
 function isGroupDescendantId( parentName, childId ) {
-	log_debug("checking descendant ID p="+parentName + " c=" + childId);
-	return __isGroupDescendant(
-		groupList[parentName],
-		groupIDList[childId]);
+ log_debug("checking descendant ID p="+parentName + " c=" + childId);
+ return __isGroupDescendant(
+  groupList[parentName],
+  groupIDList[childId]);
 }
 
 
@@ -163,32 +163,32 @@ function isGroupDescendantId( parentName, childId ) {
   */
 function __isGroupDescendant( parent, child ) {
     if(!(parent && child)) return false;
-	if (parent.id == child.id) return true;
-	var node = child;
-	while( (node = groupIDList[node.parent]) ) {
-		if( node.id == parent.id ) 
-			return true;
-	}
-	return false;
+ if (parent.id == child.id) return true;
+ var node = child;
+ while( (node = groupIDList[node.parent]) ) {
+  if( node.id == parent.id ) 
+   return true;
+ }
+ return false;
 }
 
 
 function getMARCItemType() {
-	if(	copy &&
-			copy.circ_as_type &&
-			copy.circ_as_type != 'undef' )
-		return copy.circ_as_type;
-	
-	return (marcXMLDoc) ? extractFixedField(marcXMLDoc, 'Type') : "";
+ if( copy &&
+   copy.circ_as_type &&
+   copy.circ_as_type != 'undef' )
+  return copy.circ_as_type;
+ 
+ return (marcXMLDoc) ? extractFixedField(marcXMLDoc, 'Type') : "";
 }
 
 
 function isOrgDescendent( parentName, childId ) {
-	var key = scratchKey();
-	__OILS_FUNC_isOrgDescendent(scratchPad(key), parentName, childId);
-	var val = getScratch(key);
-	if( val == '1' ) return true;
-	return false;
+ var key = scratchKey();
+ __OILS_FUNC_isOrgDescendent(scratchPad(key), parentName, childId);
+ var val = getScratch(key);
+ if( val == '1' ) return true;
+ return false;
 }
 
 /* returns the number of unfulfilled holds open on this user */
@@ -199,11 +199,11 @@ function userHoldCount(userid) {
 }
 
 function hasCommonAncestor( org1, org2, depth ) {
-	var key = scratchKey();
-	__OILS_FUNC_hasCommonAncestor(scratchPad(key), org1, org2, depth);
-	var val = getScratch(key);
-	if( val == '1' ) return true;
-	return false;
+ var key = scratchKey();
+ __OILS_FUNC_hasCommonAncestor(scratchPad(key), org1, org2, depth);
+ var val = getScratch(key);
+ if( val == '1' ) return true;
+ return false;
 }
 
 /* returns a dictionary of circmod : count for checked out items */
@@ -216,68 +216,68 @@ function checkoutsByCircModifier(userid) {
 
 /* useful for testing */
 function die(msg) {
-	log_error("die(): "+msg);
-	log_stderr("die(): "+msg);
-	var foo = null;
-	var baz = foo.bar;
+ log_error("die(): "+msg);
+ log_stderr("die(): "+msg);
+ var foo = null;
+ var baz = foo.bar;
 }
 
 
 
 /* logs a load of info */
 function log_vars( prefix ) {
-	var str = prefix + ' : ';
-
-	if(patron) {
-		str += ' Patron=' + patron.id;
-		str += ', Patron_Username='+ patron.usrname;
-		str += ', Patron_Profile_Group='+ patronProfile;
-		str += ', Patron_Fines='	+ patronFines;
-		str += ', Patron_OverdueCount='	+ patronOverdueCount;
-		str += ', Patron_Items_Out=' + patronItemsOut;
-
-		try {
-			str += ', Patron_Barcode='	+ patron.card.barcode;
-			str += ', Patron_Library='	+ patron.home_ou.name;
-		} catch(e) {}
-	}
+ var str = prefix + ' : ';
+
+ if(patron) {
+  str += ' Patron=' + patron.id;
+  str += ', Patron_Username='+ patron.usrname;
+  str += ', Patron_Profile_Group='+ patronProfile;
+  str += ', Patron_Fines=' + patronFines;
+  str += ', Patron_OverdueCount=' + patronOverdueCount;
+  str += ', Patron_Items_Out=' + patronItemsOut;
+
+  try {
+   str += ', Patron_Barcode=' + patron.card.barcode;
+   str += ', Patron_Library=' + patron.home_ou.name;
+  } catch(e) {}
+ }
 
     if(requestor.id != patron.id) 
         str+= ' Requestor='+requestor.usrname;
 
-	if(copy)	{
-		str += ', Copy=' + copy.id;
-		str += ', Copy_Barcode=' + copy.barcode;
-		str += ', Copy_status='	+ copyStatus;
+ if(copy) {
+  str += ', Copy=' + copy.id;
+  str += ', Copy_Barcode=' + copy.barcode;
+  str += ', Copy_status=' + copyStatus;
       str += (copy.circ_modifier) ? ', Circ_Mod=' + copy.circ_modifier : '';
 
-		try {
-			str += ', Circ_Lib=' + copy.circ_lib.shortname;
-			str += ', Copy_location=' + copy.location.name;
-		} catch(e) {}
-	}
+  try {
+   str += ', Circ_Lib=' + copy.circ_lib.shortname;
+   str += ', Copy_location=' + copy.location.name;
+  } catch(e) {}
+ }
 
-	if(volume) {
+ if(volume) {
         str += ', Item_Owning_lib=' + volume.owning_lib;
-        str += ', Volume='	+ volume.id;
+        str += ', Volume=' + volume.id;
     }
 
-	if(title) str += ', Record='	+ title.id;
+ if(title) str += ', Record=' + title.id;
 
-	if(recDescriptor)	{
-		str += ', Record_Descriptor=' + recDescriptor.id;
-		str += ', Item_Type='			+ recDescriptor.item_type;
-		str += ', Item_Form='			+ recDescriptor.item_form;
-		str += ', Item_Lang='			+ recDescriptor.item_lang;
-		str += ', Item_Audience='		+ recDescriptor.audience;
-	}
+ if(recDescriptor) {
+  str += ', Record_Descriptor=' + recDescriptor.id;
+  str += ', Item_Type='   + recDescriptor.item_type;
+  str += ', Item_Form='   + recDescriptor.item_form;
+  str += ', Item_Lang='   + recDescriptor.item_lang;
+  str += ', Item_Audience='  + recDescriptor.audience;
+ }
 
-	str += ', Is_Renewal: '	+ ( (isTrue(isRenewal)) ? "yes" : "no" );
-	str += ', Is_Precat: '	+ ( (isTrue(isPrecat)) ? "yes" : "no" );
-	str += (holdRequestLib) ? ', Hold_request_lib=' + holdRequestLib.shortname : '';
+ str += ', Is_Renewal: ' + ( (isTrue(isRenewal)) ? "yes" : "no" );
+ str += ', Is_Precat: ' + ( (isTrue(isPrecat)) ? "yes" : "no" );
+ str += (holdRequestLib) ? ', Hold_request_lib=' + holdRequestLib.shortname : '';
     str += (holdPickupLib) ? ', Hold_Pickup_Lib=' + holdPickupLib : '';
 
-	log_info(str);
+ log_info(str);
 }
 
 
@@ -290,25 +290,25 @@ function log_vars( prefix ) {
   * @param The name of the group who's config info to return
   */
 function findGroupConfig(name) {
-	if(!name) return null;
-	var node = groupList[name];
-	do {
-		if( GROUP_CONFIG[node.name] ) {
-			debugGroupConfig(name, node.name, GROUP_CONFIG[node.name]);
-			return GROUP_CONFIG[node.name];
-		}
-	} while( (node = groupIDList[node.parent]) );
-	return null;
+ if(!name) return null;
+ var node = groupList[name];
+ do {
+  if( GROUP_CONFIG[node.name] ) {
+   debugGroupConfig(name, node.name, GROUP_CONFIG[node.name]);
+   return GROUP_CONFIG[node.name];
+  }
+ } while( (node = groupIDList[node.parent]) );
+ return null;
 }
 
 
 /** prints out the settings for the given group config **/
 function debugGroupConfig(name, foundName, config) {
-	if(!config) return;
-	var str = "findGroupConfig('"+name+"'): returning config info for '"+ foundName +"': ";
-	for( var i in config ) 
-		str += i + '=' + config[i] + '  ';
-	log_debug(str);
+ if(!config) return;
+ var str = "findGroupConfig('"+name+"'): returning config info for '"+ foundName +"': ";
+ for( var i in config ) 
+  str += i + '=' + config[i] + '  ';
+ log_debug(str);
 }
 
 
diff --git a/Open-ILS/src/javascript/backend/circ/circ_permit_copy.js b/Open-ILS/src/javascript/backend/circ/circ_permit_copy.js
index 053d9b7f43..51cbc4df68 100644
--- a/Open-ILS/src/javascript/backend/circ/circ_permit_copy.js
+++ b/Open-ILS/src/javascript/backend/circ/circ_permit_copy.js
@@ -7,18 +7,18 @@ log_vars('circ_permit_copy');
 
 
 if( ! isTrue(copy.circulate) || !isTrue(copy.location.circulate) ) 
-	result.events.push('COPY_CIRC_NOT_ALLOWED');
+ result.events.push('COPY_CIRC_NOT_ALLOWED');
 
 
 if( ! isTrue(isRenewal) ) {
-	if(copyStatus != 'Available' && 
-		copyStatus != 'On holds shelf' && copyStatus != 'Reshelving' ) {
-			result.events.push('COPY_NOT_AVAILABLE');
-	} 
+ if(copyStatus != 'Available' && 
+  copyStatus != 'On holds shelf' && copyStatus != 'Reshelving' ) {
+   result.events.push('COPY_NOT_AVAILABLE');
+ } 
 }
 
 
-	
+ 
 } go();
 
 
diff --git a/Open-ILS/src/javascript/backend/circ/circ_permit_hold.js b/Open-ILS/src/javascript/backend/circ/circ_permit_hold.js
index 942aacedd4..c832c37706 100644
--- a/Open-ILS/src/javascript/backend/circ/circ_permit_hold.js
+++ b/Open-ILS/src/javascript/backend/circ/circ_permit_hold.js
@@ -7,13 +7,13 @@ log_vars('circ_permit_hold');
 
 
 if( isTrue(patron.barred) ) 
-	result.events.push('PATRON_BARRED');
+ result.events.push('PATRON_BARRED');
 
 if( isTrue(copy.ref) ) 
-	result.events.push('ITEM_NOT_HOLDABLE');
+ result.events.push('ITEM_NOT_HOLDABLE');
 
 if( !isTrue(copy.circulate) ) 
-	result.events.push('ITEM_NOT_HOLDABLE');
+ result.events.push('ITEM_NOT_HOLDABLE');
 
 
 var config = findGroupConfig(patronProfile);
diff --git a/Open-ILS/src/javascript/backend/circ/circ_permit_patron.js b/Open-ILS/src/javascript/backend/circ/circ_permit_patron.js
index 95496884a2..f13944fbb9 100644
--- a/Open-ILS/src/javascript/backend/circ/circ_permit_patron.js
+++ b/Open-ILS/src/javascript/backend/circ/circ_permit_patron.js
@@ -7,7 +7,7 @@ log_vars('circ_permit_patron');
 
 
 if( isTrue(patron.barred) ) 
-	result.events.push('PATRON_BARRED');
+ result.events.push('PATRON_BARRED');
 
 var config = findGroupConfig(patronProfile);
 
diff --git a/Open-ILS/src/javascript/backend/libs/jsDOM.js b/Open-ILS/src/javascript/backend/libs/jsDOM.js
index 5b143c0e98..020fb4bfdf 100644
--- a/Open-ILS/src/javascript/backend/libs/jsDOM.js
+++ b/Open-ILS/src/javascript/backend/libs/jsDOM.js
@@ -1,6 +1,6 @@
 try {
-	load_lib('jsOO.js')
-	load_lib('xpath.js')
+ load_lib('jsOO.js')
+ load_lib('xpath.js')
 } catch (e) {}
 
 function DOMException  (c) { this.code = c }
@@ -21,66 +21,66 @@ DOMException.NAMESPACE_ERR = 14;
 DOMException.INVALID_ACCESS_ERR = 15;
 
 function DOMImplementation () {
-	this._features = {};
-	this._features['CORE'] = {};
-	this._features['CORE']['any'] = true;
-	this._features['CORE']['1.0'] = true;
-	this._features['CORE']['2.0'] = true;
-	this._features['XML'] = {};
-	this._features['XML']['any'] = true;
-	this._features['XML']['1.0'] = true;
-	this._features['XML']['2.0'] = true;
+ this._features = {};
+ this._features['CORE'] = {};
+ this._features['CORE']['any'] = true;
+ this._features['CORE']['1.0'] = true;
+ this._features['CORE']['2.0'] = true;
+ this._features['XML'] = {};
+ this._features['XML']['any'] = true;
+ this._features['XML']['1.0'] = true;
+ this._features['XML']['2.0'] = true;
 }
 
 DOMImplementation.method('hasFeature', function (f, v) {
-	if (!v) v = 'any';
-	if (this._features[f] && this._features[f][v])
-		return this._features[f][v];
-	return false;
+ if (!v) v = 'any';
+ if (this._features[f] && this._features[f][v])
+  return this._features[f][v];
+ return false;
 });
 DOMImplementation.method('createDocumentType', function (n, p, s) {
-	return null;
+ return null;
 });
 DOMImplementation.method('createDocument', function (ns,qn,dt) {
-	var d = new Document(dt);
-	d.documentElement = d.createElement(qn);
-	d.appendChild(d.documentElement);
-	if (ns)
-		d.documentElement.namespaceURI = ns;
+ var d = new Document(dt);
+ d.documentElement = d.createElement(qn);
+ d.appendChild(d.documentElement);
+ if (ns)
+  d.documentElement.namespaceURI = ns;
 
-	installDOM3XPathSupport(d,new XPathParser());
-	return d;
+ installDOM3XPathSupport(d,new XPathParser());
+ return d;
 });
 
 var __XMLDOC = {};
 var __XMLDOCid = 0;
 DOMImplementation.parseString = function (xml) {
-	__XMLDOC['id' + __XMLDOCid] = {};
-	try {
-		_OILS_FUNC_xml_parse_string(xml, '__XMLDOC.id' + __XMLDOCid);
-	} catch (e) {
-		alert("Sorry, no string parsing support");
-	}
-	var x = __XMLDOC['id' + __XMLDOCid];
-	__XMLDOCid++;
-	return x;
+ __XMLDOC['id' + __XMLDOCid] = {};
+ try {
+  _OILS_FUNC_xml_parse_string(xml, '__XMLDOC.id' + __XMLDOCid);
+ } catch (e) {
+  alert("Sorry, no string parsing support");
+ }
+ var x = __XMLDOC['id' + __XMLDOCid];
+ __XMLDOCid++;
+ return x;
 }
 
 
 // NodeList interface
 function NodeList () {
-	this.length = 0;
-	//log_stdout(' --  NodeList constructor');
+ this.length = 0;
+ //log_stdout(' --  NodeList constructor');
 }
 
 NodeList.method('item', function (idx) {
-	return this[idx];
+ return this[idx];
 });
 NodeList.method('push', function (node) {
-	var idx = this.length;
-	this[idx] = node;
-	this.length++;
-	return this[idx];
+ var idx = this.length;
+ this[idx] = node;
+ this.length++;
+ return this[idx];
 });
 
 
@@ -88,89 +88,89 @@ NodeList.method('push', function (node) {
 
 // NamedNodeMap interface
 function NamedNodeMap () {
-	this.length = 0;
-	this._nodes = {};
-	this._ns_nodes = {};
-	//log_stdout(' --  NamedNodeMap constructor');
+ this.length = 0;
+ this._nodes = {};
+ this._ns_nodes = {};
+ //log_stdout(' --  NamedNodeMap constructor');
 }
 
 NamedNodeMap.method('item', function (idx) {
-	return this.getNamedItem(idx);
+ return this.getNamedItem(idx);
 });
 
 NamedNodeMap.method('removeNamedItemNS', function (ns, name) {
-	var x = this._ns_nodes[ns][name];
-	for (var i in this._nodes) {
-		if (this._nodes[i] === x) {
-			this._nodes[i] = null;
-		}
-	}
-	this._ns_nodes[ns][name] = null;
-	return x;
+ var x = this._ns_nodes[ns][name];
+ for (var i in this._nodes) {
+  if (this._nodes[i] === x) {
+   this._nodes[i] = null;
+  }
+ }
+ this._ns_nodes[ns][name] = null;
+ return x;
 });
 
 NamedNodeMap.method('removeNamedItem', function (name) {
-	var x = this._nodes[name];
-	for (var i in this._nodes) {
-		if (this._nodes[i] === x) {
-			this._nodes[i] = null;
-		}
-	}
-	return x;
+ var x = this._nodes[name];
+ for (var i in this._nodes) {
+  if (this._nodes[i] === x) {
+   this._nodes[i] = null;
+  }
+ }
+ return x;
 });
 
 NamedNodeMap.method('getNamedItem', function (name) {
-	return this._nodes[name];
+ return this._nodes[name];
 });
 
 NamedNodeMap.method('getNamedItemNS', function (ns,name) {
-	return this._ns_nodes[ns][name];
+ return this._ns_nodes[ns][name];
 });
 
 NamedNodeMap.method('setNamedItem', function (node) {
-	if (node.nodeName == 'length') return null;
-	this[node.nodeName] = node.value;
-	this[this.length] = node.value;
-	this._nodes[node.nodeName] = node;
-	this._nodes[this.length] = node;
-	this.length++;
+ if (node.nodeName == 'length') return null;
+ this[node.nodeName] = node.value;
+ this[this.length] = node.value;
+ this._nodes[node.nodeName] = node;
+ this._nodes[this.length] = node;
+ this.length++;
 });
 
 NamedNodeMap.method('setNamedItemNS', function (node) {
-	if (node.nodeName == 'length') return null;
-	this[this.length] = node.value;
-	if (!this._ns_nodes[node.namespaceURI]) this._ns_nodes[node.namespaceURI] = {};
-	this._ns_nodes[node.namespaceURI][node.nodeName] = node;
-	this._nodes[this.length] = node;
-	this.length++;
+ if (node.nodeName == 'length') return null;
+ this[this.length] = node.value;
+ if (!this._ns_nodes[node.namespaceURI]) this._ns_nodes[node.namespaceURI] = {};
+ this._ns_nodes[node.namespaceURI][node.nodeName] = node;
+ this._nodes[this.length] = node;
+ this.length++;
 });
 
 // Node interface
 function Node (name) {
-	this.nodeName = name;
-	this.nodeValue = null;
-	this.nodeType = null;
-	this.parentNode = null;
-	this.childNodes = new NodeList();
-	this.firstChild = null;
-	this.lastChild = null;
-	this.previousSibling = null;
-	this.nextSibling = null;
-	this.attributes = new NamedNodeMap();
-	this.ownerDocument = null;
-	this.namespaceURI = null;
-
-	if (name) {
-		var p = name.indexOf(':');
-		if (p != -1) {
-			this.prefix = name.substring(0,p);
-			this.localName = name.substring(p + 1);
-		} else {
-			this.localName = name;
-		}
-	}
-
-	//log_stdout(' --  Node constructor');
+ this.nodeName = name;
+ this.nodeValue = null;
+ this.nodeType = null;
+ this.parentNode = null;
+ this.childNodes = new NodeList();
+ this.firstChild = null;
+ this.lastChild = null;
+ this.previousSibling = null;
+ this.nextSibling = null;
+ this.attributes = new NamedNodeMap();
+ this.ownerDocument = null;
+ this.namespaceURI = null;
+
+ if (name) {
+  var p = name.indexOf(':');
+  if (p != -1) {
+   this.prefix = name.substring(0,p);
+   this.localName = name.substring(p + 1);
+  } else {
+   this.localName = name;
+  }
+ }
+
+ //log_stdout(' --  Node constructor');
 }
 Node.ELEMENT_NODE = 1;
 Node.ATTRIBUTE_NODE = 2;
@@ -187,442 +187,442 @@ Node.NOTATION_NODE = 12;
 Node.NAMESPACE_DECL = 18;
 
 Node.method('_childIndex', function (node) {
-	for (var i = 0; i < this.childNodes.length; i++)
-		if (this.childNodes[i] === node) return i;
+ for (var i = 0; i < this.childNodes.length; i++)
+  if (this.childNodes[i] === node) return i;
 });
 Node.method('insertBefore', function (node, target) {
 
-	if (node.nodeType == Node.DOCUMENT_FRAGMENT_NODE) {
-		for (var i = 0; i < node.childNodes.length; i++)
-			this.insertBefore(node.childNodes.item(i));
-		return node;
-	}
+ if (node.nodeType == Node.DOCUMENT_FRAGMENT_NODE) {
+  for (var i = 0; i < node.childNodes.length; i++)
+   this.insertBefore(node.childNodes.item(i));
+  return node;
+ }
 
-	node.parentNode = this;
-	node.ownerDocument = this.ownerDocument;
-	var i = this._childIndex(target);
+ node.parentNode = this;
+ node.ownerDocument = this.ownerDocument;
+ var i = this._childIndex(target);
 
-	for (var j = this.childNodes.length; j > i; j--)
-		this.childNodes[j] = this.childNodes[j - 1];
+ for (var j = this.childNodes.length; j > i; j--)
+  this.childNodes[j] = this.childNodes[j - 1];
 
-	this.childNodes[i] = node;
+ this.childNodes[i] = node;
 
-	if (i == 0) {
-		this.firstChild = node;
-	} else {
-		this.childNodes[i - 1].nextSibling = node;
-		node.previousSibling = this.childNodes[i + 1];
-	}
+ if (i == 0) {
+  this.firstChild = node;
+ } else {
+  this.childNodes[i - 1].nextSibling = node;
+  node.previousSibling = this.childNodes[i + 1];
+ }
 
-	this.childNodes[i + 1].previousSibling = node;
-	node.nextSibling = this.childNodes[i + 1];
-	
-	node._index = this.ownerDocument._nodes.length;
-	this.ownerDocument._nodes[this.ownerDocument._nodes.length] = node;
+ this.childNodes[i + 1].previousSibling = node;
+ node.nextSibling = this.childNodes[i + 1];
+ 
+ node._index = this.ownerDocument._nodes.length;
+ this.ownerDocument._nodes[this.ownerDocument._nodes.length] = node;
 
-	this.childNodes.length++;
-	return node;
+ this.childNodes.length++;
+ return node;
 });
 
 Node.method('removeChild', function (node) {
-	node.parentNode = this;
-	node.ownerDocument = this.ownerDocument;
-	var i = this._childIndex(node);
-
-	if (node === this.firstChild) {
-		this.firstChild = node.nextSibling;
-	} else {
-		node.previousSibling.nextSibling = node.nextSibling;
-		for (var j = i; j < this.childNodes.length; j++)
-			this.childNodes[j - 1] = this.childNodes[j];
-	}
-
-	if (node === this.lastChild) {
-		this.lastChild = node.previousSibling;
-	} else {
-		node.nextSibling.previousSibling = node.previousSibling;
-	}
-
-	this.ownerDocument._nodes[node._index] = null;
-	
-	this.childNodes.length--;
-	return node;
+ node.parentNode = this;
+ node.ownerDocument = this.ownerDocument;
+ var i = this._childIndex(node);
+
+ if (node === this.firstChild) {
+  this.firstChild = node.nextSibling;
+ } else {
+  node.previousSibling.nextSibling = node.nextSibling;
+  for (var j = i; j < this.childNodes.length; j++)
+   this.childNodes[j - 1] = this.childNodes[j];
+ }
+
+ if (node === this.lastChild) {
+  this.lastChild = node.previousSibling;
+ } else {
+  node.nextSibling.previousSibling = node.previousSibling;
+ }
+
+ this.ownerDocument._nodes[node._index] = null;
+ 
+ this.childNodes.length--;
+ return node;
 });
 
 Node.method('appendChild', function (node) {
 
-	if (node.nodeType == Node.DOCUMENT_FRAGMENT_NODE) {
-		for (var i = 0; i < node.childNodes.length; i++)
-			this.appendChild(node.childNodes.item(i));
-		return node;
-	}
+ if (node.nodeType == Node.DOCUMENT_FRAGMENT_NODE) {
+  for (var i = 0; i < node.childNodes.length; i++)
+   this.appendChild(node.childNodes.item(i));
+  return node;
+ }
 
-	node.parentNode = this;
-	this.childNodes.push( node );
-	this.lastChild = node;
-	if (this.childNodes.length == 1) {
-		this.firstChild = node;
-	} else {
-		this.lastChild.previousSibling = this.childNodes[this.childNodes.length - 2]
-		this.lastChild.previousSibling.nextSibling = this.lastChild;
-	}
+ node.parentNode = this;
+ this.childNodes.push( node );
+ this.lastChild = node;
+ if (this.childNodes.length == 1) {
+  this.firstChild = node;
+ } else {
+  this.lastChild.previousSibling = this.childNodes[this.childNodes.length - 2]
+  this.lastChild.previousSibling.nextSibling = this.lastChild;
+ }
 
-	return node;
+ return node;
 });
 
 Node.method('hasChildNodes', function () {
-	if (this.childNodes.length) return true;
-	return false;
+ if (this.childNodes.length) return true;
+ return false;
 });
 
 Node.method('hasAttributes', function () {
-	if (this.attributes.length) return true;
-	return false;
+ if (this.attributes.length) return true;
+ return false;
 });
 
 Node.method('cloneNode', function (deep) {
-	//log_stdout(this.constructor);
-	var newNode = new this.constructor( this.nodeName );
-	newNode.ownerDocument = this.ownerDocument;
-	newNode.namespaceURI = this.namespaceURI;
-	newNode.prefix = this.prefix;
+ //log_stdout(this.constructor);
+ var newNode = new this.constructor( this.nodeName );
+ newNode.ownerDocument = this.ownerDocument;
+ newNode.namespaceURI = this.namespaceURI;
+ newNode.prefix = this.prefix;
 
-	if (deep) {
-		for (var i = 0; i < this.childNodes.length; i++)
-			newNode.appendChild( this.childNodes.item(i).cloneNode(deep) );
-	}
+ if (deep) {
+  for (var i = 0; i < this.childNodes.length; i++)
+   newNode.appendChild( this.childNodes.item(i).cloneNode(deep) );
+ }
 
-	for (var i = 0; i < this.attributes.length; i++)
-		newNode.attributes.setNamedItem( this.attributes.item(i) );
+ for (var i = 0; i < this.attributes.length; i++)
+  newNode.attributes.setNamedItem( this.attributes.item(i) );
 
-	return newNode;
+ return newNode;
 });
 
 function DocumentType (n,p,s) {
-	this.uber('constructor');
-	this.constructor = DocumentType;
-	this.nodeType = Node.DOCUMENT_TYPE_NODE;
-	this.name = n;
-	this.entities = new NamedNodeMap();
-	this.notations = new NamedNodeMap();
-	this.publicId = p;
-	this.systemId = s;
-	this.internalSubset = null;
+ this.uber('constructor');
+ this.constructor = DocumentType;
+ this.nodeType = Node.DOCUMENT_TYPE_NODE;
+ this.name = n;
+ this.entities = new NamedNodeMap();
+ this.notations = new NamedNodeMap();
+ this.publicId = p;
+ this.systemId = s;
+ this.internalSubset = null;
 }
 DocumentType.inherits(Node);
 
 function Notation (p, s) {
-	this.uber('constructor');
-	this.constructor = Notation;
-	this.nodeType = Node.NOTATION_NODE;
-	this.publicId = p;
-	this.systemId = s;
+ this.uber('constructor');
+ this.constructor = Notation;
+ this.nodeType = Node.NOTATION_NODE;
+ this.publicId = p;
+ this.systemId = s;
 }
 Notation.inherits(Node);
 
 function ProcessingInstruction (target, data) {
-	this.uber('constructor');
-	this.constructor = ProcessingInstruction;
-	this.nodeType = Node.PROCESSING_INSTRUCTION_NODE;
-	this.target = target;
-	this.data = data;
+ this.uber('constructor');
+ this.constructor = ProcessingInstruction;
+ this.nodeType = Node.PROCESSING_INSTRUCTION_NODE;
+ this.target = target;
+ this.data = data;
 }
 ProcessingInstruction.inherits(Node);
 
 function Entity (p, s, n) {
-	this.uber('constructor');
-	this.constructor = Entity;
-	this.nodeType = Node.ENTITY_NODE;
-	this.publicId = p;
-	this.systemId = s;
-	this.notationName = n;
+ this.uber('constructor');
+ this.constructor = Entity;
+ this.nodeType = Node.ENTITY_NODE;
+ this.publicId = p;
+ this.systemId = s;
+ this.notationName = n;
 }
 Entity.inherits(Node);
 
 function EntityReference () {
-	this.uber('constructor');
-	this.constructor = EntityReference;
-	this.nodeType = Node.ENTITY_REFERENCE_NODE;
+ this.uber('constructor');
+ this.constructor = EntityReference;
+ this.nodeType = Node.ENTITY_REFERENCE_NODE;
 }
 EntityReference.inherits(Node);
 
 // Document interface
 function Document (dt) {
-	this.uber('constructor');
-	this.constructor = Document;
-	this.nodeType = Node.DOCUMENT_NODE;
-	this.doctype = dt;
-	this.documentElement = null;
-	this.implementation = new DOMImplementation();
-	this._nodes = [];
-	//log_stdout(' --  Document constructor');
+ this.uber('constructor');
+ this.constructor = Document;
+ this.nodeType = Node.DOCUMENT_NODE;
+ this.doctype = dt;
+ this.documentElement = null;
+ this.implementation = new DOMImplementation();
+ this._nodes = [];
+ //log_stdout(' --  Document constructor');
 }
 
 Document.inherits(Node);
 Document.method('createAttribute', function (tagName) {
-	var node = new Attr(tagName);
-	node.ownerDocument = this;
-	return node;
+ var node = new Attr(tagName);
+ node.ownerDocument = this;
+ return node;
 });
 
 Document.method('createAttributeNS', function (ns,tagName) {
-	var node = this.createAttribute(tagName);
-	node.namespaceURI = ns;
-	return node;
+ var node = this.createAttribute(tagName);
+ node.namespaceURI = ns;
+ return node;
 });
 
 Document.method('createElement', function (tagName) {
-	var node = new Element(tagName);
-	node.ownerDocument = this;
-	node._index = this._nodes.length;
-	this._nodes[this._nodes.length] = node;
-	return node;
+ var node = new Element(tagName);
+ node.ownerDocument = this;
+ node._index = this._nodes.length;
+ this._nodes[this._nodes.length] = node;
+ return node;
 });
 
 Document.method('createElementNS', function (ns,tagName) {
-	var node = this.createElement(tagName);
-	node.namespaceURI = ns;
-	return node;
+ var node = this.createElement(tagName);
+ node.namespaceURI = ns;
+ return node;
 });
 
 Document.method('importNode', function (node, deep) {
-	var tmp = node.clone(deep);
-	tmp.ownerDocument = this;
-	var newNode = tmp.cloneNode(deep);
-	return newNode;
+ var tmp = node.clone(deep);
+ tmp.ownerDocument = this;
+ var newNode = tmp.cloneNode(deep);
+ return newNode;
 });
 
 Document.method('createDocumentFragment', function () {
-	var x = new Node();
-	x.nodeType = Node.DOCUMENT_FRAGMENT_NODE;
-	x.ownerDocument = this;
+ var x = new Node();
+ x.nodeType = Node.DOCUMENT_FRAGMENT_NODE;
+ x.ownerDocument = this;
 });
 
 Document.method('createTextNode', function (content) {
-	var node = new Text(content);
-	node.ownerDocument = this;
-	return node;
+ var node = new Text(content);
+ node.ownerDocument = this;
+ return node;
 });
 
 Document.method('createComment', function (content) {
-	var node = new Comment(content);
-	node.ownerDocument = this;
-	return node;
+ var node = new Comment(content);
+ node.ownerDocument = this;
+ return node;
 });
 
 Document.method('createCDATASection', function (content) {
-	var node = new CDATASection(content);
-	node.ownerDocument = this;
-	return node;
+ var node = new CDATASection(content);
+ node.ownerDocument = this;
+ return node;
 });
 
 Document.method('getElementById', function (id) {
-	for (var i in this._nodes) {
-		//log_stdout(' id = ' + this._nodes[i].attributes.id);
-		if (this._nodes[i] && this._nodes[i].attributes.id == id)
-			return this._nodes[i];
-	}
-	return null;
+ for (var i in this._nodes) {
+  //log_stdout(' id = ' + this._nodes[i].attributes.id);
+  if (this._nodes[i] && this._nodes[i].attributes.id == id)
+   return this._nodes[i];
+ }
+ return null;
 });
 
 Document.method('getElementsByTagName', function (tname) {
-	var list = new NodeList();
-	this.documentElement.getElementsByTagName(tname, list);
-	return list;
+ var list = new NodeList();
+ this.documentElement.getElementsByTagName(tname, list);
+ return list;
 });
 
 Document.method('getElementsByTagNameNS', function (ns, tname) {
-	var list = new NodeList();
-	this.documentElement.getElementsByTagNameNS(ns, tname, list);
-	return list;
+ var list = new NodeList();
+ this.documentElement.getElementsByTagNameNS(ns, tname, list);
+ return list;
 });
 
 // Attr interface
 function Attr ( name, value ) {
-	this.uber('constructor',name);
-	this.constructor = Attr;
-	this.nodeType = Node.ATTRIBUTE_NODE;
-	this.name = name;
-	this.value = this.nodeValue = value;
-	this.specified = (this.value ? true : false);
-	this.ownerElement = null;
-	//log_stdout(' --  Attr constructor');
+ this.uber('constructor',name);
+ this.constructor = Attr;
+ this.nodeType = Node.ATTRIBUTE_NODE;
+ this.name = name;
+ this.value = this.nodeValue = value;
+ this.specified = (this.value ? true : false);
+ this.ownerElement = null;
+ //log_stdout(' --  Attr constructor');
 }
 Attr.inherits(Node);
 
 
 // Element interface
 function Element ( name ) {
-	this.uber('constructor',name);
-	this.constructor = Element;
-	this.nodeType = Node.ELEMENT_NODE;
-	this.tagName = name;
-	//log_stdout(' --  Element constructor')
+ this.uber('constructor',name);
+ this.constructor = Element;
+ this.nodeType = Node.ELEMENT_NODE;
+ this.tagName = name;
+ //log_stdout(' --  Element constructor')
 }
 Element.inherits(Node);
 
 Element.method('getAttribute', function (aname) {
-	var x = this.attributes.getNamedItem(aname);
-	if (x) return x.value;
-	return null;
+ var x = this.attributes.getNamedItem(aname);
+ if (x) return x.value;
+ return null;
 });
 
 Element.method('setAttribute', function (aname,aval) {
-	var attr = new Attr(aname, aval);
-	attr.ownerElement = this;
-	return this.attributes.setNamedItem(attr);
+ var attr = new Attr(aname, aval);
+ attr.ownerElement = this;
+ return this.attributes.setNamedItem(attr);
 });
 
 Element.method('removeAttribute', function (aname) {
-	this.attributes.removeNamedItem(aname);
-	return null;
+ this.attributes.removeNamedItem(aname);
+ return null;
 });
 
 Element.method('getAttributeNode', function (aname) {
-	return this.attributes.getNamedItem(aname);
+ return this.attributes.getNamedItem(aname);
 });
 
 Element.method('setAttributeNode', function (attr) {
-	attr.ownerElement = this;
-	attr.namespaceURI = (attr.namespaceURI ? attr.namespaceURI : this.namespaceURI);
-	return this.attributes.setNamedItem(attr);
+ attr.ownerElement = this;
+ attr.namespaceURI = (attr.namespaceURI ? attr.namespaceURI : this.namespaceURI);
+ return this.attributes.setNamedItem(attr);
 });
 
 Element.method('removeAttributeNode', function (attr) {
-	if (attr.namespaceURI) {
-		return this.attributes.removeNamedItemNS(attr.namespaceURI, attr.name);
-	} else {
-		return this.attributes.removeNamedItem(attr.name);
-	}
+ if (attr.namespaceURI) {
+  return this.attributes.removeNamedItemNS(attr.namespaceURI, attr.name);
+ } else {
+  return this.attributes.removeNamedItem(attr.name);
+ }
 });
 
 Element.method('getAttributeNS', function (ns,aname) {
-	var x = this.attributes.getNamedItemNS(ns,aname);
-	if (x) return x.value;
-	return null;
+ var x = this.attributes.getNamedItemNS(ns,aname);
+ if (x) return x.value;
+ return null;
 });
 
 Element.method('setAttributeNS', function (ns,aname,aval) {
-	var attr = new Attr(aname, aval);
-	attr.ownerElement = this;
-	attr.namespaceURI = ns;
-	return this.attributes.setNamedItem(ns,attr);
+ var attr = new Attr(aname, aval);
+ attr.ownerElement = this;
+ attr.namespaceURI = ns;
+ return this.attributes.setNamedItem(ns,attr);
 });
 
 Element.method('removeAttributeNS', function (ns,aname) {
-	this.attributes.removeNamedItemNS(ns,aname);
-	return null;
+ this.attributes.removeNamedItemNS(ns,aname);
+ return null;
 });
 
 Element.method('getAttributeNodeNS', function (ns, aname) {
-	return this.attributes.getNamedItemNS(ns,aname);
+ return this.attributes.getNamedItemNS(ns,aname);
 });
 
 Element.method('setAttributeNodeNS', function (attr) {
-	attr.ownerElement = this;
-	attr.namespaceURI = (attr.namespaceURI ? attr.namespaceURI : this.namespaceURI);
-	return this.attributes.setNamedItemNS(attr);
+ attr.ownerElement = this;
+ attr.namespaceURI = (attr.namespaceURI ? attr.namespaceURI : this.namespaceURI);
+ return this.attributes.setNamedItemNS(attr);
 });
 
 Element.method('hasAttribute', function (name) {
-	return ( this.getAttribute(name) ? true : false );
+ return ( this.getAttribute(name) ? true : false );
 });
 
 Element.method('hasAttributeNS', function (ns, name) {
-	return ( this.getAttributeNS(ns, name) ? true : false );
+ return ( this.getAttributeNS(ns, name) ? true : false );
 });
 
 Element.method('getElementsByTagName', function (tname, list) {
-	if (!list) list = new NodeList();
-	if (this.tagName == tname) list.push(this);
-	//log_stdout(' --  ' + this.tagName + ' :: ' + this.childNodes.length);
-	for (var i = 0;  i < this.childNodes.length; i++) {
-		if (this.childNodes.item(i).nodeType == 1)
-			this.childNodes.item(i).getElementsByTagName(tname, list);
-	}
-	return list;
+ if (!list) list = new NodeList();
+ if (this.tagName == tname) list.push(this);
+ //log_stdout(' --  ' + this.tagName + ' :: ' + this.childNodes.length);
+ for (var i = 0;  i < this.childNodes.length; i++) {
+  if (this.childNodes.item(i).nodeType == 1)
+   this.childNodes.item(i).getElementsByTagName(tname, list);
+ }
+ return list;
 });
 
 Element.method('getElementsByTagNameNS', function (ns, tname, list) {
-	if (!list) list = new NodeList();
-	if (this.localName == tname && this.namespaceURI == ns) list.push(this);
-	//log_stdout(' --  {' + this.namespaceURI + '}:' + this.localName + ' :: ' + this.childNodes.length);
-	for (var i = 0;  i < this.childNodes.length; i++) {
-		if (this.childNodes.item(i).nodeType == 1)
-			this.childNodes.item(i).getElementsByTagNameNS(ns, tname, list);
-	}
-	return list;
+ if (!list) list = new NodeList();
+ if (this.localName == tname && this.namespaceURI == ns) list.push(this);
+ //log_stdout(' --  {' + this.namespaceURI + '}:' + this.localName + ' :: ' + this.childNodes.length);
+ for (var i = 0;  i < this.childNodes.length; i++) {
+  if (this.childNodes.item(i).nodeType == 1)
+   this.childNodes.item(i).getElementsByTagNameNS(ns, tname, list);
+ }
+ return list;
 });
 
 
 // CharacterData interface
 function CharacterData ( name, content ) {
-	this.uber('constructor', name);
-	this.constructor = CharacterData;
-	this.setData(content);
-	//log_stdout(' --  CharacterData constructor');
-	//log_stdout(' --  CharacterData length == ' + this.length + ' :: ' + this.data);
+ this.uber('constructor', name);
+ this.constructor = CharacterData;
+ this.setData(content);
+ //log_stdout(' --  CharacterData constructor');
+ //log_stdout(' --  CharacterData length == ' + this.length + ' :: ' + this.data);
 }
 CharacterData.inherits(Node);
 
 CharacterData.method('setData', function (content) {
-	this.data = this.nodeValue = content;
-	if (this.data)
-		this.length = this.data.length;
+ this.data = this.nodeValue = content;
+ if (this.data)
+  this.length = this.data.length;
 });
 CharacterData.method('substringData', function (offset,count) {
-	this.data.substring(offset,count);
+ this.data.substring(offset,count);
 });
 CharacterData.method('appendData', function (txt) {
-	this.data = this.nodeValue = this.data + txt;
-	this.length = this.data.length;
+ this.data = this.nodeValue = this.data + txt;
+ this.length = this.data.length;
 });
 CharacterData.method('insertData', function (offset,txt) {
-	var b = this.data.substring(0,offset);
-	var a = this.data.substring(offset);
-	this.data = this.nodeValue = b + txt + a;
-	this.length = this.data.length;
+ var b = this.data.substring(0,offset);
+ var a = this.data.substring(offset);
+ this.data = this.nodeValue = b + txt + a;
+ this.length = this.data.length;
 });
 CharacterData.method('deleteData', function (offset,count) {
-	var b = this.data.substring(0,offset);
-	var a = this.data.substring(offset + count);
-	this.data = this.nodeValue = b + a;
-	this.length = this.data.length;
+ var b = this.data.substring(0,offset);
+ var a = this.data.substring(offset + count);
+ this.data = this.nodeValue = b + a;
+ this.length = this.data.length;
 });
 CharacterData.method('replaceData', function (offset,count,txt) {
-	var b = this.data.substring(0,offset);
-	var a = this.data.substring(offset + count);
-	this.data = this.nodeValue = b + txt +  a;
-	this.length = this.data.length;
+ var b = this.data.substring(0,offset);
+ var a = this.data.substring(offset + count);
+ this.data = this.nodeValue = b + txt +  a;
+ this.length = this.data.length;
 });
 
 
 
 // Text interface
 function Text ( content ) {
-	this.superclass.constructor.call(this, '#text', content);
-	this.constructor = Text;
-	this.nodeType = Node.TEXT_NODE;
-	//log_stdout(' --  Text constructor :: ' + this.data);
+ this.superclass.constructor.call(this, '#text', content);
+ this.constructor = Text;
+ this.nodeType = Node.TEXT_NODE;
+ //log_stdout(' --  Text constructor :: ' + this.data);
 }
 Text.inherits(CharacterData);
 
 
 // CDATASection interface
 function CDATASection ( content ) {
-	this.uber('constructor', '#cdata', content);
-	this.constructor = CDATASection;
-	this.nodeType = Node.COMMENT_NODE;
-	//log_stdout(' --  Comment constructor');
+ this.uber('constructor', '#cdata', content);
+ this.constructor = CDATASection;
+ this.nodeType = Node.COMMENT_NODE;
+ //log_stdout(' --  Comment constructor');
 }
 CDATASection.inherits(Text);
 
 // Comment interface
 function Comment ( content ) {
-	this.uber('constructor', '#comment', content);
-	this.constructor = Comment;
-	this.nodeType = Node.COMMENT_NODE;
-	//log_stdout(' --  Comment constructor');
+ this.uber('constructor', '#comment', content);
+ this.constructor = Comment;
+ this.nodeType = Node.COMMENT_NODE;
+ //log_stdout(' --  Comment constructor');
 }
 Comment.inherits(Text);
 
@@ -631,14 +631,14 @@ Comment.inherits(Text);
 //////////////////////// XPath stuff /////////////////////////
 
 function XPathNamespaceResolver (data) {
-	this.data = data;
+ this.data = data;
 }
 XPathNamespaceResolver.inherits(NamespaceResolver);
 
 XPathNamespaceResolver.method('lookupNamespaceURI', function (prefix) {
-	return this.data[prefix];
+ return this.data[prefix];
 });
 XPathNamespaceResolver.method('setNamespaceURI', function (prefix, uri) {
-	this.data[prefix] = uri;
+ this.data[prefix] = uri;
 });
 
diff --git a/Open-ILS/src/javascript/backend/libs/jsOO.js b/Open-ILS/src/javascript/backend/libs/jsOO.js
index d40321c35f..9df46e99a8 100644
--- a/Open-ILS/src/javascript/backend/libs/jsOO.js
+++ b/Open-ILS/src/javascript/backend/libs/jsOO.js
@@ -31,16 +31,16 @@ Function.method('inherits', function (parent) {
 
 
 instance_of = function(o, c) {
-	while (o != null) {
-		if (o.constructor === c) {
-			return true;
-		}
-		if (o === Object) {
-			return false;
-		}
-		o = o.superclass;
-	}
-	return false;
+ while (o != null) {
+  if (o.constructor === c) {
+   return true;
+  }
+  if (o === Object) {
+   return false;
+  }
+  o = o.superclass;
+ }
+ return false;
 };
 
 
diff --git a/Open-ILS/src/javascript/backend/libs/jsonopensrfrequest.js b/Open-ILS/src/javascript/backend/libs/jsonopensrfrequest.js
index 7f2de1d06b..5f3da75d21 100644
--- a/Open-ILS/src/javascript/backend/libs/jsonopensrfrequest.js
+++ b/Open-ILS/src/javascript/backend/libs/jsonopensrfrequest.js
@@ -1,6 +1,6 @@
 try {
-	load_lib('jsOO.js');
-	load_lib('JSON_v1.js');
+ load_lib('jsOO.js');
+ load_lib('JSON_v1.js');
 } catch (e) {}
 
 var __jsonopensrfreqid = 1;
@@ -40,60 +40,60 @@ JSONOpenSRFRequest.method('connect', function (service) {
 
         if (service) this._service = service;
 
-	if (!this._service)
-		throw "call .open with a service before calling .connect";
-	try {
-        	_OILS_FUNC_jsonopensrfrequest_connect(this._hash_id,this._service);
-	} catch (e) {
-		alert("Sorry, no JSONOpenSRFRequest support");
-	}
+ if (!this._service)
+  throw "call .open with a service before calling .connect";
+ try {
+         _OILS_FUNC_jsonopensrfrequest_connect(this._hash_id,this._service);
+ } catch (e) {
+  alert("Sorry, no JSONOpenSRFRequest support");
+ }
 
         this.connected = __jsonopensrfreq_hash['id' + this._hash_id].connected;
 });
 
 JSONOpenSRFRequest.method('disconnect', function () {
 
-	if (!this._service)
-		throw "call .connect before calling .disconnect";
-	try {
-        	_OILS_FUNC_jsonopensrfrequest_disconnect(this._hash_id);
-	} catch (e) {
-		alert("Sorry, no JSONOpenSRFRequest support");
-	}
+ if (!this._service)
+  throw "call .connect before calling .disconnect";
+ try {
+         _OILS_FUNC_jsonopensrfrequest_disconnect(this._hash_id);
+ } catch (e) {
+  alert("Sorry, no JSONOpenSRFRequest support");
+ }
 
         this.connected = __jsonopensrfreq_hash['id' + this._hash_id].connected;
 });
 
 JSONOpenSRFRequest.method('finish', function () {
 
-	if (!this._service)
-		throw "call .connect before calling .finish";
-	try {
-        	_OILS_FUNC_jsonopensrfrequest_disconnect(this._hash_id);
-        	_OILS_FUNC_jsonopensrfrequest_finish(this._hash_id);
-	} catch (e) {
-		alert("Sorry, no JSONOpenSRFRequest support");
-	}
+ if (!this._service)
+  throw "call .connect before calling .finish";
+ try {
+         _OILS_FUNC_jsonopensrfrequest_disconnect(this._hash_id);
+         _OILS_FUNC_jsonopensrfrequest_finish(this._hash_id);
+ } catch (e) {
+  alert("Sorry, no JSONOpenSRFRequest support");
+ }
 
         this.connected = __jsonopensrfreq_hash['id' + this._hash_id].connected;
 });
 
 JSONOpenSRFRequest.method('send', function () {
 
-	if (!this._service)
-		throw "call .open with a service and a method before calling .send";
+ if (!this._service)
+  throw "call .open with a service and a method before calling .send";
 
-	var data = [];
-	for (var i = 0; i < arguments.length; i++) {
-		data[i] = arguments[i];
-	}
+ var data = [];
+ for (var i = 0; i < arguments.length; i++) {
+  data[i] = arguments[i];
+ }
 
-	try {
-        	//log_debug( this._hash_id + " -> " + this._service + " -> " + this._method + " -> " + this._async + " -> " + js2JSON(data));
-        	_OILS_FUNC_jsonopensrfrequest_send(this._hash_id,this._service,this._method,this._async,js2JSON(data));
-	} catch (e) {
-		alert("Sorry, no JSONOpenSRFRequest support");
-	}
+ try {
+         //log_debug( this._hash_id + " -> " + this._service + " -> " + this._method + " -> " + this._async + " -> " + js2JSON(data));
+         _OILS_FUNC_jsonopensrfrequest_send(this._hash_id,this._service,this._method,this._async,js2JSON(data));
+ } catch (e) {
+  alert("Sorry, no JSONOpenSRFRequest support");
+ }
 
         this.responseText = __jsonopensrfreq_hash['id' + this._hash_id].responseText;
         this.readyState = __jsonopensrfreq_hash['id' + this._hash_id].readyState;
diff --git a/Open-ILS/src/javascript/backend/libs/xmlhttprequest.js b/Open-ILS/src/javascript/backend/libs/xmlhttprequest.js
index 51594e91b0..e9258113e9 100644
--- a/Open-ILS/src/javascript/backend/libs/xmlhttprequest.js
+++ b/Open-ILS/src/javascript/backend/libs/xmlhttprequest.js
@@ -1,6 +1,6 @@
 try {
-	load_lib('jsOO.js');
-	load_lib('jsDOM.js');
+ load_lib('jsOO.js');
+ load_lib('jsDOM.js');
 } catch (e) {}
 
 var __xmlhttpreqid = 1;
@@ -32,11 +32,11 @@ XMLHttpRequest.method('send', function (data) {
 
         __xmlhttpreq_hash['id' + this._hash_id] = {};
 
-	try {
-        	_OILS_FUNC_xmlhttprequest_send(this._hash_id,this._method,this._url,this._async,headerlist,data);
-	} catch (e) {
-		alert("Sorry, no XMLHttpRequest support");
-	}
+ try {
+         _OILS_FUNC_xmlhttprequest_send(this._hash_id,this._method,this._url,this._async,headerlist,data);
+ } catch (e) {
+  alert("Sorry, no XMLHttpRequest support");
+ }
 
         this.responseText = __xmlhttpreq_hash['id' + this._hash_id].responseText;
         this.readyState = __xmlhttpreq_hash['id' + this._hash_id].readyState;
diff --git a/Open-ILS/src/javascript/backend/libs/xpath.js b/Open-ILS/src/javascript/backend/libs/xpath.js
index 25bbcfc065..a7418efc79 100644
--- a/Open-ILS/src/javascript/backend/libs/xpath.js
+++ b/Open-ILS/src/javascript/backend/libs/xpath.js
@@ -117,625 +117,625 @@ XPathParser.prototype.constructor = XPathParser;
 XPathParser.superclass = Object.prototype;
 
 function XPathParser() {
-	this.init();
+ this.init();
 }
 
 XPathParser.prototype.init = function() {
-	this.reduceActions = [];
-
-	this.reduceActions[3] = function(rhs) {
-		return new OrOperation(rhs[0], rhs[2]);
-	};
-	this.reduceActions[5] = function(rhs) {
-		return new AndOperation(rhs[0], rhs[2]);
-	};
-	this.reduceActions[7] = function(rhs) {
-		return new EqualsOperation(rhs[0], rhs[2]);
-	};
-	this.reduceActions[8] = function(rhs) {
-		return new NotEqualOperation(rhs[0], rhs[2]);
-	};
-	this.reduceActions[10] = function(rhs) {
-		return new LessThanOperation(rhs[0], rhs[2]);
-	};
-	this.reduceActions[11] = function(rhs) {
-		return new GreaterThanOperation(rhs[0], rhs[2]);
-	};
-	this.reduceActions[12] = function(rhs) {
-		return new LessThanOrEqualOperation(rhs[0], rhs[2]);
-	};
-	this.reduceActions[13] = function(rhs) {
-		return new GreaterThanOrEqualOperation(rhs[0], rhs[2]);
-	};
-	this.reduceActions[15] = function(rhs) {
-		return new PlusOperation(rhs[0], rhs[2]);
-	};
-	this.reduceActions[16] = function(rhs) {
-		return new MinusOperation(rhs[0], rhs[2]);
-	};
-	this.reduceActions[18] = function(rhs) {
-		return new MultiplyOperation(rhs[0], rhs[2]);
-	};
-	this.reduceActions[19] = function(rhs) {
-		return new DivOperation(rhs[0], rhs[2]);
-	};
-	this.reduceActions[20] = function(rhs) {
-		return new ModOperation(rhs[0], rhs[2]);
-	};
-	this.reduceActions[22] = function(rhs) {
-		return new UnaryMinusOperation(rhs[1]);
-	};
-	this.reduceActions[24] = function(rhs) {
-		return new BarOperation(rhs[0], rhs[2]);
-	};
-	this.reduceActions[25] = function(rhs) {
-		return new PathExpr(undefined, undefined, rhs[0]);
-	};
-	this.reduceActions[27] = function(rhs) {
-		rhs[0].locationPath = rhs[2];
-		return rhs[0];
-	};
-	this.reduceActions[28] = function(rhs) {
-		rhs[0].locationPath = rhs[2];
-		rhs[0].locationPath.steps.unshift(new Step(Step.DESCENDANTORSELF, new NodeTest(NodeTest.NODE, undefined), []));
-		return rhs[0];
-	};
-	this.reduceActions[29] = function(rhs) {
-		return new PathExpr(rhs[0], [], undefined);
-	};
-	this.reduceActions[30] = function(rhs) {
-		if (Utilities.instance_of(rhs[0], PathExpr)) {
-			if (rhs[0].filterPredicates == undefined) {
-				rhs[0].filterPredicates = [];
-			}
-			rhs[0].filterPredicates.push(rhs[1]);
-			return rhs[0];
-		} else {
-			return new PathExpr(rhs[0], [rhs[1]], undefined);
-		}
-	};
-	this.reduceActions[32] = function(rhs) {
-		return rhs[1];
-	};
-	this.reduceActions[33] = function(rhs) {
-		return new XString(rhs[0]);
-	};
-	this.reduceActions[34] = function(rhs) {
-		return new XNumber(rhs[0]);
-	};
-	this.reduceActions[36] = function(rhs) {
-		return new FunctionCall(rhs[0], []);
-	};
-	this.reduceActions[37] = function(rhs) {
-		return new FunctionCall(rhs[0], rhs[2]);
-	};
-	this.reduceActions[38] = function(rhs) {
-		return [ rhs[0] ];
-	};
-	this.reduceActions[39] = function(rhs) {
-		rhs[2].unshift(rhs[0]);
-		return rhs[2];
-	};
-	this.reduceActions[43] = function(rhs) {
-		return new LocationPath(true, []);
-	};
-	this.reduceActions[44] = function(rhs) {
-		rhs[1].absolute = true;
-		return rhs[1];
-	};
-	this.reduceActions[46] = function(rhs) {
-		return new LocationPath(false, [ rhs[0] ]);
-	};
-	this.reduceActions[47] = function(rhs) {
-		rhs[0].steps.push(rhs[2]);
-		return rhs[0];
-	};
-	this.reduceActions[49] = function(rhs) {
-		return new Step(rhs[0], rhs[1], []);
-	};
-	this.reduceActions[50] = function(rhs) {
-		return new Step(Step.CHILD, rhs[0], []);
-	};
-	this.reduceActions[51] = function(rhs) {
-		return new Step(rhs[0], rhs[1], rhs[2]);
-	};
-	this.reduceActions[52] = function(rhs) {
-		return new Step(Step.CHILD, rhs[0], rhs[1]);
-	};
-	this.reduceActions[54] = function(rhs) {
-		return [ rhs[0] ];
-	};
-	this.reduceActions[55] = function(rhs) {
-		rhs[1].unshift(rhs[0]);
-		return rhs[1];
-	};
-	this.reduceActions[56] = function(rhs) {
-		if (rhs[0] == "ancestor") {
-			return Step.ANCESTOR;
-		} else if (rhs[0] == "ancestor-or-self") {
-			return Step.ANCESTORORSELF;
-		} else if (rhs[0] == "attribute") {
-			return Step.ATTRIBUTE;
-		} else if (rhs[0] == "child") {
-			return Step.CHILD;
-		} else if (rhs[0] == "descendant") {
-			return Step.DESCENDANT;
-		} else if (rhs[0] == "descendant-or-self") {
-			return Step.DESCENDANTORSELF;
-		} else if (rhs[0] == "following") {
-			return Step.FOLLOWING;
-		} else if (rhs[0] == "following-sibling") {
-			return Step.FOLLOWINGSIBLING;
-		} else if (rhs[0] == "namespace") {
-			return Step.NAMESPACE;
-		} else if (rhs[0] == "parent") {
-			return Step.PARENT;
-		} else if (rhs[0] == "preceding") {
-			return Step.PRECEDING;
-		} else if (rhs[0] == "preceding-sibling") {
-			return Step.PRECEDINGSIBLING;
-		} else if (rhs[0] == "self") {
-			return Step.SELF;
-		}
-		return -1;
-	};
-	this.reduceActions[57] = function(rhs) {
-		return Step.ATTRIBUTE;
-	};
-	this.reduceActions[59] = function(rhs) {
-		if (rhs[0] == "comment") {
-			return new NodeTest(NodeTest.COMMENT, undefined);
-		} else if (rhs[0] == "text") {
-			return new NodeTest(NodeTest.TEXT, undefined);
-		} else if (rhs[0] == "processing-instruction") {
-			return new NodeTest(NodeTest.PI, undefined);
-		} else if (rhs[0] == "node") {
-			return new NodeTest(NodeTest.NODE, undefined);
-		}
-		return new NodeTest(-1, undefined);
-	};
-	this.reduceActions[60] = function(rhs) {
-		return new NodeTest(NodeTest.PI, rhs[2]);
-	};
-	this.reduceActions[61] = function(rhs) {
-		return rhs[1];
-	};
-	this.reduceActions[63] = function(rhs) {
-		rhs[1].absolute = true;
-		rhs[1].steps.unshift(new Step(Step.DESCENDANTORSELF, new NodeTest(NodeTest.NODE, undefined), []));
-		return rhs[1];
-	};
-	this.reduceActions[64] = function(rhs) {
-		rhs[0].steps.push(new Step(Step.DESCENDANTORSELF, new NodeTest(NodeTest.NODE, undefined), []));
-		rhs[0].steps.push(rhs[2]);
-		return rhs[0];
-	};
-	this.reduceActions[65] = function(rhs) {
-		return new Step(Step.SELF, new NodeTest(NodeTest.NODE, undefined), []);
-	};
-	this.reduceActions[66] = function(rhs) {
-		return new Step(Step.PARENT, new NodeTest(NodeTest.NODE, undefined), []);
-	};
-	this.reduceActions[67] = function(rhs) {
-		return new VariableReference(rhs[1]);
-	};
-	this.reduceActions[68] = function(rhs) {
-		return new NodeTest(NodeTest.NAMETESTANY, undefined);
-	};
-	this.reduceActions[69] = function(rhs) {
-		var prefix = rhs[0].substring(0, rhs[0].indexOf(":"));
-		return new NodeTest(NodeTest.NAMETESTPREFIXANY, prefix);
-	};
-	this.reduceActions[70] = function(rhs) {
-		return new NodeTest(NodeTest.NAMETESTQNAME, rhs[0]);
-	};
+ this.reduceActions = [];
+
+ this.reduceActions[3] = function(rhs) {
+  return new OrOperation(rhs[0], rhs[2]);
+ };
+ this.reduceActions[5] = function(rhs) {
+  return new AndOperation(rhs[0], rhs[2]);
+ };
+ this.reduceActions[7] = function(rhs) {
+  return new EqualsOperation(rhs[0], rhs[2]);
+ };
+ this.reduceActions[8] = function(rhs) {
+  return new NotEqualOperation(rhs[0], rhs[2]);
+ };
+ this.reduceActions[10] = function(rhs) {
+  return new LessThanOperation(rhs[0], rhs[2]);
+ };
+ this.reduceActions[11] = function(rhs) {
+  return new GreaterThanOperation(rhs[0], rhs[2]);
+ };
+ this.reduceActions[12] = function(rhs) {
+  return new LessThanOrEqualOperation(rhs[0], rhs[2]);
+ };
+ this.reduceActions[13] = function(rhs) {
+  return new GreaterThanOrEqualOperation(rhs[0], rhs[2]);
+ };
+ this.reduceActions[15] = function(rhs) {
+  return new PlusOperation(rhs[0], rhs[2]);
+ };
+ this.reduceActions[16] = function(rhs) {
+  return new MinusOperation(rhs[0], rhs[2]);
+ };
+ this.reduceActions[18] = function(rhs) {
+  return new MultiplyOperation(rhs[0], rhs[2]);
+ };
+ this.reduceActions[19] = function(rhs) {
+  return new DivOperation(rhs[0], rhs[2]);
+ };
+ this.reduceActions[20] = function(rhs) {
+  return new ModOperation(rhs[0], rhs[2]);
+ };
+ this.reduceActions[22] = function(rhs) {
+  return new UnaryMinusOperation(rhs[1]);
+ };
+ this.reduceActions[24] = function(rhs) {
+  return new BarOperation(rhs[0], rhs[2]);
+ };
+ this.reduceActions[25] = function(rhs) {
+  return new PathExpr(undefined, undefined, rhs[0]);
+ };
+ this.reduceActions[27] = function(rhs) {
+  rhs[0].locationPath = rhs[2];
+  return rhs[0];
+ };
+ this.reduceActions[28] = function(rhs) {
+  rhs[0].locationPath = rhs[2];
+  rhs[0].locationPath.steps.unshift(new Step(Step.DESCENDANTORSELF, new NodeTest(NodeTest.NODE, undefined), []));
+  return rhs[0];
+ };
+ this.reduceActions[29] = function(rhs) {
+  return new PathExpr(rhs[0], [], undefined);
+ };
+ this.reduceActions[30] = function(rhs) {
+  if (Utilities.instance_of(rhs[0], PathExpr)) {
+   if (rhs[0].filterPredicates == undefined) {
+    rhs[0].filterPredicates = [];
+   }
+   rhs[0].filterPredicates.push(rhs[1]);
+   return rhs[0];
+  } else {
+   return new PathExpr(rhs[0], [rhs[1]], undefined);
+  }
+ };
+ this.reduceActions[32] = function(rhs) {
+  return rhs[1];
+ };
+ this.reduceActions[33] = function(rhs) {
+  return new XString(rhs[0]);
+ };
+ this.reduceActions[34] = function(rhs) {
+  return new XNumber(rhs[0]);
+ };
+ this.reduceActions[36] = function(rhs) {
+  return new FunctionCall(rhs[0], []);
+ };
+ this.reduceActions[37] = function(rhs) {
+  return new FunctionCall(rhs[0], rhs[2]);
+ };
+ this.reduceActions[38] = function(rhs) {
+  return [ rhs[0] ];
+ };
+ this.reduceActions[39] = function(rhs) {
+  rhs[2].unshift(rhs[0]);
+  return rhs[2];
+ };
+ this.reduceActions[43] = function(rhs) {
+  return new LocationPath(true, []);
+ };
+ this.reduceActions[44] = function(rhs) {
+  rhs[1].absolute = true;
+  return rhs[1];
+ };
+ this.reduceActions[46] = function(rhs) {
+  return new LocationPath(false, [ rhs[0] ]);
+ };
+ this.reduceActions[47] = function(rhs) {
+  rhs[0].steps.push(rhs[2]);
+  return rhs[0];
+ };
+ this.reduceActions[49] = function(rhs) {
+  return new Step(rhs[0], rhs[1], []);
+ };
+ this.reduceActions[50] = function(rhs) {
+  return new Step(Step.CHILD, rhs[0], []);
+ };
+ this.reduceActions[51] = function(rhs) {
+  return new Step(rhs[0], rhs[1], rhs[2]);
+ };
+ this.reduceActions[52] = function(rhs) {
+  return new Step(Step.CHILD, rhs[0], rhs[1]);
+ };
+ this.reduceActions[54] = function(rhs) {
+  return [ rhs[0] ];
+ };
+ this.reduceActions[55] = function(rhs) {
+  rhs[1].unshift(rhs[0]);
+  return rhs[1];
+ };
+ this.reduceActions[56] = function(rhs) {
+  if (rhs[0] == "ancestor") {
+   return Step.ANCESTOR;
+  } else if (rhs[0] == "ancestor-or-self") {
+   return Step.ANCESTORORSELF;
+  } else if (rhs[0] == "attribute") {
+   return Step.ATTRIBUTE;
+  } else if (rhs[0] == "child") {
+   return Step.CHILD;
+  } else if (rhs[0] == "descendant") {
+   return Step.DESCENDANT;
+  } else if (rhs[0] == "descendant-or-self") {
+   return Step.DESCENDANTORSELF;
+  } else if (rhs[0] == "following") {
+   return Step.FOLLOWING;
+  } else if (rhs[0] == "following-sibling") {
+   return Step.FOLLOWINGSIBLING;
+  } else if (rhs[0] == "namespace") {
+   return Step.NAMESPACE;
+  } else if (rhs[0] == "parent") {
+   return Step.PARENT;
+  } else if (rhs[0] == "preceding") {
+   return Step.PRECEDING;
+  } else if (rhs[0] == "preceding-sibling") {
+   return Step.PRECEDINGSIBLING;
+  } else if (rhs[0] == "self") {
+   return Step.SELF;
+  }
+  return -1;
+ };
+ this.reduceActions[57] = function(rhs) {
+  return Step.ATTRIBUTE;
+ };
+ this.reduceActions[59] = function(rhs) {
+  if (rhs[0] == "comment") {
+   return new NodeTest(NodeTest.COMMENT, undefined);
+  } else if (rhs[0] == "text") {
+   return new NodeTest(NodeTest.TEXT, undefined);
+  } else if (rhs[0] == "processing-instruction") {
+   return new NodeTest(NodeTest.PI, undefined);
+  } else if (rhs[0] == "node") {
+   return new NodeTest(NodeTest.NODE, undefined);
+  }
+  return new NodeTest(-1, undefined);
+ };
+ this.reduceActions[60] = function(rhs) {
+  return new NodeTest(NodeTest.PI, rhs[2]);
+ };
+ this.reduceActions[61] = function(rhs) {
+  return rhs[1];
+ };
+ this.reduceActions[63] = function(rhs) {
+  rhs[1].absolute = true;
+  rhs[1].steps.unshift(new Step(Step.DESCENDANTORSELF, new NodeTest(NodeTest.NODE, undefined), []));
+  return rhs[1];
+ };
+ this.reduceActions[64] = function(rhs) {
+  rhs[0].steps.push(new Step(Step.DESCENDANTORSELF, new NodeTest(NodeTest.NODE, undefined), []));
+  rhs[0].steps.push(rhs[2]);
+  return rhs[0];
+ };
+ this.reduceActions[65] = function(rhs) {
+  return new Step(Step.SELF, new NodeTest(NodeTest.NODE, undefined), []);
+ };
+ this.reduceActions[66] = function(rhs) {
+  return new Step(Step.PARENT, new NodeTest(NodeTest.NODE, undefined), []);
+ };
+ this.reduceActions[67] = function(rhs) {
+  return new VariableReference(rhs[1]);
+ };
+ this.reduceActions[68] = function(rhs) {
+  return new NodeTest(NodeTest.NAMETESTANY, undefined);
+ };
+ this.reduceActions[69] = function(rhs) {
+  var prefix = rhs[0].substring(0, rhs[0].indexOf(":"));
+  return new NodeTest(NodeTest.NAMETESTPREFIXANY, prefix);
+ };
+ this.reduceActions[70] = function(rhs) {
+  return new NodeTest(NodeTest.NAMETESTQNAME, rhs[0]);
+ };
 };
 
 XPathParser.actionTable = [
-	" s s        sssssssss    s ss  s  ss",
-	"                 s                  ",
-	"r  rrrrrrrrr         rrrrrrr rr  r  ",
-	"                rrrrr               ",
-	" s s        sssssssss    s ss  s  ss",
-	"rs  rrrrrrrr s  sssssrrrrrr  rrs rs ",
-	" s s        sssssssss    s ss  s  ss",
-	"                            s       ",
-	"                            s       ",
-	"r  rrrrrrrrr         rrrrrrr rr rr  ",
-	"r  rrrrrrrrr         rrrrrrr rr rr  ",
-	"r  rrrrrrrrr         rrrrrrr rr rr  ",
-	"r  rrrrrrrrr         rrrrrrr rr rr  ",
-	"r  rrrrrrrrr         rrrrrrr rr rr  ",
-	"  s                                 ",
-	"                            s       ",
-	" s           s  sssss          s  s ",
-	"r  rrrrrrrrr         rrrrrrr rr  r  ",
-	"a                                   ",
-	"r       s                    rr  r  ",
-	"r      sr                    rr  r  ",
-	"r   s  rr            s       rr  r  ",
-	"r   rssrr            rss     rr  r  ",
-	"r   rrrrr            rrrss   rr  r  ",
-	"r   rrrrrsss         rrrrr   rr  r  ",
-	"r   rrrrrrrr         rrrrr   rr  r  ",
-	"r   rrrrrrrr         rrrrrs  rr  r  ",
-	"r   rrrrrrrr         rrrrrr  rr  r  ",
-	"r   rrrrrrrr         rrrrrr  rr  r  ",
-	"r  srrrrrrrr         rrrrrrs rr sr  ",
-	"r  srrrrrrrr         rrrrrrs rr  r  ",
-	"r  rrrrrrrrr         rrrrrrr rr rr  ",
-	"r  rrrrrrrrr         rrrrrrr rr rr  ",
-	"r  rrrrrrrrr         rrrrrrr rr rr  ",
-	"r   rrrrrrrr         rrrrrr  rr  r  ",
-	"r   rrrrrrrr         rrrrrr  rr  r  ",
-	"r  rrrrrrrrr         rrrrrrr rr  r  ",
-	"r  rrrrrrrrr         rrrrrrr rr  r  ",
-	"                sssss               ",
-	"r  rrrrrrrrr         rrrrrrr rr sr  ",
-	"r  rrrrrrrrr         rrrrrrr rr  r  ",
-	"r  rrrrrrrrr         rrrrrrr rr rr  ",
-	"r  rrrrrrrrr         rrrrrrr rr rr  ",
-	"                             s      ",
-	"r  srrrrrrrr         rrrrrrs rr  r  ",
-	"r   rrrrrrrr         rrrrr   rr  r  ",
-	"              s                     ",
-	"                             s      ",
-	"                rrrrr               ",
-	" s s        sssssssss    s sss s  ss",
-	"r  srrrrrrrr         rrrrrrs rr  r  ",
-	" s s        sssssssss    s ss  s  ss",
-	" s s        sssssssss    s ss  s  ss",
-	" s s        sssssssss    s ss  s  ss",
-	" s s        sssssssss    s ss  s  ss",
-	" s s        sssssssss    s ss  s  ss",
-	" s s        sssssssss    s ss  s  ss",
-	" s s        sssssssss    s ss  s  ss",
-	" s s        sssssssss    s ss  s  ss",
-	" s s        sssssssss    s ss  s  ss",
-	" s s        sssssssss    s ss  s  ss",
-	" s s        sssssssss    s ss  s  ss",
-	" s s        sssssssss    s ss  s  ss",
-	" s s        sssssssss    s ss  s  ss",
-	" s s        sssssssss      ss  s  ss",
-	" s s        sssssssss    s ss  s  ss",
-	" s           s  sssss          s  s ",
-	" s           s  sssss          s  s ",
-	"r  rrrrrrrrr         rrrrrrr rr rr  ",
-	" s           s  sssss          s  s ",
-	" s           s  sssss          s  s ",
-	"r  rrrrrrrrr         rrrrrrr rr sr  ",
-	"r  rrrrrrrrr         rrrrrrr rr sr  ",
-	"r  rrrrrrrrr         rrrrrrr rr  r  ",
-	"r  rrrrrrrrr         rrrrrrr rr rr  ",
-	"                             s      ",
-	"r  rrrrrrrrr         rrrrrrr rr rr  ",
-	"r  rrrrrrrrr         rrrrrrr rr rr  ",
-	"                             rr     ",
-	"                             s      ",
-	"                             rs     ",
-	"r      sr                    rr  r  ",
-	"r   s  rr            s       rr  r  ",
-	"r   rssrr            rss     rr  r  ",
-	"r   rssrr            rss     rr  r  ",
-	"r   rrrrr            rrrss   rr  r  ",
-	"r   rrrrr            rrrss   rr  r  ",
-	"r   rrrrr            rrrss   rr  r  ",
-	"r   rrrrr            rrrss   rr  r  ",
-	"r   rrrrrsss         rrrrr   rr  r  ",
-	"r   rrrrrsss         rrrrr   rr  r  ",
-	"r   rrrrrrrr         rrrrr   rr  r  ",
-	"r   rrrrrrrr         rrrrr   rr  r  ",
-	"r   rrrrrrrr         rrrrr   rr  r  ",
-	"r   rrrrrrrr         rrrrrr  rr  r  ",
-	"                                 r  ",
-	"                                 s  ",
-	"r  srrrrrrrr         rrrrrrs rr  r  ",
-	"r  srrrrrrrr         rrrrrrs rr  r  ",
-	"r  rrrrrrrrr         rrrrrrr rr  r  ",
-	"r  rrrrrrrrr         rrrrrrr rr  r  ",
-	"r  rrrrrrrrr         rrrrrrr rr  r  ",
-	"r  rrrrrrrrr         rrrrrrr rr  r  ",
-	"r  rrrrrrrrr         rrrrrrr rr rr  ",
-	"r  rrrrrrrrr         rrrrrrr rr rr  ",
-	" s s        sssssssss    s ss  s  ss",
-	"r  rrrrrrrrr         rrrrrrr rr rr  ",
-	"                             r      "
+ " s s        sssssssss    s ss  s  ss",
+ "                 s                  ",
+ "r  rrrrrrrrr         rrrrrrr rr  r  ",
+ "                rrrrr               ",
+ " s s        sssssssss    s ss  s  ss",
+ "rs  rrrrrrrr s  sssssrrrrrr  rrs rs ",
+ " s s        sssssssss    s ss  s  ss",
+ "                            s       ",
+ "                            s       ",
+ "r  rrrrrrrrr         rrrrrrr rr rr  ",
+ "r  rrrrrrrrr         rrrrrrr rr rr  ",
+ "r  rrrrrrrrr         rrrrrrr rr rr  ",
+ "r  rrrrrrrrr         rrrrrrr rr rr  ",
+ "r  rrrrrrrrr         rrrrrrr rr rr  ",
+ "  s                                 ",
+ "                            s       ",
+ " s           s  sssss          s  s ",
+ "r  rrrrrrrrr         rrrrrrr rr  r  ",
+ "a                                   ",
+ "r       s                    rr  r  ",
+ "r      sr                    rr  r  ",
+ "r   s  rr            s       rr  r  ",
+ "r   rssrr            rss     rr  r  ",
+ "r   rrrrr            rrrss   rr  r  ",
+ "r   rrrrrsss         rrrrr   rr  r  ",
+ "r   rrrrrrrr         rrrrr   rr  r  ",
+ "r   rrrrrrrr         rrrrrs  rr  r  ",
+ "r   rrrrrrrr         rrrrrr  rr  r  ",
+ "r   rrrrrrrr         rrrrrr  rr  r  ",
+ "r  srrrrrrrr         rrrrrrs rr sr  ",
+ "r  srrrrrrrr         rrrrrrs rr  r  ",
+ "r  rrrrrrrrr         rrrrrrr rr rr  ",
+ "r  rrrrrrrrr         rrrrrrr rr rr  ",
+ "r  rrrrrrrrr         rrrrrrr rr rr  ",
+ "r   rrrrrrrr         rrrrrr  rr  r  ",
+ "r   rrrrrrrr         rrrrrr  rr  r  ",
+ "r  rrrrrrrrr         rrrrrrr rr  r  ",
+ "r  rrrrrrrrr         rrrrrrr rr  r  ",
+ "                sssss               ",
+ "r  rrrrrrrrr         rrrrrrr rr sr  ",
+ "r  rrrrrrrrr         rrrrrrr rr  r  ",
+ "r  rrrrrrrrr         rrrrrrr rr rr  ",
+ "r  rrrrrrrrr         rrrrrrr rr rr  ",
+ "                             s      ",
+ "r  srrrrrrrr         rrrrrrs rr  r  ",
+ "r   rrrrrrrr         rrrrr   rr  r  ",
+ "              s                     ",
+ "                             s      ",
+ "                rrrrr               ",
+ " s s        sssssssss    s sss s  ss",
+ "r  srrrrrrrr         rrrrrrs rr  r  ",
+ " s s        sssssssss    s ss  s  ss",
+ " s s        sssssssss    s ss  s  ss",
+ " s s        sssssssss    s ss  s  ss",
+ " s s        sssssssss    s ss  s  ss",
+ " s s        sssssssss    s ss  s  ss",
+ " s s        sssssssss    s ss  s  ss",
+ " s s        sssssssss    s ss  s  ss",
+ " s s        sssssssss    s ss  s  ss",
+ " s s        sssssssss    s ss  s  ss",
+ " s s        sssssssss    s ss  s  ss",
+ " s s        sssssssss    s ss  s  ss",
+ " s s        sssssssss    s ss  s  ss",
+ " s s        sssssssss    s ss  s  ss",
+ " s s        sssssssss      ss  s  ss",
+ " s s        sssssssss    s ss  s  ss",
+ " s           s  sssss          s  s ",
+ " s           s  sssss          s  s ",
+ "r  rrrrrrrrr         rrrrrrr rr rr  ",
+ " s           s  sssss          s  s ",
+ " s           s  sssss          s  s ",
+ "r  rrrrrrrrr         rrrrrrr rr sr  ",
+ "r  rrrrrrrrr         rrrrrrr rr sr  ",
+ "r  rrrrrrrrr         rrrrrrr rr  r  ",
+ "r  rrrrrrrrr         rrrrrrr rr rr  ",
+ "                             s      ",
+ "r  rrrrrrrrr         rrrrrrr rr rr  ",
+ "r  rrrrrrrrr         rrrrrrr rr rr  ",
+ "                             rr     ",
+ "                             s      ",
+ "                             rs     ",
+ "r      sr                    rr  r  ",
+ "r   s  rr            s       rr  r  ",
+ "r   rssrr            rss     rr  r  ",
+ "r   rssrr            rss     rr  r  ",
+ "r   rrrrr            rrrss   rr  r  ",
+ "r   rrrrr            rrrss   rr  r  ",
+ "r   rrrrr            rrrss   rr  r  ",
+ "r   rrrrr            rrrss   rr  r  ",
+ "r   rrrrrsss         rrrrr   rr  r  ",
+ "r   rrrrrsss         rrrrr   rr  r  ",
+ "r   rrrrrrrr         rrrrr   rr  r  ",
+ "r   rrrrrrrr         rrrrr   rr  r  ",
+ "r   rrrrrrrr         rrrrr   rr  r  ",
+ "r   rrrrrrrr         rrrrrr  rr  r  ",
+ "                                 r  ",
+ "                                 s  ",
+ "r  srrrrrrrr         rrrrrrs rr  r  ",
+ "r  srrrrrrrr         rrrrrrs rr  r  ",
+ "r  rrrrrrrrr         rrrrrrr rr  r  ",
+ "r  rrrrrrrrr         rrrrrrr rr  r  ",
+ "r  rrrrrrrrr         rrrrrrr rr  r  ",
+ "r  rrrrrrrrr         rrrrrrr rr  r  ",
+ "r  rrrrrrrrr         rrrrrrr rr rr  ",
+ "r  rrrrrrrrr         rrrrrrr rr rr  ",
+ " s s        sssssssss    s ss  s  ss",
+ "r  rrrrrrrrr         rrrrrrr rr rr  ",
+ "                             r      "
 ];
 
 XPathParser.actionTableNumber = [
-	" 1 0        /.-,+*)('    & %$  #  \"!",
-	"                 J                  ",
-	"a  aaaaaaaaa         aaaaaaa aa  a  ",
-	"                YYYYY               ",
-	" 1 0        /.-,+*)('    & %$  #  \"!",
-	"K1  KKKKKKKK .  +*)('KKKKKK  KK# K\" ",
-	" 1 0        /.-,+*)('    & %$  #  \"!",
-	"                            N       ",
-	"                            O       ",
-	"e  eeeeeeeee         eeeeeee ee ee  ",
-	"f  fffffffff         fffffff ff ff  ",
-	"d  ddddddddd         ddddddd dd dd  ",
-	"B  BBBBBBBBB         BBBBBBB BB BB  ",
-	"A  AAAAAAAAA         AAAAAAA AA AA  ",
-	"  P                                 ",
-	"                            Q       ",
-	" 1           .  +*)('          #  \" ",
-	"b  bbbbbbbbb         bbbbbbb bb  b  ",
-	"                                    ",
-	"!       S                    !!  !  ",
-	"\"      T\"                    \"\"  \"  ",
-	"$   V  $$            U       $$  $  ",
-	"&   &ZY&&            &XW     &&  &  ",
-	")   )))))            )))\\[   ))  )  ",
-	".   ....._^]         .....   ..  .  ",
-	"1   11111111         11111   11  1  ",
-	"5   55555555         55555`  55  5  ",
-	"7   77777777         777777  77  7  ",
-	"9   99999999         999999  99  9  ",
-	":  c::::::::         ::::::b :: a:  ",
-	"I  fIIIIIIII         IIIIIIe II  I  ",
-	"=  =========         ======= == ==  ",
-	"?  ?????????         ??????? ?? ??  ",
-	"C  CCCCCCCCC         CCCCCCC CC CC  ",
-	"J   JJJJJJJJ         JJJJJJ  JJ  J  ",
-	"M   MMMMMMMM         MMMMMM  MM  M  ",
-	"N  NNNNNNNNN         NNNNNNN NN  N  ",
-	"P  PPPPPPPPP         PPPPPPP PP  P  ",
-	"                +*)('               ",
-	"R  RRRRRRRRR         RRRRRRR RR aR  ",
-	"U  UUUUUUUUU         UUUUUUU UU  U  ",
-	"Z  ZZZZZZZZZ         ZZZZZZZ ZZ ZZ  ",
-	"c  ccccccccc         ccccccc cc cc  ",
-	"                             j      ",
-	"L  fLLLLLLLL         LLLLLLe LL  L  ",
-	"6   66666666         66666   66  6  ",
-	"              k                     ",
-	"                             l      ",
-	"                XXXXX               ",
-	" 1 0        /.-,+*)('    & %$m #  \"!",
-	"_  f________         ______e __  _  ",
-	" 1 0        /.-,+*)('    & %$  #  \"!",
-	" 1 0        /.-,+*)('    & %$  #  \"!",
-	" 1 0        /.-,+*)('    & %$  #  \"!",
-	" 1 0        /.-,+*)('    & %$  #  \"!",
-	" 1 0        /.-,+*)('    & %$  #  \"!",
-	" 1 0        /.-,+*)('    & %$  #  \"!",
-	" 1 0        /.-,+*)('    & %$  #  \"!",
-	" 1 0        /.-,+*)('    & %$  #  \"!",
-	" 1 0        /.-,+*)('    & %$  #  \"!",
-	" 1 0        /.-,+*)('    & %$  #  \"!",
-	" 1 0        /.-,+*)('    & %$  #  \"!",
-	" 1 0        /.-,+*)('    & %$  #  \"!",
-	" 1 0        /.-,+*)('    & %$  #  \"!",
-	" 1 0        /.-,+*)('      %$  #  \"!",
-	" 1 0        /.-,+*)('    & %$  #  \"!",
-	" 1           .  +*)('          #  \" ",
-	" 1           .  +*)('          #  \" ",
-	">  >>>>>>>>>         >>>>>>> >> >>  ",
-	" 1           .  +*)('          #  \" ",
-	" 1           .  +*)('          #  \" ",
-	"Q  QQQQQQQQQ         QQQQQQQ QQ aQ  ",
-	"V  VVVVVVVVV         VVVVVVV VV aV  ",
-	"T  TTTTTTTTT         TTTTTTT TT  T  ",
-	"@  @@@@@@@@@         @@@@@@@ @@ @@  ",
-	"                             \x87      ",
-	"[  [[[[[[[[[         [[[[[[[ [[ [[  ",
-	"D  DDDDDDDDD         DDDDDDD DD DD  ",
-	"                             HH     ",
-	"                             \x88      ",
-	"                             F\x89     ",
-	"#      T#                    ##  #  ",
-	"%   V  %%            U       %%  %  ",
-	"'   'ZY''            'XW     ''  '  ",
-	"(   (ZY((            (XW     ((  (  ",
-	"+   +++++            +++\\[   ++  +  ",
-	"*   *****            ***\\[   **  *  ",
-	"-   -----            ---\\[   --  -  ",
-	",   ,,,,,            ,,,\\[   ,,  ,  ",
-	"0   00000_^]         00000   00  0  ",
-	"/   /////_^]         /////   //  /  ",
-	"2   22222222         22222   22  2  ",
-	"3   33333333         33333   33  3  ",
-	"4   44444444         44444   44  4  ",
-	"8   88888888         888888  88  8  ",
-	"                                 ^  ",
-	"                                 \x8a  ",
-	";  f;;;;;;;;         ;;;;;;e ;;  ;  ",
-	"<  f<<<<<<<<         <<<<<<e <<  <  ",
-	"O  OOOOOOOOO         OOOOOOO OO  O  ",
-	"`  `````````         ``````` ``  `  ",
-	"S  SSSSSSSSS         SSSSSSS SS  S  ",
-	"W  WWWWWWWWW         WWWWWWW WW  W  ",
-	"\\  \\\\\\\\\\\\\\\\\\         \\\\\\\\\\\\\\ \\\\ \\\\  ",
-	"E  EEEEEEEEE         EEEEEEE EE EE  ",
-	" 1 0        /.-,+*)('    & %$  #  \"!",
-	"]  ]]]]]]]]]         ]]]]]]] ]] ]]  ",
-	"                             G      "
+ " 1 0        /.-,+*)('    & %$  #  \"!",
+ "                 J                  ",
+ "a  aaaaaaaaa         aaaaaaa aa  a  ",
+ "                YYYYY               ",
+ " 1 0        /.-,+*)('    & %$  #  \"!",
+ "K1  KKKKKKKK .  +*)('KKKKKK  KK# K\" ",
+ " 1 0        /.-,+*)('    & %$  #  \"!",
+ "                            N       ",
+ "                            O       ",
+ "e  eeeeeeeee         eeeeeee ee ee  ",
+ "f  fffffffff         fffffff ff ff  ",
+ "d  ddddddddd         ddddddd dd dd  ",
+ "B  BBBBBBBBB         BBBBBBB BB BB  ",
+ "A  AAAAAAAAA         AAAAAAA AA AA  ",
+ "  P                                 ",
+ "                            Q       ",
+ " 1           .  +*)('          #  \" ",
+ "b  bbbbbbbbb         bbbbbbb bb  b  ",
+ "                                    ",
+ "!       S                    !!  !  ",
+ "\"      T\"                    \"\"  \"  ",
+ "$   V  $$            U       $$  $  ",
+ "&   &ZY&&            &XW     &&  &  ",
+ ")   )))))            )))\\[   ))  )  ",
+ ".   ....._^]         .....   ..  .  ",
+ "1   11111111         11111   11  1  ",
+ "5   55555555         55555`  55  5  ",
+ "7   77777777         777777  77  7  ",
+ "9   99999999         999999  99  9  ",
+ ":  c::::::::         ::::::b :: a:  ",
+ "I  fIIIIIIII         IIIIIIe II  I  ",
+ "=  =========         ======= == ==  ",
+ "?  ?????????         ??????? ?? ??  ",
+ "C  CCCCCCCCC         CCCCCCC CC CC  ",
+ "J   JJJJJJJJ         JJJJJJ  JJ  J  ",
+ "M   MMMMMMMM         MMMMMM  MM  M  ",
+ "N  NNNNNNNNN         NNNNNNN NN  N  ",
+ "P  PPPPPPPPP         PPPPPPP PP  P  ",
+ "                +*)('               ",
+ "R  RRRRRRRRR         RRRRRRR RR aR  ",
+ "U  UUUUUUUUU         UUUUUUU UU  U  ",
+ "Z  ZZZZZZZZZ         ZZZZZZZ ZZ ZZ  ",
+ "c  ccccccccc         ccccccc cc cc  ",
+ "                             j      ",
+ "L  fLLLLLLLL         LLLLLLe LL  L  ",
+ "6   66666666         66666   66  6  ",
+ "              k                     ",
+ "                             l      ",
+ "                XXXXX               ",
+ " 1 0        /.-,+*)('    & %$m #  \"!",
+ "_  f________         ______e __  _  ",
+ " 1 0        /.-,+*)('    & %$  #  \"!",
+ " 1 0        /.-,+*)('    & %$  #  \"!",
+ " 1 0        /.-,+*)('    & %$  #  \"!",
+ " 1 0        /.-,+*)('    & %$  #  \"!",
+ " 1 0        /.-,+*)('    & %$  #  \"!",
+ " 1 0        /.-,+*)('    & %$  #  \"!",
+ " 1 0        /.-,+*)('    & %$  #  \"!",
+ " 1 0        /.-,+*)('    & %$  #  \"!",
+ " 1 0        /.-,+*)('    & %$  #  \"!",
+ " 1 0        /.-,+*)('    & %$  #  \"!",
+ " 1 0        /.-,+*)('    & %$  #  \"!",
+ " 1 0        /.-,+*)('    & %$  #  \"!",
+ " 1 0        /.-,+*)('    & %$  #  \"!",
+ " 1 0        /.-,+*)('      %$  #  \"!",
+ " 1 0        /.-,+*)('    & %$  #  \"!",
+ " 1           .  +*)('          #  \" ",
+ " 1           .  +*)('          #  \" ",
+ ">  >>>>>>>>>         >>>>>>> >> >>  ",
+ " 1           .  +*)('          #  \" ",
+ " 1           .  +*)('          #  \" ",
+ "Q  QQQQQQQQQ         QQQQQQQ QQ aQ  ",
+ "V  VVVVVVVVV         VVVVVVV VV aV  ",
+ "T  TTTTTTTTT         TTTTTTT TT  T  ",
+ "@  @@@@@@@@@         @@@@@@@ @@ @@  ",
+ "                             \x87      ",
+ "[  [[[[[[[[[         [[[[[[[ [[ [[  ",
+ "D  DDDDDDDDD         DDDDDDD DD DD  ",
+ "                             HH     ",
+ "                             \x88      ",
+ "                             F\x89     ",
+ "#      T#                    ##  #  ",
+ "%   V  %%            U       %%  %  ",
+ "'   'ZY''            'XW     ''  '  ",
+ "(   (ZY((            (XW     ((  (  ",
+ "+   +++++            +++\\[   ++  +  ",
+ "*   *****            ***\\[   **  *  ",
+ "-   -----            ---\\[   --  -  ",
+ ",   ,,,,,            ,,,\\[   ,,  ,  ",
+ "0   00000_^]         00000   00  0  ",
+ "/   /////_^]         /////   //  /  ",
+ "2   22222222         22222   22  2  ",
+ "3   33333333         33333   33  3  ",
+ "4   44444444         44444   44  4  ",
+ "8   88888888         888888  88  8  ",
+ "                                 ^  ",
+ "                                 \x8a  ",
+ ";  f;;;;;;;;         ;;;;;;e ;;  ;  ",
+ "<  f<<<<<<<<         <<<<<<e <<  <  ",
+ "O  OOOOOOOOO         OOOOOOO OO  O  ",
+ "`  `````````         ``````` ``  `  ",
+ "S  SSSSSSSSS         SSSSSSS SS  S  ",
+ "W  WWWWWWWWW         WWWWWWW WW  W  ",
+ "\\  \\\\\\\\\\\\\\\\\\         \\\\\\\\\\\\\\ \\\\ \\\\  ",
+ "E  EEEEEEEEE         EEEEEEE EE EE  ",
+ " 1 0        /.-,+*)('    & %$  #  \"!",
+ "]  ]]]]]]]]]         ]]]]]]] ]] ]]  ",
+ "                             G      "
 ];
 
 XPathParser.gotoTable = [
-	"3456789:;<=>?@ AB  CDEFGH IJ ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"L456789:;<=>?@ AB  CDEFGH IJ ",
-	"            M        EFGH IJ ",
-	"       N;<=>?@ AB  CDEFGH IJ ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"            S        EFGH IJ ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"              e              ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                        h  J ",
-	"              i          j   ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"o456789:;<=>?@ ABpqCDEFGH IJ ",
-	"                             ",
-	"  r6789:;<=>?@ AB  CDEFGH IJ ",
-	"   s789:;<=>?@ AB  CDEFGH IJ ",
-	"    t89:;<=>?@ AB  CDEFGH IJ ",
-	"    u89:;<=>?@ AB  CDEFGH IJ ",
-	"     v9:;<=>?@ AB  CDEFGH IJ ",
-	"     w9:;<=>?@ AB  CDEFGH IJ ",
-	"     x9:;<=>?@ AB  CDEFGH IJ ",
-	"     y9:;<=>?@ AB  CDEFGH IJ ",
-	"      z:;<=>?@ AB  CDEFGH IJ ",
-	"      {:;<=>?@ AB  CDEFGH IJ ",
-	"       |;<=>?@ AB  CDEFGH IJ ",
-	"       };<=>?@ AB  CDEFGH IJ ",
-	"       ~;<=>?@ AB  CDEFGH IJ ",
-	"         \x7f=>?@ AB  CDEFGH IJ ",
-	"\x80456789:;<=>?@ AB  CDEFGH IJ\x81",
-	"            \x82        EFGH IJ ",
-	"            \x83        EFGH IJ ",
-	"                             ",
-	"                     \x84 GH IJ ",
-	"                     \x85 GH IJ ",
-	"              i          \x86   ",
-	"              i          \x87   ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"                             ",
-	"o456789:;<=>?@ AB\x8cqCDEFGH IJ ",
-	"                             ",
-	"                             "
+ "3456789:;<=>?@ AB  CDEFGH IJ ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "L456789:;<=>?@ AB  CDEFGH IJ ",
+ "            M        EFGH IJ ",
+ "       N;<=>?@ AB  CDEFGH IJ ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "            S        EFGH IJ ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "              e              ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                        h  J ",
+ "              i          j   ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "o456789:;<=>?@ ABpqCDEFGH IJ ",
+ "                             ",
+ "  r6789:;<=>?@ AB  CDEFGH IJ ",
+ "   s789:;<=>?@ AB  CDEFGH IJ ",
+ "    t89:;<=>?@ AB  CDEFGH IJ ",
+ "    u89:;<=>?@ AB  CDEFGH IJ ",
+ "     v9:;<=>?@ AB  CDEFGH IJ ",
+ "     w9:;<=>?@ AB  CDEFGH IJ ",
+ "     x9:;<=>?@ AB  CDEFGH IJ ",
+ "     y9:;<=>?@ AB  CDEFGH IJ ",
+ "      z:;<=>?@ AB  CDEFGH IJ ",
+ "      {:;<=>?@ AB  CDEFGH IJ ",
+ "       |;<=>?@ AB  CDEFGH IJ ",
+ "       };<=>?@ AB  CDEFGH IJ ",
+ "       ~;<=>?@ AB  CDEFGH IJ ",
+ "         \x7f=>?@ AB  CDEFGH IJ ",
+ "\x80456789:;<=>?@ AB  CDEFGH IJ\x81",
+ "            \x82        EFGH IJ ",
+ "            \x83        EFGH IJ ",
+ "                             ",
+ "                     \x84 GH IJ ",
+ "                     \x85 GH IJ ",
+ "              i          \x86   ",
+ "              i          \x87   ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "                             ",
+ "o456789:;<=>?@ AB\x8cqCDEFGH IJ ",
+ "                             ",
+ "                             "
 ];
 
 XPathParser.productions = [
-	[1, 1, 2],
-	[2, 1, 3],
-	[3, 1, 4],
-	[3, 3, 3, -9, 4],
-	[4, 1, 5],
-	[4, 3, 4, -8, 5],
-	[5, 1, 6],
-	[5, 3, 5, -22, 6],
-	[5, 3, 5, -5, 6],
-	[6, 1, 7],
-	[6, 3, 6, -23, 7],
-	[6, 3, 6, -24, 7],
-	[6, 3, 6, -6, 7],
-	[6, 3, 6, -7, 7],
-	[7, 1, 8],
-	[7, 3, 7, -25, 8],
-	[7, 3, 7, -26, 8],
-	[8, 1, 9],
-	[8, 3, 8, -12, 9],
-	[8, 3, 8, -11, 9],
-	[8, 3, 8, -10, 9],
-	[9, 1, 10],
-	[9, 2, -26, 9],
-	[10, 1, 11],
-	[10, 3, 10, -27, 11],
-	[11, 1, 12],
-	[11, 1, 13],
-	[11, 3, 13, -28, 14],
-	[11, 3, 13, -4, 14],
-	[13, 1, 15],
-	[13, 2, 13, 16],
-	[15, 1, 17],
-	[15, 3, -29, 2, -30],
-	[15, 1, -15],
-	[15, 1, -16],
-	[15, 1, 18],
-	[18, 3, -13, -29, -30],
-	[18, 4, -13, -29, 19, -30],
-	[19, 1, 20],
-	[19, 3, 20, -31, 19],
-	[20, 1, 2],
-	[12, 1, 14],
-	[12, 1, 21],
-	[21, 1, -28],
-	[21, 2, -28, 14],
-	[21, 1, 22],
-	[14, 1, 23],
-	[14, 3, 14, -28, 23],
-	[14, 1, 24],
-	[23, 2, 25, 26],
-	[23, 1, 26],
-	[23, 3, 25, 26, 27],
-	[23, 2, 26, 27],
-	[23, 1, 28],
-	[27, 1, 16],
-	[27, 2, 16, 27],
-	[25, 2, -14, -3],
-	[25, 1, -32],
-	[26, 1, 29],
-	[26, 3, -20, -29, -30],
-	[26, 4, -21, -29, -15, -30],
-	[16, 3, -33, 30, -34],
-	[30, 1, 2],
-	[22, 2, -4, 14],
-	[24, 3, 14, -4, 23],
-	[28, 1, -35],
-	[28, 1, -2],
-	[17, 2, -36, -18],
-	[29, 1, -17],
-	[29, 1, -19],
-	[29, 1, -18]
+ [1, 1, 2],
+ [2, 1, 3],
+ [3, 1, 4],
+ [3, 3, 3, -9, 4],
+ [4, 1, 5],
+ [4, 3, 4, -8, 5],
+ [5, 1, 6],
+ [5, 3, 5, -22, 6],
+ [5, 3, 5, -5, 6],
+ [6, 1, 7],
+ [6, 3, 6, -23, 7],
+ [6, 3, 6, -24, 7],
+ [6, 3, 6, -6, 7],
+ [6, 3, 6, -7, 7],
+ [7, 1, 8],
+ [7, 3, 7, -25, 8],
+ [7, 3, 7, -26, 8],
+ [8, 1, 9],
+ [8, 3, 8, -12, 9],
+ [8, 3, 8, -11, 9],
+ [8, 3, 8, -10, 9],
+ [9, 1, 10],
+ [9, 2, -26, 9],
+ [10, 1, 11],
+ [10, 3, 10, -27, 11],
+ [11, 1, 12],
+ [11, 1, 13],
+ [11, 3, 13, -28, 14],
+ [11, 3, 13, -4, 14],
+ [13, 1, 15],
+ [13, 2, 13, 16],
+ [15, 1, 17],
+ [15, 3, -29, 2, -30],
+ [15, 1, -15],
+ [15, 1, -16],
+ [15, 1, 18],
+ [18, 3, -13, -29, -30],
+ [18, 4, -13, -29, 19, -30],
+ [19, 1, 20],
+ [19, 3, 20, -31, 19],
+ [20, 1, 2],
+ [12, 1, 14],
+ [12, 1, 21],
+ [21, 1, -28],
+ [21, 2, -28, 14],
+ [21, 1, 22],
+ [14, 1, 23],
+ [14, 3, 14, -28, 23],
+ [14, 1, 24],
+ [23, 2, 25, 26],
+ [23, 1, 26],
+ [23, 3, 25, 26, 27],
+ [23, 2, 26, 27],
+ [23, 1, 28],
+ [27, 1, 16],
+ [27, 2, 16, 27],
+ [25, 2, -14, -3],
+ [25, 1, -32],
+ [26, 1, 29],
+ [26, 3, -20, -29, -30],
+ [26, 4, -21, -29, -15, -30],
+ [16, 3, -33, 30, -34],
+ [30, 1, 2],
+ [22, 2, -4, 14],
+ [24, 3, 14, -4, 23],
+ [28, 1, -35],
+ [28, 1, -2],
+ [17, 2, -36, -18],
+ [29, 1, -17],
+ [29, 1, -19],
+ [29, 1, -18]
 ];
 
 XPathParser.DOUBLEDOT = 2;
@@ -775,352 +775,352 @@ XPathParser.DOT = 35;
 XPathParser.DOLLAR = 36;
 
 XPathParser.prototype.tokenize = function(s1) {
-	var types = [];
-	var values = [];
-	var s = s1 + '\0';
-
-	var pos = 0;
-	var c = s.charAt(pos++);
-	while (1) {
-		while (c == ' ' || c == '\t' || c == '\r' || c == '\n') {
-			c = s.charAt(pos++);
-		}
-		if (c == '\0' || pos >= s.length) {
-			break;
-		}
-
-		if (c == '(') {
-			types.push(XPathParser.LEFTPARENTHESIS);
-			values.push(c);
-			c = s.charAt(pos++);
-			continue;
-		}
-		if (c == ')') {
-			types.push(XPathParser.RIGHTPARENTHESIS);
-			values.push(c);
-			c = s.charAt(pos++);
-			continue;
-		}
-		if (c == '[') {
-			types.push(XPathParser.LEFTBRACKET);
-			values.push(c);
-			c = s.charAt(pos++);
-			continue;
-		}
-		if (c == ']') {
-			types.push(XPathParser.RIGHTBRACKET);
-			values.push(c);
-			c = s.charAt(pos++);
-			continue;
-		}
-		if (c == '@') {
-			types.push(XPathParser.AT);
-			values.push(c);
-			c = s.charAt(pos++);
-			continue;
-		}
-		if (c == ',') {
-			types.push(XPathParser.COMMA);
-			values.push(c);
-			c = s.charAt(pos++);
-			continue;
-		}
-		if (c == '|') {
-			types.push(XPathParser.BAR);
-			values.push(c);
-			c = s.charAt(pos++);
-			continue;
-		}
-		if (c == '+') {
-			types.push(XPathParser.PLUS);
-			values.push(c);
-			c = s.charAt(pos++);
-			continue;
-		}
-		if (c == '-') {
-			types.push(XPathParser.MINUS);
-			values.push(c);
-			c = s.charAt(pos++);
-			continue;
-		}
-		if (c == '=') {
-			types.push(XPathParser.EQUALS);
-			values.push(c);
-			c = s.charAt(pos++);
-			continue;
-		}
-		if (c == '$') {
-			types.push(XPathParser.DOLLAR);
-			values.push(c);
-			c = s.charAt(pos++);
-			continue;
-		}
-		
-		if (c == '.') {
-			c = s.charAt(pos++);
-			if (c == '.') {
-				types.push(XPathParser.DOUBLEDOT);
-				values.push("..");
-				c = s.charAt(pos++);
-				continue;
-			}
-			if (c >= '0' && c <= '9') {
-				var number = "." + c;
-				c = s.charAt(pos++);
-				while (c >= '0' && c <= '9') {
-					number += c;
-					c = s.charAt(pos++);
-				}
-				types.push(XPathParser.NUMBER);
-				values.push(number);
-				continue;
-			}
-			types.push(XPathParser.DOT);
-			values.push('.');
-			continue;
-		}
-
-		if (c == '\'' || c == '"') {
-			var delimiter = c;
-			var literal = "";
-			while ((c = s.charAt(pos++)) != delimiter) {
-				literal += c;
-			}
-			types.push(XPathParser.LITERAL);
-			values.push(literal);
-			c = s.charAt(pos++);
-			continue;
-		}
-
-		if (c >= '0' && c <= '9') {
-			var number = c;
-			c = s.charAt(pos++);
-			while (c >= '0' && c <= '9') {
-				number += c;
-				c = s.charAt(pos++);
-			}
-			if (c == '.') {
-				if (s.charAt(pos) >= '0' && s.charAt(pos) <= '9') {
-					number += c;
-					number += s.charAt(pos++);
-					c = s.charAt(pos++);
-					while (c >= '0' && c <= '9') {
-						number += c;
-						c = s.charAt(pos++);
-					}
-				}
-			}
-			types.push(XPathParser.NUMBER);
-			values.push(number);
-			continue;
-		}
-
-		if (c == '*') {
-			if (types.length > 0) {
-				var last = types[types.length - 1];
-				if (last != XPathParser.AT
-						&& last != XPathParser.DOUBLECOLON
-						&& last != XPathParser.LEFTPARENTHESIS
-						&& last != XPathParser.LEFTBRACKET
-						&& last != XPathParser.AND
-						&& last != XPathParser.OR
-						&& last != XPathParser.MOD
-						&& last != XPathParser.DIV
-						&& last != XPathParser.MULTIPLYOPERATOR
-						&& last != XPathParser.SLASH
-						&& last != XPathParser.DOUBLESLASH
-						&& last != XPathParser.BAR
-						&& last != XPathParser.PLUS
-						&& last != XPathParser.MINUS
-						&& last != XPathParser.EQUALS
-						&& last != XPathParser.NOTEQUAL
-						&& last != XPathParser.LESSTHAN
-						&& last != XPathParser.LESSTHANOREQUAL
-						&& last != XPathParser.GREATERTHAN
-						&& last != XPathParser.GREATERTHANOREQUAL) {
-					types.push(XPathParser.MULTIPLYOPERATOR);
-					values.push(c);
-					c = s.charAt(pos++);
-					continue;
-				}
-			}
-			types.push(XPathParser.ASTERISKNAMETEST);
-			values.push(c);
-			c = s.charAt(pos++);
-			continue;
-		}
-
-		if (c == ':') {
-			if (s.charAt(pos) == ':') {
-				types.push(XPathParser.DOUBLECOLON);
-				values.push("::");
-				pos++;
-				c = s.charAt(pos++);
-				continue;
-			}
-		}
-
-		if (c == '/') {
-			c = s.charAt(pos++);
-			if (c == '/') {
-				types.push(XPathParser.DOUBLESLASH);
-				values.push("//");
-				c = s.charAt(pos++);
-				continue;
-			}
-			types.push(XPathParser.SLASH);
-			values.push('/');
-			continue;
-		}
-
-		if (c == '!') {
-			if (s.charAt(pos) == '=') {
-				types.push(XPathParser.NOTEQUAL);
-				values.push("!=");
-				pos++;
-				c = s.charAt(pos++);
-				continue;
-			}
-		}
-
-		if (c == '<') {
-			if (s.charAt(pos) == '=') {
-				types.push(XPathParser.LESSTHANOREQUAL);
-				values.push("<=");
-				pos++;
-				c = s.charAt(pos++);
-				continue;
-			}
-			types.push(XPathParser.LESSTHAN);
-			values.push('<');
-			c = s.charAt(pos++);
-			continue;
-		}
-
-		if (c == '>') {
-			if (s.charAt(pos) == '=') {
-				types.push(XPathParser.GREATERTHANOREQUAL);
-				values.push(">=");
-				pos++;
-				c = s.charAt(pos++);
-				continue;
-			}
-			types.push(XPathParser.GREATERTHAN);
-			values.push('>');
-			c = s.charAt(pos++);
-			continue;
-		}
-
-		if (c == '_' || Utilities.isLetter(c.charCodeAt(0))) {
-			var name = c;
-			c = s.charAt(pos++);
-			while (Utilities.isNCNameChar(c.charCodeAt(0))) {
-				name += c;
-				c = s.charAt(pos++);
-			}
-			if (types.length > 0) {
-				var last = types[types.length - 1];
-				if (last != XPathParser.AT
-						&& last != XPathParser.DOUBLECOLON
-						&& last != XPathParser.LEFTPARENTHESIS
-						&& last != XPathParser.LEFTBRACKET
-						&& last != XPathParser.AND
-						&& last != XPathParser.OR
-						&& last != XPathParser.MOD
-						&& last != XPathParser.DIV
-						&& last != XPathParser.MULTIPLYOPERATOR
-						&& last != XPathParser.SLASH
-						&& last != XPathParser.DOUBLESLASH
-						&& last != XPathParser.BAR
-						&& last != XPathParser.PLUS
-						&& last != XPathParser.MINUS
-						&& last != XPathParser.EQUALS
-						&& last != XPathParser.NOTEQUAL
-						&& last != XPathParser.LESSTHAN
-						&& last != XPathParser.LESSTHANOREQUAL
-						&& last != XPathParser.GREATERTHAN
-						&& last != XPathParser.GREATERTHANOREQUAL) {
-					if (name == "and") {
-						types.push(XPathParser.AND);
-						values.push(name);
-						continue;
-					}
-					if (name == "or") {
-						types.push(XPathParser.OR);
-						values.push(name);
-						continue;
-					}
-					if (name == "mod") {
-						types.push(XPathParser.MOD);
-						values.push(name);
-						continue;
-					}
-					if (name == "div") {
-						types.push(XPathParser.DIV);
-						values.push(name);
-						continue;
-					}
-				}
-			}
-			if (c == ':') {
-				if (s.charAt(pos) == '*') {
-					types.push(XPathParser.NCNAMECOLONASTERISK);
-					values.push(name + ":*");
-					pos++;
-					c = s.charAt(pos++);
-					continue;
-				}
-				if (s.charAt(pos) == '_' || Utilities.isLetter(s.charCodeAt(pos))) {
-					name += ':';
-					c = s.charAt(pos++);
-					while (Utilities.isNCNameChar(c.charCodeAt(0))) {
-						name += c;
-						c = s.charAt(pos++);
-					}
-					if (c == '(') {
-						types.push(XPathParser.FUNCTIONNAME);
-						values.push(name);
-						continue;
-					}
-					types.push(XPathParser.QNAME);
-					values.push(name);
-					continue;
-				}
-				if (s.charAt(pos) == ':') {
-					types.push(XPathParser.AXISNAME);
-					values.push(name);
-					continue;
-				}
-			}
-			if (c == '(') {
-				if (name == "comment" || name == "text" || name == "node") {
-					types.push(XPathParser.NODETYPE);
-					values.push(name);
-					continue;
-				}
-				if (name == "processing-instruction") {
-					if (s.charAt(pos) == ')') {
-						types.push(XPathParser.NODETYPE);
-					} else {
-						types.push(XPathParser.PROCESSINGINSTRUCTIONWITHLITERAL);
-					}
-					values.push(name);
-					continue;
-				}
-				types.push(XPathParser.FUNCTIONNAME);
-				values.push(name);
-				continue;
-			}
-			types.push(XPathParser.QNAME);
-			values.push(name);
-			continue;
-		}
-
-		throw new Error("Unexpected character " + c);
-	}
-	types.push(1);
-	values.push("[EOF]");
-	return [types, values];
+ var types = [];
+ var values = [];
+ var s = s1 + '\0';
+
+ var pos = 0;
+ var c = s.charAt(pos++);
+ while (1) {
+  while (c == ' ' || c == '\t' || c == '\r' || c == '\n') {
+   c = s.charAt(pos++);
+  }
+  if (c == '\0' || pos >= s.length) {
+   break;
+  }
+
+  if (c == '(') {
+   types.push(XPathParser.LEFTPARENTHESIS);
+   values.push(c);
+   c = s.charAt(pos++);
+   continue;
+  }
+  if (c == ')') {
+   types.push(XPathParser.RIGHTPARENTHESIS);
+   values.push(c);
+   c = s.charAt(pos++);
+   continue;
+  }
+  if (c == '[') {
+   types.push(XPathParser.LEFTBRACKET);
+   values.push(c);
+   c = s.charAt(pos++);
+   continue;
+  }
+  if (c == ']') {
+   types.push(XPathParser.RIGHTBRACKET);
+   values.push(c);
+   c = s.charAt(pos++);
+   continue;
+  }
+  if (c == '@') {
+   types.push(XPathParser.AT);
+   values.push(c);
+   c = s.charAt(pos++);
+   continue;
+  }
+  if (c == ',') {
+   types.push(XPathParser.COMMA);
+   values.push(c);
+   c = s.charAt(pos++);
+   continue;
+  }
+  if (c == '|') {
+   types.push(XPathParser.BAR);
+   values.push(c);
+   c = s.charAt(pos++);
+   continue;
+  }
+  if (c == '+') {
+   types.push(XPathParser.PLUS);
+   values.push(c);
+   c = s.charAt(pos++);
+   continue;
+  }
+  if (c == '-') {
+   types.push(XPathParser.MINUS);
+   values.push(c);
+   c = s.charAt(pos++);
+   continue;
+  }
+  if (c == '=') {
+   types.push(XPathParser.EQUALS);
+   values.push(c);
+   c = s.charAt(pos++);
+   continue;
+  }
+  if (c == '$') {
+   types.push(XPathParser.DOLLAR);
+   values.push(c);
+   c = s.charAt(pos++);
+   continue;
+  }
+  
+  if (c == '.') {
+   c = s.charAt(pos++);
+   if (c == '.') {
+    types.push(XPathParser.DOUBLEDOT);
+    values.push("..");
+    c = s.charAt(pos++);
+    continue;
+   }
+   if (c >= '0' && c <= '9') {
+    var number = "." + c;
+    c = s.charAt(pos++);
+    while (c >= '0' && c <= '9') {
+     number += c;
+     c = s.charAt(pos++);
+    }
+    types.push(XPathParser.NUMBER);
+    values.push(number);
+    continue;
+   }
+   types.push(XPathParser.DOT);
+   values.push('.');
+   continue;
+  }
+
+  if (c == '\'' || c == '"') {
+   var delimiter = c;
+   var literal = "";
+   while ((c = s.charAt(pos++)) != delimiter) {
+    literal += c;
+   }
+   types.push(XPathParser.LITERAL);
+   values.push(literal);
+   c = s.charAt(pos++);
+   continue;
+  }
+
+  if (c >= '0' && c <= '9') {
+   var number = c;
+   c = s.charAt(pos++);
+   while (c >= '0' && c <= '9') {
+    number += c;
+    c = s.charAt(pos++);
+   }
+   if (c == '.') {
+    if (s.charAt(pos) >= '0' && s.charAt(pos) <= '9') {
+     number += c;
+     number += s.charAt(pos++);
+     c = s.charAt(pos++);
+     while (c >= '0' && c <= '9') {
+      number += c;
+      c = s.charAt(pos++);
+     }
+    }
+   }
+   types.push(XPathParser.NUMBER);
+   values.push(number);
+   continue;
+  }
+
+  if (c == '*') {
+   if (types.length > 0) {
+    var last = types[types.length - 1];
+    if (last != XPathParser.AT
+      && last != XPathParser.DOUBLECOLON
+      && last != XPathParser.LEFTPARENTHESIS
+      && last != XPathParser.LEFTBRACKET
+      && last != XPathParser.AND
+      && last != XPathParser.OR
+      && last != XPathParser.MOD
+      && last != XPathParser.DIV
+      && last != XPathParser.MULTIPLYOPERATOR
+      && last != XPathParser.SLASH
+      && last != XPathParser.DOUBLESLASH
+      && last != XPathParser.BAR
+      && last != XPathParser.PLUS
+      && last != XPathParser.MINUS
+      && last != XPathParser.EQUALS
+      && last != XPathParser.NOTEQUAL
+      && last != XPathParser.LESSTHAN
+      && last != XPathParser.LESSTHANOREQUAL
+      && last != XPathParser.GREATERTHAN
+      && last != XPathParser.GREATERTHANOREQUAL) {
+     types.push(XPathParser.MULTIPLYOPERATOR);
+     values.push(c);
+     c = s.charAt(pos++);
+     continue;
+    }
+   }
+   types.push(XPathParser.ASTERISKNAMETEST);
+   values.push(c);
+   c = s.charAt(pos++);
+   continue;
+  }
+
+  if (c == ':') {
+   if (s.charAt(pos) == ':') {
+    types.push(XPathParser.DOUBLECOLON);
+    values.push("::");
+    pos++;
+    c = s.charAt(pos++);
+    continue;
+   }
+  }
+
+  if (c == '/') {
+   c = s.charAt(pos++);
+   if (c == '/') {
+    types.push(XPathParser.DOUBLESLASH);
+    values.push("//");
+    c = s.charAt(pos++);
+    continue;
+   }
+   types.push(XPathParser.SLASH);
+   values.push('/');
+   continue;
+  }
+
+  if (c == '!') {
+   if (s.charAt(pos) == '=') {
+    types.push(XPathParser.NOTEQUAL);
+    values.push("!=");
+    pos++;
+    c = s.charAt(pos++);
+    continue;
+   }
+  }
+
+  if (c == '<') {
+   if (s.charAt(pos) == '=') {
+    types.push(XPathParser.LESSTHANOREQUAL);
+    values.push("<=");
+    pos++;
+    c = s.charAt(pos++);
+    continue;
+   }
+   types.push(XPathParser.LESSTHAN);
+   values.push('<');
+   c = s.charAt(pos++);
+   continue;
+  }
+
+  if (c == '>') {
+   if (s.charAt(pos) == '=') {
+    types.push(XPathParser.GREATERTHANOREQUAL);
+    values.push(">=");
+    pos++;
+    c = s.charAt(pos++);
+    continue;
+   }
+   types.push(XPathParser.GREATERTHAN);
+   values.push('>');
+   c = s.charAt(pos++);
+   continue;
+  }
+
+  if (c == '_' || Utilities.isLetter(c.charCodeAt(0))) {
+   var name = c;
+   c = s.charAt(pos++);
+   while (Utilities.isNCNameChar(c.charCodeAt(0))) {
+    name += c;
+    c = s.charAt(pos++);
+   }
+   if (types.length > 0) {
+    var last = types[types.length - 1];
+    if (last != XPathParser.AT
+      && last != XPathParser.DOUBLECOLON
+      && last != XPathParser.LEFTPARENTHESIS
+      && last != XPathParser.LEFTBRACKET
+      && last != XPathParser.AND
+      && last != XPathParser.OR
+      && last != XPathParser.MOD
+      && last != XPathParser.DIV
+      && last != XPathParser.MULTIPLYOPERATOR
+      && last != XPathParser.SLASH
+      && last != XPathParser.DOUBLESLASH
+      && last != XPathParser.BAR
+      && last != XPathParser.PLUS
+      && last != XPathParser.MINUS
+      && last != XPathParser.EQUALS
+      && last != XPathParser.NOTEQUAL
+      && last != XPathParser.LESSTHAN
+      && last != XPathParser.LESSTHANOREQUAL
+      && last != XPathParser.GREATERTHAN
+      && last != XPathParser.GREATERTHANOREQUAL) {
+     if (name == "and") {
+      types.push(XPathParser.AND);
+      values.push(name);
+      continue;
+     }
+     if (name == "or") {
+      types.push(XPathParser.OR);
+      values.push(name);
+      continue;
+     }
+     if (name == "mod") {
+      types.push(XPathParser.MOD);
+      values.push(name);
+      continue;
+     }
+     if (name == "div") {
+      types.push(XPathParser.DIV);
+      values.push(name);
+      continue;
+     }
+    }
+   }
+   if (c == ':') {
+    if (s.charAt(pos) == '*') {
+     types.push(XPathParser.NCNAMECOLONASTERISK);
+     values.push(name + ":*");
+     pos++;
+     c = s.charAt(pos++);
+     continue;
+    }
+    if (s.charAt(pos) == '_' || Utilities.isLetter(s.charCodeAt(pos))) {
+     name += ':';
+     c = s.charAt(pos++);
+     while (Utilities.isNCNameChar(c.charCodeAt(0))) {
+      name += c;
+      c = s.charAt(pos++);
+     }
+     if (c == '(') {
+      types.push(XPathParser.FUNCTIONNAME);
+      values.push(name);
+      continue;
+     }
+     types.push(XPathParser.QNAME);
+     values.push(name);
+     continue;
+    }
+    if (s.charAt(pos) == ':') {
+     types.push(XPathParser.AXISNAME);
+     values.push(name);
+     continue;
+    }
+   }
+   if (c == '(') {
+    if (name == "comment" || name == "text" || name == "node") {
+     types.push(XPathParser.NODETYPE);
+     values.push(name);
+     continue;
+    }
+    if (name == "processing-instruction") {
+     if (s.charAt(pos) == ')') {
+      types.push(XPathParser.NODETYPE);
+     } else {
+      types.push(XPathParser.PROCESSINGINSTRUCTIONWITHLITERAL);
+     }
+     values.push(name);
+     continue;
+    }
+    types.push(XPathParser.FUNCTIONNAME);
+    values.push(name);
+    continue;
+   }
+   types.push(XPathParser.QNAME);
+   values.push(name);
+   continue;
+  }
+
+  throw new Error("Unexpected character " + c);
+ }
+ types.push(1);
+ values.push("[EOF]");
+ return [types, values];
 };
 
 XPathParser.SHIFT = 's';
@@ -1128,61 +1128,61 @@ XPathParser.REDUCE = 'r';
 XPathParser.ACCEPT = 'a';
 
 XPathParser.prototype.parse = function(s) {
-	var types;
-	var values;
-	var res = this.tokenize(s);
-	if (res == undefined) {
-		return undefined;
-	}
-	types = res[0];
-	values = res[1];
-	var tokenPos = 0;
-	var state = [];
-	var tokenType = [];
-	var tokenValue = [];
-	var s;
-	var a;
-	var t;
-
-	state.push(0);
-	tokenType.push(1);
-	tokenValue.push("_S");
-
-	a = types[tokenPos];
-	t = values[tokenPos++];
-	while (1) {
-		s = state[state.length - 1];
-		switch (XPathParser.actionTable[s].charAt(a - 1)) {
-			case XPathParser.SHIFT:
-				tokenType.push(-a);
-				tokenValue.push(t);
-				state.push(XPathParser.actionTableNumber[s].charCodeAt(a - 1) - 32);
-				a = types[tokenPos];
-				t = values[tokenPos++];
-				break;
-			case XPathParser.REDUCE:
-				var num = XPathParser.productions[XPathParser.actionTableNumber[s].charCodeAt(a - 1) - 32][1];
-				var rhs = [];
-				for (var i = 0; i < num; i++) {
-					tokenType.pop();
-					rhs.unshift(tokenValue.pop());
-					state.pop();
-				}
-				var s_ = state[state.length - 1];
-				tokenType.push(XPathParser.productions[XPathParser.actionTableNumber[s].charCodeAt(a - 1) - 32][0]);
-				if (this.reduceActions[XPathParser.actionTableNumber[s].charCodeAt(a - 1) - 32] == undefined) {
-					tokenValue.push(rhs[0]);
-				} else {
-					tokenValue.push(this.reduceActions[XPathParser.actionTableNumber[s].charCodeAt(a - 1) - 32](rhs));
-				}
-				state.push(XPathParser.gotoTable[s_].charCodeAt(XPathParser.productions[XPathParser.actionTableNumber[s].charCodeAt(a - 1) - 32][0] - 2) - 33);
-				break;
-			case XPathParser.ACCEPT:
-				return new XPath(tokenValue.pop());
-			default:
-				throw new Error("XPath parse error");
-		}
-	}
+ var types;
+ var values;
+ var res = this.tokenize(s);
+ if (res == undefined) {
+  return undefined;
+ }
+ types = res[0];
+ values = res[1];
+ var tokenPos = 0;
+ var state = [];
+ var tokenType = [];
+ var tokenValue = [];
+ var s;
+ var a;
+ var t;
+
+ state.push(0);
+ tokenType.push(1);
+ tokenValue.push("_S");
+
+ a = types[tokenPos];
+ t = values[tokenPos++];
+ while (1) {
+  s = state[state.length - 1];
+  switch (XPathParser.actionTable[s].charAt(a - 1)) {
+   case XPathParser.SHIFT:
+    tokenType.push(-a);
+    tokenValue.push(t);
+    state.push(XPathParser.actionTableNumber[s].charCodeAt(a - 1) - 32);
+    a = types[tokenPos];
+    t = values[tokenPos++];
+    break;
+   case XPathParser.REDUCE:
+    var num = XPathParser.productions[XPathParser.actionTableNumber[s].charCodeAt(a - 1) - 32][1];
+    var rhs = [];
+    for (var i = 0; i < num; i++) {
+     tokenType.pop();
+     rhs.unshift(tokenValue.pop());
+     state.pop();
+    }
+    var s_ = state[state.length - 1];
+    tokenType.push(XPathParser.productions[XPathParser.actionTableNumber[s].charCodeAt(a - 1) - 32][0]);
+    if (this.reduceActions[XPathParser.actionTableNumber[s].charCodeAt(a - 1) - 32] == undefined) {
+     tokenValue.push(rhs[0]);
+    } else {
+     tokenValue.push(this.reduceActions[XPathParser.actionTableNumber[s].charCodeAt(a - 1) - 32](rhs));
+    }
+    state.push(XPathParser.gotoTable[s_].charCodeAt(XPathParser.productions[XPathParser.actionTableNumber[s].charCodeAt(a - 1) - 32][0] - 2) - 33);
+    break;
+   case XPathParser.ACCEPT:
+    return new XPath(tokenValue.pop());
+   default:
+    throw new Error("XPath parse error");
+  }
+ }
 };
 
 // XPath /////////////////////////////////////////////////////////////////////
@@ -1192,30 +1192,30 @@ XPath.prototype.constructor = XPath;
 XPath.superclass = Object.prototype;
 
 function XPath(e) {
-	this.expression = e;
+ this.expression = e;
 }
 
 XPath.prototype.toString = function() {
-	return this.expression.toString();
+ return this.expression.toString();
 };
 
 XPath.prototype.evaluate = function(c) {
-	c.contextNode = c.expressionContextNode;
-	c.contextSize = 1;
-	c.contextPosition = 1;
-	c.caseInsensitive = false;
-	if (c.contextNode != null) {
-		var doc = c.contextNode;
-		if (doc.nodeType != 9 /*Node.DOCUMENT_NODE*/) {
-			doc = doc.ownerDocument;
-		}
-		try {
-			c.caseInsensitive = doc.implementation.hasFeature("HTML", "2.0");
-		} catch (e) {
-			c.caseInsensitive = true;
-		}
-	}
-	return this.expression.evaluate(c);
+ c.contextNode = c.expressionContextNode;
+ c.contextSize = 1;
+ c.contextPosition = 1;
+ c.caseInsensitive = false;
+ if (c.contextNode != null) {
+  var doc = c.contextNode;
+  if (doc.nodeType != 9 /*Node.DOCUMENT_NODE*/) {
+   doc = doc.ownerDocument;
+  }
+  try {
+   c.caseInsensitive = doc.implementation.hasFeature("HTML", "2.0");
+  } catch (e) {
+   c.caseInsensitive = true;
+  }
+ }
+ return this.expression.evaluate(c);
 };
 
 XPath.XML_NAMESPACE_URI = "http://www.w3.org/XML/1998/namespace";
@@ -1234,11 +1234,11 @@ Expression.prototype.init = function() {
 };
 
 Expression.prototype.toString = function() {
-	return "<Expression>";
+ return "<Expression>";
 };
 
 Expression.prototype.evaluate = function(c) {
-	throw new Error("Could not evaluate expression.");
+ throw new Error("Could not evaluate expression.");
 };
 
 // UnaryOperation ////////////////////////////////////////////////////////////
@@ -1248,13 +1248,13 @@ UnaryOperation.prototype.constructor = UnaryOperation;
 UnaryOperation.superclass = Expression.prototype;
 
 function UnaryOperation(rhs) {
-	if (arguments.length > 0) {
-		this.init(rhs);
-	}
+ if (arguments.length > 0) {
+  this.init(rhs);
+ }
 }
 
 UnaryOperation.prototype.init = function(rhs) {
-	this.rhs = rhs;
+ this.rhs = rhs;
 };
 
 // UnaryMinusOperation ///////////////////////////////////////////////////////
@@ -1264,21 +1264,21 @@ UnaryMinusOperation.prototype.constructor = UnaryMinusOperation;
 UnaryMinusOperation.superclass = UnaryOperation.prototype;
 
 function UnaryMinusOperation(rhs) {
-	if (arguments.length > 0) {
-		this.init(rhs);
-	}
+ if (arguments.length > 0) {
+  this.init(rhs);
+ }
 }
 
 UnaryMinusOperation.prototype.init = function(rhs) {
-	UnaryMinusOperation.superclass.init.call(this, rhs);
+ UnaryMinusOperation.superclass.init.call(this, rhs);
 };
 
 UnaryMinusOperation.prototype.evaluate = function(c) {
-	return this.rhs.evaluate(c).number().negate();
+ return this.rhs.evaluate(c).number().negate();
 };
 
 UnaryMinusOperation.prototype.toString = function() {
-	return "-" + this.rhs.toString();
+ return "-" + this.rhs.toString();
 };
 
 // BinaryOperation ///////////////////////////////////////////////////////////
@@ -1288,14 +1288,14 @@ BinaryOperation.prototype.constructor = BinaryOperation;
 BinaryOperation.superclass = Expression.prototype;
 
 function BinaryOperation(lhs, rhs) {
-	if (arguments.length > 0) {
-		this.init(lhs, rhs);
-	}
+ if (arguments.length > 0) {
+  this.init(lhs, rhs);
+ }
 }
 
 BinaryOperation.prototype.init = function(lhs, rhs) {
-	this.lhs = lhs;
-	this.rhs = rhs;
+ this.lhs = lhs;
+ this.rhs = rhs;
 };
 
 // OrOperation ///////////////////////////////////////////////////////////////
@@ -1305,25 +1305,25 @@ OrOperation.prototype.constructor = OrOperation;
 OrOperation.superclass = BinaryOperation.prototype;
 
 function OrOperation(lhs, rhs) {
-	if (arguments.length > 0) {
-		this.init(lhs, rhs);
-	}
+ if (arguments.length > 0) {
+  this.init(lhs, rhs);
+ }
 }
 
 OrOperation.prototype.init = function(lhs, rhs) {
-	OrOperation.superclass.init.call(this, lhs, rhs);
+ OrOperation.superclass.init.call(this, lhs, rhs);
 };
 
 OrOperation.prototype.toString = function() {
-	return "(" + this.lhs.toString() + " or " + this.rhs.toString() + ")";
+ return "(" + this.lhs.toString() + " or " + this.rhs.toString() + ")";
 };
 
 OrOperation.prototype.evaluate = function(c) {
-	var b = this.lhs.evaluate(c).bool();
-	if (b.booleanValue()) {
-		return b;
-	}
-	return this.rhs.evaluate(c).bool();
+ var b = this.lhs.evaluate(c).bool();
+ if (b.booleanValue()) {
+  return b;
+ }
+ return this.rhs.evaluate(c).bool();
 };
 
 // AndOperation //////////////////////////////////////////////////////////////
@@ -1333,25 +1333,25 @@ AndOperation.prototype.constructor = AndOperation;
 AndOperation.superclass = BinaryOperation.prototype;
 
 function AndOperation(lhs, rhs) {
-	if (arguments.length > 0) {
-		this.init(lhs, rhs);
-	}
+ if (arguments.length > 0) {
+  this.init(lhs, rhs);
+ }
 }
 
 AndOperation.prototype.init = function(lhs, rhs) {
-	AndOperation.superclass.init.call(this, lhs, rhs);
+ AndOperation.superclass.init.call(this, lhs, rhs);
 };
 
 AndOperation.prototype.toString = function() {
-	return "(" + this.lhs.toString() + " and " + this.rhs.toString() + ")";
+ return "(" + this.lhs.toString() + " and " + this.rhs.toString() + ")";
 };
 
 AndOperation.prototype.evaluate = function(c) {
-	var b = this.lhs.evaluate(c).bool();
-	if (!b.booleanValue()) {
-		return b;
-	}
-	return this.rhs.evaluate(c).bool();
+ var b = this.lhs.evaluate(c).bool();
+ if (!b.booleanValue()) {
+  return b;
+ }
+ return this.rhs.evaluate(c).bool();
 };
 
 // EqualsOperation ///////////////////////////////////////////////////////////
@@ -1361,21 +1361,21 @@ EqualsOperation.prototype.constructor = EqualsOperation;
 EqualsOperation.superclass = BinaryOperation.prototype;
 
 function EqualsOperation(lhs, rhs) {
-	if (arguments.length > 0) {
-		this.init(lhs, rhs);
-	}
+ if (arguments.length > 0) {
+  this.init(lhs, rhs);
+ }
 }
 
 EqualsOperation.prototype.init = function(lhs, rhs) {
-	EqualsOperation.superclass.init.call(this, lhs, rhs);
+ EqualsOperation.superclass.init.call(this, lhs, rhs);
 };
 
 EqualsOperation.prototype.toString = function() {
-	return "(" + this.lhs.toString() + " = " + this.rhs.toString() + ")";
+ return "(" + this.lhs.toString() + " = " + this.rhs.toString() + ")";
 };
 
 EqualsOperation.prototype.evaluate = function(c) {
-	return this.lhs.evaluate(c).equals(this.rhs.evaluate(c));
+ return this.lhs.evaluate(c).equals(this.rhs.evaluate(c));
 };
 
 // NotEqualOperation /////////////////////////////////////////////////////////
@@ -1385,21 +1385,21 @@ NotEqualOperation.prototype.constructor = NotEqualOperation;
 NotEqualOperation.superclass = BinaryOperation.prototype;
 
 function NotEqualOperation(lhs, rhs) {
-	if (arguments.length > 0) {
-		this.init(lhs, rhs);
-	}
+ if (arguments.length > 0) {
+  this.init(lhs, rhs);
+ }
 }
 
 NotEqualOperation.prototype.init = function(lhs, rhs) {
-	NotEqualOperation.superclass.init.call(this, lhs, rhs);
+ NotEqualOperation.superclass.init.call(this, lhs, rhs);
 };
 
 NotEqualOperation.prototype.toString = function() {
-	return "(" + this.lhs.toString() + " != " + this.rhs.toString() + ")";
+ return "(" + this.lhs.toString() + " != " + this.rhs.toString() + ")";
 };
 
 NotEqualOperation.prototype.evaluate = function(c) {
-	return this.lhs.evaluate(c).notequal(this.rhs.evaluate(c));
+ return this.lhs.evaluate(c).notequal(this.rhs.evaluate(c));
 };
 
 // LessThanOperation /////////////////////////////////////////////////////////
@@ -1409,21 +1409,21 @@ LessThanOperation.prototype.constructor = LessThanOperation;
 LessThanOperation.superclass = BinaryOperation.prototype;
 
 function LessThanOperation(lhs, rhs) {
-	if (arguments.length > 0) {
-		this.init(lhs, rhs);
-	}
+ if (arguments.length > 0) {
+  this.init(lhs, rhs);
+ }
 }
 
 LessThanOperation.prototype.init = function(lhs, rhs) {
-	LessThanOperation.superclass.init.call(this, lhs, rhs);
+ LessThanOperation.superclass.init.call(this, lhs, rhs);
 };
 
 LessThanOperation.prototype.evaluate = function(c) {
-	return this.lhs.evaluate(c).lessthan(this.rhs.evaluate(c));
+ return this.lhs.evaluate(c).lessthan(this.rhs.evaluate(c));
 };
 
 LessThanOperation.prototype.toString = function() {
-	return "(" + this.lhs.toString() + " < " + this.rhs.toString() + ")";
+ return "(" + this.lhs.toString() + " < " + this.rhs.toString() + ")";
 };
 
 // GreaterThanOperation //////////////////////////////////////////////////////
@@ -1433,21 +1433,21 @@ GreaterThanOperation.prototype.constructor = GreaterThanOperation;
 GreaterThanOperation.superclass = BinaryOperation.prototype;
 
 function GreaterThanOperation(lhs, rhs) {
-	if (arguments.length > 0) {
-		this.init(lhs, rhs);
-	}
+ if (arguments.length > 0) {
+  this.init(lhs, rhs);
+ }
 }
 
 GreaterThanOperation.prototype.init = function(lhs, rhs) {
-	GreaterThanOperation.superclass.init.call(this, lhs, rhs);
+ GreaterThanOperation.superclass.init.call(this, lhs, rhs);
 };
 
 GreaterThanOperation.prototype.evaluate = function(c) {
-	return this.lhs.evaluate(c).greaterthan(this.rhs.evaluate(c));
+ return this.lhs.evaluate(c).greaterthan(this.rhs.evaluate(c));
 };
 
 GreaterThanOperation.prototype.toString = function() {
-	return "(" + this.lhs.toString() + " > " + this.rhs.toString() + ")";
+ return "(" + this.lhs.toString() + " > " + this.rhs.toString() + ")";
 };
 
 // LessThanOrEqualOperation //////////////////////////////////////////////////
@@ -1457,21 +1457,21 @@ LessThanOrEqualOperation.prototype.constructor = LessThanOrEqualOperation;
 LessThanOrEqualOperation.superclass = BinaryOperation.prototype;
 
 function LessThanOrEqualOperation(lhs, rhs) {
-	if (arguments.length > 0) {
-		this.init(lhs, rhs);
-	}
+ if (arguments.length > 0) {
+  this.init(lhs, rhs);
+ }
 }
 
 LessThanOrEqualOperation.prototype.init = function(lhs, rhs) {
-	LessThanOrEqualOperation.superclass.init.call(this, lhs, rhs);
+ LessThanOrEqualOperation.superclass.init.call(this, lhs, rhs);
 };
 
 LessThanOrEqualOperation.prototype.evaluate = function(c) {
-	return this.lhs.evaluate(c).lessthanorequal(this.rhs.evaluate(c));
+ return this.lhs.evaluate(c).lessthanorequal(this.rhs.evaluate(c));
 };
 
 LessThanOrEqualOperation.prototype.toString = function() {
-	return "(" + this.lhs.toString() + " <= " + this.rhs.toString() + ")";
+ return "(" + this.lhs.toString() + " <= " + this.rhs.toString() + ")";
 };
 
 // GreaterThanOrEqualOperation ///////////////////////////////////////////////
@@ -1481,21 +1481,21 @@ GreaterThanOrEqualOperation.prototype.constructor = GreaterThanOrEqualOperation;
 GreaterThanOrEqualOperation.superclass = BinaryOperation.prototype;
 
 function GreaterThanOrEqualOperation(lhs, rhs) {
-	if (arguments.length > 0) {
-		this.init(lhs, rhs);
-	}
+ if (arguments.length > 0) {
+  this.init(lhs, rhs);
+ }
 }
 
 GreaterThanOrEqualOperation.prototype.init = function(lhs, rhs) {
-	GreaterThanOrEqualOperation.superclass.init.call(this, lhs, rhs);
+ GreaterThanOrEqualOperation.superclass.init.call(this, lhs, rhs);
 };
 
 GreaterThanOrEqualOperation.prototype.evaluate = function(c) {
-	return this.lhs.evaluate(c).greaterthanorequal(this.rhs.evaluate(c));
+ return this.lhs.evaluate(c).greaterthanorequal(this.rhs.evaluate(c));
 };
 
 GreaterThanOrEqualOperation.prototype.toString = function() {
-	return "(" + this.lhs.toString() + " >= " + this.rhs.toString() + ")";
+ return "(" + this.lhs.toString() + " >= " + this.rhs.toString() + ")";
 };
 
 // PlusOperation /////////////////////////////////////////////////////////////
@@ -1505,21 +1505,21 @@ PlusOperation.prototype.constructor = PlusOperation;
 PlusOperation.superclass = BinaryOperation.prototype;
 
 function PlusOperation(lhs, rhs) {
-	if (arguments.length > 0) {
-		this.init(lhs, rhs);
-	}
+ if (arguments.length > 0) {
+  this.init(lhs, rhs);
+ }
 }
 
 PlusOperation.prototype.init = function(lhs, rhs) {
-	PlusOperation.superclass.init.call(this, lhs, rhs);
+ PlusOperation.superclass.init.call(this, lhs, rhs);
 };
 
 PlusOperation.prototype.evaluate = function(c) {
-	return this.lhs.evaluate(c).number().plus(this.rhs.evaluate(c).number());
+ return this.lhs.evaluate(c).number().plus(this.rhs.evaluate(c).number());
 };
 
 PlusOperation.prototype.toString = function() {
-	return "(" + this.lhs.toString() + " + " + this.rhs.toString() + ")";
+ return "(" + this.lhs.toString() + " + " + this.rhs.toString() + ")";
 };
 
 // MinusOperation ////////////////////////////////////////////////////////////
@@ -1529,21 +1529,21 @@ MinusOperation.prototype.constructor = MinusOperation;
 MinusOperation.superclass = BinaryOperation.prototype;
 
 function MinusOperation(lhs, rhs) {
-	if (arguments.length > 0) {
-		this.init(lhs, rhs);
-	}
+ if (arguments.length > 0) {
+  this.init(lhs, rhs);
+ }
 }
 
 MinusOperation.prototype.init = function(lhs, rhs) {
-	MinusOperation.superclass.init.call(this, lhs, rhs);
+ MinusOperation.superclass.init.call(this, lhs, rhs);
 };
 
 MinusOperation.prototype.evaluate = function(c) {
-	return this.lhs.evaluate(c).number().minus(this.rhs.evaluate(c).number());
+ return this.lhs.evaluate(c).number().minus(this.rhs.evaluate(c).number());
 };
 
 MinusOperation.prototype.toString = function() {
-	return "(" + this.lhs.toString() + " - " + this.rhs.toString() + ")";
+ return "(" + this.lhs.toString() + " - " + this.rhs.toString() + ")";
 };
 
 // MultiplyOperation /////////////////////////////////////////////////////////
@@ -1553,21 +1553,21 @@ MultiplyOperation.prototype.constructor = MultiplyOperation;
 MultiplyOperation.superclass = BinaryOperation.prototype;
 
 function MultiplyOperation(lhs, rhs) {
-	if (arguments.length > 0) {
-		this.init(lhs, rhs);
-	}
+ if (arguments.length > 0) {
+  this.init(lhs, rhs);
+ }
 }
 
 MultiplyOperation.prototype.init = function(lhs, rhs) {
-	MultiplyOperation.superclass.init.call(this, lhs, rhs);
+ MultiplyOperation.superclass.init.call(this, lhs, rhs);
 };
 
 MultiplyOperation.prototype.evaluate = function(c) {
-	return this.lhs.evaluate(c).number().multiply(this.rhs.evaluate(c).number());
+ return this.lhs.evaluate(c).number().multiply(this.rhs.evaluate(c).number());
 };
 
 MultiplyOperation.prototype.toString = function() {
-	return "(" + this.lhs.toString() + " * " + this.rhs.toString() + ")";
+ return "(" + this.lhs.toString() + " * " + this.rhs.toString() + ")";
 };
 
 // DivOperation //////////////////////////////////////////////////////////////
@@ -1577,21 +1577,21 @@ DivOperation.prototype.constructor = DivOperation;
 DivOperation.superclass = BinaryOperation.prototype;
 
 function DivOperation(lhs, rhs) {
-	if (arguments.length > 0) {
-		this.init(lhs, rhs);
-	}
+ if (arguments.length > 0) {
+  this.init(lhs, rhs);
+ }
 }
 
 DivOperation.prototype.init = function(lhs, rhs) {
-	DivOperation.superclass.init.call(this, lhs, rhs);
+ DivOperation.superclass.init.call(this, lhs, rhs);
 };
 
 DivOperation.prototype.evaluate = function(c) {
-	return this.lhs.evaluate(c).number().div(this.rhs.evaluate(c).number());
+ return this.lhs.evaluate(c).number().div(this.rhs.evaluate(c).number());
 };
 
 DivOperation.prototype.toString = function() {
-	return "(" + this.lhs.toString() + " div " + this.rhs.toString() + ")";
+ return "(" + this.lhs.toString() + " div " + this.rhs.toString() + ")";
 };
 
 // ModOperation //////////////////////////////////////////////////////////////
@@ -1601,21 +1601,21 @@ ModOperation.prototype.constructor = ModOperation;
 ModOperation.superclass = BinaryOperation.prototype;
 
 function ModOperation(lhs, rhs) {
-	if (arguments.length > 0) {
-		this.init(lhs, rhs);
-	}
+ if (arguments.length > 0) {
+  this.init(lhs, rhs);
+ }
 }
 
 ModOperation.prototype.init = function(lhs, rhs) {
-	ModOperation.superclass.init.call(this, lhs, rhs);
+ ModOperation.superclass.init.call(this, lhs, rhs);
 };
 
 ModOperation.prototype.evaluate = function(c) {
-	return this.lhs.evaluate(c).number().mod(this.rhs.evaluate(c).number());
+ return this.lhs.evaluate(c).number().mod(this.rhs.evaluate(c).number());
 };
 
 ModOperation.prototype.toString = function() {
-	return "(" + this.lhs.toString() + " mod " + this.rhs.toString() + ")";
+ return "(" + this.lhs.toString() + " mod " + this.rhs.toString() + ")";
 };
 
 // BarOperation //////////////////////////////////////////////////////////////
@@ -1625,21 +1625,21 @@ BarOperation.prototype.constructor = BarOperation;
 BarOperation.superclass = BinaryOperation.prototype;
 
 function BarOperation(lhs, rhs) {
-	if (arguments.length > 0) {
-		this.init(lhs, rhs);
-	}
+ if (arguments.length > 0) {
+  this.init(lhs, rhs);
+ }
 }
 
 BarOperation.prototype.init = function(lhs, rhs) {
-	BarOperation.superclass.init.call(this, lhs, rhs);
+ BarOperation.superclass.init.call(this, lhs, rhs);
 };
 
 BarOperation.prototype.evaluate = function(c) {
-	return this.lhs.evaluate(c).nodeset().union(this.rhs.evaluate(c).nodeset());
+ return this.lhs.evaluate(c).nodeset().union(this.rhs.evaluate(c).nodeset());
 };
 
 BarOperation.prototype.toString = function() {
-	return this.lhs.toString() + " | " + this.rhs.toString();
+ return this.lhs.toString() + " | " + this.rhs.toString();
 };
 
 // PathExpr //////////////////////////////////////////////////////////////////
@@ -1649,387 +1649,387 @@ PathExpr.prototype.constructor = PathExpr;
 PathExpr.superclass = Expression.prototype;
 
 function PathExpr(filter, filterPreds, locpath) {
-	if (arguments.length > 0) {
-		this.init(filter, filterPreds, locpath);
-	}
+ if (arguments.length > 0) {
+  this.init(filter, filterPreds, locpath);
+ }
 }
 
 PathExpr.prototype.init = function(filter, filterPreds, locpath) {
-	PathExpr.superclass.init.call(this);
-	this.filter = filter;
-	this.filterPredicates = filterPreds;
-	this.locationPath = locpath;
+ PathExpr.superclass.init.call(this);
+ this.filter = filter;
+ this.filterPredicates = filterPreds;
+ this.locationPath = locpath;
 };
 
 PathExpr.prototype.evaluate = function(c) {
-	var nodes;
-	var xpc = new XPathContext();
-	xpc.variableResolver = c.variableResolver;
-	xpc.functionResolver = c.functionResolver;
-	xpc.namespaceResolver = c.namespaceResolver;
-	xpc.expressionContextNode = c.expressionContextNode;
-	xpc.virtualRoot = c.virtualRoot;
-	xpc.caseInsensitive = c.caseInsensitive;
-	if (this.filter == null) {
-		nodes = [ c.contextNode ];
-	} else {
-		var ns = this.filter.evaluate(c);
-		if (!Utilities.instance_of(ns, XNodeSet)) {
-			if (this.filterPredicates != null && this.filterPredicates.length > 0 || this.locationPath != null) {
-				throw new Error("Path expression filter must evaluate to a nodset if predicates or location path are used");
-			}
-			return ns;
-		}
-		nodes = ns.toArray();
-		if (this.filterPredicates != null) {
-			// apply each of the predicates in turn
-			for (var j = 0; j < this.filterPredicates.length; j++) {
-				var pred = this.filterPredicates[j];
-				var newNodes = [];
-				xpc.contextSize = nodes.length;
-				for (xpc.contextPosition = 1; xpc.contextPosition <= xpc.contextSize; xpc.contextPosition++) {
-					xpc.contextNode = nodes[xpc.contextPosition - 1];
-					if (this.predicateMatches(pred, xpc)) {
-						newNodes.push(xpc.contextNode);
-					}
-				}
-				nodes = newNodes;
-			}
-		}
-	}
-	if (this.locationPath != null) {
-		if (this.locationPath.absolute) {
-			if (nodes[0].nodeType != 9 /*Node.DOCUMENT_NODE*/) {
-				if (xpc.virtualRoot != null) {
-					nodes = [ xpc.virtualRoot ];
-				} else {
-					if (nodes[0].ownerDocument == null) {
-						// IE 5.5 doesn't have ownerDocument?
-						var n = nodes[0];
-						while (n.parentNode != null) {
-							n = n.parentNode;
-						}
-						nodes = [ n ];
-					} else {
-						nodes = [ nodes[0].ownerDocument ];
-					}
-				}
-			} else {
-				nodes = [ nodes[0] ];
-			}
-		}
-		for (var i = 0; i < this.locationPath.steps.length; i++) {
-			var step = this.locationPath.steps[i];
-			var newNodes = [];
-			for (var j = 0; j < nodes.length; j++) {
-				xpc.contextNode = nodes[j];
-				switch (step.axis) {
-					case Step.ANCESTOR:
-						// look at all the ancestor nodes
-						if (xpc.contextNode === xpc.virtualRoot) {
-							break;
-						}
-						var m;
-						if (xpc.contextNode.nodeType == 2 /*Node.ATTRIBUTE_NODE*/) {
-							m = this.getOwnerElement(xpc.contextNode);
-						} else {
-							m = xpc.contextNode.parentNode;
-						}
-						while (m != null) {
-							if (step.nodeTest.matches(m, xpc)) {
-								newNodes.push(m);
-							}
-							if (m === xpc.virtualRoot) {
-								break;
-							}
-							m = m.parentNode;
-						}
-						break;
-
-					case Step.ANCESTORORSELF:
-						// look at all the ancestor nodes and the current node
-						for (var m = xpc.contextNode; m != null; m = m.nodeType == 2 /*Node.ATTRIBUTE_NODE*/ ? this.getOwnerElement(m) : m.parentNode) {
-							if (step.nodeTest.matches(m, xpc)) {
-								newNodes.push(m);
-							}
-							if (m === xpc.virtualRoot) {
-								break;
-							}
-						}
-						break;
-
-					case Step.ATTRIBUTE:
-						// look at the attributes
-						var nnm = xpc.contextNode.attributes;
-						if (nnm != null) {
-							for (var k = 0; k < nnm.length; k++) {
-								var m = nnm.item(k);
-								if (step.nodeTest.matches(m, xpc)) {
-									newNodes.push(m);
-								}
-							}
-						}
-						break;
-
-					case Step.CHILD:
-						// look at all child elements
-						for (var m = xpc.contextNode.firstChild; m != null; m = m.nextSibling) {
-							if (step.nodeTest.matches(m, xpc)) {
-								newNodes.push(m);
-							}
-						}
-						break;
-
-					case Step.DESCENDANT:
-						// look at all descendant nodes
-						var st = [ xpc.contextNode.firstChild ];
-						while (st.length > 0) {
-							for (var m = st.pop(); m != null; ) {
-								if (step.nodeTest.matches(m, xpc)) {
-									newNodes.push(m);
-								}
-								if (m.firstChild != null) {
-									st.push(m.nextSibling);
-									m = m.firstChild;
-								} else {
-									m = m.nextSibling;
-								}
-							}
-						}
-						break;
-
-					case Step.DESCENDANTORSELF:
-						// look at self
-						if (step.nodeTest.matches(xpc.contextNode, xpc)) {
-							newNodes.push(xpc.contextNode);
-						}
-						// look at all descendant nodes
-						var st = [ xpc.contextNode.firstChild ];
-						while (st.length > 0) {
-							for (var m = st.pop(); m != null; ) {
-								if (step.nodeTest.matches(m, xpc)) {
-									newNodes.push(m);
-								}
-								if (m.firstChild != null) {
-									st.push(m.nextSibling);
-									m = m.firstChild;
-								} else {
-									m = m.nextSibling;
-								}
-							}
-						}
-						break;
-
-					case Step.FOLLOWING:
-						if (xpc.contextNode === xpc.virtualRoot) {
-							break;
-						}
-						var st = [];
-						if (xpc.contextNode.firstChild != null) {
-							st.unshift(xpc.contextNode.firstChild);
-						} else {
-							st.unshift(xpc.contextNode.nextSibling);
-						}
-						for (var m = xpc.contextNode.parentNode; m != null && m.nodeType != 9 /*Node.DOCUMENT_NODE*/ && m !== xpc.virtualRoot; m = m.parentNode) {
-							st.unshift(m.nextSibling);
-						}
-						do {
-							for (var m = st.pop(); m != null; ) {
-								if (step.nodeTest.matches(m, xpc)) {
-									newNodes.push(m);
-								}
-								if (m.firstChild != null) {
-									st.push(m.nextSibling);
-									m = m.firstChild;
-								} else {
-									m = m.nextSibling;
-								}
-							}
-						} while (st.length > 0);
-						break;
-						
-					case Step.FOLLOWINGSIBLING:
-						if (xpc.contextNode === xpc.virtualRoot) {
-							break;
-						}
-						for (var m = xpc.contextNode.nextSibling; m != null; m = m.nextSibling) {
-							if (step.nodeTest.matches(m, xpc)) {
-								newNodes.push(m);
-							}
-						}
-						break;
-
-					case Step.NAMESPACE:
-						var n = {};
-						if (xpc.contextNode.nodeType == 1 /*Node.ELEMENT_NODE*/) {
-							n["xml"] = XPath.XML_NAMESPACE_URI;
-							n["xmlns"] = XPath.XMLNS_NAMESPACE_URI;
-							for (var m = xpc.contextNode; m != null && m.nodeType == 1 /*Node.ELEMENT_NODE*/; m = m.parentNode) {
-								for (var k = 0; k < m.attributes.length; k++) {
-									var attr = m.attributes.item(k);
-									var nm = String(attr.name);
-									if (nm == "xmlns") {
-										if (n[""] == undefined) {
-											n[""] = attr.value;
-										}
-									} else if (nm.length > 6 && nm.substring(0, 6) == "xmlns:") {
-										var pre = nm.substring(6, nm.length);
-										if (n[pre] == undefined) {
-											n[pre] = attr.value;
-										}
-									}
-								}
-							}
-							for (var pre in n) {
-								var nsn = new NamespaceNode(pre, n[pre], xpc.contextNode);
-								if (step.nodeTest.matches(nsn, xpc)) {
-									newNodes.push(nsn);
-								}
-							}
-						}
-						break;
-
-					case Step.PARENT:
-						m = null;
-						if (xpc.contextNode !== xpc.virtualRoot) {
-							if (xpc.contextNode.nodeType == 2 /*Node.ATTRIBUTE_NODE*/) {
-								m = this.getOwnerElement(xpc.contextNode);
-							} else {
-								m = xpc.contextNode.parentNode;
-							}
-						}
-						if (m != null && step.nodeTest.matches(m, xpc)) {
-							newNodes.push(m);
-						}
-						break;
-
-					case Step.PRECEDING:
-						var st;
-						if (xpc.virtualRoot != null) {
-							st = [ xpc.virtualRoot ];
-						} else {
-							st = xpc.contextNode.nodeType == 9 /*Node.DOCUMENT_NODE*/
-								? [ xpc.contextNode ]
-								: [ xpc.contextNode.ownerDocument ];
-						}
-						outer: while (st.length > 0) {
-							for (var m = st.pop(); m != null; ) {
-								if (m == xpc.contextNode) {
-									break outer;
-								}
-								if (step.nodeTest.matches(m, xpc)) {
-									newNodes.unshift(m);
-								}
-								if (m.firstChild != null) {
-									st.push(m.nextSibling);
-									m = m.firstChild;
-								} else {
-									m = m.nextSibling;
-								}
-							}
-						}
-						break;
-
-					case Step.PRECEDINGSIBLING:
-						if (xpc.contextNode === xpc.virtualRoot) {
-							break;
-						}
-						for (var m = xpc.contextNode.previousSibling; m != null; m = m.previousSibling) {
-							if (step.nodeTest.matches(m, xpc)) {
-								newNodes.push(m);
-							}
-						}
-						break;
-
-					case Step.SELF:
-						if (step.nodeTest.matches(xpc.contextNode, xpc)) {
-							newNodes.push(xpc.contextNode);
-						}
-						break;
-
-					default:
-				}
-			}
-			nodes = newNodes;
-			// apply each of the predicates in turn
-			for (var j = 0; j < step.predicates.length; j++) {
-				var pred = step.predicates[j];
-				var newNodes = [];
-				xpc.contextSize = nodes.length;
-				for (xpc.contextPosition = 1; xpc.contextPosition <= xpc.contextSize; xpc.contextPosition++) {
-					xpc.contextNode = nodes[xpc.contextPosition - 1];
-					if (this.predicateMatches(pred, xpc)) {
-						newNodes.push(xpc.contextNode);
-					} else {
-					}
-				}
-				nodes = newNodes;
-			}
-		}
-	}
-	var ns = new XNodeSet();
-	ns.addArray(nodes);
-	return ns;
+ var nodes;
+ var xpc = new XPathContext();
+ xpc.variableResolver = c.variableResolver;
+ xpc.functionResolver = c.functionResolver;
+ xpc.namespaceResolver = c.namespaceResolver;
+ xpc.expressionContextNode = c.expressionContextNode;
+ xpc.virtualRoot = c.virtualRoot;
+ xpc.caseInsensitive = c.caseInsensitive;
+ if (this.filter == null) {
+  nodes = [ c.contextNode ];
+ } else {
+  var ns = this.filter.evaluate(c);
+  if (!Utilities.instance_of(ns, XNodeSet)) {
+   if (this.filterPredicates != null && this.filterPredicates.length > 0 || this.locationPath != null) {
+    throw new Error("Path expression filter must evaluate to a nodset if predicates or location path are used");
+   }
+   return ns;
+  }
+  nodes = ns.toArray();
+  if (this.filterPredicates != null) {
+   // apply each of the predicates in turn
+   for (var j = 0; j < this.filterPredicates.length; j++) {
+    var pred = this.filterPredicates[j];
+    var newNodes = [];
+    xpc.contextSize = nodes.length;
+    for (xpc.contextPosition = 1; xpc.contextPosition <= xpc.contextSize; xpc.contextPosition++) {
+     xpc.contextNode = nodes[xpc.contextPosition - 1];
+     if (this.predicateMatches(pred, xpc)) {
+      newNodes.push(xpc.contextNode);
+     }
+    }
+    nodes = newNodes;
+   }
+  }
+ }
+ if (this.locationPath != null) {
+  if (this.locationPath.absolute) {
+   if (nodes[0].nodeType != 9 /*Node.DOCUMENT_NODE*/) {
+    if (xpc.virtualRoot != null) {
+     nodes = [ xpc.virtualRoot ];
+    } else {
+     if (nodes[0].ownerDocument == null) {
+      // IE 5.5 doesn't have ownerDocument?
+      var n = nodes[0];
+      while (n.parentNode != null) {
+       n = n.parentNode;
+      }
+      nodes = [ n ];
+     } else {
+      nodes = [ nodes[0].ownerDocument ];
+     }
+    }
+   } else {
+    nodes = [ nodes[0] ];
+   }
+  }
+  for (var i = 0; i < this.locationPath.steps.length; i++) {
+   var step = this.locationPath.steps[i];
+   var newNodes = [];
+   for (var j = 0; j < nodes.length; j++) {
+    xpc.contextNode = nodes[j];
+    switch (step.axis) {
+     case Step.ANCESTOR:
+      // look at all the ancestor nodes
+      if (xpc.contextNode === xpc.virtualRoot) {
+       break;
+      }
+      var m;
+      if (xpc.contextNode.nodeType == 2 /*Node.ATTRIBUTE_NODE*/) {
+       m = this.getOwnerElement(xpc.contextNode);
+      } else {
+       m = xpc.contextNode.parentNode;
+      }
+      while (m != null) {
+       if (step.nodeTest.matches(m, xpc)) {
+        newNodes.push(m);
+       }
+       if (m === xpc.virtualRoot) {
+        break;
+       }
+       m = m.parentNode;
+      }
+      break;
+
+     case Step.ANCESTORORSELF:
+      // look at all the ancestor nodes and the current node
+      for (var m = xpc.contextNode; m != null; m = m.nodeType == 2 /*Node.ATTRIBUTE_NODE*/ ? this.getOwnerElement(m) : m.parentNode) {
+       if (step.nodeTest.matches(m, xpc)) {
+        newNodes.push(m);
+       }
+       if (m === xpc.virtualRoot) {
+        break;
+       }
+      }
+      break;
+
+     case Step.ATTRIBUTE:
+      // look at the attributes
+      var nnm = xpc.contextNode.attributes;
+      if (nnm != null) {
+       for (var k = 0; k < nnm.length; k++) {
+        var m = nnm.item(k);
+        if (step.nodeTest.matches(m, xpc)) {
+         newNodes.push(m);
+        }
+       }
+      }
+      break;
+
+     case Step.CHILD:
+      // look at all child elements
+      for (var m = xpc.contextNode.firstChild; m != null; m = m.nextSibling) {
+       if (step.nodeTest.matches(m, xpc)) {
+        newNodes.push(m);
+       }
+      }
+      break;
+
+     case Step.DESCENDANT:
+      // look at all descendant nodes
+      var st = [ xpc.contextNode.firstChild ];
+      while (st.length > 0) {
+       for (var m = st.pop(); m != null; ) {
+        if (step.nodeTest.matches(m, xpc)) {
+         newNodes.push(m);
+        }
+        if (m.firstChild != null) {
+         st.push(m.nextSibling);
+         m = m.firstChild;
+        } else {
+         m = m.nextSibling;
+        }
+       }
+      }
+      break;
+
+     case Step.DESCENDANTORSELF:
+      // look at self
+      if (step.nodeTest.matches(xpc.contextNode, xpc)) {
+       newNodes.push(xpc.contextNode);
+      }
+      // look at all descendant nodes
+      var st = [ xpc.contextNode.firstChild ];
+      while (st.length > 0) {
+       for (var m = st.pop(); m != null; ) {
+        if (step.nodeTest.matches(m, xpc)) {
+         newNodes.push(m);
+        }
+        if (m.firstChild != null) {
+         st.push(m.nextSibling);
+         m = m.firstChild;
+        } else {
+         m = m.nextSibling;
+        }
+       }
+      }
+      break;
+
+     case Step.FOLLOWING:
+      if (xpc.contextNode === xpc.virtualRoot) {
+       break;
+      }
+      var st = [];
+      if (xpc.contextNode.firstChild != null) {
+       st.unshift(xpc.contextNode.firstChild);
+      } else {
+       st.unshift(xpc.contextNode.nextSibling);
+      }
+      for (var m = xpc.contextNode.parentNode; m != null && m.nodeType != 9 /*Node.DOCUMENT_NODE*/ && m !== xpc.virtualRoot; m = m.parentNode) {
+       st.unshift(m.nextSibling);
+      }
+      do {
+       for (var m = st.pop(); m != null; ) {
+        if (step.nodeTest.matches(m, xpc)) {
+         newNodes.push(m);
+        }
+        if (m.firstChild != null) {
+         st.push(m.nextSibling);
+         m = m.firstChild;
+        } else {
+         m = m.nextSibling;
+        }
+       }
+      } while (st.length > 0);
+      break;
+      
+     case Step.FOLLOWINGSIBLING:
+      if (xpc.contextNode === xpc.virtualRoot) {
+       break;
+      }
+      for (var m = xpc.contextNode.nextSibling; m != null; m = m.nextSibling) {
+       if (step.nodeTest.matches(m, xpc)) {
+        newNodes.push(m);
+       }
+      }
+      break;
+
+     case Step.NAMESPACE:
+      var n = {};
+      if (xpc.contextNode.nodeType == 1 /*Node.ELEMENT_NODE*/) {
+       n["xml"] = XPath.XML_NAMESPACE_URI;
+       n["xmlns"] = XPath.XMLNS_NAMESPACE_URI;
+       for (var m = xpc.contextNode; m != null && m.nodeType == 1 /*Node.ELEMENT_NODE*/; m = m.parentNode) {
+        for (var k = 0; k < m.attributes.length; k++) {
+         var attr = m.attributes.item(k);
+         var nm = String(attr.name);
+         if (nm == "xmlns") {
+          if (n[""] == undefined) {
+           n[""] = attr.value;
+          }
+         } else if (nm.length > 6 && nm.substring(0, 6) == "xmlns:") {
+          var pre = nm.substring(6, nm.length);
+          if (n[pre] == undefined) {
+           n[pre] = attr.value;
+          }
+         }
+        }
+       }
+       for (var pre in n) {
+        var nsn = new NamespaceNode(pre, n[pre], xpc.contextNode);
+        if (step.nodeTest.matches(nsn, xpc)) {
+         newNodes.push(nsn);
+        }
+       }
+      }
+      break;
+
+     case Step.PARENT:
+      m = null;
+      if (xpc.contextNode !== xpc.virtualRoot) {
+       if (xpc.contextNode.nodeType == 2 /*Node.ATTRIBUTE_NODE*/) {
+        m = this.getOwnerElement(xpc.contextNode);
+       } else {
+        m = xpc.contextNode.parentNode;
+       }
+      }
+      if (m != null && step.nodeTest.matches(m, xpc)) {
+       newNodes.push(m);
+      }
+      break;
+
+     case Step.PRECEDING:
+      var st;
+      if (xpc.virtualRoot != null) {
+       st = [ xpc.virtualRoot ];
+      } else {
+       st = xpc.contextNode.nodeType == 9 /*Node.DOCUMENT_NODE*/
+        ? [ xpc.contextNode ]
+        : [ xpc.contextNode.ownerDocument ];
+      }
+      outer: while (st.length > 0) {
+       for (var m = st.pop(); m != null; ) {
+        if (m == xpc.contextNode) {
+         break outer;
+        }
+        if (step.nodeTest.matches(m, xpc)) {
+         newNodes.unshift(m);
+        }
+        if (m.firstChild != null) {
+         st.push(m.nextSibling);
+         m = m.firstChild;
+        } else {
+         m = m.nextSibling;
+        }
+       }
+      }
+      break;
+
+     case Step.PRECEDINGSIBLING:
+      if (xpc.contextNode === xpc.virtualRoot) {
+       break;
+      }
+      for (var m = xpc.contextNode.previousSibling; m != null; m = m.previousSibling) {
+       if (step.nodeTest.matches(m, xpc)) {
+        newNodes.push(m);
+       }
+      }
+      break;
+
+     case Step.SELF:
+      if (step.nodeTest.matches(xpc.contextNode, xpc)) {
+       newNodes.push(xpc.contextNode);
+      }
+      break;
+
+     default:
+    }
+   }
+   nodes = newNodes;
+   // apply each of the predicates in turn
+   for (var j = 0; j < step.predicates.length; j++) {
+    var pred = step.predicates[j];
+    var newNodes = [];
+    xpc.contextSize = nodes.length;
+    for (xpc.contextPosition = 1; xpc.contextPosition <= xpc.contextSize; xpc.contextPosition++) {
+     xpc.contextNode = nodes[xpc.contextPosition - 1];
+     if (this.predicateMatches(pred, xpc)) {
+      newNodes.push(xpc.contextNode);
+     } else {
+     }
+    }
+    nodes = newNodes;
+   }
+  }
+ }
+ var ns = new XNodeSet();
+ ns.addArray(nodes);
+ return ns;
 };
 
 PathExpr.prototype.predicateMatches = function(pred, c) {
-	var res = pred.evaluate(c);
-	if (Utilities.instance_of(res, XNumber)) {
-		return c.contextPosition == res.numberValue();
-	}
-	return res.booleanValue();
+ var res = pred.evaluate(c);
+ if (Utilities.instance_of(res, XNumber)) {
+  return c.contextPosition == res.numberValue();
+ }
+ return res.booleanValue();
 };
 
 PathExpr.prototype.toString = function() {
-	if (this.filter != undefined) {
-		var s = this.filter.toString();
-		if (Utilities.instance_of(this.filter, XString)) {
-			s = "'" + s + "'";
-		}
-		if (this.filterPredicates != undefined) {
-			for (var i = 0; i < this.filterPredicates.length; i++) {
-				s = s + "[" + this.filterPredicates[i].toString() + "]";
-			}
-		}
-		if (this.locationPath != undefined) {
-			if (!this.locationPath.absolute) {
-				s += "/";
-			}
-			s += this.locationPath.toString();
-		}
-		return s;
-	}
-	return this.locationPath.toString();
+ if (this.filter != undefined) {
+  var s = this.filter.toString();
+  if (Utilities.instance_of(this.filter, XString)) {
+   s = "'" + s + "'";
+  }
+  if (this.filterPredicates != undefined) {
+   for (var i = 0; i < this.filterPredicates.length; i++) {
+    s = s + "[" + this.filterPredicates[i].toString() + "]";
+   }
+  }
+  if (this.locationPath != undefined) {
+   if (!this.locationPath.absolute) {
+    s += "/";
+   }
+   s += this.locationPath.toString();
+  }
+  return s;
+ }
+ return this.locationPath.toString();
 };
 
 PathExpr.prototype.getOwnerElement = function(n) {
-	// DOM 2 has ownerElement
-	if (n.ownerElement) {
-		return n.ownerElement;
-	}
-	// DOM 1 Internet Explorer can use selectSingleNode (ironically)
-	try {
-		if (n.selectSingleNode) {
-			return n.selectSingleNode("..");
-		}
-	} catch (e) {
-	}
-	// Other DOM 1 implementations must use this egregious search
-	var doc = n.nodeType == 9 /*Node.DOCUMENT_NODE*/
-			? n
-			: n.ownerDocument;
-	var elts = doc.getElementsByTagName("*");
-	for (var i = 0; i < elts.length; i++) {
-		var elt = elts.item(i);
-		var nnm = elt.attributes;
-		for (var j = 0; j < nnm.length; j++) {
-			var an = nnm.item(j);
-			if (an === n) {
-				return elt;
-			}
-		}
-	}
-	return null;
+ // DOM 2 has ownerElement
+ if (n.ownerElement) {
+  return n.ownerElement;
+ }
+ // DOM 1 Internet Explorer can use selectSingleNode (ironically)
+ try {
+  if (n.selectSingleNode) {
+   return n.selectSingleNode("..");
+  }
+ } catch (e) {
+ }
+ // Other DOM 1 implementations must use this egregious search
+ var doc = n.nodeType == 9 /*Node.DOCUMENT_NODE*/
+   ? n
+   : n.ownerDocument;
+ var elts = doc.getElementsByTagName("*");
+ for (var i = 0; i < elts.length; i++) {
+  var elt = elts.item(i);
+  var nnm = elt.attributes;
+  for (var j = 0; j < nnm.length; j++) {
+   var an = nnm.item(j);
+   if (an === n) {
+    return elt;
+   }
+  }
+ }
+ return null;
 };
 
 // LocationPath //////////////////////////////////////////////////////////////
@@ -2039,30 +2039,30 @@ LocationPath.prototype.constructor = LocationPath;
 LocationPath.superclass = Object.prototype;
 
 function LocationPath(abs, steps) {
-	if (arguments.length > 0) {
-		this.init(abs, steps);
-	}
+ if (arguments.length > 0) {
+  this.init(abs, steps);
+ }
 }
 
 LocationPath.prototype.init = function(abs, steps) {
-	this.absolute = abs;
-	this.steps = steps;
+ this.absolute = abs;
+ this.steps = steps;
 };
 
 LocationPath.prototype.toString = function() {
-	var s;
-	if (this.absolute) {
-		s = "/";
-	} else {
-		s = "";
-	}
-	for (var i = 0; i < this.steps.length; i++) {
-		if (i != 0) {
-			s += "/";
-		}
-		s += this.steps[i].toString();
-	}
-	return s;
+ var s;
+ if (this.absolute) {
+  s = "/";
+ } else {
+  s = "";
+ }
+ for (var i = 0; i < this.steps.length; i++) {
+  if (i != 0) {
+   s += "/";
+  }
+  s += this.steps[i].toString();
+ }
+ return s;
 };
 
 // Step //////////////////////////////////////////////////////////////////////
@@ -2072,66 +2072,66 @@ Step.prototype.constructor = Step;
 Step.superclass = Object.prototype;
 
 function Step(axis, nodetest, preds) {
-	if (arguments.length > 0) {
-		this.init(axis, nodetest, preds);
-	}
+ if (arguments.length > 0) {
+  this.init(axis, nodetest, preds);
+ }
 }
 
 Step.prototype.init = function(axis, nodetest, preds) {
-	this.axis = axis;
-	this.nodeTest = nodetest;
-	this.predicates = preds;
+ this.axis = axis;
+ this.nodeTest = nodetest;
+ this.predicates = preds;
 };
 
 Step.prototype.toString = function() {
-	var s;
-	switch (this.axis) {
-		case Step.ANCESTOR:
-			s = "ancestor";
-			break;
-		case Step.ANCESTORORSELF:
-			s = "ancestor-or-self";
-			break;
-		case Step.ATTRIBUTE:
-			s = "attribute";
-			break;
-		case Step.CHILD:
-			s = "child";
-			break;
-		case Step.DESCENDANT:
-			s = "descendant";
-			break;
-		case Step.DESCENDANTORSELF:
-			s = "descendant-or-self";
-			break;
-		case Step.FOLLOWING:
-			s = "following";
-			break;
-		case Step.FOLLOWINGSIBLING:
-			s = "following-sibling";
-			break;
-		case Step.NAMESPACE:
-			s = "namespace";
-			break;
-		case Step.PARENT:
-			s = "parent";
-			break;
-		case Step.PRECEDING:
-			s = "preceding";
-			break;
-		case Step.PRECEDINGSIBLING:
-			s = "preceding-sibling";
-			break;
-		case Step.SELF:
-			s = "self";
-			break;
-	}
-	s += "::";
-	s += this.nodeTest.toString();
-	for (var i = 0; i < this.predicates.length; i++) {
-		s += "[" + this.predicates[i].toString() + "]";
-	}
-	return s;
+ var s;
+ switch (this.axis) {
+  case Step.ANCESTOR:
+   s = "ancestor";
+   break;
+  case Step.ANCESTORORSELF:
+   s = "ancestor-or-self";
+   break;
+  case Step.ATTRIBUTE:
+   s = "attribute";
+   break;
+  case Step.CHILD:
+   s = "child";
+   break;
+  case Step.DESCENDANT:
+   s = "descendant";
+   break;
+  case Step.DESCENDANTORSELF:
+   s = "descendant-or-self";
+   break;
+  case Step.FOLLOWING:
+   s = "following";
+   break;
+  case Step.FOLLOWINGSIBLING:
+   s = "following-sibling";
+   break;
+  case Step.NAMESPACE:
+   s = "namespace";
+   break;
+  case Step.PARENT:
+   s = "parent";
+   break;
+  case Step.PRECEDING:
+   s = "preceding";
+   break;
+  case Step.PRECEDINGSIBLING:
+   s = "preceding-sibling";
+   break;
+  case Step.SELF:
+   s = "self";
+   break;
+ }
+ s += "::";
+ s += this.nodeTest.toString();
+ for (var i = 0; i < this.predicates.length; i++) {
+  s += "[" + this.predicates[i].toString() + "]";
+ }
+ return s;
 };
 
 Step.ANCESTOR = 0;
@@ -2155,107 +2155,107 @@ NodeTest.prototype.constructor = NodeTest;
 NodeTest.superclass = Object.prototype;
 
 function NodeTest(type, value) {
-	if (arguments.length > 0) {
-		this.init(type, value);
-	}
+ if (arguments.length > 0) {
+  this.init(type, value);
+ }
 }
 
 NodeTest.prototype.init = function(type, value) {
-	this.type = type;
-	this.value = value;
+ this.type = type;
+ this.value = value;
 };
 
 NodeTest.prototype.toString = function() {
-	switch (this.type) {
-		case NodeTest.NAMETESTANY:
-			return "*";
-		case NodeTest.NAMETESTPREFIXANY:
-			return this.value + ":*";
-		case NodeTest.NAMETESTRESOLVEDANY:
-			return "{" + this.value + "}*";
-		case NodeTest.NAMETESTQNAME:
-			return this.value;
-		case NodeTest.NAMETESTRESOLVEDNAME:
-			return "{" + this.namespaceURI + "}" + this.value;
-		case NodeTest.COMMENT:
-			return "comment()";
-		case NodeTest.TEXT:
-			return "text()";
-		case NodeTest.PI:
-			if (this.value != undefined) {
-				return "processing-instruction(\"" + this.value + "\")";
-			}
-			return "processing-instruction()";
-		case NodeTest.NODE:
-			return "node()";
-	}
-	return "<unknown nodetest type>";
+ switch (this.type) {
+  case NodeTest.NAMETESTANY:
+   return "*";
+  case NodeTest.NAMETESTPREFIXANY:
+   return this.value + ":*";
+  case NodeTest.NAMETESTRESOLVEDANY:
+   return "{" + this.value + "}*";
+  case NodeTest.NAMETESTQNAME:
+   return this.value;
+  case NodeTest.NAMETESTRESOLVEDNAME:
+   return "{" + this.namespaceURI + "}" + this.value;
+  case NodeTest.COMMENT:
+   return "comment()";
+  case NodeTest.TEXT:
+   return "text()";
+  case NodeTest.PI:
+   if (this.value != undefined) {
+    return "processing-instruction(\"" + this.value + "\")";
+   }
+   return "processing-instruction()";
+  case NodeTest.NODE:
+   return "node()";
+ }
+ return "<unknown nodetest type>";
 };
 
 NodeTest.prototype.matches = function(n, xpc) {
-	switch (this.type) {
-		case NodeTest.NAMETESTANY:
-			if (n.nodeType == 2 /*Node.ATTRIBUTE_NODE*/
-					|| n.nodeType == 1 /*Node.ELEMENT_NODE*/
-					|| n.nodeType == XPathNamespace.XPATH_NAMESPACE_NODE) {
-				return true;
-			}
-			return false;
-		case NodeTest.NAMETESTPREFIXANY:
-			if ((n.nodeType == 2 /*Node.ATTRIBUTE_NODE*/ || n.nodeType == 1 /*Node.ELEMENT_NODE*/)) {
-				var ns = xpc.namespaceResolver.getNamespace(this.value, xpc.expressionContextNode);
-				if (ns == null) {
-					throw new Error("Cannot resolve QName " + this.value);
-				}
-				return true;	
-			}
-			return false;
-		case NodeTest.NAMETESTQNAME:
-			if (n.nodeType == 2 /*Node.ATTRIBUTE_NODE*/
-					|| n.nodeType == 1 /*Node.ELEMENT_NODE*/
-					|| n.nodeType == XPathNamespace.XPATH_NAMESPACE_NODE) {
-				var test = Utilities.resolveQName(this.value, xpc.namespaceResolver, xpc.expressionContextNode, false);
-				if (test[0] == null) {
-					throw new Error("Cannot resolve QName " + this.value);
-				}
-				test[0] = String(test[0]);
-				test[1] = String(test[1]);
-				if (test[0] == "") {
-					test[0] = null;
-				}
-				var node = Utilities.resolveQName(n.nodeName, xpc.namespaceResolver, n, n.nodeType == 1 /*Node.ELEMENT_NODE*/);
-				node[0] = String(node[0]);
-				node[1] = String(node[1]);
-				if (node[0] == "") {
-					if (n.namespaceURI) {
-						node[0] = n.namespaceURI;
-					} else {
-						node[0] = null;
-					}
-				}
-				if (xpc.caseInsensitive) {
-					return test[0] == node[0] && String(test[1]).toLowerCase() == String(node[1]).toLowerCase();
-				}
-				return test[0] == node[0] && test[1] == node[1];
-			}
-			return false;
-		case NodeTest.COMMENT:
-			return n.nodeType == 8 /*Node.COMMENT_NODE*/;
-		case NodeTest.TEXT:
-			return n.nodeType == 3 /*Node.TEXT_NODE*/ || n.nodeType == 4 /*Node.CDATA_SECTION_NODE*/;
-		case NodeTest.PI:
-			return n.nodeType == 7 /*Node.PROCESSING_INSTRUCTION_NODE*/
-				&& (this.value == null || n.nodeName == this.value);
-		case NodeTest.NODE:
-			return n.nodeType == 9 /*Node.DOCUMENT_NODE*/
-				|| n.nodeType == 1 /*Node.ELEMENT_NODE*/
-				|| n.nodeType == 2 /*Node.ATTRIBUTE_NODE*/
-				|| n.nodeType == 3 /*Node.TEXT_NODE*/
-				|| n.nodeType == 4 /*Node.CDATA_SECTION_NODE*/
-				|| n.nodeType == 8 /*Node.COMMENT_NODE*/
-				|| n.nodeType == 7 /*Node.PROCESSING_INSTRUCTION_NODE*/;
-	}
-	return false;
+ switch (this.type) {
+  case NodeTest.NAMETESTANY:
+   if (n.nodeType == 2 /*Node.ATTRIBUTE_NODE*/
+     || n.nodeType == 1 /*Node.ELEMENT_NODE*/
+     || n.nodeType == XPathNamespace.XPATH_NAMESPACE_NODE) {
+    return true;
+   }
+   return false;
+  case NodeTest.NAMETESTPREFIXANY:
+   if ((n.nodeType == 2 /*Node.ATTRIBUTE_NODE*/ || n.nodeType == 1 /*Node.ELEMENT_NODE*/)) {
+    var ns = xpc.namespaceResolver.getNamespace(this.value, xpc.expressionContextNode);
+    if (ns == null) {
+     throw new Error("Cannot resolve QName " + this.value);
+    }
+    return true; 
+   }
+   return false;
+  case NodeTest.NAMETESTQNAME:
+   if (n.nodeType == 2 /*Node.ATTRIBUTE_NODE*/
+     || n.nodeType == 1 /*Node.ELEMENT_NODE*/
+     || n.nodeType == XPathNamespace.XPATH_NAMESPACE_NODE) {
+    var test = Utilities.resolveQName(this.value, xpc.namespaceResolver, xpc.expressionContextNode, false);
+    if (test[0] == null) {
+     throw new Error("Cannot resolve QName " + this.value);
+    }
+    test[0] = String(test[0]);
+    test[1] = String(test[1]);
+    if (test[0] == "") {
+     test[0] = null;
+    }
+    var node = Utilities.resolveQName(n.nodeName, xpc.namespaceResolver, n, n.nodeType == 1 /*Node.ELEMENT_NODE*/);
+    node[0] = String(node[0]);
+    node[1] = String(node[1]);
+    if (node[0] == "") {
+     if (n.namespaceURI) {
+      node[0] = n.namespaceURI;
+     } else {
+      node[0] = null;
+     }
+    }
+    if (xpc.caseInsensitive) {
+     return test[0] == node[0] && String(test[1]).toLowerCase() == String(node[1]).toLowerCase();
+    }
+    return test[0] == node[0] && test[1] == node[1];
+   }
+   return false;
+  case NodeTest.COMMENT:
+   return n.nodeType == 8 /*Node.COMMENT_NODE*/;
+  case NodeTest.TEXT:
+   return n.nodeType == 3 /*Node.TEXT_NODE*/ || n.nodeType == 4 /*Node.CDATA_SECTION_NODE*/;
+  case NodeTest.PI:
+   return n.nodeType == 7 /*Node.PROCESSING_INSTRUCTION_NODE*/
+    && (this.value == null || n.nodeName == this.value);
+  case NodeTest.NODE:
+   return n.nodeType == 9 /*Node.DOCUMENT_NODE*/
+    || n.nodeType == 1 /*Node.ELEMENT_NODE*/
+    || n.nodeType == 2 /*Node.ATTRIBUTE_NODE*/
+    || n.nodeType == 3 /*Node.TEXT_NODE*/
+    || n.nodeType == 4 /*Node.CDATA_SECTION_NODE*/
+    || n.nodeType == 8 /*Node.COMMENT_NODE*/
+    || n.nodeType == 7 /*Node.PROCESSING_INSTRUCTION_NODE*/;
+ }
+ return false;
 };
 
 NodeTest.NAMETESTANY = 0;
@@ -2273,21 +2273,21 @@ VariableReference.prototype.constructor = VariableReference;
 VariableReference.superclass = Expression.prototype;
 
 function VariableReference(v) {
-	if (arguments.length > 0) {
-		this.init(v);
-	}
+ if (arguments.length > 0) {
+  this.init(v);
+ }
 }
 
 VariableReference.prototype.init = function(v) {
-	this.variable = v;
+ this.variable = v;
 };
 
 VariableReference.prototype.toString = function() {
-	return "$" + this.variable;
+ return "$" + this.variable;
 };
 
 VariableReference.prototype.evaluate = function(c) {
-	return c.variableResolver.getVariable(this.variable, c);
+ return c.variableResolver.getVariable(this.variable, c);
 };
 
 // FunctionCall //////////////////////////////////////////////////////////////
@@ -2297,34 +2297,34 @@ FunctionCall.prototype.constructor = FunctionCall;
 FunctionCall.superclass = Expression.prototype;
 
 function FunctionCall(fn, args) {
-	if (arguments.length > 0) {
-		this.init(fn, args);
-	}
+ if (arguments.length > 0) {
+  this.init(fn, args);
+ }
 }
 
 FunctionCall.prototype.init = function(fn, args) {
-	this.functionName = fn;
-	this.arguments = args;
+ this.functionName = fn;
+ this.arguments = args;
 };
 
 FunctionCall.prototype.toString = function() {
-	var s = this.functionName + "(";
-	for (var i = 0; i < this.arguments.length; i++) {
-		if (i > 0) {
-			s += ", ";
-		}
-		s += this.arguments[i].toString();
-	}
-	return s + ")";
+ var s = this.functionName + "(";
+ for (var i = 0; i < this.arguments.length; i++) {
+  if (i > 0) {
+   s += ", ";
+  }
+  s += this.arguments[i].toString();
+ }
+ return s + ")";
 };
 
 FunctionCall.prototype.evaluate = function(c) {
-	var f = c.functionResolver.getFunction(this.functionName, c);
-	if (f == undefined) {
-		throw new Error("Unknown function " + this.functionName);
-	}
-	var a = [c].concat(this.arguments);
-	return f.apply(c.functionResolver.thisArg, a);
+ var f = c.functionResolver.getFunction(this.functionName, c);
+ if (f == undefined) {
+  throw new Error("Unknown function " + this.functionName);
+ }
+ var a = [c].concat(this.arguments);
+ return f.apply(c.functionResolver.thisArg, a);
 };
 
 // XString ///////////////////////////////////////////////////////////////////
@@ -2334,103 +2334,103 @@ XString.prototype.constructor = XString;
 XString.superclass = Expression.prototype;
 
 function XString(s) {
-	if (arguments.length > 0) {
-		this.init(s);
-	}
+ if (arguments.length > 0) {
+  this.init(s);
+ }
 }
 
 XString.prototype.init = function(s) {
-	this.str = s;
+ this.str = s;
 };
 
 XString.prototype.toString = function() {
-	return this.str;
+ return this.str;
 };
 
 XString.prototype.evaluate = function(c) {
-	return this;
+ return this;
 };
 
 XString.prototype.string = function() {
-	return this;
+ return this;
 };
 
 XString.prototype.number = function() {
-	return new XNumber(this.str);
+ return new XNumber(this.str);
 };
 
 XString.prototype.bool = function() {
-	return new XBoolean(this.str);
+ return new XBoolean(this.str);
 };
 
 XString.prototype.nodeset = function() {
-	throw new Error("Cannot convert string to nodeset");
+ throw new Error("Cannot convert string to nodeset");
 };
 
 XString.prototype.stringValue = function() {
-	return this.str;
+ return this.str;
 };
 
 XString.prototype.numberValue = function() {
-	return this.number().numberValue();
+ return this.number().numberValue();
 };
 
 XString.prototype.booleanValue = function() {
-	return this.bool().booleanValue();
+ return this.bool().booleanValue();
 };
 
 XString.prototype.equals = function(r) {
-	if (Utilities.instance_of(r, XBoolean)) {
-		return this.bool().equals(r);
-	}
-	if (Utilities.instance_of(r, XNumber)) {
-		return this.number().equals(r);
-	}
-	if (Utilities.instance_of(r, XNodeSet)) {
-		return r.compareWithString(this, Operators.equals);
-	}
-	return new XBoolean(this.str == r.str);
+ if (Utilities.instance_of(r, XBoolean)) {
+  return this.bool().equals(r);
+ }
+ if (Utilities.instance_of(r, XNumber)) {
+  return this.number().equals(r);
+ }
+ if (Utilities.instance_of(r, XNodeSet)) {
+  return r.compareWithString(this, Operators.equals);
+ }
+ return new XBoolean(this.str == r.str);
 };
 
 XString.prototype.notequal = function(r) {
-	if (Utilities.instance_of(r, XBoolean)) {
-		return this.bool().notequal(r);
-	}
-	if (Utilities.instance_of(r, XNumber)) {
-		return this.number().notequal(r);
-	}
-	if (Utilities.instance_of(r, XNodeSet)) {
-		return r.compareWithString(this, Operators.notequal);
-	}
-	return new XBoolean(this.str != r.str);
+ if (Utilities.instance_of(r, XBoolean)) {
+  return this.bool().notequal(r);
+ }
+ if (Utilities.instance_of(r, XNumber)) {
+  return this.number().notequal(r);
+ }
+ if (Utilities.instance_of(r, XNodeSet)) {
+  return r.compareWithString(this, Operators.notequal);
+ }
+ return new XBoolean(this.str != r.str);
 };
 
 XString.prototype.lessthan = function(r) {
-	if (Utilities.instance_of(r, XNodeSet)) {
-		return r.compareWithNumber(this.number(), Operators.greaterthanorequal);
-	}
-	return this.number().lessthan(r.number());
+ if (Utilities.instance_of(r, XNodeSet)) {
+  return r.compareWithNumber(this.number(), Operators.greaterthanorequal);
+ }
+ return this.number().lessthan(r.number());
 };
 
 XString.prototype.greaterthan = function(r) {
-	if (Utilities.instance_of(r, XNodeSet)) {
-		return r.compareWithNumber(this.number(), Operators.lessthanorequal);
-	}
-	return this.number().greaterthan(r.number());
+ if (Utilities.instance_of(r, XNodeSet)) {
+  return r.compareWithNumber(this.number(), Operators.lessthanorequal);
+ }
+ return this.number().greaterthan(r.number());
 };
 
 XString.prototype.lessthanorequal = function(r) {
-	if (Utilities.instance_of(r, XNodeSet)) {
-		return r.compareWithNumber(this.number(), Operators.greaterthan);
-	}
-	return this.number().lessthanorequal(r.number());
+ if (Utilities.instance_of(r, XNodeSet)) {
+  return r.compareWithNumber(this.number(), Operators.greaterthan);
+ }
+ return this.number().lessthanorequal(r.number());
 };
 
 XString.prototype.greaterthanorequal = function(r) {
-	if (Utilities.instance_of(r, XNodeSet)) {
-		return r.compareWithNumber(this.number(), Operators.lessthan);
-	}
-	return this.number().greaterthanorequal(r.number());
+ if (Utilities.instance_of(r, XNodeSet)) {
+  return r.compareWithNumber(this.number(), Operators.lessthan);
+ }
+ return this.number().greaterthanorequal(r.number());
 };
 
 // XNumber ///////////////////////////////////////////////////////////////////
@@ -2440,139 +2440,139 @@ XNumber.prototype.constructor = XNumber;
 XNumber.superclass = Expression.prototype;
 
 function XNumber(n) {
-	if (arguments.length > 0) {
-		this.init(n);
-	}
+ if (arguments.length > 0) {
+  this.init(n);
+ }
 }
 
 XNumber.prototype.init = function(n) {
-	this.num = Number(n);
+ this.num = Number(n);
 };
 
 XNumber.prototype.toString = function() {
-	return this.num;
+ return this.num;
 };
 
 XNumber.prototype.evaluate = function(c) {
-	return this;
+ return this;
 };
 
 XNumber.prototype.string = function() {
-	return new XString(this.num);
+ return new XString(this.num);
 };
 
 XNumber.prototype.number = function() {
-	return this;
+ return this;
 };
 
 XNumber.prototype.bool = function() {
-	return new XBoolean(this.num);
+ return new XBoolean(this.num);
 };
 
 XNumber.prototype.nodeset = function() {
-	throw new Error("Cannot convert number to nodeset");
+ throw new Error("Cannot convert number to nodeset");
 };
 
 XNumber.prototype.stringValue = function() {
-	return this.string().stringValue();
+ return this.string().stringValue();
 };
 
 XNumber.prototype.numberValue = function() {
-	return this.num;
+ return this.num;
 };
 
 XNumber.prototype.booleanValue = function() {
-	return this.bool().booleanValue();
+ return this.bool().booleanValue();
 };
 
 XNumber.prototype.negate = function() {
-	return new XNumber(-this.num);
+ return new XNumber(-this.num);
 };
 
 XNumber.prototype.equals = function(r) {
-	if (Utilities.instance_of(r, XBoolean)) {
-		return this.bool().equals(r);
-	}
-	if (Utilities.instance_of(r, XString)) {
-		return this.equals(r.number());
-	}
-	if (Utilities.instance_of(r, XNodeSet)) {
-		return r.compareWithNumber(this, Operators.equals);
-	}
-	return new XBoolean(this.num == r.num);
+ if (Utilities.instance_of(r, XBoolean)) {
+  return this.bool().equals(r);
+ }
+ if (Utilities.instance_of(r, XString)) {
+  return this.equals(r.number());
+ }
+ if (Utilities.instance_of(r, XNodeSet)) {
+  return r.compareWithNumber(this, Operators.equals);
+ }
+ return new XBoolean(this.num == r.num);
 };
 
 XNumber.prototype.notequal = function(r) {
-	if (Utilities.instance_of(r, XBoolean)) {
-		return this.bool().notequal(r);
-	}
-	if (Utilities.instance_of(r, XString)) {
-		return this.notequal(r.number());
-	}
-	if (Utilities.instance_of(r, XNodeSet)) {
-		return r.compareWithNumber(this, Operators.notequal);
-	}
-	return new XBoolean(this.num != r.num);
+ if (Utilities.instance_of(r, XBoolean)) {
+  return this.bool().notequal(r);
+ }
+ if (Utilities.instance_of(r, XString)) {
+  return this.notequal(r.number());
+ }
+ if (Utilities.instance_of(r, XNodeSet)) {
+  return r.compareWithNumber(this, Operators.notequal);
+ }
+ return new XBoolean(this.num != r.num);
 };
 
 XNumber.prototype.lessthan = function(r) {
-	if (Utilities.instance_of(r, XNodeSet)) {
-		return r.compareWithNumber(this, Operators.greaterthanorequal);
-	}
-	if (Utilities.instance_of(r, XBoolean) || Utilities.instance_of(r, XString)) {
-		return this.lessthan(r.number());
-	}
-	return new XBoolean(this.num < r.num);
+ if (Utilities.instance_of(r, XNodeSet)) {
+  return r.compareWithNumber(this, Operators.greaterthanorequal);
+ }
+ if (Utilities.instance_of(r, XBoolean) || Utilities.instance_of(r, XString)) {
+  return this.lessthan(r.number());
+ }
+ return new XBoolean(this.num < r.num);
 };
 
 XNumber.prototype.greaterthan = function(r) {
-	if (Utilities.instance_of(r, XNodeSet)) {
-		return r.compareWithNumber(this, Operators.lessthanorequal);
-	}
-	if (Utilities.instance_of(r, XBoolean) || Utilities.instance_of(r, XString)) {
-		return this.greaterthan(r.number());
-	}
-	return new XBoolean(this.num > r.num);
+ if (Utilities.instance_of(r, XNodeSet)) {
+  return r.compareWithNumber(this, Operators.lessthanorequal);
+ }
+ if (Utilities.instance_of(r, XBoolean) || Utilities.instance_of(r, XString)) {
+  return this.greaterthan(r.number());
+ }
+ return new XBoolean(this.num > r.num);
 };
 
 XNumber.prototype.lessthanorequal = function(r) {
-	if (Utilities.instance_of(r, XNodeSet)) {
-		return r.compareWithNumber(this, Operators.greaterthan);
-	}
-	if (Utilities.instance_of(r, XBoolean) || Utilities.instance_of(r, XString)) {
-		return this.lessthanorequal(r.number());
-	}
-	return new XBoolean(this.num <= r.num);
+ if (Utilities.instance_of(r, XNodeSet)) {
+  return r.compareWithNumber(this, Operators.greaterthan);
+ }
+ if (Utilities.instance_of(r, XBoolean) || Utilities.instance_of(r, XString)) {
+  return this.lessthanorequal(r.number());
+ }
+ return new XBoolean(this.num <= r.num);
 };
 
 XNumber.prototype.greaterthanorequal = function(r) {
-	if (Utilities.instance_of(r, XNodeSet)) {
-		return r.compareWithNumber(this, Operators.lessthan);
-	}
-	if (Utilities.instance_of(r, XBoolean) || Utilities.instance_of(r, XString)) {
-		return this.greaterthanorequal(r.number());
-	}
-	return new XBoolean(this.num >= r.num);
+ if (Utilities.instance_of(r, XNodeSet)) {
+  return r.compareWithNumber(this, Operators.lessthan);
+ }
+ if (Utilities.instance_of(r, XBoolean) || Utilities.instance_of(r, XString)) {
+  return this.greaterthanorequal(r.number());
+ }
+ return new XBoolean(this.num >= r.num);
 };
 
 XNumber.prototype.plus = function(r) {
-	return new XNumber(this.num + r.num);
+ return new XNumber(this.num + r.num);
 };
 
 XNumber.prototype.minus = function(r) {
-	return new XNumber(this.num - r.num);
+ return new XNumber(this.num - r.num);
 };
 
 XNumber.prototype.multiply = function(r) {
-	return new XNumber(this.num * r.num);
+ return new XNumber(this.num * r.num);
 };
 
 XNumber.prototype.div = function(r) {
-	return new XNumber(this.num / r.num);
+ return new XNumber(this.num / r.num);
 };
 
 XNumber.prototype.mod = function(r) {
-	return new XNumber(this.num % r.num);
+ return new XNumber(this.num % r.num);
 };
 
 // XBoolean //////////////////////////////////////////////////////////////////
@@ -2582,101 +2582,101 @@ XBoolean.prototype.constructor = XBoolean;
 XBoolean.superclass = Expression.prototype;
 
 function XBoolean(b) {
-	if (arguments.length > 0) {
-		this.init(b);
-	}
+ if (arguments.length > 0) {
+  this.init(b);
+ }
 }
 
 XBoolean.prototype.init = function(b) {
-	this.b = Boolean(b);
+ this.b = Boolean(b);
 };
 
 XBoolean.prototype.toString = function() {
-	return this.b.toString();
+ return this.b.toString();
 };
 
 XBoolean.prototype.evaluate = function(c) {
-	return this;
+ return this;
 };
 
 XBoolean.prototype.string = function() {
-	return new XString(this.b);
+ return new XString(this.b);
 };
 
 XBoolean.prototype.number = function() {
-	return new XNumber(this.b);
+ return new XNumber(this.b);
 };
 
 XBoolean.prototype.bool = function() {
-	return this;
+ return this;
 };
 
 XBoolean.prototype.nodeset = function() {
-	throw new Error("Cannot convert boolean to nodeset");
+ throw new Error("Cannot convert boolean to nodeset");
 };
 
 XBoolean.prototype.stringValue = function() {
-	return this.string().stringValue();
+ return this.string().stringValue();
 };
 
 XBoolean.prototype.numberValue = function() {
-	return this.num().numberValue();
+ return this.num().numberValue();
 };
 
 XBoolean.prototype.booleanValue = function() {
-	return this.b;
+ return this.b;
 };
 
 XBoolean.prototype.not = function() {
-	return new XBoolean(!this.b);
+ return new XBoolean(!this.b);
 };
 
 XBoolean.prototype.equals = function(r) {
-	if (Utilities.instance_of(r, XString) || Utilities.instance_of(r, XNumber)) {
-		return this.equals(r.bool());
-	}
-	if (Utilities.instance_of(r, XNodeSet)) {
-		return r.compareWithBoolean(this, Operators.equals);
-	}
-	return new XBoolean(this.b == r.b);
+ if (Utilities.instance_of(r, XString) || Utilities.instance_of(r, XNumber)) {
+  return this.equals(r.bool());
+ }
+ if (Utilities.instance_of(r, XNodeSet)) {
+  return r.compareWithBoolean(this, Operators.equals);
+ }
+ return new XBoolean(this.b == r.b);
 };
 
 XBoolean.prototype.notequal = function(r) {
-	if (Utilities.instance_of(r, XString) || Utilities.instance_of(r, XNumber)) {
-		return this.notequal(r.bool());
-	}
-	if (Utilities.instance_of(r, XNodeSet)) {
-		return r.compareWithBoolean(this, Operators.notequal);
-	}
-	return new XBoolean(this.b != r.b);
+ if (Utilities.instance_of(r, XString) || Utilities.instance_of(r, XNumber)) {
+  return this.notequal(r.bool());
+ }
+ if (Utilities.instance_of(r, XNodeSet)) {
+  return r.compareWithBoolean(this, Operators.notequal);
+ }
+ return new XBoolean(this.b != r.b);
 };
 
 XBoolean.prototype.lessthan = function(r) {
-	if (Utilities.instance_of(r, XNodeSet)) {
-		return r.compareWithNumber(this.number(), Operators.greaterthanorequal);
-	}
-	return this.number().lessthan(r.number());
+ if (Utilities.instance_of(r, XNodeSet)) {
+  return r.compareWithNumber(this.number(), Operators.greaterthanorequal);
+ }
+ return this.number().lessthan(r.number());
 };
 
 XBoolean.prototype.greaterthan = function(r) {
-	if (Utilities.instance_of(r, XNodeSet)) {
-		return r.compareWithNumber(this.number(), Operators.lessthanorequal);
-	}
-	return this.number().greaterthan(r.number());
+ if (Utilities.instance_of(r, XNodeSet)) {
+  return r.compareWithNumber(this.number(), Operators.lessthanorequal);
+ }
+ return this.number().greaterthan(r.number());
 };
 
 XBoolean.prototype.lessthanorequal = function(r) {
-	if (Utilities.instance_of(r, XNodeSet)) {
-		return r.compareWithNumber(this.number(), Operators.greaterthan);
-	}
-	return this.number().lessthanorequal(r.number());
+ if (Utilities.instance_of(r, XNodeSet)) {
+  return r.compareWithNumber(this.number(), Operators.greaterthan);
+ }
+ return this.number().lessthanorequal(r.number());
 };
 
 XBoolean.prototype.greaterthanorequal = function(r) {
-	if (Utilities.instance_of(r, XNodeSet)) {
-		return r.compareWithNumber(this.number(), Operators.lessthan);
-	}
-	return this.number().greaterthanorequal(r.number());
+ if (Utilities.instance_of(r, XNodeSet)) {
+  return r.compareWithNumber(this.number(), Operators.lessthan);
+ }
+ return this.number().greaterthanorequal(r.number());
 };
 
 // AVLTree ///////////////////////////////////////////////////////////////////
@@ -2686,21 +2686,21 @@ AVLTree.prototype.constructor = AVLTree;
 AVLTree.superclass = Object.prototype;
 
 function AVLTree(n) {
-	this.init(n);
+ this.init(n);
 }
 
 AVLTree.prototype.init = function(n) {
-	this.left = null;
+ this.left = null;
     this.right = null;
-	this.node = n;
-	this.depth = 1;
+ this.node = n;
+ this.depth = 1;
 };
 
 AVLTree.prototype.balance = function() {
     var ldepth = this.left  == null ? 0 : this.left.depth;
     var rdepth = this.right == null ? 0 : this.right.depth;
 
-	if (ldepth > rdepth + 1) {
+ if (ldepth > rdepth + 1) {
         // LR or LL rotation
         var lldepth = this.left.left  == null ? 0 : this.left.left.depth;
         var lrdepth = this.left.right == null ? 0 : this.left.right.depth;
@@ -2713,16 +2713,16 @@ AVLTree.prototype.balance = function() {
         this.rotateLL();       
     } else if (ldepth + 1 < rdepth) {
         // RR or RL rorarion
-		var rrdepth = this.right.right == null ? 0 : this.right.right.depth;
-		var rldepth = this.right.left  == null ? 0 : this.right.left.depth;
-	 
+  var rrdepth = this.right.right == null ? 0 : this.right.right.depth;
+  var rldepth = this.right.left  == null ? 0 : this.right.left.depth;
+  
         if (rldepth > rrdepth) {
             // RR rotation consists of a LL rotation of the right child
             this.right.rotateLL();
             // plus a RR rotation of this node, which happens anyway 
         }
         this.rotateRR();
-    }	     
+    }      
 };
 
 AVLTree.prototype.rotateLL = function() {
@@ -2752,7 +2752,7 @@ AVLTree.prototype.rotateRR = function() {
     this.left.updateInNewLocation();
     this.updateInNewLocation();
 }; 
-	
+ 
 AVLTree.prototype.updateInNewLocation = function() {
     this.getDepthFromChildren();
 };
@@ -2768,55 +2768,55 @@ AVLTree.prototype.getDepthFromChildren = function() {
 };
 
 AVLTree.prototype.order = function(n1, n2) {
-	if (n1 === n2) {
-		return 0;
-	}
-	var d1 = 0;
-	var d2 = 0;
-	for (var m1 = n1; m1 != null; m1 = m1.parentNode) {
-		d1++;
-	}
-	for (var m2 = n2; m2 != null; m2 = m2.parentNode) {
-		d2++;
-	}
-	if (d1 > d2) {
-		while (d1 > d2) {
-			n1 = n1.parentNode;
-			d1--;
-		}
-		if (n1 == n2) {
-			return 1;
-		}
-	} else if (d2 > d1) {
-		while (d2 > d1) {
-			n2 = n2.parentNode;
-			d2--;
-		}
-		if (n1 == n2) {
-			return -1;
-		}
-	}
-	while (n1.parentNode != n2.parentNode) {
-		n1 = n1.parentNode;
-		n2 = n2.parentNode;
-	}
-	while (n1.previousSibling != null && n2.previousSibling != null) {
-		n1 = n1.previousSibling;
-		n2 = n2.previousSibling;
-	}
-	if (n1.previousSibling == null) {
-		return -1;
-	}
-	return 1;
+ if (n1 === n2) {
+  return 0;
+ }
+ var d1 = 0;
+ var d2 = 0;
+ for (var m1 = n1; m1 != null; m1 = m1.parentNode) {
+  d1++;
+ }
+ for (var m2 = n2; m2 != null; m2 = m2.parentNode) {
+  d2++;
+ }
+ if (d1 > d2) {
+  while (d1 > d2) {
+   n1 = n1.parentNode;
+   d1--;
+  }
+  if (n1 == n2) {
+   return 1;
+  }
+ } else if (d2 > d1) {
+  while (d2 > d1) {
+   n2 = n2.parentNode;
+   d2--;
+  }
+  if (n1 == n2) {
+   return -1;
+  }
+ }
+ while (n1.parentNode != n2.parentNode) {
+  n1 = n1.parentNode;
+  n2 = n2.parentNode;
+ }
+ while (n1.previousSibling != null && n2.previousSibling != null) {
+  n1 = n1.previousSibling;
+  n2 = n2.previousSibling;
+ }
+ if (n1.previousSibling == null) {
+  return -1;
+ }
+ return 1;
 };
 
 AVLTree.prototype.add = function(n)  {
-	if (n === this.node) {
+ if (n === this.node) {
         return false;
     }
-	
-	var o = this.order(n, this.node);
-	
+ 
+ var o = this.order(n, this.node);
+ 
     var ret = false;
     if (o == -1) {
         if (this.left == null) {
@@ -2839,7 +2839,7 @@ AVLTree.prototype.add = function(n)  {
             }
         }
     }
-	
+ 
     if (ret) {
         this.getDepthFromChildren();
     }
@@ -2853,88 +2853,88 @@ XNodeSet.prototype.constructor = XNodeSet;
 XNodeSet.superclass = Expression.prototype;
 
 function XNodeSet() {
-	this.init();
+ this.init();
 }
 
 XNodeSet.prototype.init = function() {
-	this.tree = null;
-	this.size = 0;
+ this.tree = null;
+ this.size = 0;
 };
 
 XNodeSet.prototype.toString = function() {
-	var p = this.first();
-	if (p == null) {
-		return "";
-	}
-	return this.stringForNode(p);
+ var p = this.first();
+ if (p == null) {
+  return "";
+ }
+ return this.stringForNode(p);
 };
 
 XNodeSet.prototype.evaluate = function(c) {
-	return this;
+ return this;
 };
 
 XNodeSet.prototype.string = function() {
-	return new XString(this.toString());
+ return new XString(this.toString());
 };
 
 XNodeSet.prototype.stringValue = function() {
-	return this.toString();
+ return this.toString();
 };
 
 XNodeSet.prototype.number = function() {
-	return new XNumber(this.string());
+ return new XNumber(this.string());
 };
 
 XNodeSet.prototype.numberValue = function() {
-	return Number(this.string());
+ return Number(this.string());
 };
 
 XNodeSet.prototype.bool = function() {
-	return new XBoolean(this.tree != null);
+ return new XBoolean(this.tree != null);
 };
 
 XNodeSet.prototype.booleanValue = function() {
-	return this.tree != null;
+ return this.tree != null;
 };
 
 XNodeSet.prototype.nodeset = function() {
-	return this;
+ return this;
 };
 
 XNodeSet.prototype.stringForNode = function(n) {
-	if (n.nodeType == 9 /*Node.DOCUMENT_NODE*/) {
-		n = n.documentElement;
-	}
-	if (n.nodeType == 1 /*Node.ELEMENT_NODE*/) {
-		return this.stringForNodeRec(n);
-	}
-	if (n.isNamespaceNode) {
-		return n.namespace;
-	}
-	return n.nodeValue;
+ if (n.nodeType == 9 /*Node.DOCUMENT_NODE*/) {
+  n = n.documentElement;
+ }
+ if (n.nodeType == 1 /*Node.ELEMENT_NODE*/) {
+  return this.stringForNodeRec(n);
+ }
+ if (n.isNamespaceNode) {
+  return n.namespace;
+ }
+ return n.nodeValue;
 };
 
 XNodeSet.prototype.stringForNodeRec = function(n) {
-	var s = "";
-	for (var n2 = n.firstChild; n2 != null; n2 = n2.nextSibling) {
-		if (n2.nodeType == 3 /*Node.TEXT_NODE*/) {
-			s += n2.nodeValue;
-		} else if (n2.nodeType == 1 /*Node.ELEMENT_NODE*/) {
-			s += this.stringForNodeRec(n2);
-		}
-	}
-	return s;
+ var s = "";
+ for (var n2 = n.firstChild; n2 != null; n2 = n2.nextSibling) {
+  if (n2.nodeType == 3 /*Node.TEXT_NODE*/) {
+   s += n2.nodeValue;
+  } else if (n2.nodeType == 1 /*Node.ELEMENT_NODE*/) {
+   s += this.stringForNodeRec(n2);
+  }
+ }
+ return s;
 };
 
 XNodeSet.prototype.first = function() {
-	var p = this.tree;
-	if (p == null) {
-		return null;
-	}
-	while (p.left != null) {
-		p = p.left;
-	}
-	return p.node;
+ var p = this.tree;
+ if (p == null) {
+  return null;
+ }
+ while (p.left != null) {
+  p = p.left;
+ }
+ return p.node;
 };
 
 XNodeSet.prototype.add = function(n) {
@@ -2951,157 +2951,157 @@ XNodeSet.prototype.add = function(n) {
 };
 
 XNodeSet.prototype.addArray = function(ns) {
-	for (var i = 0; i < ns.length; i++) {
-		this.add(ns[i]);
-	}
+ for (var i = 0; i < ns.length; i++) {
+  this.add(ns[i]);
+ }
 };
 
 XNodeSet.prototype.toArray = function() {
-	var a = [];
-	this.toArrayRec(this.tree, a);
-	return a;
+ var a = [];
+ this.toArrayRec(this.tree, a);
+ return a;
 };
 
 XNodeSet.prototype.toArrayRec = function(t, a) {
-	if (t != null) {
-		this.toArrayRec(t.left, a);
-		a.push(t.node);
-		this.toArrayRec(t.right, a);
-	}
+ if (t != null) {
+  this.toArrayRec(t.left, a);
+  a.push(t.node);
+  this.toArrayRec(t.right, a);
+ }
 };
 
 XNodeSet.prototype.compareWithString = function(r, o) {
-	var a = this.toArray();
-	for (var i = 0; i < a.length; i++) {
-		var n = a[i];
-		var l = new XString(this.stringForNode(n));
-		var res = o(l, r);
-		if (res.booleanValue()) {
-			return res;
-		}
-	}
-	return new XBoolean(false);
+ var a = this.toArray();
+ for (var i = 0; i < a.length; i++) {
+  var n = a[i];
+  var l = new XString(this.stringForNode(n));
+  var res = o(l, r);
+  if (res.booleanValue()) {
+   return res;
+  }
+ }
+ return new XBoolean(false);
 };
 
 XNodeSet.prototype.compareWithNumber = function(r, o) {
-	var a = this.toArray();
-	for (var i = 0; i < a.length; i++) {
-		var n = a[i];
-		var l = new XNumber(this.stringForNode(n));
-		var res = o(l, r);
-		if (res.booleanValue()) {
-			return res;
-		}
-	}
-	return new XBoolean(false);
+ var a = this.toArray();
+ for (var i = 0; i < a.length; i++) {
+  var n = a[i];
+  var l = new XNumber(this.stringForNode(n));
+  var res = o(l, r);
+  if (res.booleanValue()) {
+   return res;
+  }
+ }
+ return new XBoolean(false);
 };
 
 XNodeSet.prototype.compareWithBoolean = function(r, o) {
-	return o(this.bool(), r);
+ return o(this.bool(), r);
 };
 
 XNodeSet.prototype.compareWithNodeSet = function(r, o) {
-	var a = this.toArray();
-	for (var i = 0; i < a.length; i++) {
-		var n = a[i];
-		var l = new XString(this.stringForNode(n));
-		var b = r.toArray();
-		for (var j = 0; j < b.length; j++) {
-			var n2 = b[j];
-			var r = new XString(this.stringForNode(n2));
-			var res = o(l, r);
-			if (res.booleanValue()) {
-				return res;
-			}
-		}
-	}
-	return new XBoolean(false);
+ var a = this.toArray();
+ for (var i = 0; i < a.length; i++) {
+  var n = a[i];
+  var l = new XString(this.stringForNode(n));
+  var b = r.toArray();
+  for (var j = 0; j < b.length; j++) {
+   var n2 = b[j];
+   var r = new XString(this.stringForNode(n2));
+   var res = o(l, r);
+   if (res.booleanValue()) {
+    return res;
+   }
+  }
+ }
+ return new XBoolean(false);
 };
 
 XNodeSet.prototype.equals = function(r) {
-	if (Utilities.instance_of(r, XString)) {
-		return this.compareWithString(r, Operators.equals);
-	}
-	if (Utilities.instance_of(r, XNumber)) {
-		return this.compareWithNumber(r, Operators.equals);
-	}
-	if (Utilities.instance_of(r, XBoolean)) {
-		return this.compareWithBoolean(r, Operators.equals);
-	}
-	return this.compareWithNodeSet(r, Operators.equals);
+ if (Utilities.instance_of(r, XString)) {
+  return this.compareWithString(r, Operators.equals);
+ }
+ if (Utilities.instance_of(r, XNumber)) {
+  return this.compareWithNumber(r, Operators.equals);
+ }
+ if (Utilities.instance_of(r, XBoolean)) {
+  return this.compareWithBoolean(r, Operators.equals);
+ }
+ return this.compareWithNodeSet(r, Operators.equals);
 };
 
 XNodeSet.prototype.notequal = function(r) {
-	if (Utilities.instance_of(r, XString)) {
-		return this.compareWithString(r, Operators.notequal);
-	}
-	if (Utilities.instance_of(r, XNumber)) {
-		return this.compareWithNumber(r, Operators.notequal);
-	}
-	if (Utilities.instance_of(r, XBoolean)) {
-		return this.compareWithBoolean(r, Operators.notequal);
-	}
-	return this.compareWithNodeSet(r, Operators.notequal);
+ if (Utilities.instance_of(r, XString)) {
+  return this.compareWithString(r, Operators.notequal);
+ }
+ if (Utilities.instance_of(r, XNumber)) {
+  return this.compareWithNumber(r, Operators.notequal);
+ }
+ if (Utilities.instance_of(r, XBoolean)) {
+  return this.compareWithBoolean(r, Operators.notequal);
+ }
+ return this.compareWithNodeSet(r, Operators.notequal);
 };
 
 XNodeSet.prototype.lessthan = function(r) {
-	if (Utilities.instance_of(r, XString)) {
-		return this.compareWithNumber(r.number(), Operators.lessthan);
-	}
-	if (Utilities.instance_of(r, XNumber)) {
-		return this.compareWithNumber(r, Operators.lessthan);
-	}
-	if (Utilities.instance_of(r, XBoolean)) {
-		return this.compareWithBoolean(r, Operators.lessthan);
-	}
-	return this.compareWithNodeSet(r, Operators.lessthan);
+ if (Utilities.instance_of(r, XString)) {
+  return this.compareWithNumber(r.number(), Operators.lessthan);
+ }
+ if (Utilities.instance_of(r, XNumber)) {
+  return this.compareWithNumber(r, Operators.lessthan);
+ }
+ if (Utilities.instance_of(r, XBoolean)) {
+  return this.compareWithBoolean(r, Operators.lessthan);
+ }
+ return this.compareWithNodeSet(r, Operators.lessthan);
 };
 
 XNodeSet.prototype.greaterthan = function(r) {
-	if (Utilities.instance_of(r, XString)) {
-		return this.compareWithNumber(r.number(), Operators.greaterthan);
-	}
-	if (Utilities.instance_of(r, XNumber)) {
-		return this.compareWithNumber(r, Operators.greaterthan);
-	}
-	if (Utilities.instance_of(r, XBoolean)) {
-		return this.compareWithBoolean(r, Operators.greaterthan);
-	}
-	return this.compareWithNodeSet(r, Operators.greaterthan);
+ if (Utilities.instance_of(r, XString)) {
+  return this.compareWithNumber(r.number(), Operators.greaterthan);
+ }
+ if (Utilities.instance_of(r, XNumber)) {
+  return this.compareWithNumber(r, Operators.greaterthan);
+ }
+ if (Utilities.instance_of(r, XBoolean)) {
+  return this.compareWithBoolean(r, Operators.greaterthan);
+ }
+ return this.compareWithNodeSet(r, Operators.greaterthan);
 };
 
 XNodeSet.prototype.lessthanorequal = function(r) {
-	if (Utilities.instance_of(r, XString)) {
-		return this.compareWithNumber(r.number(), Operators.lessthanorequal);
-	}
-	if (Utilities.instance_of(r, XNumber)) {
-		return this.compareWithNumber(r, Operators.lessthanorequal);
-	}
-	if (Utilities.instance_of(r, XBoolean)) {
-		return this.compareWithBoolean(r, Operators.lessthanorequal);
-	}
-	return this.compareWithNodeSet(r, Operators.lessthanorequal);
+ if (Utilities.instance_of(r, XString)) {
+  return this.compareWithNumber(r.number(), Operators.lessthanorequal);
+ }
+ if (Utilities.instance_of(r, XNumber)) {
+  return this.compareWithNumber(r, Operators.lessthanorequal);
+ }
+ if (Utilities.instance_of(r, XBoolean)) {
+  return this.compareWithBoolean(r, Operators.lessthanorequal);
+ }
+ return this.compareWithNodeSet(r, Operators.lessthanorequal);
 };
 
 XNodeSet.prototype.greaterthanorequal = function(r) {
-	if (Utilities.instance_of(r, XString)) {
-		return this.compareWithNumber(r.number(), Operators.greaterthanorequal);
-	}
-	if (Utilities.instance_of(r, XNumber)) {
-		return this.compareWithNumber(r, Operators.greaterthanorequal);
-	}
-	if (Utilities.instance_of(r, XBoolean)) {
-		return this.compareWithBoolean(r, Operators.greaterthanorequal);
-	}
-	return this.compareWithNodeSet(r, Operators.greaterthanorequal);
+ if (Utilities.instance_of(r, XString)) {
+  return this.compareWithNumber(r.number(), Operators.greaterthanorequal);
+ }
+ if (Utilities.instance_of(r, XNumber)) {
+  return this.compareWithNumber(r, Operators.greaterthanorequal);
+ }
+ if (Utilities.instance_of(r, XBoolean)) {
+  return this.compareWithBoolean(r, Operators.greaterthanorequal);
+ }
+ return this.compareWithNodeSet(r, Operators.greaterthanorequal);
 };
 
 XNodeSet.prototype.union = function(r) {
-	var ns = new XNodeSet();
-	ns.tree = this.tree;
-	ns.size = this.size;
-	ns.addArray(r.toArray());
-	return ns;
+ var ns = new XNodeSet();
+ ns.tree = this.tree;
+ ns.size = this.size;
+ ns.addArray(r.toArray());
+ return ns;
 };
 
 // XPathNamespace ////////////////////////////////////////////////////////////
@@ -3111,19 +3111,19 @@ XPathNamespace.prototype.constructor = XPathNamespace;
 XPathNamespace.superclass = Object.prototype;
 
 function XPathNamespace(pre, ns, p) {
-	this.isXPathNamespace = true;
-	this.ownerDocument = p.ownerDocument;
-	this.nodeName = "#namespace";
-	this.prefix = pre;
-	this.localName = pre;
-	this.namespaceURI = ns;
-	this.nodeValue = ns;
-	this.ownerElement = p;
-	this.nodeType = XPathNamespace.XPATH_NAMESPACE_NODE;
+ this.isXPathNamespace = true;
+ this.ownerDocument = p.ownerDocument;
+ this.nodeName = "#namespace";
+ this.prefix = pre;
+ this.localName = pre;
+ this.namespaceURI = ns;
+ this.nodeValue = ns;
+ this.ownerElement = p;
+ this.nodeType = XPathNamespace.XPATH_NAMESPACE_NODE;
 }
 
 XPathNamespace.prototype.toString = function() {
-	return "{ \"" + this.prefix + "\", \"" + this.namespaceURI + "\" }";
+ return "{ \"" + this.prefix + "\", \"" + this.namespaceURI + "\" }";
 };
 
 // Operators /////////////////////////////////////////////////////////////////
@@ -3131,27 +3131,27 @@ XPathNamespace.prototype.toString = function() {
 var Operators = new Object();
 
 Operators.equals = function(l, r) {
-	return l.equals(r);
+ return l.equals(r);
 };
 
 Operators.notequal = function(l, r) {
-	return l.notequal(r);
+ return l.notequal(r);
 };
 
 Operators.lessthan = function(l, r) {
-	return l.lessthan(r);
+ return l.lessthan(r);
 };
 
 Operators.greaterthan = function(l, r) {
-	return l.greaterthan(r);
+ return l.greaterthan(r);
 };
 
 Operators.lessthanorequal = function(l, r) {
-	return l.lessthanorequal(r);
+ return l.lessthanorequal(r);
 };
 
 Operators.greaterthanorequal = function(l, r) {
-	return l.greaterthanorequal(r);
+ return l.greaterthanorequal(r);
 };
 
 // XPathContext //////////////////////////////////////////////////////////////
@@ -3161,9 +3161,9 @@ XPathContext.prototype.constructor = XPathContext;
 XPathContext.superclass = Object.prototype;
 
 function XPathContext(vr, nr, fr) {
-	this.variableResolver = vr != null ? vr : new VariableResolver();
-	this.namespaceResolver = nr != null ? nr : new NamespaceResolver();
-	this.functionResolver = fr != null ? fr : new FunctionResolver();
+ this.variableResolver = vr != null ? vr : new VariableResolver();
+ this.namespaceResolver = nr != null ? nr : new NamespaceResolver();
+ this.functionResolver = fr != null ? fr : new FunctionResolver();
 }
 
 // VariableResolver //////////////////////////////////////////////////////////
@@ -3176,18 +3176,18 @@ function VariableResolver() {
 }
 
 VariableResolver.prototype.getVariable = function(vn, c) {
-	var parts = Utilities.splitQName(vn);
-	if (parts[0] != null) {
-		parts[0] = c.namespaceResolver.getNamespace(parts[0], c.expressionContextNode);
+ var parts = Utilities.splitQName(vn);
+ if (parts[0] != null) {
+  parts[0] = c.namespaceResolver.getNamespace(parts[0], c.expressionContextNode);
         if (parts[0] == null) {
             throw new Error("Cannot resolve QName " + fn);
         }
-	}
-	return this.getVariableWithName(parts[0], parts[1], c.expressionContextNode);
+ }
+ return this.getVariableWithName(parts[0], parts[1], c.expressionContextNode);
 };
 
 VariableResolver.prototype.getVariableWithName = function(ns, ln, c) {
-	return null;
+ return null;
 };
 
 // FunctionResolver //////////////////////////////////////////////////////////
@@ -3197,55 +3197,55 @@ FunctionResolver.prototype.constructor = FunctionResolver;
 FunctionResolver.superclass = Object.prototype;
 
 function FunctionResolver(thisArg) {
-	this.thisArg = thisArg != null ? thisArg : Functions;
-	this.functions = new Object();
-	this.addStandardFunctions();
+ this.thisArg = thisArg != null ? thisArg : Functions;
+ this.functions = new Object();
+ this.addStandardFunctions();
 }
 
 FunctionResolver.prototype.addStandardFunctions = function() {
-	this.functions["{}last"] = Functions.last;
-	this.functions["{}position"] = Functions.position;
-	this.functions["{}count"] = Functions.count;
-	this.functions["{}id"] = Functions.id;
-	this.functions["{}local-name"] = Functions.localName;
-	this.functions["{}namespace-uri"] = Functions.namespaceURI;
-	this.functions["{}name"] = Functions.name;
-	this.functions["{}string"] = Functions.string;
-	this.functions["{}concat"] = Functions.concat;
-	this.functions["{}starts-with"] = Functions.startsWith;
-	this.functions["{}contains"] = Functions.contains;
-	this.functions["{}substring-before"] = Functions.substringBefore;
-	this.functions["{}substring-after"] = Functions.substringAfter;
-	this.functions["{}substring"] = Functions.substring;
-	this.functions["{}string-length"] = Functions.stringLength;
-	this.functions["{}normalize-space"] = Functions.normalizeSpace;
-	this.functions["{}translate"] = Functions.translate;
-	this.functions["{}boolean"] = Functions.boolean_;
-	this.functions["{}not"] = Functions.not;
-	this.functions["{}true"] = Functions.true_;
-	this.functions["{}false"] = Functions.false_;
-	this.functions["{}lang"] = Functions.lang;
-	this.functions["{}number"] = Functions.number;
-	this.functions["{}sum"] = Functions.sum;
-	this.functions["{}floor"] = Functions.floor;
-	this.functions["{}ceiling"] = Functions.ceiling;
-	this.functions["{}round"] = Functions.round;
+ this.functions["{}last"] = Functions.last;
+ this.functions["{}position"] = Functions.position;
+ this.functions["{}count"] = Functions.count;
+ this.functions["{}id"] = Functions.id;
+ this.functions["{}local-name"] = Functions.localName;
+ this.functions["{}namespace-uri"] = Functions.namespaceURI;
+ this.functions["{}name"] = Functions.name;
+ this.functions["{}string"] = Functions.string;
+ this.functions["{}concat"] = Functions.concat;
+ this.functions["{}starts-with"] = Functions.startsWith;
+ this.functions["{}contains"] = Functions.contains;
+ this.functions["{}substring-before"] = Functions.substringBefore;
+ this.functions["{}substring-after"] = Functions.substringAfter;
+ this.functions["{}substring"] = Functions.substring;
+ this.functions["{}string-length"] = Functions.stringLength;
+ this.functions["{}normalize-space"] = Functions.normalizeSpace;
+ this.functions["{}translate"] = Functions.translate;
+ this.functions["{}boolean"] = Functions.boolean_;
+ this.functions["{}not"] = Functions.not;
+ this.functions["{}true"] = Functions.true_;
+ this.functions["{}false"] = Functions.false_;
+ this.functions["{}lang"] = Functions.lang;
+ this.functions["{}number"] = Functions.number;
+ this.functions["{}sum"] = Functions.sum;
+ this.functions["{}floor"] = Functions.floor;
+ this.functions["{}ceiling"] = Functions.ceiling;
+ this.functions["{}round"] = Functions.round;
 };
 
 FunctionResolver.prototype.addFunction = function(ns, ln, f) {
-	this.functions["{" + ns + "}" + ln] = f;
+ this.functions["{" + ns + "}" + ln] = f;
 };
 
 FunctionResolver.prototype.getFunction = function(fn, c) {
-	var parts = Utilities.resolveQName(fn, c.namespaceResolver, c.contextNode, false);
+ var parts = Utilities.resolveQName(fn, c.namespaceResolver, c.contextNode, false);
     if (parts[0] == null) {
         throw new Error("Cannot resolve QName " + fn);
     }
-	return this.getFunctionWithName(parts[0], parts[1], c.contextNode);
+ return this.getFunctionWithName(parts[0], parts[1], c.contextNode);
 };
 
 FunctionResolver.prototype.getFunctionWithName = function(ns, ln, c) {
-	return this.functions["{" + ns + "}" + ln];
+ return this.functions["{" + ns + "}" + ln];
 };
 
 // NamespaceResolver /////////////////////////////////////////////////////////
@@ -3258,31 +3258,31 @@ function NamespaceResolver() {
 }
 
 NamespaceResolver.prototype.getNamespace = function(prefix, n) {
-	if (prefix == "xml") {
-		return XPath.XML_NAMESPACE_URI;
-	} else if (prefix == "xmlns") {
-		return XPath.XMLNS_NAMESPACE_URI;
-	}
-	if (n.nodeType == 9 /*Node.DOCUMENT_NODE*/) {
-		n = n.documentElement;
-	} else if (n.nodeType == 2 /*Node.ATTRIBUTE_NODE*/) {
-		n = PathExpr.prototype.getOwnerElement(n);
-	} else if (n.nodeType != 1 /*Node.ELEMENT_NODE*/) {
-		n = n.parentNode;
-	}
-	while (n != null && n.nodeType == 1 /*Node.ELEMENT_NODE*/) {
-		var nnm = n.attributes;
-		for (var i = 0; i < nnm.length; i++) {
-			var a = nnm.item(i);
-			var aname = a.nodeName;
-			if (aname == "xmlns" && prefix == ""
-					|| aname == "xmlns:" + prefix) {
-				return String(a.nodeValue);
-			}
-		}
-		n = n.parentNode;
-	}
-	return null;
+ if (prefix == "xml") {
+  return XPath.XML_NAMESPACE_URI;
+ } else if (prefix == "xmlns") {
+  return XPath.XMLNS_NAMESPACE_URI;
+ }
+ if (n.nodeType == 9 /*Node.DOCUMENT_NODE*/) {
+  n = n.documentElement;
+ } else if (n.nodeType == 2 /*Node.ATTRIBUTE_NODE*/) {
+  n = PathExpr.prototype.getOwnerElement(n);
+ } else if (n.nodeType != 1 /*Node.ELEMENT_NODE*/) {
+  n = n.parentNode;
+ }
+ while (n != null && n.nodeType == 1 /*Node.ELEMENT_NODE*/) {
+  var nnm = n.attributes;
+  for (var i = 0; i < nnm.length; i++) {
+   var a = nnm.item(i);
+   var aname = a.nodeName;
+   if (aname == "xmlns" && prefix == ""
+     || aname == "xmlns:" + prefix) {
+    return String(a.nodeValue);
+   }
+  }
+  n = n.parentNode;
+ }
+ return null;
 };
 
 // Functions /////////////////////////////////////////////////////////////////
@@ -3290,370 +3290,370 @@ NamespaceResolver.prototype.getNamespace = function(prefix, n) {
 Functions = new Object();
 
 Functions.last = function() {
-	var c = arguments[0];
-	if (arguments.length != 1) {
-		throw new Error("Function last expects ()");
-	}
-	return new XNumber(c.contextSize);
+ var c = arguments[0];
+ if (arguments.length != 1) {
+  throw new Error("Function last expects ()");
+ }
+ return new XNumber(c.contextSize);
 };
 
 Functions.position = function() {
-	var c = arguments[0];
-	if (arguments.length != 1) {
-		throw new Error("Function position expects ()");
-	}
-	return new XNumber(c.contextPosition);
+ var c = arguments[0];
+ if (arguments.length != 1) {
+  throw new Error("Function position expects ()");
+ }
+ return new XNumber(c.contextPosition);
 };
 
 Functions.count = function() {
-	var c = arguments[0];
-	var ns;
-	if (arguments.length != 2 || !Utilities.instance_of(ns = arguments[1].evaluate(c), XNodeSet)) {
-		throw new Error("Function count expects (node-set)");
-	}
-	return new XNumber(ns.size);
+ var c = arguments[0];
+ var ns;
+ if (arguments.length != 2 || !Utilities.instance_of(ns = arguments[1].evaluate(c), XNodeSet)) {
+  throw new Error("Function count expects (node-set)");
+ }
+ return new XNumber(ns.size);
 };
 
 Functions.id = function() {
-	var c = arguments[0];
-	var id;
-	if (arguments.length != 2) {
-		throw new Error("Function id expects (object)");
-	}
-	id = arguments[1].evaluate(c);
-	if (Utilities.instance_of(id, XNodeSet)) {
-		id = id.toArray().join(" ");
-	} else {
-		id = id.stringValue();
-	}
-	var ids = id.split(/[\x0d\x0a\x09\x20]+/);
-	var count = 0;
-	var ns = new XNodeSet();
-	var doc = c.contextNode.nodeType == 9 /*Node.DOCUMENT_NODE*/
-			? c.contextNode
-			: c.contextNode.ownerDocument;
-	for (var i = 0; i < ids.length; i++) {
-		var n;
-		if (doc.getElementById) {
-			n = doc.getElementById(ids[i]);
-		} else {
-			n = Utilities.getElementById(doc, ids[i]);
-		}
-		if (n != null) {
-			ns.add(n);
-			count++;
-		}
-	}
-	return ns;
+ var c = arguments[0];
+ var id;
+ if (arguments.length != 2) {
+  throw new Error("Function id expects (object)");
+ }
+ id = arguments[1].evaluate(c);
+ if (Utilities.instance_of(id, XNodeSet)) {
+  id = id.toArray().join(" ");
+ } else {
+  id = id.stringValue();
+ }
+ var ids = id.split(/[\x0d\x0a\x09\x20]+/);
+ var count = 0;
+ var ns = new XNodeSet();
+ var doc = c.contextNode.nodeType == 9 /*Node.DOCUMENT_NODE*/
+   ? c.contextNode
+   : c.contextNode.ownerDocument;
+ for (var i = 0; i < ids.length; i++) {
+  var n;
+  if (doc.getElementById) {
+   n = doc.getElementById(ids[i]);
+  } else {
+   n = Utilities.getElementById(doc, ids[i]);
+  }
+  if (n != null) {
+   ns.add(n);
+   count++;
+  }
+ }
+ return ns;
 };
 
 Functions.localName = function() {
-	var c = arguments[0];
-	var n;
-	if (arguments.length == 1) {
-		n = c.contextNode;
-	} else if (arguments.length == 2) {
-		n = arguments[1].evaluate(c).first();
-	} else {
-		throw new Error("Function local-name expects (node-set?)");
-	}
-	if (n == null) {
-		return new XString("");
-	}
-	return new XString(n.localName ? n.localName : n.baseName);
+ var c = arguments[0];
+ var n;
+ if (arguments.length == 1) {
+  n = c.contextNode;
+ } else if (arguments.length == 2) {
+  n = arguments[1].evaluate(c).first();
+ } else {
+  throw new Error("Function local-name expects (node-set?)");
+ }
+ if (n == null) {
+  return new XString("");
+ }
+ return new XString(n.localName ? n.localName : n.baseName);
 };
 
 Functions.namespaceURI = function() {
-	var c = arguments[0];
-	var n;
-	if (arguments.length == 1) {
-		n = c.contextNode;
-	} else if (arguments.length == 2) {
-		n = arguments[1].evaluate(c).first();
-	} else {
-		throw new Error("Function namespace-uri expects (node-set?)");
-	}
-	if (n == null) {
-		return new XString("");
-	}
-	return new XString(n.namespaceURI);
+ var c = arguments[0];
+ var n;
+ if (arguments.length == 1) {
+  n = c.contextNode;
+ } else if (arguments.length == 2) {
+  n = arguments[1].evaluate(c).first();
+ } else {
+  throw new Error("Function namespace-uri expects (node-set?)");
+ }
+ if (n == null) {
+  return new XString("");
+ }
+ return new XString(n.namespaceURI);
 };
 
 Functions.name = function() {
-	var c = arguments[0];
-	var n;
-	if (arguments.length == 1) {
-		n = c.contextNode;
-	} else if (arguments.length == 2) {
-		n = arguments[1].evaluate(c).first();
-	} else {
-		throw new Error("Function name expects (node-set?)");
-	}
-	if (n == null) {
-		return new XString("");
-	}
-	if (n.nodeType == 1 /*Node.ELEMENT_NODE*/ || n.nodeType == 2 /*Node.ATTRIBUTE_NODE*/) {
-		return new XString(n.nodeName);
-	} else if (n.localName == null) {
-		return new XString("");
-	} else {
-		return new XString(n.localName);
-	}
+ var c = arguments[0];
+ var n;
+ if (arguments.length == 1) {
+  n = c.contextNode;
+ } else if (arguments.length == 2) {
+  n = arguments[1].evaluate(c).first();
+ } else {
+  throw new Error("Function name expects (node-set?)");
+ }
+ if (n == null) {
+  return new XString("");
+ }
+ if (n.nodeType == 1 /*Node.ELEMENT_NODE*/ || n.nodeType == 2 /*Node.ATTRIBUTE_NODE*/) {
+  return new XString(n.nodeName);
+ } else if (n.localName == null) {
+  return new XString("");
+ } else {
+  return new XString(n.localName);
+ }
 };
 
 Functions.string = function() {
-	var c = arguments[0];
-	if (arguments.length == 1) {
-		return XNodeSet.prototype.stringForNode(c.contextNode);
-	} else if (arguments.length == 2) {
-		return arguments[1].evaluate(c).string();
-	}
-	throw new Error("Function string expects (object?)");
+ var c = arguments[0];
+ if (arguments.length == 1) {
+  return XNodeSet.prototype.stringForNode(c.contextNode);
+ } else if (arguments.length == 2) {
+  return arguments[1].evaluate(c).string();
+ }
+ throw new Error("Function string expects (object?)");
 };
 
 Functions.concat = function() {
-	var c = arguments[0];
-	if (arguments.length < 3) {
-		throw new Error("Function concat expects (string, string, string*)");
-	}
-	var s = "";
-	for (var i = 1; i < arguments.length; i++) {
-		s += arguments[i].evaluate(c).stringValue();
-	}
-	return new XString(s);
+ var c = arguments[0];
+ if (arguments.length < 3) {
+  throw new Error("Function concat expects (string, string, string*)");
+ }
+ var s = "";
+ for (var i = 1; i < arguments.length; i++) {
+  s += arguments[i].evaluate(c).stringValue();
+ }
+ return new XString(s);
 };
 
 Functions.startsWith = function() {
-	var c = arguments[0];
-	if (arguments.length != 3) {
-		throw new Error("Function startsWith expects (string, string)");
-	}
-	var s1 = arguments[1].evaluate(c).stringValue();
-	var s2 = arguments[2].evaluate(c).stringValue();
-	return new XBoolean(s1.substring(0, s2.length) == s2);
+ var c = arguments[0];
+ if (arguments.length != 3) {
+  throw new Error("Function startsWith expects (string, string)");
+ }
+ var s1 = arguments[1].evaluate(c).stringValue();
+ var s2 = arguments[2].evaluate(c).stringValue();
+ return new XBoolean(s1.substring(0, s2.length) == s2);
 };
 
 Functions.contains = function() {
-	var c = arguments[0];
-	if (arguments.length != 3) {
-		throw new Error("Function contains expects (string, string)");
-	}
-	var s1 = arguments[1].evaluate(c).stringValue();
-	var s2 = arguments[2].evaluate(c).stringValue();
-	return new XBoolean(s1.indexOf(s2) != -1);
+ var c = arguments[0];
+ if (arguments.length != 3) {
+  throw new Error("Function contains expects (string, string)");
+ }
+ var s1 = arguments[1].evaluate(c).stringValue();
+ var s2 = arguments[2].evaluate(c).stringValue();
+ return new XBoolean(s1.indexOf(s2) != -1);
 };
 
 Functions.substringBefore = function() {
-	var c = arguments[0];
-	if (arguments.length != 3) {
-		throw new Error("Function substring-before expects (string, string)");
-	}
-	var s1 = arguments[1].evaluate(c).stringValue();
-	var s2 = arguments[2].evaluate(c).stringValue();
-	return new XString(s1.substring(0, s1.indexOf(s2)));
+ var c = arguments[0];
+ if (arguments.length != 3) {
+  throw new Error("Function substring-before expects (string, string)");
+ }
+ var s1 = arguments[1].evaluate(c).stringValue();
+ var s2 = arguments[2].evaluate(c).stringValue();
+ return new XString(s1.substring(0, s1.indexOf(s2)));
 };
 
 Functions.substringAfter = function() {
-	var c = arguments[0];
-	if (arguments.length != 3) {
-		throw new Error("Function substring-after expects (string, string)");
-	}
-	var s1 = arguments[1].evaluate(c).stringValue();
-	var s2 = arguments[2].evaluate(c).stringValue();
-	if (s2.length == 0) {
-		return new XString(s1);
-	}
-	var i = s1.indexOf(s2);
-	if (i == -1) {
-		return new XString("");
-	}
-	return new XString(s1.substring(s1.indexOf(s2) + 1));
+ var c = arguments[0];
+ if (arguments.length != 3) {
+  throw new Error("Function substring-after expects (string, string)");
+ }
+ var s1 = arguments[1].evaluate(c).stringValue();
+ var s2 = arguments[2].evaluate(c).stringValue();
+ if (s2.length == 0) {
+  return new XString(s1);
+ }
+ var i = s1.indexOf(s2);
+ if (i == -1) {
+  return new XString("");
+ }
+ return new XString(s1.substring(s1.indexOf(s2) + 1));
 };
 
 Functions.substring = function() {
-	var c = arguments[0];
-	if (!(arguments.length == 3 || arguments.length == 4)) {
-		throw new Error("Function substring expects (string, number, number?)");
-	}
-	var s = arguments[1].evaluate(c).stringValue();
-	var n1 = Math.round(arguments[2].evaluate(c).numberValue()) - 1;
-	var n2 = arguments.length == 4 ? n1 + Math.round(arguments[3].evaluate(c).numberValue()) : undefined;
-	return new XString(s.substring(n1, n2));
+ var c = arguments[0];
+ if (!(arguments.length == 3 || arguments.length == 4)) {
+  throw new Error("Function substring expects (string, number, number?)");
+ }
+ var s = arguments[1].evaluate(c).stringValue();
+ var n1 = Math.round(arguments[2].evaluate(c).numberValue()) - 1;
+ var n2 = arguments.length == 4 ? n1 + Math.round(arguments[3].evaluate(c).numberValue()) : undefined;
+ return new XString(s.substring(n1, n2));
 };
 
 Functions.stringLength = function() {
-	var c = arguments[0];
-	var s;
-	if (arguments.length == 1) {
-		s = XNodeSet.prototype.stringForNode(c.contextNode);
-	} else if (arguments.length == 2) {
-		s = arguments[1].evaluate(c).stringValue();
-	} else {
-		throw new Error("Function string-length expects (string?)");
-	}
-	return new XNumber(s.length);
+ var c = arguments[0];
+ var s;
+ if (arguments.length == 1) {
+  s = XNodeSet.prototype.stringForNode(c.contextNode);
+ } else if (arguments.length == 2) {
+  s = arguments[1].evaluate(c).stringValue();
+ } else {
+  throw new Error("Function string-length expects (string?)");
+ }
+ return new XNumber(s.length);
 };
 
 Functions.normalizeSpace = function() {
-	var c = arguments[0];
-	var s;
-	if (arguments.length == 1) {
-		s = XNodeSet.prototype.stringForNode(c.contextNode);
-	} else if (arguments.length == 2) {
-		s = arguments[1].evaluate(c).stringValue();
-	} else {
-		throw new Error("Function normalize-space expects (string?)");
-	}
-	var i = 0;
-	var j = s.length - 1;
-	while (Utilities.isSpace(s.charCodeAt(j))) {
-		j--;
-	}
-	var t = "";
-	while (i <= j && Utilities.isSpace(s.charCodeAt(i))) {
-		i++;
-	}
-	while (i <= j) {
-		if (Utilities.isSpace(s.charCodeAt(i))) {
-			t += " ";
-			while (i <= j && Utilities.isSpace(s.charCodeAt(i))) {
-				i++;
-			}
-		} else {
-			t += s.charAt(i);
-			i++;
-		}
-	}
-	return new XString(t);
+ var c = arguments[0];
+ var s;
+ if (arguments.length == 1) {
+  s = XNodeSet.prototype.stringForNode(c.contextNode);
+ } else if (arguments.length == 2) {
+  s = arguments[1].evaluate(c).stringValue();
+ } else {
+  throw new Error("Function normalize-space expects (string?)");
+ }
+ var i = 0;
+ var j = s.length - 1;
+ while (Utilities.isSpace(s.charCodeAt(j))) {
+  j--;
+ }
+ var t = "";
+ while (i <= j && Utilities.isSpace(s.charCodeAt(i))) {
+  i++;
+ }
+ while (i <= j) {
+  if (Utilities.isSpace(s.charCodeAt(i))) {
+   t += " ";
+   while (i <= j && Utilities.isSpace(s.charCodeAt(i))) {
+    i++;
+   }
+  } else {
+   t += s.charAt(i);
+   i++;
+  }
+ }
+ return new XString(t);
 };
 
 Functions.translate = function() {
-	var c = arguments[0];
-	if (arguments.length != 4) {
-		throw new Error("Function translate expects (string, string, string)");
-	}
-	var s1 = arguments[1].evaluate(c).stringValue();
-	var s2 = arguments[2].evaluate(c).stringValue();
-	var s3 = arguments[3].evaluate(c).stringValue();
-	var map = [];
-	for (var i = 0; i < s2.length; i++) {
-		var j = s2.charCodeAt(i);
-		if (map[j] == undefined) {
-			var k = i > s3.length ? "" : s3.charAt(i);
-			map[j] = k;
-		}
-	}
-	var t = "";
-	for (var i = 0; i < s1.length; i++) {
-		var c = s1.charCodeAt(i);
-		var r = map[c];
-		if (r == undefined) {
-			t += s1.charAt(i);
-		} else {
-			t += r;
-		}
-	}
-	return new XString(t);
+ var c = arguments[0];
+ if (arguments.length != 4) {
+  throw new Error("Function translate expects (string, string, string)");
+ }
+ var s1 = arguments[1].evaluate(c).stringValue();
+ var s2 = arguments[2].evaluate(c).stringValue();
+ var s3 = arguments[3].evaluate(c).stringValue();
+ var map = [];
+ for (var i = 0; i < s2.length; i++) {
+  var j = s2.charCodeAt(i);
+  if (map[j] == undefined) {
+   var k = i > s3.length ? "" : s3.charAt(i);
+   map[j] = k;
+  }
+ }
+ var t = "";
+ for (var i = 0; i < s1.length; i++) {
+  var c = s1.charCodeAt(i);
+  var r = map[c];
+  if (r == undefined) {
+   t += s1.charAt(i);
+  } else {
+   t += r;
+  }
+ }
+ return new XString(t);
 };
 
 Functions.boolean_ = function() {
-	var c = arguments[0];
-	if (arguments.length != 2) {
-		throw new Error("Function boolean expects (object)");
-	}
-	return arguments[1].evaluate(c).bool();
+ var c = arguments[0];
+ if (arguments.length != 2) {
+  throw new Error("Function boolean expects (object)");
+ }
+ return arguments[1].evaluate(c).bool();
 };
 
 Functions.not = function() {
-	var c = arguments[0];
-	if (arguments.length != 2) {
-		throw new Error("Function not expects (object)");
-	}
-	return arguments[1].evaluate(c).bool().not();
+ var c = arguments[0];
+ if (arguments.length != 2) {
+  throw new Error("Function not expects (object)");
+ }
+ return arguments[1].evaluate(c).bool().not();
 };
 
 Functions.true_ = function() {
-	if (arguments.length != 1) {
-		throw new Error("Function true expects ()");
-	}
-	return new XBoolean(true);
+ if (arguments.length != 1) {
+  throw new Error("Function true expects ()");
+ }
+ return new XBoolean(true);
 };
 
 Functions.false_ = function() {
-	if (arguments.length != 1) {
-		throw new Error("Function false expects ()");
-	}
-	return new XBoolean(false);
+ if (arguments.length != 1) {
+  throw new Error("Function false expects ()");
+ }
+ return new XBoolean(false);
 };
 
 Functions.lang = function() {
-	var c = arguments[0];
-	if (arguments.length != 2) {
-		throw new Error("Function lang expects (string)");
-	}
-	var lang;
-	for (var n = c.contextNode; n != null && n.nodeType != 9 /*Node.DOCUMENT_NODE*/; n = n.parentNode) {
-		var a = n.getAttributeNS(XPath.XML_NAMESPACE_URI, "lang");
-		if (a != null) {
-			lang = String(a);
-			break;
-		}
-	}
-	if (lang == null) {
-		return new XBoolean(false);
-	}
-	var s = arguments[1].evaluate(c).stringValue();
-	return new XBoolean(lang.substring(0, s.length) == s
-				&& (lang.length == s.length || lang.charAt(s.length) == '-'));
+ var c = arguments[0];
+ if (arguments.length != 2) {
+  throw new Error("Function lang expects (string)");
+ }
+ var lang;
+ for (var n = c.contextNode; n != null && n.nodeType != 9 /*Node.DOCUMENT_NODE*/; n = n.parentNode) {
+  var a = n.getAttributeNS(XPath.XML_NAMESPACE_URI, "lang");
+  if (a != null) {
+   lang = String(a);
+   break;
+  }
+ }
+ if (lang == null) {
+  return new XBoolean(false);
+ }
+ var s = arguments[1].evaluate(c).stringValue();
+ return new XBoolean(lang.substring(0, s.length) == s
+    && (lang.length == s.length || lang.charAt(s.length) == '-'));
 };
 
 Functions.number = function() {
-	var c = arguments[0];
-	if (!(arguments.length == 1 || arguments.length == 2)) {
-		throw new Error("Function number expects (object?)");
-	}
-	if (arguments.length == 1) {
-		return new XNumber(XNodeSet.prototype.stringForNode(c.contextNode));
-	}
-	return arguments[1].evaluate(c).number();
+ var c = arguments[0];
+ if (!(arguments.length == 1 || arguments.length == 2)) {
+  throw new Error("Function number expects (object?)");
+ }
+ if (arguments.length == 1) {
+  return new XNumber(XNodeSet.prototype.stringForNode(c.contextNode));
+ }
+ return arguments[1].evaluate(c).number();
 };
 
 Functions.sum = function() {
-	var c = arguments[0];
-	var ns;
-	if (arguments.length != 2 || !Utilities.instance_of((ns = arguments[1].evaluate(c)), XNodeSet)) {
-		throw new Error("Function sum expects (node-set)");
-	}
-	ns = ns.toArray();
-	var n = 0;
-	for (var i = 0; i < ns.length; i++) {
-		n += new XNumber(XNodeSet.prototype.stringForNode(ns[i])).numberValue();
-	}
-	return new XNumber(n);
+ var c = arguments[0];
+ var ns;
+ if (arguments.length != 2 || !Utilities.instance_of((ns = arguments[1].evaluate(c)), XNodeSet)) {
+  throw new Error("Function sum expects (node-set)");
+ }
+ ns = ns.toArray();
+ var n = 0;
+ for (var i = 0; i < ns.length; i++) {
+  n += new XNumber(XNodeSet.prototype.stringForNode(ns[i])).numberValue();
+ }
+ return new XNumber(n);
 };
 
 Functions.floor = function() {
-	var c = arguments[0];
-	if (arguments.length != 2) {
-		throw new Error("Function floor expects (number)");
-	}
-	return new XNumber(Math.floor(arguments[1].evaluate(c).numberValue()));
+ var c = arguments[0];
+ if (arguments.length != 2) {
+  throw new Error("Function floor expects (number)");
+ }
+ return new XNumber(Math.floor(arguments[1].evaluate(c).numberValue()));
 };
 
 Functions.ceiling = function() {
-	var c = arguments[0];
-	if (arguments.length != 2) {
-		throw new Error("Function ceiling expects (number)");
-	}
-	return new XNumber(Math.ceil(arguments[1].evaluate(c).numberValue()));
+ var c = arguments[0];
+ if (arguments.length != 2) {
+  throw new Error("Function ceiling expects (number)");
+ }
+ return new XNumber(Math.ceil(arguments[1].evaluate(c).numberValue()));
 };
 
 Functions.round = function() {
-	var c = arguments[0];
-	if (arguments.length != 2) {
-		throw new Error("Function round expects (number)");
-	}
-	return new XNumber(Math.round(arguments[1].evaluate(c).numberValue()));
+ var c = arguments[0];
+ if (arguments.length != 2) {
+  throw new Error("Function round expects (number)");
+ }
+ return new XNumber(Math.round(arguments[1].evaluate(c).numberValue()));
 };
 
 // Utilities /////////////////////////////////////////////////////////////////
@@ -3661,433 +3661,433 @@ Functions.round = function() {
 Utilities = new Object();
 
 Utilities.splitQName = function(qn) {
-	var i = qn.indexOf(":");
-	if (i == -1) {
-		return [ null, qn ];
-	}
-	return [ qn.substring(0, i), qn.substring(i + 1) ];
+ var i = qn.indexOf(":");
+ if (i == -1) {
+  return [ null, qn ];
+ }
+ return [ qn.substring(0, i), qn.substring(i + 1) ];
 };
 
 Utilities.resolveQName = function(qn, nr, n, useDefault) {
-	var parts = Utilities.splitQName(qn);
-	if (parts[0] != null) {
-		parts[0] = nr.getNamespace(parts[0], n);
-	} else {
-		if (useDefault) {
-			parts[0] = nr.getNamespace("", n);
-			if (parts[0] == null) {
-				parts[0] = "";
-			}
-		} else {
-			parts[0] = "";
-		}
-	}
-	return parts;
+ var parts = Utilities.splitQName(qn);
+ if (parts[0] != null) {
+  parts[0] = nr.getNamespace(parts[0], n);
+ } else {
+  if (useDefault) {
+   parts[0] = nr.getNamespace("", n);
+   if (parts[0] == null) {
+    parts[0] = "";
+   }
+  } else {
+   parts[0] = "";
+  }
+ }
+ return parts;
 };
 
 Utilities.isSpace = function(c) {
-	return c == 0x9 || c == 0xd || c == 0xa || c == 0x20;
+ return c == 0x9 || c == 0xd || c == 0xa || c == 0x20;
 };
 
 Utilities.isLetter = function(c) {
-	return c >= 0x0041 && c <= 0x005A ||
-		c >= 0x0061 && c <= 0x007A ||
-		c >= 0x00C0 && c <= 0x00D6 ||
-		c >= 0x00D8 && c <= 0x00F6 ||
-		c >= 0x00F8 && c <= 0x00FF ||
-		c >= 0x0100 && c <= 0x0131 ||
-		c >= 0x0134 && c <= 0x013E ||
-		c >= 0x0141 && c <= 0x0148 ||
-		c >= 0x014A && c <= 0x017E ||
-		c >= 0x0180 && c <= 0x01C3 ||
-		c >= 0x01CD && c <= 0x01F0 ||
-		c >= 0x01F4 && c <= 0x01F5 ||
-		c >= 0x01FA && c <= 0x0217 ||
-		c >= 0x0250 && c <= 0x02A8 ||
-		c >= 0x02BB && c <= 0x02C1 ||
-		c == 0x0386 ||
-		c >= 0x0388 && c <= 0x038A ||
-		c == 0x038C ||
-		c >= 0x038E && c <= 0x03A1 ||
-		c >= 0x03A3 && c <= 0x03CE ||
-		c >= 0x03D0 && c <= 0x03D6 ||
-		c == 0x03DA ||
-		c == 0x03DC ||
-		c == 0x03DE ||
-		c == 0x03E0 ||
-		c >= 0x03E2 && c <= 0x03F3 ||
-		c >= 0x0401 && c <= 0x040C ||
-		c >= 0x040E && c <= 0x044F ||
-		c >= 0x0451 && c <= 0x045C ||
-		c >= 0x045E && c <= 0x0481 ||
-		c >= 0x0490 && c <= 0x04C4 ||
-		c >= 0x04C7 && c <= 0x04C8 ||
-		c >= 0x04CB && c <= 0x04CC ||
-		c >= 0x04D0 && c <= 0x04EB ||
-		c >= 0x04EE && c <= 0x04F5 ||
-		c >= 0x04F8 && c <= 0x04F9 ||
-		c >= 0x0531 && c <= 0x0556 ||
-		c == 0x0559 ||
-		c >= 0x0561 && c <= 0x0586 ||
-		c >= 0x05D0 && c <= 0x05EA ||
-		c >= 0x05F0 && c <= 0x05F2 ||
-		c >= 0x0621 && c <= 0x063A ||
-		c >= 0x0641 && c <= 0x064A ||
-		c >= 0x0671 && c <= 0x06B7 ||
-		c >= 0x06BA && c <= 0x06BE ||
-		c >= 0x06C0 && c <= 0x06CE ||
-		c >= 0x06D0 && c <= 0x06D3 ||
-		c == 0x06D5 ||
-		c >= 0x06E5 && c <= 0x06E6 ||
-		c >= 0x0905 && c <= 0x0939 ||
-		c == 0x093D ||
-		c >= 0x0958 && c <= 0x0961 ||
-		c >= 0x0985 && c <= 0x098C ||
-		c >= 0x098F && c <= 0x0990 ||
-		c >= 0x0993 && c <= 0x09A8 ||
-		c >= 0x09AA && c <= 0x09B0 ||
-		c == 0x09B2 ||
-		c >= 0x09B6 && c <= 0x09B9 ||
-		c >= 0x09DC && c <= 0x09DD ||
-		c >= 0x09DF && c <= 0x09E1 ||
-		c >= 0x09F0 && c <= 0x09F1 ||
-		c >= 0x0A05 && c <= 0x0A0A ||
-		c >= 0x0A0F && c <= 0x0A10 ||
-		c >= 0x0A13 && c <= 0x0A28 ||
-		c >= 0x0A2A && c <= 0x0A30 ||
-		c >= 0x0A32 && c <= 0x0A33 ||
-		c >= 0x0A35 && c <= 0x0A36 ||
-		c >= 0x0A38 && c <= 0x0A39 ||
-		c >= 0x0A59 && c <= 0x0A5C ||
-		c == 0x0A5E ||
-		c >= 0x0A72 && c <= 0x0A74 ||
-		c >= 0x0A85 && c <= 0x0A8B ||
-		c == 0x0A8D ||
-		c >= 0x0A8F && c <= 0x0A91 ||
-		c >= 0x0A93 && c <= 0x0AA8 ||
-		c >= 0x0AAA && c <= 0x0AB0 ||
-		c >= 0x0AB2 && c <= 0x0AB3 ||
-		c >= 0x0AB5 && c <= 0x0AB9 ||
-		c == 0x0ABD ||
-		c == 0x0AE0 ||
-		c >= 0x0B05 && c <= 0x0B0C ||
-		c >= 0x0B0F && c <= 0x0B10 ||
-		c >= 0x0B13 && c <= 0x0B28 ||
-		c >= 0x0B2A && c <= 0x0B30 ||
-		c >= 0x0B32 && c <= 0x0B33 ||
-		c >= 0x0B36 && c <= 0x0B39 ||
-		c == 0x0B3D ||
-		c >= 0x0B5C && c <= 0x0B5D ||
-		c >= 0x0B5F && c <= 0x0B61 ||
-		c >= 0x0B85 && c <= 0x0B8A ||
-		c >= 0x0B8E && c <= 0x0B90 ||
-		c >= 0x0B92 && c <= 0x0B95 ||
-		c >= 0x0B99 && c <= 0x0B9A ||
-		c == 0x0B9C ||
-		c >= 0x0B9E && c <= 0x0B9F ||
-		c >= 0x0BA3 && c <= 0x0BA4 ||
-		c >= 0x0BA8 && c <= 0x0BAA ||
-		c >= 0x0BAE && c <= 0x0BB5 ||
-		c >= 0x0BB7 && c <= 0x0BB9 ||
-		c >= 0x0C05 && c <= 0x0C0C ||
-		c >= 0x0C0E && c <= 0x0C10 ||
-		c >= 0x0C12 && c <= 0x0C28 ||
-		c >= 0x0C2A && c <= 0x0C33 ||
-		c >= 0x0C35 && c <= 0x0C39 ||
-		c >= 0x0C60 && c <= 0x0C61 ||
-		c >= 0x0C85 && c <= 0x0C8C ||
-		c >= 0x0C8E && c <= 0x0C90 ||
-		c >= 0x0C92 && c <= 0x0CA8 ||
-		c >= 0x0CAA && c <= 0x0CB3 ||
-		c >= 0x0CB5 && c <= 0x0CB9 ||
-		c == 0x0CDE ||
-		c >= 0x0CE0 && c <= 0x0CE1 ||
-		c >= 0x0D05 && c <= 0x0D0C ||
-		c >= 0x0D0E && c <= 0x0D10 ||
-		c >= 0x0D12 && c <= 0x0D28 ||
-		c >= 0x0D2A && c <= 0x0D39 ||
-		c >= 0x0D60 && c <= 0x0D61 ||
-		c >= 0x0E01 && c <= 0x0E2E ||
-		c == 0x0E30 ||
-		c >= 0x0E32 && c <= 0x0E33 ||
-		c >= 0x0E40 && c <= 0x0E45 ||
-		c >= 0x0E81 && c <= 0x0E82 ||
-		c == 0x0E84 ||
-		c >= 0x0E87 && c <= 0x0E88 ||
-		c == 0x0E8A ||
-		c == 0x0E8D ||
-		c >= 0x0E94 && c <= 0x0E97 ||
-		c >= 0x0E99 && c <= 0x0E9F ||
-		c >= 0x0EA1 && c <= 0x0EA3 ||
-		c == 0x0EA5 ||
-		c == 0x0EA7 ||
-		c >= 0x0EAA && c <= 0x0EAB ||
-		c >= 0x0EAD && c <= 0x0EAE ||
-		c == 0x0EB0 ||
-		c >= 0x0EB2 && c <= 0x0EB3 ||
-		c == 0x0EBD ||
-		c >= 0x0EC0 && c <= 0x0EC4 ||
-		c >= 0x0F40 && c <= 0x0F47 ||
-		c >= 0x0F49 && c <= 0x0F69 ||
-		c >= 0x10A0 && c <= 0x10C5 ||
-		c >= 0x10D0 && c <= 0x10F6 ||
-		c == 0x1100 ||
-		c >= 0x1102 && c <= 0x1103 ||
-		c >= 0x1105 && c <= 0x1107 ||
-		c == 0x1109 ||
-		c >= 0x110B && c <= 0x110C ||
-		c >= 0x110E && c <= 0x1112 ||
-		c == 0x113C ||
-		c == 0x113E ||
-		c == 0x1140 ||
-		c == 0x114C ||
-		c == 0x114E ||
-		c == 0x1150 ||
-		c >= 0x1154 && c <= 0x1155 ||
-		c == 0x1159 ||
-		c >= 0x115F && c <= 0x1161 ||
-		c == 0x1163 ||
-		c == 0x1165 ||
-		c == 0x1167 ||
-		c == 0x1169 ||
-		c >= 0x116D && c <= 0x116E ||
-		c >= 0x1172 && c <= 0x1173 ||
-		c == 0x1175 ||
-		c == 0x119E ||
-		c == 0x11A8 ||
-		c == 0x11AB ||
-		c >= 0x11AE && c <= 0x11AF ||
-		c >= 0x11B7 && c <= 0x11B8 ||
-		c == 0x11BA ||
-		c >= 0x11BC && c <= 0x11C2 ||
-		c == 0x11EB ||
-		c == 0x11F0 ||
-		c == 0x11F9 ||
-		c >= 0x1E00 && c <= 0x1E9B ||
-		c >= 0x1EA0 && c <= 0x1EF9 ||
-		c >= 0x1F00 && c <= 0x1F15 ||
-		c >= 0x1F18 && c <= 0x1F1D ||
-		c >= 0x1F20 && c <= 0x1F45 ||
-		c >= 0x1F48 && c <= 0x1F4D ||
-		c >= 0x1F50 && c <= 0x1F57 ||
-		c == 0x1F59 ||
-		c == 0x1F5B ||
-		c == 0x1F5D ||
-		c >= 0x1F5F && c <= 0x1F7D ||
-		c >= 0x1F80 && c <= 0x1FB4 ||
-		c >= 0x1FB6 && c <= 0x1FBC ||
-		c == 0x1FBE ||
-		c >= 0x1FC2 && c <= 0x1FC4 ||
-		c >= 0x1FC6 && c <= 0x1FCC ||
-		c >= 0x1FD0 && c <= 0x1FD3 ||
-		c >= 0x1FD6 && c <= 0x1FDB ||
-		c >= 0x1FE0 && c <= 0x1FEC ||
-		c >= 0x1FF2 && c <= 0x1FF4 ||
-		c >= 0x1FF6 && c <= 0x1FFC ||
-		c == 0x2126 ||
-		c >= 0x212A && c <= 0x212B ||
-		c == 0x212E ||
-		c >= 0x2180 && c <= 0x2182 ||
-		c >= 0x3041 && c <= 0x3094 ||
-		c >= 0x30A1 && c <= 0x30FA ||
-		c >= 0x3105 && c <= 0x312C ||
-		c >= 0xAC00 && c <= 0xD7A3 ||
-		c >= 0x4E00 && c <= 0x9FA5 ||
-		c == 0x3007 ||
-		c >= 0x3021 && c <= 0x3029;
+ return c >= 0x0041 && c <= 0x005A ||
+  c >= 0x0061 && c <= 0x007A ||
+  c >= 0x00C0 && c <= 0x00D6 ||
+  c >= 0x00D8 && c <= 0x00F6 ||
+  c >= 0x00F8 && c <= 0x00FF ||
+  c >= 0x0100 && c <= 0x0131 ||
+  c >= 0x0134 && c <= 0x013E ||
+  c >= 0x0141 && c <= 0x0148 ||
+  c >= 0x014A && c <= 0x017E ||
+  c >= 0x0180 && c <= 0x01C3 ||
+  c >= 0x01CD && c <= 0x01F0 ||
+  c >= 0x01F4 && c <= 0x01F5 ||
+  c >= 0x01FA && c <= 0x0217 ||
+  c >= 0x0250 && c <= 0x02A8 ||
+  c >= 0x02BB && c <= 0x02C1 ||
+  c == 0x0386 ||
+  c >= 0x0388 && c <= 0x038A ||
+  c == 0x038C ||
+  c >= 0x038E && c <= 0x03A1 ||
+  c >= 0x03A3 && c <= 0x03CE ||
+  c >= 0x03D0 && c <= 0x03D6 ||
+  c == 0x03DA ||
+  c == 0x03DC ||
+  c == 0x03DE ||
+  c == 0x03E0 ||
+  c >= 0x03E2 && c <= 0x03F3 ||
+  c >= 0x0401 && c <= 0x040C ||
+  c >= 0x040E && c <= 0x044F ||
+  c >= 0x0451 && c <= 0x045C ||
+  c >= 0x045E && c <= 0x0481 ||
+  c >= 0x0490 && c <= 0x04C4 ||
+  c >= 0x04C7 && c <= 0x04C8 ||
+  c >= 0x04CB && c <= 0x04CC ||
+  c >= 0x04D0 && c <= 0x04EB ||
+  c >= 0x04EE && c <= 0x04F5 ||
+  c >= 0x04F8 && c <= 0x04F9 ||
+  c >= 0x0531 && c <= 0x0556 ||
+  c == 0x0559 ||
+  c >= 0x0561 && c <= 0x0586 ||
+  c >= 0x05D0 && c <= 0x05EA ||
+  c >= 0x05F0 && c <= 0x05F2 ||
+  c >= 0x0621 && c <= 0x063A ||
+  c >= 0x0641 && c <= 0x064A ||
+  c >= 0x0671 && c <= 0x06B7 ||
+  c >= 0x06BA && c <= 0x06BE ||
+  c >= 0x06C0 && c <= 0x06CE ||
+  c >= 0x06D0 && c <= 0x06D3 ||
+  c == 0x06D5 ||
+  c >= 0x06E5 && c <= 0x06E6 ||
+  c >= 0x0905 && c <= 0x0939 ||
+  c == 0x093D ||
+  c >= 0x0958 && c <= 0x0961 ||
+  c >= 0x0985 && c <= 0x098C ||
+  c >= 0x098F && c <= 0x0990 ||
+  c >= 0x0993 && c <= 0x09A8 ||
+  c >= 0x09AA && c <= 0x09B0 ||
+  c == 0x09B2 ||
+  c >= 0x09B6 && c <= 0x09B9 ||
+  c >= 0x09DC && c <= 0x09DD ||
+  c >= 0x09DF && c <= 0x09E1 ||
+  c >= 0x09F0 && c <= 0x09F1 ||
+  c >= 0x0A05 && c <= 0x0A0A ||
+  c >= 0x0A0F && c <= 0x0A10 ||
+  c >= 0x0A13 && c <= 0x0A28 ||
+  c >= 0x0A2A && c <= 0x0A30 ||
+  c >= 0x0A32 && c <= 0x0A33 ||
+  c >= 0x0A35 && c <= 0x0A36 ||
+  c >= 0x0A38 && c <= 0x0A39 ||
+  c >= 0x0A59 && c <= 0x0A5C ||
+  c == 0x0A5E ||
+  c >= 0x0A72 && c <= 0x0A74 ||
+  c >= 0x0A85 && c <= 0x0A8B ||
+  c == 0x0A8D ||
+  c >= 0x0A8F && c <= 0x0A91 ||
+  c >= 0x0A93 && c <= 0x0AA8 ||
+  c >= 0x0AAA && c <= 0x0AB0 ||
+  c >= 0x0AB2 && c <= 0x0AB3 ||
+  c >= 0x0AB5 && c <= 0x0AB9 ||
+  c == 0x0ABD ||
+  c == 0x0AE0 ||
+  c >= 0x0B05 && c <= 0x0B0C ||
+  c >= 0x0B0F && c <= 0x0B10 ||
+  c >= 0x0B13 && c <= 0x0B28 ||
+  c >= 0x0B2A && c <= 0x0B30 ||
+  c >= 0x0B32 && c <= 0x0B33 ||
+  c >= 0x0B36 && c <= 0x0B39 ||
+  c == 0x0B3D ||
+  c >= 0x0B5C && c <= 0x0B5D ||
+  c >= 0x0B5F && c <= 0x0B61 ||
+  c >= 0x0B85 && c <= 0x0B8A ||
+  c >= 0x0B8E && c <= 0x0B90 ||
+  c >= 0x0B92 && c <= 0x0B95 ||
+  c >= 0x0B99 && c <= 0x0B9A ||
+  c == 0x0B9C ||
+  c >= 0x0B9E && c <= 0x0B9F ||
+  c >= 0x0BA3 && c <= 0x0BA4 ||
+  c >= 0x0BA8 && c <= 0x0BAA ||
+  c >= 0x0BAE && c <= 0x0BB5 ||
+  c >= 0x0BB7 && c <= 0x0BB9 ||
+  c >= 0x0C05 && c <= 0x0C0C ||
+  c >= 0x0C0E && c <= 0x0C10 ||
+  c >= 0x0C12 && c <= 0x0C28 ||
+  c >= 0x0C2A && c <= 0x0C33 ||
+  c >= 0x0C35 && c <= 0x0C39 ||
+  c >= 0x0C60 && c <= 0x0C61 ||
+  c >= 0x0C85 && c <= 0x0C8C ||
+  c >= 0x0C8E && c <= 0x0C90 ||
+  c >= 0x0C92 && c <= 0x0CA8 ||
+  c >= 0x0CAA && c <= 0x0CB3 ||
+  c >= 0x0CB5 && c <= 0x0CB9 ||
+  c == 0x0CDE ||
+  c >= 0x0CE0 && c <= 0x0CE1 ||
+  c >= 0x0D05 && c <= 0x0D0C ||
+  c >= 0x0D0E && c <= 0x0D10 ||
+  c >= 0x0D12 && c <= 0x0D28 ||
+  c >= 0x0D2A && c <= 0x0D39 ||
+  c >= 0x0D60 && c <= 0x0D61 ||
+  c >= 0x0E01 && c <= 0x0E2E ||
+  c == 0x0E30 ||
+  c >= 0x0E32 && c <= 0x0E33 ||
+  c >= 0x0E40 && c <= 0x0E45 ||
+  c >= 0x0E81 && c <= 0x0E82 ||
+  c == 0x0E84 ||
+  c >= 0x0E87 && c <= 0x0E88 ||
+  c == 0x0E8A ||
+  c == 0x0E8D ||
+  c >= 0x0E94 && c <= 0x0E97 ||
+  c >= 0x0E99 && c <= 0x0E9F ||
+  c >= 0x0EA1 && c <= 0x0EA3 ||
+  c == 0x0EA5 ||
+  c == 0x0EA7 ||
+  c >= 0x0EAA && c <= 0x0EAB ||
+  c >= 0x0EAD && c <= 0x0EAE ||
+  c == 0x0EB0 ||
+  c >= 0x0EB2 && c <= 0x0EB3 ||
+  c == 0x0EBD ||
+  c >= 0x0EC0 && c <= 0x0EC4 ||
+  c >= 0x0F40 && c <= 0x0F47 ||
+  c >= 0x0F49 && c <= 0x0F69 ||
+  c >= 0x10A0 && c <= 0x10C5 ||
+  c >= 0x10D0 && c <= 0x10F6 ||
+  c == 0x1100 ||
+  c >= 0x1102 && c <= 0x1103 ||
+  c >= 0x1105 && c <= 0x1107 ||
+  c == 0x1109 ||
+  c >= 0x110B && c <= 0x110C ||
+  c >= 0x110E && c <= 0x1112 ||
+  c == 0x113C ||
+  c == 0x113E ||
+  c == 0x1140 ||
+  c == 0x114C ||
+  c == 0x114E ||
+  c == 0x1150 ||
+  c >= 0x1154 && c <= 0x1155 ||
+  c == 0x1159 ||
+  c >= 0x115F && c <= 0x1161 ||
+  c == 0x1163 ||
+  c == 0x1165 ||
+  c == 0x1167 ||
+  c == 0x1169 ||
+  c >= 0x116D && c <= 0x116E ||
+  c >= 0x1172 && c <= 0x1173 ||
+  c == 0x1175 ||
+  c == 0x119E ||
+  c == 0x11A8 ||
+  c == 0x11AB ||
+  c >= 0x11AE && c <= 0x11AF ||
+  c >= 0x11B7 && c <= 0x11B8 ||
+  c == 0x11BA ||
+  c >= 0x11BC && c <= 0x11C2 ||
+  c == 0x11EB ||
+  c == 0x11F0 ||
+  c == 0x11F9 ||
+  c >= 0x1E00 && c <= 0x1E9B ||
+  c >= 0x1EA0 && c <= 0x1EF9 ||
+  c >= 0x1F00 && c <= 0x1F15 ||
+  c >= 0x1F18 && c <= 0x1F1D ||
+  c >= 0x1F20 && c <= 0x1F45 ||
+  c >= 0x1F48 && c <= 0x1F4D ||
+  c >= 0x1F50 && c <= 0x1F57 ||
+  c == 0x1F59 ||
+  c == 0x1F5B ||
+  c == 0x1F5D ||
+  c >= 0x1F5F && c <= 0x1F7D ||
+  c >= 0x1F80 && c <= 0x1FB4 ||
+  c >= 0x1FB6 && c <= 0x1FBC ||
+  c == 0x1FBE ||
+  c >= 0x1FC2 && c <= 0x1FC4 ||
+  c >= 0x1FC6 && c <= 0x1FCC ||
+  c >= 0x1FD0 && c <= 0x1FD3 ||
+  c >= 0x1FD6 && c <= 0x1FDB ||
+  c >= 0x1FE0 && c <= 0x1FEC ||
+  c >= 0x1FF2 && c <= 0x1FF4 ||
+  c >= 0x1FF6 && c <= 0x1FFC ||
+  c == 0x2126 ||
+  c >= 0x212A && c <= 0x212B ||
+  c == 0x212E ||
+  c >= 0x2180 && c <= 0x2182 ||
+  c >= 0x3041 && c <= 0x3094 ||
+  c >= 0x30A1 && c <= 0x30FA ||
+  c >= 0x3105 && c <= 0x312C ||
+  c >= 0xAC00 && c <= 0xD7A3 ||
+  c >= 0x4E00 && c <= 0x9FA5 ||
+  c == 0x3007 ||
+  c >= 0x3021 && c <= 0x3029;
 };
 
 Utilities.isNCNameChar = function(c) {
-	return c >= 0x0030 && c <= 0x0039 
-		|| c >= 0x0660 && c <= 0x0669 
-		|| c >= 0x06F0 && c <= 0x06F9 
-		|| c >= 0x0966 && c <= 0x096F 
-		|| c >= 0x09E6 && c <= 0x09EF 
-		|| c >= 0x0A66 && c <= 0x0A6F 
-		|| c >= 0x0AE6 && c <= 0x0AEF 
-		|| c >= 0x0B66 && c <= 0x0B6F 
-		|| c >= 0x0BE7 && c <= 0x0BEF 
-		|| c >= 0x0C66 && c <= 0x0C6F 
-		|| c >= 0x0CE6 && c <= 0x0CEF 
-		|| c >= 0x0D66 && c <= 0x0D6F 
-		|| c >= 0x0E50 && c <= 0x0E59 
-		|| c >= 0x0ED0 && c <= 0x0ED9 
-		|| c >= 0x0F20 && c <= 0x0F29
-		|| c == 0x002E
-		|| c == 0x002D
-		|| c == 0x005F
-		|| Utilities.isLetter(c)
-		|| c >= 0x0300 && c <= 0x0345 
-		|| c >= 0x0360 && c <= 0x0361 
-		|| c >= 0x0483 && c <= 0x0486 
-		|| c >= 0x0591 && c <= 0x05A1 
-		|| c >= 0x05A3 && c <= 0x05B9 
-		|| c >= 0x05BB && c <= 0x05BD 
-		|| c == 0x05BF 
-		|| c >= 0x05C1 && c <= 0x05C2 
-		|| c == 0x05C4 
-		|| c >= 0x064B && c <= 0x0652 
-		|| c == 0x0670 
-		|| c >= 0x06D6 && c <= 0x06DC 
-		|| c >= 0x06DD && c <= 0x06DF 
-		|| c >= 0x06E0 && c <= 0x06E4 
-		|| c >= 0x06E7 && c <= 0x06E8 
-		|| c >= 0x06EA && c <= 0x06ED 
-		|| c >= 0x0901 && c <= 0x0903 
-		|| c == 0x093C 
-		|| c >= 0x093E && c <= 0x094C 
-		|| c == 0x094D 
-		|| c >= 0x0951 && c <= 0x0954 
-		|| c >= 0x0962 && c <= 0x0963 
-		|| c >= 0x0981 && c <= 0x0983 
-		|| c == 0x09BC 
-		|| c == 0x09BE 
-		|| c == 0x09BF 
-		|| c >= 0x09C0 && c <= 0x09C4 
-		|| c >= 0x09C7 && c <= 0x09C8 
-		|| c >= 0x09CB && c <= 0x09CD 
-		|| c == 0x09D7 
-		|| c >= 0x09E2 && c <= 0x09E3 
-		|| c == 0x0A02 
-		|| c == 0x0A3C 
-		|| c == 0x0A3E 
-		|| c == 0x0A3F 
-		|| c >= 0x0A40 && c <= 0x0A42 
-		|| c >= 0x0A47 && c <= 0x0A48 
-		|| c >= 0x0A4B && c <= 0x0A4D 
-		|| c >= 0x0A70 && c <= 0x0A71 
-		|| c >= 0x0A81 && c <= 0x0A83 
-		|| c == 0x0ABC 
-		|| c >= 0x0ABE && c <= 0x0AC5 
-		|| c >= 0x0AC7 && c <= 0x0AC9 
-		|| c >= 0x0ACB && c <= 0x0ACD 
-		|| c >= 0x0B01 && c <= 0x0B03 
-		|| c == 0x0B3C 
-		|| c >= 0x0B3E && c <= 0x0B43 
-		|| c >= 0x0B47 && c <= 0x0B48 
-		|| c >= 0x0B4B && c <= 0x0B4D 
-		|| c >= 0x0B56 && c <= 0x0B57 
-		|| c >= 0x0B82 && c <= 0x0B83 
-		|| c >= 0x0BBE && c <= 0x0BC2 
-		|| c >= 0x0BC6 && c <= 0x0BC8 
-		|| c >= 0x0BCA && c <= 0x0BCD 
-		|| c == 0x0BD7 
-		|| c >= 0x0C01 && c <= 0x0C03 
-		|| c >= 0x0C3E && c <= 0x0C44 
-		|| c >= 0x0C46 && c <= 0x0C48 
-		|| c >= 0x0C4A && c <= 0x0C4D 
-		|| c >= 0x0C55 && c <= 0x0C56 
-		|| c >= 0x0C82 && c <= 0x0C83 
-		|| c >= 0x0CBE && c <= 0x0CC4 
-		|| c >= 0x0CC6 && c <= 0x0CC8 
-		|| c >= 0x0CCA && c <= 0x0CCD 
-		|| c >= 0x0CD5 && c <= 0x0CD6 
-		|| c >= 0x0D02 && c <= 0x0D03 
-		|| c >= 0x0D3E && c <= 0x0D43 
-		|| c >= 0x0D46 && c <= 0x0D48 
-		|| c >= 0x0D4A && c <= 0x0D4D 
-		|| c == 0x0D57 
-		|| c == 0x0E31 
-		|| c >= 0x0E34 && c <= 0x0E3A 
-		|| c >= 0x0E47 && c <= 0x0E4E 
-		|| c == 0x0EB1 
-		|| c >= 0x0EB4 && c <= 0x0EB9 
-		|| c >= 0x0EBB && c <= 0x0EBC 
-		|| c >= 0x0EC8 && c <= 0x0ECD 
-		|| c >= 0x0F18 && c <= 0x0F19 
-		|| c == 0x0F35 
-		|| c == 0x0F37 
-		|| c == 0x0F39 
-		|| c == 0x0F3E 
-		|| c == 0x0F3F 
-		|| c >= 0x0F71 && c <= 0x0F84 
-		|| c >= 0x0F86 && c <= 0x0F8B 
-		|| c >= 0x0F90 && c <= 0x0F95 
-		|| c == 0x0F97 
-		|| c >= 0x0F99 && c <= 0x0FAD 
-		|| c >= 0x0FB1 && c <= 0x0FB7 
-		|| c == 0x0FB9 
-		|| c >= 0x20D0 && c <= 0x20DC 
-		|| c == 0x20E1 
-		|| c >= 0x302A && c <= 0x302F 
-		|| c == 0x3099 
-		|| c == 0x309A
-		|| c == 0x00B7 
-		|| c == 0x02D0 
-		|| c == 0x02D1 
-		|| c == 0x0387 
-		|| c == 0x0640 
-		|| c == 0x0E46 
-		|| c == 0x0EC6 
-		|| c == 0x3005 
-		|| c >= 0x3031 && c <= 0x3035 
-		|| c >= 0x309D && c <= 0x309E 
-		|| c >= 0x30FC && c <= 0x30FE;
+ return c >= 0x0030 && c <= 0x0039 
+  || c >= 0x0660 && c <= 0x0669 
+  || c >= 0x06F0 && c <= 0x06F9 
+  || c >= 0x0966 && c <= 0x096F 
+  || c >= 0x09E6 && c <= 0x09EF 
+  || c >= 0x0A66 && c <= 0x0A6F 
+  || c >= 0x0AE6 && c <= 0x0AEF 
+  || c >= 0x0B66 && c <= 0x0B6F 
+  || c >= 0x0BE7 && c <= 0x0BEF 
+  || c >= 0x0C66 && c <= 0x0C6F 
+  || c >= 0x0CE6 && c <= 0x0CEF 
+  || c >= 0x0D66 && c <= 0x0D6F 
+  || c >= 0x0E50 && c <= 0x0E59 
+  || c >= 0x0ED0 && c <= 0x0ED9 
+  || c >= 0x0F20 && c <= 0x0F29
+  || c == 0x002E
+  || c == 0x002D
+  || c == 0x005F
+  || Utilities.isLetter(c)
+  || c >= 0x0300 && c <= 0x0345 
+  || c >= 0x0360 && c <= 0x0361 
+  || c >= 0x0483 && c <= 0x0486 
+  || c >= 0x0591 && c <= 0x05A1 
+  || c >= 0x05A3 && c <= 0x05B9 
+  || c >= 0x05BB && c <= 0x05BD 
+  || c == 0x05BF 
+  || c >= 0x05C1 && c <= 0x05C2 
+  || c == 0x05C4 
+  || c >= 0x064B && c <= 0x0652 
+  || c == 0x0670 
+  || c >= 0x06D6 && c <= 0x06DC 
+  || c >= 0x06DD && c <= 0x06DF 
+  || c >= 0x06E0 && c <= 0x06E4 
+  || c >= 0x06E7 && c <= 0x06E8 
+  || c >= 0x06EA && c <= 0x06ED 
+  || c >= 0x0901 && c <= 0x0903 
+  || c == 0x093C 
+  || c >= 0x093E && c <= 0x094C 
+  || c == 0x094D 
+  || c >= 0x0951 && c <= 0x0954 
+  || c >= 0x0962 && c <= 0x0963 
+  || c >= 0x0981 && c <= 0x0983 
+  || c == 0x09BC 
+  || c == 0x09BE 
+  || c == 0x09BF 
+  || c >= 0x09C0 && c <= 0x09C4 
+  || c >= 0x09C7 && c <= 0x09C8 
+  || c >= 0x09CB && c <= 0x09CD 
+  || c == 0x09D7 
+  || c >= 0x09E2 && c <= 0x09E3 
+  || c == 0x0A02 
+  || c == 0x0A3C 
+  || c == 0x0A3E 
+  || c == 0x0A3F 
+  || c >= 0x0A40 && c <= 0x0A42 
+  || c >= 0x0A47 && c <= 0x0A48 
+  || c >= 0x0A4B && c <= 0x0A4D 
+  || c >= 0x0A70 && c <= 0x0A71 
+  || c >= 0x0A81 && c <= 0x0A83 
+  || c == 0x0ABC 
+  || c >= 0x0ABE && c <= 0x0AC5 
+  || c >= 0x0AC7 && c <= 0x0AC9 
+  || c >= 0x0ACB && c <= 0x0ACD 
+  || c >= 0x0B01 && c <= 0x0B03 
+  || c == 0x0B3C 
+  || c >= 0x0B3E && c <= 0x0B43 
+  || c >= 0x0B47 && c <= 0x0B48 
+  || c >= 0x0B4B && c <= 0x0B4D 
+  || c >= 0x0B56 && c <= 0x0B57 
+  || c >= 0x0B82 && c <= 0x0B83 
+  || c >= 0x0BBE && c <= 0x0BC2 
+  || c >= 0x0BC6 && c <= 0x0BC8 
+  || c >= 0x0BCA && c <= 0x0BCD 
+  || c == 0x0BD7 
+  || c >= 0x0C01 && c <= 0x0C03 
+  || c >= 0x0C3E && c <= 0x0C44 
+  || c >= 0x0C46 && c <= 0x0C48 
+  || c >= 0x0C4A && c <= 0x0C4D 
+  || c >= 0x0C55 && c <= 0x0C56 
+  || c >= 0x0C82 && c <= 0x0C83 
+  || c >= 0x0CBE && c <= 0x0CC4 
+  || c >= 0x0CC6 && c <= 0x0CC8 
+  || c >= 0x0CCA && c <= 0x0CCD 
+  || c >= 0x0CD5 && c <= 0x0CD6 
+  || c >= 0x0D02 && c <= 0x0D03 
+  || c >= 0x0D3E && c <= 0x0D43 
+  || c >= 0x0D46 && c <= 0x0D48 
+  || c >= 0x0D4A && c <= 0x0D4D 
+  || c == 0x0D57 
+  || c == 0x0E31 
+  || c >= 0x0E34 && c <= 0x0E3A 
+  || c >= 0x0E47 && c <= 0x0E4E 
+  || c == 0x0EB1 
+  || c >= 0x0EB4 && c <= 0x0EB9 
+  || c >= 0x0EBB && c <= 0x0EBC 
+  || c >= 0x0EC8 && c <= 0x0ECD 
+  || c >= 0x0F18 && c <= 0x0F19 
+  || c == 0x0F35 
+  || c == 0x0F37 
+  || c == 0x0F39 
+  || c == 0x0F3E 
+  || c == 0x0F3F 
+  || c >= 0x0F71 && c <= 0x0F84 
+  || c >= 0x0F86 && c <= 0x0F8B 
+  || c >= 0x0F90 && c <= 0x0F95 
+  || c == 0x0F97 
+  || c >= 0x0F99 && c <= 0x0FAD 
+  || c >= 0x0FB1 && c <= 0x0FB7 
+  || c == 0x0FB9 
+  || c >= 0x20D0 && c <= 0x20DC 
+  || c == 0x20E1 
+  || c >= 0x302A && c <= 0x302F 
+  || c == 0x3099 
+  || c == 0x309A
+  || c == 0x00B7 
+  || c == 0x02D0 
+  || c == 0x02D1 
+  || c == 0x0387 
+  || c == 0x0640 
+  || c == 0x0E46 
+  || c == 0x0EC6 
+  || c == 0x3005 
+  || c >= 0x3031 && c <= 0x3035 
+  || c >= 0x309D && c <= 0x309E 
+  || c >= 0x30FC && c <= 0x30FE;
 };
 
 Utilities.coalesceText = function(n) {
-	for (var m = n.firstChild; m != null; m = m.nextSibling) {
-		if (m.nodeType == 3 /*Node.TEXT_NODE*/ || m.nodeType == 4 /*Node.CDATA_SECTION_NODE*/) {
-			var s = m.nodeValue;
-			var first = m;
-			m = m.nextSibling;
-			while (m != null && (m.nodeType == 3 /*Node.TEXT_NODE*/ || m.nodeType == 4 /*Node.CDATA_SECTION_NODE*/)) {
-				s += m.nodeValue;
-				var del = m;
-				m = m.nextSibling;
-				del.parentNode.removeChild(del);
-			}
-			if (first.nodeType == 4 /*Node.CDATA_SECTION_NODE*/) {
-				var p = first.parentNode;
-				if (first.nextSibling == null) {
-					p.removeChild(first);
-					p.appendChild(p.ownerDocument.createTextNode(s));
-				} else {
-					var next = first.nextSibling;
-					p.removeChild(first);
-					p.insertBefore(p.ownerDocument.createTextNode(s), next);
-				}
-			} else {
-				first.nodeValue = s;
-			}
-			if (m == null) {
-				break;
-			}
-		} else if (m.nodeType == 1 /*Node.ELEMENT_NODE*/) {
-			Utilities.coalesceText(m);
-		}
-	}
+ for (var m = n.firstChild; m != null; m = m.nextSibling) {
+  if (m.nodeType == 3 /*Node.TEXT_NODE*/ || m.nodeType == 4 /*Node.CDATA_SECTION_NODE*/) {
+   var s = m.nodeValue;
+   var first = m;
+   m = m.nextSibling;
+   while (m != null && (m.nodeType == 3 /*Node.TEXT_NODE*/ || m.nodeType == 4 /*Node.CDATA_SECTION_NODE*/)) {
+    s += m.nodeValue;
+    var del = m;
+    m = m.nextSibling;
+    del.parentNode.removeChild(del);
+   }
+   if (first.nodeType == 4 /*Node.CDATA_SECTION_NODE*/) {
+    var p = first.parentNode;
+    if (first.nextSibling == null) {
+     p.removeChild(first);
+     p.appendChild(p.ownerDocument.createTextNode(s));
+    } else {
+     var next = first.nextSibling;
+     p.removeChild(first);
+     p.insertBefore(p.ownerDocument.createTextNode(s), next);
+    }
+   } else {
+    first.nodeValue = s;
+   }
+   if (m == null) {
+    break;
+   }
+  } else if (m.nodeType == 1 /*Node.ELEMENT_NODE*/) {
+   Utilities.coalesceText(m);
+  }
+ }
 };
 
 Utilities.instance_of = function(o, c) {
-	while (o != null) {
-		if (o.constructor === c) {
-			return true;
-		}
-		if (o === Object) {
-			return false;
-		}
-		o = o.constructor.superclass;
-	}
-	return false;
+ while (o != null) {
+  if (o.constructor === c) {
+   return true;
+  }
+  if (o === Object) {
+   return false;
+  }
+  o = o.constructor.superclass;
+ }
+ return false;
 };
 
 Utilities.getElementById = function(n, id) {
-	// Note that this does not check the DTD to check for actual
-	// attributes of type ID, so this may be a bit wrong.
-	if (n.nodeType == 1 /*Node.ELEMENT_NODE*/) {
-		if (n.getAttribute("id") == id
-				|| n.getAttributeNS(null, "id") == id) {
-			return n;
-		}
-	}
-	for (var m = n.firstChild; m != null; m = m.nextSibling) {
-		var res = Utilities.getElementById(m, id);
-		if (res != null) {
-			return res;
-		}
-	}
-	return null;
+ // Note that this does not check the DTD to check for actual
+ // attributes of type ID, so this may be a bit wrong.
+ if (n.nodeType == 1 /*Node.ELEMENT_NODE*/) {
+  if (n.getAttribute("id") == id
+    || n.getAttributeNS(null, "id") == id) {
+   return n;
+  }
+ }
+ for (var m = n.firstChild; m != null; m = m.nextSibling) {
+  var res = Utilities.getElementById(m, id);
+  if (res != null) {
+   return res;
+  }
+ }
+ return null;
 };
 
 // XPathException ////////////////////////////////////////////////////////////
@@ -4097,18 +4097,18 @@ XPathException.prototype.constructor = XPathException;
 XPathException.superclass = Object.prototype;
 
 function XPathException(c, e) {
-	this.code = c;
-	this.exception = e;
+ this.code = c;
+ this.exception = e;
 }
 
 XPathException.prototype.toString = function() {
-	var msg = this.exception ? ": " + this.exception.toString() : "";
-	switch (this.code) {
-		case XPathException.INVALID_EXPRESSION_ERR:
-			return "Invalid expression" + msg;
-		case XPathException.TYPE_ERR:
-			return "Type error" + msg;
-	}
+ var msg = this.exception ? ": " + this.exception.toString() : "";
+ switch (this.code) {
+  case XPathException.INVALID_EXPRESSION_ERR:
+   return "Invalid expression" + msg;
+  case XPathException.TYPE_ERR:
+   return "Type error" + msg;
+ }
 };
 
 XPathException.INVALID_EXPRESSION_ERR = 51;
@@ -4121,15 +4121,15 @@ XPathExpression.prototype.constructor = XPathExpression;
 XPathExpression.superclass = Object.prototype;
 
 function XPathExpression(e, r, p) {
-	this.xpath = p.parse(e);
-	this.context = new XPathContext();
-	this.context.namespaceResolver = new XPathNSResolverWrapper(r);
+ this.xpath = p.parse(e);
+ this.context = new XPathContext();
+ this.context.namespaceResolver = new XPathNSResolverWrapper(r);
 }
 
 XPathExpression.prototype.evaluate = function(n, t, res) {
-	this.context.expressionContextNode = n;
-	var result = this.xpath.evaluate(this.context);
-	return new XPathResult(result, t);
+ this.context.expressionContextNode = n;
+ var result = this.xpath.evaluate(this.context);
+ return new XPathResult(result, t);
 }
 
 // XPathNSResolverWrapper ////////////////////////////////////////////////////
@@ -4139,14 +4139,14 @@ XPathNSResolverWrapper.prototype.constructor = XPathNSResolverWrapper;
 XPathNSResolverWrapper.superclass = Object.prototype;
 
 function XPathNSResolverWrapper(r) {
-	this.xpathNSResolver = r;
+ this.xpathNSResolver = r;
 }
 
 XPathNSResolverWrapper.prototype.getNamespace = function(prefix, n) {
     if (this.xpathNSResolver == null) {
         return null;
     }
-	return this.xpathNSResolver.lookupNamespaceURI(prefix);
+ return this.xpathNSResolver.lookupNamespaceURI(prefix);
 };
 
 // NodeXPathNSResolver ///////////////////////////////////////////////////////
@@ -4156,12 +4156,12 @@ NodeXPathNSResolver.prototype.constructor = NodeXPathNSResolver;
 NodeXPathNSResolver.superclass = Object.prototype;
 
 function NodeXPathNSResolver(n) {
-	this.node = n;
-	this.namespaceResolver = new NamespaceResolver();
+ this.node = n;
+ this.namespaceResolver = new NamespaceResolver();
 }
 
 NodeXPathNSResolver.prototype.lookupNamespaceURI = function(prefix) {
-	return this.namespaceResolver.getNamespace(prefix, this.node);
+ return this.namespaceResolver.getNamespace(prefix, this.node);
 };
 
 // XPathResult ///////////////////////////////////////////////////////////////
@@ -4171,70 +4171,70 @@ XPathResult.prototype.constructor = XPathResult;
 XPathResult.superclass = Object.prototype;
 
 function XPathResult(v, t) {
-	if (t == XPathResult.ANY_TYPE) {
-		if (v.constructor === XString) {
-			t = XPathResult.STRING_TYPE;
-		} else if (v.constructor === XNumber) {
-			t = XPathResult.NUMBER_TYPE;
-		} else if (v.constructor === XBoolean) {
-			t = XPathResult.BOOLEAN_TYPE;
-		} else if (v.constructor === XNodeSet) {
-			t = XPathResult.UNORDERED_NODE_ITERATOR_TYPE;
-		}
-	}
-	this.resultType = t;
-	switch (t) {
-		case XPathResult.NUMBER_TYPE:
-			this.numberValue = v.numberValue();
-			return;
-		case XPathResult.STRING_TYPE:
-			this.stringValue = v.stringValue();
-			return;
-		case XPathResult.BOOLEAN_TYPE:
-			this.booleanValue = v.booleanValue();
-			return;
-		case XPathResult.ANY_UNORDERED_NODE_TYPE:
-		case XPathResult.FIRST_UNORDERED_NODE_TYPE:
-			if (v.constructor === XNodeSet) {
-				this.singleNodeValue = v.first();
-				return;
-			}
-			break;
-		case XPathResult.UNORDERED_NODE_ITERATOR_TYPE:
-		case XPathResult.ORDERED_NODE_ITERATOR_TYPE:
-			if (v.constructor === XNodeSet) {
-				this.invalidIteratorState = false;
-				this.nodes = v.toArray();
-				this.iteratorIndex = 0;
-				return;
-			}
-			break;
-		case XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE:
-		case XPathResult.ORDERED_NODE_SNAPSHOT_TYPE:
-			if (v.constructor === XNodeSet) {
-				this.nodes = v.toArray();
-				this.snapshotLength = this.nodes.length;
-				return;
-			}
-			break;
-	}
-	throw new XPathException(XPathException.TYPE_ERR);
+ if (t == XPathResult.ANY_TYPE) {
+  if (v.constructor === XString) {
+   t = XPathResult.STRING_TYPE;
+  } else if (v.constructor === XNumber) {
+   t = XPathResult.NUMBER_TYPE;
+  } else if (v.constructor === XBoolean) {
+   t = XPathResult.BOOLEAN_TYPE;
+  } else if (v.constructor === XNodeSet) {
+   t = XPathResult.UNORDERED_NODE_ITERATOR_TYPE;
+  }
+ }
+ this.resultType = t;
+ switch (t) {
+  case XPathResult.NUMBER_TYPE:
+   this.numberValue = v.numberValue();
+   return;
+  case XPathResult.STRING_TYPE:
+   this.stringValue = v.stringValue();
+   return;
+  case XPathResult.BOOLEAN_TYPE:
+   this.booleanValue = v.booleanValue();
+   return;
+  case XPathResult.ANY_UNORDERED_NODE_TYPE:
+  case XPathResult.FIRST_UNORDERED_NODE_TYPE:
+   if (v.constructor === XNodeSet) {
+    this.singleNodeValue = v.first();
+    return;
+   }
+   break;
+  case XPathResult.UNORDERED_NODE_ITERATOR_TYPE:
+  case XPathResult.ORDERED_NODE_ITERATOR_TYPE:
+   if (v.constructor === XNodeSet) {
+    this.invalidIteratorState = false;
+    this.nodes = v.toArray();
+    this.iteratorIndex = 0;
+    return;
+   }
+   break;
+  case XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE:
+  case XPathResult.ORDERED_NODE_SNAPSHOT_TYPE:
+   if (v.constructor === XNodeSet) {
+    this.nodes = v.toArray();
+    this.snapshotLength = this.nodes.length;
+    return;
+   }
+   break;
+ }
+ throw new XPathException(XPathException.TYPE_ERR);
 };
 
 XPathResult.prototype.iterateNext = function() {
-	if (this.resultType != XPathResult.UNORDERED_NODE_ITERATOR_TYPE
-			&& this.resultType != XPathResult.ORDERED_NODE_ITERATOR_TYPE) {
-		throw new XPathException(XPathException.TYPE_ERR);
-	}
-	return this.nodes[this.iteratorIndex++];
+ if (this.resultType != XPathResult.UNORDERED_NODE_ITERATOR_TYPE
+   && this.resultType != XPathResult.ORDERED_NODE_ITERATOR_TYPE) {
+  throw new XPathException(XPathException.TYPE_ERR);
+ }
+ return this.nodes[this.iteratorIndex++];
 };
 
 XPathResult.prototype.snapshotItem = function(i) {
-	if (this.resultType != XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE
-			&& this.resultType != XPathResult.ORDERED_NODE_SNAPSHOT_TYPE) {
-		throw new XPathException(XPathException.TYPE_ERR);
-	}
-	return this.nodes[i];
+ if (this.resultType != XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE
+   && this.resultType != XPathResult.ORDERED_NODE_SNAPSHOT_TYPE) {
+  throw new XPathException(XPathException.TYPE_ERR);
+ }
+ return this.nodes[i];
 };
 
 XPathResult.ANY_TYPE = 0;
@@ -4251,40 +4251,40 @@ XPathResult.FIRST_ORDERED_NODE_TYPE = 9;
 // DOM 3 XPath support ///////////////////////////////////////////////////////
 
 function installDOM3XPathSupport(doc, p) {
-	doc.createExpression = function(e, r) {
-		try {
-			return new XPathExpression(e, r, p);
-		} catch (e) {
-			throw new XPathException(XPathException.INVALID_EXPRESSION_ERR, e);
-		}
-	};
-	doc.createNSResolver = function(n) {
-		return new NodeXPathNSResolver(n);
-	};
-	doc.evaluate = function(e, cn, r, t, res) {
-		if (!cn) cn = doc;
-		if (t < 0 || t > 9) {
-			throw { code: 0, toString: function() { return "Request type not supported"; } };
-		}
-        	return doc.createExpression(e, r, p).evaluate(cn, t, res);
-	};
+ doc.createExpression = function(e, r) {
+  try {
+   return new XPathExpression(e, r, p);
+  } catch (e) {
+   throw new XPathException(XPathException.INVALID_EXPRESSION_ERR, e);
+  }
+ };
+ doc.createNSResolver = function(n) {
+  return new NodeXPathNSResolver(n);
+ };
+ doc.evaluate = function(e, cn, r, t, res) {
+  if (!cn) cn = doc;
+  if (t < 0 || t > 9) {
+   throw { code: 0, toString: function() { return "Request type not supported"; } };
+  }
+         return doc.createExpression(e, r, p).evaluate(cn, t, res);
+ };
 };
 
 // ---------------------------------------------------------------------------
 
 // Install DOM 3 XPath support for the current document.
 try {
-	var shouldInstall = true;
-	try {
-		if (document.implementation
-				&& document.implementation.hasFeature
-				&& document.implementation.hasFeature("XPath", null)) {
-			shouldInstall = false;
-		}
-	} catch (e) {
-	}
-	if (shouldInstall) {
-		installDOM3XPathSupport(document, new XPathParser());
-	}
+ var shouldInstall = true;
+ try {
+  if (document.implementation
+    && document.implementation.hasFeature
+    && document.implementation.hasFeature("XPath", null)) {
+   shouldInstall = false;
+  }
+ } catch (e) {
+ }
+ if (shouldInstall) {
+  installDOM3XPathSupport(document, new XPathParser());
+ }
 } catch (e) {
 }
diff --git a/Open-ILS/src/javascript/backend/penalty/patron_penalty.js b/Open-ILS/src/javascript/backend/penalty/patron_penalty.js
index 07ed2ee9b1..685e348436 100644
--- a/Open-ILS/src/javascript/backend/penalty/patron_penalty.js
+++ b/Open-ILS/src/javascript/backend/penalty/patron_penalty.js
@@ -9,16 +9,16 @@ var config = findGroupConfig(patronProfile);
 
 if( config ) {
 
-	/* check the fine limit */
-	if( config.fineThreshold >= 0 && patronFines >= config.fineThreshold ) 
-		result.fatalEvents.push('PATRON_EXCEEDS_FINES');
+ /* check the fine limit */
+ if( config.fineThreshold >= 0 && patronFines >= config.fineThreshold ) 
+  result.fatalEvents.push('PATRON_EXCEEDS_FINES');
 
-	/* check the overdue limit */
-	if( config.overdueThreshold >= 0 && patronOverdueCount >= config.overdueThreshold )
-		result.fatalEvents.push('PATRON_EXCEEDS_OVERDUE_COUNT');
+ /* check the overdue limit */
+ if( config.overdueThreshold >= 0 && patronOverdueCount >= config.overdueThreshold )
+  result.fatalEvents.push('PATRON_EXCEEDS_OVERDUE_COUNT');
 
 } else {
-	log_warn("profile has no configured information: " + patronProfile);
+ log_warn("profile has no configured information: " + patronProfile);
 }
 
 
diff --git a/Open-ILS/src/javascript/backend/test/xmlhttprequest-test.js b/Open-ILS/src/javascript/backend/test/xmlhttprequest-test.js
index 6743942f00..9d1fdf699b 100644
--- a/Open-ILS/src/javascript/backend/test/xmlhttprequest-test.js
+++ b/Open-ILS/src/javascript/backend/test/xmlhttprequest-test.js
@@ -8,8 +8,8 @@ log_stdout("recordID is",params.recordID);
 
 // xpath namespace resolver
 var ns_res = new XPathNamespaceResolver(
-	{ marc : "http://www.loc.gov/MARC21/slim",
-	  mods : "http://www.loc.gov/mods/v3" }
+ { marc : "http://www.loc.gov/MARC21/slim",
+   mods : "http://www.loc.gov/mods/v3" }
 );
 
 // xmlhttprequest uses the perl xml parser to get the xml doc from 
@@ -26,9 +26,9 @@ var marc = DOMImplementation.parseString(x.responseXML.evaluate('//marc/text()')
 
 // and then get the title
 var res = marc.evaluate(
-	"/marc:record/marc:datafield[@tag='245']/marc:subfield[@code='a']/text()",
-	marc,
-	ns_res
+ "/marc:record/marc:datafield[@tag='245']/marc:subfield[@code='a']/text()",
+ marc,
+ ns_res
 );
 
 // print the title we just grabbed
diff --git a/Open-ILS/web/conify/global/actor/org_unit.html b/Open-ILS/web/conify/global/actor/org_unit.html
index b66b7d3f32..47ea18a524 100644
--- a/Open-ILS/web/conify/global/actor/org_unit.html
+++ b/Open-ILS/web/conify/global/actor/org_unit.html
@@ -13,62 +13,62 @@
 # GNU General Public License for more details.
 -->
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/conify.dtd"-->
+ "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+ <!--#include virtual="/opac/locale/${locale}/conify.dtd"-->
 ]>
 <html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<title>&conify.org_unit.title;</title>
-
-		<style type="text/css">
-			@import url('/js/dojo/dojo/resources/dojo.css');
-			@import url('/js/dojo/dijit/themes/tundra/tundra.css');
-			@import url('/js/dojo/dojox/widget/Toaster/Toaster.css');
-		</style>
-
-		<style>
-			html, body
-			{
-				height: 100%;
-				width: 100%;
-				margin: 0px 0px 0px 0px;
-				padding: 0px 0px 0px 0px;
-				overflow: hidden;
-			}
-
-			th
-			{
-				text-align: right;
-				font-weight: bold;
-				padding-left: 20px;
-				padding-right: 5px;
-			}
-		</style>
-
-		<!-- The OpenSRF API writ JS -->
-		<script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
-		<script language='javascript' src='/opac/common/js/Cookies.js' type='text/javascript'></script>
-		<script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
-		<script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
-
-		<!-- Dojo goodness -->
-		<script type="text/javascript" src="../admin.js"></script>
-
-		<script type="text/javascript" src="/js/dojo/dojo/dojo.js"></script>
-		<script type="text/javascript" src="/js/dojo/dojo/openils_dojo.js"></script>
-		<script type="text/javascript" src="/js/dojo/dijit/dijit.js"></script>
-
-		<script type="text/javascript" src="org_unit.js"></script>
-
-	</head>
-
-	<body class="tundra" id='pagebody'>
-
-		<div dojoType="dijit.layout.SplitContainer" orientation="horizontal" style="height: 100%">
-
-			<div dojoType="dijit.layout.ContentPane" sizeShare="100">
-				<script type="dojo/method">
+ <head>
+  <title>&conify.org_unit.title;</title>
+
+  <style type="text/css">
+   @import url('/js/dojo/dojo/resources/dojo.css');
+   @import url('/js/dojo/dijit/themes/tundra/tundra.css');
+   @import url('/js/dojo/dojox/widget/Toaster/Toaster.css');
+  </style>
+
+  <style>
+   html, body
+   {
+    height: 100%;
+    width: 100%;
+    margin: 0px 0px 0px 0px;
+    padding: 0px 0px 0px 0px;
+    overflow: hidden;
+   }
+
+   th
+   {
+    text-align: right;
+    font-weight: bold;
+    padding-left: 20px;
+    padding-right: 5px;
+   }
+  </style>
+
+  <!-- The OpenSRF API writ JS -->
+  <script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
+  <script language='javascript' src='/opac/common/js/Cookies.js' type='text/javascript'></script>
+  <script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
+  <script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
+
+  <!-- Dojo goodness -->
+  <script type="text/javascript" src="../admin.js"></script>
+
+  <script type="text/javascript" src="/js/dojo/dojo/dojo.js"></script>
+  <script type="text/javascript" src="/js/dojo/dojo/openils_dojo.js"></script>
+  <script type="text/javascript" src="/js/dojo/dijit/dijit.js"></script>
+
+  <script type="text/javascript" src="org_unit.js"></script>
+
+ </head>
+
+ <body class="tundra" id='pagebody'>
+
+  <div dojoType="dijit.layout.SplitContainer" orientation="horizontal" style="height: 100%">
+
+   <div dojoType="dijit.layout.ContentPane" sizeShare="100">
+    <script type="dojo/method">
 <![CDATA[
 
                     pcrud.retrieveAll( 'aou', {
@@ -122,252 +122,252 @@
                        }
                     });
 
-					highlighter.ou_tree = {};
-					highlighter.editor_pane = {};
-					highlighter.hoo_pane = {};
-					highlighter.addresses_pane = {};
+     highlighter.ou_tree = {};
+     highlighter.editor_pane = {};
+     highlighter.hoo_pane = {};
+     highlighter.addresses_pane = {};
 
-					highlighter.ou_tree.green = dojox.fx.highlight( { color : '#B4FFB4', node : 'ou_tree', duration : 500 } );
-					highlighter.ou_tree.red = dojox.fx.highlight( { color : '#FF2018', node : 'ou_tree', duration : 500 } );
+     highlighter.ou_tree.green = dojox.fx.highlight( { color : '#B4FFB4', node : 'ou_tree', duration : 500 } );
+     highlighter.ou_tree.red = dojox.fx.highlight( { color : '#FF2018', node : 'ou_tree', duration : 500 } );
 
-					highlighter.editor_pane.green = dojox.fx.highlight( { color : '#B4FFB4', node : 'editor_pane', duration : 500 } );
-					highlighter.editor_pane.red = dojox.fx.highlight( { color : '#FF2018', node : 'editor_pane', duration : 500 } );
+     highlighter.editor_pane.green = dojox.fx.highlight( { color : '#B4FFB4', node : 'editor_pane', duration : 500 } );
+     highlighter.editor_pane.red = dojox.fx.highlight( { color : '#FF2018', node : 'editor_pane', duration : 500 } );
 
-					highlighter.hoo_pane.green = dojox.fx.highlight( { color : '#B4FFB4', node : 'hoo_pane', duration : 500 } );
-					highlighter.hoo_pane.red = dojox.fx.highlight( { color : '#FF2018', node : 'hoo_pane', duration : 500 } );
+     highlighter.hoo_pane.green = dojox.fx.highlight( { color : '#B4FFB4', node : 'hoo_pane', duration : 500 } );
+     highlighter.hoo_pane.red = dojox.fx.highlight( { color : '#FF2018', node : 'hoo_pane', duration : 500 } );
 
-					highlighter.addresses_pane.green = dojox.fx.highlight( { color : '#B4FFB4', node : 'addresses_pane', duration : 500 } );
-					highlighter.addresses_pane.red = dojox.fx.highlight( { color : '#FF2018', node : 'addresses_pane', duration : 500 } );
+     highlighter.addresses_pane.green = dojox.fx.highlight( { color : '#B4FFB4', node : 'addresses_pane', duration : 500 } );
+     highlighter.addresses_pane.red = dojox.fx.highlight( { color : '#FF2018', node : 'addresses_pane', duration : 500 } );
 ]]>
-				</script>
-				<div
-				  id="ou_tree"
-				  label="&conify.org_unit.ou_tree.label;"
-				  query="{'_top':'true'}"
-				  dojoType="dijit.Tree"
-				  store="ou_list_store"
-				  minSize="200"
-				  jsId="ou_tree"
-				>
-
-					<script type="dojo/method" event="onClick" args="item,node">
+    </script>
+    <div
+      id="ou_tree"
+      label="&conify.org_unit.ou_tree.label;"
+      query="{'_top':'true'}"
+      dojoType="dijit.Tree"
+      store="ou_list_store"
+      minSize="200"
+      jsId="ou_tree"
+    >
+
+     <script type="dojo/method" event="onClick" args="item,node">
 <![CDATA[
-						right_pane_toggler.show();
-
-						current_ou = item;
-						window.current_fm_ou = new aou().fromStoreItem(item);
-
-						highlighter.editor_pane.green.play();
-						status_update( dojo.string.substitute( aou_strings.STATUS_EDITING, [this.store.getValue( item, 'name' )] ) );
-
-						new_kid_button.disabled = false;
-						save_ou_button.disabled = false;
-						delete_ou_button.disabled = false;
-
-						dojo.byId('current_ou_name').innerHTML = this.store.getValue( current_ou, 'name' );
-
-						var main_settings_fields = [ 'name', 'shortname', 'email', 'phone', 'ou_type' ];
-						for ( var i in main_settings_fields ) {
-							var field = main_settings_fields[i];
-							var value = this.store.getValue( current_ou, field );
-
-							if (!value) {
-								window["editor_pane_" + field].setValue( '' ); // unset the value
-								window["editor_pane_" + field].setDisplayedValue( '' ); // unset the value
-							} else window["editor_pane_" + field].setValue( value );
-						}
-
-						if ( this.store.getValue( current_ou, '_trueRoot' ) == 'true' ) {
-							editor_pane_parent_ou.disabled = true;
-							editor_pane_parent_ou.setValue(null);
-							editor_pane_parent_ou.setDisplayedValue('');
-							editor_pane_parent_ou.validate(false);
-						} else {
-							editor_pane_parent_ou.disabled = false;
-							editor_pane_parent_ou.validate(true);
-							editor_pane_parent_ou.setValue( this.store.getValue( current_ou, 'parent_ou' ) );
-						}
-
-						editor_pane_opac_visible.setChecked( this.store.getValue( current_ou, 'opac_visible' ) == 't' ? true : false );
-
-						hoo_load();
-						addr_load();
+      right_pane_toggler.show();
+
+      current_ou = item;
+      window.current_fm_ou = new aou().fromStoreItem(item);
+
+      highlighter.editor_pane.green.play();
+      status_update( dojo.string.substitute( aou_strings.STATUS_EDITING, [this.store.getValue( item, 'name' )] ) );
+
+      new_kid_button.disabled = false;
+      save_ou_button.disabled = false;
+      delete_ou_button.disabled = false;
+
+      dojo.byId('current_ou_name').innerHTML = this.store.getValue( current_ou, 'name' );
+
+      var main_settings_fields = [ 'name', 'shortname', 'email', 'phone', 'ou_type' ];
+      for ( var i in main_settings_fields ) {
+       var field = main_settings_fields[i];
+       var value = this.store.getValue( current_ou, field );
+
+       if (!value) {
+        window["editor_pane_" + field].setValue( '' ); // unset the value
+        window["editor_pane_" + field].setDisplayedValue( '' ); // unset the value
+       } else window["editor_pane_" + field].setValue( value );
+      }
+
+      if ( this.store.getValue( current_ou, '_trueRoot' ) == 'true' ) {
+       editor_pane_parent_ou.disabled = true;
+       editor_pane_parent_ou.setValue(null);
+       editor_pane_parent_ou.setDisplayedValue('');
+       editor_pane_parent_ou.validate(false);
+      } else {
+       editor_pane_parent_ou.disabled = false;
+       editor_pane_parent_ou.validate(true);
+       editor_pane_parent_ou.setValue( this.store.getValue( current_ou, 'parent_ou' ) );
+      }
+
+      editor_pane_opac_visible.setChecked( this.store.getValue( current_ou, 'opac_visible' ) == 't' ? true : false );
+
+      hoo_load();
+      addr_load();
 ]]>
-					</script>
-
-					<script type="dojo/method" event="getLabel" args="item,pI">
-						var label = this.store.getValue(item,'shortname') + ' : ' + this.store.getValue(item,'name');
-						if (this.store.getValue(item,'ischanged') == 1) label = '* ' + label;
-						return label;
-					</script>
-
-				</div>
-			</div>
-
-			<div jsId="right_pane" id="right_pane" dojoType="dijit.layout.ContentPane"  sizeShare="200">
-				<script type="dojo/method">
-					window.right_pane_toggler = new dojo.fx.Toggler({ node: 'right_pane'});
-					window.right_pane_toggler.hide();
-				</script>
-
-				<div id="right_tabpane" dojoType="dijit.layout.TabContainer">
-	
-					<div id="editor_pane" dojoType="dijit.layout.ContentPane" title="&conify.org_unit.editor_pane.title;">
-
-						<table class="tundra" style="margin:10px;">
-							<tr>
-								<th>&conify.org_unit.editor_pane.org_unit_name;</th>
-								<td>
-									<span id="editor_pane_name" dojoType="dijit.form.ValidationTextBox" jsId="editor_pane_name" regExp=".+" required="true">
-										<script type="dojo/connect" event="onChange">
-											if (current_ou) ou_list_store.setValue( current_ou, "name", this.getValue() );
-										</script>
-									</span>
-									<span dojoType="openils.widget.TranslatorPopup" targetObject="current_fm_ou" field="name"></span>
-								</td>
-							</tr>
-							<tr>
-								<th>&conify.org_unit.editor_pane.org_unit_code;</th>
-								<td>
-									<span id="editor_pane_shortname" dojoType="dijit.form.ValidationTextBox" jsId="editor_pane_shortname" uppercase="true" regExp=".+" required="true">
-										<script type="dojo/connect" event="onChange">
-											if (current_ou) ou_list_store.setValue( current_ou, "shortname", this.getValue() );
-										</script>
-									</span>
-								</td>
-							</tr>
-							<tr>
-								<th>&conify.org_unit.editor_pane.main_email;</th>
-								<td>
-									<span id="editor_pane_email" dojoType="dijit.form.ValidationTextBox" jsId="editor_pane_email" regExp="^\w+(?:\.\w+)*\@\w+(?:\.\w+)+$">
-										<script type="dojo/connect" event="onChange">
-											if (current_ou) ou_list_store.setValue( current_ou, "email", this.getValue() );
-										</script>
-									</span>
-								</td>
-							</tr>
-							<tr>
-								<th>&conify.org_unit.editor_pane.main_phone;</th>
-								<td>
-									<span id="editor_pane_phone" dojoType="dijit.form.ValidationTextBox" jsId="editor_pane_phone" regExp="^(?:(?:\d{1}[ -\.])?\(?\d{3}\)?[ -\.]{1})?\d{3}[ -\.]{1}\d{4}(| \S+.*)$">
-										<script type="dojo/connect" event="onChange">
-											if (current_ou) ou_list_store.setValue( current_ou, "phone", this.getValue() );
-										</script>
-									</span>
-								</td>
-							</tr>
-							<tr>
-								<th>&conify.org_unit.editor_pane.org_unit_type;</th>
-								<td>
-									<div
-									  id="editor_pane_ou_type"
-									  dojoType="dijit.form.FilteringSelect"
-									  jsId="editor_pane_ou_type"
-									  store="ou_type_store"
-									  searchAttr="name"
-									  ignoreCase="true"
-									  required="true"
-									>
-										<script type="dojo/method" event="onChange">
-											if (current_ou) ou_list_store.setValue( current_ou, "ou_type", this.getValue() );
-										</script>
-									</div>
-								</td>
-							</tr>
-							<tr>
-								<th>&conify.org_unit.editor_pane.parent;</th>
-								<td>
-									<div
-									  id="editor_pane_parent_ou"
-									  dojoType="dijit.form.FilteringSelect"
-									  jsId="editor_pane_parent_ou"
-									  store="ou_list_store"
-									  searchAttr="shortname"
-									  ignoreCase="true"
-									  required="true"
-									>
-										<script type="dojo/method" event="onChange">
+     </script>
+
+     <script type="dojo/method" event="getLabel" args="item,pI">
+      var label = this.store.getValue(item,'shortname') + ' : ' + this.store.getValue(item,'name');
+      if (this.store.getValue(item,'ischanged') == 1) label = '* ' + label;
+      return label;
+     </script>
+
+    </div>
+   </div>
+
+   <div jsId="right_pane" id="right_pane" dojoType="dijit.layout.ContentPane"  sizeShare="200">
+    <script type="dojo/method">
+     window.right_pane_toggler = new dojo.fx.Toggler({ node: 'right_pane'});
+     window.right_pane_toggler.hide();
+    </script>
+
+    <div id="right_tabpane" dojoType="dijit.layout.TabContainer">
+ 
+     <div id="editor_pane" dojoType="dijit.layout.ContentPane" title="&conify.org_unit.editor_pane.title;">
+
+      <table class="tundra" style="margin:10px;">
+       <tr>
+        <th>&conify.org_unit.editor_pane.org_unit_name;</th>
+        <td>
+         <span id="editor_pane_name" dojoType="dijit.form.ValidationTextBox" jsId="editor_pane_name" regExp=".+" required="true">
+          <script type="dojo/connect" event="onChange">
+           if (current_ou) ou_list_store.setValue( current_ou, "name", this.getValue() );
+          </script>
+         </span>
+         <span dojoType="openils.widget.TranslatorPopup" targetObject="current_fm_ou" field="name"></span>
+        </td>
+       </tr>
+       <tr>
+        <th>&conify.org_unit.editor_pane.org_unit_code;</th>
+        <td>
+         <span id="editor_pane_shortname" dojoType="dijit.form.ValidationTextBox" jsId="editor_pane_shortname" uppercase="true" regExp=".+" required="true">
+          <script type="dojo/connect" event="onChange">
+           if (current_ou) ou_list_store.setValue( current_ou, "shortname", this.getValue() );
+          </script>
+         </span>
+        </td>
+       </tr>
+       <tr>
+        <th>&conify.org_unit.editor_pane.main_email;</th>
+        <td>
+         <span id="editor_pane_email" dojoType="dijit.form.ValidationTextBox" jsId="editor_pane_email" regExp="^\w+(?:\.\w+)*\@\w+(?:\.\w+)+$">
+          <script type="dojo/connect" event="onChange">
+           if (current_ou) ou_list_store.setValue( current_ou, "email", this.getValue() );
+          </script>
+         </span>
+        </td>
+       </tr>
+       <tr>
+        <th>&conify.org_unit.editor_pane.main_phone;</th>
+        <td>
+         <span id="editor_pane_phone" dojoType="dijit.form.ValidationTextBox" jsId="editor_pane_phone" regExp="^(?:(?:\d{1}[ -\.])?\(?\d{3}\)?[ -\.]{1})?\d{3}[ -\.]{1}\d{4}(| \S+.*)$">
+          <script type="dojo/connect" event="onChange">
+           if (current_ou) ou_list_store.setValue( current_ou, "phone", this.getValue() );
+          </script>
+         </span>
+        </td>
+       </tr>
+       <tr>
+        <th>&conify.org_unit.editor_pane.org_unit_type;</th>
+        <td>
+         <div
+           id="editor_pane_ou_type"
+           dojoType="dijit.form.FilteringSelect"
+           jsId="editor_pane_ou_type"
+           store="ou_type_store"
+           searchAttr="name"
+           ignoreCase="true"
+           required="true"
+         >
+          <script type="dojo/method" event="onChange">
+           if (current_ou) ou_list_store.setValue( current_ou, "ou_type", this.getValue() );
+          </script>
+         </div>
+        </td>
+       </tr>
+       <tr>
+        <th>&conify.org_unit.editor_pane.parent;</th>
+        <td>
+         <div
+           id="editor_pane_parent_ou"
+           dojoType="dijit.form.FilteringSelect"
+           jsId="editor_pane_parent_ou"
+           store="ou_list_store"
+           searchAttr="shortname"
+           ignoreCase="true"
+           required="true"
+         >
+          <script type="dojo/method" event="onChange">
 <![CDATA[
-											if (current_ou && this.getValue()) this.store.setValue( current_ou, "parent_ou", this.getValue() );
-											if ( this.store.getValue( current_ou, '_trueRoot' ) == 'true' ) this.required = false;
-											else this.required = true;
+           if (current_ou && this.getValue()) this.store.setValue( current_ou, "parent_ou", this.getValue() );
+           if ( this.store.getValue( current_ou, '_trueRoot' ) == 'true' ) this.required = false;
+           else this.required = true;
 ]]>
-										</script>
-									</div>
-								</td>
-							</tr>
-							<tr>
-								<th>&conify.org_unit.editor_pane.opac_visible;</th>
-								<td>
-									<input
-									  id="editor_pane_opac_visible"
-									  jsId="editor_pane_opac_visible"
-									  type="checkbox"
-									  dojoType="dijit.form.CheckBox"
-									  onChange="if (current_ou) ou_list_store.setValue( current_ou, 'opac_visible', this.checked ? 't' : 'f' );"
-									/>
-								</td>
-							</tr>
-						</table>
-	
-						<div dojoType="dijit.layout.ContentPane" orientation="horizontal" style="margin-bottom: 20px;">
-	
-							<button jsId="save_ou_button" dojoType="dijit.form.Button" label="&conify.save_button.label;" onClick="save_org()">
-								<script type="dojo/connect" event="startup">
-									this.disabled = true;
-								</script>
-							</button>
-	
-							<button jsId="delete_ou_button" dojoType="dijit.form.Button" label="&conify.delete_button.label;">
-								<script type="dojo/connect" event="startup">
-									this.disabled = true;
-								</script>
-								<script type="dojo/connect" event="onClick">
+          </script>
+         </div>
+        </td>
+       </tr>
+       <tr>
+        <th>&conify.org_unit.editor_pane.opac_visible;</th>
+        <td>
+         <input
+           id="editor_pane_opac_visible"
+           jsId="editor_pane_opac_visible"
+           type="checkbox"
+           dojoType="dijit.form.CheckBox"
+           onChange="if (current_ou) ou_list_store.setValue( current_ou, 'opac_visible', this.checked ? 't' : 'f' );"
+         />
+        </td>
+       </tr>
+      </table>
+ 
+      <div dojoType="dijit.layout.ContentPane" orientation="horizontal" style="margin-bottom: 20px;">
+ 
+       <button jsId="save_ou_button" dojoType="dijit.form.Button" label="&conify.save_button.label;" onClick="save_org()">
+        <script type="dojo/connect" event="startup">
+         this.disabled = true;
+        </script>
+       </button>
+ 
+       <button jsId="delete_ou_button" dojoType="dijit.form.Button" label="&conify.delete_button.label;">
+        <script type="dojo/connect" event="startup">
+         this.disabled = true;
+        </script>
+        <script type="dojo/connect" event="onClick">
 <![CDATA[
-									var old_name = ou_list_store.getValue( current_ou, 'name' );
-
-									if (ou_list_store.getValue( current_ou, '_trueRoot' ) == 'true') {
-										highlighter.editor_pane.red.play();
-										status_update( dojo.string.substitute( aou_strings.ERROR_DELETING_LAST_AOU, [ou_list_store.getValue( current_ou, 'name' )] ) );
-										return false;
-									}
-
-									if ( current_ou.children ) {
-										var kids = current_ou.children;
-										if (!dojo.isArray(kids)) kids = [kids];
-	
-										var existing_kids = dojo.filter(
-											kids,
-											function(kid){ return kid.isdeleted[0] != 1 }
-										);
-										if ( existing_kids.length > 0) {
-											highlighter.editor_pane.red.play();
-											status_update( dojo.string.substitute( aou_strings.ERROR_ORPHANS, [ou_list_store.getValue( current_ou, 'name' ), existing_kids.length] ) );
-											return;
-										}
-									}
-	
-									if (confirm(dojo.string.substitute(aou_strings.CONFIRM_DELETE, [current_ou.name]))) {
-										ou_list_store.setValue( current_ou, 'isdeleted', 1 );
-
-										var modified_ou = new aou().fromStoreItem( current_ou );
-										modified_ou.isdeleted( 1 );
+         var old_name = ou_list_store.getValue( current_ou, 'name' );
+
+         if (ou_list_store.getValue( current_ou, '_trueRoot' ) == 'true') {
+          highlighter.editor_pane.red.play();
+          status_update( dojo.string.substitute( aou_strings.ERROR_DELETING_LAST_AOU, [ou_list_store.getValue( current_ou, 'name' )] ) );
+          return false;
+         }
+
+         if ( current_ou.children ) {
+          var kids = current_ou.children;
+          if (!dojo.isArray(kids)) kids = [kids];
+ 
+          var existing_kids = dojo.filter(
+           kids,
+           function(kid){ return kid.isdeleted[0] != 1 }
+          );
+          if ( existing_kids.length > 0) {
+           highlighter.editor_pane.red.play();
+           status_update( dojo.string.substitute( aou_strings.ERROR_ORPHANS, [ou_list_store.getValue( current_ou, 'name' ), existing_kids.length] ) );
+           return;
+          }
+         }
+ 
+         if (confirm(dojo.string.substitute(aou_strings.CONFIRM_DELETE, [current_ou.name]))) {
+          ou_list_store.setValue( current_ou, 'isdeleted', 1 );
+
+          var modified_ou = new aou().fromStoreItem( current_ou );
+          modified_ou.isdeleted( 1 );
 
                                         var objs = [];
                                         objs.push(modified_ou);
-										if (!current_billing_address.isnew()) {
+          if (!current_billing_address.isnew()) {
                                             current_billing_address.isdeleted( 1 );
                                             objs.push(current_billing_address);
                                         }
-										if (!current_mailing_address.isnew()) {
+          if (!current_mailing_address.isnew()) {
                                             current_mailing_address.isdeleted( 1 );
                                             objs.push(current_mailing_address);
                                         }
-										if (!current_holds_address.isnew()) {
+          if (!current_holds_address.isnew()) {
                                             current_holds_address.isdeleted( 1 );
                                             objs.push(current_holds_address);
                                         }
-										if (!current_ill_address.isnew()) {
+          if (!current_ill_address.isnew()) {
                                             current_ill_address.isdeleted( 1 );
                                             objs.push(current_ill_address);
                                         }
@@ -376,137 +376,137 @@
                                             objs.push(current_ou_hoo);
                                         }
                                         pcrud.apply(objs, {
-											timeout : 10,
-											onerror : function (r) {
-												highlighter.editor_pane.red.play();
-												status_update(dojo.string.substitute(aou_strings.ERROR_DELETING, [old_name]));
-											},
-											oncomplete : function (r) {
-												new_kid_button.disabled = true;
-												save_ou_button.disabled = true;
-												delete_ou_button.disabled = true;
-
-												var main_settings_fields = [ 'name', 'shortname', 'email', 'phone', 'ou_type', 'parent_ou' ];
-												for ( var i in main_settings_fields ) {
-													var field = main_settings_fields[i];
-													window["editor_pane_" + field].setValue( '' ); // unset the value
-													window["editor_pane_" + field].setDisplayedValue( '' ); // unset the value
-												}
-
-												ou_list_store.fetch({
-													query : { id : ou_list_store.getValue( current_ou, 'id' ) },
-													queryOptions : { deep : true },
-													onItem : function (item, req) { try { if (this.isItem( item )) this.deleteItem( item ); } catch (e) { } },
-													scope : ou_list_store
-												});
+           timeout : 10,
+           onerror : function (r) {
+            highlighter.editor_pane.red.play();
+            status_update(dojo.string.substitute(aou_strings.ERROR_DELETING, [old_name]));
+           },
+           oncomplete : function (r) {
+            new_kid_button.disabled = true;
+            save_ou_button.disabled = true;
+            delete_ou_button.disabled = true;
+
+            var main_settings_fields = [ 'name', 'shortname', 'email', 'phone', 'ou_type', 'parent_ou' ];
+            for ( var i in main_settings_fields ) {
+             var field = main_settings_fields[i];
+             window["editor_pane_" + field].setValue( '' ); // unset the value
+             window["editor_pane_" + field].setDisplayedValue( '' ); // unset the value
+            }
+
+            ou_list_store.fetch({
+             query : { id : ou_list_store.getValue( current_ou, 'id' ) },
+             queryOptions : { deep : true },
+             onItem : function (item, req) { try { if (this.isItem( item )) this.deleteItem( item ); } catch (e) { } },
+             scope : ou_list_store
+            });
 
                                                 current_billing_address = null;
                                                 current_mailing_address = null;
                                                 current_holds_address = null;
                                                 current_ill_address = null;
                                                 current_ou_hoo = null;
-												current_ou = null;
+            current_ou = null;
 
-												highlighter.editor_pane.green.play();
-												status_update(dojo.string.substitute(aou_strings.STATUS_DELETED, [old_name]));
-											}
-										});
-									}
+            highlighter.editor_pane.green.play();
+            status_update(dojo.string.substitute(aou_strings.STATUS_DELETED, [old_name]));
+           }
+          });
+         }
 ]]>
-								</script>
-							</button>
-	
-						</div>
-	
-						<button jsId="new_kid_button" dojoType="dijit.form.Button" label="&conify.new_kid_button.label;">
-							<script type="dojo/connect" event="startup">
-								this.disabled = true;
-							</script>
-							<script type="dojo/connect" event="onClick">
+        </script>
+       </button>
+ 
+      </div>
+ 
+      <button jsId="new_kid_button" dojoType="dijit.form.Button" label="&conify.new_kid_button.label;">
+       <script type="dojo/connect" event="startup">
+        this.disabled = true;
+       </script>
+       <script type="dojo/connect" event="onClick">
 <![CDATA[
-								var new_fm_obj = new aou().fromHash({
-									isnew			: 1,
-									name			: aou_strings.LABEL_NEW_BRANCH + virgin_ou_id,
-									opac_visible	: 'f',
-									shortname		: ou_list_store.getValue( current_ou, 'shortname' ) + '-NEW' + virgin_ou_id--,
-									parent_ou		: ou_list_store.getValue( current_ou, 'id' ),
-									ou_type			: ou_list_store.getValue( current_ou, 'ou_type' )
-								});
-
-								pcrud.create( new_fm_obj, {
-									timeout : 10,
-									onerror : function (r) {
-										highlighter.editor_pane.red.play();
-										status_update( aou_strings.ERROR_CREATING_CHILD_AOU );
-									},
-									oncomplete : function (r) {
-										var res = r.recv();
-										if ( res && res.content() ) {
-											ou_list_store.newItem(
-												res.content().toHash(),
-												{ parent : current_ou, attribute : 'children' }
-											);
-										} else {
-											highlighter.editor_pane.red.play();
-											status_update( aou_strings.ERROR_CREATING_CHILD_AOU );
-										}
-									}
-								});
-	
-								highlighter.editor_pane.green.play();
-								highlighter.ou_tree.green.play();
-								status_update( dojo.string.substitute(aou_strings.SUCCESS_CREATING_CHILD_AOU, [ou_list_store.getValue( current_ou, 'name' )] ) );
+        var new_fm_obj = new aou().fromHash({
+         isnew   : 1,
+         name   : aou_strings.LABEL_NEW_BRANCH + virgin_ou_id,
+         opac_visible : 'f',
+         shortname  : ou_list_store.getValue( current_ou, 'shortname' ) + '-NEW' + virgin_ou_id--,
+         parent_ou  : ou_list_store.getValue( current_ou, 'id' ),
+         ou_type   : ou_list_store.getValue( current_ou, 'ou_type' )
+        });
+
+        pcrud.create( new_fm_obj, {
+         timeout : 10,
+         onerror : function (r) {
+          highlighter.editor_pane.red.play();
+          status_update( aou_strings.ERROR_CREATING_CHILD_AOU );
+         },
+         oncomplete : function (r) {
+          var res = r.recv();
+          if ( res && res.content() ) {
+           ou_list_store.newItem(
+            res.content().toHash(),
+            { parent : current_ou, attribute : 'children' }
+           );
+          } else {
+           highlighter.editor_pane.red.play();
+           status_update( aou_strings.ERROR_CREATING_CHILD_AOU );
+          }
+         }
+        });
+ 
+        highlighter.editor_pane.green.play();
+        highlighter.ou_tree.green.play();
+        status_update( dojo.string.substitute(aou_strings.SUCCESS_CREATING_CHILD_AOU, [ou_list_store.getValue( current_ou, 'name' )] ) );
 ]]>
-							</script>
-						</button>
-	
-					</div>
-
-					<div id="hoo_pane" dojoType="dijit.layout.ContentPane" title="&conify.org_unit.hoo_pane.title;">
-						<table class="tundra" style="margin:10px;">
-							<tr><th/><th>&conify.org_unit.hoo_pane.open_time;</th><th>&conify.org_unit.hoo_pane.close_time;</th></tr>
-							<tr><th>&conify.org_unit.hoo_pane.monday;</th>
-								<td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_0_open" onChange="current_ou_hoo.dow_0_open( this.getDisplayedValue() );"/></td>
-								<td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_0_close" onChange="current_ou_hoo.dow_0_close( this.getDisplayedValue() );"/></td>
-								<td><span dojoType="dijit.form.Button" label="&conify.org_unit.hoo_pane.closed;" onClick="dow_0_open.setValue( new Date('Tue Mar 25 2008 00:00:00') ); dow_0_close.setValue( new Date('Tue Mar 25 2008 00:00:00') );"/></td>
-							</tr>
-							<tr><th>&conify.org_unit.hoo_pane.tuesday;</th>
-								<td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_1_open" onChange="current_ou_hoo.dow_1_open( this.getDisplayedValue() );"/></td>
-								<td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_1_close" onChange="current_ou_hoo.dow_1_close( this.getDisplayedValue() );"/></td>
-								<td><span dojoType="dijit.form.Button" label="&conify.org_unit.hoo_pane.closed;" onClick="dow_1_open.setValue( new Date('Tue Mar 25 2008 00:00:00') ); dow_1_close.setValue( new Date('Tue Mar 25 2008 00:00:00') );"/></td>
-							</tr>
-							<tr><th>&conify.org_unit.hoo_pane.wednesday;</th>
-								<td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_2_open" onChange="current_ou_hoo.dow_2_open( this.getDisplayedValue() );"/></td>
-								<td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_2_close" onChange="current_ou_hoo.dow_2_close( this.getDisplayedValue() );"/></td>
-								<td><span dojoType="dijit.form.Button" label="&conify.org_unit.hoo_pane.closed;" onClick="dow_2_open.setValue( new Date('Tue Mar 25 2008 00:00:00') ); dow_2_close.setValue( new Date('Tue Mar 25 2008 00:00:00') );"/></td>
-							</tr>
-							<tr><th>&conify.org_unit.hoo_pane.thursday;</th>
-								<td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_3_open" onChange="current_ou_hoo.dow_3_open( this.getDisplayedValue() );"/></td>
-								<td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_3_close" onChange="current_ou_hoo.dow_3_close( this.getDisplayedValue() );"/></td>
-								<td><span dojoType="dijit.form.Button" label="&conify.org_unit.hoo_pane.closed;" onClick="dow_3_open.setValue( new Date('Tue Mar 25 2008 00:00:00') ); dow_3_close.setValue( new Date('Tue Mar 25 2008 00:00:00') );"/></td>
-							</tr>
-							<tr><th>&conify.org_unit.hoo_pane.friday;</th>
-								<td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_4_open" onChange="current_ou_hoo.dow_4_open( this.getDisplayedValue() );"/></td>
-								<td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_4_close" onChange="current_ou_hoo.dow_4_close( this.getDisplayedValue() );"/></td>
-								<td><span dojoType="dijit.form.Button" label="&conify.org_unit.hoo_pane.closed;" onClick="dow_4_open.setValue( new Date('Tue Mar 25 2008 00:00:00') ); dow_4_close.setValue( new Date('Tue Mar 25 2008 00:00:00') );"/></td>
-							</tr>
-							<tr><th>&conify.org_unit.hoo_pane.saturday;</th>
-								<td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_5_open" onChange="current_ou_hoo.dow_5_open( this.getDisplayedValue() );"/></td>
-								<td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_5_close" onChange="current_ou_hoo.dow_5_close( this.getDisplayedValue() );"/></td>
-								<td><span dojoType="dijit.form.Button" label="&conify.org_unit.hoo_pane.closed;" onClick="dow_5_open.setValue( new Date('Tue Mar 25 2008 00:00:00') ); dow_5_close.setValue( new Date('Tue Mar 25 2008 00:00:00') );"/></td>
-							</tr>
-							<tr><th>&conify.org_unit.hoo_pane.sunday;</th>
-								<td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_6_open" onChange="current_ou_hoo.dow_6_open( this.getDisplayedValue() );"/></td>
-								<td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_6_close" onChange="current_ou_hoo.dow_6_close( this.getDisplayedValue() );"/></td>
-								<td><span dojoType="dijit.form.Button" label="&conify.org_unit.hoo_pane.closed;" onClick="dow_6_open.setValue( new Date('Tue Mar 25 2008 00:00:00') ); dow_6_close.setValue( new Date('Tue Mar 25 2008 00:00:00') );"/></td>
-							</tr>
-						</table>
-	
-						<button jsId="save_hoo_button" dojoType="dijit.form.Button" label="&conify.save_button.label;">
+       </script>
+      </button>
+ 
+     </div>
+
+     <div id="hoo_pane" dojoType="dijit.layout.ContentPane" title="&conify.org_unit.hoo_pane.title;">
+      <table class="tundra" style="margin:10px;">
+       <tr><th/><th>&conify.org_unit.hoo_pane.open_time;</th><th>&conify.org_unit.hoo_pane.close_time;</th></tr>
+       <tr><th>&conify.org_unit.hoo_pane.monday;</th>
+        <td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_0_open" onChange="current_ou_hoo.dow_0_open( this.getDisplayedValue() );"/></td>
+        <td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_0_close" onChange="current_ou_hoo.dow_0_close( this.getDisplayedValue() );"/></td>
+        <td><span dojoType="dijit.form.Button" label="&conify.org_unit.hoo_pane.closed;" onClick="dow_0_open.setValue( new Date('Tue Mar 25 2008 00:00:00') ); dow_0_close.setValue( new Date('Tue Mar 25 2008 00:00:00') );"/></td>
+       </tr>
+       <tr><th>&conify.org_unit.hoo_pane.tuesday;</th>
+        <td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_1_open" onChange="current_ou_hoo.dow_1_open( this.getDisplayedValue() );"/></td>
+        <td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_1_close" onChange="current_ou_hoo.dow_1_close( this.getDisplayedValue() );"/></td>
+        <td><span dojoType="dijit.form.Button" label="&conify.org_unit.hoo_pane.closed;" onClick="dow_1_open.setValue( new Date('Tue Mar 25 2008 00:00:00') ); dow_1_close.setValue( new Date('Tue Mar 25 2008 00:00:00') );"/></td>
+       </tr>
+       <tr><th>&conify.org_unit.hoo_pane.wednesday;</th>
+        <td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_2_open" onChange="current_ou_hoo.dow_2_open( this.getDisplayedValue() );"/></td>
+        <td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_2_close" onChange="current_ou_hoo.dow_2_close( this.getDisplayedValue() );"/></td>
+        <td><span dojoType="dijit.form.Button" label="&conify.org_unit.hoo_pane.closed;" onClick="dow_2_open.setValue( new Date('Tue Mar 25 2008 00:00:00') ); dow_2_close.setValue( new Date('Tue Mar 25 2008 00:00:00') );"/></td>
+       </tr>
+       <tr><th>&conify.org_unit.hoo_pane.thursday;</th>
+        <td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_3_open" onChange="current_ou_hoo.dow_3_open( this.getDisplayedValue() );"/></td>
+        <td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_3_close" onChange="current_ou_hoo.dow_3_close( this.getDisplayedValue() );"/></td>
+        <td><span dojoType="dijit.form.Button" label="&conify.org_unit.hoo_pane.closed;" onClick="dow_3_open.setValue( new Date('Tue Mar 25 2008 00:00:00') ); dow_3_close.setValue( new Date('Tue Mar 25 2008 00:00:00') );"/></td>
+       </tr>
+       <tr><th>&conify.org_unit.hoo_pane.friday;</th>
+        <td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_4_open" onChange="current_ou_hoo.dow_4_open( this.getDisplayedValue() );"/></td>
+        <td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_4_close" onChange="current_ou_hoo.dow_4_close( this.getDisplayedValue() );"/></td>
+        <td><span dojoType="dijit.form.Button" label="&conify.org_unit.hoo_pane.closed;" onClick="dow_4_open.setValue( new Date('Tue Mar 25 2008 00:00:00') ); dow_4_close.setValue( new Date('Tue Mar 25 2008 00:00:00') );"/></td>
+       </tr>
+       <tr><th>&conify.org_unit.hoo_pane.saturday;</th>
+        <td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_5_open" onChange="current_ou_hoo.dow_5_open( this.getDisplayedValue() );"/></td>
+        <td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_5_close" onChange="current_ou_hoo.dow_5_close( this.getDisplayedValue() );"/></td>
+        <td><span dojoType="dijit.form.Button" label="&conify.org_unit.hoo_pane.closed;" onClick="dow_5_open.setValue( new Date('Tue Mar 25 2008 00:00:00') ); dow_5_close.setValue( new Date('Tue Mar 25 2008 00:00:00') );"/></td>
+       </tr>
+       <tr><th>&conify.org_unit.hoo_pane.sunday;</th>
+        <td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_6_open" onChange="current_ou_hoo.dow_6_open( this.getDisplayedValue() );"/></td>
+        <td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_6_close" onChange="current_ou_hoo.dow_6_close( this.getDisplayedValue() );"/></td>
+        <td><span dojoType="dijit.form.Button" label="&conify.org_unit.hoo_pane.closed;" onClick="dow_6_open.setValue( new Date('Tue Mar 25 2008 00:00:00') ); dow_6_close.setValue( new Date('Tue Mar 25 2008 00:00:00') );"/></td>
+       </tr>
+      </table>
+ 
+      <button jsId="save_hoo_button" dojoType="dijit.form.Button" label="&conify.save_button.label;">
                             <script type="dojo/connect" event="startup">
                                 this.disabled = true;
                             </script>
-							<script type="dojo/connect" event="onClick">
+       <script type="dojo/connect" event="onClick">
 <![CDATA[
                                 if (!current_ou_hoo.isnew()) {
                                     current_ou_hoo.ischanged( 1 );
@@ -526,61 +526,61 @@
                                     },
                                 });
 ]]>
-							</script>
-						</button>
-	
-					</div>
-	
-					<div id="addresses_pane" dojoType="dijit.layout.ContentPane" title="&conify.org_unit.addresses_pane.title;">
-						
-						<div id="billing_address_pane" dojoType="dijit.layout.TabContainer" style="margin-top:10px">
-	
-							<script type="dojo/method">
-								current_billing_address = null;
-								current_mailing_address = null;
-								current_holds_address = null;
-								current_ill_address = null;
-							</script>
-	
-							<div id="billing_address" dojoType="dijit.layout.ContentPane" title="&conify.org_unit.addresses_pane.physical.title;">
-								<table class="tundra" style="margin:10px;">
-									<tr>
-										<th>&conify.org_unit.addresses_pane.type;</th>
-										<td colspan="3">
-											<span jsId="billing_addr_type" style="width:100%;" dojoType="dijit.form.TextBox" onChange="current_billing_address.address_type( this.getValue() )"/>
-										</td>
-										<th>&conify.org_unit.addresses_pane.valid;</th><td>
-											<input
-											  type="checkbox"
-											  jsId="billing_addr_valid"
-											  dojoType="dijit.form.CheckBox"
-											  value='t'
-											  onChange="if (current_billing_address) current_billing_address.valid( this.checked ? 't' : 'f' );"
-											/>
-										</td>
-									</tr>
-									<tr>
-										<th>&conify.org_unit.addresses_pane.street1;</th><td colspan="5"><span jsId="billing_addr_street1" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_billing_address.street1( this.getValue() )" required="true"/></td>
-									</tr>
-									<tr>
-										<th>&conify.org_unit.addresses_pane.street2;</th><td colspan="5"><span jsId="billing_addr_street2" style="width:100%;" dojoType="dijit.form.TextBox" onChange="current_billing_address.street2( this.getValue() )"/></td>
-									</tr>
-									<tr>
-										<th>&conify.org_unit.addresses_pane.city;</th><td><span jsId="billing_addr_city" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_billing_address.city( this.getValue() )" required="true"/></td>
-										<th>&conify.org_unit.addresses_pane.state;</th><td><span jsId="billing_addr_state" style="width:100%;" dojoType="dijit.form.ValidationTextBox" size="2" maxSize="2" uppercase="true" onChange="current_billing_address.state( this.getValue() )" required="true"/></td>
-										<th>&conify.org_unit.addresses_pane.zip;</th><td><span jsId="billing_addr_post_code" style="width:100%;" dojoType="dijit.form.ValidationTextBox" size="10" maxSize="10" regExp="^\d{5}(?:-\d{4})?$" uppercase="true" onChange="current_billing_address.post_code( this.getValue() )" required="true"/></td>
-									</tr>
-									<tr>
-										<th>&conify.org_unit.addresses_pane.country;</th><td colspan="2"><span jsId="billing_addr_country" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_billing_address.country( this.getValue() )" required="true"/></td>
-										<th>&conify.org_unit.addresses_pane.county;</th><td colspan="2"><span jsId="billing_addr_county" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_billing_address.county( this.getValue() )" required="true"/></td>
-									</tr>
-								</table>
-	
-								<button jsId="save_billing_address" dojoType="dijit.form.Button" label="&conify.save_button.label;">
-									<script type="dojo/connect" event="startup">
-										this.disabled = true;
-									</script>
-									<script type="dojo/connect" event="onClick">
+       </script>
+      </button>
+ 
+     </div>
+ 
+     <div id="addresses_pane" dojoType="dijit.layout.ContentPane" title="&conify.org_unit.addresses_pane.title;">
+      
+      <div id="billing_address_pane" dojoType="dijit.layout.TabContainer" style="margin-top:10px">
+ 
+       <script type="dojo/method">
+        current_billing_address = null;
+        current_mailing_address = null;
+        current_holds_address = null;
+        current_ill_address = null;
+       </script>
+ 
+       <div id="billing_address" dojoType="dijit.layout.ContentPane" title="&conify.org_unit.addresses_pane.physical.title;">
+        <table class="tundra" style="margin:10px;">
+         <tr>
+          <th>&conify.org_unit.addresses_pane.type;</th>
+          <td colspan="3">
+           <span jsId="billing_addr_type" style="width:100%;" dojoType="dijit.form.TextBox" onChange="current_billing_address.address_type( this.getValue() )"/>
+          </td>
+          <th>&conify.org_unit.addresses_pane.valid;</th><td>
+           <input
+             type="checkbox"
+             jsId="billing_addr_valid"
+             dojoType="dijit.form.CheckBox"
+             value='t'
+             onChange="if (current_billing_address) current_billing_address.valid( this.checked ? 't' : 'f' );"
+           />
+          </td>
+         </tr>
+         <tr>
+          <th>&conify.org_unit.addresses_pane.street1;</th><td colspan="5"><span jsId="billing_addr_street1" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_billing_address.street1( this.getValue() )" required="true"/></td>
+         </tr>
+         <tr>
+          <th>&conify.org_unit.addresses_pane.street2;</th><td colspan="5"><span jsId="billing_addr_street2" style="width:100%;" dojoType="dijit.form.TextBox" onChange="current_billing_address.street2( this.getValue() )"/></td>
+         </tr>
+         <tr>
+          <th>&conify.org_unit.addresses_pane.city;</th><td><span jsId="billing_addr_city" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_billing_address.city( this.getValue() )" required="true"/></td>
+          <th>&conify.org_unit.addresses_pane.state;</th><td><span jsId="billing_addr_state" style="width:100%;" dojoType="dijit.form.ValidationTextBox" size="2" maxSize="2" uppercase="true" onChange="current_billing_address.state( this.getValue() )" required="true"/></td>
+          <th>&conify.org_unit.addresses_pane.zip;</th><td><span jsId="billing_addr_post_code" style="width:100%;" dojoType="dijit.form.ValidationTextBox" size="10" maxSize="10" regExp="^\d{5}(?:-\d{4})?$" uppercase="true" onChange="current_billing_address.post_code( this.getValue() )" required="true"/></td>
+         </tr>
+         <tr>
+          <th>&conify.org_unit.addresses_pane.country;</th><td colspan="2"><span jsId="billing_addr_country" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_billing_address.country( this.getValue() )" required="true"/></td>
+          <th>&conify.org_unit.addresses_pane.county;</th><td colspan="2"><span jsId="billing_addr_county" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_billing_address.county( this.getValue() )" required="true"/></td>
+         </tr>
+        </table>
+ 
+        <button jsId="save_billing_address" dojoType="dijit.form.Button" label="&conify.save_button.label;">
+         <script type="dojo/connect" event="startup">
+          this.disabled = true;
+         </script>
+         <script type="dojo/connect" event="onClick">
 <![CDATA[
                                         if (!current_billing_address.isnew()) {
                                             current_billing_address.ischanged( 1 );
@@ -608,46 +608,46 @@
                                             },
                                         });
 ]]>
-									</script>
-								</button>
-							</div>
-
-							<div id="holds_address" dojoType="dijit.layout.ContentPane" title="&conify.org_unit.addresses_pane.holds.title;">
-								<table class="tundra" style="margin:10px;">
-									<tr>
-										<th>&conify.org_unit.addresses_pane.type;</th><td colspan="3"><span jsId="holds_addr_type" style="width:100%;" dojoType="dijit.form.TextBox" onChange="current_holds_address.address_type( this.getValue() )"/></td>
-										<th>&conify.org_unit.addresses_pane.valid;</th><td>
-											<input
-											  type="checkbox"
-											  jsId="holds_addr_valid"
-											  dojoType="dijit.form.CheckBox"
-											  value='t'
-											  onChange="if (current_holds_address) current_holds_address.valid( this.checked ? 't' : 'f' );"
-											/>
-										</td>
-									</tr>
-									<tr>
-										<th>&conify.org_unit.addresses_pane.street1;</th><td colspan="5"><span jsId="holds_addr_street1" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_holds_address.street1( this.getValue() )" required="true"/></td>
-									</tr>
-									<tr>
-										<th>&conify.org_unit.addresses_pane.street2;</th><td colspan="5"><span jsId="holds_addr_street2" style="width:100%;" dojoType="dijit.form.TextBox" onChange="current_holds_address.street2( this.getValue() )"/></td>
-									</tr>
-									<tr>
-										<th>&conify.org_unit.addresses_pane.city;</th><td><span jsId="holds_addr_city" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_holds_address.city( this.getValue() )" required="true"/></td>
-										<th>&conify.org_unit.addresses_pane.state;</th><td><span jsId="holds_addr_state" style="width:100%;" dojoType="dijit.form.ValidationTextBox" size="2" maxSize="2" uppercase="true" onChange="current_holds_address.state( this.getValue() )" required="true"/></td>
-										<th>&conify.org_unit.addresses_pane.zip;</th><td><span jsId="holds_addr_post_code" style="width:100%;" dojoType="dijit.form.ValidationTextBox" size="10" maxSize="10" regExp="^\d{5}(?:-\d{4})?$" uppercase="true" onChange="current_holds_address.post_code( this.getValue() )" required="true"/></td>
-									</tr>
-									<tr>
-										<th>&conify.org_unit.addresses_pane.country;</th><td colspan="2"><span jsId="holds_addr_country" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_holds_address.country( this.getValue() )" required="true"/></td>
-										<th>&conify.org_unit.addresses_pane.county;</th><td colspan="2"><span jsId="holds_addr_county" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_holds_address.county( this.getValue() )" required="true"/></td>
-									</tr>
-								</table>
-	
-								<button jsId="save_holds_address" dojoType="dijit.form.Button" label="&conify.save_button.label;">
-									<script type="dojo/connect" event="startup">
-										this.disabled = true;
-									</script>
-									<script type="dojo/connect" event="onClick">
+         </script>
+        </button>
+       </div>
+
+       <div id="holds_address" dojoType="dijit.layout.ContentPane" title="&conify.org_unit.addresses_pane.holds.title;">
+        <table class="tundra" style="margin:10px;">
+         <tr>
+          <th>&conify.org_unit.addresses_pane.type;</th><td colspan="3"><span jsId="holds_addr_type" style="width:100%;" dojoType="dijit.form.TextBox" onChange="current_holds_address.address_type( this.getValue() )"/></td>
+          <th>&conify.org_unit.addresses_pane.valid;</th><td>
+           <input
+             type="checkbox"
+             jsId="holds_addr_valid"
+             dojoType="dijit.form.CheckBox"
+             value='t'
+             onChange="if (current_holds_address) current_holds_address.valid( this.checked ? 't' : 'f' );"
+           />
+          </td>
+         </tr>
+         <tr>
+          <th>&conify.org_unit.addresses_pane.street1;</th><td colspan="5"><span jsId="holds_addr_street1" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_holds_address.street1( this.getValue() )" required="true"/></td>
+         </tr>
+         <tr>
+          <th>&conify.org_unit.addresses_pane.street2;</th><td colspan="5"><span jsId="holds_addr_street2" style="width:100%;" dojoType="dijit.form.TextBox" onChange="current_holds_address.street2( this.getValue() )"/></td>
+         </tr>
+         <tr>
+          <th>&conify.org_unit.addresses_pane.city;</th><td><span jsId="holds_addr_city" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_holds_address.city( this.getValue() )" required="true"/></td>
+          <th>&conify.org_unit.addresses_pane.state;</th><td><span jsId="holds_addr_state" style="width:100%;" dojoType="dijit.form.ValidationTextBox" size="2" maxSize="2" uppercase="true" onChange="current_holds_address.state( this.getValue() )" required="true"/></td>
+          <th>&conify.org_unit.addresses_pane.zip;</th><td><span jsId="holds_addr_post_code" style="width:100%;" dojoType="dijit.form.ValidationTextBox" size="10" maxSize="10" regExp="^\d{5}(?:-\d{4})?$" uppercase="true" onChange="current_holds_address.post_code( this.getValue() )" required="true"/></td>
+         </tr>
+         <tr>
+          <th>&conify.org_unit.addresses_pane.country;</th><td colspan="2"><span jsId="holds_addr_country" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_holds_address.country( this.getValue() )" required="true"/></td>
+          <th>&conify.org_unit.addresses_pane.county;</th><td colspan="2"><span jsId="holds_addr_county" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_holds_address.county( this.getValue() )" required="true"/></td>
+         </tr>
+        </table>
+ 
+        <button jsId="save_holds_address" dojoType="dijit.form.Button" label="&conify.save_button.label;">
+         <script type="dojo/connect" event="startup">
+          this.disabled = true;
+         </script>
+         <script type="dojo/connect" event="onClick">
 <![CDATA[
                                         if (!current_holds_address.isnew()) {
                                             current_holds_address.ischanged( 1 );
@@ -675,45 +675,45 @@
                                             },
                                         });
 ]]>
-									</script>
-								</button>
-							</div>
-
-							<div id="mailing_address" dojoType="dijit.layout.ContentPane" title="&conify.org_unit.addresses_pane.mailing.title;">
-								<table class="tundra" style="margin:10px;">
-									<tr>
-										<th>&conify.org_unit.addresses_pane.type;</th><td colspan="3"><span jsId="mailing_addr_type" style="width:100%;" dojoType="dijit.form.TextBox" onChange="current_mailing_address.address_type( this.getValue() )"/></td>
-										<th>&conify.org_unit.addresses_pane.valid;</th><td>
-											<input
-											  type="checkbox"
-											  jsId="mailing_addr_valid"
-											  dojoType="dijit.form.CheckBox"
-											  onChange="if (current_mailing_address) current_mailing_address.valid( this.checked ? 't' : 'f' );"
-											/>
-										</td>
-									</tr>
-									<tr>
-										<th>&conify.org_unit.addresses_pane.street1;</th><td colspan="5"><span jsId="mailing_addr_street1" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_mailing_address.street1( this.getValue() )" required="true"/></td>
-									</tr>
-									<tr>
-										<th>&conify.org_unit.addresses_pane.street2;</th><td colspan="5"><span jsId="mailing_addr_street2" style="width:100%;" dojoType="dijit.form.TextBox" onChange="current_mailing_address.street2( this.getValue() )"/></td>
-									</tr>
-									<tr>
-										<th>&conify.org_unit.addresses_pane.city;</th><td><span jsId="mailing_addr_city" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_mailing_address.city( this.getValue() )" required="true"/></td>
-										<th>&conify.org_unit.addresses_pane.state;</th><td><span jsId="mailing_addr_state" style="width:100%;" dojoType="dijit.form.ValidationTextBox" size="2" maxSize="2" uppercase="true" onChange="current_mailing_address.state( this.getValue() )" required="true"/></td>
-										<th>&conify.org_unit.addresses_pane.zip;</th><td><span jsId="mailing_addr_post_code" style="width:100%;" dojoType="dijit.form.ValidationTextBox" size="10" maxSize="10" regExp="^\d{5}(?:-\d{4})?$" uppercase="true" onChange="current_mailing_address.post_code( this.getValue() )" required="true"/></td>
-									</tr>
-									<tr>
-										<th>&conify.org_unit.addresses_pane.country;</th><td colspan="2"><span jsId="mailing_addr_country" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_mailing_address.country( this.getValue() )" required="true"/></td>
-										<th>&conify.org_unit.addresses_pane.county;</th><td colspan="2"><span jsId="mailing_addr_county" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_mailing_address.county( this.getValue() )" required="true"/></td>
-									</tr>
-								</table>
-	
-								<button jsId="save_mailing_address" dojoType="dijit.form.Button" label="&conify.save_button.label;">
-									<script type="dojo/connect" event="startup">
-										this.disabled = true;
-									</script>
-									<script type="dojo/connect" event="onClick">
+         </script>
+        </button>
+       </div>
+
+       <div id="mailing_address" dojoType="dijit.layout.ContentPane" title="&conify.org_unit.addresses_pane.mailing.title;">
+        <table class="tundra" style="margin:10px;">
+         <tr>
+          <th>&conify.org_unit.addresses_pane.type;</th><td colspan="3"><span jsId="mailing_addr_type" style="width:100%;" dojoType="dijit.form.TextBox" onChange="current_mailing_address.address_type( this.getValue() )"/></td>
+          <th>&conify.org_unit.addresses_pane.valid;</th><td>
+           <input
+             type="checkbox"
+             jsId="mailing_addr_valid"
+             dojoType="dijit.form.CheckBox"
+             onChange="if (current_mailing_address) current_mailing_address.valid( this.checked ? 't' : 'f' );"
+           />
+          </td>
+         </tr>
+         <tr>
+          <th>&conify.org_unit.addresses_pane.street1;</th><td colspan="5"><span jsId="mailing_addr_street1" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_mailing_address.street1( this.getValue() )" required="true"/></td>
+         </tr>
+         <tr>
+          <th>&conify.org_unit.addresses_pane.street2;</th><td colspan="5"><span jsId="mailing_addr_street2" style="width:100%;" dojoType="dijit.form.TextBox" onChange="current_mailing_address.street2( this.getValue() )"/></td>
+         </tr>
+         <tr>
+          <th>&conify.org_unit.addresses_pane.city;</th><td><span jsId="mailing_addr_city" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_mailing_address.city( this.getValue() )" required="true"/></td>
+          <th>&conify.org_unit.addresses_pane.state;</th><td><span jsId="mailing_addr_state" style="width:100%;" dojoType="dijit.form.ValidationTextBox" size="2" maxSize="2" uppercase="true" onChange="current_mailing_address.state( this.getValue() )" required="true"/></td>
+          <th>&conify.org_unit.addresses_pane.zip;</th><td><span jsId="mailing_addr_post_code" style="width:100%;" dojoType="dijit.form.ValidationTextBox" size="10" maxSize="10" regExp="^\d{5}(?:-\d{4})?$" uppercase="true" onChange="current_mailing_address.post_code( this.getValue() )" required="true"/></td>
+         </tr>
+         <tr>
+          <th>&conify.org_unit.addresses_pane.country;</th><td colspan="2"><span jsId="mailing_addr_country" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_mailing_address.country( this.getValue() )" required="true"/></td>
+          <th>&conify.org_unit.addresses_pane.county;</th><td colspan="2"><span jsId="mailing_addr_county" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_mailing_address.county( this.getValue() )" required="true"/></td>
+         </tr>
+        </table>
+ 
+        <button jsId="save_mailing_address" dojoType="dijit.form.Button" label="&conify.save_button.label;">
+         <script type="dojo/connect" event="startup">
+          this.disabled = true;
+         </script>
+         <script type="dojo/connect" event="onClick">
 <![CDATA[
                                         if (!current_mailing_address.isnew()) {
                                             current_mailing_address.ischanged( 1 );
@@ -741,45 +741,45 @@
                                             },
                                         });
 ]]>
-									</script>
-								</button>
-							</div>
-
-							<div id="ill_address" dojoType="dijit.layout.ContentPane" title="&conify.org_unit.addresses_pane.ill.title;">
-								<table class="tundra" style="margin:10px;">
-									<tr>
-										<th>&conify.org_unit.addresses_pane.type;</th><td colspan="3"><span jsId="ill_addr_type" style="width:100%;" dojoType="dijit.form.TextBox" onChange="current_ill_address.address_type( this.getValue() )"/></td>
-										<th>&conify.org_unit.addresses_pane.valid;</th><td>
-											<input
-											  type="checkbox"
-											  jsId="ill_addr_valid"
-											  dojoType="dijit.form.CheckBox"
-											  onChange="if (current_ill_address) current_ill_address.valid( this.checked ? 't' : 'f' );"
-											/>
-										</td>
-									</tr>
-									<tr>
-										<th>&conify.org_unit.addresses_pane.street1;</th><td colspan="5"><span jsId="ill_addr_street1" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_ill_address.street1( this.getValue() )" required="true"/></td>
-									</tr>
-									<tr>
-										<th>&conify.org_unit.addresses_pane.street2;</th><td colspan="5"><span jsId="ill_addr_street2" style="width:100%;" dojoType="dijit.form.TextBox" onChange="current_ill_address.street2( this.getValue() )"/></td>
-									</tr>
-									<tr>
-										<th>&conify.org_unit.addresses_pane.city;</th><td><span jsId="ill_addr_city" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_ill_address.city( this.getValue() )" required="true"/></td>
-										<th>&conify.org_unit.addresses_pane.state;</th><td><span jsId="ill_addr_state" style="width:100%;" dojoType="dijit.form.ValidationTextBox" size="2" maxSize="2" uppercase="true" onChange="current_ill_address.state( this.getValue() )" required="true"/></td>
-										<th>&conify.org_unit.addresses_pane.zip;</th><td><span jsId="ill_addr_post_code" style="width:100%;" dojoType="dijit.form.ValidationTextBox" size="10" maxSize="10" regExp="^\d{5}(?:-\d{4})?$" uppercase="true" onChange="current_ill_address.post_code( this.getValue() )" required="true"/></td>
-									</tr>
-									<tr>
-										<th>&conify.org_unit.addresses_pane.country;</th><td colspan="2"><span jsId="ill_addr_country" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_ill_address.country( this.getValue() )" required="true"/></td>
-										<th>&conify.org_unit.addresses_pane.county;</th><td colspan="2"><span jsId="ill_addr_county" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_ill_address.county( this.getValue() )" required="true"/></td>
-									</tr>
-								</table>
-	
-								<button jsId="save_ill_address" dojoType="dijit.form.Button" label="&conify.save_button.label;">
-									<script type="dojo/connect" event="startup">
-										this.disabled = true;
-									</script>
-									<script type="dojo/connect" event="onClick">
+         </script>
+        </button>
+       </div>
+
+       <div id="ill_address" dojoType="dijit.layout.ContentPane" title="&conify.org_unit.addresses_pane.ill.title;">
+        <table class="tundra" style="margin:10px;">
+         <tr>
+          <th>&conify.org_unit.addresses_pane.type;</th><td colspan="3"><span jsId="ill_addr_type" style="width:100%;" dojoType="dijit.form.TextBox" onChange="current_ill_address.address_type( this.getValue() )"/></td>
+          <th>&conify.org_unit.addresses_pane.valid;</th><td>
+           <input
+             type="checkbox"
+             jsId="ill_addr_valid"
+             dojoType="dijit.form.CheckBox"
+             onChange="if (current_ill_address) current_ill_address.valid( this.checked ? 't' : 'f' );"
+           />
+          </td>
+         </tr>
+         <tr>
+          <th>&conify.org_unit.addresses_pane.street1;</th><td colspan="5"><span jsId="ill_addr_street1" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_ill_address.street1( this.getValue() )" required="true"/></td>
+         </tr>
+         <tr>
+          <th>&conify.org_unit.addresses_pane.street2;</th><td colspan="5"><span jsId="ill_addr_street2" style="width:100%;" dojoType="dijit.form.TextBox" onChange="current_ill_address.street2( this.getValue() )"/></td>
+         </tr>
+         <tr>
+          <th>&conify.org_unit.addresses_pane.city;</th><td><span jsId="ill_addr_city" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_ill_address.city( this.getValue() )" required="true"/></td>
+          <th>&conify.org_unit.addresses_pane.state;</th><td><span jsId="ill_addr_state" style="width:100%;" dojoType="dijit.form.ValidationTextBox" size="2" maxSize="2" uppercase="true" onChange="current_ill_address.state( this.getValue() )" required="true"/></td>
+          <th>&conify.org_unit.addresses_pane.zip;</th><td><span jsId="ill_addr_post_code" style="width:100%;" dojoType="dijit.form.ValidationTextBox" size="10" maxSize="10" regExp="^\d{5}(?:-\d{4})?$" uppercase="true" onChange="current_ill_address.post_code( this.getValue() )" required="true"/></td>
+         </tr>
+         <tr>
+          <th>&conify.org_unit.addresses_pane.country;</th><td colspan="2"><span jsId="ill_addr_country" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_ill_address.country( this.getValue() )" required="true"/></td>
+          <th>&conify.org_unit.addresses_pane.county;</th><td colspan="2"><span jsId="ill_addr_county" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_ill_address.county( this.getValue() )" required="true"/></td>
+         </tr>
+        </table>
+ 
+        <button jsId="save_ill_address" dojoType="dijit.form.Button" label="&conify.save_button.label;">
+         <script type="dojo/connect" event="startup">
+          this.disabled = true;
+         </script>
+         <script type="dojo/connect" event="onClick">
 <![CDATA[
                                         if (!current_ill_address.isnew()) {
                                             current_ill_address.ischanged( 1 );
@@ -807,15 +807,15 @@
                                             },
                                         });
 ]]>
-									</script>
-								</button>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-
-		<div id="status_bar"><span style="font-weight: bold; margin: 5px; margin-right: 10px;">&conify.org_unit.status_bar;</span><span id="current_ou_name"></span></div>
-	</body>
+         </script>
+        </button>
+       </div>
+      </div>
+     </div>
+    </div>
+   </div>
+  </div>
+
+  <div id="status_bar"><span style="font-weight: bold; margin: 5px; margin-right: 10px;">&conify.org_unit.status_bar;</span><span id="current_ou_name"></span></div>
+ </body>
 </html>
diff --git a/Open-ILS/web/conify/global/actor/org_unit_type.html b/Open-ILS/web/conify/global/actor/org_unit_type.html
index 0742bb7aaa..7196a412f7 100644
--- a/Open-ILS/web/conify/global/actor/org_unit_type.html
+++ b/Open-ILS/web/conify/global/actor/org_unit_type.html
@@ -14,64 +14,64 @@
 -->
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/conify.dtd"-->
+ "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+ <!--#include virtual="/opac/locale/${locale}/conify.dtd"-->
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<title>&conify.org_unit_type.title;</title>
-
-		<style type="text/css">
-			@import url('/js/dojo/dojo/resources/dojo.css');
-			@import url('/js/dojo/dijit/themes/tundra/tundra.css');
-			@import url('/js/dojo/dojox/widget/Toaster/Toaster.css');
-		</style>
-
-		<style>
-			html, body
-			{
-				height: 100%;
-				width: 100%;
-				margin: 0px 0px 0px 0px;
-				padding: 0px 0px 0px 0px;
-				overflow: hidden;
-			}
-
-			th
-			{
-				text-align: right;
-				font-weight: bold;
-				padding-left: 20px;
-				padding-right: 5px;
-			}
-		</style>
-
-		<!-- The OpenSRF API writ JS -->
-		<script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
-		<script language='javascript' src='/opac/common/js/Cookies.js' type='text/javascript'></script>
-		<script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
-		<script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
-
-		<!-- Dojo goodness -->
-		<script type="text/javascript" src="../admin.js"></script>
-		<script type="text/javascript" src="/js/dojo/dojo/dojo.js"></script>
+ <head>
+  <title>&conify.org_unit_type.title;</title>
+
+  <style type="text/css">
+   @import url('/js/dojo/dojo/resources/dojo.css');
+   @import url('/js/dojo/dijit/themes/tundra/tundra.css');
+   @import url('/js/dojo/dojox/widget/Toaster/Toaster.css');
+  </style>
+
+  <style>
+   html, body
+   {
+    height: 100%;
+    width: 100%;
+    margin: 0px 0px 0px 0px;
+    padding: 0px 0px 0px 0px;
+    overflow: hidden;
+   }
+
+   th
+   {
+    text-align: right;
+    font-weight: bold;
+    padding-left: 20px;
+    padding-right: 5px;
+   }
+  </style>
+
+  <!-- The OpenSRF API writ JS -->
+  <script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
+  <script language='javascript' src='/opac/common/js/Cookies.js' type='text/javascript'></script>
+  <script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
+  <script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
+
+  <!-- Dojo goodness -->
+  <script type="text/javascript" src="../admin.js"></script>
+  <script type="text/javascript" src="/js/dojo/dojo/dojo.js"></script>
                 <script type="text/javascript" src="/js/dojo/dojo/openils_dojo.js"></script>
-		<script type="text/javascript" src="/js/dojo/dijit/dijit.js"></script>
+  <script type="text/javascript" src="/js/dojo/dijit/dijit.js"></script>
 
-		<script type="text/javascript" src="org_unit_type.js"></script>
+  <script type="text/javascript" src="org_unit_type.js"></script>
 
-	</head>
+ </head>
 
-	<body class="tundra" id='pagebody'>
+ <body class="tundra" id='pagebody'>
 
-		<div dojoType="dijit.layout.SplitContainer" orientation="horizontal" style="height: 100%">
+  <div dojoType="dijit.layout.SplitContainer" orientation="horizontal" style="height: 100%">
 
-			<div dojoType="dijit.layout.ContentPane" sizeShare="100">
-				<script type="dojo/method">
+   <div dojoType="dijit.layout.ContentPane" sizeShare="100">
+    <script type="dojo/method">
 <![CDATA[
-					window.dirtyStore = [];
+     window.dirtyStore = [];
 
                     pCRUD.request({
                         method : 'open-ils.permacrud.search.aout.atomic',
@@ -96,7 +96,7 @@
 
                                 if (dirtyStore.length > 0) {
                                     var confirmation = confirm(
-										aout_strings.CONFIRM_UNSAVED_CHANGES
+          aout_strings.CONFIRM_UNSAVED_CHANGES
                                     );
 
                                     if (confirmation) {
@@ -111,312 +111,312 @@
                         }
                     }).send();
 ]]>
-				</script>
-				<div
-				  id="type_tree"
-				  label="&conify.org_unit_type.type_tree.label;"
-				  query="{'_top':'true'}"
-				  dojoType="dijit.Tree"
-				  store="ou_type_store"
-				  minSize="200"
-				  jsId="type_tree"
-				>
-
-					<script type="dojo/method" event="onClick" args="item,node">
+    </script>
+    <div
+      id="type_tree"
+      label="&conify.org_unit_type.type_tree.label;"
+      query="{'_top':'true'}"
+      dojoType="dijit.Tree"
+      store="ou_type_store"
+      minSize="200"
+      jsId="type_tree"
+    >
+
+     <script type="dojo/method" event="onClick" args="item,node">
 <![CDATA[
-						right_pane_toggler.show();
-						current_type = item;
-						current_fm_type = new aout().fromStoreItem(item);
-
-						highlighter.editor_pane.green.play();
-						status_update( dojo.string.substitute( aout_strings.STATUS_EDITING, [this.store.getValue( item, 'name' )] ) );
-
-						new_kid_button.disabled = false;
-						save_out_button.disabled = false;
-						delete_out_button.disabled = false;
-
-						var main_settings_fields = [ 'name', 'opac_label'];
-						for ( var i in main_settings_fields ) {
-							var field = main_settings_fields[i];
-							var value = this.store.getValue( current_type, field );
-
-							if (!value) {
-								window["editor_pane_" + field].setValue( '' ); // unset the value
-								window["editor_pane_" + field].setDisplayedValue( '' ); // unset the value
-							} else window["editor_pane_" + field].setValue( value );
-						}
-
-						if ( this.store.getValue( current_type, '_trueRoot' ) == 'true' ) {
-							editor_pane_parent.disabled = true;
-							editor_pane_parent.setValue(null);
-							editor_pane_parent.setDisplayedValue('');
-							editor_pane_parent.validate(false);
-						} else {
-							editor_pane_parent.disabled = false;
-							editor_pane_parent.validate(true);
-							editor_pane_parent.setValue( this.store.getValue( current_type, 'parent' ) );
-						}
-
-						editor_pane_can_have_vols.setChecked( this.store.getValue( current_type, 'can_have_vols' ) == 't' ? true : false );
-						editor_pane_can_have_users.setChecked( this.store.getValue( current_type, 'can_have_users' ) == 't' ? true : false );
+      right_pane_toggler.show();
+      current_type = item;
+      current_fm_type = new aout().fromStoreItem(item);
+
+      highlighter.editor_pane.green.play();
+      status_update( dojo.string.substitute( aout_strings.STATUS_EDITING, [this.store.getValue( item, 'name' )] ) );
+
+      new_kid_button.disabled = false;
+      save_out_button.disabled = false;
+      delete_out_button.disabled = false;
+
+      var main_settings_fields = [ 'name', 'opac_label'];
+      for ( var i in main_settings_fields ) {
+       var field = main_settings_fields[i];
+       var value = this.store.getValue( current_type, field );
+
+       if (!value) {
+        window["editor_pane_" + field].setValue( '' ); // unset the value
+        window["editor_pane_" + field].setDisplayedValue( '' ); // unset the value
+       } else window["editor_pane_" + field].setValue( value );
+      }
+
+      if ( this.store.getValue( current_type, '_trueRoot' ) == 'true' ) {
+       editor_pane_parent.disabled = true;
+       editor_pane_parent.setValue(null);
+       editor_pane_parent.setDisplayedValue('');
+       editor_pane_parent.validate(false);
+      } else {
+       editor_pane_parent.disabled = false;
+       editor_pane_parent.validate(true);
+       editor_pane_parent.setValue( this.store.getValue( current_type, 'parent' ) );
+      }
+
+      editor_pane_can_have_vols.setChecked( this.store.getValue( current_type, 'can_have_vols' ) == 't' ? true : false );
+      editor_pane_can_have_users.setChecked( this.store.getValue( current_type, 'can_have_users' ) == 't' ? true : false );
 ]]>
-					</script>
-
-					<script type="dojo/method" event="getLabel" args="item,pI">
-						var label = this.store.getValue(item,'name');
-						if (this.store.getValue(item,'ischanged') == 1) label = '* ' + label;
-						return label;
-					</script>
-
-				</div>
-			</div>
-
-			<div id="right_pane" dojoType="dijit.layout.ContentPane"  sizeShare="200">
-				<script type="dojo/method">
-					window.right_pane_toggler = new dojo.fx.Toggler({ node: 'right_pane'});
-					window.right_pane_toggler.hide();
-				</script>
-
-					<div id="editor_pane" dojoType="dijit.layout.ContentPane">
-						<script type="dojo/method">
-							highlighter.type_tree = {};
-							highlighter.editor_pane = {};
-							highlighter.type_tree.green = dojox.fx.highlight( { color : '#B4FFB4', node : 'type_tree', duration : 500 } );
-							highlighter.type_tree.red = dojox.fx.highlight( { color : '#FF2018', node : 'type_tree', duration : 500 } );
-							highlighter.editor_pane.green = dojox.fx.highlight( { color : '#B4FFB4', node : 'editor_pane', duration : 500 } );
-							highlighter.editor_pane.red = dojox.fx.highlight( { color : '#FF2018', node : 'editor_pane', duration : 500 } );
-						</script>
-	
-						<table class="tundra" style="margin:10px;">
-							<tr>
-								<th>&conify.org_unit_type.type_name;</th>
-								<td>
-									<span id="editor_pane_name" dojoType="dijit.form.ValidationTextBox" jsId="editor_pane_name" regExp=".+" required="true">
-										<script type="dojo/connect" event="onChange">
-											if (current_type) {
-												ou_type_store.setValue( current_type, "name", this.getValue() );
-											}
-										</script>
-									</span>
-									<span dojoType="openils.widget.TranslatorPopup" targetObject="current_fm_type" field="name"></span>
-								</td>
-							</tr>
-							<tr>
-								<th>&conify.org_unit_type.opac_label;</th>
-								<td>
-									<span id="editor_pane_opac_label" dojoType="dijit.form.ValidationTextBox" jsId="editor_pane_opac_label" regExp=".+" required="true">
-										<script type="dojo/connect" event="onChange">
-											if (current_type) {
-												ou_type_store.setValue( current_type, "opac_label", this.getValue() );
-											}
-										</script>
-									</span>
-									<span dojoType="openils.widget.TranslatorPopup" targetObject="current_fm_type" field="opac_label"></span>
-								</td>
-							</tr>
-							<tr>
-								<th>&conify.org_unit_type.parent_type;</th>
-								<td>
-									<div
-									  id="editor_pane_parent"
-									  dojoType="dijit.form.FilteringSelect"
-									  jsId="editor_pane_parent"
-									  store="ou_type_store"
-									  searchAttr="name"
-									  ignoreCase="true"
-									  required="true"
-									>
-										<script type="dojo/method" event="onChange">
+     </script>
+
+     <script type="dojo/method" event="getLabel" args="item,pI">
+      var label = this.store.getValue(item,'name');
+      if (this.store.getValue(item,'ischanged') == 1) label = '* ' + label;
+      return label;
+     </script>
+
+    </div>
+   </div>
+
+   <div id="right_pane" dojoType="dijit.layout.ContentPane"  sizeShare="200">
+    <script type="dojo/method">
+     window.right_pane_toggler = new dojo.fx.Toggler({ node: 'right_pane'});
+     window.right_pane_toggler.hide();
+    </script>
+
+     <div id="editor_pane" dojoType="dijit.layout.ContentPane">
+      <script type="dojo/method">
+       highlighter.type_tree = {};
+       highlighter.editor_pane = {};
+       highlighter.type_tree.green = dojox.fx.highlight( { color : '#B4FFB4', node : 'type_tree', duration : 500 } );
+       highlighter.type_tree.red = dojox.fx.highlight( { color : '#FF2018', node : 'type_tree', duration : 500 } );
+       highlighter.editor_pane.green = dojox.fx.highlight( { color : '#B4FFB4', node : 'editor_pane', duration : 500 } );
+       highlighter.editor_pane.red = dojox.fx.highlight( { color : '#FF2018', node : 'editor_pane', duration : 500 } );
+      </script>
+ 
+      <table class="tundra" style="margin:10px;">
+       <tr>
+        <th>&conify.org_unit_type.type_name;</th>
+        <td>
+         <span id="editor_pane_name" dojoType="dijit.form.ValidationTextBox" jsId="editor_pane_name" regExp=".+" required="true">
+          <script type="dojo/connect" event="onChange">
+           if (current_type) {
+            ou_type_store.setValue( current_type, "name", this.getValue() );
+           }
+          </script>
+         </span>
+         <span dojoType="openils.widget.TranslatorPopup" targetObject="current_fm_type" field="name"></span>
+        </td>
+       </tr>
+       <tr>
+        <th>&conify.org_unit_type.opac_label;</th>
+        <td>
+         <span id="editor_pane_opac_label" dojoType="dijit.form.ValidationTextBox" jsId="editor_pane_opac_label" regExp=".+" required="true">
+          <script type="dojo/connect" event="onChange">
+           if (current_type) {
+            ou_type_store.setValue( current_type, "opac_label", this.getValue() );
+           }
+          </script>
+         </span>
+         <span dojoType="openils.widget.TranslatorPopup" targetObject="current_fm_type" field="opac_label"></span>
+        </td>
+       </tr>
+       <tr>
+        <th>&conify.org_unit_type.parent_type;</th>
+        <td>
+         <div
+           id="editor_pane_parent"
+           dojoType="dijit.form.FilteringSelect"
+           jsId="editor_pane_parent"
+           store="ou_type_store"
+           searchAttr="name"
+           ignoreCase="true"
+           required="true"
+         >
+          <script type="dojo/method" event="onChange">
 <![CDATA[
-											if (current_type && this.getValue()) {
-												if ( this.store.getValue( current_type, 'parent' ) == this.getValue() ) return;
-
-												this.store.setValue( current_type, "parent", this.getValue() );
-												this.store.fetch({
-													query : { "parent" : this.getValue() },
-													onItem: function (parent_item) {
-														this.setValue( current_type, 'depth', 1 + parseInt(this.getValue( parent_item, 'depth' ) ));
-													},
-													scope : ou_type_store
-												});
-											}
+           if (current_type && this.getValue()) {
+            if ( this.store.getValue( current_type, 'parent' ) == this.getValue() ) return;
+
+            this.store.setValue( current_type, "parent", this.getValue() );
+            this.store.fetch({
+             query : { "parent" : this.getValue() },
+             onItem: function (parent_item) {
+              this.setValue( current_type, 'depth', 1 + parseInt(this.getValue( parent_item, 'depth' ) ));
+             },
+             scope : ou_type_store
+            });
+           }
 ]]>
-										</script>
-									</div>
-								</td>
-							</tr>
-							<tr>
-								<th>&conify.org_unit_type.can_have_volumes;</th>
-								<td>
-									<input
-									  id="editor_pane_can_have_vols"
-									  jsId="editor_pane_can_have_vols"
-									  type="checkbox"
-									  dojoType="dijit.form.CheckBox"
-									  onChange="if (current_type) ou_type_store.setValue( current_type, 'can_have_vols', this.checked ? 't' : 'f' );"
-									/>
-								</td>
-							</tr>
-							<tr>
-								<th>&conify.org_unit_type.can_have_users;</th>
-								<td>
-									<input
-									  id="editor_pane_can_have_users"
-									  jsId="editor_pane_can_have_users"
-									  type="checkbox"
-									  dojoType="dijit.form.CheckBox"
-									  onChange="if (current_type) ou_type_store.setValue( current_type, 'can_have_users', this.checked ? 't' : 'f' );"
-									/>
-								</td>
-							</tr>
-						</table>
-	
-						<div dojoType="dijit.layout.ContentPane" orientation="horizontal" style="margin-bottom: 20px;">
-	
-							<button jsId="save_out_button" dojoType="dijit.form.Button" label="&conify.save_button.label;" onClick="save_type()">
-								<script type="dojo/connect" event="startup">
-									this.disabled = true;
-								</script>
-							</button>
-	
-							<button jsId="delete_out_button" dojoType="dijit.form.Button" label="&conify.delete_button.label;">
-								<script type="dojo/connect" event="startup">
-									this.disabled = true;
-								</script>
-								<script type="dojo/connect" event="onClick">
+          </script>
+         </div>
+        </td>
+       </tr>
+       <tr>
+        <th>&conify.org_unit_type.can_have_volumes;</th>
+        <td>
+         <input
+           id="editor_pane_can_have_vols"
+           jsId="editor_pane_can_have_vols"
+           type="checkbox"
+           dojoType="dijit.form.CheckBox"
+           onChange="if (current_type) ou_type_store.setValue( current_type, 'can_have_vols', this.checked ? 't' : 'f' );"
+         />
+        </td>
+       </tr>
+       <tr>
+        <th>&conify.org_unit_type.can_have_users;</th>
+        <td>
+         <input
+           id="editor_pane_can_have_users"
+           jsId="editor_pane_can_have_users"
+           type="checkbox"
+           dojoType="dijit.form.CheckBox"
+           onChange="if (current_type) ou_type_store.setValue( current_type, 'can_have_users', this.checked ? 't' : 'f' );"
+         />
+        </td>
+       </tr>
+      </table>
+ 
+      <div dojoType="dijit.layout.ContentPane" orientation="horizontal" style="margin-bottom: 20px;">
+ 
+       <button jsId="save_out_button" dojoType="dijit.form.Button" label="&conify.save_button.label;" onClick="save_type()">
+        <script type="dojo/connect" event="startup">
+         this.disabled = true;
+        </script>
+       </button>
+ 
+       <button jsId="delete_out_button" dojoType="dijit.form.Button" label="&conify.delete_button.label;">
+        <script type="dojo/connect" event="startup">
+         this.disabled = true;
+        </script>
+        <script type="dojo/connect" event="onClick">
 <![CDATA[
-	
-									if (ou_type_store.getValue( current_type, '_trueRoot' ) == 'true') {
-										highlighter.editor_pane.red.play();
-										status_update( dojo.string.substitute( aout_strings.ERROR_DELETING_LAST_AOUT, [ou_type_store.getValue( current_type, 'name' )] ) );
-										return false;
-									}
-
-									if ( current_type.children ) {
-										var kids = current_type.children;
-										if (!dojo.isArray(kids)) kids = [kids];
-	
-										var existing_kids = dojo.filter(
-											kids,
-											function(kid){ return kid.isdeleted[0] != 1 }
-										);
-										if ( existing_kids.length > 0) {
-											highlighter.editor_pane.red.play();
-											status_update( dojo.string.substitute( aout_strings.ERROR_ORPHANS, [ou_type_store.getValue( current_type, 'name' ), existing_kids.length] ) );
-											return;
-										}
-									}
-	
-									if ( confirm( dojo.string.substitute ( aout_strings.CONFIRM_DELETE, [current_type.name] ))) {
-										ou_type_store.setValue( current_type, 'isdeleted', 1 );
-	
-										var modified_aout = new aout().fromStoreItem( current_type );
-										modified_aout.isdeleted( 1 );
-	
-										pCRUD.request({
-											method : 'open-ils.permacrud.delete.aout',
-											timeout : 10,
-											params : [ ses, modified_aout ],
-											onerror : function (r) {
-												highlighter.editor_pane.red.play();
-												status_update( dojo.string.substitute ( aout_strings.ERROR_DELETING, [ou_type_store.getValue( current_type, 'name' )] ) );
-											},
-											oncomplete : function (r) {
-												var res = r.recv();
-												if ( res && res.content() ) {
-	
-													var old_name = ou_type_store.getValue( current_type, 'name' );
-
-													ou_type_store.fetch({
-														query : { id : ou_type_store.getValue( current_type, 'id' ) },
-														queryOptions : { deep : true },
-														onItem : function (item, req) { try { if (this.isItem( item )) this.deleteItem( item ); } catch (e) { /* meh */ } },
-														scope : ou_type_store
-													});
-	
-													current_type = null;
-	
-													new_kid_button.disabled = true;
-													save_out_button.disabled = true;
-													delete_out_button.disabled = true;
-			
-													var main_settings_fields = [ 'name', 'opac_label' ];
-													for ( var i in main_settings_fields ) {
-														var field = main_settings_fields[i];
-														window["editor_pane_" + field].setValue( '' ); // unset the value
-														window["editor_pane_" + field].setDisplayedValue( '' ); // unset the value
-													}
-
-													window["editor_pane_can_have_vols"].setChecked( false ); // unset the value
-													window["editor_pane_can_have_users"].setChecked( false ); // unset the value
-			
-													highlighter.editor_pane.green.play();
-													status_update( dojo.string.substitute( aout_strings.STATUS_DELETED, [old_name] ) );
-												} else {
-													highlighter.editor_pane.red.play();
-													status_update( dojo.string.substitute( aout_strings.ERROR_DELETING, [old_name] ) );
-												}
-											}
-										}).send();
-	
-									}
+ 
+         if (ou_type_store.getValue( current_type, '_trueRoot' ) == 'true') {
+          highlighter.editor_pane.red.play();
+          status_update( dojo.string.substitute( aout_strings.ERROR_DELETING_LAST_AOUT, [ou_type_store.getValue( current_type, 'name' )] ) );
+          return false;
+         }
+
+         if ( current_type.children ) {
+          var kids = current_type.children;
+          if (!dojo.isArray(kids)) kids = [kids];
+ 
+          var existing_kids = dojo.filter(
+           kids,
+           function(kid){ return kid.isdeleted[0] != 1 }
+          );
+          if ( existing_kids.length > 0) {
+           highlighter.editor_pane.red.play();
+           status_update( dojo.string.substitute( aout_strings.ERROR_ORPHANS, [ou_type_store.getValue( current_type, 'name' ), existing_kids.length] ) );
+           return;
+          }
+         }
+ 
+         if ( confirm( dojo.string.substitute ( aout_strings.CONFIRM_DELETE, [current_type.name] ))) {
+          ou_type_store.setValue( current_type, 'isdeleted', 1 );
+ 
+          var modified_aout = new aout().fromStoreItem( current_type );
+          modified_aout.isdeleted( 1 );
+ 
+          pCRUD.request({
+           method : 'open-ils.permacrud.delete.aout',
+           timeout : 10,
+           params : [ ses, modified_aout ],
+           onerror : function (r) {
+            highlighter.editor_pane.red.play();
+            status_update( dojo.string.substitute ( aout_strings.ERROR_DELETING, [ou_type_store.getValue( current_type, 'name' )] ) );
+           },
+           oncomplete : function (r) {
+            var res = r.recv();
+            if ( res && res.content() ) {
+ 
+             var old_name = ou_type_store.getValue( current_type, 'name' );
+
+             ou_type_store.fetch({
+              query : { id : ou_type_store.getValue( current_type, 'id' ) },
+              queryOptions : { deep : true },
+              onItem : function (item, req) { try { if (this.isItem( item )) this.deleteItem( item ); } catch (e) { /* meh */ } },
+              scope : ou_type_store
+             });
+ 
+             current_type = null;
+ 
+             new_kid_button.disabled = true;
+             save_out_button.disabled = true;
+             delete_out_button.disabled = true;
+   
+             var main_settings_fields = [ 'name', 'opac_label' ];
+             for ( var i in main_settings_fields ) {
+              var field = main_settings_fields[i];
+              window["editor_pane_" + field].setValue( '' ); // unset the value
+              window["editor_pane_" + field].setDisplayedValue( '' ); // unset the value
+             }
+
+             window["editor_pane_can_have_vols"].setChecked( false ); // unset the value
+             window["editor_pane_can_have_users"].setChecked( false ); // unset the value
+   
+             highlighter.editor_pane.green.play();
+             status_update( dojo.string.substitute( aout_strings.STATUS_DELETED, [old_name] ) );
+            } else {
+             highlighter.editor_pane.red.play();
+             status_update( dojo.string.substitute( aout_strings.ERROR_DELETING, [old_name] ) );
+            }
+           }
+          }).send();
+ 
+         }
 ]]>
-								</script>
-							</button>
-	
-						</div>
-	
-						<button jsId="new_kid_button" dojoType="dijit.form.Button" label="&conify.new_kid_button.label;">
-							<script type="dojo/connect" event="startup">
-								this.disabled = true;
-							</script>
-							<script type="dojo/connect" event="onClick">
+        </script>
+       </button>
+ 
+      </div>
+ 
+      <button jsId="new_kid_button" dojoType="dijit.form.Button" label="&conify.new_kid_button.label;">
+       <script type="dojo/connect" event="startup">
+        this.disabled = true;
+       </script>
+       <script type="dojo/connect" event="onClick">
 <![CDATA[
-								var new_fm_obj = new aout().fromHash({
-									isnew			: 1,
-									name			: aout_strings.LABEL_NEW_TYPE,
-									can_have_vols	: 'f',
-									can_have_users	: 'f',
-									depth			: 1 + parseInt(ou_type_store.getValue( current_type, 'depth' )),
-									opac_label		: ou_type_store.getValue( current_type, 'opac_label' ) + ' child' + virgin_out_id--,
-									parent			: ou_type_store.getValue( current_type, 'id' )
-								});
-								var err = false;
-								pCRUD.request({
-									method : 'open-ils.permacrud.create.aout',
-									timeout : 10,
-									params : [ ses, new_fm_obj ],
-									onerror : function (r) {
-										highlighter.editor_pane.red.play();
-										status_update( aout_strings.ERROR_CALLING_METHOD_AOUT );
-										err = true;
-									},
-									oncomplete : function (r) {
-										var res = r.recv();
-										if ( res && res.content() ) {
-											ou_type_store.newItem(
-												res.content().toHash(),
-												{ parent : current_type, attribute : 'children' }
-											);
-										} else {
-											highlighter.editor_pane.red.play();
-											status_update( aout_strings.ERROR_CREATING_CHILD_AOUT );
-											err = true;
-										}
-									},
-								}).send();
-	
-								if (!err) {
-									highlighter.editor_pane.green.play();
-									highlighter.type_tree.green.play();
-									status_update( dojo.string.substitute( aout_strings.SUCCESS_CREATING_CHILD_AOUT, [ou_type_store.getValue( current_type, 'name' )] ) );
-								}
+        var new_fm_obj = new aout().fromHash({
+         isnew   : 1,
+         name   : aout_strings.LABEL_NEW_TYPE,
+         can_have_vols : 'f',
+         can_have_users : 'f',
+         depth   : 1 + parseInt(ou_type_store.getValue( current_type, 'depth' )),
+         opac_label  : ou_type_store.getValue( current_type, 'opac_label' ) + ' child' + virgin_out_id--,
+         parent   : ou_type_store.getValue( current_type, 'id' )
+        });
+        var err = false;
+        pCRUD.request({
+         method : 'open-ils.permacrud.create.aout',
+         timeout : 10,
+         params : [ ses, new_fm_obj ],
+         onerror : function (r) {
+          highlighter.editor_pane.red.play();
+          status_update( aout_strings.ERROR_CALLING_METHOD_AOUT );
+          err = true;
+         },
+         oncomplete : function (r) {
+          var res = r.recv();
+          if ( res && res.content() ) {
+           ou_type_store.newItem(
+            res.content().toHash(),
+            { parent : current_type, attribute : 'children' }
+           );
+          } else {
+           highlighter.editor_pane.red.play();
+           status_update( aout_strings.ERROR_CREATING_CHILD_AOUT );
+           err = true;
+          }
+         },
+        }).send();
+ 
+        if (!err) {
+         highlighter.editor_pane.green.play();
+         highlighter.type_tree.green.play();
+         status_update( dojo.string.substitute( aout_strings.SUCCESS_CREATING_CHILD_AOUT, [ou_type_store.getValue( current_type, 'name' )] ) );
+        }
 ]]>
-							</script>
-						</button>
-	
-					</div>
-				</div>
-			</div>
-	</body>
+       </script>
+      </button>
+ 
+     </div>
+    </div>
+   </div>
+ </body>
 </html>
diff --git a/Open-ILS/web/conify/global/actor/org_unit_type.js b/Open-ILS/web/conify/global/actor/org_unit_type.js
index cf4a97ffb5..be30ad40d6 100644
--- a/Open-ILS/web/conify/global/actor/org_unit_type.js
+++ b/Open-ILS/web/conify/global/actor/org_unit_type.js
@@ -51,37 +51,37 @@ var highlighter = {};
 var aout_strings = dojo.i18n.getLocalization('openils.conify', 'conify');
 
 function status_update (markup) {
-	if (parent !== window && parent.status_update) parent.status_update( markup );
+ if (parent !== window && parent.status_update) parent.status_update( markup );
 }
 
 function save_type () {
 
-	var modified_aout = new aout().fromStoreItem( current_type );
-	modified_aout.ischanged( 1 );
+ var modified_aout = new aout().fromStoreItem( current_type );
+ modified_aout.ischanged( 1 );
 
-	new_kid_button.disabled = false;
-	save_out_button.disabled = false;
-	delete_out_button.disabled = false;
+ new_kid_button.disabled = false;
+ save_out_button.disabled = false;
+ delete_out_button.disabled = false;
 
-	pCRUD.request({
-		method : 'open-ils.permacrud.update.aout',
-		timeout : 10,
-		params : [ ses, modified_aout ],
-		onerror : function (r) {
-			highlighter.editor_pane.red.play();
-			status_update( dojo.string.substitute(aout_strings.ERROR_SAVING_DATA, [ou_type_store.getValue( current_type, 'name' )] ) );
-		},
-		oncomplete : function (r) {
-			var res = r.recv();
-			if ( res && res.content() ) {
-				ou_type_store.setValue( current_type, 'ischanged', 0 );
-				highlighter.editor_pane.green.play();
-				status_update( dojo.string.substitute(aout_strings.SUCCESS_SAVING_DATA, [ou_type_store.getValue( current_type, 'name' )] ) );
-			} else {
-				highlighter.editor_pane.red.play();
-				status_update( dojo.string.substitute(aout_strings.ERROR_SAVING_DATA, [ou_type_store.getValue( current_type, 'name' )] ) );
-			}
-		},
-	}).send();
+ pCRUD.request({
+  method : 'open-ils.permacrud.update.aout',
+  timeout : 10,
+  params : [ ses, modified_aout ],
+  onerror : function (r) {
+   highlighter.editor_pane.red.play();
+   status_update( dojo.string.substitute(aout_strings.ERROR_SAVING_DATA, [ou_type_store.getValue( current_type, 'name' )] ) );
+  },
+  oncomplete : function (r) {
+   var res = r.recv();
+   if ( res && res.content() ) {
+    ou_type_store.setValue( current_type, 'ischanged', 0 );
+    highlighter.editor_pane.green.play();
+    status_update( dojo.string.substitute(aout_strings.SUCCESS_SAVING_DATA, [ou_type_store.getValue( current_type, 'name' )] ) );
+   } else {
+    highlighter.editor_pane.red.play();
+    status_update( dojo.string.substitute(aout_strings.ERROR_SAVING_DATA, [ou_type_store.getValue( current_type, 'name' )] ) );
+   }
+  },
+ }).send();
 }
 
diff --git a/Open-ILS/web/conify/global/admin.html b/Open-ILS/web/conify/global/admin.html
index e5a5bd109b..fd6b31dc21 100644
--- a/Open-ILS/web/conify/global/admin.html
+++ b/Open-ILS/web/conify/global/admin.html
@@ -14,14 +14,14 @@
 -->
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/conify.dtd"-->
+ "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+ <!--#include virtual="/opac/locale/${locale}/conify.dtd"-->
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<title>&conify.admin.title;</title>
+ <head>
+  <title>&conify.admin.title;</title>
 
         <style type="text/css">
             @import url('/js/dojo/dojo/resources/dojo.css');
@@ -57,30 +57,30 @@
 
         </script>
 
-	</head>
-	<body class="tundra" id='pagebody'>
-		<div dojoType="dijit.layout.LayoutContainer" style="height: 100%; width: 100%; margin: 0; padding: 0; border: 0;">
-			<div id="top_pane" jsId="top_pane" dojoType="dijit.layout.ContentPane" layoutAlign="top" orientation="horizontal" style="margin: 4px; width: 100%; text-align: middle;" title="&conify.admin.top_pane.controls;">
-				<img src="/opac/images/small_logo.jpg"/>
-				<span style="font-size: large; padding-left: 20px;"> &conify.admin.configure; </span>
-			</div>
-			<div id="left_pane" jsId="left_pane" dojoType="dijit.layout.ContentPane" layoutAlign="left" orientation="vertical" style="height: 90%; margin: 4px;" label="&conify.admin.left_pane.controls;">
-				<ul style="margin-left: -10px;">
-					<li><a href="javascript:void(0);" onclick="dojo.byId('action_iframe').src = 'actor/org_unit_type.html'; return false;">&conify.admin.org_unit_type.link;</a></li>
-					<li><a href="javascript:void(0);" onclick="dojo.byId('action_iframe').src = 'actor/org_unit.html'; return false;">&conify.admin.org_unit.link;</a></li>
-					<li><a href="javascript:void(0);" onclick="dojo.byId('action_iframe').src = 'permission/grp_tree.html'; return false;">&conify.admin.grp_tree.link;</a></li>
-					<li><a href="javascript:void(0);" onclick="dojo.byId('action_iframe').src = 'permission/perm_list.html'; return false;">&conify.admin.perm_list.link;</a></li>
-					<li><a href="javascript:void(0);" onclick="dojo.byId('action_iframe').src = 'config/copy_status.html'; return false;">&conify.admin.copy_status.link;</a></li>
-					<li><a href="javascript:void(0);" onclick="dojo.byId('action_iframe').src = 'config/marc_code_maps.html'; return false;">&conify.admin.marc_code_maps.link;</a></li>
-				</ul>
-			</div>
-			<div id="content_pane" jsId="content_pane" dojoType="dijit.layout.ContentPane" layoutAlign="client" style="margin: 2px; border-top: 2px solid grey; border-bottom: 2px solid grey; border-left: 2px solid grey;">
-				<iframe id="action_iframe" marginwidth="0" marginheight="0" style="border:0; height: 100%; width: 100%;"></iframe>
-			</div>
-			<div id="bottom_pane" jsId="bottom_pane" dojoType="dijit.layout.ContentPane" layoutAlign="bottom" orientation="horizontal" style="margin: 4px; height: 5%; width: 100%" title="">
-				<span id="status_text"/>
-			</div>
-		</div>
-	</body>
+ </head>
+ <body class="tundra" id='pagebody'>
+  <div dojoType="dijit.layout.LayoutContainer" style="height: 100%; width: 100%; margin: 0; padding: 0; border: 0;">
+   <div id="top_pane" jsId="top_pane" dojoType="dijit.layout.ContentPane" layoutAlign="top" orientation="horizontal" style="margin: 4px; width: 100%; text-align: middle;" title="&conify.admin.top_pane.controls;">
+    <img src="/opac/images/small_logo.jpg"/>
+    <span style="font-size: large; padding-left: 20px;"> &conify.admin.configure; </span>
+   </div>
+   <div id="left_pane" jsId="left_pane" dojoType="dijit.layout.ContentPane" layoutAlign="left" orientation="vertical" style="height: 90%; margin: 4px;" label="&conify.admin.left_pane.controls;">
+    <ul style="margin-left: -10px;">
+     <li><a href="javascript:void(0);" onclick="dojo.byId('action_iframe').src = 'actor/org_unit_type.html'; return false;">&conify.admin.org_unit_type.link;</a></li>
+     <li><a href="javascript:void(0);" onclick="dojo.byId('action_iframe').src = 'actor/org_unit.html'; return false;">&conify.admin.org_unit.link;</a></li>
+     <li><a href="javascript:void(0);" onclick="dojo.byId('action_iframe').src = 'permission/grp_tree.html'; return false;">&conify.admin.grp_tree.link;</a></li>
+     <li><a href="javascript:void(0);" onclick="dojo.byId('action_iframe').src = 'permission/perm_list.html'; return false;">&conify.admin.perm_list.link;</a></li>
+     <li><a href="javascript:void(0);" onclick="dojo.byId('action_iframe').src = 'config/copy_status.html'; return false;">&conify.admin.copy_status.link;</a></li>
+     <li><a href="javascript:void(0);" onclick="dojo.byId('action_iframe').src = 'config/marc_code_maps.html'; return false;">&conify.admin.marc_code_maps.link;</a></li>
+    </ul>
+   </div>
+   <div id="content_pane" jsId="content_pane" dojoType="dijit.layout.ContentPane" layoutAlign="client" style="margin: 2px; border-top: 2px solid grey; border-bottom: 2px solid grey; border-left: 2px solid grey;">
+    <iframe id="action_iframe" marginwidth="0" marginheight="0" style="border:0; height: 100%; width: 100%;"></iframe>
+   </div>
+   <div id="bottom_pane" jsId="bottom_pane" dojoType="dijit.layout.ContentPane" layoutAlign="bottom" orientation="horizontal" style="margin: 4px; height: 5%; width: 100%" title="">
+    <span id="status_text"/>
+   </div>
+  </div>
+ </body>
 </html>
 
diff --git a/Open-ILS/web/conify/global/admin.js b/Open-ILS/web/conify/global/admin.js
index 58a7e4a910..e05294ed76 100644
--- a/Open-ILS/web/conify/global/admin.js
+++ b/Open-ILS/web/conify/global/admin.js
@@ -1,11 +1,11 @@
 var djConfig = { parseOnLoad : true };
 
 if (location.href.match(/^.*conify\/(.+)\/global.*$/, "$1")) {
-	var _url_locale = location.href.replace(/^.*conify\/(.+)\/global.*$/, "$1").replace(/_/,'-','g');
+ var _url_locale = location.href.replace(/^.*conify\/(.+)\/global.*$/, "$1").replace(/_/,'-','g');
 
-	if (_url_locale) djConfig.locale = _url_locale.toLowerCase();
+ if (_url_locale) djConfig.locale = _url_locale.toLowerCase();
 
 } else {
-	var _url_locale = '<!--#echo var="locale"-->';
-	if (_url_locale != '(none)') djConfig.locale = _url_locale.toLowerCase();
+ var _url_locale = '<!--#echo var="locale"-->';
+ if (_url_locale != '(none)') djConfig.locale = _url_locale.toLowerCase();
 }
diff --git a/Open-ILS/web/conify/global/config/copy_status.html b/Open-ILS/web/conify/global/config/copy_status.html
index 1df6d02d64..880c45a029 100644
--- a/Open-ILS/web/conify/global/config/copy_status.html
+++ b/Open-ILS/web/conify/global/config/copy_status.html
@@ -13,68 +13,68 @@
 # GNU General Public License for more details.
 -->
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/conify.dtd"-->
+ "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+ <!--#include virtual="/opac/locale/${locale}/conify.dtd"-->
 ]>
 <html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<title>&conify.copy_status.title;</title>
+ <head>
+  <title>&conify.copy_status.title;</title>
 
-		<style type="text/css">
-			@import url('/js/dojo/dojox/grid/_grid/tundraGrid.css');
-			@import url('/js/dojo/dojo/resources/dojo.css');
-			@import url('/js/dojo/dijit/themes/tundra/tundra.css');
-			@import url('/js/dojo/dojox/widget/Toaster/Toaster.css');
-		</style>
+  <style type="text/css">
+   @import url('/js/dojo/dojox/grid/_grid/tundraGrid.css');
+   @import url('/js/dojo/dojo/resources/dojo.css');
+   @import url('/js/dojo/dijit/themes/tundra/tundra.css');
+   @import url('/js/dojo/dojox/widget/Toaster/Toaster.css');
+  </style>
 
-		<style>
-			html, body {
-				height: 100%;
-				width: 100%;
-				margin: 0px 0px 0px 0px;
-				padding: 0px 0px 0px 0px;
-				overflow: hidden;
-			}
+  <style>
+   html, body {
+    height: 100%;
+    width: 100%;
+    margin: 0px 0px 0px 0px;
+    padding: 0px 0px 0px 0px;
+    overflow: hidden;
+   }
 
-			#status_grid {
-				border: 0px;
-				width: 100%;
-				height: 100%;
-			}
+   #status_grid {
+    border: 0px;
+    width: 100%;
+    height: 100%;
+   }
 
-			#grid_container {
-				width: 100%;
-				height: 100%;
-			}
-		</style>
+   #grid_container {
+    width: 100%;
+    height: 100%;
+   }
+  </style>
 
-		<!-- The OpenSRF API writ JS -->
-		<script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
-		<script language='javascript' src='/opac/common/js/Cookies.js' type='text/javascript'></script>
-		<script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
-		<script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
+  <!-- The OpenSRF API writ JS -->
+  <script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
+  <script language='javascript' src='/opac/common/js/Cookies.js' type='text/javascript'></script>
+  <script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
+  <script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
 
-		<!-- Dojo goodness -->
-		<script type="text/javascript" src="../admin.js"></script>
-		<script type="text/javascript" src="/js/dojo/dojo/dojo.js"></script>
-	        <script type="text/javascript" src="/js/dojo/dojo/openils_dojo.js"></script>
-		<script type="text/javascript" src="/js/dojo/dijit/dijit.js"></script>
+  <!-- Dojo goodness -->
+  <script type="text/javascript" src="../admin.js"></script>
+  <script type="text/javascript" src="/js/dojo/dojo/dojo.js"></script>
+         <script type="text/javascript" src="/js/dojo/dojo/openils_dojo.js"></script>
+  <script type="text/javascript" src="/js/dojo/dijit/dijit.js"></script>
 
-		<script type="text/javascript" src="copy_status.js"></script>
+  <script type="text/javascript" src="copy_status.js"></script>
 
-	</head>
+ </head>
 
-	<body class="tundra" id='pagebody'>
+ <body class="tundra" id='pagebody'>
 
-		<div dojoType="dijit.layout.LayoutContainer" id="grid_container" jsId="grid_container" orientation="vertical">
-			<script type="dojo/method">
+  <div dojoType="dijit.layout.LayoutContainer" id="grid_container" jsId="grid_container" orientation="vertical">
+   <script type="dojo/method">
 <![CDATA[
-				window.highlighter= {};
-				window.highlighter.green = dojox.fx.highlight( { color : '#B4FFB4', node : 'grid_container', duration : 500 } );
-				window.highlighter.red = dojox.fx.highlight( { color : '#FF2018', node : 'grid_container', duration : 500 } );
+    window.highlighter= {};
+    window.highlighter.green = dojox.fx.highlight( { color : '#B4FFB4', node : 'grid_container', duration : 500 } );
+    window.highlighter.red = dojox.fx.highlight( { color : '#FF2018', node : 'grid_container', duration : 500 } );
 
-				window.dirtyStore = [];
+    window.dirtyStore = [];
 
                 pCRUD.request({
                     method : 'open-ils.permacrud.search.ccs.atomic',
@@ -87,7 +87,7 @@
                         window._status_data = ccs.toStoreData( window._status_list, 'name' );
                         window.status_store = new dojo.data.ItemFileWriteStore({ data : window._status_data });
 
-	                    window.status_store.onSet = function (item, attr, o, n) {
+                     window.status_store.onSet = function (item, attr, o, n) {
                             if (attr == 'ischanged') return;
                             if (n == o) return;
                             this.setValue( item, 'ischanged', 1);
@@ -110,7 +110,7 @@
 
                             if (dirtyStore.length > 0) {
                                 var confirmation = confirm(
-									ccs_strings.CONFIRM_EXIT_CCS
+         ccs_strings.CONFIRM_EXIT_CCS
                                 );
 
                                 if (confirmation) {
@@ -125,192 +125,192 @@
                     }
                 }).send();
 ]]>
-			</script>
+   </script>
 
-			<div dojoType="dijit.layout.LayoutContainer" orientation="horizontal" style="margin-top: 5px;" layoutAlign="top">
-				<span>&conify.copy_status.new_status.label;</span>
-				<div dojoType="dijit.form.TextBox" id="new_status_code" jsId="new_status_name" label="&conify.copy_status.new_status.name;"></div>
-				<button dojoType="dijit.form.Button" id="save_new_status_code" jsId="save_new_status_name" label="&conify.copy_status.new_status.save;"> 
-					<script type="dojo/connect" event="onClick">
+   <div dojoType="dijit.layout.LayoutContainer" orientation="horizontal" style="margin-top: 5px;" layoutAlign="top">
+    <span>&conify.copy_status.new_status.label;</span>
+    <div dojoType="dijit.form.TextBox" id="new_status_code" jsId="new_status_name" label="&conify.copy_status.new_status.name;"></div>
+    <button dojoType="dijit.form.Button" id="save_new_status_code" jsId="save_new_status_name" label="&conify.copy_status.new_status.save;"> 
+     <script type="dojo/connect" event="onClick">
 <![CDATA[
-						var new_name = new_status_name.getValue();
-						if (!new_name) return;
+      var new_name = new_status_name.getValue();
+      if (!new_name) return;
 
-    	                var new_fm_obj = new ccs().fromHash({
-        	                isnew           : 1,
-            	            name            : new_name
-	                    });
+                     var new_fm_obj = new ccs().fromHash({
+                         isnew           : 1,
+                         name            : new_name
+                     });
     
-    	                var err = false;
-        	            pCRUD.request({
-            	            method : 'open-ils.permacrud.create.ccs',
-                	        timeout : 10,
-                    	    params : [ ses, new_fm_obj ],
-	                        onerror : function (r) {
-    	                        highlighter.red.play();
-        	                    status_update( ccs_strings.ERROR_CALLING_METHOD_CCS );
-            	                err = true;
-                	        },
-	                        oncomplete : function (r) {
-    	                        var res = r.recv();
-        	                    if ( res && res.content() ) {
-            	                    var new_item_hash = res.content().toHash();
-            	                    status_store.newItem( new_item_hash );
-									status_update( dojo.string.substitute(ccs_strings.SUCCESS_CREATING_STATUS, [new_item_hash.name]) );
-									status_grid.model.sort(-2);
-									highlighter.green.play();
-                            	} else {
-	                                highlighter.red.play();
-    	                            status_update( ccs_strings.ERROR_CREATING_STATUS );
-        	                        err = true;
-            	                }
-                	        }
-                    	}).send();
+                     var err = false;
+                     pCRUD.request({
+                         method : 'open-ils.permacrud.create.ccs',
+                         timeout : 10,
+                         params : [ ses, new_fm_obj ],
+                         onerror : function (r) {
+                             highlighter.red.play();
+                             status_update( ccs_strings.ERROR_CALLING_METHOD_CCS );
+                             err = true;
+                         },
+                         oncomplete : function (r) {
+                             var res = r.recv();
+                             if ( res && res.content() ) {
+                                 var new_item_hash = res.content().toHash();
+                                 status_store.newItem( new_item_hash );
+         status_update( dojo.string.substitute(ccs_strings.SUCCESS_CREATING_STATUS, [new_item_hash.name]) );
+         status_grid.model.sort(-2);
+         highlighter.green.play();
+                             } else {
+                                 highlighter.red.play();
+                                 status_update( ccs_strings.ERROR_CREATING_STATUS );
+                                 err = true;
+                             }
+                         }
+                     }).send();
 ]]> 
-	                </script>
-				</button>
-			</div>
+                 </script>
+    </button>
+   </div>
 
-			<div dojoType="dijit.layout.ContentPane" style="width:100%; height:100%;" layoutAlign="client">
-				<div dojoType="dojox.grid.data.DojoData" id="status_data_model" jsId="status_data_model" store="status_store" query="{ 'id' : '*' }"></div>
-				<div id="status_grid" dojoType="dojox.Grid" jsId="status_grid">
-					<script type="dojo/connect" event="startup">
+   <div dojoType="dijit.layout.ContentPane" style="width:100%; height:100%;" layoutAlign="client">
+    <div dojoType="dojox.grid.data.DojoData" id="status_data_model" jsId="status_data_model" store="status_store" query="{ 'id' : '*' }"></div>
+    <div id="status_grid" dojoType="dojox.Grid" jsId="status_grid">
+     <script type="dojo/connect" event="startup">
 <![CDATA[
-						var g = this;
-						var status_grid_layout = [
-							{	cells : [
-									[
-										{ name : ccs_strings.ID,
-										  field : "id",
-										},
-										{ name : ccs_strings.NAME,
-										  field : "name",
-										  width : "auto",
-										  editor : dojox.grid.editors.Dijit
-										},
-										{ name : ccs_strings.TRANSLATION,
-										  width : "10em",
-										  height : "2em",
-										  get : function (row) {
-											if (!window.status_rows) window.status_rows = [];
-											var r = window.status_data_model.getRow(row);
-											if (r) {
-												window.status_rows[row] = new ccs().fromHash(window.status_data_model.getRow(row));
-												setTimeout(
-													'dojo.query(".status_grid_trans_cell_' + row + '").'+
-														'instantiate(openils.widget.TranslatorPopup,{field:"name",'+
-														'targetObject:"window.status_rows['+row+']"});'+
-														'status_grid.rowHeightChanged('+row+')',
-													0
-												);
-												return '<span class="status_grid_trans_cell_'+row+'"></span>';
-											}
-											return '';
-										  }
-										},
-										{ name : ccs_strings.HOLDABLE,
-										  field : "holdable",
-										  editor : dojox.grid.editors.bool,
-										  get : function (row) {
-											var r = window.status_data_model.getRow(row);
-											if (r) {
-												var h = r.holdable;
-												if (h == 't' || h === true) return true;
-												return false;
-											}
-										  }
-										},
-										{ name : ccs_strings.OPAC_VISIBLE,
-										  field : "opac_visible",
-										  editor : dojox.grid.editors.bool,
-										  get : function (row) {
-											var r = window.status_data_model.getRow(row);
-											if (r) {
-												var h = r.opac_visible;
-												if (h == 't' || h === true) return true;
-												return false;
-											}
-										  }
-										}
-									]
-								]
-							}
-						];
+      var g = this;
+      var status_grid_layout = [
+       { cells : [
+         [
+          { name : ccs_strings.ID,
+            field : "id",
+          },
+          { name : ccs_strings.NAME,
+            field : "name",
+            width : "auto",
+            editor : dojox.grid.editors.Dijit
+          },
+          { name : ccs_strings.TRANSLATION,
+            width : "10em",
+            height : "2em",
+            get : function (row) {
+           if (!window.status_rows) window.status_rows = [];
+           var r = window.status_data_model.getRow(row);
+           if (r) {
+            window.status_rows[row] = new ccs().fromHash(window.status_data_model.getRow(row));
+            setTimeout(
+             'dojo.query(".status_grid_trans_cell_' + row + '").'+
+              'instantiate(openils.widget.TranslatorPopup,{field:"name",'+
+              'targetObject:"window.status_rows['+row+']"});'+
+              'status_grid.rowHeightChanged('+row+')',
+             0
+            );
+            return '<span class="status_grid_trans_cell_'+row+'"></span>';
+           }
+           return '';
+            }
+          },
+          { name : ccs_strings.HOLDABLE,
+            field : "holdable",
+            editor : dojox.grid.editors.bool,
+            get : function (row) {
+           var r = window.status_data_model.getRow(row);
+           if (r) {
+            var h = r.holdable;
+            if (h == 't' || h === true) return true;
+            return false;
+           }
+            }
+          },
+          { name : ccs_strings.OPAC_VISIBLE,
+            field : "opac_visible",
+            editor : dojox.grid.editors.bool,
+            get : function (row) {
+           var r = window.status_data_model.getRow(row);
+           if (r) {
+            var h = r.opac_visible;
+            if (h == 't' || h === true) return true;
+            return false;
+           }
+            }
+          }
+         ]
+        ]
+       }
+      ];
 
-						this.setStructure(status_grid_layout);
-						this.setModel(window.status_data_model);
+      this.setStructure(status_grid_layout);
+      this.setModel(window.status_data_model);
 ]]>
-					</script>
-				</div>
-			</div>
+     </script>
+    </div>
+   </div>
 
-			<div dojoType="dijit.layout.ContentPane" orientation="horizontal" style="margin-bottom: 5px;" layoutAlign="bottom">
-		
-				<button jsId="save_ccs_button" dojoType="dijit.form.Button" label="&conify.copy_status.save_changes;" onClick="save_them_all()"></button>
-		
-				<button jsId="delete_ccs_button" dojoType="dijit.form.Button" label="&conify.copy_status.delete_selected;">
-					<script type="dojo/connect" event="onClick">
+   <div dojoType="dijit.layout.ContentPane" orientation="horizontal" style="margin-bottom: 5px;" layoutAlign="bottom">
+  
+    <button jsId="save_ccs_button" dojoType="dijit.form.Button" label="&conify.copy_status.save_changes;" onClick="save_them_all()"></button>
+  
+    <button jsId="delete_ccs_button" dojoType="dijit.form.Button" label="&conify.copy_status.delete_selected;">
+     <script type="dojo/connect" event="onClick">
 <![CDATA[
-						var selected_rows = status_grid.selection.getSelected();
-		
-						var selected_items = [];
-						for (var i in selected_rows) {
-							selected_items.push(
-								status_grid.model.getRow( selected_rows[i] ).__dojo_data_item
-							);
-						}
+      var selected_rows = status_grid.selection.getSelected();
+  
+      var selected_items = [];
+      for (var i in selected_rows) {
+       selected_items.push(
+        status_grid.model.getRow( selected_rows[i] ).__dojo_data_item
+       );
+      }
 
-						status_grid.selection.clear();
+      status_grid.selection.clear();
 
-						for (var i in selected_items) {
-							current_status = selected_items[i];
+      for (var i in selected_items) {
+       current_status = selected_items[i];
 
-							if ( confirm(dojo.string.substitute(ccs_strings.CONFIRM_DELETE, [status_store.getValue( current_status, 'name' )]))) {
+       if ( confirm(dojo.string.substitute(ccs_strings.CONFIRM_DELETE, [status_store.getValue( current_status, 'name' )]))) {
 
-								status_store.setValue( current_status, 'isdeleted', 1 );
-			
-								var modified_ccs = new ccs().fromStoreItem( current_status );
-								modified_ccs.isdeleted( 1 );
-			
-								pCRUD.request({
-									method : 'open-ils.permacrud.delete.ccs',
-									timeout : 10,
-									params : [ ses, modified_ccs ],
-									onerror : function (r) {
-										highlighter.red.play();
-										status_update( dojo.string.substitute( ccs_strings.ERROR_DELETING, [status_store.getValue( current_status, 'name' )] ) );
-									},
-									oncomplete : function (r) {
-										var res = r.recv();
-										if ( res && res.content() ) {
-			
-											var old_name = status_store.getValue( current_status, 'name' );
-		
-											status_store.fetch({
-												query : { id : status_store.getValue( current_status, 'id' ) },
-												onItem : function (item, req) { try { if (this.isItem( item )) this.deleteItem( item ); } catch (e) { /* meh */ } },
-												scope : status_store
-											});
-			
-											current_status = null;
-			
-											highlighter.green.play();
-											status_update( dojo.string.substitute(ccs_strings.STATUS_DELETED, [old_name]) );
-										} else {
-											highlighter.red.play();
-											status_update( dojo.string.substitute(ccs_strings.ERROR_DELETING, [old_name]) );
-										}
-									}
-								}).send();
-		
-							}
-						}
+        status_store.setValue( current_status, 'isdeleted', 1 );
+   
+        var modified_ccs = new ccs().fromStoreItem( current_status );
+        modified_ccs.isdeleted( 1 );
+   
+        pCRUD.request({
+         method : 'open-ils.permacrud.delete.ccs',
+         timeout : 10,
+         params : [ ses, modified_ccs ],
+         onerror : function (r) {
+          highlighter.red.play();
+          status_update( dojo.string.substitute( ccs_strings.ERROR_DELETING, [status_store.getValue( current_status, 'name' )] ) );
+         },
+         oncomplete : function (r) {
+          var res = r.recv();
+          if ( res && res.content() ) {
+   
+           var old_name = status_store.getValue( current_status, 'name' );
+  
+           status_store.fetch({
+            query : { id : status_store.getValue( current_status, 'id' ) },
+            onItem : function (item, req) { try { if (this.isItem( item )) this.deleteItem( item ); } catch (e) { /* meh */ } },
+            scope : status_store
+           });
+   
+           current_status = null;
+   
+           highlighter.green.play();
+           status_update( dojo.string.substitute(ccs_strings.STATUS_DELETED, [old_name]) );
+          } else {
+           highlighter.red.play();
+           status_update( dojo.string.substitute(ccs_strings.ERROR_DELETING, [old_name]) );
+          }
+         }
+        }).send();
+  
+       }
+      }
 ]]>
-					</script>
-				</button>
-	
-			</div>
-		</div>
-	
-	</body>
+     </script>
+    </button>
+ 
+   </div>
+  </div>
+ 
+ </body>
 </html>
diff --git a/Open-ILS/web/conify/global/config/copy_status.js b/Open-ILS/web/conify/global/config/copy_status.js
index 4b50a96ca9..3d7ec2e79b 100644
--- a/Open-ILS/web/conify/global/config/copy_status.js
+++ b/Open-ILS/web/conify/global/config/copy_status.js
@@ -46,61 +46,61 @@ var ccs_strings = dojo.i18n.getLocalization('openils.conify', 'conify');
 var highlighter = {};
 
 function status_update (markup) {
-	if (parent !== window && parent.status_update) parent.status_update( markup );
+ if (parent !== window && parent.status_update) parent.status_update( markup );
 }
 
 function save_status () {
 
-	var modified_ccs = new ccs().fromStoreItem( current_status );
-	modified_ccs.ischanged( 1 );
-
-	pCRUD.request({
-		method : 'open-ils.permacrud.update.ccs',
-		timeout : 10,
-		params : [ ses, modified_ccs ],
-		onerror : function (r) {
-			highlighter.red.play();
-			status_update( dojo.string.substitute(ccs_strings.ERROR_SAVING_STATUS, [status_store.getValue( current_status, 'name' )]) );
-		},
-		oncomplete : function (r) {
-			var res = r.recv();
-			if ( res && res.content() ) {
-				status_store.setValue( current_status, 'ischanged', 0 );
-				highlighter.green.play();
-				status_update( dojo.string.substitute(ccs_strings.SUCCESS_SAVE, [status_store.getValue( current_status, 'name' )]) );
-			} else {
-				highlighter.red.play();
-				status_update( dojo.string.substitute(ccs_strings.ERROR_SAVING_STATUS, [status_store.getValue( current_status, 'name' )]) );
-			}
-		},
-	}).send();
+ var modified_ccs = new ccs().fromStoreItem( current_status );
+ modified_ccs.ischanged( 1 );
+
+ pCRUD.request({
+  method : 'open-ils.permacrud.update.ccs',
+  timeout : 10,
+  params : [ ses, modified_ccs ],
+  onerror : function (r) {
+   highlighter.red.play();
+   status_update( dojo.string.substitute(ccs_strings.ERROR_SAVING_STATUS, [status_store.getValue( current_status, 'name' )]) );
+  },
+  oncomplete : function (r) {
+   var res = r.recv();
+   if ( res && res.content() ) {
+    status_store.setValue( current_status, 'ischanged', 0 );
+    highlighter.green.play();
+    status_update( dojo.string.substitute(ccs_strings.SUCCESS_SAVE, [status_store.getValue( current_status, 'name' )]) );
+   } else {
+    highlighter.red.play();
+    status_update( dojo.string.substitute(ccs_strings.ERROR_SAVING_STATUS, [status_store.getValue( current_status, 'name' )]) );
+   }
+  },
+ }).send();
 }
 
 function save_them_all (event) {
 
-	status_store.fetch({
-		query : { ischanged : 1 },
-		onItem : function (item, req) { try { if (this.isItem( item )) window.dirtyStore.push( item ); } catch (e) { /* meh */ } },
-		scope : status_store
-	});
+ status_store.fetch({
+  query : { ischanged : 1 },
+  onItem : function (item, req) { try { if (this.isItem( item )) window.dirtyStore.push( item ); } catch (e) { /* meh */ } },
+  scope : status_store
+ });
 
-	var confirmation = true;
+ var confirmation = true;
 
 
-	if (event && dirtyStore.length > 0) {
-		confirmation = confirm(
-			ccs_strings.CONFIRM_EXIT_CCS
-		);
-	}
+ if (event && dirtyStore.length > 0) {
+  confirmation = confirm(
+   ccs_strings.CONFIRM_EXIT_CCS
+  );
+ }
 
-	if (confirmation) {
-		for (var i in window.dirtyStore) {
-			window.current_status = window.dirtyStore[i];
-			save_status(true);
-		}
+ if (confirmation) {
+  for (var i in window.dirtyStore) {
+   window.current_status = window.dirtyStore[i];
+   save_status(true);
+  }
 
-		window.dirtyStore = [];
-	}
+  window.dirtyStore = [];
+ }
 }
 
 dojo.addOnUnload( save_them_all );
diff --git a/Open-ILS/web/conify/global/config/marc_code_maps.html b/Open-ILS/web/conify/global/config/marc_code_maps.html
index 7974a4538e..d86089a822 100644
--- a/Open-ILS/web/conify/global/config/marc_code_maps.html
+++ b/Open-ILS/web/conify/global/config/marc_code_maps.html
@@ -13,62 +13,62 @@
 # GNU General Public License for more details.
 -->
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/conify.dtd"-->
+ "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+ <!--#include virtual="/opac/locale/${locale}/conify.dtd"-->
 ]>
 <html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<title>&conify.marc_code_maps.title;</title>
-
-		<style type="text/css">
-			@import url('/js/dojo/dojox/grid/_grid/tundraGrid.css');
-			@import url('/js/dojo/dojo/resources/dojo.css');
-			@import url('/js/dojo/dijit/themes/tundra/tundra.css');
-			@import url('/js/dojo/dojox/widget/Toaster/Toaster.css');
-		</style>
-
-		<style>
-			html, body {
-				height: 100%;
-				width: 100%;
-				margin: 0px 0px 0px 0px;
-				padding: 0px 0px 0px 0px;
-				overflow: hidden;
-			}
-
-			#perm_grid {
-				border: 0px;
-				width: 100%;
-				height: 100%;
-			}
-
-			.grid_container {
-				width: 100%;
-				height: 100%;
-			}
-		</style>
-
-		<!-- The OpenSRF API writ JS -->
-		<script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
-		<script language='javascript' src='/opac/common/js/Cookies.js' type='text/javascript'></script>
-		<script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
-		<script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
-
-		<!-- Dojo goodness -->
-		<script type="text/javascript" src="/js/dojo/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
+ <head>
+  <title>&conify.marc_code_maps.title;</title>
+
+  <style type="text/css">
+   @import url('/js/dojo/dojox/grid/_grid/tundraGrid.css');
+   @import url('/js/dojo/dojo/resources/dojo.css');
+   @import url('/js/dojo/dijit/themes/tundra/tundra.css');
+   @import url('/js/dojo/dojox/widget/Toaster/Toaster.css');
+  </style>
+
+  <style>
+   html, body {
+    height: 100%;
+    width: 100%;
+    margin: 0px 0px 0px 0px;
+    padding: 0px 0px 0px 0px;
+    overflow: hidden;
+   }
+
+   #perm_grid {
+    border: 0px;
+    width: 100%;
+    height: 100%;
+   }
+
+   .grid_container {
+    width: 100%;
+    height: 100%;
+   }
+  </style>
+
+  <!-- The OpenSRF API writ JS -->
+  <script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
+  <script language='javascript' src='/opac/common/js/Cookies.js' type='text/javascript'></script>
+  <script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
+  <script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
+
+  <!-- Dojo goodness -->
+  <script type="text/javascript" src="/js/dojo/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
                  <script type="text/javascript" src="/js/dojo/dojo/openils_dojo.js"
             djConfig="parseOnLoad: true, isDebug:false"></script>
-		<script type="text/javascript" src="/js/dojo/dijit/dijit.js"></script>
+  <script type="text/javascript" src="/js/dojo/dijit/dijit.js"></script>
 
-		<script type="text/javascript" src="marc_code_maps.js"></script>
+  <script type="text/javascript" src="marc_code_maps.js"></script>
 
-		<script type="text/javascript">
+  <script type="text/javascript">
 <![CDATA[
-			var grid_row_object_cache = {};
-			var layouts = {};
+   var grid_row_object_cache = {};
+   var layouts = {};
 
-			console.log('create the special layout for cam');
+   console.log('create the special layout for cam');
 
             layouts.cam = [
                 {   cells : [
@@ -89,9 +89,9 @@
                                     setTimeout(
                                         'dojo.query(".cam_value_' + row + '").'+
                                             'instantiate('+
-												'openils.widget.TranslatorPopup,{field:"value",'+
-                                            	'targetObject:"grid_row_object_cache.cam['+row+']"}'+
-											');cam_grid.rowHeightChanged('+row+');',
+            'openils.widget.TranslatorPopup,{field:"value",'+
+                                             'targetObject:"grid_row_object_cache.cam['+row+']"}'+
+           ');cam_grid.rowHeightChanged('+row+');',
                                         0
                                     );
                                     var oldnode = dojo.byId('value_translation_cam_' + row);
@@ -112,9 +112,9 @@
                                     setTimeout(
                                         'dojo.query(".cam_description_' + row + '").'+
                                             'instantiate('+
-												'openils.widget.TranslatorPopup,{field:"description",'+
-                                            	'targetObject:"grid_row_object_cache.cam['+row+']"}'+
-											');cam_grid.rowHeightChanged('+row+');',
+            'openils.widget.TranslatorPopup,{field:"description",'+
+                                             'targetObject:"grid_row_object_cache.cam['+row+']"}'+
+           ');cam_grid.rowHeightChanged('+row+');',
                                         0
                                     );
                                     var oldnode = dojo.byId('description_translation_cam_' + row);
@@ -129,312 +129,312 @@
                 }
             ];
 
-			var codelist = ['cam','cblvl','cifm','citm','clm','clfm','cvrfm'];
-			var hashes = {};
-			var objects = {};
-			var stores = {};
-
-			console.log('about to loop over codelist: ' + codelist);
-
-			for (var i in codelist) {
-
-				(function (classname) {
-
-					hashes[classname] = fieldmapper.standardRequest(
-						[ 'open-ils.fielder', 'open-ils.fielder.' + classname + '.atomic'],
-						[ { query : { code : { '!=' : null } } } ]
-					);
-
-					console.log('created hashes for ' + classname);
-
-					if (!hashes[classname]) return;
-
-					objects[classname] = dojo.map(
-						hashes[classname].concat(),
-						new Function('x', 'return new fieldmapper.' + classname + '().fromHash( x );')
-					);
-
-					console.log('created objects for ' + classname);
-
-					stores[classname] =  new dojo.data.ItemFileWriteStore(
-						{ data : fieldmapper[classname].toStoreData( objects[classname], 'value' ) }
-					);
-
-					console.log('create store for ' + classname);
-
-					if (classname != 'cam') {
-						layouts[classname] = [
-				            {   cells : [
-					                [
-						                { name : cam_strings.LABEL_CODE,  field : "code",  width : "5em",  editor : dojox.grid.editors.Dijit },
-							            { name : cam_strings.LABEL_VALUE, field : "value", width : "auto", editor : dojox.grid.editors.Editor, style : "minHeight:1em;" },
-								        { name : cam_strings.LABEL_TRANSLATION,
-									      width : "10em",
-										  height : "2em",
-	                                      get : function (row) {
-		                                    if (!grid_row_object_cache[classname]) grid_row_object_cache[classname] = [];
-			                                var r = this.grid.model.getRow(row);
-				                            if (r) {
-					                    		grid_row_object_cache[classname][row] = new fieldmapper[classname]().fromHash(r);
-						                        setTimeout(
-							                        'dojo.query(".'+classname+'_value_' + row + '").'+
-								                        'instantiate('+
-															'openils.widget.TranslatorPopup,{field:"value",'+
-										                	'targetObject:"grid_row_object_cache.'+classname+'['+row+']"}'+
-														');'+classname+'_grid.rowHeightChanged('+row+');',
-	                                                0
-		                                        );
-												var oldnode = dojo.byId('value_translation_' + classname + '_' + row);
-												if (oldnode) dijit.byNode(oldnode).destroyRecursive();
-					                            return '<span class="'+classname+'_value_'+row+'"></span>';
-						                    }
-							                return '';
-								          }
-	                                    }
-		                            ]
-			                    ]
-				            }
-					    ];
-					}
-				})(codelist[i])
-
-			}
+   var codelist = ['cam','cblvl','cifm','citm','clm','clfm','cvrfm'];
+   var hashes = {};
+   var objects = {};
+   var stores = {};
+
+   console.log('about to loop over codelist: ' + codelist);
+
+   for (var i in codelist) {
+
+    (function (classname) {
+
+     hashes[classname] = fieldmapper.standardRequest(
+      [ 'open-ils.fielder', 'open-ils.fielder.' + classname + '.atomic'],
+      [ { query : { code : { '!=' : null } } } ]
+     );
+
+     console.log('created hashes for ' + classname);
+
+     if (!hashes[classname]) return;
+
+     objects[classname] = dojo.map(
+      hashes[classname].concat(),
+      new Function('x', 'return new fieldmapper.' + classname + '().fromHash( x );')
+     );
+
+     console.log('created objects for ' + classname);
+
+     stores[classname] =  new dojo.data.ItemFileWriteStore(
+      { data : fieldmapper[classname].toStoreData( objects[classname], 'value' ) }
+     );
+
+     console.log('create store for ' + classname);
+
+     if (classname != 'cam') {
+      layouts[classname] = [
+                {   cells : [
+                     [
+                      { name : cam_strings.LABEL_CODE,  field : "code",  width : "5em",  editor : dojox.grid.editors.Dijit },
+                   { name : cam_strings.LABEL_VALUE, field : "value", width : "auto", editor : dojox.grid.editors.Editor, style : "minHeight:1em;" },
+                { name : cam_strings.LABEL_TRANSLATION,
+               width : "10em",
+            height : "2em",
+                                       get : function (row) {
+                                      if (!grid_row_object_cache[classname]) grid_row_object_cache[classname] = [];
+                                   var r = this.grid.model.getRow(row);
+                                if (r) {
+                           grid_row_object_cache[classname][row] = new fieldmapper[classname]().fromHash(r);
+                              setTimeout(
+                               'dojo.query(".'+classname+'_value_' + row + '").'+
+                                'instantiate('+
+               'openils.widget.TranslatorPopup,{field:"value",'+
+                           'targetObject:"grid_row_object_cache.'+classname+'['+row+']"}'+
+              ');'+classname+'_grid.rowHeightChanged('+row+');',
+                                                 0
+                                          );
+            var oldnode = dojo.byId('value_translation_' + classname + '_' + row);
+            if (oldnode) dijit.byNode(oldnode).destroyRecursive();
+                                 return '<span class="'+classname+'_value_'+row+'"></span>';
+                          }
+                       return '';
+                  }
+                                     }
+                              ]
+                       ]
+                }
+         ];
+     }
+    })(codelist[i])
+
+   }
 ]]>
-		</script>
-
-	</head>
-
-	<body class="tundra" id='pagebody'>
-
-		<div dojoType="dijit.layout.TabContainer" id="grid_container" class="grid_container" style="margin: 5px;" orientation="vertical" layoutAlign="top">
-
-			<div dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="&conify.marc_code_maps.audience_map.title;">
-				<div dojoType="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
-		
-					<div dojoType="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top" onSubmit="create_marc_code">
-						<div>&conify.marc_code_maps.audience_map.new.label;</div>
-						<input type="hidden" name="classname" value="cam"/>
-						<label for="code">&conify.marc_code_maps.new_code;</label><input dojoType="dijit.form.TextBox" name="code" title="&conify.marc_code_maps.new_code;"/>
-						<label for="value">&conify.marc_code_maps.new_value;</label><input dojoType="dijit.form.TextBox" name="value" title="&conify.marc_code_maps.new_value;"/>
-						<label for="description">&conify.marc_code_maps.audience_map.description;</label><input dojoType="dijit.form.TextBox" name="description" title="&conify.marc_code_maps.audience_map.description;"/>
-						<button type="submit" dojoType="dijit.form.Button" label="&conify.marc_code_maps.add;"></button>
-						<button style="margin-left:10px" layoutAlign="bottom" jsId="delete_cam_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.delete_selected;" onclick="delete_grid_selection('cam',cam_grid)"></button>
-						<button style="margin-left:20px" layoutAlign="bottom" jsId="save_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.save_changes;" onClick="save_them_all()"></button>
-					</div>
-		
-					<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-						<div dojoType="dojox.grid.data.DojoData" jsId="cam_model" store="stores.cam" query="{ code : '*' }"></div>
-						<div dojoType="dojox.Grid" jsId="cam_grid">
-							<script type="dojo/connect" event="startup">
-								this.setStructure(window.layouts.cam);
-								this.setModel(window.cam_model);
-							</script>
-						</div>
-
-					</div>
-		
-				</div>
-
-			</div>
-		
-			<div id="cblvl_pane" dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="&conify.marc_code_maps.bib_level.title;">
-				<script type="dojo/connect" event="onShow">
-					if (!window.cblvl_once) setTimeout("cblvl_grid.render()",0);
-					window.cblvl_once = 1;
-				</script>
-				<div dojoType="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
-
-					<div dojoType="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top" onSubmit="create_marc_code">
-						<div>&conify.marc_code_maps.bib_level.new.label;</div>
-						<input type="hidden" name="classname" value="cblvl"/>
-						<label for="code">&conify.marc_code_maps.new_code;</label><input dojoType="dijit.form.TextBox" name="code" title="&conify.marc_code_maps.new_code;"/>
-						<label for="value">&conify.marc_code_maps.new_value;</label><input dojoType="dijit.form.TextBox" name="value" title="&conify.marc_code_maps.new_value;"/>
-						<button type="submit" dojoType="dijit.form.Button" label="&conify.marc_code_maps.add;"></button>
-						<button style="margin-left:20px" layoutAlign="bottom" jsId="delete_cblvl_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.delete_selected;" onclick="delete_grid_selection('cblvl',cblvl_grid)"></button>
-						<button style="margin-left:20px" layoutAlign="bottom" jsId="save_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.save_changes;" onClick="save_them_all()"></button>
-					</div>
-		
-					<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-						<div dojoType="dojox.grid.data.DojoData" jsId="cblvl_model" store="stores.cblvl" query="{ code : '*' }"></div>
-						<div dojoType="dojox.Grid"  jsId="cblvl_grid">
-							<script type="dojo/connect" event="startup">
-								this.setStructure(window.layouts.cblvl);
-								this.setModel(window.cblvl_model);
-							</script>
-						</div>
-
-					</div>
-	
-				</div>
-
-			</div>
-
-			<div dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="&conify.marc_code_maps.item_form.title;">
-				<script type="dojo/connect" event="onShow">
-					if (!window.cifm_once) setTimeout("cifm_grid.render()",0);
-					window.cifm_once = 1;
-				</script>
-				<div dojoType="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
-
-					<div jsId="new_form_form" dojoType="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top">
-						<div>&conify.marc_code_maps.item_form.new.label;</div>
-						<input type="hidden" name="classname" value="cifm"/>
-						<label for="code">&conify.marc_code_maps.new_code;</label><input dojoType="dijit.form.TextBox" name="code" title="&conify.marc_code_maps.new_code;"/>
-						<label for="value">&conify.marc_code_maps.new_value;</label><input dojoType="dijit.form.TextBox" name="value" title="&conify.marc_code_maps.new_value;"/>
-						<button dojoType="dijit.form.Button" label="&conify.marc_code_maps.add;" onclick="create_marc_code(new_form_form)"></button>
-
-						<button style="margin-left:20px" layoutAlign="bottom" jsId="delete_cifm_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.delete_selected;" onclick="delete_grid_selection('cifm',cifm_grid)"></button>
-						<button style="margin-left:20px" layoutAlign="bottom" jsId="save_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.save_changes;" onClick="save_them_all()"></button>
-					</div>
-	
-					<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-						<div dojoType="dojox.grid.data.DojoData" jsId="cifm_model" store="stores.cifm" query="{ code : '*' }"></div>
-						<div dojoType="dojox.Grid"  jsId="cifm_grid">
-							<script type="dojo/connect" event="startup">
-								this.setStructure(window.layouts.cifm);
-								this.setModel(window.cifm_model);
-							</script>
-						</div>
-
-					</div>
-	
-				</div>
-
-			</div>
-
-			<div dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="&conify.marc_code_maps.item_type.title;">
-				<script type="dojo/connect" event="onShow">
-					if (!window.citm_once) setTimeout("citm_grid.render()",0);
-					window.citm_once = 1;
-				</script>
-
-				<div dojoType="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
-
-					<div dojoType="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top" onSubmit="create_marc_code">
-						<div>&conify.marc_code_maps.item_type.new.label;</div>
-						<input type="hidden" name="classname" value="citm"/>
-						<label for="code">&conify.marc_code_maps.new_code;</label><input dojoType="dijit.form.TextBox" name="code" title="&conify.marc_code_maps.new_code;"/>
-						<label for="value">&conify.marc_code_maps.new_value;</label><input dojoType="dijit.form.TextBox" name="value" title="&conify.marc_code_maps.new_value;"/>
-						<button type="submit" dojoType="dijit.form.Button" label="&conify.marc_code_maps.add;"></button>
-						<button style="margin-left:20px" layoutAlign="bottom" jsId="delete_citm_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.delete_selected;" onclick="delete_grid_selection('citm',citm_grid)"></button>
-						<button style="margin-left:20px" layoutAlign="bottom" jsId="save_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.save_changes;" onClick="save_them_all()"></button>
-					</div>
-		
-					<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-						<div dojoType="dojox.grid.data.DojoData" jsId="citm_model" store="stores.citm" query="{ code : '*' }"></div>
-						<div dojoType="dojox.Grid"  jsId="citm_grid">
-							<script type="dojo/connect" event="startup">
-								this.setStructure(window.layouts.citm);
-								this.setModel(window.citm_model);
-							</script>
-						</div>
-
-					</div>
-	
-				</div>
-
-			</div>
-
-			<div dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="&conify.marc_code_maps.language.title;">
-				<script type="dojo/connect" event="onShow">
-					if (!window.clm_once) setTimeout("clm_grid.render()",0);
-					window.clm_once = 1;
-				</script>
-
-				<div dojoType="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
-
-					<div dojoType="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top" onSubmit="create_marc_code">
-						<div>&conify.marc_code_maps.language.new.label;</div>
-						<input type="hidden" name="classname" value="clm"/>
-						<label for="code">&conify.marc_code_maps.new_code;</label><input dojoType="dijit.form.TextBox" name="code" title="&conify.marc_code_maps.new_code;"/>
-						<label for="value">&conify.marc_code_maps.new_value;</label><input dojoType="dijit.form.TextBox" name="value" title="&conify.marc_code_maps.new_value;"/>
-						<button type="submit" dojoType="dijit.form.Button" label="&conify.marc_code_maps.add;"></button>
-						<button style="margin-left:20px" layoutAlign="bottom" jsId="delete_clm_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.delete_selected;" onclick="delete_grid_selection('clm',clm_grid)"></button>
-						<button style="margin-left:20px" layoutAlign="bottom" jsId="save_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.save_changes;" onClick="save_them_all()"></button>
-					</div>
-		
-					<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-						<div dojoType="dojox.grid.data.DojoData" jsId="clm_model" store="stores.clm" query="{ code : '*' }"></div>
-						<div dojoType="dojox.Grid"  jsId="clm_grid">
-							<script type="dojo/connect" event="startup">
-								this.setStructure(window.layouts.clm);
-								this.setModel(window.clm_model);
-							</script>
-						</div>
-
-					</div>
-	
-				</div>
-
-			</div>
-
-			<div dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="&conify.marc_code_maps.literary_form.title;">
-				<script type="dojo/connect" event="onShow">
-					if (!window.clfm_once) setTimeout("clfm_grid.render()",0);
-					window.clfm_once = 1;
-				</script>
-
-				<div dojoType="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
-
-					<div dojoType="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top" onSubmit="create_marc_code">
-						<div>&conify.marc_code_maps.literary_form.new.label;</div>
-						<input type="hidden" name="classname" value="clfm"/>
-						<label for="code">&conify.marc_code_maps.new_code;</label><input dojoType="dijit.form.TextBox" name="code" title="&conify.marc_code_maps.new_code;"/>
-						<label for="value">&conify.marc_code_maps.new_value;</label><input dojoType="dijit.form.TextBox" name="value" title="&conify.marc_code_maps.new_value;"/>
-						<button type="submit" dojoType="dijit.form.Button" label="&conify.marc_code_maps.add;"></button>
-						<button style="margin-left:20px" layoutAlign="bottom" jsId="delete_clfm_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.delete_selected;" onclick="delete_grid_selection('clfm',clfm_grid)"></button>
-						<button style="margin-left:20px" layoutAlign="bottom" jsId="save_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.save_changes;" onClick="save_them_all()"></button>
-					</div>
-		
-					<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-						<div dojoType="dojox.grid.data.DojoData" jsId="clfm_model" store="stores.clfm" query="{ code : '*' }"></div>
-						<div dojoType="dojox.Grid"  jsId="clfm_grid">
-							<script type="dojo/connect" event="startup">
-								this.setStructure(window.layouts.clfm);
-								this.setModel(window.clfm_model);
-							</script>
-						</div>
-
-					</div>
-	
-				</div>
-
-			</div>
-
-			<div dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="&conify.marc_code_maps.video.title;">
-				<script type="dojo/connect" event="onShow">
-					if (!window.cvrfm_once) setTimeout("cvrfm_grid.render()",0);
-					window.cvrfm_once = 1;
-				</script>
-
-				<div dojoType="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
-
-					<div dojoType="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top" onSubmit="create_marc_code">
-						<div>&conify.marc_code_maps.video.new.label;</div>
-						<input type="hidden" name="classname" value="cvrfm"/>
-						<label for="code">&conify.marc_code_maps.new_code;</label><input dojoType="dijit.form.TextBox" name="code" title="&conify.marc_code_maps.new_code;"/>
-						<label for="value">&conify.marc_code_maps.new_value;</label><input dojoType="dijit.form.TextBox" name="value" title="&conify.marc_code_maps.new_value;"/>
-						<button type="submit" dojoType="dijit.form.Button" label="&conify.marc_code_maps.add;"></button>
-						<button style="margin-left:20px" layoutAlign="bottom" jsId="delete_cvrfm_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.delete_selected;" onclick="delete_grid_selection('cvrfm',cvrfm_grid)"></button>
-						<button style="margin-left:20px" layoutAlign="bottom" jsId="save_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.save_changes;" onClick="save_them_all()"></button>
-					</div>
-		
-					<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-						<div dojoType="dojox.grid.data.DojoData" jsId="cvrfm_model" store="stores.cvrfm" query="{ code : '*' }"></div>
-						<div dojoType="dojox.Grid"  jsId="cvrfm_grid">
-							<script type="dojo/connect" event="startup">
-								this.setStructure(window.layouts.cvrfm);
-								this.setModel(window.cvrfm_model);
-							</script>
-						</div>
-
-					</div>
-	
-				</div>
-
-		</div>
-
-		</div>
-		
-	</body>
+  </script>
+
+ </head>
+
+ <body class="tundra" id='pagebody'>
+
+  <div dojoType="dijit.layout.TabContainer" id="grid_container" class="grid_container" style="margin: 5px;" orientation="vertical" layoutAlign="top">
+
+   <div dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="&conify.marc_code_maps.audience_map.title;">
+    <div dojoType="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
+  
+     <div dojoType="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top" onSubmit="create_marc_code">
+      <div>&conify.marc_code_maps.audience_map.new.label;</div>
+      <input type="hidden" name="classname" value="cam"/>
+      <label for="code">&conify.marc_code_maps.new_code;</label><input dojoType="dijit.form.TextBox" name="code" title="&conify.marc_code_maps.new_code;"/>
+      <label for="value">&conify.marc_code_maps.new_value;</label><input dojoType="dijit.form.TextBox" name="value" title="&conify.marc_code_maps.new_value;"/>
+      <label for="description">&conify.marc_code_maps.audience_map.description;</label><input dojoType="dijit.form.TextBox" name="description" title="&conify.marc_code_maps.audience_map.description;"/>
+      <button type="submit" dojoType="dijit.form.Button" label="&conify.marc_code_maps.add;"></button>
+      <button style="margin-left:10px" layoutAlign="bottom" jsId="delete_cam_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.delete_selected;" onclick="delete_grid_selection('cam',cam_grid)"></button>
+      <button style="margin-left:20px" layoutAlign="bottom" jsId="save_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.save_changes;" onClick="save_them_all()"></button>
+     </div>
+  
+     <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+      <div dojoType="dojox.grid.data.DojoData" jsId="cam_model" store="stores.cam" query="{ code : '*' }"></div>
+      <div dojoType="dojox.Grid" jsId="cam_grid">
+       <script type="dojo/connect" event="startup">
+        this.setStructure(window.layouts.cam);
+        this.setModel(window.cam_model);
+       </script>
+      </div>
+
+     </div>
+  
+    </div>
+
+   </div>
+  
+   <div id="cblvl_pane" dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="&conify.marc_code_maps.bib_level.title;">
+    <script type="dojo/connect" event="onShow">
+     if (!window.cblvl_once) setTimeout("cblvl_grid.render()",0);
+     window.cblvl_once = 1;
+    </script>
+    <div dojoType="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
+
+     <div dojoType="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top" onSubmit="create_marc_code">
+      <div>&conify.marc_code_maps.bib_level.new.label;</div>
+      <input type="hidden" name="classname" value="cblvl"/>
+      <label for="code">&conify.marc_code_maps.new_code;</label><input dojoType="dijit.form.TextBox" name="code" title="&conify.marc_code_maps.new_code;"/>
+      <label for="value">&conify.marc_code_maps.new_value;</label><input dojoType="dijit.form.TextBox" name="value" title="&conify.marc_code_maps.new_value;"/>
+      <button type="submit" dojoType="dijit.form.Button" label="&conify.marc_code_maps.add;"></button>
+      <button style="margin-left:20px" layoutAlign="bottom" jsId="delete_cblvl_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.delete_selected;" onclick="delete_grid_selection('cblvl',cblvl_grid)"></button>
+      <button style="margin-left:20px" layoutAlign="bottom" jsId="save_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.save_changes;" onClick="save_them_all()"></button>
+     </div>
+  
+     <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+      <div dojoType="dojox.grid.data.DojoData" jsId="cblvl_model" store="stores.cblvl" query="{ code : '*' }"></div>
+      <div dojoType="dojox.Grid"  jsId="cblvl_grid">
+       <script type="dojo/connect" event="startup">
+        this.setStructure(window.layouts.cblvl);
+        this.setModel(window.cblvl_model);
+       </script>
+      </div>
+
+     </div>
+ 
+    </div>
+
+   </div>
+
+   <div dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="&conify.marc_code_maps.item_form.title;">
+    <script type="dojo/connect" event="onShow">
+     if (!window.cifm_once) setTimeout("cifm_grid.render()",0);
+     window.cifm_once = 1;
+    </script>
+    <div dojoType="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
+
+     <div jsId="new_form_form" dojoType="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top">
+      <div>&conify.marc_code_maps.item_form.new.label;</div>
+      <input type="hidden" name="classname" value="cifm"/>
+      <label for="code">&conify.marc_code_maps.new_code;</label><input dojoType="dijit.form.TextBox" name="code" title="&conify.marc_code_maps.new_code;"/>
+      <label for="value">&conify.marc_code_maps.new_value;</label><input dojoType="dijit.form.TextBox" name="value" title="&conify.marc_code_maps.new_value;"/>
+      <button dojoType="dijit.form.Button" label="&conify.marc_code_maps.add;" onclick="create_marc_code(new_form_form)"></button>
+
+      <button style="margin-left:20px" layoutAlign="bottom" jsId="delete_cifm_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.delete_selected;" onclick="delete_grid_selection('cifm',cifm_grid)"></button>
+      <button style="margin-left:20px" layoutAlign="bottom" jsId="save_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.save_changes;" onClick="save_them_all()"></button>
+     </div>
+ 
+     <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+      <div dojoType="dojox.grid.data.DojoData" jsId="cifm_model" store="stores.cifm" query="{ code : '*' }"></div>
+      <div dojoType="dojox.Grid"  jsId="cifm_grid">
+       <script type="dojo/connect" event="startup">
+        this.setStructure(window.layouts.cifm);
+        this.setModel(window.cifm_model);
+       </script>
+      </div>
+
+     </div>
+ 
+    </div>
+
+   </div>
+
+   <div dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="&conify.marc_code_maps.item_type.title;">
+    <script type="dojo/connect" event="onShow">
+     if (!window.citm_once) setTimeout("citm_grid.render()",0);
+     window.citm_once = 1;
+    </script>
+
+    <div dojoType="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
+
+     <div dojoType="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top" onSubmit="create_marc_code">
+      <div>&conify.marc_code_maps.item_type.new.label;</div>
+      <input type="hidden" name="classname" value="citm"/>
+      <label for="code">&conify.marc_code_maps.new_code;</label><input dojoType="dijit.form.TextBox" name="code" title="&conify.marc_code_maps.new_code;"/>
+      <label for="value">&conify.marc_code_maps.new_value;</label><input dojoType="dijit.form.TextBox" name="value" title="&conify.marc_code_maps.new_value;"/>
+      <button type="submit" dojoType="dijit.form.Button" label="&conify.marc_code_maps.add;"></button>
+      <button style="margin-left:20px" layoutAlign="bottom" jsId="delete_citm_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.delete_selected;" onclick="delete_grid_selection('citm',citm_grid)"></button>
+      <button style="margin-left:20px" layoutAlign="bottom" jsId="save_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.save_changes;" onClick="save_them_all()"></button>
+     </div>
+  
+     <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+      <div dojoType="dojox.grid.data.DojoData" jsId="citm_model" store="stores.citm" query="{ code : '*' }"></div>
+      <div dojoType="dojox.Grid"  jsId="citm_grid">
+       <script type="dojo/connect" event="startup">
+        this.setStructure(window.layouts.citm);
+        this.setModel(window.citm_model);
+       </script>
+      </div>
+
+     </div>
+ 
+    </div>
+
+   </div>
+
+   <div dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="&conify.marc_code_maps.language.title;">
+    <script type="dojo/connect" event="onShow">
+     if (!window.clm_once) setTimeout("clm_grid.render()",0);
+     window.clm_once = 1;
+    </script>
+
+    <div dojoType="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
+
+     <div dojoType="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top" onSubmit="create_marc_code">
+      <div>&conify.marc_code_maps.language.new.label;</div>
+      <input type="hidden" name="classname" value="clm"/>
+      <label for="code">&conify.marc_code_maps.new_code;</label><input dojoType="dijit.form.TextBox" name="code" title="&conify.marc_code_maps.new_code;"/>
+      <label for="value">&conify.marc_code_maps.new_value;</label><input dojoType="dijit.form.TextBox" name="value" title="&conify.marc_code_maps.new_value;"/>
+      <button type="submit" dojoType="dijit.form.Button" label="&conify.marc_code_maps.add;"></button>
+      <button style="margin-left:20px" layoutAlign="bottom" jsId="delete_clm_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.delete_selected;" onclick="delete_grid_selection('clm',clm_grid)"></button>
+      <button style="margin-left:20px" layoutAlign="bottom" jsId="save_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.save_changes;" onClick="save_them_all()"></button>
+     </div>
+  
+     <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+      <div dojoType="dojox.grid.data.DojoData" jsId="clm_model" store="stores.clm" query="{ code : '*' }"></div>
+      <div dojoType="dojox.Grid"  jsId="clm_grid">
+       <script type="dojo/connect" event="startup">
+        this.setStructure(window.layouts.clm);
+        this.setModel(window.clm_model);
+       </script>
+      </div>
+
+     </div>
+ 
+    </div>
+
+   </div>
+
+   <div dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="&conify.marc_code_maps.literary_form.title;">
+    <script type="dojo/connect" event="onShow">
+     if (!window.clfm_once) setTimeout("clfm_grid.render()",0);
+     window.clfm_once = 1;
+    </script>
+
+    <div dojoType="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
+
+     <div dojoType="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top" onSubmit="create_marc_code">
+      <div>&conify.marc_code_maps.literary_form.new.label;</div>
+      <input type="hidden" name="classname" value="clfm"/>
+      <label for="code">&conify.marc_code_maps.new_code;</label><input dojoType="dijit.form.TextBox" name="code" title="&conify.marc_code_maps.new_code;"/>
+      <label for="value">&conify.marc_code_maps.new_value;</label><input dojoType="dijit.form.TextBox" name="value" title="&conify.marc_code_maps.new_value;"/>
+      <button type="submit" dojoType="dijit.form.Button" label="&conify.marc_code_maps.add;"></button>
+      <button style="margin-left:20px" layoutAlign="bottom" jsId="delete_clfm_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.delete_selected;" onclick="delete_grid_selection('clfm',clfm_grid)"></button>
+      <button style="margin-left:20px" layoutAlign="bottom" jsId="save_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.save_changes;" onClick="save_them_all()"></button>
+     </div>
+  
+     <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+      <div dojoType="dojox.grid.data.DojoData" jsId="clfm_model" store="stores.clfm" query="{ code : '*' }"></div>
+      <div dojoType="dojox.Grid"  jsId="clfm_grid">
+       <script type="dojo/connect" event="startup">
+        this.setStructure(window.layouts.clfm);
+        this.setModel(window.clfm_model);
+       </script>
+      </div>
+
+     </div>
+ 
+    </div>
+
+   </div>
+
+   <div dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="&conify.marc_code_maps.video.title;">
+    <script type="dojo/connect" event="onShow">
+     if (!window.cvrfm_once) setTimeout("cvrfm_grid.render()",0);
+     window.cvrfm_once = 1;
+    </script>
+
+    <div dojoType="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
+
+     <div dojoType="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top" onSubmit="create_marc_code">
+      <div>&conify.marc_code_maps.video.new.label;</div>
+      <input type="hidden" name="classname" value="cvrfm"/>
+      <label for="code">&conify.marc_code_maps.new_code;</label><input dojoType="dijit.form.TextBox" name="code" title="&conify.marc_code_maps.new_code;"/>
+      <label for="value">&conify.marc_code_maps.new_value;</label><input dojoType="dijit.form.TextBox" name="value" title="&conify.marc_code_maps.new_value;"/>
+      <button type="submit" dojoType="dijit.form.Button" label="&conify.marc_code_maps.add;"></button>
+      <button style="margin-left:20px" layoutAlign="bottom" jsId="delete_cvrfm_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.delete_selected;" onclick="delete_grid_selection('cvrfm',cvrfm_grid)"></button>
+      <button style="margin-left:20px" layoutAlign="bottom" jsId="save_button" dojoType="dijit.form.Button" label="&conify.marc_code_maps.save_changes;" onClick="save_them_all()"></button>
+     </div>
+  
+     <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+      <div dojoType="dojox.grid.data.DojoData" jsId="cvrfm_model" store="stores.cvrfm" query="{ code : '*' }"></div>
+      <div dojoType="dojox.Grid"  jsId="cvrfm_grid">
+       <script type="dojo/connect" event="startup">
+        this.setStructure(window.layouts.cvrfm);
+        this.setModel(window.cvrfm_model);
+       </script>
+      </div>
+
+     </div>
+ 
+    </div>
+
+  </div>
+
+  </div>
+  
+ </body>
 </html>
diff --git a/Open-ILS/web/conify/global/config/marc_code_maps.js b/Open-ILS/web/conify/global/config/marc_code_maps.js
index d8120c4d76..75fa837520 100644
--- a/Open-ILS/web/conify/global/config/marc_code_maps.js
+++ b/Open-ILS/web/conify/global/config/marc_code_maps.js
@@ -51,8 +51,8 @@ var cam_strings = dojo.i18n.getLocalization('openils.conify', 'conify');
 
 /*
 var highlighter = {
-	green : dojox.fx.highlight( { color : '#B4FFB4', node : 'grid_container', duration : 500 } ),
-	red : dojox.fx.highlight( { color : '#FF2018', node : 'grid_container', duration : 500 } )
+ green : dojox.fx.highlight( { color : '#B4FFB4', node : 'grid_container', duration : 500 } ),
+ red : dojox.fx.highlight( { color : '#FF2018', node : 'grid_container', duration : 500 } )
 };
 
 console.log('highlighters set up');
@@ -61,71 +61,71 @@ console.log('highlighters set up');
 var dirtyStore = [];
 
 function status_update (markup) {
-	if (parent !== window && parent.status_update) parent.status_update( markup );
+ if (parent !== window && parent.status_update) parent.status_update( markup );
 }
 
 console.log('local status function built');
 
 function save_code (classname) {
 
-	var item = current_item[classname];
-	var obj = new fieldmapper[classname]().fromStoreItem( item );
-
-	obj.ischanged( 1 );
-	obj.code( dojo.string.trim( obj.code() ) );
-	obj.value( dojo.string.trim( obj.value() ) );
-	if(classname == 'cam' || classname == 'clfm')
-		obj.description( dojo.string.trim( obj.description() ) );
-
-	pCRUD.request({
-		method : 'open-ils.permacrud.update.' + classname,
-		timeout : 10,
-		params : [ ses, modified_ppl ],
-		onerror : function (r) {
-			//highlighter.red.play();
-			status_update( dojo.string.substitute(cam_strings.ERROR_SAVING_DATA_CAM, [classname, obj.code()]) );
-		},
-		oncomplete : function (r) {
-			var res = r.recv();
-			if ( res && res.content() ) {
-				stores[classname].setValue( current_item, 'ischanged', 0 );
-				//highlighter.green.play();
-				status_update( dojo.string.substitute(cam_strings.SUCCESS_SAVE, stores[classname].getValue( item, 'code' )) );
-			} else {
-				//highlighter.red.play();
-				status_update( dojo.string.substitute( cam_strings.ERROR_SAVING_DATA_CAM, [classname, stores[classname].getValue( item, 'code' )] ) );
-			}
-		},
-	}).send();
+ var item = current_item[classname];
+ var obj = new fieldmapper[classname]().fromStoreItem( item );
+
+ obj.ischanged( 1 );
+ obj.code( dojo.string.trim( obj.code() ) );
+ obj.value( dojo.string.trim( obj.value() ) );
+ if(classname == 'cam' || classname == 'clfm')
+  obj.description( dojo.string.trim( obj.description() ) );
+
+ pCRUD.request({
+  method : 'open-ils.permacrud.update.' + classname,
+  timeout : 10,
+  params : [ ses, modified_ppl ],
+  onerror : function (r) {
+   //highlighter.red.play();
+   status_update( dojo.string.substitute(cam_strings.ERROR_SAVING_DATA_CAM, [classname, obj.code()]) );
+  },
+  oncomplete : function (r) {
+   var res = r.recv();
+   if ( res && res.content() ) {
+    stores[classname].setValue( current_item, 'ischanged', 0 );
+    //highlighter.green.play();
+    status_update( dojo.string.substitute(cam_strings.SUCCESS_SAVE, stores[classname].getValue( item, 'code' )) );
+   } else {
+    //highlighter.red.play();
+    status_update( dojo.string.substitute( cam_strings.ERROR_SAVING_DATA_CAM, [classname, stores[classname].getValue( item, 'code' )] ) );
+   }
+  },
+ }).send();
 }
 
 function save_them_all (event) {
 
-	for (var classname in stores) {
+ for (var classname in stores) {
 
-		var store = stores[classname];
-		store.fetch({
-			query : { ischanged : 1 },
-			onItem : function (item, req) { try { if (this.isItem( item )) window.dirtyStore.push( item ); } catch (e) { /* meh */ } },
-			scope : store
-		});
+  var store = stores[classname];
+  store.fetch({
+   query : { ischanged : 1 },
+   onItem : function (item, req) { try { if (this.isItem( item )) window.dirtyStore.push( item ); } catch (e) { /* meh */ } },
+   scope : store
+  });
 
-		var confirmation = true;
+  var confirmation = true;
 
-		if (event && dirtyStore.length > 0) {
-			confirmation = confirm( cam_strings.CONFIRM_EXIT_CAM );
-			event = null;
-		}
+  if (event && dirtyStore.length > 0) {
+   confirmation = confirm( cam_strings.CONFIRM_EXIT_CAM );
+   event = null;
+  }
 
-		if (confirmation) {
-			for (var i in dirtyStore) {
-				current_item[classname] = dirtyStore[i];
-				save_object(classname);
-			}
+  if (confirmation) {
+   for (var i in dirtyStore) {
+    current_item[classname] = dirtyStore[i];
+    save_object(classname);
+   }
 
-			dirtyStore = [];
-		}
-	}
+   dirtyStore = [];
+  }
+ }
 }
 
 dojo.addOnUnload( save_them_all );
@@ -187,16 +187,16 @@ function delete_grid_selection(classname, grid ) {
 
 function create_marc_code (data) {
 
-	var cl = data.classname;
-	if (!cl) return false;
+ var cl = data.classname;
+ if (!cl) return false;
 
-	data.code = dojo.string.trim( data.code );
-	data.value = dojo.string.trim( data.value );
+ data.code = dojo.string.trim( data.code );
+ data.value = dojo.string.trim( data.value );
 
-	if(!data.code || !data.value) return false;
+ if(!data.code || !data.value) return false;
 
-	if(cl == 'cam' || cl == 'clfm')
-		data.description = dojo.string.trim( data.description );
+ if(cl == 'cam' || cl == 'clfm')
+  data.description = dojo.string.trim( data.description );
 
     var new_fm_obj = new fieldmapper[cl]().fromHash( data )
     new_fm_obj.isnew(1);
@@ -226,6 +226,6 @@ function create_marc_code (data) {
         }
     }).send();
 
-	return false;
+ return false;
 }
 
diff --git a/Open-ILS/web/conify/global/permission/grp_tree.html b/Open-ILS/web/conify/global/permission/grp_tree.html
index a3f01f80a5..41ecae62c7 100644
--- a/Open-ILS/web/conify/global/permission/grp_tree.html
+++ b/Open-ILS/web/conify/global/permission/grp_tree.html
@@ -13,38 +13,38 @@
 # GNU General Public License for more details.
 -->
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/conify.dtd"-->
+ "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+ <!--#include virtual="/opac/locale/${locale}/conify.dtd"-->
 ]>
 <html xmlns="http://www.w2.org/1999/xhtml">
-	<head>
-		<title>&conify.grp_tree.group_tree.title;</title>
-
-		<style type="text/css">
-			@import url('/js/dojo/dojox/grid/_grid/tundraGrid.css');
-			@import url('/js/dojo/dojo/resources/dojo.css');
-			@import url('/js/dojo/dijit/themes/tundra/tundra.css');
-			@import url('/js/dojo/dojox/widget/Toaster/Toaster.css');
-		</style>
-
-		<style>
-			html, body
-			{
-				height: 100%;
-				width: 100%;
-				margin: 0px 0px 0px 0px;
-				padding: 0px 0px 0px 0px;
-				overflow: hidden;
-			}
-
-			th
-			{
-				text-align: right;
-				font-weight: bold;
-				padding-left: 20px;
-				padding-right: 5px;
-			}
+ <head>
+  <title>&conify.grp_tree.group_tree.title;</title>
+
+  <style type="text/css">
+   @import url('/js/dojo/dojox/grid/_grid/tundraGrid.css');
+   @import url('/js/dojo/dojo/resources/dojo.css');
+   @import url('/js/dojo/dijit/themes/tundra/tundra.css');
+   @import url('/js/dojo/dojox/widget/Toaster/Toaster.css');
+  </style>
+
+  <style>
+   html, body
+   {
+    height: 100%;
+    width: 100%;
+    margin: 0px 0px 0px 0px;
+    padding: 0px 0px 0px 0px;
+    overflow: hidden;
+   }
+
+   th
+   {
+    text-align: right;
+    font-weight: bold;
+    padding-left: 20px;
+    padding-right: 5px;
+   }
 
             #perm_grid {
                 border: 0px;
@@ -57,32 +57,32 @@
                 height: 100%;
             }
 
-		</style>
+  </style>
 
-		<!-- The OpenSRF API writ JS -->
-		<script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
-		<script language='javascript' src='/opac/common/js/Cookies.js' type='text/javascript'></script>
-		<script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
-		<script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
+  <!-- The OpenSRF API writ JS -->
+  <script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
+  <script language='javascript' src='/opac/common/js/Cookies.js' type='text/javascript'></script>
+  <script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
+  <script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
 
-		<!-- Dojo goodness -->
-		<script type="text/javascript" src="../admin.js"></script>
-		<script type="text/javascript" src="/js/dojo/dojo/dojo.js"></script>
-	        <script type="text/javascript" src="/js/dojo/dojo/openils_dojo.js"></script>
-		<script type="text/javascript" src="/js/dojo/dijit/dijit.js"></script>
+  <!-- Dojo goodness -->
+  <script type="text/javascript" src="../admin.js"></script>
+  <script type="text/javascript" src="/js/dojo/dojo/dojo.js"></script>
+         <script type="text/javascript" src="/js/dojo/dojo/openils_dojo.js"></script>
+  <script type="text/javascript" src="/js/dojo/dijit/dijit.js"></script>
 
-		<script type="text/javascript" src="grp_tree.js"></script>
+  <script type="text/javascript" src="grp_tree.js"></script>
 
-	</head>
+ </head>
 
-	<body class="tundra" id='pagebody'>
+ <body class="tundra" id='pagebody'>
 
-		<div dojoType="dijit.layout.SplitContainer" orientation="horizontal" style="height: 100%">
+  <div dojoType="dijit.layout.SplitContainer" orientation="horizontal" style="height: 100%">
 
-			<div dojoType="dijit.layout.ContentPane" sizeShare="100">
-				<script type="dojo/method">
-				<![CDATA[
-					window.dirtyStore = [];
+   <div dojoType="dijit.layout.ContentPane" sizeShare="100">
+    <script type="dojo/method">
+    <![CDATA[
+     window.dirtyStore = [];
 
                     server.pCRUD.request({
                         method : 'open-ils.permacrud.search.pgt.atomic',
@@ -161,593 +161,593 @@
                             window._perm_map_data = pgpm.toStoreData( window._perm_map_list, 'id' );
                             window.perm_map_store = new dojo.data.ItemFileWriteStore({ data : window._perm_map_data });
 
-							window.perm_map_store.onSet = function (item, attr, o, n) {
-								if (attr == 'ischanged') return;
-								if (n == o) return;
+       window.perm_map_store.onSet = function (item, attr, o, n) {
+        if (attr == 'ischanged') return;
+        if (n == o) return;
 
-								this.setValue( item, 'ischanged', 1);
+        this.setValue( item, 'ischanged', 1);
 
-								if (attr == 'grantable' && (typeof (n) != 'string'))
-									this.setValue(item, 'grantable', n ? 't' : 'f');
-							}
+        if (attr == 'grantable' && (typeof (n) != 'string'))
+         this.setValue(item, 'grantable', n ? 't' : 'f');
+       }
 
                             dojo.addOnUnload( function (event) { save_them_all(); });
                         }
  
                     }).send();
 ]]>
-				</script>
-				<div
-				  id="group_tree"
-				  label="&conify.grp_tree.permission_groups.label;"
-				  query="{'_top':'true'}"
-				  dojoType="dijit.Tree"
-				  store="group_store"
-				  minSize="200"
-				  jsId="group_tree"
-				>
-
-					<script type="dojo/method" event="onClick" args="item,node">
+    </script>
+    <div
+      id="group_tree"
+      label="&conify.grp_tree.permission_groups.label;"
+      query="{'_top':'true'}"
+      dojoType="dijit.Tree"
+      store="group_store"
+      minSize="200"
+      jsId="group_tree"
+    >
+
+     <script type="dojo/method" event="onClick" args="item,node">
 <![CDATA[
-						right_pane_toggler.show();
-
-						current_group = item;
-						window.current_fm_group = new pgt().fromStoreItem(item);
-
-						perm_map_model.query = { grp : current_group ? current_group.id[0] : -1 };
-						perm_map_model.refresh();
-						perm_grid.refresh();
-
-						highlighter.editor_pane.green.play();
-						status_update( dojo.string.substitute( pgt_strings.STATUS_EDITING, [this.store.getValue( item, 'name' )]) );
-
-						new_kid_button.disabled = false;
-						save_group_button.disabled = false;
-						delete_group_button.disabled = false;
-
-						var main_settings_fields = [ 'name', 'perm_interval', 'description'];
-						for ( var i in main_settings_fields ) {
-							var field = main_settings_fields[i];
-							var value = this.store.getValue( current_group, field );
-
-							if (!value) {
-								window["editor_pane_" + field].setValue( '' ); // unset the value
-								if (field != 'description') window["editor_pane_" + field].setDisplayedValue( '' ); // unset the value
-							} else window["editor_pane_" + field].setValue( value );
-						}
-
-						if ( this.store.getValue( current_group, '_trueRoot' ) == 'true' ) {
-							editor_pane_parent.disabled = true;
-							editor_pane_parent.setValue(null);
-							editor_pane_parent.setDisplayedValue('');
-							editor_pane_parent.validate(false);
-						} else {
-							editor_pane_parent.disabled = false;
-							editor_pane_parent.validate(true);
-							editor_pane_parent.setValue( this.store.getValue( current_group, 'parent' ) );
-						}
-
-						editor_pane_application_perm.setValue( this.store.getValue( current_group, 'application_perm' ) );
-
-						editor_pane_usergroup.setChecked( this.store.getValue( current_group, 'usergroup' ) == 't' ? true : false );
+      right_pane_toggler.show();
+
+      current_group = item;
+      window.current_fm_group = new pgt().fromStoreItem(item);
+
+      perm_map_model.query = { grp : current_group ? current_group.id[0] : -1 };
+      perm_map_model.refresh();
+      perm_grid.refresh();
+
+      highlighter.editor_pane.green.play();
+      status_update( dojo.string.substitute( pgt_strings.STATUS_EDITING, [this.store.getValue( item, 'name' )]) );
+
+      new_kid_button.disabled = false;
+      save_group_button.disabled = false;
+      delete_group_button.disabled = false;
+
+      var main_settings_fields = [ 'name', 'perm_interval', 'description'];
+      for ( var i in main_settings_fields ) {
+       var field = main_settings_fields[i];
+       var value = this.store.getValue( current_group, field );
+
+       if (!value) {
+        window["editor_pane_" + field].setValue( '' ); // unset the value
+        if (field != 'description') window["editor_pane_" + field].setDisplayedValue( '' ); // unset the value
+       } else window["editor_pane_" + field].setValue( value );
+      }
+
+      if ( this.store.getValue( current_group, '_trueRoot' ) == 'true' ) {
+       editor_pane_parent.disabled = true;
+       editor_pane_parent.setValue(null);
+       editor_pane_parent.setDisplayedValue('');
+       editor_pane_parent.validate(false);
+      } else {
+       editor_pane_parent.disabled = false;
+       editor_pane_parent.validate(true);
+       editor_pane_parent.setValue( this.store.getValue( current_group, 'parent' ) );
+      }
+
+      editor_pane_application_perm.setValue( this.store.getValue( current_group, 'application_perm' ) );
+
+      editor_pane_usergroup.setChecked( this.store.getValue( current_group, 'usergroup' ) == 't' ? true : false );
 ]]>
-					</script>
-
-					<script type="dojo/method" event="getLabel" args="item,pI">
-						var label = this.store.getValue(item,'name');
-						if (this.store.getValue(item,'ischanged') == 1) label = '* ' + label;
-						return label;
-					</script>
-
-				</div>
-			</div>
-
-			<div id="right_pane" dojoType="dijit.layout.ContentPane"  sizeShare="300">
-				<script type="dojo/method">
-					window.right_pane_toggler = new dojo.fx.Toggler({ node: 'right_pane'});
-					window.right_pane_toggler.hide();
-				</script>
-
-				<div dojoType="dijit.layout.TabContainer">
-					<div id="editor_pane" dojoType="dijit.layout.ContentPane" title="&conify.grp_tree.group_config.label;">
-						<script type="dojo/method">
-							highlighter.group_tree = {};
-							highlighter.editor_pane = {};
-							highlighter.group_tree.green = dojox.fx.highlight( { color : '#B4FFB4', node : 'group_tree', duration : 500 } );
-							highlighter.group_tree.red = dojox.fx.highlight( { color : '#FF2018', node : 'group_tree', duration : 500 } );
-							highlighter.editor_pane.green = dojox.fx.highlight( { color : '#B4FFB4', node : 'editor_pane', duration : 500 } );
-							highlighter.editor_pane.red = dojox.fx.highlight( { color : '#FF2018', node : 'editor_pane', duration : 500 } );
-						</script>
-	
-						<table class="tundra" style="margin:10px;">
-							<tr>
-								<th>&conify.grp_tree.group_name.label;</th>
-								<td>
-									<span id="editor_pane_name" dojoType="dijit.form.ValidationTextBox" jsId="editor_pane_name" regExp=".+" required="true">
-										<script type="dojo/connect" event="onChange">
-											if (current_group) {
-												group_store.setValue( current_group, "name", this.getValue() );
-											}
-										</script>
-									</span>
-									<span dojoType="openils.widget.TranslatorPopup" targetObject="current_fm_group" field="name"></span>
-								</td>
-							</tr>
-							<tr>
-								<th>&conify.grp_tree.description.label;</th>
-								<td>
-									<span>
-										<textarea
-										  id="editor_pane_description"
-										  dojoType="dijit.form.Textarea"
-										  jsId="editor_pane_description"
-										  onChange="if (current_group) group_store.setValue( current_group, 'description', this.getValue() );"
-										></textarea>
-									</span>
-									<span dojoType="openils.widget.TranslatorPopup" targetObject="current_fm_group" field="description"></span>
-								</td>
-							</tr>
-							<tr>
-								<th>&conify.grp_tree.permission_interval.label;</th>
-								<td>
-									<span id="editor_pane_perm_interval" dojoType="dijit.form.ValidationTextBox" jsId="editor_pane_perm_interval" regExp="^\d+ (?:y.*|mo.*|d.*)$" required="true">
-										<script type="dojo/connect" event="onChange">
-											if (current_group) {
-												group_store.setValue( current_group, "perm_interval", this.getValue() );
-											}
-										</script>
-									</span>
-								</td>
-							</tr>
-							<tr>
-								<th>&conify.grp_tree.editing_permission.label;</th>
-								<td>
-									<div
-									  id="editor_pane_application_perm"
-									  dojoType="dijit.form.FilteringSelect"
-									  store="perm_name_store"
-									  searchAttr="code"
-									  jsId="editor_pane_application_perm"
-									>
-										<script type="dojo/connect" event="onChange">
+     </script>
+
+     <script type="dojo/method" event="getLabel" args="item,pI">
+      var label = this.store.getValue(item,'name');
+      if (this.store.getValue(item,'ischanged') == 1) label = '* ' + label;
+      return label;
+     </script>
+
+    </div>
+   </div>
+
+   <div id="right_pane" dojoType="dijit.layout.ContentPane"  sizeShare="300">
+    <script type="dojo/method">
+     window.right_pane_toggler = new dojo.fx.Toggler({ node: 'right_pane'});
+     window.right_pane_toggler.hide();
+    </script>
+
+    <div dojoType="dijit.layout.TabContainer">
+     <div id="editor_pane" dojoType="dijit.layout.ContentPane" title="&conify.grp_tree.group_config.label;">
+      <script type="dojo/method">
+       highlighter.group_tree = {};
+       highlighter.editor_pane = {};
+       highlighter.group_tree.green = dojox.fx.highlight( { color : '#B4FFB4', node : 'group_tree', duration : 500 } );
+       highlighter.group_tree.red = dojox.fx.highlight( { color : '#FF2018', node : 'group_tree', duration : 500 } );
+       highlighter.editor_pane.green = dojox.fx.highlight( { color : '#B4FFB4', node : 'editor_pane', duration : 500 } );
+       highlighter.editor_pane.red = dojox.fx.highlight( { color : '#FF2018', node : 'editor_pane', duration : 500 } );
+      </script>
+ 
+      <table class="tundra" style="margin:10px;">
+       <tr>
+        <th>&conify.grp_tree.group_name.label;</th>
+        <td>
+         <span id="editor_pane_name" dojoType="dijit.form.ValidationTextBox" jsId="editor_pane_name" regExp=".+" required="true">
+          <script type="dojo/connect" event="onChange">
+           if (current_group) {
+            group_store.setValue( current_group, "name", this.getValue() );
+           }
+          </script>
+         </span>
+         <span dojoType="openils.widget.TranslatorPopup" targetObject="current_fm_group" field="name"></span>
+        </td>
+       </tr>
+       <tr>
+        <th>&conify.grp_tree.description.label;</th>
+        <td>
+         <span>
+          <textarea
+            id="editor_pane_description"
+            dojoType="dijit.form.Textarea"
+            jsId="editor_pane_description"
+            onChange="if (current_group) group_store.setValue( current_group, 'description', this.getValue() );"
+          ></textarea>
+         </span>
+         <span dojoType="openils.widget.TranslatorPopup" targetObject="current_fm_group" field="description"></span>
+        </td>
+       </tr>
+       <tr>
+        <th>&conify.grp_tree.permission_interval.label;</th>
+        <td>
+         <span id="editor_pane_perm_interval" dojoType="dijit.form.ValidationTextBox" jsId="editor_pane_perm_interval" regExp="^\d+ (?:y.*|mo.*|d.*)$" required="true">
+          <script type="dojo/connect" event="onChange">
+           if (current_group) {
+            group_store.setValue( current_group, "perm_interval", this.getValue() );
+           }
+          </script>
+         </span>
+        </td>
+       </tr>
+       <tr>
+        <th>&conify.grp_tree.editing_permission.label;</th>
+        <td>
+         <div
+           id="editor_pane_application_perm"
+           dojoType="dijit.form.FilteringSelect"
+           store="perm_name_store"
+           searchAttr="code"
+           jsId="editor_pane_application_perm"
+         >
+          <script type="dojo/connect" event="onChange">
 <![CDATA[
-											if (current_group && this.getValue()) {
-												group_store.setValue( current_group, "application_perm", this.getValue() );
-											}
+           if (current_group && this.getValue()) {
+            group_store.setValue( current_group, "application_perm", this.getValue() );
+           }
 ]]>
-										</script>
-									</div>
-								</td>
-							</tr>
-							<tr>
-								<th>&conify.grp_tree.parent_group.label;</th>
-								<td>
-									<div
-									  id="editor_pane_parent"
-									  dojoType="dijit.form.FilteringSelect"
-									  jsId="editor_pane_parent"
-									  store="group_store"
-									  searchAttr="name"
-									  ignoreCase="true"
-									  required="true"
-									>
-										<script type="dojo/connect" event="onChange">
+          </script>
+         </div>
+        </td>
+       </tr>
+       <tr>
+        <th>&conify.grp_tree.parent_group.label;</th>
+        <td>
+         <div
+           id="editor_pane_parent"
+           dojoType="dijit.form.FilteringSelect"
+           jsId="editor_pane_parent"
+           store="group_store"
+           searchAttr="name"
+           ignoreCase="true"
+           required="true"
+         >
+          <script type="dojo/connect" event="onChange">
 <![CDATA[
-											if (current_group && this.getValue()) {
-												this.store.setValue( current_group, "parent", this.getValue() );
-											}
+           if (current_group && this.getValue()) {
+            this.store.setValue( current_group, "parent", this.getValue() );
+           }
 ]]>
-										</script>
-									</div>
-								</td>
-							</tr>
-							<tr>
-								<th>&conify.grp_tree.user_group.label;</th>
-								<td>
-									<input
-									  id="editor_pane_usergroup"
-									  jsId="editor_pane_usergroup"
-									  type="checkbox"
-									  dojoType="dijit.form.CheckBox"
-									  onChange="if (current_group) group_store.setValue( current_group, 'usergroup', this.checked ? 't' : 'f' );"
-									/>
-								</td>
-							</tr>
-						</table>
-	
-						<div dojoType="dijit.layout.ContentPane" orientation="horizontal" style="margin-bottom: 20px;">
-	
-							<button jsId="save_group_button" dojoType="dijit.form.Button" label="&conify.grp_tree.save_button.label;" onClick="save_group()">
-								<script type="dojo/connect" event="startup">
-									this.disabled = true;
-								</script>
-							</button>
-	
-							<button jsId="delete_group_button" dojoType="dijit.form.Button" label="&conify.grp_tree.delete_button.label;">
-								<script type="dojo/connect" event="startup">
-									this.disabled = true;
-								</script>
-								<script type="dojo/connect" event="onClick">
+          </script>
+         </div>
+        </td>
+       </tr>
+       <tr>
+        <th>&conify.grp_tree.user_group.label;</th>
+        <td>
+         <input
+           id="editor_pane_usergroup"
+           jsId="editor_pane_usergroup"
+           type="checkbox"
+           dojoType="dijit.form.CheckBox"
+           onChange="if (current_group) group_store.setValue( current_group, 'usergroup', this.checked ? 't' : 'f' );"
+         />
+        </td>
+       </tr>
+      </table>
+ 
+      <div dojoType="dijit.layout.ContentPane" orientation="horizontal" style="margin-bottom: 20px;">
+ 
+       <button jsId="save_group_button" dojoType="dijit.form.Button" label="&conify.grp_tree.save_button.label;" onClick="save_group()">
+        <script type="dojo/connect" event="startup">
+         this.disabled = true;
+        </script>
+       </button>
+ 
+       <button jsId="delete_group_button" dojoType="dijit.form.Button" label="&conify.grp_tree.delete_button.label;">
+        <script type="dojo/connect" event="startup">
+         this.disabled = true;
+        </script>
+        <script type="dojo/connect" event="onClick">
 <![CDATA[
-	
-									if (group_store.getValue( current_group, '_trueRoot' ) == 'true') {
-										highlighter.editor_pane.red.play();
-										status_update( dojo.string.substitute( pgt_strings.STATUS_ERR_DELETING, [group_store.getValue( current_group, 'name' )])  );
-										return false;
-									}
-
-									if ( current_group.children ) {
-										var kids = current_group.children;
-										if (!dojo.isArray(kids)) kids = [kids];
-	
-										var existing_kids = dojo.filter(
-											kids,
-											function(kid){ return kid.isdeleted[0] != 1 }
-										);
-										if ( existing_kids.length > 0) {
-											highlighter.editor_pane.red.play();
-											status_update( dojo.string.substitute( pgt_strings.STATUS_ERR_DELETING_DEPENDENCY, [group_store.getValue( current_group, 'name' ), existing_kids.length]) );
-											return;
-										}
-									}
-	
-									if ( confirm( dojo.string.substitute( pgt_strings.CONFIRM_DELETE, [current_group.name]) ) ) {
-										group_store.setValue( current_group, 'isdeleted', 1 );
-	
-										var modified_pgt = new pgt().fromStoreItem( current_group );
-										modified_pgt.isdeleted( 1 );
-	
-										server.pCRUD.request({
-											method : 'open-ils.permacrud.delete.pgt',
-											timeout : 10,
-											params : [ ses, modified_pgt ],
-											onerror : function (r) {
-												highlighter.editor_pane.red.play();
-												status_update( dojo.string.substitute( pgt_strings.CONFIRM_DELETE, [group_store.getValue( current_group, 'name' )]) );
-											},
-											oncomplete : function (r) {
-												var res = r.recv();
-												if ( res && res.content() ) {
-	
-													var old_name = group_store.getValue( current_group, 'name' );
-
-													group_store.fetch({
-														query : { id : group_store.getValue( current_group, 'id' ) },
-														queryOptions : { deep : true },
-														onItem : function (item, req) { try { if (this.isItem( item )) this.deleteItem( item ); } catch (e) { /* meh */ } },
-														scope : group_store
-													});
-	
-													current_group = null;
-	
-													new_kid_button.disabled = true;
-													save_group_button.disabled = true;
-													delete_group_button.disabled = true;
-			
-													var main_settings_fields = [ 'name', 'perm_interval', 'description' ];
-													for ( var i in main_settings_fields ) {
-														var field = main_settings_fields[i];
-														window["editor_pane_" + field].setValue( '' ); // unset the value
-														window["editor_pane_" + field].setDisplayedValue( '' ); // unset the value
-													}
-
-													window["editor_pane_usergroup"].setChecked( false ); // unset the value
-			
-													highlighter.editor_pane.green.play();
-													status_update( dojo.string.substitute( pgt_strings.STATUS_DELETED, [old_name]) );
-												} else {
-													highlighter.editor_pane.red.play();
-													status_update( dojo.string.substitute( pgt_strings.ERROR_DELETING, [old_name]) );
-												}
-											}
-										}).send();
-	
-									}
-]]>	
-								</script>
-							</button>
-	
-						</div>
-	
-						<button jsId="new_kid_button" dojoType="dijit.form.Button" label="&conify.grp_tree.new_child_button.label;">
-							<script type="dojo/connect" event="startup">
-								this.disabled = true;
-							</script>
-							<script type="dojo/connect" event="onClick">
+ 
+         if (group_store.getValue( current_group, '_trueRoot' ) == 'true') {
+          highlighter.editor_pane.red.play();
+          status_update( dojo.string.substitute( pgt_strings.STATUS_ERR_DELETING, [group_store.getValue( current_group, 'name' )])  );
+          return false;
+         }
+
+         if ( current_group.children ) {
+          var kids = current_group.children;
+          if (!dojo.isArray(kids)) kids = [kids];
+ 
+          var existing_kids = dojo.filter(
+           kids,
+           function(kid){ return kid.isdeleted[0] != 1 }
+          );
+          if ( existing_kids.length > 0) {
+           highlighter.editor_pane.red.play();
+           status_update( dojo.string.substitute( pgt_strings.STATUS_ERR_DELETING_DEPENDENCY, [group_store.getValue( current_group, 'name' ), existing_kids.length]) );
+           return;
+          }
+         }
+ 
+         if ( confirm( dojo.string.substitute( pgt_strings.CONFIRM_DELETE, [current_group.name]) ) ) {
+          group_store.setValue( current_group, 'isdeleted', 1 );
+ 
+          var modified_pgt = new pgt().fromStoreItem( current_group );
+          modified_pgt.isdeleted( 1 );
+ 
+          server.pCRUD.request({
+           method : 'open-ils.permacrud.delete.pgt',
+           timeout : 10,
+           params : [ ses, modified_pgt ],
+           onerror : function (r) {
+            highlighter.editor_pane.red.play();
+            status_update( dojo.string.substitute( pgt_strings.CONFIRM_DELETE, [group_store.getValue( current_group, 'name' )]) );
+           },
+           oncomplete : function (r) {
+            var res = r.recv();
+            if ( res && res.content() ) {
+ 
+             var old_name = group_store.getValue( current_group, 'name' );
+
+             group_store.fetch({
+              query : { id : group_store.getValue( current_group, 'id' ) },
+              queryOptions : { deep : true },
+              onItem : function (item, req) { try { if (this.isItem( item )) this.deleteItem( item ); } catch (e) { /* meh */ } },
+              scope : group_store
+             });
+ 
+             current_group = null;
+ 
+             new_kid_button.disabled = true;
+             save_group_button.disabled = true;
+             delete_group_button.disabled = true;
+   
+             var main_settings_fields = [ 'name', 'perm_interval', 'description' ];
+             for ( var i in main_settings_fields ) {
+              var field = main_settings_fields[i];
+              window["editor_pane_" + field].setValue( '' ); // unset the value
+              window["editor_pane_" + field].setDisplayedValue( '' ); // unset the value
+             }
+
+             window["editor_pane_usergroup"].setChecked( false ); // unset the value
+   
+             highlighter.editor_pane.green.play();
+             status_update( dojo.string.substitute( pgt_strings.STATUS_DELETED, [old_name]) );
+            } else {
+             highlighter.editor_pane.red.play();
+             status_update( dojo.string.substitute( pgt_strings.ERROR_DELETING, [old_name]) );
+            }
+           }
+          }).send();
+ 
+         }
+]]> 
+        </script>
+       </button>
+ 
+      </div>
+ 
+      <button jsId="new_kid_button" dojoType="dijit.form.Button" label="&conify.grp_tree.new_child_button.label;">
+       <script type="dojo/connect" event="startup">
+        this.disabled = true;
+       </script>
+       <script type="dojo/connect" event="onClick">
 <![CDATA[
-	
-								var new_fm_obj = new pgt().fromHash({
-									isnew			: 1,
-									name			: pgt_strings.LABEL_NEW_GROUP,
-									usergroup		: 'f',
-									parent			: group_store.getValue( current_group, 'id' )
-								});
-	
-								var err = false;
-								server.pCRUD.request({
-									method : 'open-ils.permacrud.create.pgt',
-									timeout : 10,
-									params : [ ses, new_fm_obj ],
-									onerror : function (r) {
-										highlighter.editor_pane.red.play();
-										status_update( pgt_strings.ERROR_CALLING_METHOD_PGT );
-										err = true;
-									},
-									oncomplete : function (r) {
-										var res = r.recv();
-										if ( res && res.content() ) {
-											group_store.newItem(
-												res.content().toHash(),
-												{ parent : current_group, attribute : 'children' }
-											);
-										} else {
-											highlighter.editor_pane.red.play();
-											status_update( pgt_strings.ERROR_CREATING_CHILD_GROUP );
-											err = true;
-										}
-									},
-								}).send();
-	
-								if (!err) {
-									highlighter.editor_pane.green.play();
-									highlighter.group_tree.green.play();
-									status_update( dojo.string.substitute( pgt_strings.SUCCESS_NEW_CHILD_GROUP, [group_store.getValue( current_group, 'name' )]) );
-								}
-]]>	
-							</script>
-						</button>
-	
-					</div>
-
-					<div id="perm_pane" dojoType="dijit.layout.ContentPane" title="&conify.grp_tree.group_permissions.title;">
-						<script type="dojo/connect" event="onShow">
-							perm_map_model.query = { grp : current_group ? current_group.id[0] : -1 };
-							perm_map_model.refresh();
-							perm_grid.refresh();
-						</script>
-						<div dojoType="dijit.layout.LayoutContainer" orientation="horizontal" style="width:100%; height:100%;">
-							<div id="grid_container" dojoType="dijit.layout.ContentPane" sizeShare="1" layoutAlign="left">
-								<div dojoType="dojox.grid.data.DojoData" id="perm_map_model" jsId="perm_map_model" store="perm_map_store"></div>
-	
-								<div id="perm_grid" dojoType="dojox.Grid" model="perm_map_model" jsId="perm_grid">
-									<script type="dojo/connect" event="startup">
+ 
+        var new_fm_obj = new pgt().fromHash({
+         isnew   : 1,
+         name   : pgt_strings.LABEL_NEW_GROUP,
+         usergroup  : 'f',
+         parent   : group_store.getValue( current_group, 'id' )
+        });
+ 
+        var err = false;
+        server.pCRUD.request({
+         method : 'open-ils.permacrud.create.pgt',
+         timeout : 10,
+         params : [ ses, new_fm_obj ],
+         onerror : function (r) {
+          highlighter.editor_pane.red.play();
+          status_update( pgt_strings.ERROR_CALLING_METHOD_PGT );
+          err = true;
+         },
+         oncomplete : function (r) {
+          var res = r.recv();
+          if ( res && res.content() ) {
+           group_store.newItem(
+            res.content().toHash(),
+            { parent : current_group, attribute : 'children' }
+           );
+          } else {
+           highlighter.editor_pane.red.play();
+           status_update( pgt_strings.ERROR_CREATING_CHILD_GROUP );
+           err = true;
+          }
+         },
+        }).send();
+ 
+        if (!err) {
+         highlighter.editor_pane.green.play();
+         highlighter.group_tree.green.play();
+         status_update( dojo.string.substitute( pgt_strings.SUCCESS_NEW_CHILD_GROUP, [group_store.getValue( current_group, 'name' )]) );
+        }
+]]> 
+       </script>
+      </button>
+ 
+     </div>
+
+     <div id="perm_pane" dojoType="dijit.layout.ContentPane" title="&conify.grp_tree.group_permissions.title;">
+      <script type="dojo/connect" event="onShow">
+       perm_map_model.query = { grp : current_group ? current_group.id[0] : -1 };
+       perm_map_model.refresh();
+       perm_grid.refresh();
+      </script>
+      <div dojoType="dijit.layout.LayoutContainer" orientation="horizontal" style="width:100%; height:100%;">
+       <div id="grid_container" dojoType="dijit.layout.ContentPane" sizeShare="1" layoutAlign="left">
+        <div dojoType="dojox.grid.data.DojoData" id="perm_map_model" jsId="perm_map_model" store="perm_map_store"></div>
+ 
+        <div id="perm_grid" dojoType="dojox.Grid" model="perm_map_model" jsId="perm_grid">
+         <script type="dojo/connect" event="startup">
 <![CDATA[
-										function get_item_part(model_field, item_search_field, item_part, model, store, datum, row) {
-											var formatter = true;
-	
-											if (!row && row != '0') {
-												row = datum;
-												formatter = false;
-											}
-	
-											if(!model.getRow(row)) return null;
-											var value = null;
-	
-											if(!formatter) { //this.editor && (this.editor.alwaysOn || (this.grid.edit.info.rowIndex==row && this.grid.edit.info.cell==this))) {
-												return model.getRow(row)[model_field];
-											}
-	
-											var q = {};
-											q[item_search_field] = model.getRow(row)[model_field];
-	
-											store.fetch({
-												query : q,
-												onItem : function (item) { value = store.getValue( item, item_part ) }
-											});
-
-											return value;
-										}
-	
-			                            window.current_perm_grid_layout = [
-			                                {   cells : [
-				                                    [
-					                                    {	name : pgt_strings.LABEL_CODE,
-															field: "perm",
-															formatter : dojo.partial(get_item_part, "perm", "id", "code", perm_map_model, perm_store),
-															width : "auto"
-														},
-										                {	name : pgt_strings.LABEL_DEPTH,
-															field : "depth",
-															formatter : dojo.partial(get_item_part, "depth", "depth", "name", perm_map_model, ou_type_store),
-															editor : dojox.grid.editors.select,
-															options : dojo.map( _ou_type_list, function (x) { return x.name() } ),
-															values : dojo.map( _ou_type_list, function (x) { return x.depth() } )
-														}, 
-			                                            {	name : pgt_strings.LABEL_GRANTABLE,
-															field : "grantable",
-															editor : dojox.grid.editors.bool,
-															get : function (row) {
-																var gr = get_item_part("id", "id", "grantable", perm_map_model, perm_map_model.store, row, row);
-																if (gr == 't' || gr === true) return true;
-																return false;
-															},
-														}
-											        ]
-												]
-			                                }
-			                            ];
-
-										perm_grid.setStructure(window.current_perm_grid_layout);
+          function get_item_part(model_field, item_search_field, item_part, model, store, datum, row) {
+           var formatter = true;
+ 
+           if (!row && row != '0') {
+            row = datum;
+            formatter = false;
+           }
+ 
+           if(!model.getRow(row)) return null;
+           var value = null;
+ 
+           if(!formatter) { //this.editor && (this.editor.alwaysOn || (this.grid.edit.info.rowIndex==row && this.grid.edit.info.cell==this))) {
+            return model.getRow(row)[model_field];
+           }
+ 
+           var q = {};
+           q[item_search_field] = model.getRow(row)[model_field];
+ 
+           store.fetch({
+            query : q,
+            onItem : function (item) { value = store.getValue( item, item_part ) }
+           });
+
+           return value;
+          }
+ 
+                               window.current_perm_grid_layout = [
+                                   {   cells : [
+                                        [
+                                         { name : pgt_strings.LABEL_CODE,
+               field: "perm",
+               formatter : dojo.partial(get_item_part, "perm", "id", "code", perm_map_model, perm_store),
+               width : "auto"
+              },
+                          { name : pgt_strings.LABEL_DEPTH,
+               field : "depth",
+               formatter : dojo.partial(get_item_part, "depth", "depth", "name", perm_map_model, ou_type_store),
+               editor : dojox.grid.editors.select,
+               options : dojo.map( _ou_type_list, function (x) { return x.name() } ),
+               values : dojo.map( _ou_type_list, function (x) { return x.depth() } )
+              }, 
+                                               { name : pgt_strings.LABEL_GRANTABLE,
+               field : "grantable",
+               editor : dojox.grid.editors.bool,
+               get : function (row) {
+                var gr = get_item_part("id", "id", "grantable", perm_map_model, perm_map_model.store, row, row);
+                if (gr == 't' || gr === true) return true;
+                return false;
+               },
+              }
+                   ]
+            ]
+                                   }
+                               ];
+
+          perm_grid.setStructure(window.current_perm_grid_layout);
 ]]>
-									</script>
-								</div>
-							</div>
-
-							<div id="new_perm_container" dojoType="dijit.layout.ContentPane" sizeShare="1" layoutAlign="client">
-
-								<div dojoType="dijit.form.DropDownButton" id="new_popup" jsId="new_popup">
-									<span>&conify.grp_tree.new_mapping.label;</span>
-									<div  dojoType="dijit.TooltipDialog"> 
-										<table class="tundra">
-											<tr>
-												<td>&conify.grp_tree.permission.label;</td>
-												<td>
-													<div
-													  dojoType="dijit.form.FilteringSelect"
-													  Id="new_perm_select"
-													  jsId="new_perm_select"
-													  store="perm_store"
-													  searchAttr="code"
-													  ignoreCase="true"
-													  required="true"></div>
-												</td>
-											</tr>
-											<tr>
-												<td>&conify.grp_tree.depth.label;</td>
-												<td>
-													<div
-													  dojoType="dijit.form.FilteringSelect"
-													  Id="new_depth_select"
-													  jsId="new_depth_select"
-													  store="ou_type_store"
-													  searchAttr="name"
-													  ignoreCase="true"
-													  required="true"></div>
-												</td>
-											</tr>
-											<tr>
-												<td>&conify.grp_tree.grantable.label;</td>
-												<td>
-													<input
-													  type="checkbox"
-													  dojoType="dijit.form.CheckBox"
-													  Id="new_grant_checkbox"
-													  jsId="new_grant_checkbox"
-													  value="t"></input>
-												</td>
-											</tr>
-										</table>
-
-										<button dojoType="dijit.form.Button" jsId="new_mapping_add" label="&conify.grp_tree.add_mapping_button.label;">
-						                    <script type="dojo/connect" event="onClick">
+         </script>
+        </div>
+       </div>
+
+       <div id="new_perm_container" dojoType="dijit.layout.ContentPane" sizeShare="1" layoutAlign="client">
+
+        <div dojoType="dijit.form.DropDownButton" id="new_popup" jsId="new_popup">
+         <span>&conify.grp_tree.new_mapping.label;</span>
+         <div  dojoType="dijit.TooltipDialog"> 
+          <table class="tundra">
+           <tr>
+            <td>&conify.grp_tree.permission.label;</td>
+            <td>
+             <div
+               dojoType="dijit.form.FilteringSelect"
+               Id="new_perm_select"
+               jsId="new_perm_select"
+               store="perm_store"
+               searchAttr="code"
+               ignoreCase="true"
+               required="true"></div>
+            </td>
+           </tr>
+           <tr>
+            <td>&conify.grp_tree.depth.label;</td>
+            <td>
+             <div
+               dojoType="dijit.form.FilteringSelect"
+               Id="new_depth_select"
+               jsId="new_depth_select"
+               store="ou_type_store"
+               searchAttr="name"
+               ignoreCase="true"
+               required="true"></div>
+            </td>
+           </tr>
+           <tr>
+            <td>&conify.grp_tree.grantable.label;</td>
+            <td>
+             <input
+               type="checkbox"
+               dojoType="dijit.form.CheckBox"
+               Id="new_grant_checkbox"
+               jsId="new_grant_checkbox"
+               value="t"></input>
+            </td>
+           </tr>
+          </table>
+
+          <button dojoType="dijit.form.Button" jsId="new_mapping_add" label="&conify.grp_tree.add_mapping_button.label;">
+                          <script type="dojo/connect" event="onClick">
 <![CDATA[
-						                        var new_perm = new_perm_select.getValue();
-												alert(new_perm);
-						                        if (!new_perm) return;
-		
-						                        var new_type_id = new_depth_select.getValue();
-						                        if (!new_type_id) return;
-		
-												var new_type;
-				                                window.ou_type_store.fetch({
-		    		                                query : { id : new_type_id },
-		                    		                onItem : function (item, req) { try { new_type = item } catch (e) { /* meh */ } },
-		        		                        });
-		
-						                        var new_depth = ou_type_store.getValue( new_type, 'depth')
-						                        var new_grant = new_grant_checkbox.getValue();
-						
-						                        var new_fm_obj = new pgpm().fromHash({
-						                            isnew   	: 1,
-						                            perm    	: new_perm,
-						                            depth   	: new_depth,
-													grp			: group_store.getValue( current_group, 'id' ),
-													grantable	: new_grant ? 't' : 'f'
-						                        });
-						    
-						                        var err = false;
-						                        server.pCRUD.request({
-						                            method : 'open-ils.permacrud.create.pgpm',
-						                            timeout : 10,
-						                            params : [ ses, new_fm_obj ],
-						                            onerror : function (r) {
-						                                highlighter.group_tree.red.play();
-						                                status_update( pgt_strings.ERROR_CALLING_METHOD_PERM_MAP );
-						                                err = true;
-						                            },
-						                            oncomplete : function (r) {
-		
-						                                var res = r.recv();
-						                                if ( res && res.content() ) {
-						                                    var new_item_hash = res.content().toHash();
-						                                    perm_map_store.newItem( new_item_hash );
-						                                    status_update( pgt_strings.SUCCESS_NEW_PERM_MAP );
-						                                    highlighter.group_tree.green.play();
-		
-								                            perm_map_model.query = { grp : current_group ? current_group.id[0] : -1 };
-						                                    perm_grid.model.sort(-1);
-								                            perm_map_model.refresh();
-								                            perm_grid.refresh();
-		
-						                                } else {
-						                                    highlighter.group_tree.red.play();
-						                                    status_update( pgt_strings.ERROR_CREATING_PERM_MAP );
-						                                    err = true;
-						                                }
-						                            }
-						                        }).send();
-
-												new_popup._closeDropDown();
+                              var new_perm = new_perm_select.getValue();
+            alert(new_perm);
+                              if (!new_perm) return;
+  
+                              var new_type_id = new_depth_select.getValue();
+                              if (!new_type_id) return;
+  
+            var new_type;
+                                    window.ou_type_store.fetch({
+                                        query : { id : new_type_id },
+                                        onItem : function (item, req) { try { new_type = item } catch (e) { /* meh */ } },
+                                    });
+  
+                              var new_depth = ou_type_store.getValue( new_type, 'depth')
+                              var new_grant = new_grant_checkbox.getValue();
+      
+                              var new_fm_obj = new pgpm().fromHash({
+                                  isnew    : 1,
+                                  perm     : new_perm,
+                                  depth    : new_depth,
+             grp   : group_store.getValue( current_group, 'id' ),
+             grantable : new_grant ? 't' : 'f'
+                              });
+          
+                              var err = false;
+                              server.pCRUD.request({
+                                  method : 'open-ils.permacrud.create.pgpm',
+                                  timeout : 10,
+                                  params : [ ses, new_fm_obj ],
+                                  onerror : function (r) {
+                                      highlighter.group_tree.red.play();
+                                      status_update( pgt_strings.ERROR_CALLING_METHOD_PERM_MAP );
+                                      err = true;
+                                  },
+                                  oncomplete : function (r) {
+  
+                                      var res = r.recv();
+                                      if ( res && res.content() ) {
+                                          var new_item_hash = res.content().toHash();
+                                          perm_map_store.newItem( new_item_hash );
+                                          status_update( pgt_strings.SUCCESS_NEW_PERM_MAP );
+                                          highlighter.group_tree.green.play();
+  
+                                    perm_map_model.query = { grp : current_group ? current_group.id[0] : -1 };
+                                          perm_grid.model.sort(-1);
+                                    perm_map_model.refresh();
+                                    perm_grid.refresh();
+  
+                                      } else {
+                                          highlighter.group_tree.red.play();
+                                          status_update( pgt_strings.ERROR_CREATING_PERM_MAP );
+                                          err = true;
+                                      }
+                                  }
+                              }).send();
+
+            new_popup._closeDropDown();
 ]]>    
-						                    </script>
-		
-										</button>
-									</div>
-								</div>
+                          </script>
+  
+          </button>
+         </div>
+        </div>
 
-								<button jsId="save_pgpm_button" dojoType="dijit.form.Button" label="&conify.grp_tree.save_changes.label;" onClick="save_them_all()"></button><br/>
+        <button jsId="save_pgpm_button" dojoType="dijit.form.Button" label="&conify.grp_tree.save_changes.label;" onClick="save_them_all()"></button><br/>
 
-				                <button jsId="delete_pgpm_button" dojoType="dijit.form.Button" label="&conify.grp_tree.remove_selected.label;">
-					                <script type="dojo/connect" event="onClick">
+                    <button jsId="delete_pgpm_button" dojoType="dijit.form.Button" label="&conify.grp_tree.remove_selected.label;">
+                     <script type="dojo/connect" event="onClick">
 <![CDATA[
-				                        var selected_rows = perm_grid.selection.getSelected();
-				        
-				                        var selected_items = [];
-				                        for (var i in selected_rows) {
-				                            selected_items.push(
-				                                perm_grid.model.getRow( selected_rows[i] ).__dojo_data_item
-				                            );
-				                        }
-			
-				                        perm_grid.selection.clear();
-				
-					                    for (var i in selected_items) {
-						                    window.current_perm_map = selected_items[i];
-			
-							                perm_map_store.setValue( window.current_perm_map, 'isdeleted', 1 );
-							
-								            var modified_pgpm = new pgpm().fromStoreItem( window.current_perm_map );
-									        modified_pgpm.isdeleted( 1 );
-			            
-			                                server.pCRUD.request({
-			                                    method : 'open-ils.permacrud.delete.pgpm',
-			                                    timeout : 10,
-				                                params : [ ses, modified_pgpm ],
-					                            onerror : function (r) {
-													highlighter.editor_pane.red.play();
-							                        status_update( dojo.string.substitute( pgt_strings.ERROR_DELETING_PERM_MAPPING, [perm_map_store.getValue( window.current_perm_map, 'id' )] ) );
-								                },
-									            oncomplete : function (r) {
-										            var res = r.recv();
-											        if ( res && res.content() ) {
-						
-							                            perm_map_store.fetch({
-								                            query : { id : perm_map_store.getValue( window.current_perm_map, 'id' ) },
-									                        onItem : function (item, req) { try { if (this.isItem( item )) this.deleteItem( item ); } catch (e) { /* meh */ } },
-										                    scope : perm_map_store
-											            });
-		            
-												        window.current_perm_map = null;
-						
-														highlighter.editor_pane.green.play();
-								                        status_update( pgt_strings.SUCCESS_DELETED_PERM_MAP );
-									                } else {
-														highlighter.editor_pane.red.play();
-											            status_update( dojo.string.substitute( pgt_strings.ERROR_DELETING_PERM_MAPPING, [perm_map_store.getValue( window.current_perm_map, 'id' )]) );
-												    }
-			                                    }
-			                                }).send();
-				        
-				                        }
+                            var selected_rows = perm_grid.selection.getSelected();
+            
+                            var selected_items = [];
+                            for (var i in selected_rows) {
+                                selected_items.push(
+                                    perm_grid.model.getRow( selected_rows[i] ).__dojo_data_item
+                                );
+                            }
+   
+                            perm_grid.selection.clear();
+    
+                         for (var i in selected_items) {
+                          window.current_perm_map = selected_items[i];
+   
+                       perm_map_store.setValue( window.current_perm_map, 'isdeleted', 1 );
+       
+                    var modified_pgpm = new pgpm().fromStoreItem( window.current_perm_map );
+                 modified_pgpm.isdeleted( 1 );
+               
+                                   server.pCRUD.request({
+                                       method : 'open-ils.permacrud.delete.pgpm',
+                                       timeout : 10,
+                                    params : [ ses, modified_pgpm ],
+                                 onerror : function (r) {
+             highlighter.editor_pane.red.play();
+                               status_update( dojo.string.substitute( pgt_strings.ERROR_DELETING_PERM_MAPPING, [perm_map_store.getValue( window.current_perm_map, 'id' )] ) );
+                        },
+                     oncomplete : function (r) {
+                      var res = r.recv();
+                   if ( res && res.content() ) {
+      
+                                   perm_map_store.fetch({
+                                    query : { id : perm_map_store.getValue( window.current_perm_map, 'id' ) },
+                                 onItem : function (item, req) { try { if (this.isItem( item )) this.deleteItem( item ); } catch (e) { /* meh */ } },
+                              scope : perm_map_store
+                       });
+              
+                    window.current_perm_map = null;
+      
+              highlighter.editor_pane.green.play();
+                                status_update( pgt_strings.SUCCESS_DELETED_PERM_MAP );
+                         } else {
+              highlighter.editor_pane.red.play();
+                       status_update( dojo.string.substitute( pgt_strings.ERROR_DELETING_PERM_MAPPING, [perm_map_store.getValue( window.current_perm_map, 'id' )]) );
+                }
+                                       }
+                                   }).send();
+            
+                            }
 ]]>
-					                </script>
-						        </button>
-	
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</body>
+                     </script>
+              </button>
+ 
+       </div>
+      </div>
+     </div>
+    </div>
+   </div>
+  </div>
+ </body>
 </html>
diff --git a/Open-ILS/web/conify/global/permission/grp_tree.js b/Open-ILS/web/conify/global/permission/grp_tree.js
index b56e1df044..d8c9dd84a8 100644
--- a/Open-ILS/web/conify/global/permission/grp_tree.js
+++ b/Open-ILS/web/conify/global/permission/grp_tree.js
@@ -56,70 +56,70 @@ var virgin_out_id = -1;
 var highlighter = {};
 
 function status_update (markup) {
-	if (parent !== window && parent.status_update) parent.status_update( markup );
+ if (parent !== window && parent.status_update) parent.status_update( markup );
 }
 
 function save_group () {
 
-	var modified_pgt = new pgt().fromStoreItem( current_group );
-	modified_pgt.ischanged( 1 );
-
-	new_kid_button.disabled = false;
-	save_group_button.disabled = false;
-	delete_group_button.disabled = false;
-
-	server.pCRUD.request({
-		method : 'open-ils.permacrud.update.pgt',
-		timeout : 10,
-		params : [ ses, modified_pgt ],
-		onerror : function (r) {
-			highlighter.editor_pane.red.play();
-			status_update( dojo.string.substitute( pgt_strings.ERROR_SAVING_DATA, [group_store.getValue( current_group, 'name' )]) );
-		},
-		oncomplete : function (r) {
-			var res = r.recv();
-			if ( res && res.content() ) {
-				group_store.setValue( current_group, 'ischanged', 0 );
-				highlighter.editor_pane.green.play();
-				status_update( dojo.string.substitute(pgt_strings.SUCCESS_SAVE, [group_store.getValue( current_group, 'name' )]) );
-			} else {
-				highlighter.editor_pane.red.play();
-				status_update( dojo.string.substitute(pgt_strings.ERROR_SAVING_DATA, [group_store.getValue( current_group, 'name' )]) );
-			}
-		},
-	}).send();
+ var modified_pgt = new pgt().fromStoreItem( current_group );
+ modified_pgt.ischanged( 1 );
+
+ new_kid_button.disabled = false;
+ save_group_button.disabled = false;
+ delete_group_button.disabled = false;
+
+ server.pCRUD.request({
+  method : 'open-ils.permacrud.update.pgt',
+  timeout : 10,
+  params : [ ses, modified_pgt ],
+  onerror : function (r) {
+   highlighter.editor_pane.red.play();
+   status_update( dojo.string.substitute( pgt_strings.ERROR_SAVING_DATA, [group_store.getValue( current_group, 'name' )]) );
+  },
+  oncomplete : function (r) {
+   var res = r.recv();
+   if ( res && res.content() ) {
+    group_store.setValue( current_group, 'ischanged', 0 );
+    highlighter.editor_pane.green.play();
+    status_update( dojo.string.substitute(pgt_strings.SUCCESS_SAVE, [group_store.getValue( current_group, 'name' )]) );
+   } else {
+    highlighter.editor_pane.red.play();
+    status_update( dojo.string.substitute(pgt_strings.ERROR_SAVING_DATA, [group_store.getValue( current_group, 'name' )]) );
+   }
+  },
+ }).send();
 }
 
 function save_perm_map (storeItem) {
 
-	var modified_pgpm = new pgpm().fromStoreItem( storeItem );
-	modified_pgpm.ischanged( 1 );
-
-	server.pCRUD.request({
-		method : 'open-ils.permacrud.update.pgpm',
-		timeout : 10,
-		params : [ ses, modified_pgpm ],
-		onerror : function (r) {
-			highlighter.editor_pane.red.play();
-			status_update( dojo.string.substitute(pgt_strings.ERROR_SAVING_PERM_DATA, [group_store.getValue( current_group, 'name' )]) );
-		},
-		oncomplete : function (r) {
-			var res = r.recv();
-			if ( res && res.content() ) {
-				perm_map_store.setValue( storeItem, 'ischanged', 0 );
-				highlighter.editor_pane.green.play();
-				status_update( dojo.string.substitute(pgt_strings.SUCCESS_SAVE_PERM, [group_store.getValue( current_group, 'name' )]) );
-			} else {
-				highlighter.editor_pane.red.play();
-				status_update( dojo.string.substitute(pgt_strings.ERROR_SAVING_PERM_DATA, [group_store.getValue( current_group, 'name' )]) );
-			}
-		},
-	}).send();
+ var modified_pgpm = new pgpm().fromStoreItem( storeItem );
+ modified_pgpm.ischanged( 1 );
+
+ server.pCRUD.request({
+  method : 'open-ils.permacrud.update.pgpm',
+  timeout : 10,
+  params : [ ses, modified_pgpm ],
+  onerror : function (r) {
+   highlighter.editor_pane.red.play();
+   status_update( dojo.string.substitute(pgt_strings.ERROR_SAVING_PERM_DATA, [group_store.getValue( current_group, 'name' )]) );
+  },
+  oncomplete : function (r) {
+   var res = r.recv();
+   if ( res && res.content() ) {
+    perm_map_store.setValue( storeItem, 'ischanged', 0 );
+    highlighter.editor_pane.green.play();
+    status_update( dojo.string.substitute(pgt_strings.SUCCESS_SAVE_PERM, [group_store.getValue( current_group, 'name' )]) );
+   } else {
+    highlighter.editor_pane.red.play();
+    status_update( dojo.string.substitute(pgt_strings.ERROR_SAVING_PERM_DATA, [group_store.getValue( current_group, 'name' )]) );
+   }
+  },
+ }).send();
 }
 
 function save_them_all (event) {
 
-	var dirtyMaps = [];
+ var dirtyMaps = [];
 
     perm_map_store.fetch({
         query : { ischanged : 1 },
diff --git a/Open-ILS/web/conify/global/permission/perm_list.html b/Open-ILS/web/conify/global/permission/perm_list.html
index fad15ade02..0148e211bf 100644
--- a/Open-ILS/web/conify/global/permission/perm_list.html
+++ b/Open-ILS/web/conify/global/permission/perm_list.html
@@ -13,67 +13,67 @@
 # GNU General Public License for more details.
 -->
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/conify.dtd"-->
+ "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+ <!--#include virtual="/opac/locale/${locale}/conify.dtd"-->
 ]>
 <html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<title>&conify.perm_list.permission_list.title;</title>
+ <head>
+  <title>&conify.perm_list.permission_list.title;</title>
 
-		<style type="text/css">
-			@import url('/js/dojo/dojox/grid/_grid/tundraGrid.css');
-			@import url('/js/dojo/dojo/resources/dojo.css');
-			@import url('/js/dojo/dijit/themes/tundra/tundra.css');
-			@import url('/js/dojo/dojox/widget/Toaster/Toaster.css');
-		</style>
+  <style type="text/css">
+   @import url('/js/dojo/dojox/grid/_grid/tundraGrid.css');
+   @import url('/js/dojo/dojo/resources/dojo.css');
+   @import url('/js/dojo/dijit/themes/tundra/tundra.css');
+   @import url('/js/dojo/dojox/widget/Toaster/Toaster.css');
+  </style>
 
-		<style>
-			html, body {
-				height: 100%;
-				width: 100%;
-				margin: 0px 0px 0px 0px;
-				padding: 0px 0px 0px 0px;
-				overflow: hidden;
-			}
+  <style>
+   html, body {
+    height: 100%;
+    width: 100%;
+    margin: 0px 0px 0px 0px;
+    padding: 0px 0px 0px 0px;
+    overflow: hidden;
+   }
 
-			#perm_grid {
-				border: 0px;
-				width: 100%;
-				height: 100%;
-			}
+   #perm_grid {
+    border: 0px;
+    width: 100%;
+    height: 100%;
+   }
 
-			#grid_container {
-				width: 100%;
-				height: 100%;
-			}
-		</style>
+   #grid_container {
+    width: 100%;
+    height: 100%;
+   }
+  </style>
 
-		<!-- The OpenSRF API writ JS -->
-		<script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
-		<script language='javascript' src='/opac/common/js/Cookies.js' type='text/javascript'></script>
-		<script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
-		<script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
+  <!-- The OpenSRF API writ JS -->
+  <script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
+  <script language='javascript' src='/opac/common/js/Cookies.js' type='text/javascript'></script>
+  <script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
+  <script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
 
-		<!-- Dojo goodness -->
-		<script type="text/javascript" src="/js/dojo/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
-	        <script type="text/javascript" src="/js/dojo/dojo/openils_dojo.js" djConfig="parseOnLoad: true"></script>
-		<script type="text/javascript" src="/js/dojo/dijit/dijit.js"></script>
+  <!-- Dojo goodness -->
+  <script type="text/javascript" src="/js/dojo/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
+         <script type="text/javascript" src="/js/dojo/dojo/openils_dojo.js" djConfig="parseOnLoad: true"></script>
+  <script type="text/javascript" src="/js/dojo/dijit/dijit.js"></script>
 
-		<script type="text/javascript" src="perm_list.js"></script>
+  <script type="text/javascript" src="perm_list.js"></script>
 
-	</head>
+ </head>
 
-	<body class="tundra" id='pagebody'>
+ <body class="tundra" id='pagebody'>
 
-		<div dojoType="dijit.layout.LayoutContainer" id="grid_container" jsId="grid_container" orientation="vertical">
-			<script type="dojo/method">
+  <div dojoType="dijit.layout.LayoutContainer" id="grid_container" jsId="grid_container" orientation="vertical">
+   <script type="dojo/method">
 <![CDATA[
-				window.highlighter= {};
-				window.highlighter.green = dojox.fx.highlight( { color : '#B4FFB4', node : 'grid_container', duration : 500 } );
-				window.highlighter.red = dojox.fx.highlight( { color : '#FF2018', node : 'grid_container', duration : 500 } );
+    window.highlighter= {};
+    window.highlighter.green = dojox.fx.highlight( { color : '#B4FFB4', node : 'grid_container', duration : 500 } );
+    window.highlighter.red = dojox.fx.highlight( { color : '#FF2018', node : 'grid_container', duration : 500 } );
 
-				window.dirtyStore = [];
+    window.dirtyStore = [];
 
                 pCRUD.request({
                     method : 'open-ils.permacrud.search.ppl.atomic',
@@ -86,45 +86,45 @@
                         window._perm_data = ppl.toStoreData( window._perm_list, 'code' );
                         window.perm_store = new dojo.data.ItemFileWriteStore({ data : window._perm_data });
 
-	                    perm_store.onSet = function (item, attr, o, n) {
+                     perm_store.onSet = function (item, attr, o, n) {
                             if (attr == 'ischanged') return;
                             if (n == o) return;
                             this.setValue( item, 'ischanged', 1);
                         };
 
-						window.perm_grid_layout = [
-							{	cells : [
-									[
-										{ name : ppl_strings.LABEL_CODE,        field : "code",        width : "300px", editor : dojox.grid.editors.Dijit, rowSpan : "2" },
-										{ name : ppl_strings.LABEL_DESCRIPTION, field : "description", width : "auto",  editor : dojox.grid.editors.Editor, style : "minHeight:1em;" }
-									],
-									[
-										{ name : ppl_strings.LABEL_TRANSLATION,
-										  width : "10em",
-										  height : "2em",
-										  get : function (row) {
-											if (!window.perm_rows) window.perm_rows = [];
-											var r = window.perm_data_model.getRow(row);
-											if (r) {
-												window.perm_rows[row] = new ccs().fromHash(window.perm_data_model.getRow(row));
-												setTimeout(
-													'dojo.query(".perm_grid_trans_desc_' + row + '").'+
-														'instantiate(openils.widget.TranslatorPopup,{field:"description",'+
-														'targetObject:"window.perm_rows['+row+']"});'+
-														'perm_grid.rowHeightChanged('+row+')',
-													0
-												);
-												var oldnode = dojo.byId('description_translation_' + row);
-												if (oldnode) dijit.byNode(oldnode).destroyRecursive();
-												return '<span class="perm_grid_trans_desc_'+row+'"></span>';
-											}
-											return '';
-										  }
-										}
-									]
-								]
-							}
-						];
+      window.perm_grid_layout = [
+       { cells : [
+         [
+          { name : ppl_strings.LABEL_CODE,        field : "code",        width : "300px", editor : dojox.grid.editors.Dijit, rowSpan : "2" },
+          { name : ppl_strings.LABEL_DESCRIPTION, field : "description", width : "auto",  editor : dojox.grid.editors.Editor, style : "minHeight:1em;" }
+         ],
+         [
+          { name : ppl_strings.LABEL_TRANSLATION,
+            width : "10em",
+            height : "2em",
+            get : function (row) {
+           if (!window.perm_rows) window.perm_rows = [];
+           var r = window.perm_data_model.getRow(row);
+           if (r) {
+            window.perm_rows[row] = new ccs().fromHash(window.perm_data_model.getRow(row));
+            setTimeout(
+             'dojo.query(".perm_grid_trans_desc_' + row + '").'+
+              'instantiate(openils.widget.TranslatorPopup,{field:"description",'+
+              'targetObject:"window.perm_rows['+row+']"});'+
+              'perm_grid.rowHeightChanged('+row+')',
+             0
+            );
+            var oldnode = dojo.byId('description_translation_' + row);
+            if (oldnode) dijit.byNode(oldnode).destroyRecursive();
+            return '<span class="perm_grid_trans_desc_'+row+'"></span>';
+           }
+           return '';
+            }
+          }
+         ]
+        ]
+       }
+      ];
 
                         dojo.addOnUnload( function (event) {
 
@@ -149,129 +149,129 @@
                     }
                 }).send();
 ]]>
-			</script>
+   </script>
 
-			<div dojoType="dijit.layout.LayoutContainer" orientation="horizontal" style="margin-top: 5px;" layoutAlign="top">
-				<span>&conify.perm_list.new_permission.label;</span>
-				<div dojoType="dijit.form.TextBox" id="new_perm_code" jsId="new_perm_code" label="&conify.perm_list.new_code.label;"></div>
-				<button dojoType="dijit.form.Button" id="save_new_perm_code" jsId="save_new_perm_code" label="&conify.perm_list.add_button.label;"> 
-					<script type="dojo/connect" event="onClick">
+   <div dojoType="dijit.layout.LayoutContainer" orientation="horizontal" style="margin-top: 5px;" layoutAlign="top">
+    <span>&conify.perm_list.new_permission.label;</span>
+    <div dojoType="dijit.form.TextBox" id="new_perm_code" jsId="new_perm_code" label="&conify.perm_list.new_code.label;"></div>
+    <button dojoType="dijit.form.Button" id="save_new_perm_code" jsId="save_new_perm_code" label="&conify.perm_list.add_button.label;"> 
+     <script type="dojo/connect" event="onClick">
 <![CDATA[
-						var new_code = new_perm_code.getValue();
-						if (!new_code) return;
+      var new_code = new_perm_code.getValue();
+      if (!new_code) return;
 
-    	                var new_fm_obj = new ppl().fromHash({
-        	                isnew           : 1,
-            	            code            : new_code
-	                    });
+                     var new_fm_obj = new ppl().fromHash({
+                         isnew           : 1,
+                         code            : new_code
+                     });
     
-    	                var err = false;
-        	            pCRUD.request({
-            	            method : 'open-ils.permacrud.create.ppl',
-                	        timeout : 10,
-                    	    params : [ ses, new_fm_obj ],
-	                        onerror : function (r) {
-    	                        highlighter.red.play();
-        	                    status_update( ppl_strings.ERROR_CALLING_METHOD_PPL );
-            	                err = true;
-                	        },
-	                        oncomplete : function (r) {
-    	                        var res = r.recv();
-        	                    if ( res && res.content() ) {
-            	                    var new_item_hash = res.content().toHash();
-            	                    perm_store.newItem( new_item_hash );
-									status_update( dojo.string.substitute(ppl_strings.SUCCESS_CREATING_PERMISSION, [new_item_hash.code]) );
-									perm_grid.model.sort(-1);
-									highlighter.green.play();
-                            	} else {
-	                                highlighter.red.play();
-    	                            status_update( ppl_strings.ERROR_CREATING_PERMISSION );
-        	                        err = true;
-            	                }
-                	        }
-                    	}).send();
+                     var err = false;
+                     pCRUD.request({
+                         method : 'open-ils.permacrud.create.ppl',
+                         timeout : 10,
+                         params : [ ses, new_fm_obj ],
+                         onerror : function (r) {
+                             highlighter.red.play();
+                             status_update( ppl_strings.ERROR_CALLING_METHOD_PPL );
+                             err = true;
+                         },
+                         oncomplete : function (r) {
+                             var res = r.recv();
+                             if ( res && res.content() ) {
+                                 var new_item_hash = res.content().toHash();
+                                 perm_store.newItem( new_item_hash );
+         status_update( dojo.string.substitute(ppl_strings.SUCCESS_CREATING_PERMISSION, [new_item_hash.code]) );
+         perm_grid.model.sort(-1);
+         highlighter.green.play();
+                             } else {
+                                 highlighter.red.play();
+                                 status_update( ppl_strings.ERROR_CREATING_PERMISSION );
+                                 err = true;
+                             }
+                         }
+                     }).send();
 ]]> 
-	                </script>
-				</button>
-			</div>
+                 </script>
+    </button>
+   </div>
 
-			<div dojoType="dijit.layout.ContentPane" style="width:100%; height:100%;" layoutAlign="client">
-				<div dojoType="dojox.grid.data.DojoData" id="perm_data_model" jsId="perm_data_model" store="perm_store" query="{ code : '*' }"></div>
-				<div id="perm_grid" dojoType="dojox.Grid" model="perm_data_model" structure="perm_grid_layout" jsId="perm_grid">
-					<!--
-					<script type="dojo/connect" event="onSet" args="item,attr,oldVal,newVal">
-					</script>
-					-->
-				</div>
-			</div>
+   <div dojoType="dijit.layout.ContentPane" style="width:100%; height:100%;" layoutAlign="client">
+    <div dojoType="dojox.grid.data.DojoData" id="perm_data_model" jsId="perm_data_model" store="perm_store" query="{ code : '*' }"></div>
+    <div id="perm_grid" dojoType="dojox.Grid" model="perm_data_model" structure="perm_grid_layout" jsId="perm_grid">
+     <!--
+     <script type="dojo/connect" event="onSet" args="item,attr,oldVal,newVal">
+     </script>
+     -->
+    </div>
+   </div>
 
-			<div dojoType="dijit.layout.ContentPane" orientation="horizontal" style="margin-bottom: 5px;" layoutAlign="bottom">
-		
-				<button jsId="save_ppl_button" dojoType="dijit.form.Button" label="&conify.perm_list.save_changes.label;" onClick="save_them_all()"></button>
-		
-				<button jsId="delete_ppl_button" dojoType="dijit.form.Button" label="&conify.perm_list.delete_selected.label;">
-					<script type="dojo/connect" event="onClick">
+   <div dojoType="dijit.layout.ContentPane" orientation="horizontal" style="margin-bottom: 5px;" layoutAlign="bottom">
+  
+    <button jsId="save_ppl_button" dojoType="dijit.form.Button" label="&conify.perm_list.save_changes.label;" onClick="save_them_all()"></button>
+  
+    <button jsId="delete_ppl_button" dojoType="dijit.form.Button" label="&conify.perm_list.delete_selected.label;">
+     <script type="dojo/connect" event="onClick">
 <![CDATA[
-						var selected_rows = perm_grid.selection.getSelected();
-		
-						var selected_items = [];
-						for (var i in selected_rows) {
-							selected_items.push(
-								perm_grid.model.getRow( selected_rows[i] ).__dojo_data_item
-							);
-						}
+      var selected_rows = perm_grid.selection.getSelected();
+  
+      var selected_items = [];
+      for (var i in selected_rows) {
+       selected_items.push(
+        perm_grid.model.getRow( selected_rows[i] ).__dojo_data_item
+       );
+      }
 
-						perm_grid.selection.clear();
+      perm_grid.selection.clear();
 
-						for (var i in selected_items) {
-							current_perm = selected_items[i];
+      for (var i in selected_items) {
+       current_perm = selected_items[i];
 
-							if ( confirm( dojo.string.substitute(ppl_strings.CONFIRM_DELETE, [perm_store.getValue(current_perm, 'code')]) ) ) {
+       if ( confirm( dojo.string.substitute(ppl_strings.CONFIRM_DELETE, [perm_store.getValue(current_perm, 'code')]) ) ) {
 
-								perm_store.setValue( current_perm, 'isdeleted', 1 );
-			
-								var modified_ppl = new ppl().fromStoreItem( current_perm );
-								modified_ppl.isdeleted( 1 );
-			
-								pCRUD.request({
-									method : 'open-ils.permacrud.delete.ppl',
-									timeout : 10,
-									params : [ ses, modified_ppl ],
-									onerror : function (r) {
-										highlighter.red.play();
-										status_update( dojo.string.substitute(ppl_strings.ERROR_DELETING, [perm_store.getValue( current_perm, 'code' )]) );
-									},
-									oncomplete : function (r) {
-										var res = r.recv();
-										if ( res && res.content() ) {
-			
-											var old_name = perm_store.getValue( current_perm, 'code' );
-		
-											perm_store.fetch({
-												query : { id : perm_store.getValue( current_perm, 'id' ) },
-												onItem : function (item, req) { try { if (this.isItem( item )) this.deleteItem( item ); } catch (e) { /* meh */ } },
-												scope : perm_store
-											});
-			
-											current_perm = null;
-			
-											highlighter.green.play();
-											status_update( dojo.string.substitute(ppl_strings.STATUS_DELETED, [old_name]) );
-										} else {
-											highlighter.red.play();
-											status_update( dojo.string.substitute(ppl_strings.ERROR_DELETING, [old_name]) );
-										}
-									}
-								}).send();
-		
-							}
-						}
+        perm_store.setValue( current_perm, 'isdeleted', 1 );
+   
+        var modified_ppl = new ppl().fromStoreItem( current_perm );
+        modified_ppl.isdeleted( 1 );
+   
+        pCRUD.request({
+         method : 'open-ils.permacrud.delete.ppl',
+         timeout : 10,
+         params : [ ses, modified_ppl ],
+         onerror : function (r) {
+          highlighter.red.play();
+          status_update( dojo.string.substitute(ppl_strings.ERROR_DELETING, [perm_store.getValue( current_perm, 'code' )]) );
+         },
+         oncomplete : function (r) {
+          var res = r.recv();
+          if ( res && res.content() ) {
+   
+           var old_name = perm_store.getValue( current_perm, 'code' );
+  
+           perm_store.fetch({
+            query : { id : perm_store.getValue( current_perm, 'id' ) },
+            onItem : function (item, req) { try { if (this.isItem( item )) this.deleteItem( item ); } catch (e) { /* meh */ } },
+            scope : perm_store
+           });
+   
+           current_perm = null;
+   
+           highlighter.green.play();
+           status_update( dojo.string.substitute(ppl_strings.STATUS_DELETED, [old_name]) );
+          } else {
+           highlighter.red.play();
+           status_update( dojo.string.substitute(ppl_strings.ERROR_DELETING, [old_name]) );
+          }
+         }
+        }).send();
+  
+       }
+      }
 ]]>
-					</script>
-				</button>
-	
-			</div>
-		</div>
-	
-	</body>
+     </script>
+    </button>
+ 
+   </div>
+  </div>
+ 
+ </body>
 </html>
diff --git a/Open-ILS/web/conify/global/permission/perm_list.js b/Open-ILS/web/conify/global/permission/perm_list.js
index ad845ca19d..58c9cbd32a 100644
--- a/Open-ILS/web/conify/global/permission/perm_list.js
+++ b/Open-ILS/web/conify/global/permission/perm_list.js
@@ -46,61 +46,61 @@ var virgin_out_id = -1;
 var highlighter = {};
 
 function status_update (markup) {
-	if (parent !== window && parent.status_update) parent.status_update( markup );
+ if (parent !== window && parent.status_update) parent.status_update( markup );
 }
 
 function save_perm () {
 
-	var modified_ppl = new ppl().fromStoreItem( current_perm );
-	modified_ppl.ischanged( 1 );
-	modified_ppl.description( dojo.string.trim( modified_ppl.description() ) );
-	modified_ppl.code( dojo.string.trim( modified_ppl.code() ) );
-
-	pCRUD.request({
-		method : 'open-ils.permacrud.update.ppl',
-		timeout : 10,
-		params : [ ses, modified_ppl ],
-		onerror : function (r) {
-			highlighter.red.play();
-			status_update( dojo.string.substitute(ppl_strings.ERROR_SAVING_DATA, [perm_store.getValue(current_perm, 'code')]) );
-		},
-		oncomplete : function (r) {
-			var res = r.recv();
-			if ( res && res.content() ) {
-				perm_store.setValue( current_perm, 'ischanged', 0 );
-				highlighter.green.play();
-				status_update( dojo.string.substitute(ppl_strings.SUCCESS_SAVE, [perm_store.getValue(current_perm, 'code')]) );
-			} else {
-				highlighter.red.play();
-				status_update( dojo.string.substitute(ppl_strings.ERROR_SAVING_DATA, [perm_store.getValue(current_perm, 'code')]) );
-			}
-		},
-	}).send();
+ var modified_ppl = new ppl().fromStoreItem( current_perm );
+ modified_ppl.ischanged( 1 );
+ modified_ppl.description( dojo.string.trim( modified_ppl.description() ) );
+ modified_ppl.code( dojo.string.trim( modified_ppl.code() ) );
+
+ pCRUD.request({
+  method : 'open-ils.permacrud.update.ppl',
+  timeout : 10,
+  params : [ ses, modified_ppl ],
+  onerror : function (r) {
+   highlighter.red.play();
+   status_update( dojo.string.substitute(ppl_strings.ERROR_SAVING_DATA, [perm_store.getValue(current_perm, 'code')]) );
+  },
+  oncomplete : function (r) {
+   var res = r.recv();
+   if ( res && res.content() ) {
+    perm_store.setValue( current_perm, 'ischanged', 0 );
+    highlighter.green.play();
+    status_update( dojo.string.substitute(ppl_strings.SUCCESS_SAVE, [perm_store.getValue(current_perm, 'code')]) );
+   } else {
+    highlighter.red.play();
+    status_update( dojo.string.substitute(ppl_strings.ERROR_SAVING_DATA, [perm_store.getValue(current_perm, 'code')]) );
+   }
+  },
+ }).send();
 }
 
 function save_them_all (event) {
 
-	perm_store.fetch({
-		query : { ischanged : 1 },
-		onItem : function (item, req) { try { if (this.isItem( item )) window.dirtyStore.push( item ); } catch (e) { /* meh */ } },
-		scope : perm_store
-	});
+ perm_store.fetch({
+  query : { ischanged : 1 },
+  onItem : function (item, req) { try { if (this.isItem( item )) window.dirtyStore.push( item ); } catch (e) { /* meh */ } },
+  scope : perm_store
+ });
 
-	var confirmation = true;
+ var confirmation = true;
 
 
-	if (event && dirtyStore.length > 0) {
-		confirmation = confirm( ppl_strings.CONFIRM_EXIT_PPL );
-	}
+ if (event && dirtyStore.length > 0) {
+  confirmation = confirm( ppl_strings.CONFIRM_EXIT_PPL );
+ }
 
-	if (confirmation) {
-		for (var i in window.dirtyStore) {
-			window.current_perm = window.dirtyStore[i];
-			save_perm(true);
-		}
+ if (confirmation) {
+  for (var i in window.dirtyStore) {
+   window.current_perm = window.dirtyStore[i];
+   save_perm(true);
+  }
 
-		window.dirtyStore = [];
-	}
+  window.dirtyStore = [];
+ }
 }
 
 dojo.addOnUnload( save_them_all );
diff --git a/Open-ILS/web/js/dojo/fieldmapper/Fieldmapper.js b/Open-ILS/web/js/dojo/fieldmapper/Fieldmapper.js
index 901d87d084..8f52e0ff97 100644
--- a/Open-ILS/web/js/dojo/fieldmapper/Fieldmapper.js
+++ b/Open-ILS/web/js/dojo/fieldmapper/Fieldmapper.js
@@ -18,82 +18,82 @@
 if(!dojo._hasResource["fieldmapper.Fieldmapper"]){
 
 /* generate fieldmapper javascript classes.  This expects a global variable
-	called 'fmclasses' to be fleshed with the classes we need to build */
-
-	function FMEX(message) { this.message = message; }
-	FMEX.toString = function() { return "FieldmapperException: " + this.message + "\n"; }
-
-
-	dojo._hasResource["fieldmapper.Fieldmapper"] = true;
-	dojo.provide("fieldmapper.Fieldmapper");
-	dojo.require("DojoSRF");
-
-	dojo.declare( "fieldmapper.Fieldmapper", null, {
-
-		constructor : function (initArray) {
-			if (initArray) {
-				if (dojo.isArray(initArray)) {
-					this.a = initArray;
-				} else {
-					this.a = [];
-				}
-			}
-		},
-
-		_isfieldmapper : true,
-
-		clone : function() {
-			var obj = new this.constructor();
-
-			for( var i in this.a ) {
-				var thing = this.a[i];
-				if(thing == null) continue;
-
-				if( thing._isfieldmapper ) {
-					obj.a[i] = thing.clone();
-				} else {
-
-					if(instanceOf(thing, Array)) {
-						obj.a[i] = new Array();
-
-						for( var j in thing ) {
-
-							if( thing[j]._isfieldmapper )
-								obj.a[i][j] = thing[j].clone();
-							else
-								obj.a[i][j] = thing[j];
-						}
-					} else {
-						obj.a[i] = thing;
-					}
-				}
-			}
-			return obj;
-		},
-
-		isnew : function(n) { if(arguments.length == 1) this.a[0] =n; return this.a[0]; },
-		ischanged : function(n) { if(arguments.length == 1) this.a[1] =n; return this.a[1]; },
-		isdeleted : function(n) { if(arguments.length == 1) this.a[2] =n; return this.a[2]; }
-	});
-
-	fieldmapper._request = function ( meth, staff, params ) {
-		var ses = OpenSRF.CachedClientSession( meth[0] );
-		if (!ses) return null;
-
-		var result = null;
-		var args = {};
-
-		if (dojo.isArray(params)) {
-			args.params = params;
-		} else {
-
-			if (dojo.isObject(params)) {
-				args = params;
-			} else {
+ called 'fmclasses' to be fleshed with the classes we need to build */
+
+ function FMEX(message) { this.message = message; }
+ FMEX.toString = function() { return "FieldmapperException: " + this.message + "\n"; }
+
+
+ dojo._hasResource["fieldmapper.Fieldmapper"] = true;
+ dojo.provide("fieldmapper.Fieldmapper");
+ dojo.require("DojoSRF");
+
+ dojo.declare( "fieldmapper.Fieldmapper", null, {
+
+  constructor : function (initArray) {
+   if (initArray) {
+    if (dojo.isArray(initArray)) {
+     this.a = initArray;
+    } else {
+     this.a = [];
+    }
+   }
+  },
+
+  _isfieldmapper : true,
+
+  clone : function() {
+   var obj = new this.constructor();
+
+   for( var i in this.a ) {
+    var thing = this.a[i];
+    if(thing == null) continue;
+
+    if( thing._isfieldmapper ) {
+     obj.a[i] = thing.clone();
+    } else {
+
+     if(instanceOf(thing, Array)) {
+      obj.a[i] = new Array();
+
+      for( var j in thing ) {
+
+       if( thing[j]._isfieldmapper )
+        obj.a[i][j] = thing[j].clone();
+       else
+        obj.a[i][j] = thing[j];
+      }
+     } else {
+      obj.a[i] = thing;
+     }
+    }
+   }
+   return obj;
+  },
+
+  isnew : function(n) { if(arguments.length == 1) this.a[0] =n; return this.a[0]; },
+  ischanged : function(n) { if(arguments.length == 1) this.a[1] =n; return this.a[1]; },
+  isdeleted : function(n) { if(arguments.length == 1) this.a[2] =n; return this.a[2]; }
+ });
+
+ fieldmapper._request = function ( meth, staff, params ) {
+  var ses = OpenSRF.CachedClientSession( meth[0] );
+  if (!ses) return null;
+
+  var result = null;
+  var args = {};
+
+  if (dojo.isArray(params)) {
+   args.params = params;
+  } else {
+
+   if (dojo.isObject(params)) {
+    args = params;
+   } else {
                 args.params = [].splice.call(arguments, 1, arguments.length - 1);
-			}
+   }
 
-		}
+  }
 
         if (!args.async && !args.timeout) args.timeout = 10;
 
@@ -109,193 +109,193 @@ if(!dojo._hasResource["fieldmapper.Fieldmapper"]){
             }
         }
 
-		if (!args.onerror) {
-			args.onerror = function (r) {
-				throw new Error('Request error encountered! ' + r);
-			}
-		}
+  if (!args.onerror) {
+   args.onerror = function (r) {
+    throw new Error('Request error encountered! ' + r);
+   }
+  }
 
-		if (!args.oncomplete) {
-			args.oncomplete = function (r) {
-				var x = r.recv();
-				if (x) result = x.content();
-			}
-		}
+  if (!args.oncomplete) {
+   args.oncomplete = function (r) {
+    var x = r.recv();
+    if (x) result = x.content();
+   }
+  }
 
-		args.method = meth[1];
-		if (staff && meth[2]) args.method += '.staff';
+  args.method = meth[1];
+  if (staff && meth[2]) args.method += '.staff';
 
-		ses.request(args).send();
+  ses.request(args).send();
 
-		return result;
-	};
+  return result;
+ };
 
-	fieldmapper.standardRequest = function (meth, params) { return fieldmapper._request(meth, false, params) };
-	fieldmapper.Fieldmapper.prototype.standardRequest = fieldmapper.standardRequest;
+ fieldmapper.standardRequest = function (meth, params) { return fieldmapper._request(meth, false, params) };
+ fieldmapper.Fieldmapper.prototype.standardRequest = fieldmapper.standardRequest;
 
-	fieldmapper.staffRequest = function (meth, params) { return fieldmapper._request(meth, true, params) };
-	fieldmapper.Fieldmapper.prototype.staffRequest = fieldmapper.staffRequest;
+ fieldmapper.staffRequest = function (meth, params) { return fieldmapper._request(meth, true, params) };
+ fieldmapper.Fieldmapper.prototype.staffRequest = fieldmapper.staffRequest;
 
     // if we were called by the IDL loader ...
     if ( fieldmapper.IDL && fieldmapper.IDL.loaded ) {
-    	for( var cl in fieldmapper.IDL.fmclasses ) {
-    		dojo.provide( cl );
-    		dojo.declare( cl , fieldmapper.Fieldmapper, {
-    			constructor : function () {
-    				if (!this.a) this.a = [];
-    				this.classname = this.declaredClass;
+     for( var cl in fieldmapper.IDL.fmclasses ) {
+      dojo.provide( cl );
+      dojo.declare( cl , fieldmapper.Fieldmapper, {
+       constructor : function () {
+        if (!this.a) this.a = [];
+        this.classname = this.declaredClass;
                     this._fields = [];
                     this.Structure = fieldmapper.IDL.fmclasses[this.classname]
 
                     for (var f in fieldmapper.IDL.fmclasses[this.classname].fields) {
                         var field = fieldmapper.IDL.fmclasses[this.classname].fields[f];
                         var p = field.array_position;
-        				this._fields.push( field.name );
-    					this[field.name]=new Function('n', 'if(arguments.length==1)this.a['+p+']=n;return this.a['+p+'];');
+            this._fields.push( field.name );
+         this[field.name]=new Function('n', 'if(arguments.length==1)this.a['+p+']=n;return this.a['+p+'];');
                     }
-    			}
-    		});
-    		fieldmapper[cl] = window[cl]; // alias into place
-    		fieldmapper[cl].Identifier = fieldmapper.IDL.fmclasses[cl].pkey;
-    	}
+       }
+      });
+      fieldmapper[cl] = window[cl]; // alias into place
+      fieldmapper[cl].Identifier = fieldmapper.IDL.fmclasses[cl].pkey;
+     }
 
     // ... otherwise we need to get the oldschool fmall.js stuff, which will lack .structure
     } else {
-    	if (!window.fmclasses)
+     if (!window.fmclasses)
             dojo.require("fieldmapper.fmall", true);
 
-    	for( var cl in fmclasses ) {
-    		dojo.provide( cl );
-    		dojo.declare( cl , fieldmapper.Fieldmapper, {
-    			constructor : function () {
-    				if (!this.a) this.a = [];
-    				this.classname = this.declaredClass;
-    				this._fields = fmclasses[this.classname];
-    				for( var pos = 0; pos <  this._fields.length; pos++ ) {
-    					var p = parseInt(pos);
-    					var f = this._fields[pos];
-    					this[f]=new Function('n', 'if(arguments.length==1)this.a['+p+']=n;return this.a['+p+'];');
-    				}
-    			}
-    		});
-    		fieldmapper[cl] = window[cl]; // alias into place
-    		fieldmapper[cl].Identifier = 'id'; // alias into place
-    	}
-
-    	fieldmapper.i18n_l.Identifier = 'code';
-    	fieldmapper.ccpbt.Identifier = 'code';
-    	fieldmapper.ccnbt.Identifier = 'code';
-    	fieldmapper.cbrebt.Identifier = 'code';
-    	fieldmapper.cubt.Identifier = 'code';
-    	fieldmapper.ccm.Identifier = 'code';
-    	fieldmapper.cvrfm.Identifier = 'code';
-    	fieldmapper.clm.Identifier = 'code';
-    	fieldmapper.cam.Identifier = 'code';
-    	fieldmapper.cifm.Identifier = 'code';
-    	fieldmapper.citm.Identifier = 'code';
-    	fieldmapper.cblvl.Identifier = 'code';
-    	fieldmapper.clfm.Identifier = 'code';
-    	fieldmapper.mous.Identifier = 'usr';
-    	fieldmapper.moucs.Identifier = 'usr';
-    	fieldmapper.mucs.Identifier = 'usr';
-    	fieldmapper.mus.Identifier = 'usr';
-    	fieldmapper.rxbt.Identifier = 'xact';
-    	fieldmapper.rxpt.Identifier = 'xact';
-    	fieldmapper.cxt.Identifier = 'name';
-    	fieldmapper.amtr.Identifier = 'matchpoint';
+     for( var cl in fmclasses ) {
+      dojo.provide( cl );
+      dojo.declare( cl , fieldmapper.Fieldmapper, {
+       constructor : function () {
+        if (!this.a) this.a = [];
+        this.classname = this.declaredClass;
+        this._fields = fmclasses[this.classname];
+        for( var pos = 0; pos <  this._fields.length; pos++ ) {
+         var p = parseInt(pos);
+         var f = this._fields[pos];
+         this[f]=new Function('n', 'if(arguments.length==1)this.a['+p+']=n;return this.a['+p+'];');
+        }
+       }
+      });
+      fieldmapper[cl] = window[cl]; // alias into place
+      fieldmapper[cl].Identifier = 'id'; // alias into place
+     }
+
+     fieldmapper.i18n_l.Identifier = 'code';
+     fieldmapper.ccpbt.Identifier = 'code';
+     fieldmapper.ccnbt.Identifier = 'code';
+     fieldmapper.cbrebt.Identifier = 'code';
+     fieldmapper.cubt.Identifier = 'code';
+     fieldmapper.ccm.Identifier = 'code';
+     fieldmapper.cvrfm.Identifier = 'code';
+     fieldmapper.clm.Identifier = 'code';
+     fieldmapper.cam.Identifier = 'code';
+     fieldmapper.cifm.Identifier = 'code';
+     fieldmapper.citm.Identifier = 'code';
+     fieldmapper.cblvl.Identifier = 'code';
+     fieldmapper.clfm.Identifier = 'code';
+     fieldmapper.mous.Identifier = 'usr';
+     fieldmapper.moucs.Identifier = 'usr';
+     fieldmapper.mucs.Identifier = 'usr';
+     fieldmapper.mus.Identifier = 'usr';
+     fieldmapper.rxbt.Identifier = 'xact';
+     fieldmapper.rxpt.Identifier = 'xact';
+     fieldmapper.cxt.Identifier = 'name';
+     fieldmapper.amtr.Identifier = 'matchpoint';
 
     }
 
-	fieldmapper.OpenSRF = {};
-
-	/*	Methods are defined as [ service, method, have_staff ]
-		An optional 3rd component is when a method is followed by true, such methods
-		have a staff counterpart and should have ".staff" appended to the method 
-		before the method is called when in XUL mode */
-	fieldmapper.OpenSRF.methods = {
-		SEARCH_MRS : ['open-ils.search','open-ils.search.metabib.multiclass',true],
-		SEARCH_RS : ['open-ils.search','open-ils.search.biblio.multiclass',true],
-		SEARCH_MRS_QUERY : ['open-ils.search','open-ils.search.metabib.multiclass.query',true],
-		SEARCH_RS_QUERY : ['open-ils.search','open-ils.search.biblio.multiclass.query',true],
-		FETCH_SEARCH_RIDS : ['open-ils.search','open-ils.search.biblio.record.class.search',true],
-		FETCH_MRMODS : ['open-ils.search','open-ils.search.biblio.metarecord.mods_slim.retrieve'],
-		FETCH_MODS_FROM_COPY : ['open-ils.search','open-ils.search.biblio.mods_from_copy'],
-		FETCH_MR_COPY_COUNTS : ['open-ils.search','open-ils.search.biblio.metarecord.copy_count',true],
-		FETCH_RIDS : ['open-ils.search','open-ils.search.biblio.metarecord_to_records',true],
-		FETCH_RMODS : ['open-ils.search','open-ils.search.biblio.record.mods_slim.retrieve'],
-		FETCH_R_COPY_COUNTS : ['open-ils.search','open-ils.search.biblio.record.copy_count',true],
-		FETCH_FLESHED_USER : ['open-ils.actor','open-ils.actor.user.fleshed.retrieve'],
-		FETCH_SESSION : ['open-ils.auth','open-ils.auth.session.retrieve'],
-		LOGIN_INIT : ['open-ils.auth','open-ils.auth.authenticate.init'],
-		LOGIN_COMPLETE : ['open-ils.auth','open-ils.auth.authenticate.complete'],
-		LOGIN_DELETE : ['open-ils.auth','open-ils.auth.session.delete'],
-		FETCH_USER_PREFS : ['open-ils.actor','open-ils.actor.patron.settings.retrieve'], 
-		UPDATE_USER_PREFS : ['open-ils.actor','open-ils.actor.patron.settings.update'], 
-		FETCH_COPY_STATUSES : ['open-ils.search','open-ils.search.config.copy_status.retrieve.all'],
-		FETCH_COPY_COUNTS_SUMMARY : ['open-ils.search','open-ils.search.biblio.copy_counts.summary.retrieve'],
-		FETCH_MARC_HTML : ['open-ils.search','open-ils.search.biblio.record.html'],
-		FETCH_CHECKED_OUT_SUM : ['open-ils.actor','open-ils.actor.user.checked_out'],
-		FETCH_HOLDS : ['open-ils.circ','open-ils.circ.holds.retrieve'],
-		FETCH_FINES_SUMMARY : ['open-ils.actor','open-ils.actor.user.fines.summary'],
-		FETCH_TRANSACTIONS : ['open-ils.actor','open-ils.actor.user.transactions.have_charge.fleshed'],
-		FETCH_MONEY_BILLING : ['open-ils.circ','open-ils.circ.money.billing.retrieve.all'],
-		FETCH_CROSSREF : ['open-ils.search','open-ils.search.authority.crossref'],
-		FETCH_CROSSREF_BATCH : ['open-ils.search','open-ils.search.authority.crossref.batch'],
-		CREATE_HOLD : ['open-ils.circ','open-ils.circ.holds.create'],
-		CREATE_HOLD_OVERRIDE : ['open-ils.circ','open-ils.circ.holds.create.override'],
-		CANCEL_HOLD : ['open-ils.circ','open-ils.circ.hold.cancel'],
-		UPDATE_USERNAME : ['open-ils.actor','open-ils.actor.user.username.update'],
-		UPDATE_PASSWORD : ['open-ils.actor','open-ils.actor.user.password.update'],
-		UPDATE_EMAIL : ['open-ils.actor','open-ils.actor.user.email.update'],
-		RENEW_CIRC : ['open-ils.circ','open-ils.circ.renew'],
-		CHECK_SPELL : ['open-ils.search','open-ils.search.spellcheck'],
-		FETCH_REVIEWS : ['open-ils.search','open-ils.search.added_content.review.retrieve.all'],
-		FETCH_TOC : ['open-ils.search','open-ils.search.added_content.toc.retrieve'],
-		FETCH_ACONT_SUMMARY : ['open-ils.search','open-ils.search.added_content.summary.retrieve'],
-		FETCH_USER_BYBARCODE : ['open-ils.actor','open-ils.actor.user.fleshed.retrieve_by_barcode'],
-		FETCH_ADV_MARC_MRIDS : ['open-ils.search','open-ils.search.biblio.marc',true],
-		FETCH_ADV_ISBN_RIDS : ['open-ils.search','open-ils.search.biblio.isbn'],
-		FETCH_ADV_ISSN_RIDS : ['open-ils.search','open-ils.search.biblio.issn'],
-		FETCH_ADV_TCN_RIDS : ['open-ils.search','open-ils.search.biblio.tcn'],
-		FETCH_CNBROWSE : ['open-ils.search','open-ils.search.callnumber.browse'],
-		FETCH_CONTAINERS : ['open-ils.actor','open-ils.actor.container.retrieve_by_class'],
-		FETCH_CONTAINERS : ['open-ils.actor','open-ils.actor.container.retrieve_by_class'],
-		CREATE_CONTAINER : ['open-ils.actor','open-ils.actor.container.create'],
-		DELETE_CONTAINER : ['open-ils.actor','open-ils.actor.container.full_delete'],
-		CREATE_CONTAINER_ITEM : ['open-ils.actor','open-ils.actor.container.item.create'],
-		DELETE_CONTAINER_ITEM : ['open-ils.actor','open-ils.actor.container.item.delete'],
-		FLESH_CONTAINER : ['open-ils.actor','open-ils.actor.container.flesh'],
-		FLESH_PUBLIC_CONTAINER : ['open-ils.actor','open-ils.actor.container.public.flesh'],
-		UPDATE_CONTAINER : ['open-ils.actor','open-ils.actor.container.update'],
-		FETCH_COPY : ['open-ils.search','open-ils.search.asset.copy.retrieve'],
-		FETCH_FLESHED_COPY : ['open-ils.search','open-ils.search.asset.copy.fleshed2.retrieve'],
-		CHECK_HOLD_POSSIBLE : ['open-ils.circ','open-ils.circ.title_hold.is_possible'],
-		UPDATE_HOLD : ['open-ils.circ','open-ils.circ.hold.update'],
-		FETCH_COPIES_FROM_VOLUME : ['open-ils.search','open-ils.search.asset.copy.retrieve_by_cn_label',true],
-		FETCH_VOLUME_BY_INFO : ['open-ils.search','open-ils.search.call_number.retrieve_by_info'], /* XXX staff method? */
-		FETCH_VOLUME : ['open-ils.search','open-ils.search.asset.call_number.retrieve'],
-		FETCH_COPY_LOCATIONS : ['open-ils.circ','open-ils.circ.copy_location.retrieve.all'],
-		FETCH_COPY_NOTES : ['open-ils.circ','open-ils.circ.copy_note.retrieve.all'],
-		FETCH_COPY_STAT_CATS : ['open-ils.circ','open-ils.circ.asset.stat_cat_entries.fleshed.retrieve_by_copy'],
-		FETCH_LIT_FORMS : ['open-ils.search','open-ils.search.biblio.lit_form_map.retrieve.all'],
-		FETCH_ITEM_FORMS : ['open-ils.search','open-ils.search.biblio.item_form_map.retrieve.all'],
-		FETCH_ITEM_TYPES : ['open-ils.search','open-ils.search.biblio.item_type_map.retrieve.all'],
-		FETCH_AUDIENCES : ['open-ils.search','open-ils.search.biblio.audience_map.retrieve.all'],
-		FETCH_HOLD_STATUS : ['open-ils.circ','open-ils.circ.hold.status.retrieve'],
-		FETCH_NON_CAT_CIRCS : ['open-ils.circ','open-ils.circ.open_non_cataloged_circulation.user'],
-		FETCH_NON_CAT_CIRC : ['open-ils.circ','open-ils.circ.non_cataloged_circulation.retrieve'],
-		FETCH_NON_CAT_TYPES : ['open-ils.circ','open-ils.circ.non_cat_types.retrieve.all'],
-		FETCH_BRE : ['open-ils.search','open-ils.search.biblio.record_entry.slim.retrieve'],
-		CHECK_USERNAME : ['open-ils.actor','open-ils.actor.username.exists'],
-		FETCH_CIRC_BY_ID : ['open-ils.circ','open-ils.circ.retrieve'],
-		FETCH_MR_DESCRIPTORS : ['open-ils.search','open-ils.search.metabib.record_to_descriptors'],
-		FETCH_HIGHEST_PERM_ORG : ['open-ils.actor','open-ils.actor.user.perm.highest_org.batch'],
-		FETCH_USER_NOTES : ['open-ils.actor','open-ils.actor.note.retrieve.all'],
-		FETCH_ORG_BY_SHORTNAME : ['open-ils.actor','open-ils.actor.org_unit.retrieve_by_shorname'],
-		FETCH_BIB_ID_BY_BARCODE : ['open-ils.search','open-ils.search.bib_id.by_barcode'],
-		FETCH_ORG_SETTING : ['open-ils.actor','open-ils.actor.ou_setting.ancestor_default'],
-		FETCH_ORG_SETTING_BATCH : ['open-ils.actor','open-ils.actor.ou_setting.ancestor_default.batch']
-	};
+ fieldmapper.OpenSRF = {};
+
+ /* Methods are defined as [ service, method, have_staff ]
+  An optional 3rd component is when a method is followed by true, such methods
+  have a staff counterpart and should have ".staff" appended to the method 
+  before the method is called when in XUL mode */
+ fieldmapper.OpenSRF.methods = {
+  SEARCH_MRS : ['open-ils.search','open-ils.search.metabib.multiclass',true],
+  SEARCH_RS : ['open-ils.search','open-ils.search.biblio.multiclass',true],
+  SEARCH_MRS_QUERY : ['open-ils.search','open-ils.search.metabib.multiclass.query',true],
+  SEARCH_RS_QUERY : ['open-ils.search','open-ils.search.biblio.multiclass.query',true],
+  FETCH_SEARCH_RIDS : ['open-ils.search','open-ils.search.biblio.record.class.search',true],
+  FETCH_MRMODS : ['open-ils.search','open-ils.search.biblio.metarecord.mods_slim.retrieve'],
+  FETCH_MODS_FROM_COPY : ['open-ils.search','open-ils.search.biblio.mods_from_copy'],
+  FETCH_MR_COPY_COUNTS : ['open-ils.search','open-ils.search.biblio.metarecord.copy_count',true],
+  FETCH_RIDS : ['open-ils.search','open-ils.search.biblio.metarecord_to_records',true],
+  FETCH_RMODS : ['open-ils.search','open-ils.search.biblio.record.mods_slim.retrieve'],
+  FETCH_R_COPY_COUNTS : ['open-ils.search','open-ils.search.biblio.record.copy_count',true],
+  FETCH_FLESHED_USER : ['open-ils.actor','open-ils.actor.user.fleshed.retrieve'],
+  FETCH_SESSION : ['open-ils.auth','open-ils.auth.session.retrieve'],
+  LOGIN_INIT : ['open-ils.auth','open-ils.auth.authenticate.init'],
+  LOGIN_COMPLETE : ['open-ils.auth','open-ils.auth.authenticate.complete'],
+  LOGIN_DELETE : ['open-ils.auth','open-ils.auth.session.delete'],
+  FETCH_USER_PREFS : ['open-ils.actor','open-ils.actor.patron.settings.retrieve'], 
+  UPDATE_USER_PREFS : ['open-ils.actor','open-ils.actor.patron.settings.update'], 
+  FETCH_COPY_STATUSES : ['open-ils.search','open-ils.search.config.copy_status.retrieve.all'],
+  FETCH_COPY_COUNTS_SUMMARY : ['open-ils.search','open-ils.search.biblio.copy_counts.summary.retrieve'],
+  FETCH_MARC_HTML : ['open-ils.search','open-ils.search.biblio.record.html'],
+  FETCH_CHECKED_OUT_SUM : ['open-ils.actor','open-ils.actor.user.checked_out'],
+  FETCH_HOLDS : ['open-ils.circ','open-ils.circ.holds.retrieve'],
+  FETCH_FINES_SUMMARY : ['open-ils.actor','open-ils.actor.user.fines.summary'],
+  FETCH_TRANSACTIONS : ['open-ils.actor','open-ils.actor.user.transactions.have_charge.fleshed'],
+  FETCH_MONEY_BILLING : ['open-ils.circ','open-ils.circ.money.billing.retrieve.all'],
+  FETCH_CROSSREF : ['open-ils.search','open-ils.search.authority.crossref'],
+  FETCH_CROSSREF_BATCH : ['open-ils.search','open-ils.search.authority.crossref.batch'],
+  CREATE_HOLD : ['open-ils.circ','open-ils.circ.holds.create'],
+  CREATE_HOLD_OVERRIDE : ['open-ils.circ','open-ils.circ.holds.create.override'],
+  CANCEL_HOLD : ['open-ils.circ','open-ils.circ.hold.cancel'],
+  UPDATE_USERNAME : ['open-ils.actor','open-ils.actor.user.username.update'],
+  UPDATE_PASSWORD : ['open-ils.actor','open-ils.actor.user.password.update'],
+  UPDATE_EMAIL : ['open-ils.actor','open-ils.actor.user.email.update'],
+  RENEW_CIRC : ['open-ils.circ','open-ils.circ.renew'],
+  CHECK_SPELL : ['open-ils.search','open-ils.search.spellcheck'],
+  FETCH_REVIEWS : ['open-ils.search','open-ils.search.added_content.review.retrieve.all'],
+  FETCH_TOC : ['open-ils.search','open-ils.search.added_content.toc.retrieve'],
+  FETCH_ACONT_SUMMARY : ['open-ils.search','open-ils.search.added_content.summary.retrieve'],
+  FETCH_USER_BYBARCODE : ['open-ils.actor','open-ils.actor.user.fleshed.retrieve_by_barcode'],
+  FETCH_ADV_MARC_MRIDS : ['open-ils.search','open-ils.search.biblio.marc',true],
+  FETCH_ADV_ISBN_RIDS : ['open-ils.search','open-ils.search.biblio.isbn'],
+  FETCH_ADV_ISSN_RIDS : ['open-ils.search','open-ils.search.biblio.issn'],
+  FETCH_ADV_TCN_RIDS : ['open-ils.search','open-ils.search.biblio.tcn'],
+  FETCH_CNBROWSE : ['open-ils.search','open-ils.search.callnumber.browse'],
+  FETCH_CONTAINERS : ['open-ils.actor','open-ils.actor.container.retrieve_by_class'],
+  FETCH_CONTAINERS : ['open-ils.actor','open-ils.actor.container.retrieve_by_class'],
+  CREATE_CONTAINER : ['open-ils.actor','open-ils.actor.container.create'],
+  DELETE_CONTAINER : ['open-ils.actor','open-ils.actor.container.full_delete'],
+  CREATE_CONTAINER_ITEM : ['open-ils.actor','open-ils.actor.container.item.create'],
+  DELETE_CONTAINER_ITEM : ['open-ils.actor','open-ils.actor.container.item.delete'],
+  FLESH_CONTAINER : ['open-ils.actor','open-ils.actor.container.flesh'],
+  FLESH_PUBLIC_CONTAINER : ['open-ils.actor','open-ils.actor.container.public.flesh'],
+  UPDATE_CONTAINER : ['open-ils.actor','open-ils.actor.container.update'],
+  FETCH_COPY : ['open-ils.search','open-ils.search.asset.copy.retrieve'],
+  FETCH_FLESHED_COPY : ['open-ils.search','open-ils.search.asset.copy.fleshed2.retrieve'],
+  CHECK_HOLD_POSSIBLE : ['open-ils.circ','open-ils.circ.title_hold.is_possible'],
+  UPDATE_HOLD : ['open-ils.circ','open-ils.circ.hold.update'],
+  FETCH_COPIES_FROM_VOLUME : ['open-ils.search','open-ils.search.asset.copy.retrieve_by_cn_label',true],
+  FETCH_VOLUME_BY_INFO : ['open-ils.search','open-ils.search.call_number.retrieve_by_info'], /* XXX staff method? */
+  FETCH_VOLUME : ['open-ils.search','open-ils.search.asset.call_number.retrieve'],
+  FETCH_COPY_LOCATIONS : ['open-ils.circ','open-ils.circ.copy_location.retrieve.all'],
+  FETCH_COPY_NOTES : ['open-ils.circ','open-ils.circ.copy_note.retrieve.all'],
+  FETCH_COPY_STAT_CATS : ['open-ils.circ','open-ils.circ.asset.stat_cat_entries.fleshed.retrieve_by_copy'],
+  FETCH_LIT_FORMS : ['open-ils.search','open-ils.search.biblio.lit_form_map.retrieve.all'],
+  FETCH_ITEM_FORMS : ['open-ils.search','open-ils.search.biblio.item_form_map.retrieve.all'],
+  FETCH_ITEM_TYPES : ['open-ils.search','open-ils.search.biblio.item_type_map.retrieve.all'],
+  FETCH_AUDIENCES : ['open-ils.search','open-ils.search.biblio.audience_map.retrieve.all'],
+  FETCH_HOLD_STATUS : ['open-ils.circ','open-ils.circ.hold.status.retrieve'],
+  FETCH_NON_CAT_CIRCS : ['open-ils.circ','open-ils.circ.open_non_cataloged_circulation.user'],
+  FETCH_NON_CAT_CIRC : ['open-ils.circ','open-ils.circ.non_cataloged_circulation.retrieve'],
+  FETCH_NON_CAT_TYPES : ['open-ils.circ','open-ils.circ.non_cat_types.retrieve.all'],
+  FETCH_BRE : ['open-ils.search','open-ils.search.biblio.record_entry.slim.retrieve'],
+  CHECK_USERNAME : ['open-ils.actor','open-ils.actor.username.exists'],
+  FETCH_CIRC_BY_ID : ['open-ils.circ','open-ils.circ.retrieve'],
+  FETCH_MR_DESCRIPTORS : ['open-ils.search','open-ils.search.metabib.record_to_descriptors'],
+  FETCH_HIGHEST_PERM_ORG : ['open-ils.actor','open-ils.actor.user.perm.highest_org.batch'],
+  FETCH_USER_NOTES : ['open-ils.actor','open-ils.actor.note.retrieve.all'],
+  FETCH_ORG_BY_SHORTNAME : ['open-ils.actor','open-ils.actor.org_unit.retrieve_by_shorname'],
+  FETCH_BIB_ID_BY_BARCODE : ['open-ils.search','open-ils.search.bib_id.by_barcode'],
+  FETCH_ORG_SETTING : ['open-ils.actor','open-ils.actor.ou_setting.ancestor_default'],
+  FETCH_ORG_SETTING_BATCH : ['open-ils.actor','open-ils.actor.ou_setting.ancestor_default.batch']
+ };
 
 }
 
diff --git a/Open-ILS/web/js/dojo/fieldmapper/IDL.js b/Open-ILS/web/js/dojo/fieldmapper/IDL.js
index 87af3e3650..6004489911 100644
--- a/Open-ILS/web/js/dojo/fieldmapper/IDL.js
+++ b/Open-ILS/web/js/dojo/fieldmapper/IDL.js
@@ -115,13 +115,13 @@ if(!dojo._hasResource["fieldmapper.IDL"]) {
 
                 var obj = {
                     field : field,
-                    name	: name,
+                    name : name,
                     label : field.getAttributeNS(this.NS_REPORTS,'label'),
                     datatype : field.getAttributeNS(this.NS_REPORTS,'datatype'),
                     primitive : field.getAttributeNS(this.NS_PERSIST,'primitive'),
                     selector : field.getAttributeNS(this.NS_REPORTS,'selector'),
                     array_position : position++,
-                    type	: 'field',
+                    type : 'field',
                     virtual : (fields[i].getAttributeNS(this.NS_PERSIST, 'virtual') == 'true') 
                 };
 
diff --git a/Open-ILS/web/js/dojo/fieldmapper/OrgUtils.js b/Open-ILS/web/js/dojo/fieldmapper/OrgUtils.js
index 5b81cf30fd..e2fd719618 100644
--- a/Open-ILS/web/js/dojo/fieldmapper/OrgUtils.js
+++ b/Open-ILS/web/js/dojo/fieldmapper/OrgUtils.js
@@ -17,191 +17,191 @@
 
 if(!dojo._hasResource["fieldmapper.OrgUtils"]){
 
-	dojo._hasResource["fieldmapper.OrgUtils"] = true;
-	dojo.provide("fieldmapper.OrgUtils");
-	dojo.require("fieldmapper.Fieldmapper");
-	dojo.require("fieldmapper.hash");
-	dojo.require("fieldmapper.OrgTree", true);
-	dojo.require("fieldmapper.OrgLasso", true);
-
-	fieldmapper.aou.slim_ok = true;
-	fieldmapper.aou.globalOrgTree = {};
-	fieldmapper.aou.OrgCache = {};
-	fieldmapper.aou.OrgCacheSN = {};
-	fieldmapper.aout.OrgTypeCache = {};
-
-	fieldmapper.aout.LoadOrgTypes = function () {
-		for (var i in fieldmapper.aout.OrgTypeCache) {
-			return;
-		}
-
-		var types = fieldmapper.standardRequest(['open-ils.actor','open-ils.actor.org_types.retrieve']);
-
-		for (var i in types) {
-			fieldmapper.aout.OrgTypeCache[types[i].id()] = {
-				loaded : true,
-				type : types[i]
-			};
-		}
-	}
-
-	fieldmapper.aou.LoadOrg = function (id, slim_ok) {
-		if (slim_ok == null) slim_ok = fieldmapper.aou.slim_ok;
-		var slim_o = fieldmapper.aou.OrgCache[id];
-
-		if (slim_o && (slim_ok || slim_o.loaded))
-			return fieldmapper.aou.OrgCache[id].org;
-
-		var o = fieldmapper.standardRequest(['open-ils.actor','open-ils.actor.org_unit.retrieve'],[null,id]);
+ dojo._hasResource["fieldmapper.OrgUtils"] = true;
+ dojo.provide("fieldmapper.OrgUtils");
+ dojo.require("fieldmapper.Fieldmapper");
+ dojo.require("fieldmapper.hash");
+ dojo.require("fieldmapper.OrgTree", true);
+ dojo.require("fieldmapper.OrgLasso", true);
+
+ fieldmapper.aou.slim_ok = true;
+ fieldmapper.aou.globalOrgTree = {};
+ fieldmapper.aou.OrgCache = {};
+ fieldmapper.aou.OrgCacheSN = {};
+ fieldmapper.aout.OrgTypeCache = {};
+
+ fieldmapper.aout.LoadOrgTypes = function () {
+  for (var i in fieldmapper.aout.OrgTypeCache) {
+   return;
+  }
+
+  var types = fieldmapper.standardRequest(['open-ils.actor','open-ils.actor.org_types.retrieve']);
+
+  for (var i in types) {
+   fieldmapper.aout.OrgTypeCache[types[i].id()] = {
+    loaded : true,
+    type : types[i]
+   };
+  }
+ }
+
+ fieldmapper.aou.LoadOrg = function (id, slim_ok) {
+  if (slim_ok == null) slim_ok = fieldmapper.aou.slim_ok;
+  var slim_o = fieldmapper.aou.OrgCache[id];
+
+  if (slim_o && (slim_ok || slim_o.loaded))
+   return fieldmapper.aou.OrgCache[id].org;
+
+  var o = fieldmapper.standardRequest(['open-ils.actor','open-ils.actor.org_unit.retrieve'],[null,id]);
         if(!(o && o.id)) {
             throw new Error("fieldmapper.aou.LoadOrg(): No org unit found with ID " + id);
         }
-		o.children = fieldmapper.aou.OrgCache[o.id()].children;
-		fieldmapper.aou.OrgCache[o.id()] = { loaded : true, org : o };
-		return o;
-	}
-	fieldmapper.aou.findOrgUnit = fieldmapper.aou.LoadOrg;
-
-	if (window._l) {
-		for (var i in _l) {
-			fieldmapper.aou.OrgCache[_l[i][0]] = {
-				loaded: false,
-				org : new fieldmapper.aou().fromHash({
-					id : _l[i][0],
-					ou_type : _l[i][1],
-					parent_ou : _l[i][2],
-					name : _l[i][3],
-					opac_visible : _l[i][4],
-					shortname : _l[i][5]
-				})
-			};
-
-		}
-
-		for (var i in fieldmapper.aou.OrgCache) {
-			var x = fieldmapper.aou.OrgCache[i].org;
-			if (x.parent_ou() == null || x.parent_ou() == '') {
-				fieldmapper.aou.globalOrgTree = x;
-				continue;
-			}
-
-			var par = fieldmapper.aou.findOrgUnit(x.parent_ou(),true);
-			if (!par.children()) par.children([]);
-			par.children().push(x);
-			fieldmapper.aou.OrgCache[x.id()].treePtr = x;
-		}
-
-		for (var i in globalOrgTypes) {
-			fieldmapper.aout.OrgTypeCache[globalOrgTypes[i].id()] = {
-				loaded : true,
-				type : globalOrgTypes[i]
-			};
-		}
-	}
+  o.children = fieldmapper.aou.OrgCache[o.id()].children;
+  fieldmapper.aou.OrgCache[o.id()] = { loaded : true, org : o };
+  return o;
+ }
+ fieldmapper.aou.findOrgUnit = fieldmapper.aou.LoadOrg;
+
+ if (window._l) {
+  for (var i in _l) {
+   fieldmapper.aou.OrgCache[_l[i][0]] = {
+    loaded: false,
+    org : new fieldmapper.aou().fromHash({
+     id : _l[i][0],
+     ou_type : _l[i][1],
+     parent_ou : _l[i][2],
+     name : _l[i][3],
+     opac_visible : _l[i][4],
+     shortname : _l[i][5]
+    })
+   };
+
+  }
+
+  for (var i in fieldmapper.aou.OrgCache) {
+   var x = fieldmapper.aou.OrgCache[i].org;
+   if (x.parent_ou() == null || x.parent_ou() == '') {
+    fieldmapper.aou.globalOrgTree = x;
+    continue;
+   }
+
+   var par = fieldmapper.aou.findOrgUnit(x.parent_ou(),true);
+   if (!par.children()) par.children([]);
+   par.children().push(x);
+   fieldmapper.aou.OrgCache[x.id()].treePtr = x;
+  }
+
+  for (var i in globalOrgTypes) {
+   fieldmapper.aout.OrgTypeCache[globalOrgTypes[i].id()] = {
+    loaded : true,
+    type : globalOrgTypes[i]
+   };
+  }
+ }
 
 
    /* ---------------------------------------------------------------------- */
 
-	fieldmapper.aou.prototype.fetchOrgSettingDefault = function (name) {
-		return this.standardRequest( fieldmapper.OpenSRF.methods.FETCH_ORG_SETTING, [this.id(), name] ); 
-	}
-
-	fieldmapper.aou.prototype.fetchOrgSettingBatch = function (nameList) {
-		return this.standardRequest( fieldmapper.OpenSRF.methods.FETCH_ORG_SETTING_BATCH, [this.id(), nameList] ); 
-	}
-
-	fieldmapper.aou.fetchOrgSettingDefault = function (orgId, name) {
-		return fieldmapper.standardRequest( fieldmapper.OpenSRF.methods.FETCH_ORG_SETTING, [orgId, name] ); 
-	}
-
-	fieldmapper.aou.fetchOrgSettingBatch = function (orgId, nameList) {
-		return fieldmapper.standardRequest( fieldmapper.OpenSRF.methods.FETCH_ORG_SETTING_BATCH, [orgId, nameList] ); 
-	}
-
-	fieldmapper.aout.findOrgType = function (id) {
-		fieldmapper.aout.LoadOrgTypes();
-		return fieldmapper.aout.OrgTypeCache[id].type;
-	}
-
-	fieldmapper.aou.prototype.findOrgDepth = function (id) {
-		if (!id) id = this.id;
-		if (!id) return null;
-
-		var org = fieldmapper.aou.findOrgUnit(id);
-		return fieldmapper.aout.findOrgType(
-			fieldmapper.aou.findOrgUnit(id).ou_type()
-		).depth();
-	}
-	fieldmapper.aou.findOrgDepth = fieldmapper.aou.prototype.findOrgDepth;
-
-	fieldmapper.aout.findOrgTypeFromDepth = function (depth) {
-		if( depth == null ) return null;
-		fieldmapper.aout.LoadOrgTypes();
-		for( var i in fieldmapper.aout.OrgTypeCache ) {
-			var t = fieldmapper.aout.OrgTypeCache[i].type;
-			if( t.depth() == depth ) return t;
-		}
-		return null;
-	}
-
-	fieldmapper.aou.findOrgUnitSN = function (sn, slim_ok) {
-		if (slim_ok == null) slim_ok = fieldmapper.aou.slim_ok;
-		var org = fieldmapper.aou.OrgCacheSN[sn];
-		if (!org) {
-			for (var i in fieldmapper.aou.OrgCache) {
-				var o = fieldmapper.aou.OrgCache[i];
-				if (o.org.shortname() == sn) {
-					fieldmapper.aou.OrgCacheSN[o.org.shortname()] = o;
-					org = o;
-				}
-			}
-
-			if (!slim_ok && !fieldmapper.aou.OrgCache[org.id()].loaded) {
-				org = fieldmapper.standardRequest(fieldmapper.OpenSRF.methods.FETCH_ORG_BY_SHORTNAME, sn);
-
-				org.children = fieldmapper.aou.OrgCache[org.id()].children;
-				fieldmapper.aou.OrgCache[org.id()] = { loaded : true, org : org };
-				fieldmapper.aou.OrgCacheSN[org.shortname()] = { loaded : true, org : org };
-			}
-
-		}
-
-		return org;
-	}
-
-	fieldmapper.aou.prototype.orgNodeTrail = function (node) {
-		if (!node) node = this;
-		if (!node) return [];
-
-		var na = [];
-
-		while( node ) {
-			na.push(node);
-			if (node.parent_ou())
-				node = fieldmapper.aou.findOrgUnit(node.parent_ou());
-			else
-				node = null;
-		}
-
-		return na.reverse();
-	}
-	fieldmapper.aou.orgNodeTrail = fieldmapper.aou.prototype.orgNodeTrail;
-
-	fieldmapper.aou.prototype.orgIsMine = function (me, org) {
-		if (this._isfieldmapper) {
-			org = me;
-			me = this;
-		}
-
-		if(!me || !org) return false;
-
-		if(me.id() == org.id()) return true;
-
-		for( var i in me.children() ) {
-			if(me.children()[i].orgIsMine(org)) return true;
-		}
-		return false;
-	}
+ fieldmapper.aou.prototype.fetchOrgSettingDefault = function (name) {
+  return this.standardRequest( fieldmapper.OpenSRF.methods.FETCH_ORG_SETTING, [this.id(), name] ); 
+ }
+
+ fieldmapper.aou.prototype.fetchOrgSettingBatch = function (nameList) {
+  return this.standardRequest( fieldmapper.OpenSRF.methods.FETCH_ORG_SETTING_BATCH, [this.id(), nameList] ); 
+ }
+
+ fieldmapper.aou.fetchOrgSettingDefault = function (orgId, name) {
+  return fieldmapper.standardRequest( fieldmapper.OpenSRF.methods.FETCH_ORG_SETTING, [orgId, name] ); 
+ }
+
+ fieldmapper.aou.fetchOrgSettingBatch = function (orgId, nameList) {
+  return fieldmapper.standardRequest( fieldmapper.OpenSRF.methods.FETCH_ORG_SETTING_BATCH, [orgId, nameList] ); 
+ }
+
+ fieldmapper.aout.findOrgType = function (id) {
+  fieldmapper.aout.LoadOrgTypes();
+  return fieldmapper.aout.OrgTypeCache[id].type;
+ }
+
+ fieldmapper.aou.prototype.findOrgDepth = function (id) {
+  if (!id) id = this.id;
+  if (!id) return null;
+
+  var org = fieldmapper.aou.findOrgUnit(id);
+  return fieldmapper.aout.findOrgType(
+   fieldmapper.aou.findOrgUnit(id).ou_type()
+  ).depth();
+ }
+ fieldmapper.aou.findOrgDepth = fieldmapper.aou.prototype.findOrgDepth;
+
+ fieldmapper.aout.findOrgTypeFromDepth = function (depth) {
+  if( depth == null ) return null;
+  fieldmapper.aout.LoadOrgTypes();
+  for( var i in fieldmapper.aout.OrgTypeCache ) {
+   var t = fieldmapper.aout.OrgTypeCache[i].type;
+   if( t.depth() == depth ) return t;
+  }
+  return null;
+ }
+
+ fieldmapper.aou.findOrgUnitSN = function (sn, slim_ok) {
+  if (slim_ok == null) slim_ok = fieldmapper.aou.slim_ok;
+  var org = fieldmapper.aou.OrgCacheSN[sn];
+  if (!org) {
+   for (var i in fieldmapper.aou.OrgCache) {
+    var o = fieldmapper.aou.OrgCache[i];
+    if (o.org.shortname() == sn) {
+     fieldmapper.aou.OrgCacheSN[o.org.shortname()] = o;
+     org = o;
+    }
+   }
+
+   if (!slim_ok && !fieldmapper.aou.OrgCache[org.id()].loaded) {
+    org = fieldmapper.standardRequest(fieldmapper.OpenSRF.methods.FETCH_ORG_BY_SHORTNAME, sn);
+
+    org.children = fieldmapper.aou.OrgCache[org.id()].children;
+    fieldmapper.aou.OrgCache[org.id()] = { loaded : true, org : org };
+    fieldmapper.aou.OrgCacheSN[org.shortname()] = { loaded : true, org : org };
+   }
+
+  }
+
+  return org;
+ }
+
+ fieldmapper.aou.prototype.orgNodeTrail = function (node) {
+  if (!node) node = this;
+  if (!node) return [];
+
+  var na = [];
+
+  while( node ) {
+   na.push(node);
+   if (node.parent_ou())
+    node = fieldmapper.aou.findOrgUnit(node.parent_ou());
+   else
+    node = null;
+  }
+
+  return na.reverse();
+ }
+ fieldmapper.aou.orgNodeTrail = fieldmapper.aou.prototype.orgNodeTrail;
+
+ fieldmapper.aou.prototype.orgIsMine = function (me, org) {
+  if (this._isfieldmapper) {
+   org = me;
+   me = this;
+  }
+
+  if(!me || !org) return false;
+
+  if(me.id() == org.id()) return true;
+
+  for( var i in me.children() ) {
+   if(me.children()[i].orgIsMine(org)) return true;
+  }
+  return false;
+ }
 
     /** Given an org id, returns an array of org units including
      * the org for the ID provided and all descendant orgs */
@@ -220,20 +220,20 @@ if(!dojo._hasResource["fieldmapper.OrgUtils"]){
         return list;
     }
 
-	dojo.addOnUnload( function () {
-		for (var i in fieldmapper.aou.OrgCache) {
-			x=fieldmapper.aou.OrgCache[i].treePtr;
-			if (!x) continue;
-
-			x.children(null);
-			x.parent_ou(null);
-			fieldmapper.aou.OrgCache[i]=null;
-		}
-		fieldmapper.aou.globalOrgTree = null;
-		fieldmapper.aou.OrgCache = null;
-		fieldmapper.aou.OrgCacheSN = null;
-		fieldmapper.aout.OrgTypeCache = null;
-	});
+ dojo.addOnUnload( function () {
+  for (var i in fieldmapper.aou.OrgCache) {
+   x=fieldmapper.aou.OrgCache[i].treePtr;
+   if (!x) continue;
+
+   x.children(null);
+   x.parent_ou(null);
+   fieldmapper.aou.OrgCache[i]=null;
+  }
+  fieldmapper.aou.globalOrgTree = null;
+  fieldmapper.aou.OrgCache = null;
+  fieldmapper.aou.OrgCacheSN = null;
+  fieldmapper.aout.OrgTypeCache = null;
+ });
 }
 
 
diff --git a/Open-ILS/web/js/dojo/fieldmapper/dojoData.js b/Open-ILS/web/js/dojo/fieldmapper/dojoData.js
index 597e9b127e..9eb03c002f 100644
--- a/Open-ILS/web/js/dojo/fieldmapper/dojoData.js
+++ b/Open-ILS/web/js/dojo/fieldmapper/dojoData.js
@@ -17,111 +17,111 @@
 
 if(!dojo._hasResource['fieldmapper.dojoData']){
 
-	dojo._hasResource['fieldmapper.dojoData'] = true;
-	dojo.provide('fieldmapper.dojoData');
-	dojo.require('fieldmapper.Fieldmapper');
-	dojo.require('fieldmapper.hash');
+ dojo._hasResource['fieldmapper.dojoData'] = true;
+ dojo.provide('fieldmapper.dojoData');
+ dojo.require('fieldmapper.Fieldmapper');
+ dojo.require('fieldmapper.hash');
 
 
-	function _fromStoreItem (data) {
-		this.fromHash(data);
+ function _fromStoreItem (data) {
+  this.fromHash(data);
 
-		for (var i in this._ignore_fields)
-			this[this._ignore_fields[i]](null);
+  for (var i in this._ignore_fields)
+   this[this._ignore_fields[i]](null);
 
-		for ( var i=0; i < this._fields.length; i++) {
-			if (dojo.isArray( this[this._fields[i]]() ))
-				this[this._fields[i]]( this[this._fields[i]]()[0] );
-		}
-		return this;
-	}
+  for ( var i=0; i < this._fields.length; i++) {
+   if (dojo.isArray( this[this._fields[i]]() ))
+    this[this._fields[i]]( this[this._fields[i]]()[0] );
+  }
+  return this;
+ }
 
     function _initStoreData(label, params) {
-		if (!params) params = {};
-		if (!params.identifier) params.identifier = this.Identifier;
-		if (!label) label = params.label;
-		if (!label) label = params.identifier;
-		return { label : label, identifier : params.identifier, items : [] };
+  if (!params) params = {};
+  if (!params.identifier) params.identifier = this.Identifier;
+  if (!label) label = params.label;
+  if (!label) label = params.identifier;
+  return { label : label, identifier : params.identifier, items : [] };
     }
 
     function _toStoreItem(fmObj, params) {
-		if (!params) params = {};
+  if (!params) params = {};
         return fmObj.toHash(true, params.virtualFields);
     }
 
-	function _toStoreData (list, label, params) {
-		if (!params) params = {};
+ function _toStoreData (list, label, params) {
+  if (!params) params = {};
         var data = this.initStoreData(label, params);
 
-		for (var i in list) data.items.push( list[i].toHash(true, params.virtualFields) );
-
-		if (params.children && params.parent) {
-			var _hash_list = data.items;
-
-			var _find_root = {};
-			for (var i in _hash_list) {
-				_find_root[_hash_list[i][params.identifier]] = _hash_list[i]; 
-			}
-
-			var item_data = [];
-			for (var i in _hash_list) {
-				var obj = _hash_list[i]
-				obj[params.children] = [];
-
-				for (var j in _hash_list) {
-					var kid = _hash_list[j];
-					if (kid[params.parent] == obj[params.identifier]) {
-						obj[params.children].push( { _reference : kid[params.identifier] } );
-						kid._iskid = true;
-						if (_find_root[kid[params.identifier]]) delete _find_root[kid[params.identifier]];
-					}
-				}
-
-				item_data.push( obj );
-			}
-
-			for (var j in _find_root) {
-				_find_root[j]['_top'] = 'true';
-				if (!_find_root[j][params.parent])
-					_find_root[j]['_trueRoot'] = 'true';
-			}
-
-			data.items = item_data;
-		}
-
-		return data;
-	}
-
-	for (var i in fmclasses) fieldmapper[i].prototype.fromStoreItem = _fromStoreItem;
-	for (var i in fmclasses) fieldmapper[i].toStoreData = _toStoreData;
-	for (var i in fmclasses) fieldmapper[i].toStoreItem = _toStoreItem;
-	for (var i in fmclasses) fieldmapper[i].prototype.toStoreItem = function ( args ) { return _toStoreItem(this, args) };
-	for (var i in fmclasses) fieldmapper[i].initStoreData = _initStoreData;
-
-	fieldmapper.aou.prototype._ignore_fields = ['children'];
-	fieldmapper.aout.prototype._ignore_fields = ['children'];
-	fieldmapper.pgt.prototype._ignore_fields = ['children'];
-
-	fieldmapper.aou.toStoreData = function (list, label) {
-		if (!label) label = 'shortname';
-		return _toStoreData.call(this, list, label, { 'parent' : 'parent_ou', 'children' : 'children' });
-	}
-
-	fieldmapper.aout.toStoreData = function (list, label) {
-		if (!label) label = 'name';
-		return _toStoreData.call(this, list, label, { 'parent' : 'parent', 'children' : 'children' });
-	}
-
-	fieldmapper.pgt.toStoreData = function (list, label) {
-		if (!label) label = 'name';
-		return _toStoreData.call(this, list, label, { 'parent' : 'parent', 'children' : 'children' });
-	}
-
-	/*
-	ppl.toStoreData = function (list, label) {
-		if (!label) label = 'code';
-		return _toStoreData(list, label, {});
-	}
-	*/
+  for (var i in list) data.items.push( list[i].toHash(true, params.virtualFields) );
+
+  if (params.children && params.parent) {
+   var _hash_list = data.items;
+
+   var _find_root = {};
+   for (var i in _hash_list) {
+    _find_root[_hash_list[i][params.identifier]] = _hash_list[i]; 
+   }
+
+   var item_data = [];
+   for (var i in _hash_list) {
+    var obj = _hash_list[i]
+    obj[params.children] = [];
+
+    for (var j in _hash_list) {
+     var kid = _hash_list[j];
+     if (kid[params.parent] == obj[params.identifier]) {
+      obj[params.children].push( { _reference : kid[params.identifier] } );
+      kid._iskid = true;
+      if (_find_root[kid[params.identifier]]) delete _find_root[kid[params.identifier]];
+     }
+    }
+
+    item_data.push( obj );
+   }
+
+   for (var j in _find_root) {
+    _find_root[j]['_top'] = 'true';
+    if (!_find_root[j][params.parent])
+     _find_root[j]['_trueRoot'] = 'true';
+   }
+
+   data.items = item_data;
+  }
+
+  return data;
+ }
+
+ for (var i in fmclasses) fieldmapper[i].prototype.fromStoreItem = _fromStoreItem;
+ for (var i in fmclasses) fieldmapper[i].toStoreData = _toStoreData;
+ for (var i in fmclasses) fieldmapper[i].toStoreItem = _toStoreItem;
+ for (var i in fmclasses) fieldmapper[i].prototype.toStoreItem = function ( args ) { return _toStoreItem(this, args) };
+ for (var i in fmclasses) fieldmapper[i].initStoreData = _initStoreData;
+
+ fieldmapper.aou.prototype._ignore_fields = ['children'];
+ fieldmapper.aout.prototype._ignore_fields = ['children'];
+ fieldmapper.pgt.prototype._ignore_fields = ['children'];
+
+ fieldmapper.aou.toStoreData = function (list, label) {
+  if (!label) label = 'shortname';
+  return _toStoreData.call(this, list, label, { 'parent' : 'parent_ou', 'children' : 'children' });
+ }
+
+ fieldmapper.aout.toStoreData = function (list, label) {
+  if (!label) label = 'name';
+  return _toStoreData.call(this, list, label, { 'parent' : 'parent', 'children' : 'children' });
+ }
+
+ fieldmapper.pgt.toStoreData = function (list, label) {
+  if (!label) label = 'name';
+  return _toStoreData.call(this, list, label, { 'parent' : 'parent', 'children' : 'children' });
+ }
+
+ /*
+ ppl.toStoreData = function (list, label) {
+  if (!label) label = 'code';
+  return _toStoreData(list, label, {});
+ }
+ */
 
 }
diff --git a/Open-ILS/web/js/dojo/fieldmapper/hash.js b/Open-ILS/web/js/dojo/fieldmapper/hash.js
index d3a62568c6..18f6683e70 100644
--- a/Open-ILS/web/js/dojo/fieldmapper/hash.js
+++ b/Open-ILS/web/js/dojo/fieldmapper/hash.js
@@ -17,42 +17,42 @@
 
 if(!dojo._hasResource['fieldmapper.hash']){
 
-	dojo._hasResource['fieldmapper.hash'] = true;
-	dojo.provide('fieldmapper.hash');
-	dojo.require('fieldmapper.Fieldmapper');
-
-	function _fromHash (_hash) {
-		for ( var i=0; i < this._fields.length; i++) {
-			if (_hash[this._fields[i]] != null)
-				this[this._fields[i]]( _hash[this._fields[i]] );
-		}
-		return this;
-	}
-
-	function _toHash (includeNulls, virtFields) {
-		var _hash = {};
-		for ( var i=0; i < this._fields.length; i++) {
-			if (includeNulls || this[this._fields[i]]() != null) {
-				if (this[this._fields[i]]() == null)
+ dojo._hasResource['fieldmapper.hash'] = true;
+ dojo.provide('fieldmapper.hash');
+ dojo.require('fieldmapper.Fieldmapper');
+
+ function _fromHash (_hash) {
+  for ( var i=0; i < this._fields.length; i++) {
+   if (_hash[this._fields[i]] != null)
+    this[this._fields[i]]( _hash[this._fields[i]] );
+  }
+  return this;
+ }
+
+ function _toHash (includeNulls, virtFields) {
+  var _hash = {};
+  for ( var i=0; i < this._fields.length; i++) {
+   if (includeNulls || this[this._fields[i]]() != null) {
+    if (this[this._fields[i]]() == null)
                     _hash[this._fields[i]] = null;
                 else
-				    _hash[this._fields[i]] = '' + this[this._fields[i]]();
+        _hash[this._fields[i]] = '' + this[this._fields[i]]();
             }
-		}
-
-		if (virtFields && virtFields.length > 0) {
-			for (var i in virtFields) {
-				if (!_hash[virtFields[i]])
-					_hash[virtFields[i]] = null;
-			}
-		}
-
-		return _hash;
-	}
-
-	for (var i in fmclasses) {
-		window[i].prototype.fromHash = _fromHash;
-		window[i].prototype.toHash = _toHash;
-	}
+  }
+
+  if (virtFields && virtFields.length > 0) {
+   for (var i in virtFields) {
+    if (!_hash[virtFields[i]])
+     _hash[virtFields[i]] = null;
+   }
+  }
+
+  return _hash;
+ }
+
+ for (var i in fmclasses) {
+  window[i].prototype.fromHash = _fromHash;
+  window[i].prototype.toHash = _toHash;
+ }
 
 }
diff --git a/Open-ILS/web/js/dojo/openils/CGI.js b/Open-ILS/web/js/dojo/openils/CGI.js
index d63576e0f2..280104b1d5 100644
--- a/Open-ILS/web/js/dojo/openils/CGI.js
+++ b/Open-ILS/web/js/dojo/openils/CGI.js
@@ -37,7 +37,7 @@ if(!dojo._hasResource["openils.CGI"]) {
 
                 var c = string.charAt(idx);
 
-                if( c == "=" )	{
+                if( c == "=" ) {
                     invalue = true;
                     inkey = false;
                     continue;
diff --git a/Open-ILS/web/js/dojo/openils/DojoPatch.js b/Open-ILS/web/js/dojo/openils/DojoPatch.js
index 54b44131ad..6e7e936b65 100644
--- a/Open-ILS/web/js/dojo/openils/DojoPatch.js
+++ b/Open-ILS/web/js/dojo/openils/DojoPatch.js
@@ -9,7 +9,7 @@ if(!dojo._hasResource["openils.DojoPatch"]) {
         // lots of useful doc comments snipped for brevity
         dojo.create = function(tag, attrs, refNode, pos) {
             var doc = d.doc;
-            if(refNode){		
+            if(refNode){  
                 refNode = d.byId(refNode);
                 doc = refNode.ownerDocument;
             }
diff --git a/Open-ILS/web/js/dojo/openils/I18N.js b/Open-ILS/web/js/dojo/openils/I18N.js
index 12e1a7abf2..c03863f0cd 100644
--- a/Open-ILS/web/js/dojo/openils/I18N.js
+++ b/Open-ILS/web/js/dojo/openils/I18N.js
@@ -21,13 +21,13 @@ if(!dojo._hasResource["openils.I18N"]) {
     dojo.provide("openils.I18N");
     dojo.require("fieldmapper.dojoData");
     dojo.require("DojoSRF");
-	dojo.require("dojo.data.ItemFileWriteStore");
+ dojo.require("dojo.data.ItemFileWriteStore");
 
     dojo.declare('openils.I18N', null, {});
 
-	openils.I18N.BaseLocales = fieldmapper.standardRequest( [ 'open-ils.fielder', 'open-ils.fielder.i18n_l.atomic'], [ { query : { code : { '!=' :  null }  } } ] );
-	openils.I18N.localeStore = new dojo.data.ItemFileWriteStore( { data : {identifier : 'locale', label : 'label', items : [] } } );
-	openils.I18N.BaseLocales = openils.I18N.BaseLocales.sort(
+ openils.I18N.BaseLocales = fieldmapper.standardRequest( [ 'open-ils.fielder', 'open-ils.fielder.i18n_l.atomic'], [ { query : { code : { '!=' :  null }  } } ] );
+ openils.I18N.localeStore = new dojo.data.ItemFileWriteStore( { data : {identifier : 'locale', label : 'label', items : [] } } );
+ openils.I18N.BaseLocales = openils.I18N.BaseLocales.sort(
         function(a, b) {
             if(a.name > b.name) return 1;
             if(a.name < b.name) return -1;
@@ -35,26 +35,26 @@ if(!dojo._hasResource["openils.I18N"]) {
         }
     );
 
-	for (var i in openils.I18N.BaseLocales) {
-		openils.I18N.localeStore.newItem({ locale : openils.I18N.BaseLocales[i].code, label : openils.I18N.BaseLocales[i].name });
-	}
+ for (var i in openils.I18N.BaseLocales) {
+  openils.I18N.localeStore.newItem({ locale : openils.I18N.BaseLocales[i].code, label : openils.I18N.BaseLocales[i].name });
+ }
 
-	openils.I18N.getTranslations = function ( obj /* Fieldmapper object */,  field /* Field to translate */, locale /* optional locale */) {
-		var classname = obj.classname;
+ openils.I18N.getTranslations = function ( obj /* Fieldmapper object */,  field /* Field to translate */, locale /* optional locale */) {
+  var classname = obj.classname;
 
-		// XXX need to derive identity field from IDL...
-		var ident_field = fieldmapper[classname].Identifier;
-		var ident_value = obj[ident_field]();
+  // XXX need to derive identity field from IDL...
+  var ident_field = fieldmapper[classname].Identifier;
+  var ident_value = obj[ident_field]();
 
-		var fielder_args = { query : { fq_field : classname + '.' + field, identity_value : ident_value } };
-		if (locale) fielder_args.translation = locale;
+  var fielder_args = { query : { fq_field : classname + '.' + field, identity_value : ident_value } };
+  if (locale) fielder_args.translation = locale;
 
-		var hash_list = fieldmapper.standardRequest( [ 'open-ils.fielder', 'open-ils.fielder.i18n.atomic'], [ fielder_args ] );
-		var obj_list = dojo.map( hash_list, function (t) { return new fieldmapper.i18n().fromHash( t ) } );
+  var hash_list = fieldmapper.standardRequest( [ 'open-ils.fielder', 'open-ils.fielder.i18n.atomic'], [ fielder_args ] );
+  var obj_list = dojo.map( hash_list, function (t) { return new fieldmapper.i18n().fromHash( t ) } );
 
-		if (locale) return obj_list[0];
-		return obj_list;
-	}
+  if (locale) return obj_list[0];
+  return obj_list;
+ }
 
 }
 
diff --git a/Open-ILS/web/js/dojo/openils/PermaCrud.js b/Open-ILS/web/js/dojo/openils/PermaCrud.js
index 0d5ab77b48..de4a946cdf 100644
--- a/Open-ILS/web/js/dojo/openils/PermaCrud.js
+++ b/Open-ILS/web/js/dojo/openils/PermaCrud.js
@@ -300,10 +300,10 @@ if(!dojo._hasResource["openils.PermaCrud"]) {
             this._CUD( 'delete', list, opts );
         },
 
-	/* 
-	 * 'delete' is a reserved keyword in JavaScript and can't be used
-	 * in browsers like IE or Chrome, so we define a safe synonym
-	 */
+ /* 
+  * 'delete' is a reserved keyword in JavaScript and can't be used
+  * in browsers like IE or Chrome, so we define a safe synonym
+  */
         eliminate: function ( list, opts ) {
             this._CUD( 'delete', list, opts );
         },
diff --git a/Open-ILS/web/js/dojo/openils/User.js b/Open-ILS/web/js/dojo/openils/User.js
index 11ca1a5df7..b9fdef4638 100644
--- a/Open-ILS/web/js/dojo/openils/User.js
+++ b/Open-ILS/web/js/dojo/openils/User.js
@@ -66,7 +66,7 @@ if(!dojo._hasResource["openils.User"]) {
 
             if(this.sessionCache[this.authtoken]) {
                 this.user = this.sessionCache[this.authtoken];
-				if (!openils.User.user) 
+    if (!openils.User.user) 
                     openils.User.user = this.user;
                 return this.user;
             }
@@ -80,7 +80,7 @@ if(!dojo._hasResource["openils.User"]) {
                             var user = r.recv().content();
                             _u.user = user;
                             _u.sessionCache[_u.authtoken] = user;
-					        if (!openils.User.user) openils.User.user = _u.user;
+             if (!openils.User.user) openils.User.user = _u.user;
                             if(onComplete)
                                 onComplete(user);
                         }
@@ -88,7 +88,7 @@ if(!dojo._hasResource["openils.User"]) {
                 );
             } else {
                 _u.user = fieldmapper.standardRequest(req, params);
-				if (!openils.User.user) openils.User.user = _u.user;
+    if (!openils.User.user) openils.User.user = _u.user;
                 _u.sessionCache[_u.authtoken] = _u.user;
                 return _u.user;
             }
@@ -138,9 +138,9 @@ if(!dojo._hasResource["openils.User"]) {
                 authReq.oncomplete = function(rr) {
                     var data = rr.recv().content();
                     _u.authtoken = data.payload.authtoken;
-					if (!openils.User.authtoken) openils.User.authtoken = _u.authtoken;
+     if (!openils.User.authtoken) openils.User.authtoken = _u.authtoken;
                     _u.authtime = data.payload.authtime;
-					if (!openils.User.authtime) openils.User.authtime = _u.authtime;
+     if (!openils.User.authtime) openils.User.authtime = _u.authtime;
                     _u.getBySession(onComplete);
                     if(_u.authcookie) {
                         dojo.require('dojo.cookie');
@@ -277,16 +277,16 @@ if(!dojo._hasResource["openils.User"]) {
                 _u.permOrgStoreCache[perm] = store;
             }
     
-	        if (_u.permOrgStoreCache[perm])
-		        hookupStore(_u.permOrgStoreCache[perm]);
-	        else
+         if (_u.permOrgStoreCache[perm])
+          hookupStore(_u.permOrgStoreCache[perm]);
+         else
                 _u.getPermOrgList(perm, buildTreePicker, true);
         },
     });
 
-	openils.User.user = null;
-	openils.User.authtoken = null;
-	openils.User.authtime = null;
+ openils.User.user = null;
+ openils.User.authtoken = null;
+ openils.User.authtime = null;
     openils.User.authcookie = null;
 }
 
diff --git a/Open-ILS/web/js/dojo/openils/Util.js b/Open-ILS/web/js/dojo/openils/Util.js
index 9d160367cd..3b32d3aa1d 100644
--- a/Open-ILS/web/js/dojo/openils/Util.js
+++ b/Open-ILS/web/js/dojo/openils/Util.js
@@ -83,13 +83,13 @@ if(!dojo._hasResource["openils.Util"]) {
      * the provided DOM node has focus.
      */
     openils.Util.registerEnterHandler = function(domNode, func) {
-	    if(!(domNode && func)) return;
-	    domNode.onkeydown = function(evt) {
+     if(!(domNode && func)) return;
+     domNode.onkeydown = function(evt) {
             var code = openils.Util.getCharCode(evt);
             if(code == 13 || code == 3) 
                 func();
         }
-	}
+ }
 
 
     /**
diff --git a/Open-ILS/web/js/dojo/openils/XUL.js b/Open-ILS/web/js/dojo/openils/XUL.js
index c9cde521cb..ac63bf72bf 100644
--- a/Open-ILS/web/js/dojo/openils/XUL.js
+++ b/Open-ILS/web/js/dojo/openils/XUL.js
@@ -16,8 +16,8 @@ if(!dojo._hasResource["openils.XUL"]) {
         if(openils.XUL.isXUL()) {
             try {
                 if(openils.XUL.enableXPConnect()) {
-			        var CacheClass = new Components.Constructor("@mozilla.org/openils_data_cache;1", "nsIOpenILS");
-			        return new CacheClass().wrappedJSObject.OpenILS.prototype.data;
+           var CacheClass = new Components.Constructor("@mozilla.org/openils_data_cache;1", "nsIOpenILS");
+           return new CacheClass().wrappedJSObject.OpenILS.prototype.data;
                 }
             } catch(e) {
                 console.log("Error loading XUL stash: " + e);
diff --git a/Open-ILS/web/js/dojo/openils/acq/Fund.js b/Open-ILS/web/js/dojo/openils/acq/Fund.js
index 6786569695..f516a3f735 100644
--- a/Open-ILS/web/js/dojo/openils/acq/Fund.js
+++ b/Open-ILS/web/js/dojo/openils/acq/Fund.js
@@ -40,7 +40,7 @@ openils.acq.Fund.createStore = function(onComplete, limitPerm) {
             openils.acq.Fund.cache[src.id()] = src;
             items.push(src);
         }
-	    openils.acq.Fund._cachecomplete = true;
+     openils.acq.Fund._cachecomplete = true;
         onComplete(acqf.toStoreData(items));
     }
 
@@ -148,18 +148,18 @@ openils.acq.Fund.nameMapping = function(oncomplete) {
     var ids = [];
     var names = [];
     var buildMap = function() {
-	for (var i in openils.acq.Fund.cache) {
-	    var item = openils.acq.Fund.cache[i];
-	    ids.push(item.id());
-	    names.push(item.name());
-	    oncomplete(ids, names);
-	}
+ for (var i in openils.acq.Fund.cache) {
+     var item = openils.acq.Fund.cache[i];
+     ids.push(item.id());
+     names.push(item.name());
+     oncomplete(ids, names);
+ }
     };
 
     if (openils.acq.Fund._cachecomplete) {
-	buildMap(oncomplete);
+ buildMap(oncomplete);
     } else {
-	openils.acq.Fund.createStore(buildMap);
+ openils.acq.Fund.createStore(buildMap);
     }
 };
 
@@ -176,35 +176,35 @@ openils.acq.Fund.buildPermFundSelector = function(perm, selector) {
     dojo.require('dojo.data.ItemFileReadStore');
 
     function hookupStore(store) {
-	selector.store = store;
+ selector.store = store;
         selector.startup();
     }
 
     function buildPicker(r) {
-	var msg;
-	var fundList = [];
-	while (msg = r.recv()) {
-	    var fund = msg.content();
-	    fundList.push(fund);
-	}
+ var msg;
+ var fundList = [];
+ while (msg = r.recv()) {
+     var fund = msg.content();
+     fundList.push(fund);
+ }
 
-	var store = new dojo.data.ItemFileReadStore({data:acqf.toStoreData(fundList)});
+ var store = new dojo.data.ItemFileReadStore({data:acqf.toStoreData(fundList)});
 
-	hookupStore(store);
-	openils.acq.Fund.storeCache[perm] = store;
+ hookupStore(store);
+ openils.acq.Fund.storeCache[perm] = store;
     }
 
     if (openils.acq.Fund.storeCache[perm]) {
-	hookupStore(openils.acq.Fund.storeCache[perm]);
+ hookupStore(openils.acq.Fund.storeCache[perm]);
     } else {
-	fieldmapper.standardRequest(
-	    ['open-ils.acq', 'open-ils.acq.fund.org.retrieve'],
+ fieldmapper.standardRequest(
+     ['open-ils.acq', 'open-ils.acq.fund.org.retrieve'],
             {   params: [openils.User.authtoken, null,
-			 {flesh_summary:1, limit_perm:perm}],
-		oncomplete: buildPicker,
-		async: true
+    {flesh_summary:1, limit_perm:perm}],
+  oncomplete: buildPicker,
+  async: true
             }
-	)
+ )
     }
 }
 
diff --git a/Open-ILS/web/js/dojo/openils/acq/Lineitem.js b/Open-ILS/web/js/dojo/openils/acq/Lineitem.js
index d7d3958f21..9c34bc39c4 100644
--- a/Open-ILS/web/js/dojo/openils/acq/Lineitem.js
+++ b/Open-ILS/web/js/dojo/openils/acq/Lineitem.js
@@ -81,25 +81,25 @@ dojo.declare('openils.acq.Lineitem', null, {
             {   async: true,
                 params: [openils.User.authtoken, this.lineitem],
                 oncomplete: function(r) {
-		    oncomplete(openils.Event.parse(r.recv().content()));
+      oncomplete(openils.Event.parse(r.recv().content()));
                 }
             }
         );
     },
 
     approve: function(oncomplete) {
-	fieldmapper.standardRequest(
-	    ['open-ils.acq', 'open-ils.acq.lineitem.approve'],
-	    {  async: true,
-	       params: [openils.User.authtoken, this.lineitem.id()],
-	       oncomplete: function(r) {
-		   oncomplete(openils.Event.parse(r.recv().content()));
-	       }
-	    });
+ fieldmapper.standardRequest(
+     ['open-ils.acq', 'open-ils.acq.lineitem.approve'],
+     {  async: true,
+        params: [openils.User.authtoken, this.lineitem.id()],
+        oncomplete: function(r) {
+     oncomplete(openils.Event.parse(r.recv().content()));
+        }
+     });
     },
 
     id: function() {
-	return this.lineitem.id();
+ return this.lineitem.id();
     },
 });
 
@@ -129,74 +129,74 @@ openils.acq.Lineitem.createLIDStore = function(li_id, onComplete) {
     // Fetches the details of a lineitem and builds a grid
 
     function mkStore(r) {
-	var msg;
-	var items = [];
-	while (msg = r.recv()) {
-	    var data = msg.content();
-	    for (i in data.lineitem_details()) {
-		var lid = data.lineitem_details()[i];
-		items.push(lid);
-		openils.acq.Lineitem.acqlidCache[lid.id()] = lid;
-	    }
-	}
-
-	onComplete(acqlid.toStoreData(items));
+ var msg;
+ var items = [];
+ while (msg = r.recv()) {
+     var data = msg.content();
+     for (i in data.lineitem_details()) {
+  var lid = data.lineitem_details()[i];
+  items.push(lid);
+  openils.acq.Lineitem.acqlidCache[lid.id()] = lid;
+     }
+ }
+
+ onComplete(acqlid.toStoreData(items));
     }
 
     fieldmapper.standardRequest(
-	['open-ils.acq', 'open-ils.acq.lineitem.retrieve'],
-	{ async: true,
-	  params: [openils.User.authtoken, li_id,
-		   {flesh_attrs:1, flesh_li_details:1}],
-	  oncomplete: mkStore
-	});
+ ['open-ils.acq', 'open-ils.acq.lineitem.retrieve'],
+ { async: true,
+   params: [openils.User.authtoken, li_id,
+     {flesh_attrs:1, flesh_li_details:1}],
+   oncomplete: mkStore
+ });
 };
 
 openils.acq.Lineitem.alertOnLIDSet = function(griditem, attr, oldVal, newVal) {
     var item;
     var updateDone = function(r) {
-	var stat = r.recv().content();
-	var evt = openils.Event.parse(stat);
-
-	if (evt) {
-	    alert("Error: "+evt.desc);
-	    console.dir(evt);
-	    if (attr == "fund") {
-		item.fund(oldVal);
-		griditem.fund = oldVal;
-	    } else if (attr ==  "owning_lib") {
-		item.owning_lib(oldVal);
-		griditem.owning_lib = oldVal;
-	    }
-	}
+ var stat = r.recv().content();
+ var evt = openils.Event.parse(stat);
+
+ if (evt) {
+     alert("Error: "+evt.desc);
+     console.dir(evt);
+     if (attr == "fund") {
+  item.fund(oldVal);
+  griditem.fund = oldVal;
+     } else if (attr ==  "owning_lib") {
+  item.owning_lib(oldVal);
+  griditem.owning_lib = oldVal;
+     }
+ }
     };
 
     if (oldVal == newVal) {
-	return;
+ return;
     }
 
     item = openils.acq.Lineitem.acqlidCache[griditem.id];
     
     if (attr == "fund") {
-	item.fund(newVal);
+ item.fund(newVal);
     } else if (attr ==  "owning_lib") {
-	item.owning_lib(newVal);
+ item.owning_lib(newVal);
     } else if (attr ==  "cn_label") {
-	item.cn_label(newVal);
+ item.cn_label(newVal);
     } else if (attr ==  "barcode") {
-	item.barcode(newVal);
+ item.barcode(newVal);
     } else if (attr ==  "location") {
-	item.location(newVal);
+ item.location(newVal);
     } else {
-	alert("Unexpected attr in Lineitem.alertOnSet: '"+attr+"'");
-	return;
+ alert("Unexpected attr in Lineitem.alertOnSet: '"+attr+"'");
+ return;
     }
 
     fieldmapper.standardRequest(
-	["open-ils.acq", "open-ils.acq.lineitem_detail.update"],
-	{ params: [openils.User.authtoken, item],
-	  oncomplete: updateDone
-	});
+ ["open-ils.acq", "open-ils.acq.lineitem_detail.update"],
+ { params: [openils.User.authtoken, item],
+   oncomplete: updateDone
+ });
 };
 
 openils.acq.Lineitem.deleteLID = function(id, onComplete) {
@@ -207,7 +207,7 @@ openils.acq.Lineitem.deleteLID = function(id, onComplete) {
             oncomplete: function(r) {
                 msg = r.recv()
                 stat = msg.content();
-		onComplete(openils.Event.parse(stat));
+  onComplete(openils.Event.parse(stat));
             }
     });
 };
@@ -215,45 +215,45 @@ openils.acq.Lineitem.deleteLID = function(id, onComplete) {
 openils.acq.Lineitem.createLID = function(fields, onCreateComplete) {
     var lid = new acqlid()
     for (var field in fields) {
-	lid[field](fields[field]);
+ lid[field](fields[field]);
     }
 
     fieldmapper.standardRequest(
-	['open-ils.acq', 'open-ils.acq.lineitem_detail.create'],
-	{ async: true,
-	  params: [openils.User.authtoken, lid, {return_obj:1}],
-	  oncomplete: function(r) {
-	      var msg = r.recv();
+ ['open-ils.acq', 'open-ils.acq.lineitem_detail.create'],
+ { async: true,
+   params: [openils.User.authtoken, lid, {return_obj:1}],
+   oncomplete: function(r) {
+       var msg = r.recv();
           var obj = msg.content();
           openils.Event.parse_and_raise(obj);
-	      if (onCreateComplete) {
-		    onCreateComplete(obj);
-	      }
-	  }
-	});
+       if (onCreateComplete) {
+      onCreateComplete(obj);
+       }
+   }
+ });
 };
 
 openils.acq.Lineitem.loadLIDGrid = function(domNode, id, layout) {
     if (!openils.acq.Lineitem.ModelCache[id]) {
-	openils.acq.Lineitem.createLIDStore(id,
-		function(storeData) {
-		    var store = new dojo.data.ItemFileWriteStore({data:storeData});
-		    var model = new dojox.grid.data.DojoData(null, store,
-			{rowsPerPage: 20, clientSort:true, query:{id:'*'}});
-
-		    dojo.connect(store, "onSet",
-				 openils.acq.Lineitem.alertOnLIDSet);
-		    openils.acq.Lineitem.ModelCache[id] = model;
-
-		    domNode.setStructure(layout);
-		    domNode.setModel(model);
-		    domNode.update();
-		});
+ openils.acq.Lineitem.createLIDStore(id,
+  function(storeData) {
+      var store = new dojo.data.ItemFileWriteStore({data:storeData});
+      var model = new dojox.grid.data.DojoData(null, store,
+   {rowsPerPage: 20, clientSort:true, query:{id:'*'}});
+
+      dojo.connect(store, "onSet",
+     openils.acq.Lineitem.alertOnLIDSet);
+      openils.acq.Lineitem.ModelCache[id] = model;
+
+      domNode.setStructure(layout);
+      domNode.setModel(model);
+      domNode.update();
+  });
     } else {
-	domNode.setModel(openils.acq.Lineitem.ModelCache[id]);
-	domNode.setStructure(layout);
-	domNode.update();
-	domNode.refresh();
+ domNode.setModel(openils.acq.Lineitem.ModelCache[id]);
+ domNode.setStructure(layout);
+ domNode.update();
+ domNode.refresh();
     }
 };
 }
diff --git a/Open-ILS/web/js/dojo/openils/acq/Picklist.js b/Open-ILS/web/js/dojo/openils/acq/Picklist.js
index 504b9691a0..356fe3dcc5 100644
--- a/Open-ILS/web/js/dojo/openils/acq/Picklist.js
+++ b/Open-ILS/web/js/dojo/openils/acq/Picklist.js
@@ -30,7 +30,7 @@ dojo.declare('openils.acq.Picklist', null, {
 
     constructor: function (pl_id, onComplete, args) {
 
-        var pl_this = this;		// 'this' doesn't exist inside callbacks
+        var pl_this = this;  // 'this' doesn't exist inside callbacks
         var liArgs = (args && args.liArgs) ? args.liArgs : {flesh_attrs:1, clear_marc:1};
         var mkStore = function (r) {
             var storeData;
@@ -78,19 +78,19 @@ dojo.declare('openils.acq.Picklist', null, {
     },
 
     id: function () {
-	return this._id;
+ return this._id;
     },
     name: function() {
-	return this._plist.name();
+ return this._plist.name();
     },
     owner: function() {
-	return this._plist.owner();
+ return this._plist.owner();
     },
     create_time: function() {
-	return this._plist.create_time();
+ return this._plist.create_time();
     },
     edit_time: function() {
-	return this._plist.edit_time();
+ return this._plist.edit_time();
     },
 
     find_attr: function(id, at_name, at_type) {
diff --git a/Open-ILS/web/js/dojo/openils/acq/Provider.js b/Open-ILS/web/js/dojo/openils/acq/Provider.js
index 9803bd00e3..4742a74d1b 100644
--- a/Open-ILS/web/js/dojo/openils/acq/Provider.js
+++ b/Open-ILS/web/js/dojo/openils/acq/Provider.js
@@ -140,35 +140,35 @@ openils.acq.Provider.buildPermProviderSelector = function(perm, selector) {
     dojo.require('dojo.data.ItemFileReadStore');
 
     function hookupStore(store) {
-	selector.store = store;
-	selector.startup();
+ selector.store = store;
+ selector.startup();
     }
 
     function buildPicker(r) {
-	var msg;
-	var providerList = [];
-	while (msg = r.recv()) {
-	    var provider = msg.content();
-	    providerList.push(provider);
-	}
+ var msg;
+ var providerList = [];
+ while (msg = r.recv()) {
+     var provider = msg.content();
+     providerList.push(provider);
+ }
 
-	var store = new dojo.data.ItemFileReadStore({data:acqpro.toStoreData(providerList)});
+ var store = new dojo.data.ItemFileReadStore({data:acqpro.toStoreData(providerList)});
 
-	hookupStore(store);
-	openils.acq.Provider.storeCache[perm] = store;
+ hookupStore(store);
+ openils.acq.Provider.storeCache[perm] = store;
     }
 
     if (openils.acq.Provider.storeCache[perm]) {
-	hookupStore(openils.acq.Provider.storeCache[perm]);
+ hookupStore(openils.acq.Provider.storeCache[perm]);
     } else {
-	fieldmapper.standardRequest(
-	    ['open-ils.acq', 'open-ils.acq.provider.org.retrieve'],
+ fieldmapper.standardRequest(
+     ['open-ils.acq', 'open-ils.acq.provider.org.retrieve'],
             {   params: [openils.User.authtoken, null,
-			 {flesh_summary:1, limit_perm:perm}],
-		oncomplete: buildPicker,
-		async: true
+    {flesh_summary:1, limit_perm:perm}],
+  oncomplete: buildPicker,
+  async: true
             }
-	)
+ )
     }
 }
 }
diff --git a/Open-ILS/web/js/dojo/openils/conify/nls/conify.js b/Open-ILS/web/js/dojo/openils/conify/nls/conify.js
index eea305da1e..f975905576 100644
--- a/Open-ILS/web/js/dojo/openils/conify/nls/conify.js
+++ b/Open-ILS/web/js/dojo/openils/conify/nls/conify.js
@@ -1,78 +1,78 @@
 {
-	"CONFIRM_DELETE": "Are you sure you want to delete ${0}?",
-	"CONFIRM_EXIT_AOU": "There are unsaved changes to one or more organizational units. Click OK to save these changes, or Cancel to abandon them.",
-	"CONFIRM_EXIT_CAM": "There are unsaved changes to one or more ${0} codes. Click OK to save these changes, or Cancel to abandon them.",
-	"CONFIRM_EXIT_CCS": "There are unsaved changes to one or more copy statuses. Click OK to save these changes, or Cancel to abandon them.",
-	"CONFIRM_EXIT_PGT": "There are unsaved modified permission maps. Click OK to save these changes, or Cancel to abandon them.",
-	"CONFIRM_EXIT_PPL": "There are unsaved modified permissions. Click OK to save these changes, or Cancel to abandon them.",
-	"CONFIRM_UNSAVED_CHANGES": "There are unsaved changes to one or more organization types. Click OK to save these changes, or Cancel to abandon them.",
-	"ERROR_CALLING_METHOD_AOUT": "Problem calling method to create child organization type",
-	"ERROR_CALLING_METHOD_CAM": "Problem calling method to create new ${0}",
-	"ERROR_CALLING_METHOD_CCS": "Problem calling method to create new copy status",
-	"ERROR_CALLING_METHOD_PERM_MAP": "Problem calling method to create new permission map",
-	"ERROR_CALLING_METHOD_PGT": "Problem calling method to create child Group",
-	"ERROR_CALLING_METHOD_PPL": "Problem calling method to create new permission",
-	"ERROR_CREATING_CHILD_AOU": "Problem creating child organizational unit",
-	"ERROR_CREATING_CHILD_AOUT": "Problem creating child organization type",
-	"ERROR_CREATING_CHILD_GROUP": "Problem creating child Group",
-	"ERROR_CREATING_PERMISSION": "Problem creating new Permission",
-	"ERROR_CREATING_PERM_MAP": "Problem creating new Permission Map",
-	"ERROR_CREATING_STATUS": "Problem creating new Status",
-	"ERROR_DELETING_LAST_AOU": "Cannot delete ${0}, you need at least one organization unit.",
-	"ERROR_DELETING_LAST_AOUT": "Cannot delete ${0}. You need at least one organization type.",
-	"ERROR_DELETING_PERM_MAPPING": "Problem deleting permission mapping ${0}",
-	"ERROR_DELETING": "Problem deleting ${0}",
-	"ERROR_FETCHING_GROUPS": "Problem fetching groups",
-	"ERROR_FETCHING_HOLDS": "Problem fetching Holds Address for ${0}",
-	"ERROR_FETCHING_HOURS": "Problem fetching hours of operation for ${0}",
-	"ERROR_FETCHING_ILL": "Problem fetching ILL Address for ${0}",
-	"ERROR_FETCHING_MAILING": "Problem fetching Mailing Address for ${0}",
-	"ERROR_FETCHING_ORGS": "Problem fetching organizational unit data",
-	"ERROR_FETCHING_PERM_MAPS": "Problem fetching perm maps",
-	"ERROR_FETCHING_PERMS": "Problem fetching perms",
-	"ERROR_FETCHING_PHYSICAL": "Problem fetching Physical Address for ${0}",
-	"ERROR_FETCHING_STATUSES": "Problem fetching statuses",
-	"ERROR_FETCHING_TYPES_AOUT": "Problem fetching organizational unit types",
-	"ERROR_ORPHANS": "Cannot delete ${0}, ${1} subordinates still exist.",
-	"ERROR_SAVING_DATA": "Problem saving data for ${0}",
-	"ERROR_SAVING_DATA_CAM": "Problem saving data for ${0} ${1}",
-	"ERROR_SAVING_HOLDS": "Problem saving Holds Address data for ${0}",
-	"ERROR_SAVING_HOO": "Problem saving Hours of Operation data for ${0}",
-	"ERROR_SAVING_ILL": "Problem saving ILL Address data for ${0}",
-	"ERROR_SAVING_MAILING": "Problem saving Mailing Address data for ${0}",
-	"ERROR_SAVING_PERM_DATA": "Problem saving permission data for ${0}",
-	"ERROR_SAVING_PHYSICAL": "Problem saving Physical Address data for ${0}",
-	"ERROR_SAVING_STATUS": "Problem saving ${0}",
-	"HOLDABLE": "Holdable",
-	"ID": "ID",
-	"LABEL_CODE": "Code",
-	"LABEL_DEPTH": "Depth",
-	"LABEL_DESCRIPTION": "Description",
-	"LABEL_GRANTABLE": "Grantable",
-	"LABEL_NEW_BRANCH": "New Branch",
-	"LABEL_NEW_GROUP": "New Group",
-	"LABEL_NEW_TYPE": "New Type",
-	"LABEL_TRANSLATION": "Translation",
-	"LABEL_VALUE": "Value",
-	"NAME": "Name",
-	"OPAC_VISIBLE": "OPAC Visible",
-	"STATUS_DELETED": "${0} deleted",
-	"STATUS_EDITING": "Now editing ${0}",
-	"SUCCESS_CREATING_CHILD_AOU": "New child Organizational Unit created for ${0}",
-	"SUCCESS_CREATING_CHILD_AOUT": "New child Organization Type created for ${0}",
-	"SUCCESS_CREATING_CODE": "New ${0} ${1} created",
-	"SUCCESS_CREATING_PERMISSION": "New ${0} permission created",
-	"SUCCESS_CREATING_STATUS": "New ${0} status created",
-	"SUCCESS_DELETED_PERM_MAP": "Permission mapping deleted",
-	"SUCCESS_NEW_CHILD_GROUP": "New child Group created for ${0}",
-	"SUCCESS_NEW_PERM_MAP": "New permission map created",
-	"SUCCESS_SAVE_PERM": "Saved permission changes to ${0}",
-	"SUCCESS_SAVE": "Saved changes to ${0}",
-	"SUCCESS_SAVING_DATA": "Saved changes to ${0}",
-	"SUCCESS_SAVING_HOLDS": "Saved changes to the Holds Address of ${0}",
-	"SUCCESS_SAVING_HOO": "Hours of Operation updated for ${0}",
-	"SUCCESS_SAVING_ILL": "Saved changes to the ILL Address of ${0}",
-	"SUCCESS_SAVING_MAILING": "Saved changes to the Mailing Address of ${0}",
+ "CONFIRM_DELETE": "Are you sure you want to delete ${0}?",
+ "CONFIRM_EXIT_AOU": "There are unsaved changes to one or more organizational units. Click OK to save these changes, or Cancel to abandon them.",
+ "CONFIRM_EXIT_CAM": "There are unsaved changes to one or more ${0} codes. Click OK to save these changes, or Cancel to abandon them.",
+ "CONFIRM_EXIT_CCS": "There are unsaved changes to one or more copy statuses. Click OK to save these changes, or Cancel to abandon them.",
+ "CONFIRM_EXIT_PGT": "There are unsaved modified permission maps. Click OK to save these changes, or Cancel to abandon them.",
+ "CONFIRM_EXIT_PPL": "There are unsaved modified permissions. Click OK to save these changes, or Cancel to abandon them.",
+ "CONFIRM_UNSAVED_CHANGES": "There are unsaved changes to one or more organization types. Click OK to save these changes, or Cancel to abandon them.",
+ "ERROR_CALLING_METHOD_AOUT": "Problem calling method to create child organization type",
+ "ERROR_CALLING_METHOD_CAM": "Problem calling method to create new ${0}",
+ "ERROR_CALLING_METHOD_CCS": "Problem calling method to create new copy status",
+ "ERROR_CALLING_METHOD_PERM_MAP": "Problem calling method to create new permission map",
+ "ERROR_CALLING_METHOD_PGT": "Problem calling method to create child Group",
+ "ERROR_CALLING_METHOD_PPL": "Problem calling method to create new permission",
+ "ERROR_CREATING_CHILD_AOU": "Problem creating child organizational unit",
+ "ERROR_CREATING_CHILD_AOUT": "Problem creating child organization type",
+ "ERROR_CREATING_CHILD_GROUP": "Problem creating child Group",
+ "ERROR_CREATING_PERMISSION": "Problem creating new Permission",
+ "ERROR_CREATING_PERM_MAP": "Problem creating new Permission Map",
+ "ERROR_CREATING_STATUS": "Problem creating new Status",
+ "ERROR_DELETING_LAST_AOU": "Cannot delete ${0}, you need at least one organization unit.",
+ "ERROR_DELETING_LAST_AOUT": "Cannot delete ${0}. You need at least one organization type.",
+ "ERROR_DELETING_PERM_MAPPING": "Problem deleting permission mapping ${0}",
+ "ERROR_DELETING": "Problem deleting ${0}",
+ "ERROR_FETCHING_GROUPS": "Problem fetching groups",
+ "ERROR_FETCHING_HOLDS": "Problem fetching Holds Address for ${0}",
+ "ERROR_FETCHING_HOURS": "Problem fetching hours of operation for ${0}",
+ "ERROR_FETCHING_ILL": "Problem fetching ILL Address for ${0}",
+ "ERROR_FETCHING_MAILING": "Problem fetching Mailing Address for ${0}",
+ "ERROR_FETCHING_ORGS": "Problem fetching organizational unit data",
+ "ERROR_FETCHING_PERM_MAPS": "Problem fetching perm maps",
+ "ERROR_FETCHING_PERMS": "Problem fetching perms",
+ "ERROR_FETCHING_PHYSICAL": "Problem fetching Physical Address for ${0}",
+ "ERROR_FETCHING_STATUSES": "Problem fetching statuses",
+ "ERROR_FETCHING_TYPES_AOUT": "Problem fetching organizational unit types",
+ "ERROR_ORPHANS": "Cannot delete ${0}, ${1} subordinates still exist.",
+ "ERROR_SAVING_DATA": "Problem saving data for ${0}",
+ "ERROR_SAVING_DATA_CAM": "Problem saving data for ${0} ${1}",
+ "ERROR_SAVING_HOLDS": "Problem saving Holds Address data for ${0}",
+ "ERROR_SAVING_HOO": "Problem saving Hours of Operation data for ${0}",
+ "ERROR_SAVING_ILL": "Problem saving ILL Address data for ${0}",
+ "ERROR_SAVING_MAILING": "Problem saving Mailing Address data for ${0}",
+ "ERROR_SAVING_PERM_DATA": "Problem saving permission data for ${0}",
+ "ERROR_SAVING_PHYSICAL": "Problem saving Physical Address data for ${0}",
+ "ERROR_SAVING_STATUS": "Problem saving ${0}",
+ "HOLDABLE": "Holdable",
+ "ID": "ID",
+ "LABEL_CODE": "Code",
+ "LABEL_DEPTH": "Depth",
+ "LABEL_DESCRIPTION": "Description",
+ "LABEL_GRANTABLE": "Grantable",
+ "LABEL_NEW_BRANCH": "New Branch",
+ "LABEL_NEW_GROUP": "New Group",
+ "LABEL_NEW_TYPE": "New Type",
+ "LABEL_TRANSLATION": "Translation",
+ "LABEL_VALUE": "Value",
+ "NAME": "Name",
+ "OPAC_VISIBLE": "OPAC Visible",
+ "STATUS_DELETED": "${0} deleted",
+ "STATUS_EDITING": "Now editing ${0}",
+ "SUCCESS_CREATING_CHILD_AOU": "New child Organizational Unit created for ${0}",
+ "SUCCESS_CREATING_CHILD_AOUT": "New child Organization Type created for ${0}",
+ "SUCCESS_CREATING_CODE": "New ${0} ${1} created",
+ "SUCCESS_CREATING_PERMISSION": "New ${0} permission created",
+ "SUCCESS_CREATING_STATUS": "New ${0} status created",
+ "SUCCESS_DELETED_PERM_MAP": "Permission mapping deleted",
+ "SUCCESS_NEW_CHILD_GROUP": "New child Group created for ${0}",
+ "SUCCESS_NEW_PERM_MAP": "New permission map created",
+ "SUCCESS_SAVE_PERM": "Saved permission changes to ${0}",
+ "SUCCESS_SAVE": "Saved changes to ${0}",
+ "SUCCESS_SAVING_DATA": "Saved changes to ${0}",
+ "SUCCESS_SAVING_HOLDS": "Saved changes to the Holds Address of ${0}",
+ "SUCCESS_SAVING_HOO": "Hours of Operation updated for ${0}",
+ "SUCCESS_SAVING_ILL": "Saved changes to the ILL Address of ${0}",
+ "SUCCESS_SAVING_MAILING": "Saved changes to the Mailing Address of ${0}",
     "SUCCESS_SAVING_PHYSICAL": "Saved changes to the Physical Address of ${0}",
     "TRANSLATION": "Translation",
     "END_SURVEY": "End Survey Now",
diff --git a/Open-ILS/web/js/dojo/openils/editors.js b/Open-ILS/web/js/dojo/openils/editors.js
index ca3a1d1284..56ebb9c4b0 100644
--- a/Open-ILS/web/js/dojo/openils/editors.js
+++ b/Open-ILS/web/js/dojo/openils/editors.js
@@ -17,47 +17,47 @@ dojo.declare("openils.editors.NumberSpinner", dojox.grid.editors.Dijit, {
     editorClass: "dijit.form.NumberSpinner",
 
     getvalue: function() {
-	var e = this.editor;
-	// make sure to apply the displayed value
-	e.setDisplayedValue(e.getDisplayedValue());
-	return e.getValue();
+ var e = this.editor;
+ // make sure to apply the displayed value
+ e.setDisplayedValue(e.getDisplayedValue());
+ return e.getValue();
     },
 
     getEditorProps: function(inDatum){
-	return dojo.mixin({}, this.cell.editorProps||{}, {
-	    constraints: dojo.mixin({}, this.cell.constraints) || {},
-	    value: inDatum
-	});
+ return dojo.mixin({}, this.cell.editorProps||{}, {
+     constraints: dojo.mixin({}, this.cell.constraints) || {},
+     value: inDatum
+ });
     },
 });
 
 dojo.declare('openils.editors.FundSelectEditor', dojox.grid.editors.Dijit, {
     editorClass: "openils.widget.FundSelector",
     createEditor: function(inNode, inDatum, inRowIndex) {
-	var editor = new this.editorClass(this.getEditorProps(inDatum), inNode);
-	openils.acq.Fund.buildPermFundSelector(this.cell.perm || this.perm,
-					 editor);
-	return editor;
+ var editor = new this.editorClass(this.getEditorProps(inDatum), inNode);
+ openils.acq.Fund.buildPermFundSelector(this.cell.perm || this.perm,
+      editor);
+ return editor;
     },
 });
 
 dojo.declare('openils.editors.ProviderSelectEditor', dojox.grid.editors.Dijit, {
     editorClass: "openils.widget.ProviderSelector",
     createEditor: function(inNode, inDatum, inRowIndex) {
-	var editor = new this.editorClass(this.getEditorProps(inDatum), inNode);
-	openils.acq.Provider.buildPermProviderSelector(this.cell.perm || this.perm,
-						       editor);
-	return editor;
+ var editor = new this.editorClass(this.getEditorProps(inDatum), inNode);
+ openils.acq.Provider.buildPermProviderSelector(this.cell.perm || this.perm,
+             editor);
+ return editor;
     },
 });
 
 dojo.declare('openils.editors.OrgUnitSelectEditor', dojox.grid.editors.Dijit, {
     editorClass: "openils.widget.OrgUnitFilteringSelect",
     createEditor: function(inNode, inDatum, inRowIndex) {
-	var editor = new this.editorClass(this.getEditorProps(inDatum), inNode);
-	new openils.User().buildPermOrgSelector(this.cell.perm || this.perm, editor);
-	editor.setValue(inDatum);
-	return editor;
+ var editor = new this.editorClass(this.getEditorProps(inDatum), inNode);
+ new openils.User().buildPermOrgSelector(this.cell.perm || this.perm, editor);
+ editor.setValue(inDatum);
+ return editor;
     },
 });
 
@@ -65,7 +65,7 @@ dojo.declare('openils.editors.CopyLocationSelectEditor', dojox.grid.editors.Diji
     editorClass: "dijit.form.FilteringSelect",
     createEditor: function(inNode, inDatum, inRowIndex) {
         dojo.require('openils.CopyLocation');
-	    var editor = new this.editorClass(this.getEditorProps(inDatum), inNode);
+     var editor = new this.editorClass(this.getEditorProps(inDatum), inNode);
         openils.CopyLocation.createStore(1,  /* XXX how do we propagate arguments to the editor?? */
             function(store) {
                 editor.store = new dojo.data.ItemFileReadStore({data:store});
@@ -74,7 +74,7 @@ dojo.declare('openils.editors.CopyLocationSelectEditor', dojox.grid.editors.Diji
                     editor.setValue(inDatum);
             }
         );
-	    return editor;
+     return editor;
     },
 });
 
diff --git a/Open-ILS/web/js/dojo/openils/opac/nls/opac.js b/Open-ILS/web/js/dojo/openils/opac/nls/opac.js
index c1978605e0..f0ba84bb96 100644
--- a/Open-ILS/web/js/dojo/openils/opac/nls/opac.js
+++ b/Open-ILS/web/js/dojo/openils/opac/nls/opac.js
@@ -1,20 +1,20 @@
 {
-	"CREATE_MFHD": "Add MFHD Record",
-	"CREATED_MFHD_RECORD": "Created MFHD record for ${0}",
-	"DELETE_MFHD": "Delete Record",
-	"DELETED_MFHD_RECORD": "Deleted MFHD record ${0}",
-	"EDIT_MFHD_RECORD": "Edit Record",
-	"EDIT_MFHD_MENU": "Edit Holdings",
-	"EDIT_PROPERTIES": "Edit Propeties",
-	"HOLDINGS": "Previous volumes",
-	"INDEXES": "Previous indexes",
-	"CURRENT_HOLDINGS": "Current volume",
-	"CURRENT_INDEXES": "Current indexes",
-	"CURRENT_SUPPLEMENTS": "Current supplements",
-	"HOLDINGS_TABLE_CAPTION": "Holdings summary (${0})",
-	"INCOMPLETE_VOLUMES": "Incomplete volumes",
-	"MISSING_VOLUMES": "Missing volumes",
-	"ONLINE_VOLUMES": "Online volumes",
-	"SAVE_MFHD_LABEL": "Save MFHD",
-	"SUPPLEMENTS": "Previous supplements"
+ "CREATE_MFHD": "Add MFHD Record",
+ "CREATED_MFHD_RECORD": "Created MFHD record for ${0}",
+ "DELETE_MFHD": "Delete Record",
+ "DELETED_MFHD_RECORD": "Deleted MFHD record ${0}",
+ "EDIT_MFHD_RECORD": "Edit Record",
+ "EDIT_MFHD_MENU": "Edit Holdings",
+ "EDIT_PROPERTIES": "Edit Propeties",
+ "HOLDINGS": "Previous volumes",
+ "INDEXES": "Previous indexes",
+ "CURRENT_HOLDINGS": "Current volume",
+ "CURRENT_INDEXES": "Current indexes",
+ "CURRENT_SUPPLEMENTS": "Current supplements",
+ "HOLDINGS_TABLE_CAPTION": "Holdings summary (${0})",
+ "INCOMPLETE_VOLUMES": "Incomplete volumes",
+ "MISSING_VOLUMES": "Missing volumes",
+ "ONLINE_VOLUMES": "Online volumes",
+ "SAVE_MFHD_LABEL": "Save MFHD",
+ "SUPPLEMENTS": "Previous supplements"
 }
diff --git a/Open-ILS/web/js/dojo/openils/reports/nls/reports.js b/Open-ILS/web/js/dojo/openils/reports/nls/reports.js
index f9b72e551a..d242885b8f 100644
--- a/Open-ILS/web/js/dojo/openils/reports/nls/reports.js
+++ b/Open-ILS/web/js/dojo/openils/reports/nls/reports.js
@@ -1,166 +1,166 @@
 {
-	"RPT_BUILDER_CONFIRM_SAVE": "Name : ${0}\nDescription: ${1}\nSave Template?",
+ "RPT_BUILDER_CONFIRM_SAVE": "Name : ${0}\nDescription: ${1}\nSave Template?",
 
     "LINK_NULLABLE_DEFAULT": "Default",
     "LINK_NULLABLE_RIGHT": "Parent",
     "LINK_NULLABLE_LEFT": "Child",
     "LINK_NULLABLE_NONE": "None",
-	
-	"FILTERS_LABEL_EQUALS":"Equals",
-	"FILTERS_LABEL_LIKE": "Contains Matching substring",
-	"FILTERS_LABEL_ILIKE": "Contains Matching substring (ignore case)",
-	"FILTERS_LABEL_GREATER_THAN": "Greater than",
-	"FILTERS_LABEL_GT_TIME": "After (Date/Time)",
-	"FILTERS_LABEL_GT_EQUAL": "Greater than or equal to",
-	"FILTERS_LABEL_GTE_TIME": "On or After (Date/Time)",
-	"FILTERS_LABEL_LESS_THAN": "Less than",
-	"FILTERS_LABEL_LT_TIME": "Before (Date/Time)",
-	"FILTERS_LABEL_LT_EQUAL": "Less than or equal to",
-	"FILTERS_LABEL_LSE_TIME": "On or Before (Date/Time)",
-	"FILTERS_LABEL_IN": "In list",
-	"FILTERS_LABEL_NOT_IN": "Not in list",
-	"FILTERS_LABEL_BETWEEN": "Between",
-	"FILTERS_LABEL_NOT_BETWEEN": "Not between",
-	"FILTERS_LABEL_NULL": "Is NULL",
-	"FILTERS_LABEL_NOT_NULL": "Is not NULL",
-	"FILTERS_LABEL_NULL_BLANK": "Is NULL or Blank",
-	"FILTERS_LABEL_NOT_NULL_BLANK": "Is not NULL or Blank",
-	
-	"FOLDERS_TEMPLATES": "Templates",
-	"FOLDERS_TEMPLATE": "Template",
-	"FOLDERS_REPORTS": "Reports",
-	"FOLDERS_REPORT": "Report",
-	"FOLDERS_OUTPUT": "Output",
-	
-	"FOLDER_WINDOW_SELECT_ITEM": "Please select an item from the list",
-	"FOLDER_WINDOW_CHANGE_FOLDERS": "Change Folders",
-	"FOLDER_WINDOW_REPORT_OUTPUT": "Report Output: ${0}",
-	"FOLDER_WINDOW_COLNAME_SELECT": "Select",
-	"FOLDER_WINDOW_COLNAME_ALL": "All",
-	"FOLDER_WINDOW_COLNAME_NONE": "None",
-	
-	"REPORT_EDITOR_REPORT_FOLDERS": "Report Folders",
-	"REPORT_EDITOR_OUTPUT_FOLDERS": "Output Folders",
-	"REPORT_EDITOR_PROVIDE_FOLDER_ALERT": "Please provide a report folder",
-	"REPORT_EDITOR_ENTER_NAME_ALERT": "Please enter a report name",
-	"REPORT_EDITOR_INVALID_DATE_ALERT": "invalid start date -  YYYY-MM-DD",
-	"REPORT_EDITOR_PROVIDE_OUTPUT_ALERT": "Please provide an output folder",
-	
-	"TFORMS_LABEL_RAW_DATA": "Raw Data",
-	"TFORMS_LABEL_FIRST": "First Value",
-	"TFORMS_LABEL_LAST": "Last Value",
-	"TFORMS_LABEL_COUNT": "Count",
-	"TFORMS_LABEL_COUNT_DISTINCT": "Count Distinct",
-	"TFORMS_LABEL_MIN": "Min",
-	"TFORMS_LABEL_MAX": "Max",
-	"TFORMS_LABEL_LOWER": "Lower case",
-	"TFORMS_LABEL_UPPER": "Upper case",
-	"TFORMS_LABEL_FIRST5": "First 5 characters (for US ZIP code)",
-	"TFORMS_LABEL_FIRST_WORD": "First contiguous non-space string",
-	"TFORMS_LABEL_DOW": "Day of Week",
-	"TFORMS_LABEL_DOM": "Day of Month",
-	"TFORMS_LABEL_DOY": "Day of Year",
-	"TFORMS_LABEL_WOY": "Week of Year",
-	"TFORMS_LABEL_MOY": "Month of Year",
-	"TFORMS_LABEL_QOY": "Quarter of Year",
-	"TFORMS_LABEL_HOD": "Hour of day",
-	"TFORMS_LABEL_DATE": "Date",
-	"TFORMS_LABEL_MONTH_TRUNC": "Year + Month",
-	"TFORMS_LABEL_YEAR_TRUNC": "Year",
-	"TFORMS_LABEL_HOUR_TRUNC": "Hour",
-	"TFORMS_LABEL_DAY_NAME": "Day Name",
-	"TFORMS_LABEL_MONTH_NAME": "Month Name'",
-	"TFORMS_LABEL_AGE": "Age",
-	"TFORMS_LABEL_MONTHS_AGO": "Months ago",
-	"TFORMS_LABEL_QUARTERS_AGO": "Quarters ago",
-	"TFORMS_LABEL_SUM": "Sum",
-	"TFORMS_LABEL_AVERAGE": "Average",
-	"TFORMS_LABEL_ROUND": "Round",
-	"TFORMS_LABEL_INT": "Drop trailing decimals",
-	
-	"WIDGET_DAYS": "Day(s)",
-	"WIDGET_MONTHS": "Month(s)",
-	"WIDGET_YEARS": "Year(s)",
-	"WIDGET_QUARTERS": "Quarter(s)",
-	"WIDGET_REAL_DATE": "Real Date",
-	"WIDGET_RELATIVE_DATE": "Relative Date",
-	
-	"OPERATORS_EQUALS": "Equals",
-	"OPERATORS_LIKE": "Contains Matching substring",
-	"OPERATORS_ILIKE": "Contains Matching substring (ignore case)",
-	"OPERATORS_GREATER_THAN": "Greater than",
-	"OPERATORS_GT_TIME": "After (Date/Time)",
-	"OPERATORS_GT_EQUAL": "Greater than or equal to",
-	"OPERATORS_GTE_TIME": "On or After (Date/Time)",
-	"OPERATORS_LESS_THAN": "Less than",
-	"OPERATORS_LT_TIME": "Before (Date/Time)",
-	"OPERATORS_LT_EQUAL": "Less than or equal to",
-	"OPERATORS_LTE_TIME": "On or Before (Date/Time)",
-	"OPERATORS_IN_LIST": "In list",
-	"OPERATORS_NOT_IN_LIST": "Not in list",
-	"OPERATORS_BETWEEN": "Between",
-	"OPERATORS_NOT_BETWEEN": "Not between",
-	"OPERATORS_IS_NULL": "Is NULL",
-	"OPERATORS_IS_NOT_NULL": "Is not NULL",
-	"OPERATORS_NULL_BLANK": "Is NULL or Blank",
-	"OPERATORS_NOT_NULL_BLANK": "Is not NULL or Blank",
-	
-	"SOURCE_BROWSE_AGGREGATE": "Aggregate",
-	"SOURCE_BROWSE_NON_AGGREGATE": "Non-Aggregate",
-	
-	"SOURCE_SETUP_CONFIRM_EXIT": "You have started building a template!\n Selecting a new starting source will destroy the current template and start over.  Is this OK?",
-	"SOURCE_SETUP_CORE_SOURCES": "Core Sources",
-	"SOURCE_SETUP_ALL_AVAIL_SOURCES": "All Available Sources",
-	
-	"TEMPLATE_CONF_BARE": "Bare",
-	"TEMPLATE_CONF_RAW_DATA": "Raw Data",
-	"TEMPLATE_CONF_EQUALS": "Equals",
-	"TEMPLATE_CONF_CONFIRM_RESET": "You have already added the [${0}] field\nfrom the [${1}] source. Click OK if you\nwould like to reset this field.",
-	"TEMPLATE_CONF_PROMPT_CHANGE": "Change the column header to: ${0}",
-	"TEMPLATE_CONF_BOOLEAN_VALUE": "Boolean Value",
-	"TEMPLATE_CONF_SELECT_CANCEL": "Select the value, or cancel:",
-	"TEMPLATE_CONF_TRUE": "True",
-	"TEMPLATE_CONF_FALSE": "False",
-	"TEMPLATE_CONF_CONFIRM_STATE": "Click OK for TRUE and Cancel for FALSE.",
-	"TEMPLATE_CONF_NO_MATCH": "Field does not match one of list (comma separated):",
-	"TEMPLATE_CONF_NOT_BETWEEN": "Field value is not between (comma separated):",
-	"TEMPLATE_CONF_BETWEEN": "Field value is between (comma separated):",
-	"TEMPLATE_CONF_NOT_IN": "Field does not match one of list (comma separated):",
-	"TEMPLATE_CONF_IN": "Field matches one of list (comma separated):",
-	"TEMPLATE_CONF_DEFAULT": "Value ${0}:",
-	"TEMPLATE_CONF_CONFIRM_SAVE": "Name : ${0}\nDescription: ${1}\nSave Template?",
-	"TEMPLATE_CONF_SUCCESS_SAVE": "Template ${0} was successfully saved.",
-	
-	"TRANSFORMS_BARE": "Raw Data",
-	"TRANSFORMS_FIRST": "First Value",
-	"TRANSFORMS_LAST": "Last Value",
-	"TRANSFORMS_COUNT": "Count",
-	"TRANSFORMS_COUNT_DISTINCT": "Count Distinct",
-	"TRANSFORMS_MIN": "Min",
-	"TRANSFORMS_MAX": "Max",
-	"TRANSFORMS_SUBSTRING": "Substring",
-	"TRANSFORMS_LOWER": "Lower case",
-	"TRANSFORMS_UPPER": "Upper case",
-	"TRANSFORMS_FIRST5": "First 5 characters (for US ZIP code)",
-	"TRANSFORMS_FIRST_WORD": "First contiguous non-space string",
-	"TRANSFORMS_DOW": "Day of Week",
-	"TRANSFORMS_DOM": "Day of Month",
-	"TRANSFORMS_DOY": "Day of Year",
-	"TRANSFORMS_WOY": "Week of Year",
-	"TRANSFORMS_MOY": "Month of Year",
-	"TRANSFORMS_QOY": "Quarter of Year",
-	"TRANSFORMS_HOD": "Hour of day",
-	"TRANSFORMS_DATE": "Date",
-	"TRANSFORMS_MONTH_TRUNC": "Year + Month",
-	"TRANSFORMS_YEAR_TRUNC": "Year",
-	"TRANSFORMS_HOUR_TRUNC": "Hour",
-	"TRANSFORMS_DAY_NAME": "Day Name",
-	"TRANSFORMS_MONTH_NAME": "Month Name",
-	"TRANSFORMS_AGE": "Age",
-	"TRANSFORMS_MONTHS_AGO": "Months ago",
-	"TRANSFORMS_QUARTERS_AGO": "Quarters ago",
-	"TRANSFORMS_SUM": "Sum",
-	"TRANSFORMS_AVERAGE": "Average",
-	"TRANSFORMS_ROUND": "Round",
-	"TRANSFORMS_INT": "Drop trailing decimals"
+ 
+ "FILTERS_LABEL_EQUALS":"Equals",
+ "FILTERS_LABEL_LIKE": "Contains Matching substring",
+ "FILTERS_LABEL_ILIKE": "Contains Matching substring (ignore case)",
+ "FILTERS_LABEL_GREATER_THAN": "Greater than",
+ "FILTERS_LABEL_GT_TIME": "After (Date/Time)",
+ "FILTERS_LABEL_GT_EQUAL": "Greater than or equal to",
+ "FILTERS_LABEL_GTE_TIME": "On or After (Date/Time)",
+ "FILTERS_LABEL_LESS_THAN": "Less than",
+ "FILTERS_LABEL_LT_TIME": "Before (Date/Time)",
+ "FILTERS_LABEL_LT_EQUAL": "Less than or equal to",
+ "FILTERS_LABEL_LSE_TIME": "On or Before (Date/Time)",
+ "FILTERS_LABEL_IN": "In list",
+ "FILTERS_LABEL_NOT_IN": "Not in list",
+ "FILTERS_LABEL_BETWEEN": "Between",
+ "FILTERS_LABEL_NOT_BETWEEN": "Not between",
+ "FILTERS_LABEL_NULL": "Is NULL",
+ "FILTERS_LABEL_NOT_NULL": "Is not NULL",
+ "FILTERS_LABEL_NULL_BLANK": "Is NULL or Blank",
+ "FILTERS_LABEL_NOT_NULL_BLANK": "Is not NULL or Blank",
+ 
+ "FOLDERS_TEMPLATES": "Templates",
+ "FOLDERS_TEMPLATE": "Template",
+ "FOLDERS_REPORTS": "Reports",
+ "FOLDERS_REPORT": "Report",
+ "FOLDERS_OUTPUT": "Output",
+ 
+ "FOLDER_WINDOW_SELECT_ITEM": "Please select an item from the list",
+ "FOLDER_WINDOW_CHANGE_FOLDERS": "Change Folders",
+ "FOLDER_WINDOW_REPORT_OUTPUT": "Report Output: ${0}",
+ "FOLDER_WINDOW_COLNAME_SELECT": "Select",
+ "FOLDER_WINDOW_COLNAME_ALL": "All",
+ "FOLDER_WINDOW_COLNAME_NONE": "None",
+ 
+ "REPORT_EDITOR_REPORT_FOLDERS": "Report Folders",
+ "REPORT_EDITOR_OUTPUT_FOLDERS": "Output Folders",
+ "REPORT_EDITOR_PROVIDE_FOLDER_ALERT": "Please provide a report folder",
+ "REPORT_EDITOR_ENTER_NAME_ALERT": "Please enter a report name",
+ "REPORT_EDITOR_INVALID_DATE_ALERT": "invalid start date -  YYYY-MM-DD",
+ "REPORT_EDITOR_PROVIDE_OUTPUT_ALERT": "Please provide an output folder",
+ 
+ "TFORMS_LABEL_RAW_DATA": "Raw Data",
+ "TFORMS_LABEL_FIRST": "First Value",
+ "TFORMS_LABEL_LAST": "Last Value",
+ "TFORMS_LABEL_COUNT": "Count",
+ "TFORMS_LABEL_COUNT_DISTINCT": "Count Distinct",
+ "TFORMS_LABEL_MIN": "Min",
+ "TFORMS_LABEL_MAX": "Max",
+ "TFORMS_LABEL_LOWER": "Lower case",
+ "TFORMS_LABEL_UPPER": "Upper case",
+ "TFORMS_LABEL_FIRST5": "First 5 characters (for US ZIP code)",
+ "TFORMS_LABEL_FIRST_WORD": "First contiguous non-space string",
+ "TFORMS_LABEL_DOW": "Day of Week",
+ "TFORMS_LABEL_DOM": "Day of Month",
+ "TFORMS_LABEL_DOY": "Day of Year",
+ "TFORMS_LABEL_WOY": "Week of Year",
+ "TFORMS_LABEL_MOY": "Month of Year",
+ "TFORMS_LABEL_QOY": "Quarter of Year",
+ "TFORMS_LABEL_HOD": "Hour of day",
+ "TFORMS_LABEL_DATE": "Date",
+ "TFORMS_LABEL_MONTH_TRUNC": "Year + Month",
+ "TFORMS_LABEL_YEAR_TRUNC": "Year",
+ "TFORMS_LABEL_HOUR_TRUNC": "Hour",
+ "TFORMS_LABEL_DAY_NAME": "Day Name",
+ "TFORMS_LABEL_MONTH_NAME": "Month Name'",
+ "TFORMS_LABEL_AGE": "Age",
+ "TFORMS_LABEL_MONTHS_AGO": "Months ago",
+ "TFORMS_LABEL_QUARTERS_AGO": "Quarters ago",
+ "TFORMS_LABEL_SUM": "Sum",
+ "TFORMS_LABEL_AVERAGE": "Average",
+ "TFORMS_LABEL_ROUND": "Round",
+ "TFORMS_LABEL_INT": "Drop trailing decimals",
+ 
+ "WIDGET_DAYS": "Day(s)",
+ "WIDGET_MONTHS": "Month(s)",
+ "WIDGET_YEARS": "Year(s)",
+ "WIDGET_QUARTERS": "Quarter(s)",
+ "WIDGET_REAL_DATE": "Real Date",
+ "WIDGET_RELATIVE_DATE": "Relative Date",
+ 
+ "OPERATORS_EQUALS": "Equals",
+ "OPERATORS_LIKE": "Contains Matching substring",
+ "OPERATORS_ILIKE": "Contains Matching substring (ignore case)",
+ "OPERATORS_GREATER_THAN": "Greater than",
+ "OPERATORS_GT_TIME": "After (Date/Time)",
+ "OPERATORS_GT_EQUAL": "Greater than or equal to",
+ "OPERATORS_GTE_TIME": "On or After (Date/Time)",
+ "OPERATORS_LESS_THAN": "Less than",
+ "OPERATORS_LT_TIME": "Before (Date/Time)",
+ "OPERATORS_LT_EQUAL": "Less than or equal to",
+ "OPERATORS_LTE_TIME": "On or Before (Date/Time)",
+ "OPERATORS_IN_LIST": "In list",
+ "OPERATORS_NOT_IN_LIST": "Not in list",
+ "OPERATORS_BETWEEN": "Between",
+ "OPERATORS_NOT_BETWEEN": "Not between",
+ "OPERATORS_IS_NULL": "Is NULL",
+ "OPERATORS_IS_NOT_NULL": "Is not NULL",
+ "OPERATORS_NULL_BLANK": "Is NULL or Blank",
+ "OPERATORS_NOT_NULL_BLANK": "Is not NULL or Blank",
+ 
+ "SOURCE_BROWSE_AGGREGATE": "Aggregate",
+ "SOURCE_BROWSE_NON_AGGREGATE": "Non-Aggregate",
+ 
+ "SOURCE_SETUP_CONFIRM_EXIT": "You have started building a template!\n Selecting a new starting source will destroy the current template and start over.  Is this OK?",
+ "SOURCE_SETUP_CORE_SOURCES": "Core Sources",
+ "SOURCE_SETUP_ALL_AVAIL_SOURCES": "All Available Sources",
+ 
+ "TEMPLATE_CONF_BARE": "Bare",
+ "TEMPLATE_CONF_RAW_DATA": "Raw Data",
+ "TEMPLATE_CONF_EQUALS": "Equals",
+ "TEMPLATE_CONF_CONFIRM_RESET": "You have already added the [${0}] field\nfrom the [${1}] source. Click OK if you\nwould like to reset this field.",
+ "TEMPLATE_CONF_PROMPT_CHANGE": "Change the column header to: ${0}",
+ "TEMPLATE_CONF_BOOLEAN_VALUE": "Boolean Value",
+ "TEMPLATE_CONF_SELECT_CANCEL": "Select the value, or cancel:",
+ "TEMPLATE_CONF_TRUE": "True",
+ "TEMPLATE_CONF_FALSE": "False",
+ "TEMPLATE_CONF_CONFIRM_STATE": "Click OK for TRUE and Cancel for FALSE.",
+ "TEMPLATE_CONF_NO_MATCH": "Field does not match one of list (comma separated):",
+ "TEMPLATE_CONF_NOT_BETWEEN": "Field value is not between (comma separated):",
+ "TEMPLATE_CONF_BETWEEN": "Field value is between (comma separated):",
+ "TEMPLATE_CONF_NOT_IN": "Field does not match one of list (comma separated):",
+ "TEMPLATE_CONF_IN": "Field matches one of list (comma separated):",
+ "TEMPLATE_CONF_DEFAULT": "Value ${0}:",
+ "TEMPLATE_CONF_CONFIRM_SAVE": "Name : ${0}\nDescription: ${1}\nSave Template?",
+ "TEMPLATE_CONF_SUCCESS_SAVE": "Template ${0} was successfully saved.",
+ 
+ "TRANSFORMS_BARE": "Raw Data",
+ "TRANSFORMS_FIRST": "First Value",
+ "TRANSFORMS_LAST": "Last Value",
+ "TRANSFORMS_COUNT": "Count",
+ "TRANSFORMS_COUNT_DISTINCT": "Count Distinct",
+ "TRANSFORMS_MIN": "Min",
+ "TRANSFORMS_MAX": "Max",
+ "TRANSFORMS_SUBSTRING": "Substring",
+ "TRANSFORMS_LOWER": "Lower case",
+ "TRANSFORMS_UPPER": "Upper case",
+ "TRANSFORMS_FIRST5": "First 5 characters (for US ZIP code)",
+ "TRANSFORMS_FIRST_WORD": "First contiguous non-space string",
+ "TRANSFORMS_DOW": "Day of Week",
+ "TRANSFORMS_DOM": "Day of Month",
+ "TRANSFORMS_DOY": "Day of Year",
+ "TRANSFORMS_WOY": "Week of Year",
+ "TRANSFORMS_MOY": "Month of Year",
+ "TRANSFORMS_QOY": "Quarter of Year",
+ "TRANSFORMS_HOD": "Hour of day",
+ "TRANSFORMS_DATE": "Date",
+ "TRANSFORMS_MONTH_TRUNC": "Year + Month",
+ "TRANSFORMS_YEAR_TRUNC": "Year",
+ "TRANSFORMS_HOUR_TRUNC": "Hour",
+ "TRANSFORMS_DAY_NAME": "Day Name",
+ "TRANSFORMS_MONTH_NAME": "Month Name",
+ "TRANSFORMS_AGE": "Age",
+ "TRANSFORMS_MONTHS_AGO": "Months ago",
+ "TRANSFORMS_QUARTERS_AGO": "Quarters ago",
+ "TRANSFORMS_SUM": "Sum",
+ "TRANSFORMS_AVERAGE": "Average",
+ "TRANSFORMS_ROUND": "Round",
+ "TRANSFORMS_INT": "Drop trailing decimals"
 }
diff --git a/Open-ILS/web/js/dojo/openils/widget/AutoFieldWidget.js b/Open-ILS/web/js/dojo/openils/widget/AutoFieldWidget.js
index 1d56b17937..42bfa79470 100644
--- a/Open-ILS/web/js/dojo/openils/widget/AutoFieldWidget.js
+++ b/Open-ILS/web/js/dojo/openils/widget/AutoFieldWidget.js
@@ -4,7 +4,7 @@ if(!dojo._hasResource['openils.widget.AutoFieldWidget']) {
     dojo.require('openils.User');
     dojo.require('fieldmapper.IDL');
     dojo.require('openils.PermaCrud');
-	dojo.requireLocalization("openils.widget", "AutoFieldWidget");
+ dojo.requireLocalization("openils.widget", "AutoFieldWidget");
 
     dojo.declare('openils.widget.AutoFieldWidget', null, {
 
diff --git a/Open-ILS/web/js/dojo/openils/widget/FundSelector.js b/Open-ILS/web/js/dojo/openils/widget/FundSelector.js
index 38442cd494..0ed2622dd6 100644
--- a/Open-ILS/web/js/dojo/openils/widget/FundSelector.js
+++ b/Open-ILS/web/js/dojo/openils/widget/FundSelector.js
@@ -12,7 +12,7 @@ if(!dojo._hasResource["openils.widget.FundSelector"]){
      */
 
     dojo.declare(
-	"openils.widget.FundSelector", [dijit.form.FilteringSelect],
-	{
-	});
+ "openils.widget.FundSelector", [dijit.form.FilteringSelect],
+ {
+ });
 }
diff --git a/Open-ILS/web/js/dojo/openils/widget/ProviderSelector.js b/Open-ILS/web/js/dojo/openils/widget/ProviderSelector.js
index 460bf2b5d7..52e39fe522 100644
--- a/Open-ILS/web/js/dojo/openils/widget/ProviderSelector.js
+++ b/Open-ILS/web/js/dojo/openils/widget/ProviderSelector.js
@@ -12,9 +12,9 @@ if(!dojo._hasResource["openils.widget.ProviderSelector"]){
      */
 
     dojo.declare(
-	"openils.widget.ProviderSelector", [dijit.form.FilteringSelect],
-	{
+ "openils.widget.ProviderSelector", [dijit.form.FilteringSelect],
+ {
         labelAttr: 'code',
         searchAttr: 'code'
-	});
+ });
 }
diff --git a/Open-ILS/web/js/dojo/openils/widget/TranslatorPopup.js b/Open-ILS/web/js/dojo/openils/widget/TranslatorPopup.js
index 519c2ceeaa..24d2f2d8c9 100644
--- a/Open-ILS/web/js/dojo/openils/widget/TranslatorPopup.js
+++ b/Open-ILS/web/js/dojo/openils/widget/TranslatorPopup.js
@@ -22,231 +22,231 @@ if(!dojo._hasResource["openils.widget.TranslatorPopup"]) {
     dojo.require("openils.I18N");
     dojo.require("fieldmapper.dojoData");
     dojo.require("DojoSRF");
-	dojo.require("dojo.data.ItemFileWriteStore");
-	dojo.require("dijit._Widget");
-	dojo.require("dijit._Templated");
-	dojo.require("dijit.layout.ContentPane");
-	dojo.require("dijit.Dialog");
-	dojo.require("dijit.form.Button");
-	dojo.require("dijit.form.TextBox");
-	dojo.require("dijit.form.FilteringSelect");
-	dojo.require("dojox.jsonPath");
-	dojo.requireLocalization("openils.widget", "TranslatorPopup");
+ dojo.require("dojo.data.ItemFileWriteStore");
+ dojo.require("dijit._Widget");
+ dojo.require("dijit._Templated");
+ dojo.require("dijit.layout.ContentPane");
+ dojo.require("dijit.Dialog");
+ dojo.require("dijit.form.Button");
+ dojo.require("dijit.form.TextBox");
+ dojo.require("dijit.form.FilteringSelect");
+ dojo.require("dojox.jsonPath");
+ dojo.requireLocalization("openils.widget", "TranslatorPopup");
 
 
     dojo.declare(
-		'openils.widget.TranslatorPopup',
-		[dijit._Widget, dijit._Templated],
-		{
-
-			templateString : "<span id='${field}_translation_${unique}' dojoAttachPoint='containerNode'><div id='${field}_translation_button_${unique}' dojoAttachPoint='translateLabelNode' dojoType='dijit.form.DropDownButton'><span>Translate</span><div id='${field}_translation_tooltip_${unique}' dojoAttachPoint='tooltipDialog' dojoType='dijit.TooltipDialog'><div dojoType='dijit.layout.ContentPane'><table><tbody class='translation_tbody_template' style='display:none; visibility:hidden;'><tr><th dojoAttachPoint='localeLabelNode'/><td class='locale'><div class='locale_combobox'></div></td><th dojoAttachPoint='translationLabelNode'/><td class='translation'><div class='translation_textbox'></div></td><td><button class='create_button' style='display:none; visibility:hidden;'><span dojoAttachPoint='createButtonNode'/></button><button class='update_button' style='display:none; visibility:hidden;'><span dojoAttachPoint='updateButtonNode'/></button><button class='delete_button' style='display:none; visibility:hidden;'><span dojoAttachPoint='removeButtonNode'/></button></td></tr></tbody><tbody class='translation_tbody'></tbody></table></div></div></div></span>",
-
-			widgetsInTemplate: true,
-			field : "",
-			targetObject : "",
-			unique : "",
-
-			postMixInProperties : function () {
-				if (!this.unique) this.unique = openils.widget.TranslatorPopup._unique++;
-			},
-
-			postCreate : function () {
-
-				dojo.connect(this.tooltipDialog, 'onOpen', this, 'renderTranslatorPopup');
-
-				this.nls = dojo.i18n.getLocalization("openils.widget", "TranslatorPopup");
-
-				this.translateLabelNode.setLabel(this.nls.translate);
-
-				this.localeLabelNode.textContent = this.nls.locale;
-				this.translationLabelNode.textContent = this.nls.translation;
-
-				this.createButtonNode.textContent = this.nls.create;
-				this.updateButtonNode.textContent = this.nls.update;
-				this.removeButtonNode.textContent = this.nls.remove;
-			},
-
-			renderTranslatorPopup : function () {
-
-				var _trans_dijit = this;
-
-				this._targetObject = dojox.jsonPath.query(window, '$.' + this.targetObject, {evalType:"RESULT"});
-
-				var node = dojo.byId(this.field + '_translation_tooltip_' + this.unique);
-		
-				var trans_list = openils.I18N.getTranslations( this._targetObject, this.field );
-		
-				var trans_template = dojo.query('.translation_tbody_template', node)[0];
-				var trans_tbody = dojo.query('.translation_tbody', node)[0];
-		
-				// Empty it
-				while (trans_tbody.lastChild) trans_tbody.removeChild( trans_tbody.lastChild );
-		
-				for (var i in trans_list) {
-					if (!trans_list[i]) continue;
-		
-					var trans_obj = trans_list[i];
-					var trans_id = trans_obj.id();
-		
-					var trans_row = dojo.query('tr',trans_template)[0].cloneNode(true);
-					trans_row.id = 'translation_row_' + trans_id;
-		
-					var old_dijit = dijit.byId('locale_' + trans_id);
-					if (old_dijit) old_dijit.destroy();
-		
-					old_dijit = dijit.byId('translation_' + trans_id);
-					if (old_dijit) old_dijit.destroy();
-		
-					dojo.query('.locale_combobox',trans_row).instantiate(
-						dijit.form.FilteringSelect,
-						{ store:openils.I18N.localeStore,
-						  searchAttr:'locale',
-						  labelAttr:'label',
-						  lowercase:false,
-						  required:true,
-						  id:'locale_' + trans_id,
-						  value: trans_obj.translation(),
-						  invalidMessage:'Specify locale as {languageCode}-{countryCode}, as in en-US',
-						  regExp:'[a-z_]+'
-						}
-					);
-		
-					dojo.query('.translation_textbox',trans_row).instantiate(
-						dijit.form.TextBox,
-						{ required : true,
-						  id:'translation_' + trans_id,
-						  value: trans_obj.string()
-						}
-					);
-		
-					dojo.query('.update_button',trans_row).style({ visibility : 'visible', display : 'inline'}).instantiate(
-						dijit.form.Button,
-						{ onClick : dojo.hitch( _trans_dijit, 'updateTranslation', trans_id) }
-					);
-		
-					dojo.query('.delete_button',trans_row).style({ visibility : 'visible', display : 'inline'}).instantiate(
-						dijit.form.Button,
-						{ onClick : dojo.hitch( _trans_dijit, 'removeTranslation', trans_id) }
-					);
-		
-					trans_tbody.appendChild( trans_row );
-		
-				}
-		
-				old_dijit = dijit.byId('i18n_new_locale_' + this._targetObject.classname + '.' + this.field + this.unique);
-				if (old_dijit) old_dijit.destroy();
-		
-				old_dijit = dijit.byId('i18n_new_translation_' + this._targetObject.classname + '.' + this.field + this.unique);
-				if (old_dijit) old_dijit.destroy();
-		
-				trans_row = dojo.query('tr',trans_template)[0].cloneNode(true);
-		
-				dojo.query('.locale_combobox',trans_row).instantiate(
-					dijit.form.FilteringSelect,
-					{ store:openils.I18N.localeStore,
-					  searchAttr:'locale',
-					  labelAttr:'label',
-					  id:'i18n_new_locale_' + this._targetObject.classname + '.' + this.field + this.unique,
-					  lowercase:false,
-					  required:true,
-					  invalidMessage:'Specify locale as {languageCode}_{countryCode}, as in en-US',
-					  regExp:'[a-z_]+'
-					}
-				);
-		
-				dojo.query('.translation_textbox',trans_row).addClass('new_translation').instantiate(
-					dijit.form.TextBox,
-					{ required : true,
-					  id:'i18n_new_translation_' + this._targetObject.classname + '.' + this.field + this.unique
-					}
-				);
-		
-				dojo.query('.create_button',trans_row).style({ visibility : 'visible', display : 'inline'}).instantiate(
-					dijit.form.Button,
-					{ onClick : dojo.hitch( _trans_dijit, 'createTranslation') }
-				);
-		
-				trans_tbody.appendChild( trans_row );
-
-			},
-
-			updateTranslation : function (t) {
-				return this.changeTranslation('update',t);
-			},
-			
-			removeTranslation : function (t) {
-				return this.changeTranslation('delete',t);
-			},
-			
-			changeTranslation : function (method, trans_id) {
-			
-				var trans_obj = new i18n().fromHash({
-					ischanged : method == 'update' ? 1 : 0,
-					isdeleted : method == 'delete' ? 1 : 0,
-					id : trans_id,
-					fq_field : this._targetObject.classname + '.' + this.field,
-					identity_value : this._targetObject[fieldmapper[this._targetObject.classname].Identifier](),
-					translation : dijit.byId('locale_' + trans_id).getValue(),
-					string : dijit.byId('translation_' + trans_id).getValue()
-				});
-			
-				this.writeTranslation(method, trans_obj);
-			},
-			
-			createTranslation : function () {
-				var node = dojo.byId(this.field + '_translation_tooltip_' + this.unique);
-			
-				var trans_obj = new i18n().fromHash({
-					isnew : 1,
-					fq_field : this._targetObject.classname + '.' + this.field,
-					identity_value : this._targetObject[fieldmapper[this._targetObject.classname].Identifier](),
-					translation : dijit.byId('i18n_new_locale_' + this._targetObject.classname + '.' + this.field + this.unique).getValue(),
-					string : dijit.byId('i18n_new_translation_' + this._targetObject.classname + '.' + this.field + this.unique).getValue()
-				});
-			
-				this.writeTranslation('create', trans_obj);
-			},
-	
-			writeTranslation : function (method, trans_obj) {
-			
-				var _trans_dijit = this;
-
-				OpenSRF.CachedClientSession('open-ils.permacrud').request({
-					method : 'open-ils.permacrud.' + method + '.i18n',
-					timeout: 10,
-					params : [ ses, trans_obj ],
-					onerror: function (r) {
-						//highlighter.editor_pane.red.play();
-						if (status_update) status_update( 'Problem saving translation for ' + _trans_dijit._targetObject[_trans_dijit.field]() );
-					},
-					oncomplete : function (r) {
-						var res = r.recv();
-						if ( res && res.content() ) {
-							//highlighter.editor_pane.green.play();
-							if (status_update) status_update( 'Saved changes to translation for ' + _trans_dijit._targetObject[_trans_dijit.field]() );
-			
-							if (method == 'delete') {
-								dojo.NodeList(dojo.byId('translation_row_' + trans_obj.id())).orphan();
-							} else if (method == 'create') {
-								var node = dojo.byId(_trans_dijit.field + '_translation_tooltip_' + _trans_dijit.unique);
-								dijit.byId('i18n_new_locale_' + _trans_dijit._targetObject.classname + '.' + _trans_dijit.field + _trans_dijit.unique).setValue(null);
-								dijit.byId('i18n_new_translation_' + _trans_dijit._targetObject.classname + '.' + _trans_dijit.field + _trans_dijit.unique).setValue(null);
-								_trans_dijit.renderTranslatorPopup();
-							}
-			
-						} else {
-							//highlighter.editor_pane.red.play();
-							if (status_update) status_update( 'Problem saving translation for ' + _trans_dijit._targetObject[_trans_dijit.field]() );
-						}
-					},
-				}).send();
-			}
-
-		}
-
-	);
-
-	openils.widget.TranslatorPopup._unique = 1;
+  'openils.widget.TranslatorPopup',
+  [dijit._Widget, dijit._Templated],
+  {
+
+   templateString : "<span id='${field}_translation_${unique}' dojoAttachPoint='containerNode'><div id='${field}_translation_button_${unique}' dojoAttachPoint='translateLabelNode' dojoType='dijit.form.DropDownButton'><span>Translate</span><div id='${field}_translation_tooltip_${unique}' dojoAttachPoint='tooltipDialog' dojoType='dijit.TooltipDialog'><div dojoType='dijit.layout.ContentPane'><table><tbody class='translation_tbody_template' style='display:none; visibility:hidden;'><tr><th dojoAttachPoint='localeLabelNode'/><td class='locale'><div class='locale_combobox'></div></td><th dojoAttachPoint='translationLabelNode'/><td class='translation'><div class='translation_textbox'></div></td><td><button class='create_button' style='display:none; visibility:hidden;'><span dojoAttachPoint='createButtonNode'/></button><button class='update_button' style='display:none; visibility:hidden;'><span dojoAttachPoint='updateButtonNode'/></button><button class='delete_button' style='display:none; visibility:hidden;'><span dojoAttachPoint='removeButtonNode'/></button></td></tr></tbody><tbody class='translation_tbody'></tbody></table></div></div></div></span>",
+
+   widgetsInTemplate: true,
+   field : "",
+   targetObject : "",
+   unique : "",
+
+   postMixInProperties : function () {
+    if (!this.unique) this.unique = openils.widget.TranslatorPopup._unique++;
+   },
+
+   postCreate : function () {
+
+    dojo.connect(this.tooltipDialog, 'onOpen', this, 'renderTranslatorPopup');
+
+    this.nls = dojo.i18n.getLocalization("openils.widget", "TranslatorPopup");
+
+    this.translateLabelNode.setLabel(this.nls.translate);
+
+    this.localeLabelNode.textContent = this.nls.locale;
+    this.translationLabelNode.textContent = this.nls.translation;
+
+    this.createButtonNode.textContent = this.nls.create;
+    this.updateButtonNode.textContent = this.nls.update;
+    this.removeButtonNode.textContent = this.nls.remove;
+   },
+
+   renderTranslatorPopup : function () {
+
+    var _trans_dijit = this;
+
+    this._targetObject = dojox.jsonPath.query(window, '$.' + this.targetObject, {evalType:"RESULT"});
+
+    var node = dojo.byId(this.field + '_translation_tooltip_' + this.unique);
+  
+    var trans_list = openils.I18N.getTranslations( this._targetObject, this.field );
+  
+    var trans_template = dojo.query('.translation_tbody_template', node)[0];
+    var trans_tbody = dojo.query('.translation_tbody', node)[0];
+  
+    // Empty it
+    while (trans_tbody.lastChild) trans_tbody.removeChild( trans_tbody.lastChild );
+  
+    for (var i in trans_list) {
+     if (!trans_list[i]) continue;
+  
+     var trans_obj = trans_list[i];
+     var trans_id = trans_obj.id();
+  
+     var trans_row = dojo.query('tr',trans_template)[0].cloneNode(true);
+     trans_row.id = 'translation_row_' + trans_id;
+  
+     var old_dijit = dijit.byId('locale_' + trans_id);
+     if (old_dijit) old_dijit.destroy();
+  
+     old_dijit = dijit.byId('translation_' + trans_id);
+     if (old_dijit) old_dijit.destroy();
+  
+     dojo.query('.locale_combobox',trans_row).instantiate(
+      dijit.form.FilteringSelect,
+      { store:openils.I18N.localeStore,
+        searchAttr:'locale',
+        labelAttr:'label',
+        lowercase:false,
+        required:true,
+        id:'locale_' + trans_id,
+        value: trans_obj.translation(),
+        invalidMessage:'Specify locale as {languageCode}-{countryCode}, as in en-US',
+        regExp:'[a-z_]+'
+      }
+     );
+  
+     dojo.query('.translation_textbox',trans_row).instantiate(
+      dijit.form.TextBox,
+      { required : true,
+        id:'translation_' + trans_id,
+        value: trans_obj.string()
+      }
+     );
+  
+     dojo.query('.update_button',trans_row).style({ visibility : 'visible', display : 'inline'}).instantiate(
+      dijit.form.Button,
+      { onClick : dojo.hitch( _trans_dijit, 'updateTranslation', trans_id) }
+     );
+  
+     dojo.query('.delete_button',trans_row).style({ visibility : 'visible', display : 'inline'}).instantiate(
+      dijit.form.Button,
+      { onClick : dojo.hitch( _trans_dijit, 'removeTranslation', trans_id) }
+     );
+  
+     trans_tbody.appendChild( trans_row );
+  
+    }
+  
+    old_dijit = dijit.byId('i18n_new_locale_' + this._targetObject.classname + '.' + this.field + this.unique);
+    if (old_dijit) old_dijit.destroy();
+  
+    old_dijit = dijit.byId('i18n_new_translation_' + this._targetObject.classname + '.' + this.field + this.unique);
+    if (old_dijit) old_dijit.destroy();
+  
+    trans_row = dojo.query('tr',trans_template)[0].cloneNode(true);
+  
+    dojo.query('.locale_combobox',trans_row).instantiate(
+     dijit.form.FilteringSelect,
+     { store:openils.I18N.localeStore,
+       searchAttr:'locale',
+       labelAttr:'label',
+       id:'i18n_new_locale_' + this._targetObject.classname + '.' + this.field + this.unique,
+       lowercase:false,
+       required:true,
+       invalidMessage:'Specify locale as {languageCode}_{countryCode}, as in en-US',
+       regExp:'[a-z_]+'
+     }
+    );
+  
+    dojo.query('.translation_textbox',trans_row).addClass('new_translation').instantiate(
+     dijit.form.TextBox,
+     { required : true,
+       id:'i18n_new_translation_' + this._targetObject.classname + '.' + this.field + this.unique
+     }
+    );
+  
+    dojo.query('.create_button',trans_row).style({ visibility : 'visible', display : 'inline'}).instantiate(
+     dijit.form.Button,
+     { onClick : dojo.hitch( _trans_dijit, 'createTranslation') }
+    );
+  
+    trans_tbody.appendChild( trans_row );
+
+   },
+
+   updateTranslation : function (t) {
+    return this.changeTranslation('update',t);
+   },
+   
+   removeTranslation : function (t) {
+    return this.changeTranslation('delete',t);
+   },
+   
+   changeTranslation : function (method, trans_id) {
+   
+    var trans_obj = new i18n().fromHash({
+     ischanged : method == 'update' ? 1 : 0,
+     isdeleted : method == 'delete' ? 1 : 0,
+     id : trans_id,
+     fq_field : this._targetObject.classname + '.' + this.field,
+     identity_value : this._targetObject[fieldmapper[this._targetObject.classname].Identifier](),
+     translation : dijit.byId('locale_' + trans_id).getValue(),
+     string : dijit.byId('translation_' + trans_id).getValue()
+    });
+   
+    this.writeTranslation(method, trans_obj);
+   },
+   
+   createTranslation : function () {
+    var node = dojo.byId(this.field + '_translation_tooltip_' + this.unique);
+   
+    var trans_obj = new i18n().fromHash({
+     isnew : 1,
+     fq_field : this._targetObject.classname + '.' + this.field,
+     identity_value : this._targetObject[fieldmapper[this._targetObject.classname].Identifier](),
+     translation : dijit.byId('i18n_new_locale_' + this._targetObject.classname + '.' + this.field + this.unique).getValue(),
+     string : dijit.byId('i18n_new_translation_' + this._targetObject.classname + '.' + this.field + this.unique).getValue()
+    });
+   
+    this.writeTranslation('create', trans_obj);
+   },
+ 
+   writeTranslation : function (method, trans_obj) {
+   
+    var _trans_dijit = this;
+
+    OpenSRF.CachedClientSession('open-ils.permacrud').request({
+     method : 'open-ils.permacrud.' + method + '.i18n',
+     timeout: 10,
+     params : [ ses, trans_obj ],
+     onerror: function (r) {
+      //highlighter.editor_pane.red.play();
+      if (status_update) status_update( 'Problem saving translation for ' + _trans_dijit._targetObject[_trans_dijit.field]() );
+     },
+     oncomplete : function (r) {
+      var res = r.recv();
+      if ( res && res.content() ) {
+       //highlighter.editor_pane.green.play();
+       if (status_update) status_update( 'Saved changes to translation for ' + _trans_dijit._targetObject[_trans_dijit.field]() );
+   
+       if (method == 'delete') {
+        dojo.NodeList(dojo.byId('translation_row_' + trans_obj.id())).orphan();
+       } else if (method == 'create') {
+        var node = dojo.byId(_trans_dijit.field + '_translation_tooltip_' + _trans_dijit.unique);
+        dijit.byId('i18n_new_locale_' + _trans_dijit._targetObject.classname + '.' + _trans_dijit.field + _trans_dijit.unique).setValue(null);
+        dijit.byId('i18n_new_translation_' + _trans_dijit._targetObject.classname + '.' + _trans_dijit.field + _trans_dijit.unique).setValue(null);
+        _trans_dijit.renderTranslatorPopup();
+       }
+   
+      } else {
+       //highlighter.editor_pane.red.play();
+       if (status_update) status_update( 'Problem saving translation for ' + _trans_dijit._targetObject[_trans_dijit.field]() );
+      }
+     },
+    }).send();
+   }
+
+  }
+
+ );
+
+ openils.widget.TranslatorPopup._unique = 1;
 
 
 
diff --git a/Open-ILS/web/js/dojo/openils/widget/nls/TranslatorPopup.js b/Open-ILS/web/js/dojo/openils/widget/nls/TranslatorPopup.js
index 7fc07a47bd..78f3235a17 100644
--- a/Open-ILS/web/js/dojo/openils/widget/nls/TranslatorPopup.js
+++ b/Open-ILS/web/js/dojo/openils/widget/nls/TranslatorPopup.js
@@ -1,8 +1,8 @@
 ({
-	locale : 'Locale',
-	translation : 'Translation',
-	translate : 'Translate',
-	create : 'Create',
-	update : 'Update',
-	remove : 'Remove'
+ locale : 'Locale',
+ translation : 'Translation',
+ translate : 'Translate',
+ create : 'Create',
+ update : 'Update',
+ remove : 'Remove'
 })
diff --git a/Open-ILS/web/js/dojo/openils/widget/nls/es/TranslatorPopup.js b/Open-ILS/web/js/dojo/openils/widget/nls/es/TranslatorPopup.js
index b976c60395..77971701af 100644
--- a/Open-ILS/web/js/dojo/openils/widget/nls/es/TranslatorPopup.js
+++ b/Open-ILS/web/js/dojo/openils/widget/nls/es/TranslatorPopup.js
@@ -1,8 +1,8 @@
 ({
-	locale : 'Escena',
-	translation : 'Traduccion',
-	translate : 'Traducir',
-	create : 'Crear',
-	update : 'Actualizacion',
-	remove : 'Quitar'
+ locale : 'Escena',
+ translation : 'Traduccion',
+ translate : 'Traducir',
+ create : 'Crear',
+ update : 'Actualizacion',
+ remove : 'Quitar'
 })
diff --git a/Open-ILS/web/js/ui/default/acq/common/jubgrid.js b/Open-ILS/web/js/ui/default/acq/common/jubgrid.js
index 6a0c451aef..23527db43b 100644
--- a/Open-ILS/web/js/ui/default/acq/common/jubgrid.js
+++ b/Open-ILS/web/js/ui/default/acq/common/jubgrid.js
@@ -57,7 +57,7 @@ var JUBGrid = {
     getJUBEstimatedPrice : function(rowIndex) {
         var data = JUBGrid.jubGrid.model.getRow(rowIndex);
         if (!data) return '';
-	    var price = new openils.acq.Lineitem(
+     var price = new openils.acq.Lineitem(
             {lineitem:JUBGrid.getLi(data.id)}).getEstimatedPrice();
         if(price) return price.price;
         return ''
@@ -204,15 +204,15 @@ var JUBGrid = {
             var deleted = false;
             for(var i = 0; i < selected.length; i++) {
                 var rowIdx = selected[i];
-	            var jubid = JUBGrid.jubGrid.model.getRow(rowIdx).id;
+             var jubid = JUBGrid.jubGrid.model.getRow(rowIdx).id;
                 if(jubid == id) {
-		    if (lineitems[id].state() == 'new') {
-			deleteMe.push(lineitems[id]);
-			deleted = true;
-		    } else {
-			alert("Can not delete line item "+id+
-			      ": item is "+lineitems[id].state());
-		    }
+      if (lineitems[id].state() == 'new') {
+   deleteMe.push(lineitems[id]);
+   deleted = true;
+      } else {
+   alert("Can not delete line item "+id+
+         ": item is "+lineitems[id].state());
+      }
                 }
             }
             if(!deleted) 
@@ -229,36 +229,36 @@ var JUBGrid = {
     },
 
     deleteLID: function(evt) {
-	var list =[];
-	var selected = JUBGrid.jubDetailGrid.selection.getSelected();
-	for (var idx = 0; idx < selected.length; idx++) {
-	    var rowIdx = selected[idx];
-	    var lid = JUBGrid.jubDetailGrid.model.getRow(rowIdx);
-	    var deleteFromStore = function (evt) {
-
-		if (evt) {
-		    // something bad happened
-		    alert("Error: "+evt.desc);
-		} else {
-		    var deleteItem = function(item, rq) {
-			JUBGrid.jubDetailGrid.model.store.deleteItem(item);
-		    };
-		    var updateCount = function(item) {
-			var newval = JUBGrid.jubGrid.model.store.getValue(item, "item_count");
-			JUBGrid.jubGrid.model.store.setValue(item, "item_count", newval-1);
-			JUBGrid.jubGrid.update();
-		    };
-
-		    JUBGrid.jubDetailGrid.model.store.fetch({query:{id:lid.id},
-							     onItem: deleteItem});
-		    JUBGrid.jubGrid.model.store.fetch({query:{id:JUBGrid.jubDetailGrid.lineitemID},
-						       onItem: updateCount});
-		}
-		JUBGrid.jubDetailGrid.update(); 
-	    };
-
-	    openils.acq.Lineitem.deleteLID(lid.id, deleteFromStore);
-	}
+ var list =[];
+ var selected = JUBGrid.jubDetailGrid.selection.getSelected();
+ for (var idx = 0; idx < selected.length; idx++) {
+     var rowIdx = selected[idx];
+     var lid = JUBGrid.jubDetailGrid.model.getRow(rowIdx);
+     var deleteFromStore = function (evt) {
+
+  if (evt) {
+      // something bad happened
+      alert("Error: "+evt.desc);
+  } else {
+      var deleteItem = function(item, rq) {
+   JUBGrid.jubDetailGrid.model.store.deleteItem(item);
+      };
+      var updateCount = function(item) {
+   var newval = JUBGrid.jubGrid.model.store.getValue(item, "item_count");
+   JUBGrid.jubGrid.model.store.setValue(item, "item_count", newval-1);
+   JUBGrid.jubGrid.update();
+      };
+
+      JUBGrid.jubDetailGrid.model.store.fetch({query:{id:lid.id},
+            onItem: deleteItem});
+      JUBGrid.jubGrid.model.store.fetch({query:{id:JUBGrid.jubDetailGrid.lineitemID},
+             onItem: updateCount});
+  }
+  JUBGrid.jubDetailGrid.update(); 
+     };
+
+     openils.acq.Lineitem.deleteLID(lid.id, deleteFromStore);
+ }
     },
 
     createLID: function(fields) {
@@ -273,11 +273,11 @@ var JUBGrid = {
     },
 
     receiveLID: function(evt) {
-	    var list =[];
-	    var selected = JUBGrid.jubDetailGrid.selection.getSelected();
-    	for (var idx = 0; idx < selected.length; idx++) {
-    	    var rowIdx = selected[idx];
-    	    var lid = JUBGrid.jubDetailGrid.model.getRow(rowIdx);
+     var list =[];
+     var selected = JUBGrid.jubDetailGrid.selection.getSelected();
+     for (var idx = 0; idx < selected.length; idx++) {
+         var rowIdx = selected[idx];
+         var lid = JUBGrid.jubDetailGrid.model.getRow(rowIdx);
             list.push(lid.id);
         }
         if(lid != null) { // is at least one selected?
diff --git a/Open-ILS/web/js/ui/default/acq/common/li_table.js b/Open-ILS/web/js/ui/default/acq/common/li_table.js
index 3fa3643e2e..6269862c20 100644
--- a/Open-ILS/web/js/ui/default/acq/common/li_table.js
+++ b/Open-ILS/web/js/ui/default/acq/common/li_table.js
@@ -443,10 +443,10 @@ function AcqLiTable() {
             if(openils.XUL.isXUL()) {
 
                 var makeRecTab = function() {
-				    xulG.new_tab(
+        xulG.new_tab(
                         XUL_OPAC_WRAPPER,
-					    {tab_name: localeStrings.XUL_RECORD_DETAIL_PAGE, browser:false},
-					    {
+         {tab_name: localeStrings.XUL_RECORD_DETAIL_PAGE, browser:false},
+         {
                             no_xulG : false, 
                             show_nav_buttons : true, 
                             show_print_button : true, 
diff --git a/Open-ILS/web/js/ui/default/actor/user/register.js b/Open-ILS/web/js/ui/default/actor/user/register.js
index 3dffc85873..29007d7ced 100644
--- a/Open-ILS/web/js/ui/default/actor/user/register.js
+++ b/Open-ILS/web/js/ui/default/actor/user/register.js
@@ -48,14 +48,14 @@ function load() {
     var userId = cgi.param('usr');
 
     if(xulG) {
-	    if(xulG.ses) openils.User.authtoken = xulG.ses;
-	    if(xulG.clone !== null) cloneUser = xulG.clone;
+     if(xulG.ses) openils.User.authtoken = xulG.ses;
+     if(xulG.clone !== null) cloneUser = xulG.clone;
         if(xulG.usr !== null) userId = xulG.usr
         if(xulG.params) {
             var parms = xulG.params;
-	        if(parms.ses) 
+         if(parms.ses) 
                 openils.User.authtoken = parms.ses;
-	        if(parms.clone) 
+         if(parms.clone) 
                 cloneUser = parms.clone;
             if(parms.usr !== null)
                 userId = parms.usr
@@ -630,22 +630,22 @@ function uEditFinishSave(newPatron, doClone) {
     if(doClone &&cloneUser == null)
         cloneUser = newPatron.id();
 
-	if( doClone ) {
+ if( doClone ) {
 
-		if(xulG && typeof xulG.spawn_editor == 'function' && !patron.isnew() ) {
+  if(xulG && typeof xulG.spawn_editor == 'function' && !patron.isnew() ) {
             window.xulG.spawn_editor({ses:openils.User.authtoken,clone:cloneUser});
             uEditRefresh();
 
-		} else {
-			location.href = href.replace(/\?.*/, '') + '?clone=' + cloneUser;
-		}
+  } else {
+   location.href = href.replace(/\?.*/, '') + '?clone=' + cloneUser;
+  }
 
-	} else {
+ } else {
 
-		uEditRefresh();
-	}
+  uEditRefresh();
+ }
 
-	uEditRefreshXUL(newPatron);
+ uEditRefreshXUL(newPatron);
 }
 
 function uEditRefresh() {
@@ -656,8 +656,8 @@ function uEditRefresh() {
 }
 
 function uEditRefreshXUL(newuser) {
-	if (window.xulG && typeof window.xulG.on_save == 'function') 
-		window.xulG.on_save(newuser);
+ if (window.xulG && typeof window.xulG.on_save == 'function') 
+  window.xulG.on_save(newuser);
 }
 
 
@@ -748,11 +748,11 @@ function uEditApproveAddress(addr) {
                     
                     // remove the replaced address 
                     if(oldId != addr.id()) {
-		                patron.addresses(
+                  patron.addresses(
                             patron.addresses().filter(
-				                function(i) { return (i.id() != oldId); }
-			                )
-		                );
+                    function(i) { return (i.id() != oldId); }
+                   )
+                  );
                     }
                     
                     // fix the the new address
diff --git a/Open-ILS/web/js/ui/default/vandelay/vandelay.js b/Open-ILS/web/js/ui/default/vandelay/vandelay.js
index 92e8981042..02d79ac647 100644
--- a/Open-ILS/web/js/ui/default/vandelay/vandelay.js
+++ b/Open-ILS/web/js/ui/default/vandelay/vandelay.js
@@ -282,7 +282,7 @@ function uploadMARC(onload){
             onload(content);
         }
     });
-}	
+} 
 
 /**
   * Creates a new vandelay queue
@@ -1006,9 +1006,9 @@ function vlLoadMarcEditor(type, recId, postReloadHTMLHandler) {
 
 // attribute-editor global variables
 
-var ATTR_EDITOR_IN_UPDATE_MODE = false;	// true on 'edit', false on 'create'
-var ATTR_EDIT_ID = null;		// id of current 'edit' attribute
-var ATTR_EDIT_GROUP = 'bib';		// bib-attrs or auth-attrs
+var ATTR_EDITOR_IN_UPDATE_MODE = false; // true on 'edit', false on 'create'
+var ATTR_EDIT_ID = null;  // id of current 'edit' attribute
+var ATTR_EDIT_GROUP = 'bib';  // bib-attrs or auth-attrs
 
 function vlAttrEditorInit() {
     // set up tooltips on the edit form
@@ -1025,8 +1025,8 @@ function vlShowAttrEditor() {
 function setAttrEditorGroup(groupName) {
     // put us into 'bib'-attr or 'auth'-attr mode.
     if (ATTR_EDIT_GROUP != groupName) {
-	ATTR_EDIT_GROUP = groupName;
-	loadAttrEditorGrid();
+ ATTR_EDIT_GROUP = groupName;
+ loadAttrEditorGrid();
     }
 }
 
@@ -1035,14 +1035,14 @@ function onAttrEditorOpen() {
     var create_bar = document.getElementById('attr-editor-create-bar');
     var update_bar = document.getElementById('attr-editor-update-bar');
     if (ATTR_EDITOR_IN_UPDATE_MODE) {
-	update_bar.style.display='table-row';
-	create_bar.style.display='none';
-	// hide the dropdown-button
-	idStyle('vl-create-attr-editor-button', 'visibility', 'hidden');
+ update_bar.style.display='table-row';
+ create_bar.style.display='none';
+ // hide the dropdown-button
+ idStyle('vl-create-attr-editor-button', 'visibility', 'hidden');
     } else {
-	dijit.byId('attr-editor-dialog').reset();
-	create_bar.style.display='table-row';
-	update_bar.style.display='none';
+ dijit.byId('attr-editor-dialog').reset();
+ create_bar.style.display='table-row';
+ update_bar.style.display='none';
     }
 }
 
@@ -1055,7 +1055,7 @@ function onAttrEditorClose() {
 
 function loadAttrEditorGrid() {
     var _data = (ATTR_EDIT_GROUP == 'auth') ? 
-	vqarad.toStoreData(authAttrDefs) : vqbrad.toStoreData(bibAttrDefs) ;
+ vqarad.toStoreData(authAttrDefs) : vqbrad.toStoreData(bibAttrDefs) ;
 
     var store = new dojo.data.ItemFileReadStore({data:_data});
     attrEditorGrid.setStore(store);
@@ -1101,8 +1101,8 @@ function vlSaveAttrDefinition(data) {
     // this ought to honour custom xpaths, but overwrite xpaths
     // derived from tags/subfields.
     if (data.xpath == '' || looksLikeDerivedXpath(data.xpath)) {
-	var _xpath = tagAndSubFieldsToXpath(data.tag, data.subfield);
-	data.xpath = _xpath;
+ var _xpath = tagAndSubFieldsToXpath(data.tag, data.subfield);
+ data.xpath = _xpath;
     }
 
     // build up our permacrud params. Key variables here are
@@ -1112,7 +1112,7 @@ function vlSaveAttrDefinition(data) {
     var isCreate = (ATTR_EDIT_ID == null);
     var rad      = isAuth ? new vqarad() : new vqbrad() ;
     var method   = 'open-ils.permacrud' + (isCreate ? '.create.' : '.update.') 
-	+ (isAuth ? 'vqarad' : 'vqbrad');
+ + (isAuth ? 'vqarad' : 'vqbrad');
     var _data    = rad.fromStoreItem(data);
 
     _data.ischanged(1);
@@ -1121,14 +1121,14 @@ function vlSaveAttrDefinition(data) {
         ['open-ils.permacrud', method],
         {   async: true,
             params: [authtoken, _data ],
-	    onresponse: function(r) { },
+     onresponse: function(r) { },
             oncomplete: function(r) {
-		attrEditorFetchAttrDefs(vlShowAttrEditor);
-		ATTR_EDIT_ID = null;
-	    },
-	    onerror: function(r) {
-		alert('vlSaveAttrDefinition comms error: ' + r);
-	    }
+  attrEditorFetchAttrDefs(vlShowAttrEditor);
+  ATTR_EDIT_ID = null;
+     },
+     onerror: function(r) {
+  alert('vlSaveAttrDefinition comms error: ' + r);
+     }
         }
     );
 }
@@ -1148,15 +1148,15 @@ function vlAttrDelete() {
     fieldmapper.standardRequest(
         ['open-ils.permacrud', method],
         {   async: true,
-	    params: [authtoken, rad.fromHash({ id : ATTR_EDIT_ID }), ],
-	    oncomplete: function() {
-		dijit.byId('attr-editor-dialog').onCancel(); // close the dialog
-		attrEditorFetchAttrDefs(vlShowAttrEditor);
-		ATTR_EDIT_ID = null;
-	    },
-	    onerror: function(r) {
-		alert('vlAttrDelete comms error: ' + r);
-	    }
+     params: [authtoken, rad.fromHash({ id : ATTR_EDIT_ID }), ],
+     oncomplete: function() {
+  dijit.byId('attr-editor-dialog').onCancel(); // close the dialog
+  attrEditorFetchAttrDefs(vlShowAttrEditor);
+  ATTR_EDIT_ID = null;
+     },
+     onerror: function(r) {
+  alert('vlAttrDelete comms error: ' + r);
+     }
         }
     );
 }
@@ -1166,9 +1166,9 @@ function vlAttrDelete() {
 
 // dom utilities (maybe dojo does these, and these should be replaced)
 
-function idStyle(obId, k, v)	{ document.getElementById(obId).style[k] = v;	}
-function idShow(obId)		{ idStyle(obId, 'display', 'block');		}
-function idHide(obId)		{ idStyle(obId, 'display' , 'none');		}
+function idStyle(obId, k, v) { document.getElementById(obId).style[k] = v; }
+function idShow(obId)  { idStyle(obId, 'display', 'block');  }
+function idHide(obId)  { idStyle(obId, 'display' , 'none');  }
 
 function connectTooltip(fieldId) {
     // Given an element id, look up a tooltip element in the doc (same
@@ -1177,7 +1177,7 @@ function connectTooltip(fieldId) {
     var fld = dojo.byId(fieldId);
     var tip = dojo.byId(fieldId + '-tip');
     dojo.connect(fld, 'onfocus', function(evt) {
-		     dijit.showTooltip(tip.innerHTML, fld, ['below', 'after']); });
+       dijit.showTooltip(tip.innerHTML, fld, ['below', 'after']); });
     dojo.connect(fld, 'onblur', function(evt) { dijit.hideTooltip(fld); });
 }
 
@@ -1188,12 +1188,12 @@ var xpathParser = new openils.MarcXPathParser();
 function tagAndSubFieldsToXpath(tags, subfields) {
     // given tags, and subfields, build up an XPath.
     try {
-	var parts = {
-	    'tags':tags.match(/[\d]+/g), 
-	    'subfields':subfields.match(/[a-zA-z]/g) };
-	return xpathParser.compile(parts);
+ var parts = {
+     'tags':tags.match(/[\d]+/g), 
+     'subfields':subfields.match(/[a-zA-z]/g) };
+ return xpathParser.compile(parts);
     } catch (err) {
-	return {'parts':null, 'tags':null, 'error':err};
+ return {'parts':null, 'tags':null, 'error':err};
     }
 }
 
@@ -1201,11 +1201,11 @@ function looksLikeDerivedXpath(path) {
     // Does this path look like it was derived from tags and subfields?
     var parsed = xpathParser.parse(path);
     if (parsed.tags == null) 
-	return false;
+ return false;
     var compiled = xpathParser.compile(parsed);
     return (path == compiled);
 }
 
 // amazing xpath-util unit-tests
-if (!looksLikeDerivedXpath('//*[@tag="901"]/*[@code="c"]'))	alert('vandelay xpath-utility error');
-if ( looksLikeDerivedXpath('ba-boo-ba-boo!'))			alert('vandelay xpath-utility error');
+if (!looksLikeDerivedXpath('//*[@tag="901"]/*[@code="c"]')) alert('vandelay xpath-utility error');
+if ( looksLikeDerivedXpath('ba-boo-ba-boo!'))   alert('vandelay xpath-utility error');
diff --git a/Open-ILS/web/opac/common/css/dtree.css b/Open-ILS/web/opac/common/css/dtree.css
index b201c2fd60..ba5343ce5e 100644
--- a/Open-ILS/web/opac/common/css/dtree.css
+++ b/Open-ILS/web/opac/common/css/dtree.css
@@ -5,30 +5,30 @@
 |--------------------------------------------------*/
 
 .dtree {
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #666;
-	white-space: nowrap;
+ font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ color: #666;
+ white-space: nowrap;
 }
 .dtree img {
-	border: 0px;
-	vertical-align: middle;
+ border: 0px;
+ vertical-align: middle;
 }
 .dtree a {
-	color: #333;
-	text-decoration: none;
+ color: #333;
+ text-decoration: none;
 }
 .dtree a.node, .dtree a.nodeSel {
-	white-space: nowrap;
-	padding: 1px 2px 1px 2px;
+ white-space: nowrap;
+ padding: 1px 2px 1px 2px;
 }
 .dtree a.node:hover, .dtree a.nodeSel:hover {
-	color: #333;
-	text-decoration: underline;
+ color: #333;
+ text-decoration: underline;
 }
 .dtree a.nodeSel {
-	background-color: #c0d2ec;
+ background-color: #c0d2ec;
 }
 .dtree .clip {
-	overflow: hidden;
+ overflow: hidden;
 }
\ No newline at end of file
diff --git a/Open-ILS/web/opac/common/css/largefont.css b/Open-ILS/web/opac/common/css/largefont.css
index 18c86dde48..a4b6a80b97 100644
--- a/Open-ILS/web/opac/common/css/largefont.css
+++ b/Open-ILS/web/opac/common/css/largefont.css
@@ -1,5 +1,5 @@
-body				{ font-family: Helvetica, Arial, Tahoma, sans-serif; font-size: 1.5em; } 
-body table		{ font-size: inherit; }
+body    { font-family: Helvetica, Arial, Tahoma, sans-serif; font-size: 1.5em; } 
+body table  { font-size: inherit; }
 
 .org_link { font-size: 92%; }
 .sidebar_extra_item { font-size: 95%; }
diff --git a/Open-ILS/web/opac/common/css/mediumfont.css b/Open-ILS/web/opac/common/css/mediumfont.css
index 925b0eeac4..22f163d443 100644
--- a/Open-ILS/web/opac/common/css/mediumfont.css
+++ b/Open-ILS/web/opac/common/css/mediumfont.css
@@ -3,8 +3,8 @@ table { font-size: 9pt; }
 table tr { font-size: 9pt; }
 table tr td { font-size: 9pt; }
 
-body table tr td	{ font-size: inherit; }
-/*body table tr td	{ font-size: 95%;}*/
+body table tr td { font-size: inherit; }
+/*body table tr td { font-size: 95%;}*/
 
 .org_link { font-size: 9pt; }
 .sidebar_extra_item { font-size: 9pt; }
diff --git a/Open-ILS/web/opac/common/css/smallfont.css b/Open-ILS/web/opac/common/css/smallfont.css
index 594aac12de..996969cf6a 100644
--- a/Open-ILS/web/opac/common/css/smallfont.css
+++ b/Open-ILS/web/opac/common/css/smallfont.css
@@ -1,5 +1,5 @@
-body				{ font-family: Helvetica, Arial, Tahoma, sans-serif; font-size: 50%; } 
-body table		{ font-size: inherit; }
+body    { font-family: Helvetica, Arial, Tahoma, sans-serif; font-size: 50%; } 
+body table  { font-size: inherit; }
 
 .org_link { font-size: 92%; }
 .sidebar_extra_item { font-size: 95%; }
diff --git a/Open-ILS/web/opac/common/js/CGI.js b/Open-ILS/web/opac/common/js/CGI.js
index 28e9e6d26d..4d74b138e1 100644
--- a/Open-ILS/web/opac/common/js/CGI.js
+++ b/Open-ILS/web/opac/common/js/CGI.js
@@ -1,76 +1,76 @@
 function CGI() {
-	/* load up the url parameters */
-
-	this._keys = new Array();
-	this.data = new Object();
-
-	var string = location.search.replace(/^\?/,"");
-	this.server_name = location.href.replace(/^https?:\/\/([^\/]+).+$/,"$1");
-
-	var key = ""; 
-	var value = "";
-	var inkey = true;
-	var invalue = false;
-
-	for( var idx = 0; idx!= string.length; idx++ ) {
-
-		var c = string.charAt(idx);
-
-		if( c == "=" )	{
-			invalue = true;
-			inkey = false;
-			continue;
-		} 
-
-		if(c == "&" || c == ";") {
-			inkey = 1;
-			invalue = 0;
-			if( ! this.data[key] ) this.data[key] = [];
-			this.data[key].push(decodeURIComponent(value));
-			this._keys.push(key);
-			key = ""; value = "";
-			continue;
-		}
-
-		if(inkey) key += c;
-		else if(invalue) value += c;
-	}
-
-	if( ! this.data[key] ) this.data[key] = [];
-	this.data[key].push(decodeURIComponent(value));
-	this._keys.push(key);
+ /* load up the url parameters */
+
+ this._keys = new Array();
+ this.data = new Object();
+
+ var string = location.search.replace(/^\?/,"");
+ this.server_name = location.href.replace(/^https?:\/\/([^\/]+).+$/,"$1");
+
+ var key = ""; 
+ var value = "";
+ var inkey = true;
+ var invalue = false;
+
+ for( var idx = 0; idx!= string.length; idx++ ) {
+
+  var c = string.charAt(idx);
+
+  if( c == "=" ) {
+   invalue = true;
+   inkey = false;
+   continue;
+  } 
+
+  if(c == "&" || c == ";") {
+   inkey = 1;
+   invalue = 0;
+   if( ! this.data[key] ) this.data[key] = [];
+   this.data[key].push(decodeURIComponent(value));
+   this._keys.push(key);
+   key = ""; value = "";
+   continue;
+  }
+
+  if(inkey) key += c;
+  else if(invalue) value += c;
+ }
+
+ if( ! this.data[key] ) this.data[key] = [];
+ this.data[key].push(decodeURIComponent(value));
+ this._keys.push(key);
 }
 
 /* returns the value for the given param.  If there is only one value for the
    given param, it returns that value.  Otherwise it returns an array of values
  */
 CGI.prototype.param = function(p) {
-	if(this.data[p] == null) return null;
-	if(this.data[p].length == 1)
-		return this.data[p][0];
-	return this.data[p];
+ if(this.data[p] == null) return null;
+ if(this.data[p].length == 1)
+  return this.data[p][0];
+ return this.data[p];
 }
 
 /* returns an array of param names */
 CGI.prototype.keys = function() {
-	return this._keys;
+ return this._keys;
 }
 
 /* debuggin method */
 CGI.prototype.toString = function() {
-	var string = "";
-	var keys = this.keys();
-
-	for( var k in keys ) {
-		string += keys[k] + " : ";
-		var params = this.param(keys[k]);
-
-		for( var p in params ) {
-			string +=  params[p] + " ";
-		}
-		string += "\n";
-	}
-	return string;
+ var string = "";
+ var keys = this.keys();
+
+ for( var k in keys ) {
+  string += keys[k] + " : ";
+  var params = this.param(keys[k]);
+
+  for( var p in params ) {
+   string +=  params[p] + " ";
+  }
+  string += "\n";
+ }
+ return string;
 }
 
 
diff --git a/Open-ILS/web/opac/common/js/Cookies.js b/Open-ILS/web/opac/common/js/Cookies.js
index 21b8dc8e5e..7f071ab1bf 100644
--- a/Open-ILS/web/opac/common/js/Cookies.js
+++ b/Open-ILS/web/opac/common/js/Cookies.js
@@ -55,7 +55,7 @@ HTTP.Cookies.prototype.date = new HTTP.Cookies.Date; // date object instance
 HTTP.Cookies.prototype.read = function (name) {
    var value  = '';
    if(!this.JAR) {
-		this.JAR = {};
+  this.JAR = {};
       var array  = document.cookie.split(';');
       for (var x = 0; x < array.length; x++) {
          var pair = array[x].split('=');
@@ -70,7 +70,7 @@ HTTP.Cookies.prototype.read = function (name) {
          if(cookie == name) {
             value = this.JAR[cookie];
          }
-	   }
+    }
    }
    return value ? unescape(value) : '';
 }
diff --git a/Open-ILS/web/opac/common/js/DP_DateExtensions.js b/Open-ILS/web/opac/common/js/DP_DateExtensions.js
index db96365749..80dcaa1727 100644
--- a/Open-ILS/web/opac/common/js/DP_DateExtensions.js
+++ b/Open-ILS/web/opac/common/js/DP_DateExtensions.js
@@ -21,8 +21,8 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 CHANGES: --------------------------------------------------------------------------------
 
-	2008-07-26 / dscott@laurentian.ca
-	 - Comment out Date.parseIso8601 as we move to Dojo
+ 2008-07-26 / dscott@laurentian.ca
+  - Comment out Date.parseIso8601 as we move to Dojo
 
     2007-02-02 / billserickson@gmail.com
      - chopped out some utility methods to trim file size
@@ -35,62 +35,62 @@ CHANGES: -----------------------------------------------------------------------
 /*
 Date.parseIso8601 = function(CurDate) {
 
-		// Check the input parameters
-	if ( typeof CurDate != "string" ) {
-		return null;
-	};
-		// Set the fragment expressions
-	var S = "[\\-/:.]";
-	var Yr = "((?:1[6-9]|[2-9][0-9])[0-9]{2})";
-	var Mo = S + "((?:1[012])|(?:0[1-9])|[1-9])";
-	var Dy = S + "((?:3[01])|(?:[12][0-9])|(?:0[1-9])|[1-9])";
-	var Hr = "(2[0-4]|[01]?[0-9])";
-	var Mn = S + "([0-5]?[0-9])";
-	var Sd = "(?:" + S + "([0-5]?[0-9])(?:[.,]([0-9]+))?)?";
-	var TZ = "(?:(Z)|(?:([\+\-])(1[012]|[0]?[0-9])(?::?([0-5]?[0-9]))?))?";
-		// RegEx the input
-		// First check: Just date parts (month and day are optional)
-		// Second check: Full date plus time (seconds, milliseconds and TimeZone info are optional)
-	var TF;
-
-	if ( TF = new RegExp("^" + Yr + "(?:" + Mo + "(?:" + Dy + ")?)?" + "$").exec(CurDate) ) {
+  // Check the input parameters
+ if ( typeof CurDate != "string" ) {
+  return null;
+ };
+  // Set the fragment expressions
+ var S = "[\\-/:.]";
+ var Yr = "((?:1[6-9]|[2-9][0-9])[0-9]{2})";
+ var Mo = S + "((?:1[012])|(?:0[1-9])|[1-9])";
+ var Dy = S + "((?:3[01])|(?:[12][0-9])|(?:0[1-9])|[1-9])";
+ var Hr = "(2[0-4]|[01]?[0-9])";
+ var Mn = S + "([0-5]?[0-9])";
+ var Sd = "(?:" + S + "([0-5]?[0-9])(?:[.,]([0-9]+))?)?";
+ var TZ = "(?:(Z)|(?:([\+\-])(1[012]|[0]?[0-9])(?::?([0-5]?[0-9]))?))?";
+  // RegEx the input
+  // First check: Just date parts (month and day are optional)
+  // Second check: Full date plus time (seconds, milliseconds and TimeZone info are optional)
+ var TF;
+
+ if ( TF = new RegExp("^" + Yr + "(?:" + Mo + "(?:" + Dy + ")?)?" + "$").exec(CurDate) ) {
         } else if ( TF = new RegExp("^" + Yr + Mo + Dy + "[Tt ]" + Hr + Mn + Sd + TZ + "$").exec(CurDate) ) {};
 
-		// If the date couldn't be parsed, return null
-	if ( !TF ) { return null };
-		// Default the Time Fragments if they're not present
-	if ( !TF[2] ) { TF[2] = 1 } else { TF[2] = TF[2] - 1 };
-	if ( !TF[3] ) { TF[3] = 1 };
-	if ( !TF[4] ) { TF[4] = 0 };
-	if ( !TF[5] ) { TF[5] = 0 };
-	if ( !TF[6] ) { TF[6] = 0 };
-	if ( !TF[7] ) { TF[7] = 0 };
-	if ( !TF[8] ) { TF[8] = null };
-	if ( TF[9] != "-" && TF[9] != "+" ) { TF[9] = null };
-	if ( !TF[10] ) { TF[10] = 0 } else { TF[10] = TF[9] + TF[10] };
-	if ( !TF[11] ) { TF[11] = 0 } else { TF[11] = TF[9] + TF[11] };
-		// If there's no timezone info the data is local time
+  // If the date couldn't be parsed, return null
+ if ( !TF ) { return null };
+  // Default the Time Fragments if they're not present
+ if ( !TF[2] ) { TF[2] = 1 } else { TF[2] = TF[2] - 1 };
+ if ( !TF[3] ) { TF[3] = 1 };
+ if ( !TF[4] ) { TF[4] = 0 };
+ if ( !TF[5] ) { TF[5] = 0 };
+ if ( !TF[6] ) { TF[6] = 0 };
+ if ( !TF[7] ) { TF[7] = 0 };
+ if ( !TF[8] ) { TF[8] = null };
+ if ( TF[9] != "-" && TF[9] != "+" ) { TF[9] = null };
+ if ( !TF[10] ) { TF[10] = 0 } else { TF[10] = TF[9] + TF[10] };
+ if ( !TF[11] ) { TF[11] = 0 } else { TF[11] = TF[9] + TF[11] };
+  // If there's no timezone info the data is local time
 
     TF[7] = 0;
 
-	if ( !TF[8] && !TF[9] ) {
-		return new Date(TF[1], TF[2], TF[3], TF[4], TF[5], TF[6], TF[7]);
-	};
-		// If the UTC indicator is set the date is UTC
-	if ( TF[8] == "Z" ) {
-		return new Date(Date.UTC(TF[1], TF[2], TF[3], TF[4], TF[5], TF[6], TF[7]));
-	};
-		// If the date has a timezone offset
-	if ( TF[9] == "-" || TF[9] == "+" ) {
-			// Get current Timezone information
-		var CurTZ = new Date().getTimezoneOffset();
-		var CurTZh = TF[10] - ((CurTZ >= 0 ? "-" : "+") + Math.floor(Math.abs(CurTZ) / 60))
-		var CurTZm = TF[11] - ((CurTZ >= 0 ? "-" : "+") + (Math.abs(CurTZ) % 60))
-			// Return the date
-		return new Date(TF[1], TF[2], TF[3], TF[4] - CurTZh, TF[5] - CurTZm, TF[6], TF[7]);
-	};
-		// If we've reached here we couldn't deal with the input, return null
-	return null;
+ if ( !TF[8] && !TF[9] ) {
+  return new Date(TF[1], TF[2], TF[3], TF[4], TF[5], TF[6], TF[7]);
+ };
+  // If the UTC indicator is set the date is UTC
+ if ( TF[8] == "Z" ) {
+  return new Date(Date.UTC(TF[1], TF[2], TF[3], TF[4], TF[5], TF[6], TF[7]));
+ };
+  // If the date has a timezone offset
+ if ( TF[9] == "-" || TF[9] == "+" ) {
+   // Get current Timezone information
+  var CurTZ = new Date().getTimezoneOffset();
+  var CurTZh = TF[10] - ((CurTZ >= 0 ? "-" : "+") + Math.floor(Math.abs(CurTZ) / 60))
+  var CurTZm = TF[11] - ((CurTZ >= 0 ? "-" : "+") + (Math.abs(CurTZ) % 60))
+   // Return the date
+  return new Date(TF[1], TF[2], TF[3], TF[4] - CurTZh, TF[5] - CurTZm, TF[6], TF[7]);
+ };
+  // If we've reached here we couldn't deal with the input, return null
+ return null;
 
 };
 
@@ -103,211 +103,211 @@ Date.parseIso8601 = function(CurDate) {
 
 Date.prototype.dateFormat = function(Mask) {
 
-	var FormattedDate = "";
-	var Ref_MonthFullName = ["January", "February", "March", "April", "May", 
+ var FormattedDate = "";
+ var Ref_MonthFullName = ["January", "February", "March", "April", "May", 
         "June", "July", "August", "September", "October", "November", "December"];
-	var Ref_MonthAbbreviation = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
-	var Ref_DayFullName = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
-	var Ref_DayAbbreviation = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
-
-		// Convert any supported simple masks into "real" masks
-	switch (Mask) {
-		case "short":
-			Mask = "m/d/yy";		
-		break;
-		case "medium":
-			Mask = "mmm d, yyyy";
-		break;
-		case "long":
-			Mask = "mmmm d, yyyy";
-		break;
-		case "full":
-			Mask = "dddd, mmmm d, yyyy";
-		break;
-	};
-
-		// Tack a temporary space at the end of the mask to ensure that the last character isn't a mask character
-	Mask += " ";
-
-		// Parse the Mask
-	var CurChar;
-	var MaskPart = "";
-	for ( var Cnt = 0; Cnt < Mask.length; Cnt++ ) {
-			// Get the character
-		CurChar = Mask.charAt(Cnt);
-			// Determine if the character is a mask element
-		if ( (CurChar != "d") && (CurChar != "m") && (CurChar != "y") ) {
-				// Determine if we need to parse a MaskPart or not
-			if ( MaskPart != "" ) {
-					// Convert the mask part to the date value
-				switch (MaskPart) {
-					case "d":
-						FormattedDate += this.getDate();
-						break;
-					case "dd":
-						FormattedDate += ("0" + this.getDate()).slice(-2);
-						break;
-					case "ddd":
-						FormattedDate += Ref_DayAbbreviation[this.getDay()];
-						break;
-					case "dddd":
-						FormattedDate += Ref_DayFullName[this.getDay()];
-						break;
-					case "m":
-						FormattedDate += this.getMonth() + 1;
-						break;
-					case "mm":
-						FormattedDate += ("0" + (this.getMonth() + 1)).slice(-2);
-						break;
-					case "mmm":
-						FormattedDate += Ref_MonthAbbreviation[this.getMonth()];
-						break;
-					case "mmmm":
-						FormattedDate += Ref_MonthFullName[this.getMonth()];
-						break;
-					case "yy":
-						FormattedDate += ("0" + this.getFullYear()).slice(-2);
-						break;
-					case "yyyy":
-						FormattedDate += ("000" + this.getFullYear()).slice(-4);
-						break;
-				};
-					// Reset the MaskPart to nothing
-				MaskPart = "";
-			};
-				// Add the character to the output
-			FormattedDate += CurChar;
-		} else {
-				// Add the current mask character to the MaskPart
-			MaskPart += CurChar;
-		};
-	};
-
-		// Remove the temporary space from the end of the formatted date
-	FormattedDate = FormattedDate.substring(0,FormattedDate.length - 1);
-
-		// Return the formatted date
-	return FormattedDate;
+ var Ref_MonthAbbreviation = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+ var Ref_DayFullName = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
+ var Ref_DayAbbreviation = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+
+  // Convert any supported simple masks into "real" masks
+ switch (Mask) {
+  case "short":
+   Mask = "m/d/yy";  
+  break;
+  case "medium":
+   Mask = "mmm d, yyyy";
+  break;
+  case "long":
+   Mask = "mmmm d, yyyy";
+  break;
+  case "full":
+   Mask = "dddd, mmmm d, yyyy";
+  break;
+ };
+
+  // Tack a temporary space at the end of the mask to ensure that the last character isn't a mask character
+ Mask += " ";
+
+  // Parse the Mask
+ var CurChar;
+ var MaskPart = "";
+ for ( var Cnt = 0; Cnt < Mask.length; Cnt++ ) {
+   // Get the character
+  CurChar = Mask.charAt(Cnt);
+   // Determine if the character is a mask element
+  if ( (CurChar != "d") && (CurChar != "m") && (CurChar != "y") ) {
+    // Determine if we need to parse a MaskPart or not
+   if ( MaskPart != "" ) {
+     // Convert the mask part to the date value
+    switch (MaskPart) {
+     case "d":
+      FormattedDate += this.getDate();
+      break;
+     case "dd":
+      FormattedDate += ("0" + this.getDate()).slice(-2);
+      break;
+     case "ddd":
+      FormattedDate += Ref_DayAbbreviation[this.getDay()];
+      break;
+     case "dddd":
+      FormattedDate += Ref_DayFullName[this.getDay()];
+      break;
+     case "m":
+      FormattedDate += this.getMonth() + 1;
+      break;
+     case "mm":
+      FormattedDate += ("0" + (this.getMonth() + 1)).slice(-2);
+      break;
+     case "mmm":
+      FormattedDate += Ref_MonthAbbreviation[this.getMonth()];
+      break;
+     case "mmmm":
+      FormattedDate += Ref_MonthFullName[this.getMonth()];
+      break;
+     case "yy":
+      FormattedDate += ("0" + this.getFullYear()).slice(-2);
+      break;
+     case "yyyy":
+      FormattedDate += ("000" + this.getFullYear()).slice(-4);
+      break;
+    };
+     // Reset the MaskPart to nothing
+    MaskPart = "";
+   };
+    // Add the character to the output
+   FormattedDate += CurChar;
+  } else {
+    // Add the current mask character to the MaskPart
+   MaskPart += CurChar;
+  };
+ };
+
+  // Remove the temporary space from the end of the formatted date
+ FormattedDate = FormattedDate.substring(0,FormattedDate.length - 1);
+
+  // Return the formatted date
+ return FormattedDate;
 
 };
 
 
 Date.prototype.timeFormat = function(Mask) {
 
-	var FormattedTime = "";
-
-		// Convert any supported simple masks into "real" masks
-	switch (Mask) {
-		case "short":
-			Mask = "h:mm tt";		
-		break;
-		case "medium":
-			Mask = "h:mm:ss tt";
-		break;
-		case "long":
-			Mask = "h:mm:ss.l tt";
-		break;
-		case "full":
-			Mask = "h:mm:ss.l tt";
-		break;
-	};
-
-		// Tack a temporary space at the end of the mask to ensure that the last character isn't a mask character
-	Mask += " ";
-
-		// Parse the Mask
-	var CurChar;
-	var MaskPart = "";
-	for ( var Cnt = 0; Cnt < Mask.length; Cnt++ ) {
-			// Get the character
-		CurChar = Mask.charAt(Cnt);
-			// Determine if the character is a mask element
-		if ( (CurChar != "h") && (CurChar != "H") && (CurChar != "m") && 
+ var FormattedTime = "";
+
+  // Convert any supported simple masks into "real" masks
+ switch (Mask) {
+  case "short":
+   Mask = "h:mm tt";  
+  break;
+  case "medium":
+   Mask = "h:mm:ss tt";
+  break;
+  case "long":
+   Mask = "h:mm:ss.l tt";
+  break;
+  case "full":
+   Mask = "h:mm:ss.l tt";
+  break;
+ };
+
+  // Tack a temporary space at the end of the mask to ensure that the last character isn't a mask character
+ Mask += " ";
+
+  // Parse the Mask
+ var CurChar;
+ var MaskPart = "";
+ for ( var Cnt = 0; Cnt < Mask.length; Cnt++ ) {
+   // Get the character
+  CurChar = Mask.charAt(Cnt);
+   // Determine if the character is a mask element
+  if ( (CurChar != "h") && (CurChar != "H") && (CurChar != "m") && 
             (CurChar != "s") && (CurChar != "l") && (CurChar != "t") && (CurChar != "T") ) {
-				// Determine if we need to parse a MaskPart or not
-			if ( MaskPart != "" ) {
-					// Convert the mask part to the date value
-				switch (MaskPart) {
-					case "h":
-						var CurValue = this.getHours();
-						if ( CurValue >  12 ) {
-							CurValue = CurValue - 12;
-						};
-						FormattedTime += CurValue;
-						break;
-					case "hh":
-						var CurValue = this.getHours();
-						if ( CurValue >  12 ) {
-							CurValue = CurValue - 12;
-						};
-						FormattedTime += ("0" + CurValue).slice(-2);
-						break;
-					case "H":
-						FormattedTime += ("0" + this.getHours()).slice(-2);
-						break;
-					case "HH":
-						FormattedTime += ("0" + this.getHours()).slice(-2);
-						break;
-					case "m":
-						FormattedTime += this.getMinutes();
-						break;
-					case "mm":
-						FormattedTime += ("0" + this.getMinutes()).slice(-2);
-						break;
-					case "s":
-						FormattedTime += this.getSeconds();
-						break;
-					case "ss":
-						FormattedTime += ("0" + this.getSeconds()).slice(-2);
-						break;
-					case "l":
-						FormattedTime += ("00" + this.getMilliseconds()).slice(-3);
-						break;
-					case "t":
-						if ( this.getHours() > 12 ) {
-							FormattedTime += "p";
-						} else {
-							FormattedTime += "a";
-						};
-						break;
-					case "tt":
-						if ( this.getHours() > 12 ) {
-							FormattedTime += "pm";
-						} else {
-							FormattedTime += "am";
-						};
-						break;
-					case "T":
-						if ( this.getHours() > 12 ) {
-							FormattedTime += "P";
-						} else {
-							FormattedTime += "A";
-						};
-						break;
-					case "TT":
-						if ( this.getHours() > 12 ) {
-							FormattedTime += "PM";
-						} else {
-							FormattedTime += "AM";
-						};
-						break;
-				};
-					// Reset the MaskPart to nothing
-				MaskPart = "";
-			};
-				// Add the character to the output
-			FormattedTime += CurChar;
-		} else {
-				// Add the current mask character to the MaskPart
-			MaskPart += CurChar;
-		};
-	};
-
-		// Remove the temporary space from the end of the formatted date
-	FormattedTime = FormattedTime.substring(0,FormattedTime.length - 1);
-
-		// Return the formatted date
-	return FormattedTime;
+    // Determine if we need to parse a MaskPart or not
+   if ( MaskPart != "" ) {
+     // Convert the mask part to the date value
+    switch (MaskPart) {
+     case "h":
+      var CurValue = this.getHours();
+      if ( CurValue >  12 ) {
+       CurValue = CurValue - 12;
+      };
+      FormattedTime += CurValue;
+      break;
+     case "hh":
+      var CurValue = this.getHours();
+      if ( CurValue >  12 ) {
+       CurValue = CurValue - 12;
+      };
+      FormattedTime += ("0" + CurValue).slice(-2);
+      break;
+     case "H":
+      FormattedTime += ("0" + this.getHours()).slice(-2);
+      break;
+     case "HH":
+      FormattedTime += ("0" + this.getHours()).slice(-2);
+      break;
+     case "m":
+      FormattedTime += this.getMinutes();
+      break;
+     case "mm":
+      FormattedTime += ("0" + this.getMinutes()).slice(-2);
+      break;
+     case "s":
+      FormattedTime += this.getSeconds();
+      break;
+     case "ss":
+      FormattedTime += ("0" + this.getSeconds()).slice(-2);
+      break;
+     case "l":
+      FormattedTime += ("00" + this.getMilliseconds()).slice(-3);
+      break;
+     case "t":
+      if ( this.getHours() > 12 ) {
+       FormattedTime += "p";
+      } else {
+       FormattedTime += "a";
+      };
+      break;
+     case "tt":
+      if ( this.getHours() > 12 ) {
+       FormattedTime += "pm";
+      } else {
+       FormattedTime += "am";
+      };
+      break;
+     case "T":
+      if ( this.getHours() > 12 ) {
+       FormattedTime += "P";
+      } else {
+       FormattedTime += "A";
+      };
+      break;
+     case "TT":
+      if ( this.getHours() > 12 ) {
+       FormattedTime += "PM";
+      } else {
+       FormattedTime += "AM";
+      };
+      break;
+    };
+     // Reset the MaskPart to nothing
+    MaskPart = "";
+   };
+    // Add the character to the output
+   FormattedTime += CurChar;
+  } else {
+    // Add the current mask character to the MaskPart
+   MaskPart += CurChar;
+  };
+ };
+
+  // Remove the temporary space from the end of the formatted date
+ FormattedTime = FormattedTime.substring(0,FormattedTime.length - 1);
+
+  // Return the formatted date
+ return FormattedTime;
 
 };
 
@@ -318,44 +318,44 @@ Date.prototype.timeFormat = function(Mask) {
 */
 Date.prototype.iso8601Format = function(Style, isUTC, dropTZ, useSpace) {
 
-	var FormattedDate = "";
-
-	switch (Style) {
-		case "Y":
-			FormattedDate += this.dateFormat("yyyy");
-			break;
-		case "YM":
-			FormattedDate += this.dateFormat("yyyy-mm");
-			break;
-		case "YMD":
-			FormattedDate += this.dateFormat("yyyy-mm-dd");
-			break;
-		case "YMDHM":
-			FormattedDate += this.dateFormat("yyyy-mm-dd") + ((useSpace) ? " " : "T") + this.timeFormat("HH:mm");
-			break;
-		case "YMDHMS":
-			FormattedDate += this.dateFormat("yyyy-mm-dd") + ((useSpace) ? " " : "T") + this.timeFormat("HH:mm:ss");
-			break;
-		case "YMDHMSM":
-			FormattedDate += this.dateFormat("yyyy-mm-dd") + ((useSpace) ? " " : "T") + this.timeFormat("HH:mm:ss.l");
-			break;
-	};
-
-	if ( !dropTZ && (Style == "YMDHM" || Style == "YMDHMS" || Style == "YMDHMSM") ) {
-		if ( isUTC ) {
-			FormattedDate += "Z";
-		} else {
-				// Get TimeZone Information
-			var TimeZoneOffset = this.getTimezoneOffset();
-			var TimeZoneInfo = (TimeZoneOffset >= 0 ? "-" : "+") + 
+ var FormattedDate = "";
+
+ switch (Style) {
+  case "Y":
+   FormattedDate += this.dateFormat("yyyy");
+   break;
+  case "YM":
+   FormattedDate += this.dateFormat("yyyy-mm");
+   break;
+  case "YMD":
+   FormattedDate += this.dateFormat("yyyy-mm-dd");
+   break;
+  case "YMDHM":
+   FormattedDate += this.dateFormat("yyyy-mm-dd") + ((useSpace) ? " " : "T") + this.timeFormat("HH:mm");
+   break;
+  case "YMDHMS":
+   FormattedDate += this.dateFormat("yyyy-mm-dd") + ((useSpace) ? " " : "T") + this.timeFormat("HH:mm:ss");
+   break;
+  case "YMDHMSM":
+   FormattedDate += this.dateFormat("yyyy-mm-dd") + ((useSpace) ? " " : "T") + this.timeFormat("HH:mm:ss.l");
+   break;
+ };
+
+ if ( !dropTZ && (Style == "YMDHM" || Style == "YMDHMS" || Style == "YMDHMSM") ) {
+  if ( isUTC ) {
+   FormattedDate += "Z";
+  } else {
+    // Get TimeZone Information
+   var TimeZoneOffset = this.getTimezoneOffset();
+   var TimeZoneInfo = (TimeZoneOffset >= 0 ? "-" : "+") + 
                 ("0" + (Math.floor(Math.abs(TimeZoneOffset) / 60))).slice(-2) + ":" + 
                 ("00" + (Math.abs(TimeZoneOffset) % 60)).slice(-2);
-			FormattedDate += TimeZoneInfo;
-		};
-	};	
+   FormattedDate += TimeZoneInfo;
+  };
+ }; 
 
-		// Return the date
-	return FormattedDate;
+  // Return the date
+ return FormattedDate;
 
 };
 
diff --git a/Open-ILS/web/opac/common/js/RemoteRequest.js b/Open-ILS/web/opac/common/js/RemoteRequest.js
index aff59b4734..9a9c8e14f5 100644
--- a/Open-ILS/web/opac/common/js/RemoteRequest.js
+++ b/Open-ILS/web/opac/common/js/RemoteRequest.js
@@ -4,14 +4,14 @@ var XML_HTTP_SERVER = "";
 
 /* This object is thrown when network failures occur */
 function NetworkFailure(stat, url) { 
-	this._status = stat; 
-	this._url = url;
+ this._status = stat; 
+ this._url = url;
 }
 
 NetworkFailure.prototype.status = function() { return this._status; }
 NetworkFailure.prototype.url = function() { return this._url; }
 NetworkFailure.prototype.toString = function() { 
-	return "Network Failure: status = " + this.status() +'\n'+this.url(); 
+ return "Network Failure: status = " + this.status() +'\n'+this.url(); 
 }
 
 
@@ -27,31 +27,31 @@ if(isXUL()) {
 */
 
 function cleanRemoteRequests() {
-	for( var i in _allrequests ) 
-		destroyRequest(_allrequests[i]);
+ for( var i in _allrequests ) 
+  destroyRequest(_allrequests[i]);
 }
 
 function abortAllRequests() {
-	for( var i in _allrequests ) {
-		var r = _allrequests[i];
-		if(r) {	
-			r.abort();
-			destroyRequest(r);
-		}
-	}
+ for( var i in _allrequests ) {
+  var r = _allrequests[i];
+  if(r) { 
+   r.abort();
+   destroyRequest(r);
+  }
+ }
 }
 
 function destroyRequest(r) {
-	if(r == null) return;
+ if(r == null) return;
 
-	if( r.xmlhttp ) {
-		r.xmlhttp.onreadystatechange = function(){};
-		r.xmlhttp = null;
-	}
+ if( r.xmlhttp ) {
+  r.xmlhttp.onreadystatechange = function(){};
+  r.xmlhttp = null;
+ }
 
-	r.callback				= null;
-	r.userdata				= null;
-	_allrequests[r.id] 	= null;
+ r.callback    = null;
+ r.userdata    = null;
+ _allrequests[r.id]  = null;
 }
 
 /* ----------------------------------------------------------------------- */
@@ -59,319 +59,319 @@ function destroyRequest(r) {
 var rrId = 0;
 function RemoteRequest( service, method ) {
 
-	/* dojo is currently only available in the OPAC */
-	try {
-		/* We want OpenSRF.locale for xx-YY format */
-		this.locale	= OpenSRF.locale;
-	}
-	catch (e) {
-		this.locale = null;
-	}
-	this.service	= service;
-	this.method		= method;
-	this.xmlhttp	= false;
-	this.name		= null;
-	this.alertEvent = true; /* only used when isXUL is false */
-
-	this.type		= "POST"; /* default */
-	this.id			= rrId++;
-	this.cancelled = false;
-
-	this.setSecure(false);
-	if(isXUL()) this.setSecure(true);
-
-	_allrequests[this.id] = this;
-
-	var i = 2;
-	this.params = ""; 
-
-	while(i < arguments.length) {
-		var object = js2JSON(arguments[i++]);
-		this.params += "&param=" + encodeURIComponent(object);
-	}
-
-	if(!this.params) { this.params = ""; }
-
-	this.param_string = "service=" + service + "&method=" + method + this.params;
-	if (this.locale != null) {
-		this.param_string = this.param_string + "&locale=" + this.locale;
-	}
-	if( this.buildXMLRequest() == null ) alert("Browser is not supported!");
+ /* dojo is currently only available in the OPAC */
+ try {
+  /* We want OpenSRF.locale for xx-YY format */
+  this.locale = OpenSRF.locale;
+ }
+ catch (e) {
+  this.locale = null;
+ }
+ this.service = service;
+ this.method  = method;
+ this.xmlhttp = false;
+ this.name  = null;
+ this.alertEvent = true; /* only used when isXUL is false */
+
+ this.type  = "POST"; /* default */
+ this.id   = rrId++;
+ this.cancelled = false;
+
+ this.setSecure(false);
+ if(isXUL()) this.setSecure(true);
+
+ _allrequests[this.id] = this;
+
+ var i = 2;
+ this.params = ""; 
+
+ while(i < arguments.length) {
+  var object = js2JSON(arguments[i++]);
+  this.params += "&param=" + encodeURIComponent(object);
+ }
+
+ if(!this.params) { this.params = ""; }
+
+ this.param_string = "service=" + service + "&method=" + method + this.params;
+ if (this.locale != null) {
+  this.param_string = this.param_string + "&locale=" + this.locale;
+ }
+ if( this.buildXMLRequest() == null ) alert("Browser is not supported!");
 
 }
 
 
 RemoteRequest.prototype.timeout = function(t) {
-	t *= 1000
-	var req = this;
-	req.timeoutFunc = setTimeout(
-		function() {
-			if( req && req.xmlhttp ) {
-				req.cancelled = true;
-				req.abort();
-				if( req.abtCallback ) {
-					req.abtCallback(req);
-				}
-			}
-		},
-		t
-	);
+ t *= 1000
+ var req = this;
+ req.timeoutFunc = setTimeout(
+  function() {
+   if( req && req.xmlhttp ) {
+    req.cancelled = true;
+    req.abort();
+    if( req.abtCallback ) {
+     req.abtCallback(req);
+    }
+   }
+  },
+  t
+ );
 }
 
 RemoteRequest.prototype.abortCallback = function(func) {
-	this.abtCallback = func;
+ this.abtCallback = func;
 }
 
 RemoteRequest.prototype.event = function(evt) {
-	if( arguments.length > 0 )
-		this.evt = evt;
-	return this.evt;
+ if( arguments.length > 0 )
+  this.evt = evt;
+ return this.evt;
 }
 
 RemoteRequest.prototype.abort = function() {
-	if( this.xmlhttp ) {
-		/* this has to come before abort() or IE will puke on you */
-		this.xmlhttp.onreadystatechange = function(){};
-		this.xmlhttp.abort();
-	}
+ if( this.xmlhttp ) {
+  /* this has to come before abort() or IE will puke on you */
+  this.xmlhttp.onreadystatechange = function(){};
+  this.xmlhttp.abort();
+ }
 }
 
 /* constructs our XMLHTTPRequest object */
 RemoteRequest.prototype.buildXMLRequest = function() {
-	this.xmlhttp = buildXMLRequest();
-	return true;
+ this.xmlhttp = buildXMLRequest();
+ return true;
 }
 
 
 function buildXMLRequest() {
     try {
-	    return new XMLHttpRequest();
+     return new XMLHttpRequest();
     } catch(e) {
-	    try { 
-		    return new ActiveXObject("Msxml2.XMLHTTP"); 
-	    } catch (e2) {
-		    try { 
-			    return new ActiveXObject("Microsoft.XMLHTTP"); 
-		    } catch (e3) {
-		        alert("NEEDS NEWER JAVASCRIPT for XMLHTTPRequest()");
+     try { 
+      return new ActiveXObject("Msxml2.XMLHTTP"); 
+     } catch (e2) {
+      try { 
+       return new ActiveXObject("Microsoft.XMLHTTP"); 
+      } catch (e3) {
+          alert("NEEDS NEWER JAVASCRIPT for XMLHTTPRequest()");
                 return null;
-		    }
-	    }
+      }
+     }
     }
 }
 
 
 function _remoteRequestCallback(id) {
 
-	var object = _allrequests[id];
-	if(object.cancelled) return;
+ var object = _allrequests[id];
+ if(object.cancelled) return;
 
-	if( object.xmlhttp.readyState == 4 ) {
+ if( object.xmlhttp.readyState == 4 ) {
 
         try {
             object.duration = new Date().getTime() - object.sendTime;
             dump('request ' + object.id + ': duration = ' + object.duration + ' ms\n');
         } catch(ee){}
 
-		try {
-			object.callback(object);
-		} catch(E) {
+  try {
+   object.callback(object);
+  } catch(E) {
             throw E
-		} finally { 
-			destroyRequest(object); 
-			object = null; 
-		}  
-	}
+  } finally { 
+   destroyRequest(object); 
+   object = null; 
+  }  
+ }
 }
 
 
 /* define the callback we use when this request has received
-	all of its data */
+ all of its data */
 RemoteRequest.prototype.setCompleteCallback = function(callback) {
-	if(this.cancelled) return;
-	this.callback = callback;
-	var id = this.id;
-	this.xmlhttp.onreadystatechange = function() { _remoteRequestCallback(id); }
+ if(this.cancelled) return;
+ this.callback = callback;
+ var id = this.id;
+ this.xmlhttp.onreadystatechange = function() { _remoteRequestCallback(id); }
 }
 
 
 /* http by default.  This makes it https. *ONLY works when
-	embedded in a XUL app. */
+ embedded in a XUL app. */
 RemoteRequest.prototype.setSecure = function(bool) {
-	this.secure = bool; 
+ this.secure = bool; 
 }
 
 RemoteRequest.prototype.send = function(blocking) {
 
-	if(this.cancelled) return;
+ if(this.cancelled) return;
 
-	/* determine the xmlhttp server dynamically */
-	var url = location.protocol + "//" + location.host + "/" + XML_HTTP_GATEWAY;
+ /* determine the xmlhttp server dynamically */
+ var url = location.protocol + "//" + location.host + "/" + XML_HTTP_GATEWAY;
 
-	if(isXUL()) {
-		if( XML_HTTP_SERVER ) 
-			url = 'http://'+XML_HTTP_SERVER+'/'+XML_HTTP_GATEWAY;
+ if(isXUL()) {
+  if( XML_HTTP_SERVER ) 
+   url = 'http://'+XML_HTTP_SERVER+'/'+XML_HTTP_GATEWAY;
 
-		if( url.match(/^http:/) && 
-				(this.secure || location.href.match(/^https:/)) ) {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-			url = url.replace(/^http:/, 'https:');
-		}
-	}
+  if( url.match(/^http:/) && 
+    (this.secure || location.href.match(/^https:/)) ) {
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
+   url = url.replace(/^http:/, 'https:');
+  }
+ }
 
-	var data = null;
-	if( this.type == 'GET' ) url +=  "?" + this.param_string; 
+ var data = null;
+ if( this.type == 'GET' ) url +=  "?" + this.param_string; 
 
-	this.url = url;
+ this.url = url;
 
    //if( isXUL() ) dump('request URL = ' + url + '?' + this.param_string + '\n');
 
-	try {
+ try {
 
-		if(blocking) this.xmlhttp.open(this.type, url, false);
-		else this.xmlhttp.open(this.type, url, true);
-		
-	} catch(E) {
-		alert("Fatal error opening XMLHTTPRequest for URL:\n" + url + '\n' + E);
-		return;
-	}
+  if(blocking) this.xmlhttp.open(this.type, url, false);
+  else this.xmlhttp.open(this.type, url, true);
+  
+ } catch(E) {
+  alert("Fatal error opening XMLHTTPRequest for URL:\n" + url + '\n' + E);
+  return;
+ }
 
-	if( this.type == 'POST' ) {
-		data = this.param_string;
-		this.xmlhttp.setRequestHeader('Content-Type',
-				'application/x-www-form-urlencoded');
-	}
+ if( this.type == 'POST' ) {
+  data = this.param_string;
+  this.xmlhttp.setRequestHeader('Content-Type',
+    'application/x-www-form-urlencoded');
+ }
 
-	try {
-		var auth;
-		try { auth = cookieManager.read(COOKIE_SES) } catch(ee) {}
-		if( isXUL() ) auth = fetchXULStash().session.key;
-		if( auth ) 
-			this.xmlhttp.setRequestHeader('X-OILS-Authtoken', auth);
+ try {
+  var auth;
+  try { auth = cookieManager.read(COOKIE_SES) } catch(ee) {}
+  if( isXUL() ) auth = fetchXULStash().session.key;
+  if( auth ) 
+   this.xmlhttp.setRequestHeader('X-OILS-Authtoken', auth);
 
-	} catch(e) {}
+ } catch(e) {}
 
-	if(data && data.match(/param=undefined/)) {
-		/* we get a bogus param .. replace with NULL */
-		try{dump('!+! UNDEFINED PARAM IN QUERY: ' + this.service + ' : ' + this.method+'\n');}catch(r){}
-		data = data.replace(/param=undefined/g,'param=null');
-	}
+ if(data && data.match(/param=undefined/)) {
+  /* we get a bogus param .. replace with NULL */
+  try{dump('!+! UNDEFINED PARAM IN QUERY: ' + this.service + ' : ' + this.method+'\n');}catch(r){}
+  data = data.replace(/param=undefined/g,'param=null');
+ }
 
 
     this.sendTime = new Date().getTime();
-	try{ this.xmlhttp.send( data ); } catch(e){}
+ try{ this.xmlhttp.send( data ); } catch(e){}
 
-	return this;
+ return this;
 }
 
 /* returns the actual response text from the request */
 RemoteRequest.prototype.getText = function() {
-	return this.xmlhttp.responseText;
+ return this.xmlhttp.responseText;
 }
 
 RemoteRequest.prototype.isReady = function() {
-	return this.xmlhttp.readyState == 4;
+ return this.xmlhttp.readyState == 4;
 }
 
 
 /* returns the JSON->js result object  */
 RemoteRequest.prototype.getResultObject = function() {
 
-	if(this.cancelled) return null;
-	if(!this.xmlhttp) return null;
-
-	var failed = false;
-	var status = null;
-	this.event(null);
-
-	/*
-	try {
-		dump(this.url + '?' + this.param_string + '\n' +
-			'Returned with \n\tstatus = ' + this.xmlhttp.status + 
-			'\n\tpayload= ' + this.xmlhttp.responseText + '\n');
-	} catch(e) {}
-	*/
-
-	try {
-		status = this.xmlhttp.status;
-		if( status != 200 ) failed = true;
-	} catch(e) { failed = true; }
-
-	if( failed ) {
-		if(!status) status = '<unknown>';
-		try{dump('! NETWORK FAILURE.  HTTP STATUS = ' +status+'\n'+this.param_string+'\n');}catch(e){}
-		if(isXUL()) 
-			throw new NetworkFailure(status, this.param_string);
-		else return null;
-	}
-
-	var text = this.xmlhttp.responseText;
-
-	//try{if(getDebug()) _debug('response: ' + text + '\n')}catch(e){}
-
-	if(text == "" || text == " " || text == null) {
-		try { dump('dbg: Request returned no text!\n'); } catch(E) {}
-		if(isXUL()) 
-			throw new NetworkFailure(status, this.param_string);
-		return null;
-	}
-
-	var obj = JSON2js(text);
-	if(!obj) return null;
-
-	if( obj.status != 200 ) {
-
-		var str = 'A server error occurred. Debug information follows: ' +
-					'\ncode = '		+ obj.status + 
-					'\ndebug: '		+ obj.debug + 
-					'\npayload: '	+ js2JSON(obj.payload); 
-
-		if(isXUL()) {
-			dump(str);
-			throw obj;
-
-		} else {
-			_debug(str);
-			throw str;
-		}
-	}
-
-	var payload = obj.payload;
-	if(!payload || payload.length == 0) return null;
-	payload = (payload.length == 1) ? payload[0] : payload;
-
-	if(!isXUL()) {
-		if( checkILSEvent(payload) ) {
-			this.event(payload);
-			if( this.alertEvent ) {
-				alertILSEvent(payload);
-				return null;
-			}
-		} 
-	}
-
-	return payload;
+ if(this.cancelled) return null;
+ if(!this.xmlhttp) return null;
+
+ var failed = false;
+ var status = null;
+ this.event(null);
+
+ /*
+ try {
+  dump(this.url + '?' + this.param_string + '\n' +
+   'Returned with \n\tstatus = ' + this.xmlhttp.status + 
+   '\n\tpayload= ' + this.xmlhttp.responseText + '\n');
+ } catch(e) {}
+ */
+
+ try {
+  status = this.xmlhttp.status;
+  if( status != 200 ) failed = true;
+ } catch(e) { failed = true; }
+
+ if( failed ) {
+  if(!status) status = '<unknown>';
+  try{dump('! NETWORK FAILURE.  HTTP STATUS = ' +status+'\n'+this.param_string+'\n');}catch(e){}
+  if(isXUL()) 
+   throw new NetworkFailure(status, this.param_string);
+  else return null;
+ }
+
+ var text = this.xmlhttp.responseText;
+
+ //try{if(getDebug()) _debug('response: ' + text + '\n')}catch(e){}
+
+ if(text == "" || text == " " || text == null) {
+  try { dump('dbg: Request returned no text!\n'); } catch(E) {}
+  if(isXUL()) 
+   throw new NetworkFailure(status, this.param_string);
+  return null;
+ }
+
+ var obj = JSON2js(text);
+ if(!obj) return null;
+
+ if( obj.status != 200 ) {
+
+  var str = 'A server error occurred. Debug information follows: ' +
+     '\ncode = '  + obj.status + 
+     '\ndebug: '  + obj.debug + 
+     '\npayload: ' + js2JSON(obj.payload); 
+
+  if(isXUL()) {
+   dump(str);
+   throw obj;
+
+  } else {
+   _debug(str);
+   throw str;
+  }
+ }
+
+ var payload = obj.payload;
+ if(!payload || payload.length == 0) return null;
+ payload = (payload.length == 1) ? payload[0] : payload;
+
+ if(!isXUL()) {
+  if( checkILSEvent(payload) ) {
+   this.event(payload);
+   if( this.alertEvent ) {
+    alertILSEvent(payload);
+    return null;
+   }
+  } 
+ }
+
+ return payload;
 }
 
 /* adds a new parameter to the request */
 RemoteRequest.prototype.addParam = function(param) {
-	var string = encodeURIComponent(js2JSON(param));
-	this.param_string += "&param=" + string;
+ var string = encodeURIComponent(js2JSON(param));
+ this.param_string += "&param=" + string;
 }
 
 function fetchXULStash() {
-	if( isXUL() ) {
-		try {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			var __OILS = new Components.Constructor("@mozilla.org/openils_data_cache;1", "nsIOpenILS");
-			var data_cache = new __OILS( );
-			return data_cache.wrappedJSObject.OpenILS.prototype.data;
-	
-		} catch(E) {
-			_debug('Error in OpenILS.data._debug_stash(): ' + js2JSON(E) );
-		}
-	}
-	return {};
+ if( isXUL() ) {
+  try {
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   var __OILS = new Components.Constructor("@mozilla.org/openils_data_cache;1", "nsIOpenILS");
+   var data_cache = new __OILS( );
+   return data_cache.wrappedJSObject.OpenILS.prototype.data;
+ 
+  } catch(E) {
+   _debug('Error in OpenILS.data._debug_stash(): ' + js2JSON(E) );
+  }
+ }
+ return {};
 }
 
 
diff --git a/Open-ILS/web/opac/common/js/added_content.js b/Open-ILS/web/opac/common/js/added_content.js
index 4e2074ce8a..9ac82b05a7 100644
--- a/Open-ILS/web/opac/common/js/added_content.js
+++ b/Open-ILS/web/opac/common/js/added_content.js
@@ -4,61 +4,61 @@
 
 
 function buildISBNSrc(isbn, size) {
-	size = (size) ? size : 'small';
-	var protocol = (OILS_OPAC_STATIC_PROTOCOL) ? OILS_OPAC_STATIC_PROTOCOL + ':' : location.protocol;
+ size = (size) ? size : 'small';
+ var protocol = (OILS_OPAC_STATIC_PROTOCOL) ? OILS_OPAC_STATIC_PROTOCOL + ':' : location.protocol;
     if(OILS_OPAC_IMAGES_HOST)
         return protocol + '//' + OILS_OPAC_IMAGES_HOST + size + '/' + isbn;
-	return '../../../../extras/ac/jacket/'+size+'/'+isbn;
+ return '../../../../extras/ac/jacket/'+size+'/'+isbn;
 }      
 
 
 function acMakeURL(type, key) {
-	return '../../../../extras/ac/' + type + '/html/' + key;
+ return '../../../../extras/ac/' + type + '/html/' + key;
 }
 
 
 function acCollectData( key, callback ) {
-	var context = { key : key, callback: callback, data : {} };
-	acCollectItem(context, 'reviews');
-	acCollectItem(context, 'toc');
-	acCollectItem(context, 'excerpt');
-	acCollectItem(context, 'anotes');
+ var context = { key : key, callback: callback, data : {} };
+ acCollectItem(context, 'reviews');
+ acCollectItem(context, 'toc');
+ acCollectItem(context, 'excerpt');
+ acCollectItem(context, 'anotes');
 }
 
 function acCheckDone(context) {
-	if(	context.data.reviews && context.data.reviews.done &&
-			context.data.toc		&& context.data.toc.done &&
-			context.data.excerpt && context.data.excerpt.done &&
-			context.data.anotes	&& context.data.anotes.done ) {
+ if( context.data.reviews && context.data.reviews.done &&
+   context.data.toc  && context.data.toc.done &&
+   context.data.excerpt && context.data.excerpt.done &&
+   context.data.anotes && context.data.anotes.done ) {
 
-		if(context.callback) context.callback(context.data);
-	}
+  if(context.callback) context.callback(context.data);
+ }
 }
 
 function acCollectItem(context, type) {
-	var req = buildXMLRequest();
-	req.open('GET', acMakeURL(type, context.key), true);
-	req.onreadystatechange = function() {
-		if( req.readyState == 4 ) {
-			context.data[type] = { done : true }
+ var req = buildXMLRequest();
+ req.open('GET', acMakeURL(type, context.key), true);
+ req.onreadystatechange = function() {
+  if( req.readyState == 4 ) {
+   context.data[type] = { done : true }
 
-			if(IE) {
+   if(IE) {
 
-				/* Someone please explain why IE treats status 404 as status 200?? 
-					On second thought, don't bother.
-				*/
-				if( ! req.responseText.match(
-					/The requested URL.*was not found on this server/) )
-					context.data[type].html = req.responseText;
+    /* Someone please explain why IE treats status 404 as status 200?? 
+     On second thought, don't bother.
+    */
+    if( ! req.responseText.match(
+     /The requested URL.*was not found on this server/) )
+     context.data[type].html = req.responseText;
 
-			} else {
-				if( req.status != 404 ) 
-					context.data[type].html = req.responseText;
-			}
-			acCheckDone(context);
-		}
-	}
-	req.send(null);
+   } else {
+    if( req.status != 404 ) 
+     context.data[type].html = req.responseText;
+   }
+   acCheckDone(context);
+  }
+ }
+ req.send(null);
 }
 
 
diff --git a/Open-ILS/web/opac/common/js/config.js b/Open-ILS/web/opac/common/js/config.js
index 382ed22825..f7db487db1 100644
--- a/Open-ILS/web/opac/common/js/config.js
+++ b/Open-ILS/web/opac/common/js/config.js
@@ -6,37 +6,37 @@ var SHOW_MR_DEFAULT = false; /* true if we show metarecords by default */
 var DO_AUTHORITY_LOOKUPS = true;
 
 /* URL param names */
-var PARAM_TERM			= "t";			/* search term */
-var PARAM_STYPE		= "tp";			/* search type */
-var PARAM_LOCATION	= "l";			/* current location */
-var PARAM_LASSO	= "sg";			/* current location */
-var PARAM_DEPTH		= "d";			/* search depth */
-var PARAM_FORM			= "f";			/* search format */
-var PARAM_OFFSET		= "o";			/* search offset */
-var PARAM_COUNT		= "c";			/* hits per page */
-var PARAM_HITCOUNT	= "hc";			/* hits per page */
-var PARAM_MRID			= "m";			/* metarecord id */
-var PARAM_RID			= "r";			/* record id */
-var PARAM_RLIST		= "rl";
-var PARAM_ORIGLOC		= "ol";			/* the original location */
-var PARAM_AUTHTIME	= "at";			/* inactivity timeout in seconds */
-var PARAM_ADVTERM		= "adv";			/* advanced search term */
-var PARAM_ADVTYPE		= "adt";			/* the advanced search type */
-var PARAM_RTYPE		= "rt";
-var PARAM_SORT			= "s";
-var PARAM_SORT_DIR	= "sd";
-var PARAM_DEBUG		= "dbg";
-var PARAM_CN			= "cn";
-var PARAM_LITFORM		= 'lf';
-var PARAM_ITEMFORM	= 'if';
-var PARAM_ITEMTYPE	= 'it';
-var PARAM_BIBLEVEL	= 'bl';
-var PARAM_AUDIENCE	= 'a';
-var PARAM_SEARCHES	= 'ss';
-var PARAM_LANGUAGE	= 'la';
-var PARAM_TFORM		= 'tf'; /* temporary format for title result pages */
-var PARAM_RDEPTH		= 'rd';
-var PARAM_REDIR		= 're'; /* true if we have been redirected by IP (we're at a real lib) */
+var PARAM_TERM   = "t";   /* search term */
+var PARAM_STYPE  = "tp";   /* search type */
+var PARAM_LOCATION = "l";   /* current location */
+var PARAM_LASSO = "sg";   /* current location */
+var PARAM_DEPTH  = "d";   /* search depth */
+var PARAM_FORM   = "f";   /* search format */
+var PARAM_OFFSET  = "o";   /* search offset */
+var PARAM_COUNT  = "c";   /* hits per page */
+var PARAM_HITCOUNT = "hc";   /* hits per page */
+var PARAM_MRID   = "m";   /* metarecord id */
+var PARAM_RID   = "r";   /* record id */
+var PARAM_RLIST  = "rl";
+var PARAM_ORIGLOC  = "ol";   /* the original location */
+var PARAM_AUTHTIME = "at";   /* inactivity timeout in seconds */
+var PARAM_ADVTERM  = "adv";   /* advanced search term */
+var PARAM_ADVTYPE  = "adt";   /* the advanced search type */
+var PARAM_RTYPE  = "rt";
+var PARAM_SORT   = "s";
+var PARAM_SORT_DIR = "sd";
+var PARAM_DEBUG  = "dbg";
+var PARAM_CN   = "cn";
+var PARAM_LITFORM  = 'lf';
+var PARAM_ITEMFORM = 'if';
+var PARAM_ITEMTYPE = 'it';
+var PARAM_BIBLEVEL = 'bl';
+var PARAM_AUDIENCE = 'a';
+var PARAM_SEARCHES = 'ss';
+var PARAM_LANGUAGE = 'la';
+var PARAM_TFORM  = 'tf'; /* temporary format for title result pages */
+var PARAM_RDEPTH  = 'rd';
+var PARAM_REDIR  = 're'; /* true if we have been redirected by IP (we're at a real lib) */
 var PARAM_AVAIL     = 'av'; /* limit search results to available items */
 var PARAM_COPYLOCS  = 'cl'; // copy (shelving) locations
 var PARAM_PUBD_BEFORE = 'pdb';
@@ -90,72 +90,72 @@ var SBEXTRAS;
 var SKIN;
 
 /* cookies */
-var COOKIE_SB		= "sbe";
-var COOKIE_SES		= "ses";
-//var COOKIE_IDS		= "ids"; /* list of mrecord ids */
-//var COOKIE_SRIDS	= "srids"; /* record ids cached from a search */
-var COOKIE_FONT	= "fnt";
-var COOKIE_SKIN	= "skin";
-var COOKIE_RIDS	= "rids"; /* list of record ids */
+var COOKIE_SB  = "sbe";
+var COOKIE_SES  = "ses";
+//var COOKIE_IDS  = "ids"; /* list of mrecord ids */
+//var COOKIE_SRIDS = "srids"; /* record ids cached from a search */
+var COOKIE_FONT = "fnt";
+var COOKIE_SKIN = "skin";
+var COOKIE_RIDS = "rids"; /* list of record ids */
 var COOKIE_SEARCH = 'sr';
 
 /* pages */
-var MRESULT		= "mresult";
-var RRESULT		= "rresult";
-var RDETAIL		= "rdetail";
-var MYOPAC		= "myopac";
-var ADVANCED	= "advanced";
-var HOME			= "home";
-var BBAGS		= "bbags";
-var REQITEMS	= "reqitems";
-var CNBROWSE	= "cnbrowse";
+var MRESULT  = "mresult";
+var RRESULT  = "rresult";
+var RDETAIL  = "rdetail";
+var MYOPAC  = "myopac";
+var ADVANCED = "advanced";
+var HOME   = "home";
+var BBAGS  = "bbags";
+var REQITEMS = "reqitems";
+var CNBROWSE = "cnbrowse";
 
 /* search type (STYPE) options */
-var STYPE_AUTHOR	= "author";
-var STYPE_TITLE	= "title";
-var STYPE_SUBJECT	= "subject";
-var STYPE_SERIES	= "series";
-var STYPE_KEYWORD	= "keyword";
+var STYPE_AUTHOR = "author";
+var STYPE_TITLE = "title";
+var STYPE_SUBJECT = "subject";
+var STYPE_SERIES = "series";
+var STYPE_KEYWORD = "keyword";
 
 /* record-level search types */
-var RTYPE_MRID		= "mrid";
-var RTYPE_COOKIE	= "cookie";
-var RTYPE_AUTHOR	= STYPE_AUTHOR;
-var RTYPE_SUBJECT	= STYPE_SUBJECT;
-var RTYPE_TITLE	= STYPE_TITLE;
-var RTYPE_SERIES	= STYPE_SERIES;
-var RTYPE_KEYWORD	= STYPE_KEYWORD;
-var RTYPE_LIST		= "list";
-var RTYPE_MULTI	= 'multi';
-var RTYPE_MARC		= 'marc';
-var RTYPE_ISBN		= 'isbn';
-var RTYPE_ISSN		= 'issn';
-var RTYPE_TCN		= 'tcn';
-
-var SORT_TYPE_REL			= "rel";
-var SORT_TYPE_AUTHOR		= STYPE_AUTHOR; 
-var SORT_TYPE_TITLE		= STYPE_TITLE;
-var SORT_TYPE_PUBDATE	= "pubdate";
-var SORT_DIR_ASC			= "asc";
-var SORT_DIR_DESC			= "desc";
+var RTYPE_MRID  = "mrid";
+var RTYPE_COOKIE = "cookie";
+var RTYPE_AUTHOR = STYPE_AUTHOR;
+var RTYPE_SUBJECT = STYPE_SUBJECT;
+var RTYPE_TITLE = STYPE_TITLE;
+var RTYPE_SERIES = STYPE_SERIES;
+var RTYPE_KEYWORD = STYPE_KEYWORD;
+var RTYPE_LIST  = "list";
+var RTYPE_MULTI = 'multi';
+var RTYPE_MARC  = 'marc';
+var RTYPE_ISBN  = 'isbn';
+var RTYPE_ISSN  = 'issn';
+var RTYPE_TCN  = 'tcn';
+
+var SORT_TYPE_REL   = "rel";
+var SORT_TYPE_AUTHOR  = STYPE_AUTHOR; 
+var SORT_TYPE_TITLE  = STYPE_TITLE;
+var SORT_TYPE_PUBDATE = "pubdate";
+var SORT_DIR_ASC   = "asc";
+var SORT_DIR_DESC   = "desc";
 
 /* types of advanced search */
 var ADVTYPE_MULTI = 'ml';
-var ADVTYPE_MARC	= 'ma';
+var ADVTYPE_MARC = 'ma';
 
 /*
-var ADVTYPE_ISBN	= 'isbn';
-var ADVTYPE_ISSN	= 'issn';
+var ADVTYPE_ISBN = 'isbn';
+var ADVTYPE_ISSN = 'issn';
 */
 
 var LOGOUT_WARNING_TIME = 30; /* "head up" for session timeout */
 
 /* user preferences */
-var PREF_HITS_PER		= 'opac.hits_per_page';
-var PREF_DEF_FONT		= 'opac.default_font';
+var PREF_HITS_PER  = 'opac.hits_per_page';
+var PREF_DEF_FONT  = 'opac.default_font';
 var PREF_HOLD_NOTIFY = 'opac.hold_notify';
 var PREF_DEF_LOCATION = 'opac.default_search_location';
-var PREF_DEF_DEPTH	= 'opac.default_search_depth';
+var PREF_DEF_DEPTH = 'opac.default_search_depth';
 
 
 /** If enabled, added content attribution links will be 
@@ -166,9 +166,9 @@ var ENABLE_ADDED_CONTENT_ATTRIB_LINKS = false;
 
 
 /* container for global variables shared accross pages */
-var G		= {};
-G.user	= null; /* global user object */
-G.ui		= {} /* cache of UI components */
+var G  = {};
+G.user = null; /* global user object */
+G.ui  = {} /* cache of UI components */
 
 
 /* regexes */
@@ -177,50 +177,50 @@ var REGEX_PHONE = /^\d{3}-\d{3}-\d{4}$/; /* 111-222-3333 */
 
 
 /* call me after page init and I will load references 
-	to all of the ui object id's defined below 
-	They will be stored in G.ui.<page>.<thingy>
+ to all of the ui object id's defined below 
+ They will be stored in G.ui.<page>.<thingy>
  */
 function loadUIObjects() {
-	for( var p in config.ids ) {
-		G.ui[p] = {};
-		for( var o in config.ids[p] ) 
-			G.ui[p][o] = getId(config.ids[p][o]);
-	}
+ for( var p in config.ids ) {
+  G.ui[p] = {};
+  for( var o in config.ids[p] ) 
+   G.ui[p][o] = getId(config.ids[p][o]);
+ }
 }
 
 /* try our best to free memory */
 function clearUIObjects() {
-	for( var p in config.ids ) {
-		for( var o in config.ids[p] ) {
-			if(G.ui[p][o]) {
-				G.ui[p][o].onclick = null;
-				G.ui[p][o].onkeydown = null;
-				G.ui[p][o] = null;
-			}
-		}
-		G.ui[p] = null;
-	}
+ for( var p in config.ids ) {
+  for( var o in config.ids[p] ) {
+   if(G.ui[p][o]) {
+    G.ui[p][o].onclick = null;
+    G.ui[p][o].onkeydown = null;
+    G.ui[p][o] = null;
+   }
+  }
+  G.ui[p] = null;
+ }
 }
 
 /* ---------------------------------------------------------------------------- 
-	Set up ID's and CSS classes 
-	Any new ids, css, etc. may be added by giving the unique names and putting 
-	them into the correct scope 
+ Set up ID's and CSS classes 
+ Any new ids, css, etc. may be added by giving the unique names and putting 
+ them into the correct scope 
 /* ---------------------------------------------------------------------------- */
 
 var config = {};
 
 /* Set up the page names */
 config.page = {};
-config.page[HOME]			= "index.xml";
-config.page[ADVANCED]	= "advanced.xml";
-config.page[MRESULT]		= "mresult.xml";
-config.page[RRESULT]		= "rresult.xml";
-config.page[MYOPAC]		= "myopac.xml";
-config.page[RDETAIL]		= "rdetail.xml";
-config.page[BBAGS]		= "bbags.xml";
-config.page[REQITEMS]	= "reqitems.xml";
-config.page[CNBROWSE]	= "cnbrowse.xml";
+config.page[HOME]   = "index.xml";
+config.page[ADVANCED] = "advanced.xml";
+config.page[MRESULT]  = "mresult.xml";
+config.page[RRESULT]  = "rresult.xml";
+config.page[MYOPAC]  = "myopac.xml";
+config.page[RDETAIL]  = "rdetail.xml";
+config.page[BBAGS]  = "bbags.xml";
+config.page[REQITEMS] = "reqitems.xml";
+config.page[CNBROWSE] = "cnbrowse.xml";
 
 /* themes */
 config.themes = {};
@@ -231,38 +231,38 @@ config.images.logo = "main_logo.jpg";
 
 
 /* set up ID's, CSS, and node names */
-config.ids				= {};
-config.ids.result		= {};
-config.ids.mresult	= {};
-config.ids.advanced	= {};
-config.ids.rresult	= {};
-config.ids.myopac		= {};
-config.ids.rdetail	= {};
-
-config.css				= {};
-config.css.result		= {};
-config.css.mresult	= {};
-config.css.advanced	= {};
-config.css.rresult	= {};
-config.css.myopac		= {};
-config.css.rdetail	= {};
-
-config.names			= {};
-config.names.result	= {};
+config.ids    = {};
+config.ids.result  = {};
+config.ids.mresult = {};
+config.ids.advanced = {};
+config.ids.rresult = {};
+config.ids.myopac  = {};
+config.ids.rdetail = {};
+
+config.css    = {};
+config.css.result  = {};
+config.css.mresult = {};
+config.css.advanced = {};
+config.css.rresult = {};
+config.css.myopac  = {};
+config.css.rdetail = {};
+
+config.names   = {};
+config.names.result = {};
 config.names.mresult = {};
 config.names.advanced = {};
 config.names.rresult = {};
-config.names.myopac	= {};
+config.names.myopac = {};
 config.names.rdetail = {};
 
 
 /* id's shared accross skins. These *must* be defined */
 config.ids.common = {};
-config.ids.common.loading			= "loading_div";		
-config.ids.common.canvas			= "canvas";				
-config.ids.common.canvas_main		= "canvas_main";		
-config.ids.common.org_tree			= "org_tree";			
-config.ids.common.org_container	= "org_container";
+config.ids.common.loading   = "loading_div";  
+config.ids.common.canvas   = "canvas";    
+config.ids.common.canvas_main  = "canvas_main";  
+config.ids.common.org_tree   = "org_tree";   
+config.ids.common.org_container = "org_container";
 
 config.ids.xul = {};
 
@@ -282,96 +282,96 @@ config.ids.altcanvas = {};
 
 /* ---------------------------------------------------------------------------- */
 /* Methods are defined as service:method 
-	An optional 3rd component is when a method is followed by a :1, such methods
-	have a staff counterpart and should have ".staff" appended to the method 
-	before the method is called when in XUL mode */
+ An optional 3rd component is when a method is followed by a :1, such methods
+ have a staff counterpart and should have ".staff" appended to the method 
+ before the method is called when in XUL mode */
 
-var SEARCH_MRS						= 'open-ils.search:open-ils.search.metabib.multiclass:1';
-var SEARCH_RS						= 'open-ils.search:open-ils.search.biblio.multiclass:1';
-var SEARCH_MRS_QUERY			= 'open-ils.search:open-ils.search.metabib.multiclass.query:1';
+var SEARCH_MRS      = 'open-ils.search:open-ils.search.metabib.multiclass:1';
+var SEARCH_RS      = 'open-ils.search:open-ils.search.biblio.multiclass:1';
+var SEARCH_MRS_QUERY   = 'open-ils.search:open-ils.search.metabib.multiclass.query:1';
 var SEARCH_RS_QUERY             = 'open-ils.search:open-ils.search.biblio.multiclass.query:1';
-var FETCH_SEARCH_RIDS			= "open-ils.search:open-ils.search.biblio.record.class.search:1";
-var CREATE_MFHD_RECORD			= "open-ils.cat:open-ils.cat.serial.record.xml.create";
-var DELETE_MFHD_RECORD			= "open-ils.cat:open-ils.cat.serial.record.delete";
-var FETCH_MFHD_SUMMARY			= "open-ils.search:open-ils.search.serial.record.bib.retrieve";
-var FETCH_MRMODS					= "open-ils.search:open-ils.search.biblio.metarecord.mods_slim.retrieve";
-var FETCH_MODS_FROM_COPY		= "open-ils.search:open-ils.search.biblio.mods_from_copy";
-var FETCH_MR_COPY_COUNTS		= "open-ils.search:open-ils.search.biblio.metarecord.copy_count:1";
-var FETCH_RIDS						= "open-ils.search:open-ils.search.biblio.metarecord_to_records:1";
-var FETCH_RMODS					= "open-ils.search:open-ils.search.biblio.record.mods_slim.retrieve";
-var FETCH_R_COPY_COUNTS			= "open-ils.search:open-ils.search.biblio.record.copy_count:1";
-var FETCH_FLESHED_USER			= "open-ils.actor:open-ils.actor.user.fleshed.retrieve";
-var FETCH_SESSION					= "open-ils.auth:open-ils.auth.session.retrieve";
-var LOGIN_INIT						= "open-ils.auth:open-ils.auth.authenticate.init";
-var LOGIN_COMPLETE				= "open-ils.auth:open-ils.auth.authenticate.complete";
-var LOGIN_DELETE					= "open-ils.auth:open-ils.auth.session.delete";
-var FETCH_USER_PREFS				= "open-ils.actor:open-ils.actor.patron.settings.retrieve"; 
-var UPDATE_USER_PREFS			= "open-ils.actor:open-ils.actor.patron.settings.update"; 
-var FETCH_COPY_STATUSES			= "open-ils.search:open-ils.search.config.copy_status.retrieve.all";
-var FETCH_COPY_LOCATION_COUNTS_SUMMARY	= "open-ils.search:open-ils.search.biblio.copy_location_counts.summary.retrieve";
-var FETCH_COPY_COUNTS_SUMMARY	= "open-ils.search:open-ils.search.biblio.copy_counts.summary.retrieve";
-//var FETCH_COPY_COUNTS_SUMMARY	= "open-ils.search:open-ils.search.biblio.copy_counts.location.summary.retrieve";
-var FETCH_MARC_HTML				= "open-ils.search:open-ils.search.biblio.record.html";
-var FETCH_CHECKED_OUT_SUM		= "open-ils.actor:open-ils.actor.user.checked_out";
-var FETCH_HOLDS					= "open-ils.circ:open-ils.circ.holds.retrieve";
-var FETCH_FINES_SUMMARY			= "open-ils.actor:open-ils.actor.user.fines.summary";
-var FETCH_TRANSACTIONS			= "open-ils.actor:open-ils.actor.user.transactions.have_charge.fleshed";
-var FETCH_MONEY_BILLING			= 'open-ils.circ:open-ils.circ.money.billing.retrieve.all';
-var FETCH_CROSSREF				= "open-ils.search:open-ils.search.authority.crossref";
-var FETCH_CROSSREF_BATCH		= "open-ils.search:open-ils.search.authority.crossref.batch";
-var CREATE_HOLD					= "open-ils.circ:open-ils.circ.holds.create";
-var CREATE_HOLD_OVERRIDE		= "open-ils.circ:open-ils.circ.holds.create.override";
-var CANCEL_HOLD					= "open-ils.circ:open-ils.circ.hold.cancel";
-var UPDATE_USERNAME				= "open-ils.actor:open-ils.actor.user.username.update";
-var UPDATE_PASSWORD				= "open-ils.actor:open-ils.actor.user.password.update";
-var UPDATE_EMAIL					= "open-ils.actor:open-ils.actor.user.email.update";
-var RENEW_CIRC						= "open-ils.circ:open-ils.circ.renew";
-var CHECK_SPELL					= "open-ils.search:open-ils.search.spellcheck";
-var FETCH_REVIEWS					= "open-ils.search:open-ils.search.added_content.review.retrieve.all";
-var FETCH_TOC						= "open-ils.search:open-ils.search.added_content.toc.retrieve";
-var FETCH_ACONT_SUMMARY			= "open-ils.search:open-ils.search.added_content.summary.retrieve";
-var FETCH_USER_BYBARCODE		= "open-ils.actor:open-ils.actor.user.fleshed.retrieve_by_barcode";
-var FETCH_ADV_MARC_MRIDS		= "open-ils.search:open-ils.search.biblio.marc:1";
-var FETCH_ADV_ISBN_RIDS			= "open-ils.search:open-ils.search.biblio.isbn";
-var FETCH_ADV_ISSN_RIDS			= "open-ils.search:open-ils.search.biblio.issn";
-var FETCH_ADV_TCN_RIDS			= "open-ils.search:open-ils.search.biblio.tcn";
-var FETCH_CNBROWSE				= 'open-ils.search:open-ils.search.callnumber.browse';
-var FETCH_CONTAINERS				= 'open-ils.actor:open-ils.actor.container.retrieve_by_class';
-var FETCH_CONTAINERS				= 'open-ils.actor:open-ils.actor.container.retrieve_by_class';
-var CREATE_CONTAINER				= 'open-ils.actor:open-ils.actor.container.create';
-var DELETE_CONTAINER				= 'open-ils.actor:open-ils.actor.container.full_delete';
-var CREATE_CONTAINER_ITEM		= 'open-ils.actor:open-ils.actor.container.item.create';
-var DELETE_CONTAINER_ITEM		= 'open-ils.actor:open-ils.actor.container.item.delete';
-var FLESH_CONTAINER				= 'open-ils.actor:open-ils.actor.container.flesh';
-var FLESH_PUBLIC_CONTAINER		= 'open-ils.actor:open-ils.actor.container.public.flesh';
-var UPDATE_CONTAINER				= 'open-ils.actor:open-ils.actor.container.update';
-var FETCH_COPY						= 'open-ils.search:open-ils.search.asset.copy.retrieve';
-var FETCH_FLESHED_COPY			= 'open-ils.search:open-ils.search.asset.copy.fleshed2.retrieve';
-var CHECK_HOLD_POSSIBLE			= 'open-ils.circ:open-ils.circ.title_hold.is_possible';
-var UPDATE_HOLD					= 'open-ils.circ:open-ils.circ.hold.update';
-var FETCH_COPIES_FROM_VOLUME	= 'open-ils.search:open-ils.search.asset.copy.retrieve_by_cn_label:1';
-var FETCH_VOLUME_BY_INFO		= 'open-ils.search:open-ils.search.call_number.retrieve_by_info'; /* XXX staff method? */
-var FETCH_VOLUME					= 'open-ils.search:open-ils.search.asset.call_number.retrieve';
-var FETCH_COPY_LOCATIONS		= 'open-ils.circ:open-ils.circ.copy_location.retrieve.all';
-var FETCH_COPY_NOTES				= 'open-ils.circ:open-ils.circ.copy_note.retrieve.all';
-var FETCH_COPY_STAT_CATS		= 'open-ils.circ:open-ils.circ.asset.stat_cat_entries.fleshed.retrieve_by_copy';
-var FETCH_LIT_FORMS				= 'open-ils.search:open-ils.search.biblio.lit_form_map.retrieve.all';
-var FETCH_ITEM_FORMS				= 'open-ils.search:open-ils.search.biblio.item_form_map.retrieve.all';
-var FETCH_ITEM_TYPES				= 'open-ils.search:open-ils.search.biblio.item_type_map.retrieve.all';
-var FETCH_BIB_LEVELS				= 'open-ils.search:open-ils.search.biblio.bib_level_map.retrieve.all';
-var FETCH_AUDIENCES				= 'open-ils.search:open-ils.search.biblio.audience_map.retrieve.all';
-//var FETCH_HOLD_STATUS			= 'open-ils.circ:open-ils.circ.hold.status.retrieve';
-var FETCH_HOLD_STATUS			= 'open-ils.circ:open-ils.circ.hold.queue_stats.retrieve';
-var FETCH_NON_CAT_CIRCS			= 'open-ils.circ:open-ils.circ.open_non_cataloged_circulation.user';
-var FETCH_NON_CAT_CIRC			= 'open-ils.circ:open-ils.circ.non_cataloged_circulation.retrieve';
-var FETCH_NON_CAT_TYPES			= "open-ils.circ:open-ils.circ.non_cat_types.retrieve.all";
-var FETCH_BRE						= 'open-ils.search:open-ils.search.biblio.record_entry.slim.retrieve';
-var CHECK_USERNAME				= 'open-ils.actor:open-ils.actor.username.exists';
-var FETCH_CIRC_BY_ID				= 'open-ils.circ:open-ils.circ.retrieve';
-var FETCH_MR_DESCRIPTORS		= 'open-ils.search:open-ils.search.metabib.record_to_descriptors';
-var FETCH_HIGHEST_PERM_ORG		= 'open-ils.actor:open-ils.actor.user.perm.highest_org.batch';
-var FETCH_USER_NOTES				= 'open-ils.actor:open-ils.actor.note.retrieve.all';
-var FETCH_ORG_BY_SHORTNAME		= 'open-ils.actor:open-ils.actor.org_unit.retrieve_by_shorname';
+var FETCH_SEARCH_RIDS   = "open-ils.search:open-ils.search.biblio.record.class.search:1";
+var CREATE_MFHD_RECORD   = "open-ils.cat:open-ils.cat.serial.record.xml.create";
+var DELETE_MFHD_RECORD   = "open-ils.cat:open-ils.cat.serial.record.delete";
+var FETCH_MFHD_SUMMARY   = "open-ils.search:open-ils.search.serial.record.bib.retrieve";
+var FETCH_MRMODS     = "open-ils.search:open-ils.search.biblio.metarecord.mods_slim.retrieve";
+var FETCH_MODS_FROM_COPY  = "open-ils.search:open-ils.search.biblio.mods_from_copy";
+var FETCH_MR_COPY_COUNTS  = "open-ils.search:open-ils.search.biblio.metarecord.copy_count:1";
+var FETCH_RIDS      = "open-ils.search:open-ils.search.biblio.metarecord_to_records:1";
+var FETCH_RMODS     = "open-ils.search:open-ils.search.biblio.record.mods_slim.retrieve";
+var FETCH_R_COPY_COUNTS   = "open-ils.search:open-ils.search.biblio.record.copy_count:1";
+var FETCH_FLESHED_USER   = "open-ils.actor:open-ils.actor.user.fleshed.retrieve";
+var FETCH_SESSION     = "open-ils.auth:open-ils.auth.session.retrieve";
+var LOGIN_INIT      = "open-ils.auth:open-ils.auth.authenticate.init";
+var LOGIN_COMPLETE    = "open-ils.auth:open-ils.auth.authenticate.complete";
+var LOGIN_DELETE     = "open-ils.auth:open-ils.auth.session.delete";
+var FETCH_USER_PREFS    = "open-ils.actor:open-ils.actor.patron.settings.retrieve"; 
+var UPDATE_USER_PREFS   = "open-ils.actor:open-ils.actor.patron.settings.update"; 
+var FETCH_COPY_STATUSES   = "open-ils.search:open-ils.search.config.copy_status.retrieve.all";
+var FETCH_COPY_LOCATION_COUNTS_SUMMARY = "open-ils.search:open-ils.search.biblio.copy_location_counts.summary.retrieve";
+var FETCH_COPY_COUNTS_SUMMARY = "open-ils.search:open-ils.search.biblio.copy_counts.summary.retrieve";
+//var FETCH_COPY_COUNTS_SUMMARY = "open-ils.search:open-ils.search.biblio.copy_counts.location.summary.retrieve";
+var FETCH_MARC_HTML    = "open-ils.search:open-ils.search.biblio.record.html";
+var FETCH_CHECKED_OUT_SUM  = "open-ils.actor:open-ils.actor.user.checked_out";
+var FETCH_HOLDS     = "open-ils.circ:open-ils.circ.holds.retrieve";
+var FETCH_FINES_SUMMARY   = "open-ils.actor:open-ils.actor.user.fines.summary";
+var FETCH_TRANSACTIONS   = "open-ils.actor:open-ils.actor.user.transactions.have_charge.fleshed";
+var FETCH_MONEY_BILLING   = 'open-ils.circ:open-ils.circ.money.billing.retrieve.all';
+var FETCH_CROSSREF    = "open-ils.search:open-ils.search.authority.crossref";
+var FETCH_CROSSREF_BATCH  = "open-ils.search:open-ils.search.authority.crossref.batch";
+var CREATE_HOLD     = "open-ils.circ:open-ils.circ.holds.create";
+var CREATE_HOLD_OVERRIDE  = "open-ils.circ:open-ils.circ.holds.create.override";
+var CANCEL_HOLD     = "open-ils.circ:open-ils.circ.hold.cancel";
+var UPDATE_USERNAME    = "open-ils.actor:open-ils.actor.user.username.update";
+var UPDATE_PASSWORD    = "open-ils.actor:open-ils.actor.user.password.update";
+var UPDATE_EMAIL     = "open-ils.actor:open-ils.actor.user.email.update";
+var RENEW_CIRC      = "open-ils.circ:open-ils.circ.renew";
+var CHECK_SPELL     = "open-ils.search:open-ils.search.spellcheck";
+var FETCH_REVIEWS     = "open-ils.search:open-ils.search.added_content.review.retrieve.all";
+var FETCH_TOC      = "open-ils.search:open-ils.search.added_content.toc.retrieve";
+var FETCH_ACONT_SUMMARY   = "open-ils.search:open-ils.search.added_content.summary.retrieve";
+var FETCH_USER_BYBARCODE  = "open-ils.actor:open-ils.actor.user.fleshed.retrieve_by_barcode";
+var FETCH_ADV_MARC_MRIDS  = "open-ils.search:open-ils.search.biblio.marc:1";
+var FETCH_ADV_ISBN_RIDS   = "open-ils.search:open-ils.search.biblio.isbn";
+var FETCH_ADV_ISSN_RIDS   = "open-ils.search:open-ils.search.biblio.issn";
+var FETCH_ADV_TCN_RIDS   = "open-ils.search:open-ils.search.biblio.tcn";
+var FETCH_CNBROWSE    = 'open-ils.search:open-ils.search.callnumber.browse';
+var FETCH_CONTAINERS    = 'open-ils.actor:open-ils.actor.container.retrieve_by_class';
+var FETCH_CONTAINERS    = 'open-ils.actor:open-ils.actor.container.retrieve_by_class';
+var CREATE_CONTAINER    = 'open-ils.actor:open-ils.actor.container.create';
+var DELETE_CONTAINER    = 'open-ils.actor:open-ils.actor.container.full_delete';
+var CREATE_CONTAINER_ITEM  = 'open-ils.actor:open-ils.actor.container.item.create';
+var DELETE_CONTAINER_ITEM  = 'open-ils.actor:open-ils.actor.container.item.delete';
+var FLESH_CONTAINER    = 'open-ils.actor:open-ils.actor.container.flesh';
+var FLESH_PUBLIC_CONTAINER  = 'open-ils.actor:open-ils.actor.container.public.flesh';
+var UPDATE_CONTAINER    = 'open-ils.actor:open-ils.actor.container.update';
+var FETCH_COPY      = 'open-ils.search:open-ils.search.asset.copy.retrieve';
+var FETCH_FLESHED_COPY   = 'open-ils.search:open-ils.search.asset.copy.fleshed2.retrieve';
+var CHECK_HOLD_POSSIBLE   = 'open-ils.circ:open-ils.circ.title_hold.is_possible';
+var UPDATE_HOLD     = 'open-ils.circ:open-ils.circ.hold.update';
+var FETCH_COPIES_FROM_VOLUME = 'open-ils.search:open-ils.search.asset.copy.retrieve_by_cn_label:1';
+var FETCH_VOLUME_BY_INFO  = 'open-ils.search:open-ils.search.call_number.retrieve_by_info'; /* XXX staff method? */
+var FETCH_VOLUME     = 'open-ils.search:open-ils.search.asset.call_number.retrieve';
+var FETCH_COPY_LOCATIONS  = 'open-ils.circ:open-ils.circ.copy_location.retrieve.all';
+var FETCH_COPY_NOTES    = 'open-ils.circ:open-ils.circ.copy_note.retrieve.all';
+var FETCH_COPY_STAT_CATS  = 'open-ils.circ:open-ils.circ.asset.stat_cat_entries.fleshed.retrieve_by_copy';
+var FETCH_LIT_FORMS    = 'open-ils.search:open-ils.search.biblio.lit_form_map.retrieve.all';
+var FETCH_ITEM_FORMS    = 'open-ils.search:open-ils.search.biblio.item_form_map.retrieve.all';
+var FETCH_ITEM_TYPES    = 'open-ils.search:open-ils.search.biblio.item_type_map.retrieve.all';
+var FETCH_BIB_LEVELS    = 'open-ils.search:open-ils.search.biblio.bib_level_map.retrieve.all';
+var FETCH_AUDIENCES    = 'open-ils.search:open-ils.search.biblio.audience_map.retrieve.all';
+//var FETCH_HOLD_STATUS   = 'open-ils.circ:open-ils.circ.hold.status.retrieve';
+var FETCH_HOLD_STATUS   = 'open-ils.circ:open-ils.circ.hold.queue_stats.retrieve';
+var FETCH_NON_CAT_CIRCS   = 'open-ils.circ:open-ils.circ.open_non_cataloged_circulation.user';
+var FETCH_NON_CAT_CIRC   = 'open-ils.circ:open-ils.circ.non_cataloged_circulation.retrieve';
+var FETCH_NON_CAT_TYPES   = "open-ils.circ:open-ils.circ.non_cat_types.retrieve.all";
+var FETCH_BRE      = 'open-ils.search:open-ils.search.biblio.record_entry.slim.retrieve';
+var CHECK_USERNAME    = 'open-ils.actor:open-ils.actor.username.exists';
+var FETCH_CIRC_BY_ID    = 'open-ils.circ:open-ils.circ.retrieve';
+var FETCH_MR_DESCRIPTORS  = 'open-ils.search:open-ils.search.metabib.record_to_descriptors';
+var FETCH_HIGHEST_PERM_ORG  = 'open-ils.actor:open-ils.actor.user.perm.highest_org.batch';
+var FETCH_USER_NOTES    = 'open-ils.actor:open-ils.actor.note.retrieve.all';
+var FETCH_ORG_BY_SHORTNAME  = 'open-ils.actor:open-ils.actor.org_unit.retrieve_by_shorname';
 var FETCH_BIB_ID_BY_BARCODE = 'open-ils.search:open-ils.search.bib_id.by_barcode';
 var FETCH_ORG_SETTING = 'open-ils.actor:open-ils.actor.ou_setting.ancestor_default';
 
@@ -380,57 +380,57 @@ var FETCH_ORG_SETTING = 'open-ils.actor:open-ils.actor.ou_setting.ancestor_defau
 
 /* ---------------------------------------------------------------------------- */
 /* event callback functions. Other functions may be appended to these vars to
-	for added functionality.  */
+ for added functionality.  */
 
-G.evt				= {}; /* events container */
+G.evt    = {}; /* events container */
 
 function runEvt(scope, name, a, b, c, d, e, f, g) {
-	var evt = G.evt[scope][name];
-	for( var i in evt ) {
-		evt[i](a, b, c, d, e, f, g);	
-	}
+ var evt = G.evt[scope][name];
+ for( var i in evt ) {
+  evt[i](a, b, c, d, e, f, g); 
+ }
 }
 
 /* creates a new event if it doesn't already exist */
 function createEvt(scope, name) {
-	if(!G.evt[scope]) G.evt[scope] = {};
-	if(G.evt[scope][name] == null)
-		G.evt[scope][name] = []; 
+ if(!G.evt[scope]) G.evt[scope] = {};
+ if(G.evt[scope][name] == null)
+  G.evt[scope][name] = []; 
 }
 
 function attachEvt(scope, name, action) {
-	createEvt(scope, name);
-	G.evt[scope][name].push(action);
+ createEvt(scope, name);
+ G.evt[scope][name].push(action);
 }
 
 function detachAllEvt(scope, name) {
-	G.evt[scope][name] = [];
+ G.evt[scope][name] = [];
 }
 
 
-createEvt("common", "init");						/* f() : what happens on page init */
-createEvt("common", "pageRendered");			/* f() : what happens when the page is done (up to the skin to call this even)*/
-createEvt("common", "unload");					/* f() : what happens on window unload (clean memory, etc.)*/
-createEvt("common", "locationChanged");		/* f() : what happens when the location has changed */
-createEvt("common", "locationUpdated");		/* f() : what happens when the location has updated by the code */
+createEvt("common", "init");      /* f() : what happens on page init */
+createEvt("common", "pageRendered");   /* f() : what happens when the page is done (up to the skin to call this even)*/
+createEvt("common", "unload");     /* f() : what happens on window unload (clean memory, etc.)*/
+createEvt("common", "locationChanged");  /* f() : what happens when the location has changed */
+createEvt("common", "locationUpdated");  /* f() : what happens when the location has updated by the code */
 
-createEvt("common", "run");						/* f() : make the page do stuff */
-createEvt("result", "idsReceived");				/* f(ids) */
-createEvt("rresult", "recordDrawn");			/* f(recordid, linkDOMNode) : after record is drawn, allow others (xul) to plugin actions */
-createEvt("result", "preCollectRecords");		/* f() we're about to go and grab the recs */
+createEvt("common", "run");      /* f() : make the page do stuff */
+createEvt("result", "idsReceived");    /* f(ids) */
+createEvt("rresult", "recordDrawn");   /* f(recordid, linkDOMNode) : after record is drawn, allow others (xul) to plugin actions */
+createEvt("result", "preCollectRecords");  /* f() we're about to go and grab the recs */
 
-createEvt("result", "hitCountReceived");		/* f() : display hit info, pagination, etc. */
-createEvt("result", "recordReceived");			/* f(mvr, pagePosition, isMr) : display the record*/
-createEvt("result", "recordDrawn");				/* f(recordid, linkDOMNode) : after record is drawn, allow others (xul) to plugin actions */
-createEvt("result", "copyCountsReceived");	/* f(mvr, pagePosition, copyCountInfo) : display copy counts*/
-createEvt("result", "allRecordsReceived");	/* f(mvrsArray) : add other page stuff, sidebars, etc.*/
+createEvt("result", "hitCountReceived");  /* f() : display hit info, pagination, etc. */
+createEvt("result", "recordReceived");   /* f(mvr, pagePosition, isMr) : display the record*/
+createEvt("result", "recordDrawn");    /* f(recordid, linkDOMNode) : after record is drawn, allow others (xul) to plugin actions */
+createEvt("result", "copyCountsReceived"); /* f(mvr, pagePosition, copyCountInfo) : display copy counts*/
+createEvt("result", "allRecordsReceived"); /* f(mvrsArray) : add other page stuff, sidebars, etc.*/
 
-createEvt("rdetail", "recordDrawn");			/* f() : the record has been drawn */
+createEvt("rdetail", "recordDrawn");   /* f() : the record has been drawn */
 
-createEvt("common", "loggedIn");					/* f() : user has just logged in */
+createEvt("common", "loggedIn");     /* f() : user has just logged in */
 createEvt('result', 'zeroHits');
 createEvt('result', 'lowHits');
-createEvt('rdetail', 'recordRetrieved');			/* we are about to draw the rdetail page */
+createEvt('rdetail', 'recordRetrieved');   /* we are about to draw the rdetail page */
 createEvt('common', 'depthChanged');
 createEvt('common', 'holdUpdated'); 
 createEvt('common', 'holdUpdateCanceled'); 
diff --git a/Open-ILS/web/opac/common/js/dtree.js b/Open-ILS/web/opac/common/js/dtree.js
index 8f95cb030f..289ed98d1b 100644
--- a/Open-ILS/web/opac/common/js/dtree.js
+++ b/Open-ILS/web/opac/common/js/dtree.js
@@ -10,315 +10,315 @@
 |--------------------------------------------------*/
 
 function Node(id, pid, name, url, title, target, icon, iconOpen, open) {
-	this.id = id;
-	this.pid = pid;
-	this.name = name;
-	this.url = url;
-	this.title = title;
-	this.target = target;
-	this.icon = icon;
-	this.iconOpen = iconOpen;
-	this._io = open || false;
-	this._is = false;
-	this._ls = false;
-	this._hc = false;
-	this._ai = 0;
-	this._p;
+ this.id = id;
+ this.pid = pid;
+ this.name = name;
+ this.url = url;
+ this.title = title;
+ this.target = target;
+ this.icon = icon;
+ this.iconOpen = iconOpen;
+ this._io = open || false;
+ this._is = false;
+ this._ls = false;
+ this._hc = false;
+ this._ai = 0;
+ this._p;
 };
 
 function dTree(objName) {
-	this.config = {
-		target					: null,
-		folderLinks			: true,
-		useSelection		: true,
-		useCookies			: true,
-		useLines				: true,
-		useIcons				: true,
-		useStatusText		: false,
-		closeSameLevel	: false,
-		inOrder					: false
-	}
-	this.icon = {
-		root				: '../../../images/orgtree/base.gif',
-		folder			: '../../../images/orgtree/folder.gif',
-		folderOpen		: '../../../images/orgtree/folderopen.gif',
-		node				: '../../../images/orgtree/page.gif',
-		empty				: '../../../images/orgtree/empty.gif',
-		line				: '../../../images/orgtree/line.gif',
-		join				: '../../../images/orgtree/join.gif',
-		joinBottom		: '../../../images/orgtree/joinbottom.gif',
-		plus				: '../../../images/orgtree/plus.gif',
-		plusBottom		: '../../../images/orgtree/plusbottom.gif',
-		minus				: '../../../images/orgtree/minus.gif',
-		minusBottom		: '../../../images/orgtree/minusbottom.gif',
-		nlPlus			: '../../../images/orgtree/nolines_plus.gif',
-		nlMinus			: '../../../images/orgtree/nolines_minus.gif'
-	};
-	this.obj = objName;
-	this.aNodes = [];
-	this.aIndent = [];
-	this.root = new Node(-1);
-	this.selectedNode = null;
-	this.selectedFound = false;
-	this.completed = false;
+ this.config = {
+  target     : null,
+  folderLinks   : true,
+  useSelection  : true,
+  useCookies   : true,
+  useLines    : true,
+  useIcons    : true,
+  useStatusText  : false,
+  closeSameLevel : false,
+  inOrder     : false
+ }
+ this.icon = {
+  root    : '../../../images/orgtree/base.gif',
+  folder   : '../../../images/orgtree/folder.gif',
+  folderOpen  : '../../../images/orgtree/folderopen.gif',
+  node    : '../../../images/orgtree/page.gif',
+  empty    : '../../../images/orgtree/empty.gif',
+  line    : '../../../images/orgtree/line.gif',
+  join    : '../../../images/orgtree/join.gif',
+  joinBottom  : '../../../images/orgtree/joinbottom.gif',
+  plus    : '../../../images/orgtree/plus.gif',
+  plusBottom  : '../../../images/orgtree/plusbottom.gif',
+  minus    : '../../../images/orgtree/minus.gif',
+  minusBottom  : '../../../images/orgtree/minusbottom.gif',
+  nlPlus   : '../../../images/orgtree/nolines_plus.gif',
+  nlMinus   : '../../../images/orgtree/nolines_minus.gif'
+ };
+ this.obj = objName;
+ this.aNodes = [];
+ this.aIndent = [];
+ this.root = new Node(-1);
+ this.selectedNode = null;
+ this.selectedFound = false;
+ this.completed = false;
 };
 
 dTree.prototype.add = function(id, pid, name, url, title, target, icon, iconOpen, open) {
-	this.aNodes[this.aNodes.length] = new Node(id, pid, name, url, title, target, icon, iconOpen, open);
+ this.aNodes[this.aNodes.length] = new Node(id, pid, name, url, title, target, icon, iconOpen, open);
 };
 
 dTree.prototype.openAll = function() {
-	this.oAll(true);
+ this.oAll(true);
 };
 dTree.prototype.closeAll = function() {
-	this.oAll(false);
+ this.oAll(false);
 };
 
 dTree.prototype.toString = function() {
-	var str = '<div class="dtree">\n';
-	if (document.getElementById) {
-		if (this.config.useCookies) this.selectedNode = this.getSelected();
-		str += this.addNode(this.root);
-	} else str += 'Browser not supported.';
-	str += '</div>';
-	if (!this.selectedFound) this.selectedNode = null;
-	this.completed = true;
-	return str;
+ var str = '<div class="dtree">\n';
+ if (document.getElementById) {
+  if (this.config.useCookies) this.selectedNode = this.getSelected();
+  str += this.addNode(this.root);
+ } else str += 'Browser not supported.';
+ str += '</div>';
+ if (!this.selectedFound) this.selectedNode = null;
+ this.completed = true;
+ return str;
 };
 
 dTree.prototype.addNode = function(pNode) {
-	var str = '';
-	var n=0;
-	if (this.config.inOrder) n = pNode._ai;
-	for (n; n<this.aNodes.length; n++) {
-		if (this.aNodes[n].pid == pNode.id) {
-			var cn = this.aNodes[n];
-			cn._p = pNode;
-			cn._ai = n;
-			this.setCS(cn);
-			if (!cn.target && this.config.target) cn.target = this.config.target;
-			if (cn._hc && !cn._io && this.config.useCookies) cn._io = this.isOpen(cn.id);
-			if (!this.config.folderLinks && cn._hc) cn.url = null;
-			if (this.config.useSelection && cn.id == this.selectedNode && !this.selectedFound) {
-					cn._is = true;
-					this.selectedNode = n;
-					this.selectedFound = true;
-			}
-			str += this.node(cn, n);
-			if (cn._ls) break;
-		}
-	}
-	return str;
+ var str = '';
+ var n=0;
+ if (this.config.inOrder) n = pNode._ai;
+ for (n; n<this.aNodes.length; n++) {
+  if (this.aNodes[n].pid == pNode.id) {
+   var cn = this.aNodes[n];
+   cn._p = pNode;
+   cn._ai = n;
+   this.setCS(cn);
+   if (!cn.target && this.config.target) cn.target = this.config.target;
+   if (cn._hc && !cn._io && this.config.useCookies) cn._io = this.isOpen(cn.id);
+   if (!this.config.folderLinks && cn._hc) cn.url = null;
+   if (this.config.useSelection && cn.id == this.selectedNode && !this.selectedFound) {
+     cn._is = true;
+     this.selectedNode = n;
+     this.selectedFound = true;
+   }
+   str += this.node(cn, n);
+   if (cn._ls) break;
+  }
+ }
+ return str;
 };
 
 dTree.prototype.node = function(node, nodeId) {
-	var str = '<div class="dTreeNode">' + this.indent(node, nodeId);
-	if (this.config.useIcons) {
-		if (!node.icon) node.icon = (this.root.id == node.pid) ? this.icon.root : ((node._hc) ? this.icon.folder : this.icon.node);
-		if (!node.iconOpen) node.iconOpen = (node._hc) ? this.icon.folderOpen : this.icon.node;
-		if (this.root.id == node.pid) {
-			node.icon = this.icon.root;
-			node.iconOpen = this.icon.root;
-		}
-		str += '<img id="i' + this.obj + nodeId + '" src="' + ((node._io) ? node.iconOpen : node.icon) + '" alt="" />';
-	}
-	if (node.url) {
-		str += '<a id="s' + this.obj + nodeId + '" class="' + ((this.config.useSelection) ? ((node._is ? 'nodeSel' : 'node')) : 'node') + '" href="' + node.url + '"';
-		if (node.title) str += ' title="' + node.title + '"';
-		if (node.target) str += ' target="' + node.target + '"';
-		if (this.config.useStatusText) str += ' onmouseover="window.status=\'' + node.name + '\';return true;" onmouseout="window.status=\'\';return true;" ';
-		if (this.config.useSelection && ((node._hc && this.config.folderLinks) || !node._hc))
-			str += ' onclick="javascript: ' + this.obj + '.s(' + nodeId + ');"';
-		str += '>';
-	}
-	else if ((!this.config.folderLinks || !node.url) && node._hc && node.pid != this.root.id)
-		str += '<a href="javascript: ' + this.obj + '.o(' + nodeId + ');" class="node">';
-	str += node.name;
-	if (node.url || ((!this.config.folderLinks || !node.url) && node._hc)) str += '</a>';
-	str += '</div>';
-	if (node._hc) {
-		str += '<div id="d' + this.obj + nodeId + '" class="clip" style="display:' + ((this.root.id == node.pid || node._io) ? 'block' : 'none') + ';">';
-		str += this.addNode(node);
-		str += '</div>';
-	}
-	this.aIndent.pop();
-	return str;
+ var str = '<div class="dTreeNode">' + this.indent(node, nodeId);
+ if (this.config.useIcons) {
+  if (!node.icon) node.icon = (this.root.id == node.pid) ? this.icon.root : ((node._hc) ? this.icon.folder : this.icon.node);
+  if (!node.iconOpen) node.iconOpen = (node._hc) ? this.icon.folderOpen : this.icon.node;
+  if (this.root.id == node.pid) {
+   node.icon = this.icon.root;
+   node.iconOpen = this.icon.root;
+  }
+  str += '<img id="i' + this.obj + nodeId + '" src="' + ((node._io) ? node.iconOpen : node.icon) + '" alt="" />';
+ }
+ if (node.url) {
+  str += '<a id="s' + this.obj + nodeId + '" class="' + ((this.config.useSelection) ? ((node._is ? 'nodeSel' : 'node')) : 'node') + '" href="' + node.url + '"';
+  if (node.title) str += ' title="' + node.title + '"';
+  if (node.target) str += ' target="' + node.target + '"';
+  if (this.config.useStatusText) str += ' onmouseover="window.status=\'' + node.name + '\';return true;" onmouseout="window.status=\'\';return true;" ';
+  if (this.config.useSelection && ((node._hc && this.config.folderLinks) || !node._hc))
+   str += ' onclick="javascript: ' + this.obj + '.s(' + nodeId + ');"';
+  str += '>';
+ }
+ else if ((!this.config.folderLinks || !node.url) && node._hc && node.pid != this.root.id)
+  str += '<a href="javascript: ' + this.obj + '.o(' + nodeId + ');" class="node">';
+ str += node.name;
+ if (node.url || ((!this.config.folderLinks || !node.url) && node._hc)) str += '</a>';
+ str += '</div>';
+ if (node._hc) {
+  str += '<div id="d' + this.obj + nodeId + '" class="clip" style="display:' + ((this.root.id == node.pid || node._io) ? 'block' : 'none') + ';">';
+  str += this.addNode(node);
+  str += '</div>';
+ }
+ this.aIndent.pop();
+ return str;
 };
 
 dTree.prototype.indent = function(node, nodeId) {
-	var str = '';
-	if (this.root.id != node.pid) {
-		for (var n=0; n<this.aIndent.length; n++)
-			str += '<img src="' + ( (this.aIndent[n] == 1 && this.config.useLines) ? this.icon.line : this.icon.empty ) + '" alt="" />';
-		(node._ls) ? this.aIndent.push(0) : this.aIndent.push(1);
-		if (node._hc) {
-			str += '<a href="javascript: ' + this.obj + '.o(' + nodeId + ');"><img  id="j' + this.obj + nodeId + '" src="';
-			if (!this.config.useLines) str += (node._io) ? this.icon.nlMinus : this.icon.nlPlus;
-			else str += ( (node._io) ? ((node._ls && this.config.useLines) ? this.icon.minusBottom : this.icon.minus) : ((node._ls && this.config.useLines) ? this.icon.plusBottom : this.icon.plus ) );
-			str += '" alt="" /></a>';
-		} else str += '<img src="' + ( (this.config.useLines) ? ((node._ls) ? this.icon.joinBottom : this.icon.join ) : this.icon.empty) + '" alt="" />';
-	}
-	return str;
+ var str = '';
+ if (this.root.id != node.pid) {
+  for (var n=0; n<this.aIndent.length; n++)
+   str += '<img src="' + ( (this.aIndent[n] == 1 && this.config.useLines) ? this.icon.line : this.icon.empty ) + '" alt="" />';
+  (node._ls) ? this.aIndent.push(0) : this.aIndent.push(1);
+  if (node._hc) {
+   str += '<a href="javascript: ' + this.obj + '.o(' + nodeId + ');"><img  id="j' + this.obj + nodeId + '" src="';
+   if (!this.config.useLines) str += (node._io) ? this.icon.nlMinus : this.icon.nlPlus;
+   else str += ( (node._io) ? ((node._ls && this.config.useLines) ? this.icon.minusBottom : this.icon.minus) : ((node._ls && this.config.useLines) ? this.icon.plusBottom : this.icon.plus ) );
+   str += '" alt="" /></a>';
+  } else str += '<img src="' + ( (this.config.useLines) ? ((node._ls) ? this.icon.joinBottom : this.icon.join ) : this.icon.empty) + '" alt="" />';
+ }
+ return str;
 };
 
 dTree.prototype.setCS = function(node) {
-	var lastId;
-	for (var n=0; n<this.aNodes.length; n++) {
-		if (this.aNodes[n].pid == node.id) node._hc = true;
-		if (this.aNodes[n].pid == node.pid) lastId = this.aNodes[n].id;
-	}
-	if (lastId==node.id) node._ls = true;
+ var lastId;
+ for (var n=0; n<this.aNodes.length; n++) {
+  if (this.aNodes[n].pid == node.id) node._hc = true;
+  if (this.aNodes[n].pid == node.pid) lastId = this.aNodes[n].id;
+ }
+ if (lastId==node.id) node._ls = true;
 };
 
 dTree.prototype.getSelected = function() {
-	var sn = this.getCookie('cs' + this.obj);
-	return (sn) ? sn : null;
+ var sn = this.getCookie('cs' + this.obj);
+ return (sn) ? sn : null;
 };
 
 dTree.prototype.s = function(id) {
-	if (!this.config.useSelection) return;
-	var cn = this.aNodes[id];
-	if (cn._hc && !this.config.folderLinks) return;
-	if (this.selectedNode != id) {
-		if (this.selectedNode || this.selectedNode==0) {
-			eOld = document.getElementById("s" + this.obj + this.selectedNode);
-			eOld.className = "node";
-		}
-		eNew = document.getElementById("s" + this.obj + id);
-		eNew.className = "nodeSel";
-		this.selectedNode = id;
-		if (this.config.useCookies) this.setCookie('cs' + this.obj, cn.id);
-	}
+ if (!this.config.useSelection) return;
+ var cn = this.aNodes[id];
+ if (cn._hc && !this.config.folderLinks) return;
+ if (this.selectedNode != id) {
+  if (this.selectedNode || this.selectedNode==0) {
+   eOld = document.getElementById("s" + this.obj + this.selectedNode);
+   eOld.className = "node";
+  }
+  eNew = document.getElementById("s" + this.obj + id);
+  eNew.className = "nodeSel";
+  this.selectedNode = id;
+  if (this.config.useCookies) this.setCookie('cs' + this.obj, cn.id);
+ }
 };
 
 dTree.prototype.o = function(id) {
-	var cn = this.aNodes[id];
-	this.nodeStatus(!cn._io, id, cn._ls);
-	cn._io = !cn._io;
-	if (this.config.closeSameLevel) this.closeLevel(cn);
-	if (this.config.useCookies) this.updateCookie();
+ var cn = this.aNodes[id];
+ this.nodeStatus(!cn._io, id, cn._ls);
+ cn._io = !cn._io;
+ if (this.config.closeSameLevel) this.closeLevel(cn);
+ if (this.config.useCookies) this.updateCookie();
 };
 
 dTree.prototype.oAll = function(status) {
-	for (var n=0; n<this.aNodes.length; n++) {
-		if (this.aNodes[n]._hc && this.aNodes[n].pid != this.root.id) {
-			this.nodeStatus(status, n, this.aNodes[n]._ls)
-			this.aNodes[n]._io = status;
-		}
-	}
-	if (this.config.useCookies) this.updateCookie();
+ for (var n=0; n<this.aNodes.length; n++) {
+  if (this.aNodes[n]._hc && this.aNodes[n].pid != this.root.id) {
+   this.nodeStatus(status, n, this.aNodes[n]._ls)
+   this.aNodes[n]._io = status;
+  }
+ }
+ if (this.config.useCookies) this.updateCookie();
 };
 
 dTree.prototype.openTo = function(nId, bSelect, bFirst) {
-	if (!bFirst) {
-		for (var n=0; n<this.aNodes.length; n++) {
-			if (this.aNodes[n].id == nId) {
-				nId=n;
-				break;
-			}
-		}
-	}
-	var cn=this.aNodes[nId];
-	if (cn.pid==this.root.id || !cn._p) return;
-	cn._io = true;
-	cn._is = bSelect;
-	if (this.completed && cn._hc) this.nodeStatus(true, cn._ai, cn._ls);
-	if (this.completed && bSelect) this.s(cn._ai);
-	else if (bSelect) this._sn=cn._ai;
-	this.openTo(cn._p._ai, false, true);
+ if (!bFirst) {
+  for (var n=0; n<this.aNodes.length; n++) {
+   if (this.aNodes[n].id == nId) {
+    nId=n;
+    break;
+   }
+  }
+ }
+ var cn=this.aNodes[nId];
+ if (cn.pid==this.root.id || !cn._p) return;
+ cn._io = true;
+ cn._is = bSelect;
+ if (this.completed && cn._hc) this.nodeStatus(true, cn._ai, cn._ls);
+ if (this.completed && bSelect) this.s(cn._ai);
+ else if (bSelect) this._sn=cn._ai;
+ this.openTo(cn._p._ai, false, true);
 };
 
 dTree.prototype.closeLevel = function(node) {
-	for (var n=0; n<this.aNodes.length; n++) {
-		if (this.aNodes[n].pid == node.pid && this.aNodes[n].id != node.id && this.aNodes[n]._hc) {
-			this.nodeStatus(false, n, this.aNodes[n]._ls);
-			this.aNodes[n]._io = false;
-			this.closeAllChildren(this.aNodes[n]);
-		}
-	}
+ for (var n=0; n<this.aNodes.length; n++) {
+  if (this.aNodes[n].pid == node.pid && this.aNodes[n].id != node.id && this.aNodes[n]._hc) {
+   this.nodeStatus(false, n, this.aNodes[n]._ls);
+   this.aNodes[n]._io = false;
+   this.closeAllChildren(this.aNodes[n]);
+  }
+ }
 }
 
 dTree.prototype.closeAllChildren = function(node) {
-	for (var n=0; n<this.aNodes.length; n++) {
-		if (this.aNodes[n].pid == node.id && this.aNodes[n]._hc) {
-			if (this.aNodes[n]._io) this.nodeStatus(false, n, this.aNodes[n]._ls);
-			this.aNodes[n]._io = false;
-			this.closeAllChildren(this.aNodes[n]);		
-		}
-	}
+ for (var n=0; n<this.aNodes.length; n++) {
+  if (this.aNodes[n].pid == node.id && this.aNodes[n]._hc) {
+   if (this.aNodes[n]._io) this.nodeStatus(false, n, this.aNodes[n]._ls);
+   this.aNodes[n]._io = false;
+   this.closeAllChildren(this.aNodes[n]);  
+  }
+ }
 }
 
 dTree.prototype.nodeStatus = function(status, id, bottom) {
-	eDiv	= document.getElementById('d' + this.obj + id);
-	eJoin	= document.getElementById('j' + this.obj + id);
-	if (this.config.useIcons) {
-		eIcon	= document.getElementById('i' + this.obj + id);
-		eIcon.src = (status) ? this.aNodes[id].iconOpen : this.aNodes[id].icon;
-	}
-	eJoin.src = (this.config.useLines)?
-	((status)?((bottom)?this.icon.minusBottom:this.icon.minus):((bottom)?this.icon.plusBottom:this.icon.plus)):
-	((status)?this.icon.nlMinus:this.icon.nlPlus);
-	eDiv.style.display = (status) ? 'block': 'none';
+ eDiv = document.getElementById('d' + this.obj + id);
+ eJoin = document.getElementById('j' + this.obj + id);
+ if (this.config.useIcons) {
+  eIcon = document.getElementById('i' + this.obj + id);
+  eIcon.src = (status) ? this.aNodes[id].iconOpen : this.aNodes[id].icon;
+ }
+ eJoin.src = (this.config.useLines)?
+ ((status)?((bottom)?this.icon.minusBottom:this.icon.minus):((bottom)?this.icon.plusBottom:this.icon.plus)):
+ ((status)?this.icon.nlMinus:this.icon.nlPlus);
+ eDiv.style.display = (status) ? 'block': 'none';
 };
 
 
 dTree.prototype.clearCookie = function() {
-	var now = new Date();
-	var yesterday = new Date(now.getTime() - 1000 * 60 * 60 * 24);
-	this.setCookie('co'+this.obj, 'cookieValue', yesterday);
-	this.setCookie('cs'+this.obj, 'cookieValue', yesterday);
+ var now = new Date();
+ var yesterday = new Date(now.getTime() - 1000 * 60 * 60 * 24);
+ this.setCookie('co'+this.obj, 'cookieValue', yesterday);
+ this.setCookie('cs'+this.obj, 'cookieValue', yesterday);
 };
 
 dTree.prototype.setCookie = function(cookieName, cookieValue, expires, path, domain, secure) {
-	document.cookie =
-		escape(cookieName) + '=' + escape(cookieValue)
-		+ (expires ? '; expires=' + expires.toGMTString() : '')
-		+ (path ? '; path=' + path : '')
-		+ (domain ? '; domain=' + domain : '')
-		+ (secure ? '; secure' : '');
+ document.cookie =
+  escape(cookieName) + '=' + escape(cookieValue)
+  + (expires ? '; expires=' + expires.toGMTString() : '')
+  + (path ? '; path=' + path : '')
+  + (domain ? '; domain=' + domain : '')
+  + (secure ? '; secure' : '');
 };
 
 dTree.prototype.getCookie = function(cookieName) {
-	var cookieValue = '';
-	var posName = document.cookie.indexOf(escape(cookieName) + '=');
-	if (posName != -1) {
-		var posValue = posName + (escape(cookieName) + '=').length;
-		var endPos = document.cookie.indexOf(';', posValue);
-		if (endPos != -1) cookieValue = unescape(document.cookie.substring(posValue, endPos));
-		else cookieValue = unescape(document.cookie.substring(posValue));
-	}
-	return (cookieValue);
+ var cookieValue = '';
+ var posName = document.cookie.indexOf(escape(cookieName) + '=');
+ if (posName != -1) {
+  var posValue = posName + (escape(cookieName) + '=').length;
+  var endPos = document.cookie.indexOf(';', posValue);
+  if (endPos != -1) cookieValue = unescape(document.cookie.substring(posValue, endPos));
+  else cookieValue = unescape(document.cookie.substring(posValue));
+ }
+ return (cookieValue);
 };
 
 dTree.prototype.updateCookie = function() {
-	var str = '';
-	for (var n=0; n<this.aNodes.length; n++) {
-		if (this.aNodes[n]._io && this.aNodes[n].pid != this.root.id) {
-			if (str) str += '.';
-			str += this.aNodes[n].id;
-		}
-	}
-	this.setCookie('co' + this.obj, str);
+ var str = '';
+ for (var n=0; n<this.aNodes.length; n++) {
+  if (this.aNodes[n]._io && this.aNodes[n].pid != this.root.id) {
+   if (str) str += '.';
+   str += this.aNodes[n].id;
+  }
+ }
+ this.setCookie('co' + this.obj, str);
 };
 
 dTree.prototype.isOpen = function(id) {
-	var aOpen = this.getCookie('co' + this.obj).split('.');
-	for (var n=0; n<aOpen.length; n++)
-		if (aOpen[n] == id) return true;
-	return false;
+ var aOpen = this.getCookie('co' + this.obj).split('.');
+ for (var n=0; n<aOpen.length; n++)
+  if (aOpen[n] == id) return true;
+ return false;
 };
 
 if (!Array.prototype.push) {
-	Array.prototype.push = function array_push() {
-		for(var i=0;i<arguments.length;i++)
-			this[this.length]=arguments[i];
-		return this.length;
-	}
+ Array.prototype.push = function array_push() {
+  for(var i=0;i<arguments.length;i++)
+   this[this.length]=arguments[i];
+  return this.length;
+ }
 };
 if (!Array.prototype.pop) {
-	Array.prototype.pop = function array_pop() {
-		lastElement = this[this.length-1];
-		this.length = Math.max(this.length-1,0);
-		return lastElement;
-	}
+ Array.prototype.pop = function array_pop() {
+  lastElement = this[this.length-1];
+  this.length = Math.max(this.length-1,0);
+  return lastElement;
+ }
 };
diff --git a/Open-ILS/web/opac/common/js/fm_table.js b/Open-ILS/web/opac/common/js/fm_table.js
index 95c5bc9d83..67e2d650e1 100644
--- a/Open-ILS/web/opac/common/js/fm_table.js
+++ b/Open-ILS/web/opac/common/js/fm_table.js
@@ -1,5 +1,5 @@
 /* 
-	Fieldmapper object table
+ Fieldmapper object table
 */
 
 var ID_GEN = 1;
@@ -8,315 +8,315 @@ var ID_GEN = 1;
 
 function drawFMObjectTable( args ) {
 
-	var destination = args.dest;
-	var obj = args.obj;
+ var destination = args.dest;
+ var obj = args.obj;
 
-	if( typeof destination == 'string' ) 
-		destination = $(destination);
-	var builder = new FMObjectBuilder(obj, args);
+ if( typeof destination == 'string' ) 
+  destination = $(destination);
+ var builder = new FMObjectBuilder(obj, args);
 
-	destination.appendChild(builder.build());
-	return builder;
+ destination.appendChild(builder.build());
+ return builder;
 }
 
 
 /* Constructor for the builder object */
 function FMObjectBuilder( obj, args ) {
-	this.obj		= obj;
-	this.table	= elem('table');
-	this.thead	= elem('thead');
-	this.tbody	= elem('tbody');
-	this.thead_tr = elem('tr');
-	this.subtables = [];
-	this.display = args.display;
-	this.selectCol = args.selectCol;
-	this.moneySummaryRow = args.moneySummaryRow;
-	this.selectColName = args.selectColName;
-	this.selectAllName = args.selectAllName;
-	this.selectNoneName = args.selectNoneName;
-	this.rows = [];
-	if(!this.display) this.display = {};
-
-	this.table.appendChild(this.thead);
-	this.table.appendChild(this.tbody);
-	this.thead.appendChild(this.thead_tr)
-
-	addCSSClass(this.table, 'fm_table');
-	addCSSClass(this.table, 'sortable');
-	this.table.id = 'fm_table_' + (ID_GEN++);
+ this.obj  = obj;
+ this.table = elem('table');
+ this.thead = elem('thead');
+ this.tbody = elem('tbody');
+ this.thead_tr = elem('tr');
+ this.subtables = [];
+ this.display = args.display;
+ this.selectCol = args.selectCol;
+ this.moneySummaryRow = args.moneySummaryRow;
+ this.selectColName = args.selectColName;
+ this.selectAllName = args.selectAllName;
+ this.selectNoneName = args.selectNoneName;
+ this.rows = [];
+ if(!this.display) this.display = {};
+
+ this.table.appendChild(this.thead);
+ this.table.appendChild(this.tbody);
+ this.thead.appendChild(this.thead_tr)
+
+ addCSSClass(this.table, 'fm_table');
+ addCSSClass(this.table, 'sortable');
+ this.table.id = 'fm_table_' + (ID_GEN++);
 }
 
 
 FMObjectBuilder.prototype.getSelected = function() {
-	var objs = [];
-	for( var i = 0; i < this.rows.length; i++ ) {
-		var r = $(this.rows[i]);
-		if( $n(r,'selected') && $n(r,'selected').checked )
-			objs.push(this.obj[i]);
-	}
-	return objs;
+ var objs = [];
+ for( var i = 0; i < this.rows.length; i++ ) {
+  var r = $(this.rows[i]);
+  if( $n(r,'selected') && $n(r,'selected').checked )
+   objs.push(this.obj[i]);
+ }
+ return objs;
 }
 
 /* Builds the table */
 FMObjectBuilder.prototype.build = function() {
-	var o = this.obj;
+ var o = this.obj;
 
-	if( instanceOf(this.obj, Array) ) 
-		o = this.obj[0];
-	else this.obj = [this.obj];
+ if( instanceOf(this.obj, Array) ) 
+  o = this.obj[0];
+ else this.obj = [this.obj];
 
-	if( o ) {
+ if( o ) {
 
-		this.setKeys(o);
-		if( this.selectCol ) {
-			var obj = this;
-			var td = elem('td',null,this.selectColName);
+  this.setKeys(o);
+  if( this.selectCol ) {
+   var obj = this;
+   var td = elem('td',null,this.selectColName);
 
-			var all = elem('a',{href:'javascript:void(0);','class':'fm_select_link' }, this.selectAllName);
-			var none = elem('a',{href:'javascript:void(0);', 'class':'fm_select_link'}, this.selectNoneName);
+   var all = elem('a',{href:'javascript:void(0);','class':'fm_select_link' }, this.selectAllName);
+   var none = elem('a',{href:'javascript:void(0);', 'class':'fm_select_link'}, this.selectNoneName);
 
-			all.onclick = function(){obj.selectAll()};
-			none.onclick = function(){obj.selectNone()};
+   all.onclick = function(){obj.selectAll()};
+   none.onclick = function(){obj.selectNone()};
 
-			td.appendChild(all);
-			td.appendChild(none);
-			this.thead_tr.appendChild(td);
-		}
+   td.appendChild(all);
+   td.appendChild(none);
+   this.thead_tr.appendChild(td);
+  }
 
-		if (this.moneySummaryRow) {
-			this.moneySummaryRow = elem('tr');
+  if (this.moneySummaryRow) {
+   this.moneySummaryRow = elem('tr');
 
-			if( this.selectCol )
-				this.moneySummaryRow.appendChild(elem('td'));
+   if( this.selectCol )
+    this.moneySummaryRow.appendChild(elem('td'));
 
-			for( var i = 0; i < this.keys.length; i++ ) {
-				var key = this.keys[i];
+   for( var i = 0; i < this.keys.length; i++ ) {
+    var key = this.keys[i];
 
-				var td = elem('td');
-				td.setAttribute('name', this.table.id + key);
+    var td = elem('td');
+    td.setAttribute('name', this.table.id + key);
 
-				if (this.money && grep(this.money,function(i){return (i==key)}) )
-					td.appendChild(text('0.00'));
+    if (this.money && grep(this.money,function(i){return (i==key)}) )
+     td.appendChild(text('0.00'));
 
-				this.moneySummaryRow.appendChild(td);
-			}
+    this.moneySummaryRow.appendChild(td);
+   }
 
-			this.tbody.appendChild(this.moneySummaryRow);
-		}
+   this.tbody.appendChild(this.moneySummaryRow);
+  }
 
-		for( var i = 0; i < this.keys.length; i++ ) 
-			this.thead_tr.appendChild(elem('td',null,this.keys[i]));
-	
-		for( var i = 0; i < this.obj.length; i++ ) 
-			this.buildObjectRow(this.obj[i]);
-	}
+  for( var i = 0; i < this.keys.length; i++ ) 
+   this.thead_tr.appendChild(elem('td',null,this.keys[i]));
+ 
+  for( var i = 0; i < this.obj.length; i++ ) 
+   this.buildObjectRow(this.obj[i]);
+ }
 
-	return this.table;
+ return this.table;
 }
 
 
 FMObjectBuilder.prototype.selectAll = function() {
-	for( var i = 0; i < this.rows.length; i++ ) {
-		var r = $(this.rows[i]);
-		$n(r,'selected').checked = true;
-	}
+ for( var i = 0; i < this.rows.length; i++ ) {
+  var r = $(this.rows[i]);
+  $n(r,'selected').checked = true;
+ }
 }
 
 FMObjectBuilder.prototype.selectNone = function() {
-	for( var i = 0; i < this.rows.length; i++ ) {
-		var r = $(this.rows[i]);
-		$n(r,'selected').checked = false;
-	}
+ for( var i = 0; i < this.rows.length; i++ ) {
+  var r = $(this.rows[i]);
+  $n(r,'selected').checked = false;
+ }
 }
 
 
 /* */
 FMObjectBuilder.prototype.setKeys = function(o) {
-	var sortme = false;
-	if( this.display[o.classname] ) {
-		this.keys = this.display[o.classname].fields;
-		this.bold = this.display[o.classname].bold;
-		this.money = this.display[o.classname].money;
-	}
+ var sortme = false;
+ if( this.display[o.classname] ) {
+  this.keys = this.display[o.classname].fields;
+  this.bold = this.display[o.classname].bold;
+  this.money = this.display[o.classname].money;
+ }
 
-	if(!this.keys && FM_TABLE_DISPLAY[o.classname])
-		this.keys = FM_TABLE_DISPLAY[o.classname].fields;
+ if(!this.keys && FM_TABLE_DISPLAY[o.classname])
+  this.keys = FM_TABLE_DISPLAY[o.classname].fields;
 
-	if(!this.bold && FM_TABLE_DISPLAY[o.classname])
-		this.bold = FM_TABLE_DISPLAY[o.classname].bold;
+ if(!this.bold && FM_TABLE_DISPLAY[o.classname])
+  this.bold = FM_TABLE_DISPLAY[o.classname].bold;
 
-	if(!this.money && FM_TABLE_DISPLAY[o.classname])
-		this.money = FM_TABLE_DISPLAY[o.classname].money;
+ if(!this.money && FM_TABLE_DISPLAY[o.classname])
+  this.money = FM_TABLE_DISPLAY[o.classname].money;
 
-	if(!this.keys) {
-		this.keys = fmclasses[o.classname];
-		sortme = true;
-	}
+ if(!this.keys) {
+  this.keys = fmclasses[o.classname];
+  sortme = true;
+ }
 
-	if(sortme) this.keys = this.keys.sort();
+ if(sortme) this.keys = this.keys.sort();
 }
 
 /* use this method to insert object rows after the table has been rendered */
 FMObjectBuilder.prototype.add = function(obj) {
-	this.obj.push(obj);
-	this.buildObjectRow(obj);
+ this.obj.push(obj);
+ this.buildObjectRow(obj);
 }
 
 /* Inserts one row into the table to represent a single object */
 FMObjectBuilder.prototype.buildObjectRow = function(obj) {
-	var row = elem('tr');
-	row.id = 'fm_table_' + (ID_GEN++);
-	this.rows.push(row.id);
-
-	if(this.selectCol) {
-		var td = elem('td');
-		td.appendChild(elem('input',{type:'checkbox',name:'selected'}));
-		row.appendChild(td);
-	}
-
-	for( var i = 0; i < this.keys.length; i++ ) {
-		var td = elem('td');	
-		var data = obj[this.keys[i]]();
-		data = this.munge(data);
-		this.fleshData(td, data, this.keys[i]);
-		row.appendChild(td);
-	}
-	this.tbody.appendChild(row);
-	if (this.moneySummaryRow) this.tbody.appendChild(this.moneySummaryRow);
+ var row = elem('tr');
+ row.id = 'fm_table_' + (ID_GEN++);
+ this.rows.push(row.id);
+
+ if(this.selectCol) {
+  var td = elem('td');
+  td.appendChild(elem('input',{type:'checkbox',name:'selected'}));
+  row.appendChild(td);
+ }
+
+ for( var i = 0; i < this.keys.length; i++ ) {
+  var td = elem('td'); 
+  var data = obj[this.keys[i]]();
+  data = this.munge(data);
+  this.fleshData(td, data, this.keys[i]);
+  row.appendChild(td);
+ }
+ this.tbody.appendChild(row);
+ if (this.moneySummaryRow) this.tbody.appendChild(this.moneySummaryRow);
 }
 
 FMObjectBuilder.prototype.munge = function(data) {
-	if(!data) return;
-	if(typeof data == 'string') {
-		if( data.match(/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/) ) {
-			data = data.replace(/T/,' ');
-			data = data.replace(/:\d{2}-.*/,'');
-		}
-	}
-
-	return data;
+ if(!data) return;
+ if(typeof data == 'string') {
+  if( data.match(/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/) ) {
+   data = data.replace(/T/,' ');
+   data = data.replace(/:\d{2}-.*/,'');
+  }
+ }
+
+ return data;
 }
 
 
 FMObjectBuilder.prototype.dataName = function(data) {
-	var name;
-	if( this.display[data.classname] ) 
-		name = this.display[data.classname].name;
+ var name;
+ if( this.display[data.classname] ) 
+  name = this.display[data.classname].name;
 
-	if(!name && FM_TABLE_DISPLAY[data.classname])
-		name = FM_TABLE_DISPLAY[data.classname].name;
+ if(!name && FM_TABLE_DISPLAY[data.classname])
+  name = FM_TABLE_DISPLAY[data.classname].name;
 
-	if(!name) name = 'id';
+ if(!name) name = 'id';
 
-	return data[name]();
-	return name;
+ return data[name]();
+ return name;
 }
 
 
 FMObjectBuilder.prototype.fleshData = function(td, data, key) {
-	if(data == null) data = '';
-
-	if( typeof data == 'object' ) {
-		var atext;
-
-		if( data._isfieldmapper ) 
-			atext = this.dataName(data);
-
-		else if (instanceOf(data, Array) )
-			atext = data.length;
-
-		if( atext ) {
-
-			var master = this;
-			var expand = function () { 
-				var buildme = true;
-				var row = td.parentNode.nextSibling;
-				if( row && row.getAttribute('subrow') == key) buildme = false;
-				master.hideSubTables();
-				if(buildme) master.buildSubTable(td, data, key);
-			};
-
-			var a = elem('a',{href:'javascript:void(0);'});
-			a.onclick = expand;
-			a.appendChild(text(atext));
-			td.appendChild(a);
-
-		} else {
-			td.appendChild(text(''));
-		}
-
-	} else {
-		if (this.money && grep(this.money,function(i){return (i==key)}) ) {
-			td.setAttribute('align', 'right');
-			data = parseFloat(data).toFixed(2);
-
-			if (isNaN(data)) data = '0.00';
-
-			if (this.moneySummaryRow) {
-				var summary_td = $n(this.moneySummaryRow, this.table.id + key);
-				summary_td.innerHTML = parseFloat(parseFloat(summary_td.innerHTML) + parseFloat(data)).toFixed(2);
-			}
-		}
-
-		if( this.bold && grep(this.bold,function(i){return (i==key)}) ) {
-			var span = elem('span',{'class':'fm_table_bold'}, data);
-			td.appendChild(span);
-		} else {
-			td.appendChild(text( data ));
-		}
-	}
+ if(data == null) data = '';
+
+ if( typeof data == 'object' ) {
+  var atext;
+
+  if( data._isfieldmapper ) 
+   atext = this.dataName(data);
+
+  else if (instanceOf(data, Array) )
+   atext = data.length;
+
+  if( atext ) {
+
+   var master = this;
+   var expand = function () { 
+    var buildme = true;
+    var row = td.parentNode.nextSibling;
+    if( row && row.getAttribute('subrow') == key) buildme = false;
+    master.hideSubTables();
+    if(buildme) master.buildSubTable(td, data, key);
+   };
+
+   var a = elem('a',{href:'javascript:void(0);'});
+   a.onclick = expand;
+   a.appendChild(text(atext));
+   td.appendChild(a);
+
+  } else {
+   td.appendChild(text(''));
+  }
+
+ } else {
+  if (this.money && grep(this.money,function(i){return (i==key)}) ) {
+   td.setAttribute('align', 'right');
+   data = parseFloat(data).toFixed(2);
+
+   if (isNaN(data)) data = '0.00';
+
+   if (this.moneySummaryRow) {
+    var summary_td = $n(this.moneySummaryRow, this.table.id + key);
+    summary_td.innerHTML = parseFloat(parseFloat(summary_td.innerHTML) + parseFloat(data)).toFixed(2);
+   }
+  }
+
+  if( this.bold && grep(this.bold,function(i){return (i==key)}) ) {
+   var span = elem('span',{'class':'fm_table_bold'}, data);
+   td.appendChild(span);
+  } else {
+   td.appendChild(text( data ));
+  }
+ }
 }
 
 FMObjectBuilder.prototype.hideSubTables = function() {
 
-	/* clear out any existing subrows */
-	for( var i = 0; i < this.tbody.childNodes.length; i++ ) {
-		var r = this.tbody.childNodes[i];
-		if( r.getAttribute('subrow') )
-			this.tbody.removeChild(r);
-	}
-
-	/* un-style any selected tds */
-	var tds = this.tbody.getElementsByTagName('td');
-	for( i = 0; i < tds.length; i++ )
-		removeCSSClass( tds[i], 'fm_selected' );
+ /* clear out any existing subrows */
+ for( var i = 0; i < this.tbody.childNodes.length; i++ ) {
+  var r = this.tbody.childNodes[i];
+  if( r.getAttribute('subrow') )
+   this.tbody.removeChild(r);
+ }
+
+ /* un-style any selected tds */
+ var tds = this.tbody.getElementsByTagName('td');
+ for( i = 0; i < tds.length; i++ )
+  removeCSSClass( tds[i], 'fm_selected' );
 }
 
 FMObjectBuilder.prototype.buildSubTable = function(td, obj, key) {
 
-	var left = parseInt(td.offsetLeft);
-	var div	= elem('div');
-	var row	= elem('tr');
-	var subtd= elem('td');
-
-	if( td.parentNode.nextSibling ) 
-		this.tbody.insertBefore(row, td.parentNode.nextSibling);
-	else
-		this.tbody.appendChild(row);
-
-	row.appendChild(subtd);
-	row.setAttribute('subrow', key);
-	subtd.appendChild(div);
-
-	addCSSClass(td, 'fm_selected');
-	subtd.setAttribute('colspan',this.keys.length);
-	if(this.selectCol)
-		subtd.setAttribute('colspan',this.keys.length + 1);
-
-	subtd.setAttribute('style', 'width: 100%; padding-left:'+left+'px;');
-	var builder = drawFMObjectTable({dest:div, obj:obj, display:this.display});
-	builder.table.setAttribute('style', 'width: auto;');
-	addCSSClass(builder.table, 'fm_selected');
-
-	var newleft = left - (builder.table.clientWidth / 2) + (td.clientWidth / 2);
-
-	if( newleft < left ) {
-		if( newleft < 0 ) newleft = 0;
-		newleft = parseInt(newleft);
-		var style = subtd.getAttribute('style');
-		style = style.replace(new RegExp(left), newleft);
-		subtd.setAttribute('style', style);
-	}
+ var left = parseInt(td.offsetLeft);
+ var div = elem('div');
+ var row = elem('tr');
+ var subtd= elem('td');
+
+ if( td.parentNode.nextSibling ) 
+  this.tbody.insertBefore(row, td.parentNode.nextSibling);
+ else
+  this.tbody.appendChild(row);
+
+ row.appendChild(subtd);
+ row.setAttribute('subrow', key);
+ subtd.appendChild(div);
+
+ addCSSClass(td, 'fm_selected');
+ subtd.setAttribute('colspan',this.keys.length);
+ if(this.selectCol)
+  subtd.setAttribute('colspan',this.keys.length + 1);
+
+ subtd.setAttribute('style', 'width: 100%; padding-left:'+left+'px;');
+ var builder = drawFMObjectTable({dest:div, obj:obj, display:this.display});
+ builder.table.setAttribute('style', 'width: auto;');
+ addCSSClass(builder.table, 'fm_selected');
+
+ var newleft = left - (builder.table.clientWidth / 2) + (td.clientWidth / 2);
+
+ if( newleft < left ) {
+  if( newleft < 0 ) newleft = 0;
+  newleft = parseInt(newleft);
+  var style = subtd.getAttribute('style');
+  style = style.replace(new RegExp(left), newleft);
+  subtd.setAttribute('style', style);
+ }
 }
 
 
diff --git a/Open-ILS/web/opac/common/js/fm_table_conf.js b/Open-ILS/web/opac/common/js/fm_table_conf.js
index 9153b5ac6d..894ee9bc8f 100644
--- a/Open-ILS/web/opac/common/js/fm_table_conf.js
+++ b/Open-ILS/web/opac/common/js/fm_table_conf.js
@@ -1,129 +1,129 @@
 var FM_TABLE_DISPLAY = {
-	'acp' : {
-		name : 'barcode',	
-		fields : [
-			'barcode',
-			'call_number',
-			'circ_modifier',
-			'create_date',
-			'edit_date',
-			'fine_level',
-			'holdable',
-			'loan_duration',
-			'location',
-			'notes',
-			'stat_cat_entry_copy_maps',
-			'status' ],
-		},
-	'acpn' : {
-		name : 'title',
-		fields : [
-			'pub',
-			'title',
-			'value'
-		]
-	},
-	'asc' : {
-		name : 'name',
-		fields : [
-			'owner',
-			'opac_visible',
-			'name'
-		]
-	},
-	'ascecm' : {
-		fields : [ 'stat_cat', 'stat_cat_entry' ]
-	},
-	'ccs' : {
-		name : 'name'
-	},
-	'acpl' : {
-		name : 'name',
-		fields : [
-			'circulate',
-			'holdable',
-			'owning_lib',
-			'opac_visible'
-		]
-	},
-	'au' : {
-		name : 'usrname',
-		fields : [
-			'card',
-			'email',
-			'first_given_name',
-			'family_name',
-			'home_ou',
-		]
-	},
-	'aws' : {
-		name : 'name'
-	},
-	'mwps' : {
-		fields : [
-			'workstation',
-			'cash_payment',
-			'check_payment',	
-			'credit_card_payment'
-		],
-		money : [
-			'cash_payment',
-			'check_payment',	
-			'credit_card_payment'
-		]
-	},
+ 'acp' : {
+  name : 'barcode', 
+  fields : [
+   'barcode',
+   'call_number',
+   'circ_modifier',
+   'create_date',
+   'edit_date',
+   'fine_level',
+   'holdable',
+   'loan_duration',
+   'location',
+   'notes',
+   'stat_cat_entry_copy_maps',
+   'status' ],
+  },
+ 'acpn' : {
+  name : 'title',
+  fields : [
+   'pub',
+   'title',
+   'value'
+  ]
+ },
+ 'asc' : {
+  name : 'name',
+  fields : [
+   'owner',
+   'opac_visible',
+   'name'
+  ]
+ },
+ 'ascecm' : {
+  fields : [ 'stat_cat', 'stat_cat_entry' ]
+ },
+ 'ccs' : {
+  name : 'name'
+ },
+ 'acpl' : {
+  name : 'name',
+  fields : [
+   'circulate',
+   'holdable',
+   'owning_lib',
+   'opac_visible'
+  ]
+ },
+ 'au' : {
+  name : 'usrname',
+  fields : [
+   'card',
+   'email',
+   'first_given_name',
+   'family_name',
+   'home_ou',
+  ]
+ },
+ 'aws' : {
+  name : 'name'
+ },
+ 'mwps' : {
+  fields : [
+   'workstation',
+   'cash_payment',
+   'check_payment', 
+   'credit_card_payment'
+  ],
+  money : [
+   'cash_payment',
+   'check_payment', 
+   'credit_card_payment'
+  ]
+ },
 
-	'mups' : {
-		fields : [
-			'usr',
-			'credit_payment',
-			'forgive_payment',
-			'work_payment',
-			'goods_payment'
-		],
-		money : [
-			'credit_payment',
-			'forgive_payment',
-			'work_payment',
-			'goods_payment'
-		]
-	},
-	'rr' : {
-		name : 'name',
-		fields : [
-			'name',
-			'description',
-			'template',
-			'create_time',
-			'recur',
-			'recurance',
-			'owner',
-		]
-	},
-	'rt' : {
-		name : 'name',
-		fields : [
-			'name',
-			'description',
-			'create_time',
-			'owner',
-		]
-	},
-	'rs' : {
-		fields : [
-			'report',
-			'run_time',
-			'complete_time',
-			'runner',
-			'email',
-			'folder',
-			'error_text',
-			'excel_format',
-			'html_format',
-			'csv_format',
-		],
-		bold : [
-			'error_text',
-		]
-	}
+ 'mups' : {
+  fields : [
+   'usr',
+   'credit_payment',
+   'forgive_payment',
+   'work_payment',
+   'goods_payment'
+  ],
+  money : [
+   'credit_payment',
+   'forgive_payment',
+   'work_payment',
+   'goods_payment'
+  ]
+ },
+ 'rr' : {
+  name : 'name',
+  fields : [
+   'name',
+   'description',
+   'template',
+   'create_time',
+   'recur',
+   'recurance',
+   'owner',
+  ]
+ },
+ 'rt' : {
+  name : 'name',
+  fields : [
+   'name',
+   'description',
+   'create_time',
+   'owner',
+  ]
+ },
+ 'rs' : {
+  fields : [
+   'report',
+   'run_time',
+   'complete_time',
+   'runner',
+   'email',
+   'folder',
+   'error_text',
+   'excel_format',
+   'html_format',
+   'csv_format',
+  ],
+  bold : [
+   'error_text',
+  ]
+ }
 }
diff --git a/Open-ILS/web/opac/common/js/fmgen.js b/Open-ILS/web/opac/common/js/fmgen.js
index bf67355e8a..ff4d05e1bb 100644
--- a/Open-ILS/web/opac/common/js/fmgen.js
+++ b/Open-ILS/web/opac/common/js/fmgen.js
@@ -1,37 +1,37 @@
 /* generate fieldmapper javascript classes.  This expects a global variable
-	called 'fmclasses' to be fleshed with the classes we need to build */
+ called 'fmclasses' to be fleshed with the classes we need to build */
 
 function Fieldmapper() {}
 
 var errorstr = "Attempt to build fieldmapper object with non-array";
 
 Fieldmapper.prototype.clone = function() {
-	var obj = new this.constructor();
+ var obj = new this.constructor();
 
-	for( var i in this.a ) {
-		var thing = this.a[i];
-		if(thing == null) continue;
+ for( var i in this.a ) {
+  var thing = this.a[i];
+  if(thing == null) continue;
 
-		if( thing._isfieldmapper ) {
-			obj.a[i] = thing.clone();
-		} else {
+  if( thing._isfieldmapper ) {
+   obj.a[i] = thing.clone();
+  } else {
 
-			if(instanceOf(thing, Array)) {
-				obj.a[i] = new Array();
+   if(instanceOf(thing, Array)) {
+    obj.a[i] = new Array();
 
-				for( var j in thing ) {
+    for( var j in thing ) {
 
-					if( thing[j]._isfieldmapper )
-						obj.a[i][j] = thing[j].clone();
-					else
-						obj.a[i][j] = thing[j];
-				}
-			} else {
-				obj.a[i] = thing;
-			}
-		}
-	}
-	return obj;
+     if( thing[j]._isfieldmapper )
+      obj.a[i][j] = thing[j].clone();
+     else
+      obj.a[i][j] = thing[j];
+    }
+   } else {
+    obj.a[i] = thing;
+   }
+  }
+ }
+ return obj;
 }
 
 function FMEX(message) { this.message = message; }
@@ -39,27 +39,27 @@ FMEX.toString = function() { return "FieldmapperException: " + this.message + "\
 
 var string = "";
 for( var cl in fmclasses ) {
-	string += cl + ".prototype = new Fieldmapper(); " + 
-						cl + ".prototype.constructor = " + cl + ";" +
-						cl + ".baseClass = Fieldmapper.constructor;" +
-						"function " + cl + "(a) { " +
-							"this.classname = \"" + cl + "\";" +
-							"this._isfieldmapper = true;" +
-							"if(a) { if(a.constructor == Array) this.a = a; else throw new FMEX(errorstr);} else this.a = []}"; 
+ string += cl + ".prototype = new Fieldmapper(); " + 
+      cl + ".prototype.constructor = " + cl + ";" +
+      cl + ".baseClass = Fieldmapper.constructor;" +
+      "function " + cl + "(a) { " +
+       "this.classname = \"" + cl + "\";" +
+       "this._isfieldmapper = true;" +
+       "if(a) { if(a.constructor == Array) this.a = a; else throw new FMEX(errorstr);} else this.a = []}"; 
 
-	string += cl + "._isfieldmapper=true;";
+ string += cl + "._isfieldmapper=true;";
 
-	fmclasses[cl].push('isnew');
-	fmclasses[cl].push('ischanged');
-	fmclasses[cl].push('isdeleted');
+ fmclasses[cl].push('isnew');
+ fmclasses[cl].push('ischanged');
+ fmclasses[cl].push('isdeleted');
 
-	for( var pos in fmclasses[cl] ) {
-		var p = parseInt(pos);
-		var field = fmclasses[cl][pos];
-		string += cl + ".prototype." + field + 
-			"=function(n){if(arguments.length == 1)this.a[" + 
-			p + "]=n;return this.a[" + p + "];};";
-	}
+ for( var pos in fmclasses[cl] ) {
+  var p = parseInt(pos);
+  var field = fmclasses[cl][pos];
+  string += cl + ".prototype." + field + 
+   "=function(n){if(arguments.length == 1)this.a[" + 
+   p + "]=n;return this.a[" + p + "];};";
+ }
 }
 eval(string);
 
diff --git a/Open-ILS/web/opac/common/js/init.js b/Open-ILS/web/opac/common/js/init.js
index 9ad1ed8301..be8ca63f4a 100644
--- a/Open-ILS/web/opac/common/js/init.js
+++ b/Open-ILS/web/opac/common/js/init.js
@@ -12,46 +12,46 @@ try{ attachEvt("common", "unload", cleanRemoteRequests);} catch(e){}
 
 function init() {
 
-	initParams();
+ initParams();
 
-	if( getLocation() == null && getOrigLocation() != null )
-		LOCATION = getOrigLocation();
+ if( getLocation() == null && getOrigLocation() != null )
+  LOCATION = getOrigLocation();
 
-	if( getLocation() == null && getOrigLocation() == null )
-		LOCATION = globalOrgTree.id();
+ if( getLocation() == null && getOrigLocation() == null )
+  LOCATION = globalOrgTree.id();
 
-	/* if they click on the home page and the origlocation is set
-		take the opac back to the origlocation */
-	if( findCurrentPage() == HOME && getOrigLocation() != null )
-		LOCATION = getOrigLocation();
+ /* if they click on the home page and the origlocation is set
+  take the opac back to the origlocation */
+ if( findCurrentPage() == HOME && getOrigLocation() != null )
+  LOCATION = getOrigLocation();
 
-	if(getDepth() == null) DEPTH = findOrgDepth(getLocation());
+ if(getDepth() == null) DEPTH = findOrgDepth(getLocation());
 
 
-	runEvt('common','init');
+ runEvt('common','init');
 
-	var cgi = new CGI();
-	if( grabUser() ) {
-		if( cgi.param(PARAM_LOCATION) == null ) {
-			var org = G.user.prefs[PREF_DEF_LOCATION];
-			var depth = G.user.prefs[PREF_DEF_DEPTH];
+ var cgi = new CGI();
+ if( grabUser() ) {
+  if( cgi.param(PARAM_LOCATION) == null ) {
+   var org = G.user.prefs[PREF_DEF_LOCATION];
+   var depth = G.user.prefs[PREF_DEF_DEPTH];
 
-			if(org == null) org = G.user.ws_ou();
-			if(depth == null) depth = findOrgDepth(org);
+   if(org == null) org = G.user.ws_ou();
+   if(depth == null) depth = findOrgDepth(org);
 
-			LOCATION = org;
-			DEPTH = depth;
-		}
-	}
+   LOCATION = org;
+   DEPTH = depth;
+  }
+ }
 
-	runEvt("common", "run");
-	//checkUserSkin();
+ runEvt("common", "run");
+ //checkUserSkin();
 
-	var loc = findOrgLasso(getLasso());
-	if (!loc) loc = findOrgUnit(getLocation());
+ var loc = findOrgLasso(getLasso());
+ if (!loc) loc = findOrgUnit(getLocation());
 
-	if (getLasso()) G.ui.common.now_searching.appendChild(text('Search group: '));
-	G.ui.common.now_searching.appendChild(text(loc.name()));
+ if (getLasso()) G.ui.common.now_searching.appendChild(text('Search group: '));
+ G.ui.common.now_searching.appendChild(text(loc.name()));
 }
 
 function windowUnload() { runEvt("common", "unload"); }
diff --git a/Open-ILS/web/opac/common/js/jscalendar/calendar-setup.js b/Open-ILS/web/opac/common/js/jscalendar/calendar-setup.js
index 5dfbb01550..577638285c 100644
--- a/Open-ILS/web/opac/common/js/jscalendar/calendar-setup.js
+++ b/Open-ILS/web/opac/common/js/jscalendar/calendar-setup.js
@@ -60,142 +60,142 @@
  *  saying "nothing to setup".
  */
 Calendar.setup = function (params) {
-	function param_default(pname, def) { if (typeof params[pname] == "undefined") { params[pname] = def; } };
+ function param_default(pname, def) { if (typeof params[pname] == "undefined") { params[pname] = def; } };
 
-	param_default("inputField",     null);
-	param_default("displayArea",    null);
-	param_default("button",         null);
-	param_default("eventName",      "click");
-	param_default("ifFormat",       "%Y/%m/%d");
-	param_default("daFormat",       "%Y/%m/%d");
-	param_default("singleClick",    true);
-	param_default("disableFunc",    null);
-	param_default("dateStatusFunc", params["disableFunc"]);	// takes precedence if both are defined
-	param_default("dateText",       null);
-	param_default("firstDay",       null);
-	param_default("align",          "Br");
-	param_default("range",          [1900, 2999]);
-	param_default("weekNumbers",    true);
-	param_default("flat",           null);
-	param_default("flatCallback",   null);
-	param_default("onSelect",       null);
-	param_default("onClose",        null);
-	param_default("onUpdate",       null);
-	param_default("date",           null);
-	param_default("showsTime",      false);
-	param_default("timeFormat",     "24");
-	param_default("electric",       true);
-	param_default("step",           2);
-	param_default("position",       null);
-	param_default("cache",          false);
-	param_default("showOthers",     false);
-	param_default("multiple",       null);
+ param_default("inputField",     null);
+ param_default("displayArea",    null);
+ param_default("button",         null);
+ param_default("eventName",      "click");
+ param_default("ifFormat",       "%Y/%m/%d");
+ param_default("daFormat",       "%Y/%m/%d");
+ param_default("singleClick",    true);
+ param_default("disableFunc",    null);
+ param_default("dateStatusFunc", params["disableFunc"]); // takes precedence if both are defined
+ param_default("dateText",       null);
+ param_default("firstDay",       null);
+ param_default("align",          "Br");
+ param_default("range",          [1900, 2999]);
+ param_default("weekNumbers",    true);
+ param_default("flat",           null);
+ param_default("flatCallback",   null);
+ param_default("onSelect",       null);
+ param_default("onClose",        null);
+ param_default("onUpdate",       null);
+ param_default("date",           null);
+ param_default("showsTime",      false);
+ param_default("timeFormat",     "24");
+ param_default("electric",       true);
+ param_default("step",           2);
+ param_default("position",       null);
+ param_default("cache",          false);
+ param_default("showOthers",     false);
+ param_default("multiple",       null);
 
-	var tmp = ["inputField", "displayArea", "button"];
-	for (var i in tmp) {
-		if (typeof params[tmp[i]] == "string") {
-			params[tmp[i]] = document.getElementById(params[tmp[i]]);
-		}
-	}
+ var tmp = ["inputField", "displayArea", "button"];
+ for (var i in tmp) {
+  if (typeof params[tmp[i]] == "string") {
+   params[tmp[i]] = document.getElementById(params[tmp[i]]);
+  }
+ }
 
-	if (!(params.flat || params.multiple || params.inputField || params.displayArea || params.button)) {
-		alert("Calendar.setup:\n  Nothing to setup (no fields found).  Please check your code");
-		return false;
-	}
+ if (!(params.flat || params.multiple || params.inputField || params.displayArea || params.button)) {
+  alert("Calendar.setup:\n  Nothing to setup (no fields found).  Please check your code");
+  return false;
+ }
 
-	function onSelect(cal) {
-		var p = cal.params;
-		var update = (cal.dateClicked || p.electric);
-		if (update && p.inputField) {
-			p.inputField.value = cal.date.print(p.ifFormat);
-			if (typeof p.inputField.onchange == "function")
-				p.inputField.onchange();
-		}
-		if (update && p.displayArea)
-			p.displayArea.innerHTML = cal.date.print(p.daFormat);
-		if (update && typeof p.onUpdate == "function")
-			p.onUpdate(cal);
-		if (update && p.flat) {
-			if (typeof p.flatCallback == "function")
-				p.flatCallback(cal);
-		}
-		if (update && p.singleClick && cal.dateClicked)
-			cal.callCloseHandler();
-	};
+ function onSelect(cal) {
+  var p = cal.params;
+  var update = (cal.dateClicked || p.electric);
+  if (update && p.inputField) {
+   p.inputField.value = cal.date.print(p.ifFormat);
+   if (typeof p.inputField.onchange == "function")
+    p.inputField.onchange();
+  }
+  if (update && p.displayArea)
+   p.displayArea.innerHTML = cal.date.print(p.daFormat);
+  if (update && typeof p.onUpdate == "function")
+   p.onUpdate(cal);
+  if (update && p.flat) {
+   if (typeof p.flatCallback == "function")
+    p.flatCallback(cal);
+  }
+  if (update && p.singleClick && cal.dateClicked)
+   cal.callCloseHandler();
+ };
 
-	if (params.flat != null) {
-		if (typeof params.flat == "string")
-			params.flat = document.getElementById(params.flat);
-		if (!params.flat) {
-			alert("Calendar.setup:\n  Flat specified but can't find parent.");
-			return false;
-		}
-		var cal = new Calendar(params.firstDay, params.date, params.onSelect || onSelect);
-		cal.showsOtherMonths = params.showOthers;
-		cal.showsTime = params.showsTime;
-		cal.time24 = (params.timeFormat == "24");
-		cal.params = params;
-		cal.weekNumbers = params.weekNumbers;
-		cal.setRange(params.range[0], params.range[1]);
-		cal.setDateStatusHandler(params.dateStatusFunc);
-		cal.getDateText = params.dateText;
-		if (params.ifFormat) {
-			cal.setDateFormat(params.ifFormat);
-		}
-		if (params.inputField && typeof params.inputField.value == "string") {
-			cal.parseDate(params.inputField.value);
-		}
-		cal.create(params.flat);
-		cal.show();
-		return false;
-	}
+ if (params.flat != null) {
+  if (typeof params.flat == "string")
+   params.flat = document.getElementById(params.flat);
+  if (!params.flat) {
+   alert("Calendar.setup:\n  Flat specified but can't find parent.");
+   return false;
+  }
+  var cal = new Calendar(params.firstDay, params.date, params.onSelect || onSelect);
+  cal.showsOtherMonths = params.showOthers;
+  cal.showsTime = params.showsTime;
+  cal.time24 = (params.timeFormat == "24");
+  cal.params = params;
+  cal.weekNumbers = params.weekNumbers;
+  cal.setRange(params.range[0], params.range[1]);
+  cal.setDateStatusHandler(params.dateStatusFunc);
+  cal.getDateText = params.dateText;
+  if (params.ifFormat) {
+   cal.setDateFormat(params.ifFormat);
+  }
+  if (params.inputField && typeof params.inputField.value == "string") {
+   cal.parseDate(params.inputField.value);
+  }
+  cal.create(params.flat);
+  cal.show();
+  return false;
+ }
 
-	var triggerEl = params.button || params.displayArea || params.inputField;
-	triggerEl["on" + params.eventName] = function() {
-		var dateEl = params.inputField || params.displayArea;
-		var dateFmt = params.inputField ? params.ifFormat : params.daFormat;
-		var mustCreate = false;
-		var cal = window.calendar;
-		if (dateEl)
-			params.date = Date.parseDate(dateEl.value || dateEl.innerHTML, dateFmt);
-		if (!(cal && params.cache)) {
-			window.calendar = cal = new Calendar(params.firstDay,
-							     params.date,
-							     params.onSelect || onSelect,
-							     params.onClose || function(cal) { cal.hide(); });
-			cal.showsTime = params.showsTime;
-			cal.time24 = (params.timeFormat == "24");
-			cal.weekNumbers = params.weekNumbers;
-			mustCreate = true;
-		} else {
-			if (params.date)
-				cal.setDate(params.date);
-			cal.hide();
-		}
-		if (params.multiple) {
-			cal.multiple = {};
-			for (var i = params.multiple.length; --i >= 0;) {
-				var d = params.multiple[i];
-				var ds = d.print("%Y%m%d");
-				cal.multiple[ds] = d;
-			}
-		}
-		cal.showsOtherMonths = params.showOthers;
-		cal.yearStep = params.step;
-		cal.setRange(params.range[0], params.range[1]);
-		cal.params = params;
-		cal.setDateStatusHandler(params.dateStatusFunc);
-		cal.getDateText = params.dateText;
-		cal.setDateFormat(dateFmt);
-		if (mustCreate)
-			cal.create();
-		cal.refresh();
-		if (!params.position)
-			cal.showAtElement(params.button || params.displayArea || params.inputField, params.align);
-		else
-			cal.showAt(params.position[0], params.position[1]);
-		return false;
-	};
+ var triggerEl = params.button || params.displayArea || params.inputField;
+ triggerEl["on" + params.eventName] = function() {
+  var dateEl = params.inputField || params.displayArea;
+  var dateFmt = params.inputField ? params.ifFormat : params.daFormat;
+  var mustCreate = false;
+  var cal = window.calendar;
+  if (dateEl)
+   params.date = Date.parseDate(dateEl.value || dateEl.innerHTML, dateFmt);
+  if (!(cal && params.cache)) {
+   window.calendar = cal = new Calendar(params.firstDay,
+            params.date,
+            params.onSelect || onSelect,
+            params.onClose || function(cal) { cal.hide(); });
+   cal.showsTime = params.showsTime;
+   cal.time24 = (params.timeFormat == "24");
+   cal.weekNumbers = params.weekNumbers;
+   mustCreate = true;
+  } else {
+   if (params.date)
+    cal.setDate(params.date);
+   cal.hide();
+  }
+  if (params.multiple) {
+   cal.multiple = {};
+   for (var i = params.multiple.length; --i >= 0;) {
+    var d = params.multiple[i];
+    var ds = d.print("%Y%m%d");
+    cal.multiple[ds] = d;
+   }
+  }
+  cal.showsOtherMonths = params.showOthers;
+  cal.yearStep = params.step;
+  cal.setRange(params.range[0], params.range[1]);
+  cal.params = params;
+  cal.setDateStatusHandler(params.dateStatusFunc);
+  cal.getDateText = params.dateText;
+  cal.setDateFormat(dateFmt);
+  if (mustCreate)
+   cal.create();
+  cal.refresh();
+  if (!params.position)
+   cal.showAtElement(params.button || params.displayArea || params.inputField, params.align);
+  else
+   cal.showAt(params.position[0], params.position[1]);
+  return false;
+ };
 
-	return cal;
+ return cal;
 };
diff --git a/Open-ILS/web/opac/common/js/jscalendar/calendar-tas.css b/Open-ILS/web/opac/common/js/jscalendar/calendar-tas.css
index c2f872168c..79effdf3cc 100644
--- a/Open-ILS/web/opac/common/js/jscalendar/calendar-tas.css
+++ b/Open-ILS/web/opac/common/js/jscalendar/calendar-tas.css
@@ -38,7 +38,7 @@ progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr=#ffffff,
 .calendar thead .headrow { /* Row <TR> containing navigation buttons */
   /*background: #3B86A0;*/
   color: #363636;
-  font-weight: bold; 	
+  font-weight: bold;  
 filter:
 progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr=#ffffff,EndColorStr=#3b86a0);
 }
@@ -150,7 +150,7 @@ progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr=#DDDCCC,
   background: #dcb;
   color: #363636;
   font-weight: bold;
-	filter:
+ filter:
 progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr=#FFFFFF,EndColorStr=#DDDCCC);
 }
 .calendar tfoot .hilite { /* Hover style for buttons in footer */
diff --git a/Open-ILS/web/opac/common/js/jscalendar/calendar.js b/Open-ILS/web/opac/common/js/jscalendar/calendar.js
index 28283c2bef..aecdb9ead6 100644
--- a/Open-ILS/web/opac/common/js/jscalendar/calendar.js
+++ b/Open-ILS/web/opac/common/js/jscalendar/calendar.js
@@ -16,66 +16,66 @@
 
 /** The Calendar object constructor. */
 Calendar = function (firstDayOfWeek, dateStr, onSelected, onClose) {
-	// member variables
-	this.activeDiv = null;
-	this.currentDateEl = null;
-	this.getDateStatus = null;
-	this.getDateToolTip = null;
-	this.getDateText = null;
-	this.timeout = null;
-	this.onSelected = onSelected || null;
-	this.onClose = onClose || null;
-	this.dragging = false;
-	this.hidden = false;
-	this.minYear = 1970;
-	this.maxYear = 2050;
-	this.dateFormat = Calendar._TT["DEF_DATE_FORMAT"];
-	this.ttDateFormat = Calendar._TT["TT_DATE_FORMAT"];
-	this.isPopup = true;
-	this.weekNumbers = true;
-	this.firstDayOfWeek = typeof firstDayOfWeek == "number" ? firstDayOfWeek : Calendar._FD; // 0 for Sunday, 1 for Monday, etc.
-	this.showsOtherMonths = false;
-	this.dateStr = dateStr;
-	this.ar_days = null;
-	this.showsTime = false;
-	this.time24 = true;
-	this.yearStep = 2;
-	this.hiliteToday = true;
-	this.multiple = null;
-	// HTML elements
-	this.table = null;
-	this.element = null;
-	this.tbody = null;
-	this.firstdayname = null;
-	// Combo boxes
-	this.monthsCombo = null;
-	this.yearsCombo = null;
-	this.hilitedMonth = null;
-	this.activeMonth = null;
-	this.hilitedYear = null;
-	this.activeYear = null;
-	// Information
-	this.dateClicked = false;
-
-	// one-time initializations
-	if (typeof Calendar._SDN == "undefined") {
-		// table of short day names
-		if (typeof Calendar._SDN_len == "undefined")
-			Calendar._SDN_len = 3;
-		var ar = new Array();
-		for (var i = 8; i > 0;) {
-			ar[--i] = Calendar._DN[i].substr(0, Calendar._SDN_len);
-		}
-		Calendar._SDN = ar;
-		// table of short month names
-		if (typeof Calendar._SMN_len == "undefined")
-			Calendar._SMN_len = 3;
-		ar = new Array();
-		for (var i = 12; i > 0;) {
-			ar[--i] = Calendar._MN[i].substr(0, Calendar._SMN_len);
-		}
-		Calendar._SMN = ar;
-	}
+ // member variables
+ this.activeDiv = null;
+ this.currentDateEl = null;
+ this.getDateStatus = null;
+ this.getDateToolTip = null;
+ this.getDateText = null;
+ this.timeout = null;
+ this.onSelected = onSelected || null;
+ this.onClose = onClose || null;
+ this.dragging = false;
+ this.hidden = false;
+ this.minYear = 1970;
+ this.maxYear = 2050;
+ this.dateFormat = Calendar._TT["DEF_DATE_FORMAT"];
+ this.ttDateFormat = Calendar._TT["TT_DATE_FORMAT"];
+ this.isPopup = true;
+ this.weekNumbers = true;
+ this.firstDayOfWeek = typeof firstDayOfWeek == "number" ? firstDayOfWeek : Calendar._FD; // 0 for Sunday, 1 for Monday, etc.
+ this.showsOtherMonths = false;
+ this.dateStr = dateStr;
+ this.ar_days = null;
+ this.showsTime = false;
+ this.time24 = true;
+ this.yearStep = 2;
+ this.hiliteToday = true;
+ this.multiple = null;
+ // HTML elements
+ this.table = null;
+ this.element = null;
+ this.tbody = null;
+ this.firstdayname = null;
+ // Combo boxes
+ this.monthsCombo = null;
+ this.yearsCombo = null;
+ this.hilitedMonth = null;
+ this.activeMonth = null;
+ this.hilitedYear = null;
+ this.activeYear = null;
+ // Information
+ this.dateClicked = false;
+
+ // one-time initializations
+ if (typeof Calendar._SDN == "undefined") {
+  // table of short day names
+  if (typeof Calendar._SDN_len == "undefined")
+   Calendar._SDN_len = 3;
+  var ar = new Array();
+  for (var i = 8; i > 0;) {
+   ar[--i] = Calendar._DN[i].substr(0, Calendar._SDN_len);
+  }
+  Calendar._SDN = ar;
+  // table of short month names
+  if (typeof Calendar._SMN_len == "undefined")
+   Calendar._SMN_len = 3;
+  ar = new Array();
+  for (var i = 12; i > 0;) {
+   ar[--i] = Calendar._MN[i].substr(0, Calendar._SMN_len);
+  }
+  Calendar._SMN = ar;
+ }
 };
 
 // ** constants
@@ -85,7 +85,7 @@ Calendar._C = null;
 
 /// detect a special case of "web browser"
 Calendar.is_ie = ( /msie/i.test(navigator.userAgent) &&
-		   !/opera/i.test(navigator.userAgent) );
+     !/opera/i.test(navigator.userAgent) );
 
 Calendar.is_ie5 = ( Calendar.is_ie && /msie 5\.0/i.test(navigator.userAgent) );
 
@@ -99,119 +99,119 @@ Calendar.is_khtml = /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
 //        library, at some point.
 
 Calendar.getAbsolutePos = function(el) {
-	var SL = 0, ST = 0;
-	var is_div = /^div$/i.test(el.tagName);
-	if (is_div && el.scrollLeft)
-		SL = el.scrollLeft;
-	if (is_div && el.scrollTop)
-		ST = el.scrollTop;
-	var r = { x: el.offsetLeft - SL, y: el.offsetTop - ST };
-	if (el.offsetParent) {
-		var tmp = this.getAbsolutePos(el.offsetParent);
-		r.x += tmp.x;
-		r.y += tmp.y;
-	}
-	return r;
+ var SL = 0, ST = 0;
+ var is_div = /^div$/i.test(el.tagName);
+ if (is_div && el.scrollLeft)
+  SL = el.scrollLeft;
+ if (is_div && el.scrollTop)
+  ST = el.scrollTop;
+ var r = { x: el.offsetLeft - SL, y: el.offsetTop - ST };
+ if (el.offsetParent) {
+  var tmp = this.getAbsolutePos(el.offsetParent);
+  r.x += tmp.x;
+  r.y += tmp.y;
+ }
+ return r;
 };
 
 Calendar.isRelated = function (el, evt) {
-	var related = evt.relatedTarget;
-	if (!related) {
-		var type = evt.type;
-		if (type == "mouseover") {
-			related = evt.fromElement;
-		} else if (type == "mouseout") {
-			related = evt.toElement;
-		}
-	}
-	while (related) {
-		if (related == el) {
-			return true;
-		}
-		related = related.parentNode;
-	}
-	return false;
+ var related = evt.relatedTarget;
+ if (!related) {
+  var type = evt.type;
+  if (type == "mouseover") {
+   related = evt.fromElement;
+  } else if (type == "mouseout") {
+   related = evt.toElement;
+  }
+ }
+ while (related) {
+  if (related == el) {
+   return true;
+  }
+  related = related.parentNode;
+ }
+ return false;
 };
 
 Calendar.removeClass = function(el, className) {
-	if (!(el && el.className)) {
-		return;
-	}
-	var cls = el.className.split(" ");
-	var ar = new Array();
-	for (var i = cls.length; i > 0;) {
-		if (cls[--i] != className) {
-			ar[ar.length] = cls[i];
-		}
-	}
-	el.className = ar.join(" ");
+ if (!(el && el.className)) {
+  return;
+ }
+ var cls = el.className.split(" ");
+ var ar = new Array();
+ for (var i = cls.length; i > 0;) {
+  if (cls[--i] != className) {
+   ar[ar.length] = cls[i];
+  }
+ }
+ el.className = ar.join(" ");
 };
 
 Calendar.addClass = function(el, className) {
-	Calendar.removeClass(el, className);
-	el.className += " " + className;
+ Calendar.removeClass(el, className);
+ el.className += " " + className;
 };
 
 // FIXME: the following 2 functions totally suck, are useless and should be replaced immediately.
 Calendar.getElement = function(ev) {
-	var f = Calendar.is_ie ? window.event.srcElement : ev.currentTarget;
-	while (f.nodeType != 1 || /^div$/i.test(f.tagName))
-		f = f.parentNode;
-	return f;
+ var f = Calendar.is_ie ? window.event.srcElement : ev.currentTarget;
+ while (f.nodeType != 1 || /^div$/i.test(f.tagName))
+  f = f.parentNode;
+ return f;
 };
 
 Calendar.getTargetElement = function(ev) {
-	var f = Calendar.is_ie ? window.event.srcElement : ev.target;
-	while (f.nodeType != 1)
-		f = f.parentNode;
-	return f;
+ var f = Calendar.is_ie ? window.event.srcElement : ev.target;
+ while (f.nodeType != 1)
+  f = f.parentNode;
+ return f;
 };
 
 Calendar.stopEvent = function(ev) {
-	ev || (ev = window.event);
-	if (Calendar.is_ie) {
-		ev.cancelBubble = true;
-		ev.returnValue = false;
-	} else {
-		ev.preventDefault();
-		ev.stopPropagation();
-	}
-	return false;
+ ev || (ev = window.event);
+ if (Calendar.is_ie) {
+  ev.cancelBubble = true;
+  ev.returnValue = false;
+ } else {
+  ev.preventDefault();
+  ev.stopPropagation();
+ }
+ return false;
 };
 
 Calendar.addEvent = function(el, evname, func) {
-	if (el.attachEvent) { // IE
-		el.attachEvent("on" + evname, func);
-	} else if (el.addEventListener) { // Gecko / W3C
-		el.addEventListener(evname, func, true);
-	} else {
-		el["on" + evname] = func;
-	}
+ if (el.attachEvent) { // IE
+  el.attachEvent("on" + evname, func);
+ } else if (el.addEventListener) { // Gecko / W3C
+  el.addEventListener(evname, func, true);
+ } else {
+  el["on" + evname] = func;
+ }
 };
 
 Calendar.removeEvent = function(el, evname, func) {
-	if (el.detachEvent) { // IE
-		el.detachEvent("on" + evname, func);
-	} else if (el.removeEventListener) { // Gecko / W3C
-		el.removeEventListener(evname, func, true);
-	} else {
-		el["on" + evname] = null;
-	}
+ if (el.detachEvent) { // IE
+  el.detachEvent("on" + evname, func);
+ } else if (el.removeEventListener) { // Gecko / W3C
+  el.removeEventListener(evname, func, true);
+ } else {
+  el["on" + evname] = null;
+ }
 };
 
 Calendar.createElement = function(type, parent) {
-	var el = null;
-	if (document.createElementNS) {
-		// use the XHTML namespace; IE won't normally get here unless
-		// _they_ "fix" the DOM2 implementation.
-		el = document.createElementNS("http://www.w3.org/1999/xhtml", type);
-	} else {
-		el = document.createElement(type);
-	}
-	if (typeof parent != "undefined") {
-		parent.appendChild(el);
-	}
-	return el;
+ var el = null;
+ if (document.createElementNS) {
+  // use the XHTML namespace; IE won't normally get here unless
+  // _they_ "fix" the DOM2 implementation.
+  el = document.createElementNS("http://www.w3.org/1999/xhtml", type);
+ } else {
+  el = document.createElement(type);
+ }
+ if (typeof parent != "undefined") {
+  parent.appendChild(el);
+ }
+ return el;
 };
 
 // END: UTILITY FUNCTIONS
@@ -220,355 +220,355 @@ Calendar.createElement = function(type, parent) {
 
 /** Internal -- adds a set of events to make some element behave like a button. */
 Calendar._add_evs = function(el) {
-	with (Calendar) {
-		addEvent(el, "mouseover", dayMouseOver);
-		addEvent(el, "mousedown", dayMouseDown);
-		addEvent(el, "mouseout", dayMouseOut);
-		if (is_ie) {
-			addEvent(el, "dblclick", dayMouseDblClick);
-			el.setAttribute("unselectable", true);
-		}
-	}
+ with (Calendar) {
+  addEvent(el, "mouseover", dayMouseOver);
+  addEvent(el, "mousedown", dayMouseDown);
+  addEvent(el, "mouseout", dayMouseOut);
+  if (is_ie) {
+   addEvent(el, "dblclick", dayMouseDblClick);
+   el.setAttribute("unselectable", true);
+  }
+ }
 };
 
 Calendar.findMonth = function(el) {
-	if (typeof el.month != "undefined") {
-		return el;
-	} else if (typeof el.parentNode.month != "undefined") {
-		return el.parentNode;
-	}
-	return null;
+ if (typeof el.month != "undefined") {
+  return el;
+ } else if (typeof el.parentNode.month != "undefined") {
+  return el.parentNode;
+ }
+ return null;
 };
 
 Calendar.findYear = function(el) {
-	if (typeof el.year != "undefined") {
-		return el;
-	} else if (typeof el.parentNode.year != "undefined") {
-		return el.parentNode;
-	}
-	return null;
+ if (typeof el.year != "undefined") {
+  return el;
+ } else if (typeof el.parentNode.year != "undefined") {
+  return el.parentNode;
+ }
+ return null;
 };
 
 Calendar.showMonthsCombo = function () {
-	var cal = Calendar._C;
-	if (!cal) {
-		return false;
-	}
-	var cal = cal;
-	var cd = cal.activeDiv;
-	var mc = cal.monthsCombo;
-	if (cal.hilitedMonth) {
-		Calendar.removeClass(cal.hilitedMonth, "hilite");
-	}
-	if (cal.activeMonth) {
-		Calendar.removeClass(cal.activeMonth, "active");
-	}
-	var mon = cal.monthsCombo.getElementsByTagName("div")[cal.date.getMonth()];
-	Calendar.addClass(mon, "active");
-	cal.activeMonth = mon;
-	var s = mc.style;
-	s.display = "block";
-	if (cd.navtype < 0)
-		s.left = cd.offsetLeft + "px";
-	else {
-		var mcw = mc.offsetWidth;
-		if (typeof mcw == "undefined")
-			// Konqueror brain-dead techniques
-			mcw = 50;
-		s.left = (cd.offsetLeft + cd.offsetWidth - mcw) + "px";
-	}
-	s.top = (cd.offsetTop + cd.offsetHeight) + "px";
+ var cal = Calendar._C;
+ if (!cal) {
+  return false;
+ }
+ var cal = cal;
+ var cd = cal.activeDiv;
+ var mc = cal.monthsCombo;
+ if (cal.hilitedMonth) {
+  Calendar.removeClass(cal.hilitedMonth, "hilite");
+ }
+ if (cal.activeMonth) {
+  Calendar.removeClass(cal.activeMonth, "active");
+ }
+ var mon = cal.monthsCombo.getElementsByTagName("div")[cal.date.getMonth()];
+ Calendar.addClass(mon, "active");
+ cal.activeMonth = mon;
+ var s = mc.style;
+ s.display = "block";
+ if (cd.navtype < 0)
+  s.left = cd.offsetLeft + "px";
+ else {
+  var mcw = mc.offsetWidth;
+  if (typeof mcw == "undefined")
+   // Konqueror brain-dead techniques
+   mcw = 50;
+  s.left = (cd.offsetLeft + cd.offsetWidth - mcw) + "px";
+ }
+ s.top = (cd.offsetTop + cd.offsetHeight) + "px";
 };
 
 Calendar.showYearsCombo = function (fwd) {
-	var cal = Calendar._C;
-	if (!cal) {
-		return false;
-	}
-	var cal = cal;
-	var cd = cal.activeDiv;
-	var yc = cal.yearsCombo;
-	if (cal.hilitedYear) {
-		Calendar.removeClass(cal.hilitedYear, "hilite");
-	}
-	if (cal.activeYear) {
-		Calendar.removeClass(cal.activeYear, "active");
-	}
-	cal.activeYear = null;
-	var Y = cal.date.getFullYear() + (fwd ? 1 : -1);
-	var yr = yc.firstChild;
-	var show = false;
-	for (var i = 12; i > 0; --i) {
-		if (Y >= cal.minYear && Y <= cal.maxYear) {
-			yr.innerHTML = Y;
-			yr.year = Y;
-			yr.style.display = "block";
-			show = true;
-		} else {
-			yr.style.display = "none";
-		}
-		yr = yr.nextSibling;
-		Y += fwd ? cal.yearStep : -cal.yearStep;
-	}
-	if (show) {
-		var s = yc.style;
-		s.display = "block";
-		if (cd.navtype < 0)
-			s.left = cd.offsetLeft + "px";
-		else {
-			var ycw = yc.offsetWidth;
-			if (typeof ycw == "undefined")
-				// Konqueror brain-dead techniques
-				ycw = 50;
-			s.left = (cd.offsetLeft + cd.offsetWidth - ycw) + "px";
-		}
-		s.top = (cd.offsetTop + cd.offsetHeight) + "px";
-	}
+ var cal = Calendar._C;
+ if (!cal) {
+  return false;
+ }
+ var cal = cal;
+ var cd = cal.activeDiv;
+ var yc = cal.yearsCombo;
+ if (cal.hilitedYear) {
+  Calendar.removeClass(cal.hilitedYear, "hilite");
+ }
+ if (cal.activeYear) {
+  Calendar.removeClass(cal.activeYear, "active");
+ }
+ cal.activeYear = null;
+ var Y = cal.date.getFullYear() + (fwd ? 1 : -1);
+ var yr = yc.firstChild;
+ var show = false;
+ for (var i = 12; i > 0; --i) {
+  if (Y >= cal.minYear && Y <= cal.maxYear) {
+   yr.innerHTML = Y;
+   yr.year = Y;
+   yr.style.display = "block";
+   show = true;
+  } else {
+   yr.style.display = "none";
+  }
+  yr = yr.nextSibling;
+  Y += fwd ? cal.yearStep : -cal.yearStep;
+ }
+ if (show) {
+  var s = yc.style;
+  s.display = "block";
+  if (cd.navtype < 0)
+   s.left = cd.offsetLeft + "px";
+  else {
+   var ycw = yc.offsetWidth;
+   if (typeof ycw == "undefined")
+    // Konqueror brain-dead techniques
+    ycw = 50;
+   s.left = (cd.offsetLeft + cd.offsetWidth - ycw) + "px";
+  }
+  s.top = (cd.offsetTop + cd.offsetHeight) + "px";
+ }
 };
 
 // event handlers
 
 Calendar.tableMouseUp = function(ev) {
-	var cal = Calendar._C;
-	if (!cal) {
-		return false;
-	}
-	if (cal.timeout) {
-		clearTimeout(cal.timeout);
-	}
-	var el = cal.activeDiv;
-	if (!el) {
-		return false;
-	}
-	var target = Calendar.getTargetElement(ev);
-	ev || (ev = window.event);
-	Calendar.removeClass(el, "active");
-	if (target == el || target.parentNode == el) {
-		Calendar.cellClick(el, ev);
-	}
-	var mon = Calendar.findMonth(target);
-	var date = null;
-	if (mon) {
-		date = new Date(cal.date);
-		if (mon.month != date.getMonth()) {
-			date.setMonth(mon.month);
-			cal.setDate(date);
-			cal.dateClicked = false;
-			cal.callHandler();
-		}
-	} else {
-		var year = Calendar.findYear(target);
-		if (year) {
-			date = new Date(cal.date);
-			if (year.year != date.getFullYear()) {
-				date.setFullYear(year.year);
-				cal.setDate(date);
-				cal.dateClicked = false;
-				cal.callHandler();
-			}
-		}
-	}
-	with (Calendar) {
-		removeEvent(document, "mouseup", tableMouseUp);
-		removeEvent(document, "mouseover", tableMouseOver);
-		removeEvent(document, "mousemove", tableMouseOver);
-		cal._hideCombos();
-		_C = null;
-		return stopEvent(ev);
-	}
+ var cal = Calendar._C;
+ if (!cal) {
+  return false;
+ }
+ if (cal.timeout) {
+  clearTimeout(cal.timeout);
+ }
+ var el = cal.activeDiv;
+ if (!el) {
+  return false;
+ }
+ var target = Calendar.getTargetElement(ev);
+ ev || (ev = window.event);
+ Calendar.removeClass(el, "active");
+ if (target == el || target.parentNode == el) {
+  Calendar.cellClick(el, ev);
+ }
+ var mon = Calendar.findMonth(target);
+ var date = null;
+ if (mon) {
+  date = new Date(cal.date);
+  if (mon.month != date.getMonth()) {
+   date.setMonth(mon.month);
+   cal.setDate(date);
+   cal.dateClicked = false;
+   cal.callHandler();
+  }
+ } else {
+  var year = Calendar.findYear(target);
+  if (year) {
+   date = new Date(cal.date);
+   if (year.year != date.getFullYear()) {
+    date.setFullYear(year.year);
+    cal.setDate(date);
+    cal.dateClicked = false;
+    cal.callHandler();
+   }
+  }
+ }
+ with (Calendar) {
+  removeEvent(document, "mouseup", tableMouseUp);
+  removeEvent(document, "mouseover", tableMouseOver);
+  removeEvent(document, "mousemove", tableMouseOver);
+  cal._hideCombos();
+  _C = null;
+  return stopEvent(ev);
+ }
 };
 
 Calendar.tableMouseOver = function (ev) {
-	var cal = Calendar._C;
-	if (!cal) {
-		return;
-	}
-	var el = cal.activeDiv;
-	var target = Calendar.getTargetElement(ev);
-	if (target == el || target.parentNode == el) {
-		Calendar.addClass(el, "hilite active");
-		Calendar.addClass(el.parentNode, "rowhilite");
-	} else {
-		if (typeof el.navtype == "undefined" || (el.navtype != 50 && (el.navtype == 0 || Math.abs(el.navtype) > 2)))
-			Calendar.removeClass(el, "active");
-		Calendar.removeClass(el, "hilite");
-		Calendar.removeClass(el.parentNode, "rowhilite");
-	}
-	ev || (ev = window.event);
-	if (el.navtype == 50 && target != el) {
-		var pos = Calendar.getAbsolutePos(el);
-		var w = el.offsetWidth;
-		var x = ev.clientX;
-		var dx;
-		var decrease = true;
-		if (x > pos.x + w) {
-			dx = x - pos.x - w;
-			decrease = false;
-		} else
-			dx = pos.x - x;
-
-		if (dx < 0) dx = 0;
-		var range = el._range;
-		var current = el._current;
-		var count = Math.floor(dx / 10) % range.length;
-		for (var i = range.length; --i >= 0;)
-			if (range[i] == current)
-				break;
-		while (count-- > 0)
-			if (decrease) {
-				if (--i < 0)
-					i = range.length - 1;
-			} else if ( ++i >= range.length )
-				i = 0;
-		var newval = range[i];
-		el.innerHTML = newval;
-
-		cal.onUpdateTime();
-	}
-	var mon = Calendar.findMonth(target);
-	if (mon) {
-		if (mon.month != cal.date.getMonth()) {
-			if (cal.hilitedMonth) {
-				Calendar.removeClass(cal.hilitedMonth, "hilite");
-			}
-			Calendar.addClass(mon, "hilite");
-			cal.hilitedMonth = mon;
-		} else if (cal.hilitedMonth) {
-			Calendar.removeClass(cal.hilitedMonth, "hilite");
-		}
-	} else {
-		if (cal.hilitedMonth) {
-			Calendar.removeClass(cal.hilitedMonth, "hilite");
-		}
-		var year = Calendar.findYear(target);
-		if (year) {
-			if (year.year != cal.date.getFullYear()) {
-				if (cal.hilitedYear) {
-					Calendar.removeClass(cal.hilitedYear, "hilite");
-				}
-				Calendar.addClass(year, "hilite");
-				cal.hilitedYear = year;
-			} else if (cal.hilitedYear) {
-				Calendar.removeClass(cal.hilitedYear, "hilite");
-			}
-		} else if (cal.hilitedYear) {
-			Calendar.removeClass(cal.hilitedYear, "hilite");
-		}
-	}
-	return Calendar.stopEvent(ev);
+ var cal = Calendar._C;
+ if (!cal) {
+  return;
+ }
+ var el = cal.activeDiv;
+ var target = Calendar.getTargetElement(ev);
+ if (target == el || target.parentNode == el) {
+  Calendar.addClass(el, "hilite active");
+  Calendar.addClass(el.parentNode, "rowhilite");
+ } else {
+  if (typeof el.navtype == "undefined" || (el.navtype != 50 && (el.navtype == 0 || Math.abs(el.navtype) > 2)))
+   Calendar.removeClass(el, "active");
+  Calendar.removeClass(el, "hilite");
+  Calendar.removeClass(el.parentNode, "rowhilite");
+ }
+ ev || (ev = window.event);
+ if (el.navtype == 50 && target != el) {
+  var pos = Calendar.getAbsolutePos(el);
+  var w = el.offsetWidth;
+  var x = ev.clientX;
+  var dx;
+  var decrease = true;
+  if (x > pos.x + w) {
+   dx = x - pos.x - w;
+   decrease = false;
+  } else
+   dx = pos.x - x;
+
+  if (dx < 0) dx = 0;
+  var range = el._range;
+  var current = el._current;
+  var count = Math.floor(dx / 10) % range.length;
+  for (var i = range.length; --i >= 0;)
+   if (range[i] == current)
+    break;
+  while (count-- > 0)
+   if (decrease) {
+    if (--i < 0)
+     i = range.length - 1;
+   } else if ( ++i >= range.length )
+    i = 0;
+  var newval = range[i];
+  el.innerHTML = newval;
+
+  cal.onUpdateTime();
+ }
+ var mon = Calendar.findMonth(target);
+ if (mon) {
+  if (mon.month != cal.date.getMonth()) {
+   if (cal.hilitedMonth) {
+    Calendar.removeClass(cal.hilitedMonth, "hilite");
+   }
+   Calendar.addClass(mon, "hilite");
+   cal.hilitedMonth = mon;
+  } else if (cal.hilitedMonth) {
+   Calendar.removeClass(cal.hilitedMonth, "hilite");
+  }
+ } else {
+  if (cal.hilitedMonth) {
+   Calendar.removeClass(cal.hilitedMonth, "hilite");
+  }
+  var year = Calendar.findYear(target);
+  if (year) {
+   if (year.year != cal.date.getFullYear()) {
+    if (cal.hilitedYear) {
+     Calendar.removeClass(cal.hilitedYear, "hilite");
+    }
+    Calendar.addClass(year, "hilite");
+    cal.hilitedYear = year;
+   } else if (cal.hilitedYear) {
+    Calendar.removeClass(cal.hilitedYear, "hilite");
+   }
+  } else if (cal.hilitedYear) {
+   Calendar.removeClass(cal.hilitedYear, "hilite");
+  }
+ }
+ return Calendar.stopEvent(ev);
 };
 
 Calendar.tableMouseDown = function (ev) {
-	if (Calendar.getTargetElement(ev) == Calendar.getElement(ev)) {
-		return Calendar.stopEvent(ev);
-	}
+ if (Calendar.getTargetElement(ev) == Calendar.getElement(ev)) {
+  return Calendar.stopEvent(ev);
+ }
 };
 
 Calendar.calDragIt = function (ev) {
-	var cal = Calendar._C;
-	if (!(cal && cal.dragging)) {
-		return false;
-	}
-	var posX;
-	var posY;
-	if (Calendar.is_ie) {
-		posY = window.event.clientY + document.body.scrollTop;
-		posX = window.event.clientX + document.body.scrollLeft;
-	} else {
-		posX = ev.pageX;
-		posY = ev.pageY;
-	}
-	cal.hideShowCovered();
-	var st = cal.element.style;
-	st.left = (posX - cal.xOffs) + "px";
-	st.top = (posY - cal.yOffs) + "px";
-	return Calendar.stopEvent(ev);
+ var cal = Calendar._C;
+ if (!(cal && cal.dragging)) {
+  return false;
+ }
+ var posX;
+ var posY;
+ if (Calendar.is_ie) {
+  posY = window.event.clientY + document.body.scrollTop;
+  posX = window.event.clientX + document.body.scrollLeft;
+ } else {
+  posX = ev.pageX;
+  posY = ev.pageY;
+ }
+ cal.hideShowCovered();
+ var st = cal.element.style;
+ st.left = (posX - cal.xOffs) + "px";
+ st.top = (posY - cal.yOffs) + "px";
+ return Calendar.stopEvent(ev);
 };
 
 Calendar.calDragEnd = function (ev) {
-	var cal = Calendar._C;
-	if (!cal) {
-		return false;
-	}
-	cal.dragging = false;
-	with (Calendar) {
-		removeEvent(document, "mousemove", calDragIt);
-		removeEvent(document, "mouseup", calDragEnd);
-		tableMouseUp(ev);
-	}
-	cal.hideShowCovered();
+ var cal = Calendar._C;
+ if (!cal) {
+  return false;
+ }
+ cal.dragging = false;
+ with (Calendar) {
+  removeEvent(document, "mousemove", calDragIt);
+  removeEvent(document, "mouseup", calDragEnd);
+  tableMouseUp(ev);
+ }
+ cal.hideShowCovered();
 };
 
 Calendar.dayMouseDown = function(ev) {
-	var el = Calendar.getElement(ev);
-	if (el.disabled) {
-		return false;
-	}
-	var cal = el.calendar;
-	cal.activeDiv = el;
-	Calendar._C = cal;
-	if (el.navtype != 300) with (Calendar) {
-		if (el.navtype == 50) {
-			el._current = el.innerHTML;
-			addEvent(document, "mousemove", tableMouseOver);
-		} else
-			addEvent(document, Calendar.is_ie5 ? "mousemove" : "mouseover", tableMouseOver);
-		addClass(el, "hilite active");
-		addEvent(document, "mouseup", tableMouseUp);
-	} else if (cal.isPopup) {
-		cal._dragStart(ev);
-	}
-	if (el.navtype == -1 || el.navtype == 1) {
-		if (cal.timeout) clearTimeout(cal.timeout);
-		cal.timeout = setTimeout("Calendar.showMonthsCombo()", 250);
-	} else if (el.navtype == -2 || el.navtype == 2) {
-		if (cal.timeout) clearTimeout(cal.timeout);
-		cal.timeout = setTimeout((el.navtype > 0) ? "Calendar.showYearsCombo(true)" : "Calendar.showYearsCombo(false)", 250);
-	} else {
-		cal.timeout = null;
-	}
-	return Calendar.stopEvent(ev);
+ var el = Calendar.getElement(ev);
+ if (el.disabled) {
+  return false;
+ }
+ var cal = el.calendar;
+ cal.activeDiv = el;
+ Calendar._C = cal;
+ if (el.navtype != 300) with (Calendar) {
+  if (el.navtype == 50) {
+   el._current = el.innerHTML;
+   addEvent(document, "mousemove", tableMouseOver);
+  } else
+   addEvent(document, Calendar.is_ie5 ? "mousemove" : "mouseover", tableMouseOver);
+  addClass(el, "hilite active");
+  addEvent(document, "mouseup", tableMouseUp);
+ } else if (cal.isPopup) {
+  cal._dragStart(ev);
+ }
+ if (el.navtype == -1 || el.navtype == 1) {
+  if (cal.timeout) clearTimeout(cal.timeout);
+  cal.timeout = setTimeout("Calendar.showMonthsCombo()", 250);
+ } else if (el.navtype == -2 || el.navtype == 2) {
+  if (cal.timeout) clearTimeout(cal.timeout);
+  cal.timeout = setTimeout((el.navtype > 0) ? "Calendar.showYearsCombo(true)" : "Calendar.showYearsCombo(false)", 250);
+ } else {
+  cal.timeout = null;
+ }
+ return Calendar.stopEvent(ev);
 };
 
 Calendar.dayMouseDblClick = function(ev) {
-	Calendar.cellClick(Calendar.getElement(ev), ev || window.event);
-	if (Calendar.is_ie) {
-		document.selection.empty();
-	}
+ Calendar.cellClick(Calendar.getElement(ev), ev || window.event);
+ if (Calendar.is_ie) {
+  document.selection.empty();
+ }
 };
 
 Calendar.dayMouseOver = function(ev) {
-	var el = Calendar.getElement(ev);
-	if (Calendar.isRelated(el, ev) || Calendar._C || el.disabled) {
-		return false;
-	}
-	if (el.ttip) {
-		if (el.ttip.substr(0, 1) == "_") {
-			el.ttip = el.caldate.print(el.calendar.ttDateFormat) + el.ttip.substr(1);
-		}
-		el.calendar.tooltips.innerHTML = el.ttip;
-	}
-	if (el.navtype != 300) {
-		Calendar.addClass(el, "hilite");
-		if (el.caldate) {
-			Calendar.addClass(el.parentNode, "rowhilite");
-		}
-	}
-	return Calendar.stopEvent(ev);
+ var el = Calendar.getElement(ev);
+ if (Calendar.isRelated(el, ev) || Calendar._C || el.disabled) {
+  return false;
+ }
+ if (el.ttip) {
+  if (el.ttip.substr(0, 1) == "_") {
+   el.ttip = el.caldate.print(el.calendar.ttDateFormat) + el.ttip.substr(1);
+  }
+  el.calendar.tooltips.innerHTML = el.ttip;
+ }
+ if (el.navtype != 300) {
+  Calendar.addClass(el, "hilite");
+  if (el.caldate) {
+   Calendar.addClass(el.parentNode, "rowhilite");
+  }
+ }
+ return Calendar.stopEvent(ev);
 };
 
 Calendar.dayMouseOut = function(ev) {
-	with (Calendar) {
-		var el = getElement(ev);
-		if (isRelated(el, ev) || _C || el.disabled)
-			return false;
-		removeClass(el, "hilite");
-		if (el.caldate)
-			removeClass(el.parentNode, "rowhilite");
-		if (el.calendar)
-			el.calendar.tooltips.innerHTML = _TT["SEL_DATE"];
-		return stopEvent(ev);
-	}
+ with (Calendar) {
+  var el = getElement(ev);
+  if (isRelated(el, ev) || _C || el.disabled)
+   return false;
+  removeClass(el, "hilite");
+  if (el.caldate)
+   removeClass(el.parentNode, "rowhilite");
+  if (el.calendar)
+   el.calendar.tooltips.innerHTML = _TT["SEL_DATE"];
+  return stopEvent(ev);
+ }
 };
 
 /**
@@ -576,135 +576,135 @@ Calendar.dayMouseOut = function(ev) {
  *  calendar.
  */
 Calendar.cellClick = function(el, ev) {
-	var cal = el.calendar;
-	var closing = false;
-	var newdate = false;
-	var date = null;
-	if (typeof el.navtype == "undefined") {
-		if (cal.currentDateEl) {
-			Calendar.removeClass(cal.currentDateEl, "selected");
-			Calendar.addClass(el, "selected");
-			closing = (cal.currentDateEl == el);
-			if (!closing) {
-				cal.currentDateEl = el;
-			}
-		}
-		cal.date.setDateOnly(el.caldate);
-		date = cal.date;
-		var other_month = !(cal.dateClicked = !el.otherMonth);
-		if (!other_month && !cal.currentDateEl)
-			cal._toggleMultipleDate(new Date(date));
-		else
-			newdate = !el.disabled;
-		// a date was clicked
-		if (other_month)
-			cal._init(cal.firstDayOfWeek, date);
-	} else {
-		if (el.navtype == 200) {
-			Calendar.removeClass(el, "hilite");
-			cal.callCloseHandler();
-			return;
-		}
-		date = new Date(cal.date);
-		if (el.navtype == 0)
-			date.setDateOnly(new Date()); // TODAY
-		// unless "today" was clicked, we assume no date was clicked so
-		// the selected handler will know not to close the calenar when
-		// in single-click mode.
-		// cal.dateClicked = (el.navtype == 0);
-		cal.dateClicked = false;
-		var year = date.getFullYear();
-		var mon = date.getMonth();
-		function setMonth(m) {
-			var day = date.getDate();
-			var max = date.getMonthDays(m);
-			if (day > max) {
-				date.setDate(max);
-			}
-			date.setMonth(m);
-		};
-		switch (el.navtype) {
-		    case 400:
-			Calendar.removeClass(el, "hilite");
-			var text = Calendar._TT["ABOUT"];
-			if (typeof text != "undefined") {
-				text += cal.showsTime ? Calendar._TT["ABOUT_TIME"] : "";
-			} else {
-				// FIXME: this should be removed as soon as lang files get updated!
-				text = "Help and about box text is not translated into this language.\n" +
-					"If you know this language and you feel generous please update\n" +
-					"the corresponding file in \"lang\" subdir to match calendar-en.js\n" +
-					"and send it back to <mihai_bazon@yahoo.com> to get it into the distribution  ;-)\n\n" +
-					"Thank you!\n" +
-					"http://dynarch.com/mishoo/calendar.epl\n";
-			}
-			alert(text);
-			return;
-		    case -2:
-			if (year > cal.minYear) {
-				date.setFullYear(year - 1);
-			}
-			break;
-		    case -1:
-			if (mon > 0) {
-				setMonth(mon - 1);
-			} else if (year-- > cal.minYear) {
-				date.setFullYear(year);
-				setMonth(11);
-			}
-			break;
-		    case 1:
-			if (mon < 11) {
-				setMonth(mon + 1);
-			} else if (year < cal.maxYear) {
-				date.setFullYear(year + 1);
-				setMonth(0);
-			}
-			break;
-		    case 2:
-			if (year < cal.maxYear) {
-				date.setFullYear(year + 1);
-			}
-			break;
-		    case 100:
-			cal.setFirstDayOfWeek(el.fdow);
-			return;
-		    case 50:
-			var range = el._range;
-			var current = el.innerHTML;
-			for (var i = range.length; --i >= 0;)
-				if (range[i] == current)
-					break;
-			if (ev && ev.shiftKey) {
-				if (--i < 0)
-					i = range.length - 1;
-			} else if ( ++i >= range.length )
-				i = 0;
-			var newval = range[i];
-			el.innerHTML = newval;
-			cal.onUpdateTime();
-			return;
-		    case 0:
-			// TODAY will bring us here
-			if ((typeof cal.getDateStatus == "function") &&
-			    cal.getDateStatus(date, date.getFullYear(), date.getMonth(), date.getDate())) {
-				return false;
-			}
-			break;
-		}
-		if (!date.equalsTo(cal.date)) {
-			cal.setDate(date);
-			newdate = true;
-		} else if (el.navtype == 0)
-			newdate = closing = true;
-	}
-	if (newdate) {
-		ev && cal.callHandler();
-	}
-	if (closing) {
-		Calendar.removeClass(el, "hilite");
-		ev && cal.callCloseHandler();
-	}
+ var cal = el.calendar;
+ var closing = false;
+ var newdate = false;
+ var date = null;
+ if (typeof el.navtype == "undefined") {
+  if (cal.currentDateEl) {
+   Calendar.removeClass(cal.currentDateEl, "selected");
+   Calendar.addClass(el, "selected");
+   closing = (cal.currentDateEl == el);
+   if (!closing) {
+    cal.currentDateEl = el;
+   }
+  }
+  cal.date.setDateOnly(el.caldate);
+  date = cal.date;
+  var other_month = !(cal.dateClicked = !el.otherMonth);
+  if (!other_month && !cal.currentDateEl)
+   cal._toggleMultipleDate(new Date(date));
+  else
+   newdate = !el.disabled;
+  // a date was clicked
+  if (other_month)
+   cal._init(cal.firstDayOfWeek, date);
+ } else {
+  if (el.navtype == 200) {
+   Calendar.removeClass(el, "hilite");
+   cal.callCloseHandler();
+   return;
+  }
+  date = new Date(cal.date);
+  if (el.navtype == 0)
+   date.setDateOnly(new Date()); // TODAY
+  // unless "today" was clicked, we assume no date was clicked so
+  // the selected handler will know not to close the calenar when
+  // in single-click mode.
+  // cal.dateClicked = (el.navtype == 0);
+  cal.dateClicked = false;
+  var year = date.getFullYear();
+  var mon = date.getMonth();
+  function setMonth(m) {
+   var day = date.getDate();
+   var max = date.getMonthDays(m);
+   if (day > max) {
+    date.setDate(max);
+   }
+   date.setMonth(m);
+  };
+  switch (el.navtype) {
+      case 400:
+   Calendar.removeClass(el, "hilite");
+   var text = Calendar._TT["ABOUT"];
+   if (typeof text != "undefined") {
+    text += cal.showsTime ? Calendar._TT["ABOUT_TIME"] : "";
+   } else {
+    // FIXME: this should be removed as soon as lang files get updated!
+    text = "Help and about box text is not translated into this language.\n" +
+     "If you know this language and you feel generous please update\n" +
+     "the corresponding file in \"lang\" subdir to match calendar-en.js\n" +
+     "and send it back to <mihai_bazon@yahoo.com> to get it into the distribution  ;-)\n\n" +
+     "Thank you!\n" +
+     "http://dynarch.com/mishoo/calendar.epl\n";
+   }
+   alert(text);
+   return;
+      case -2:
+   if (year > cal.minYear) {
+    date.setFullYear(year - 1);
+   }
+   break;
+      case -1:
+   if (mon > 0) {
+    setMonth(mon - 1);
+   } else if (year-- > cal.minYear) {
+    date.setFullYear(year);
+    setMonth(11);
+   }
+   break;
+      case 1:
+   if (mon < 11) {
+    setMonth(mon + 1);
+   } else if (year < cal.maxYear) {
+    date.setFullYear(year + 1);
+    setMonth(0);
+   }
+   break;
+      case 2:
+   if (year < cal.maxYear) {
+    date.setFullYear(year + 1);
+   }
+   break;
+      case 100:
+   cal.setFirstDayOfWeek(el.fdow);
+   return;
+      case 50:
+   var range = el._range;
+   var current = el.innerHTML;
+   for (var i = range.length; --i >= 0;)
+    if (range[i] == current)
+     break;
+   if (ev && ev.shiftKey) {
+    if (--i < 0)
+     i = range.length - 1;
+   } else if ( ++i >= range.length )
+    i = 0;
+   var newval = range[i];
+   el.innerHTML = newval;
+   cal.onUpdateTime();
+   return;
+      case 0:
+   // TODAY will bring us here
+   if ((typeof cal.getDateStatus == "function") &&
+       cal.getDateStatus(date, date.getFullYear(), date.getMonth(), date.getDate())) {
+    return false;
+   }
+   break;
+  }
+  if (!date.equalsTo(cal.date)) {
+   cal.setDate(date);
+   newdate = true;
+  } else if (el.navtype == 0)
+   newdate = closing = true;
+ }
+ if (newdate) {
+  ev && cal.callHandler();
+ }
+ if (closing) {
+  Calendar.removeClass(el, "hilite");
+  ev && cal.callCloseHandler();
+ }
 };
 
 // END: CALENDAR STATIC FUNCTIONS
@@ -718,512 +718,512 @@ Calendar.cellClick = function(el, ev) {
  *  hidden).  Some properties need to be set before calling this function.
  */
 Calendar.prototype.create = function (_par) {
-	var parent = null;
-	if (! _par) {
-		// default parent is the document body, in which case we create
-		// a popup calendar.
-		parent = document.getElementsByTagName("body")[0];
-		this.isPopup = true;
-	} else {
-		parent = _par;
-		this.isPopup = false;
-	}
-	this.date = this.dateStr ? new Date(this.dateStr) : new Date();
-
-	var table = Calendar.createElement("table");
-	this.table = table;
-	table.cellSpacing = 0;
-	table.cellPadding = 0;
-	table.calendar = this;
-	Calendar.addEvent(table, "mousedown", Calendar.tableMouseDown);
-
-	var div = Calendar.createElement("div");
-	this.element = div;
-	div.className = "calendar";
-	if (this.isPopup) {
-		div.style.position = "absolute";
-		div.style.display = "none";
-	}
-	div.appendChild(table);
-
-	var thead = Calendar.createElement("thead", table);
-	var cell = null;
-	var row = null;
-
-	var cal = this;
-	var hh = function (text, cs, navtype) {
-		cell = Calendar.createElement("td", row);
-		cell.colSpan = cs;
-		cell.className = "button";
-		if (navtype != 0 && Math.abs(navtype) <= 2)
-			cell.className += " nav";
-		Calendar._add_evs(cell);
-		cell.calendar = cal;
-		cell.navtype = navtype;
-		cell.innerHTML = "<div unselectable='on'>" + text + "</div>";
-		return cell;
-	};
-
-	row = Calendar.createElement("tr", thead);
-	var title_length = 6;
-	(this.isPopup) && --title_length;
-	(this.weekNumbers) && ++title_length;
-
-	hh("?", 1, 400).ttip = Calendar._TT["INFO"];
-	this.title = hh("", title_length, 300);
-	this.title.className = "title";
-	if (this.isPopup) {
-		this.title.ttip = Calendar._TT["DRAG_TO_MOVE"];
-		this.title.style.cursor = "move";
-		hh("&#x00d7;", 1, 200).ttip = Calendar._TT["CLOSE"];
-	}
-
-	row = Calendar.createElement("tr", thead);
-	row.className = "headrow";
-
-	this._nav_py = hh("&#x00ab;", 1, -2);
-	this._nav_py.ttip = Calendar._TT["PREV_YEAR"];
-
-	this._nav_pm = hh("&#x2039;", 1, -1);
-	this._nav_pm.ttip = Calendar._TT["PREV_MONTH"];
-
-	this._nav_now = hh(Calendar._TT["TODAY"], this.weekNumbers ? 4 : 3, 0);
-	this._nav_now.ttip = Calendar._TT["GO_TODAY"];
-
-	this._nav_nm = hh("&#x203a;", 1, 1);
-	this._nav_nm.ttip = Calendar._TT["NEXT_MONTH"];
-
-	this._nav_ny = hh("&#x00bb;", 1, 2);
-	this._nav_ny.ttip = Calendar._TT["NEXT_YEAR"];
-
-	// day names
-	row = Calendar.createElement("tr", thead);
-	row.className = "daynames";
-	if (this.weekNumbers) {
-		cell = Calendar.createElement("td", row);
-		cell.className = "name wn";
-		cell.innerHTML = Calendar._TT["WK"];
-	}
-	for (var i = 7; i > 0; --i) {
-		cell = Calendar.createElement("td", row);
-		if (!i) {
-			cell.navtype = 100;
-			cell.calendar = this;
-			Calendar._add_evs(cell);
-		}
-	}
-	this.firstdayname = (this.weekNumbers) ? row.firstChild.nextSibling : row.firstChild;
-	this._displayWeekdays();
-
-	var tbody = Calendar.createElement("tbody", table);
-	this.tbody = tbody;
-
-	for (i = 6; i > 0; --i) {
-		row = Calendar.createElement("tr", tbody);
-		if (this.weekNumbers) {
-			cell = Calendar.createElement("td", row);
-		}
-		for (var j = 7; j > 0; --j) {
-			cell = Calendar.createElement("td", row);
-			cell.calendar = this;
-			Calendar._add_evs(cell);
-		}
-	}
-
-	if (this.showsTime) {
-		row = Calendar.createElement("tr", tbody);
-		row.className = "time";
-
-		cell = Calendar.createElement("td", row);
-		cell.className = "time";
-		cell.colSpan = 2;
-		cell.innerHTML = Calendar._TT["TIME"] || " ";
-
-		cell = Calendar.createElement("td", row);
-		cell.className = "time";
-		cell.colSpan = this.weekNumbers ? 4 : 3;
-
-		(function(){
-			function makeTimePart(className, init, range_start, range_end) {
-				var part = Calendar.createElement("span", cell);
-				part.className = className;
-				part.innerHTML = init;
-				part.calendar = cal;
-				part.ttip = Calendar._TT["TIME_PART"];
-				part.navtype = 50;
-				part._range = [];
-				if (typeof range_start != "number")
-					part._range = range_start;
-				else {
-					for (var i = range_start; i <= range_end; ++i) {
-						var txt;
-						if (i < 10 && range_end >= 10) txt = '0' + i;
-						else txt = '' + i;
-						part._range[part._range.length] = txt;
-					}
-				}
-				Calendar._add_evs(part);
-				return part;
-			};
-			var hrs = cal.date.getHours();
-			var mins = cal.date.getMinutes();
-			var t12 = !cal.time24;
-			var pm = (hrs > 12);
-			if (t12 && pm) hrs -= 12;
-			var H = makeTimePart("hour", hrs, t12 ? 1 : 0, t12 ? 12 : 23);
-			var span = Calendar.createElement("span", cell);
-			span.innerHTML = ":";
-			span.className = "colon";
-			var M = makeTimePart("minute", mins, 0, 59);
-			var AP = null;
-			cell = Calendar.createElement("td", row);
-			cell.className = "time";
-			cell.colSpan = 2;
-			if (t12)
-				AP = makeTimePart("ampm", pm ? "pm" : "am", ["am", "pm"]);
-			else
-				cell.innerHTML = " ";
-
-			cal.onSetTime = function() {
-				var pm, hrs = this.date.getHours(),
-					mins = this.date.getMinutes();
-				if (t12) {
-					pm = (hrs >= 12);
-					if (pm) hrs -= 12;
-					if (hrs == 0) hrs = 12;
-					AP.innerHTML = pm ? "pm" : "am";
-				}
-				H.innerHTML = (hrs < 10) ? ("0" + hrs) : hrs;
-				M.innerHTML = (mins < 10) ? ("0" + mins) : mins;
-			};
-
-			cal.onUpdateTime = function() {
-				var date = this.date;
-				var h = parseInt(H.innerHTML, 10);
-				if (t12) {
-					if (/pm/i.test(AP.innerHTML) && h < 12)
-						h += 12;
-					else if (/am/i.test(AP.innerHTML) && h == 12)
-						h = 0;
-				}
-				var d = date.getDate();
-				var m = date.getMonth();
-				var y = date.getFullYear();
-				date.setHours(h);
-				date.setMinutes(parseInt(M.innerHTML, 10));
-				date.setFullYear(y);
-				date.setMonth(m);
-				date.setDate(d);
-				this.dateClicked = false;
-				this.callHandler();
-			};
-		})();
-	} else {
-		this.onSetTime = this.onUpdateTime = function() {};
-	}
-
-	var tfoot = Calendar.createElement("tfoot", table);
-
-	row = Calendar.createElement("tr", tfoot);
-	row.className = "footrow";
-
-	cell = hh(Calendar._TT["SEL_DATE"], this.weekNumbers ? 8 : 7, 300);
-	cell.className = "ttip";
-	if (this.isPopup) {
-		cell.ttip = Calendar._TT["DRAG_TO_MOVE"];
-		cell.style.cursor = "move";
-	}
-	this.tooltips = cell;
-
-	div = Calendar.createElement("div", this.element);
-	this.monthsCombo = div;
-	div.className = "combo";
-	for (i = 0; i < Calendar._MN.length; ++i) {
-		var mn = Calendar.createElement("div");
-		mn.className = Calendar.is_ie ? "label-IEfix" : "label";
-		mn.month = i;
-		mn.innerHTML = Calendar._SMN[i];
-		div.appendChild(mn);
-	}
-
-	div = Calendar.createElement("div", this.element);
-	this.yearsCombo = div;
-	div.className = "combo";
-	for (i = 12; i > 0; --i) {
-		var yr = Calendar.createElement("div");
-		yr.className = Calendar.is_ie ? "label-IEfix" : "label";
-		div.appendChild(yr);
-	}
-
-	this._init(this.firstDayOfWeek, this.date);
-	parent.appendChild(this.element);
+ var parent = null;
+ if (! _par) {
+  // default parent is the document body, in which case we create
+  // a popup calendar.
+  parent = document.getElementsByTagName("body")[0];
+  this.isPopup = true;
+ } else {
+  parent = _par;
+  this.isPopup = false;
+ }
+ this.date = this.dateStr ? new Date(this.dateStr) : new Date();
+
+ var table = Calendar.createElement("table");
+ this.table = table;
+ table.cellSpacing = 0;
+ table.cellPadding = 0;
+ table.calendar = this;
+ Calendar.addEvent(table, "mousedown", Calendar.tableMouseDown);
+
+ var div = Calendar.createElement("div");
+ this.element = div;
+ div.className = "calendar";
+ if (this.isPopup) {
+  div.style.position = "absolute";
+  div.style.display = "none";
+ }
+ div.appendChild(table);
+
+ var thead = Calendar.createElement("thead", table);
+ var cell = null;
+ var row = null;
+
+ var cal = this;
+ var hh = function (text, cs, navtype) {
+  cell = Calendar.createElement("td", row);
+  cell.colSpan = cs;
+  cell.className = "button";
+  if (navtype != 0 && Math.abs(navtype) <= 2)
+   cell.className += " nav";
+  Calendar._add_evs(cell);
+  cell.calendar = cal;
+  cell.navtype = navtype;
+  cell.innerHTML = "<div unselectable='on'>" + text + "</div>";
+  return cell;
+ };
+
+ row = Calendar.createElement("tr", thead);
+ var title_length = 6;
+ (this.isPopup) && --title_length;
+ (this.weekNumbers) && ++title_length;
+
+ hh("?", 1, 400).ttip = Calendar._TT["INFO"];
+ this.title = hh("", title_length, 300);
+ this.title.className = "title";
+ if (this.isPopup) {
+  this.title.ttip = Calendar._TT["DRAG_TO_MOVE"];
+  this.title.style.cursor = "move";
+  hh("&#x00d7;", 1, 200).ttip = Calendar._TT["CLOSE"];
+ }
+
+ row = Calendar.createElement("tr", thead);
+ row.className = "headrow";
+
+ this._nav_py = hh("&#x00ab;", 1, -2);
+ this._nav_py.ttip = Calendar._TT["PREV_YEAR"];
+
+ this._nav_pm = hh("&#x2039;", 1, -1);
+ this._nav_pm.ttip = Calendar._TT["PREV_MONTH"];
+
+ this._nav_now = hh(Calendar._TT["TODAY"], this.weekNumbers ? 4 : 3, 0);
+ this._nav_now.ttip = Calendar._TT["GO_TODAY"];
+
+ this._nav_nm = hh("&#x203a;", 1, 1);
+ this._nav_nm.ttip = Calendar._TT["NEXT_MONTH"];
+
+ this._nav_ny = hh("&#x00bb;", 1, 2);
+ this._nav_ny.ttip = Calendar._TT["NEXT_YEAR"];
+
+ // day names
+ row = Calendar.createElement("tr", thead);
+ row.className = "daynames";
+ if (this.weekNumbers) {
+  cell = Calendar.createElement("td", row);
+  cell.className = "name wn";
+  cell.innerHTML = Calendar._TT["WK"];
+ }
+ for (var i = 7; i > 0; --i) {
+  cell = Calendar.createElement("td", row);
+  if (!i) {
+   cell.navtype = 100;
+   cell.calendar = this;
+   Calendar._add_evs(cell);
+  }
+ }
+ this.firstdayname = (this.weekNumbers) ? row.firstChild.nextSibling : row.firstChild;
+ this._displayWeekdays();
+
+ var tbody = Calendar.createElement("tbody", table);
+ this.tbody = tbody;
+
+ for (i = 6; i > 0; --i) {
+  row = Calendar.createElement("tr", tbody);
+  if (this.weekNumbers) {
+   cell = Calendar.createElement("td", row);
+  }
+  for (var j = 7; j > 0; --j) {
+   cell = Calendar.createElement("td", row);
+   cell.calendar = this;
+   Calendar._add_evs(cell);
+  }
+ }
+
+ if (this.showsTime) {
+  row = Calendar.createElement("tr", tbody);
+  row.className = "time";
+
+  cell = Calendar.createElement("td", row);
+  cell.className = "time";
+  cell.colSpan = 2;
+  cell.innerHTML = Calendar._TT["TIME"] || " ";
+
+  cell = Calendar.createElement("td", row);
+  cell.className = "time";
+  cell.colSpan = this.weekNumbers ? 4 : 3;
+
+  (function(){
+   function makeTimePart(className, init, range_start, range_end) {
+    var part = Calendar.createElement("span", cell);
+    part.className = className;
+    part.innerHTML = init;
+    part.calendar = cal;
+    part.ttip = Calendar._TT["TIME_PART"];
+    part.navtype = 50;
+    part._range = [];
+    if (typeof range_start != "number")
+     part._range = range_start;
+    else {
+     for (var i = range_start; i <= range_end; ++i) {
+      var txt;
+      if (i < 10 && range_end >= 10) txt = '0' + i;
+      else txt = '' + i;
+      part._range[part._range.length] = txt;
+     }
+    }
+    Calendar._add_evs(part);
+    return part;
+   };
+   var hrs = cal.date.getHours();
+   var mins = cal.date.getMinutes();
+   var t12 = !cal.time24;
+   var pm = (hrs > 12);
+   if (t12 && pm) hrs -= 12;
+   var H = makeTimePart("hour", hrs, t12 ? 1 : 0, t12 ? 12 : 23);
+   var span = Calendar.createElement("span", cell);
+   span.innerHTML = ":";
+   span.className = "colon";
+   var M = makeTimePart("minute", mins, 0, 59);
+   var AP = null;
+   cell = Calendar.createElement("td", row);
+   cell.className = "time";
+   cell.colSpan = 2;
+   if (t12)
+    AP = makeTimePart("ampm", pm ? "pm" : "am", ["am", "pm"]);
+   else
+    cell.innerHTML = " ";
+
+   cal.onSetTime = function() {
+    var pm, hrs = this.date.getHours(),
+     mins = this.date.getMinutes();
+    if (t12) {
+     pm = (hrs >= 12);
+     if (pm) hrs -= 12;
+     if (hrs == 0) hrs = 12;
+     AP.innerHTML = pm ? "pm" : "am";
+    }
+    H.innerHTML = (hrs < 10) ? ("0" + hrs) : hrs;
+    M.innerHTML = (mins < 10) ? ("0" + mins) : mins;
+   };
+
+   cal.onUpdateTime = function() {
+    var date = this.date;
+    var h = parseInt(H.innerHTML, 10);
+    if (t12) {
+     if (/pm/i.test(AP.innerHTML) && h < 12)
+      h += 12;
+     else if (/am/i.test(AP.innerHTML) && h == 12)
+      h = 0;
+    }
+    var d = date.getDate();
+    var m = date.getMonth();
+    var y = date.getFullYear();
+    date.setHours(h);
+    date.setMinutes(parseInt(M.innerHTML, 10));
+    date.setFullYear(y);
+    date.setMonth(m);
+    date.setDate(d);
+    this.dateClicked = false;
+    this.callHandler();
+   };
+  })();
+ } else {
+  this.onSetTime = this.onUpdateTime = function() {};
+ }
+
+ var tfoot = Calendar.createElement("tfoot", table);
+
+ row = Calendar.createElement("tr", tfoot);
+ row.className = "footrow";
+
+ cell = hh(Calendar._TT["SEL_DATE"], this.weekNumbers ? 8 : 7, 300);
+ cell.className = "ttip";
+ if (this.isPopup) {
+  cell.ttip = Calendar._TT["DRAG_TO_MOVE"];
+  cell.style.cursor = "move";
+ }
+ this.tooltips = cell;
+
+ div = Calendar.createElement("div", this.element);
+ this.monthsCombo = div;
+ div.className = "combo";
+ for (i = 0; i < Calendar._MN.length; ++i) {
+  var mn = Calendar.createElement("div");
+  mn.className = Calendar.is_ie ? "label-IEfix" : "label";
+  mn.month = i;
+  mn.innerHTML = Calendar._SMN[i];
+  div.appendChild(mn);
+ }
+
+ div = Calendar.createElement("div", this.element);
+ this.yearsCombo = div;
+ div.className = "combo";
+ for (i = 12; i > 0; --i) {
+  var yr = Calendar.createElement("div");
+  yr.className = Calendar.is_ie ? "label-IEfix" : "label";
+  div.appendChild(yr);
+ }
+
+ this._init(this.firstDayOfWeek, this.date);
+ parent.appendChild(this.element);
 };
 
 /** keyboard navigation, only for popup calendars */
 Calendar._keyEvent = function(ev) {
-	var cal = window._dynarch_popupCalendar;
-	if (!cal || cal.multiple)
-		return false;
-	(Calendar.is_ie) && (ev = window.event);
-	var act = (Calendar.is_ie || ev.type == "keypress"),
-		K = ev.keyCode;
-	if (ev.ctrlKey) {
-		switch (K) {
-		    case 37: // KEY left
-			act && Calendar.cellClick(cal._nav_pm);
-			break;
-		    case 38: // KEY up
-			act && Calendar.cellClick(cal._nav_py);
-			break;
-		    case 39: // KEY right
-			act && Calendar.cellClick(cal._nav_nm);
-			break;
-		    case 40: // KEY down
-			act && Calendar.cellClick(cal._nav_ny);
-			break;
-		    default:
-			return false;
-		}
-	} else switch (K) {
-	    case 32: // KEY space (now)
-		Calendar.cellClick(cal._nav_now);
-		break;
-	    case 27: // KEY esc
-		act && cal.callCloseHandler();
-		break;
-	    case 37: // KEY left
-	    case 38: // KEY up
-	    case 39: // KEY right
-	    case 40: // KEY down
-		if (act) {
-			var prev, x, y, ne, el, step;
-			prev = K == 37 || K == 38;
-			step = (K == 37 || K == 39) ? 1 : 7;
-			function setVars() {
-				el = cal.currentDateEl;
-				var p = el.pos;
-				x = p & 15;
-				y = p >> 4;
-				ne = cal.ar_days[y][x];
-			};setVars();
-			function prevMonth() {
-				var date = new Date(cal.date);
-				date.setDate(date.getDate() - step);
-				cal.setDate(date);
-			};
-			function nextMonth() {
-				var date = new Date(cal.date);
-				date.setDate(date.getDate() + step);
-				cal.setDate(date);
-			};
-			while (1) {
-				switch (K) {
-				    case 37: // KEY left
-					if (--x >= 0)
-						ne = cal.ar_days[y][x];
-					else {
-						x = 6;
-						K = 38;
-						continue;
-					}
-					break;
-				    case 38: // KEY up
-					if (--y >= 0)
-						ne = cal.ar_days[y][x];
-					else {
-						prevMonth();
-						setVars();
-					}
-					break;
-				    case 39: // KEY right
-					if (++x < 7)
-						ne = cal.ar_days[y][x];
-					else {
-						x = 0;
-						K = 40;
-						continue;
-					}
-					break;
-				    case 40: // KEY down
-					if (++y < cal.ar_days.length)
-						ne = cal.ar_days[y][x];
-					else {
-						nextMonth();
-						setVars();
-					}
-					break;
-				}
-				break;
-			}
-			if (ne) {
-				if (!ne.disabled)
-					Calendar.cellClick(ne);
-				else if (prev)
-					prevMonth();
-				else
-					nextMonth();
-			}
-		}
-		break;
-	    case 13: // KEY enter
-		if (act)
-			Calendar.cellClick(cal.currentDateEl, ev);
-		break;
-	    default:
-		return false;
-	}
-	return Calendar.stopEvent(ev);
+ var cal = window._dynarch_popupCalendar;
+ if (!cal || cal.multiple)
+  return false;
+ (Calendar.is_ie) && (ev = window.event);
+ var act = (Calendar.is_ie || ev.type == "keypress"),
+  K = ev.keyCode;
+ if (ev.ctrlKey) {
+  switch (K) {
+      case 37: // KEY left
+   act && Calendar.cellClick(cal._nav_pm);
+   break;
+      case 38: // KEY up
+   act && Calendar.cellClick(cal._nav_py);
+   break;
+      case 39: // KEY right
+   act && Calendar.cellClick(cal._nav_nm);
+   break;
+      case 40: // KEY down
+   act && Calendar.cellClick(cal._nav_ny);
+   break;
+      default:
+   return false;
+  }
+ } else switch (K) {
+     case 32: // KEY space (now)
+  Calendar.cellClick(cal._nav_now);
+  break;
+     case 27: // KEY esc
+  act && cal.callCloseHandler();
+  break;
+     case 37: // KEY left
+     case 38: // KEY up
+     case 39: // KEY right
+     case 40: // KEY down
+  if (act) {
+   var prev, x, y, ne, el, step;
+   prev = K == 37 || K == 38;
+   step = (K == 37 || K == 39) ? 1 : 7;
+   function setVars() {
+    el = cal.currentDateEl;
+    var p = el.pos;
+    x = p & 15;
+    y = p >> 4;
+    ne = cal.ar_days[y][x];
+   };setVars();
+   function prevMonth() {
+    var date = new Date(cal.date);
+    date.setDate(date.getDate() - step);
+    cal.setDate(date);
+   };
+   function nextMonth() {
+    var date = new Date(cal.date);
+    date.setDate(date.getDate() + step);
+    cal.setDate(date);
+   };
+   while (1) {
+    switch (K) {
+        case 37: // KEY left
+     if (--x >= 0)
+      ne = cal.ar_days[y][x];
+     else {
+      x = 6;
+      K = 38;
+      continue;
+     }
+     break;
+        case 38: // KEY up
+     if (--y >= 0)
+      ne = cal.ar_days[y][x];
+     else {
+      prevMonth();
+      setVars();
+     }
+     break;
+        case 39: // KEY right
+     if (++x < 7)
+      ne = cal.ar_days[y][x];
+     else {
+      x = 0;
+      K = 40;
+      continue;
+     }
+     break;
+        case 40: // KEY down
+     if (++y < cal.ar_days.length)
+      ne = cal.ar_days[y][x];
+     else {
+      nextMonth();
+      setVars();
+     }
+     break;
+    }
+    break;
+   }
+   if (ne) {
+    if (!ne.disabled)
+     Calendar.cellClick(ne);
+    else if (prev)
+     prevMonth();
+    else
+     nextMonth();
+   }
+  }
+  break;
+     case 13: // KEY enter
+  if (act)
+   Calendar.cellClick(cal.currentDateEl, ev);
+  break;
+     default:
+  return false;
+ }
+ return Calendar.stopEvent(ev);
 };
 
 /**
  *  (RE)Initializes the calendar to the given date and firstDayOfWeek
  */
 Calendar.prototype._init = function (firstDayOfWeek, date) {
-	var today = new Date(),
-		TY = today.getFullYear(),
-		TM = today.getMonth(),
-		TD = today.getDate();
-	this.table.style.visibility = "hidden";
-	var year = date.getFullYear();
-	if (year < this.minYear) {
-		year = this.minYear;
-		date.setFullYear(year);
-	} else if (year > this.maxYear) {
-		year = this.maxYear;
-		date.setFullYear(year);
-	}
-	this.firstDayOfWeek = firstDayOfWeek;
-	this.date = new Date(date);
-	var month = date.getMonth();
-	var mday = date.getDate();
-	var no_days = date.getMonthDays();
-
-	// calendar voodoo for computing the first day that would actually be
-	// displayed in the calendar, even if it's from the previous month.
-	// WARNING: this is magic. ;-)
-	date.setDate(1);
-	var day1 = (date.getDay() - this.firstDayOfWeek) % 7;
-	if (day1 < 0)
-		day1 += 7;
-	date.setDate(-day1);
-	date.setDate(date.getDate() + 1);
-
-	var row = this.tbody.firstChild;
-	var MN = Calendar._SMN[month];
-	var ar_days = this.ar_days = new Array();
-	var weekend = Calendar._TT["WEEKEND"];
-	var dates = this.multiple ? (this.datesCells = {}) : null;
-	for (var i = 0; i < 6; ++i, row = row.nextSibling) {
-		var cell = row.firstChild;
-		if (this.weekNumbers) {
-			cell.className = "day wn";
-			cell.innerHTML = date.getWeekNumber();
-			cell = cell.nextSibling;
-		}
-		row.className = "daysrow";
-		var hasdays = false, iday, dpos = ar_days[i] = [];
-		for (var j = 0; j < 7; ++j, cell = cell.nextSibling, date.setDate(iday + 1)) {
-			iday = date.getDate();
-			var wday = date.getDay();
-			cell.className = "day";
-			cell.pos = i << 4 | j;
-			dpos[j] = cell;
-			var current_month = (date.getMonth() == month);
-			if (!current_month) {
-				if (this.showsOtherMonths) {
-					cell.className += " othermonth";
-					cell.otherMonth = true;
-				} else {
-					cell.className = "emptycell";
-					cell.innerHTML = " ";
-					cell.disabled = true;
-					continue;
-				}
-			} else {
-				cell.otherMonth = false;
-				hasdays = true;
-			}
-			cell.disabled = false;
-			cell.innerHTML = this.getDateText ? this.getDateText(date, iday) : iday;
-			if (dates)
-				dates[date.print("%Y%m%d")] = cell;
-			if (this.getDateStatus) {
-				var status = this.getDateStatus(date, year, month, iday);
-				if (this.getDateToolTip) {
-					var toolTip = this.getDateToolTip(date, year, month, iday);
-					if (toolTip)
-						cell.title = toolTip;
-				}
-				if (status === true) {
-					cell.className += " disabled";
-					cell.disabled = true;
-				} else {
-					if (/disabled/i.test(status))
-						cell.disabled = true;
-					cell.className += " " + status;
-				}
-			}
-			if (!cell.disabled) {
-				cell.caldate = new Date(date);
-				cell.ttip = "_";
-				if (!this.multiple && current_month
-				    && iday == mday && this.hiliteToday) {
-					cell.className += " selected";
-					this.currentDateEl = cell;
-				}
-				if (date.getFullYear() == TY &&
-				    date.getMonth() == TM &&
-				    iday == TD) {
-					cell.className += " today";
-					cell.ttip += Calendar._TT["PART_TODAY"];
-				}
-				if (weekend.indexOf(wday.toString()) != -1)
-					cell.className += cell.otherMonth ? " oweekend" : " weekend";
-			}
-		}
-		if (!(hasdays || this.showsOtherMonths))
-			row.className = "emptyrow";
-	}
-	this.title.innerHTML = Calendar._MN[month] + ", " + year;
-	this.onSetTime();
-	this.table.style.visibility = "visible";
-	this._initMultipleDates();
-	// PROFILE
-	// this.tooltips.innerHTML = "Generated in " + ((new Date()) - today) + " ms";
+ var today = new Date(),
+  TY = today.getFullYear(),
+  TM = today.getMonth(),
+  TD = today.getDate();
+ this.table.style.visibility = "hidden";
+ var year = date.getFullYear();
+ if (year < this.minYear) {
+  year = this.minYear;
+  date.setFullYear(year);
+ } else if (year > this.maxYear) {
+  year = this.maxYear;
+  date.setFullYear(year);
+ }
+ this.firstDayOfWeek = firstDayOfWeek;
+ this.date = new Date(date);
+ var month = date.getMonth();
+ var mday = date.getDate();
+ var no_days = date.getMonthDays();
+
+ // calendar voodoo for computing the first day that would actually be
+ // displayed in the calendar, even if it's from the previous month.
+ // WARNING: this is magic. ;-)
+ date.setDate(1);
+ var day1 = (date.getDay() - this.firstDayOfWeek) % 7;
+ if (day1 < 0)
+  day1 += 7;
+ date.setDate(-day1);
+ date.setDate(date.getDate() + 1);
+
+ var row = this.tbody.firstChild;
+ var MN = Calendar._SMN[month];
+ var ar_days = this.ar_days = new Array();
+ var weekend = Calendar._TT["WEEKEND"];
+ var dates = this.multiple ? (this.datesCells = {}) : null;
+ for (var i = 0; i < 6; ++i, row = row.nextSibling) {
+  var cell = row.firstChild;
+  if (this.weekNumbers) {
+   cell.className = "day wn";
+   cell.innerHTML = date.getWeekNumber();
+   cell = cell.nextSibling;
+  }
+  row.className = "daysrow";
+  var hasdays = false, iday, dpos = ar_days[i] = [];
+  for (var j = 0; j < 7; ++j, cell = cell.nextSibling, date.setDate(iday + 1)) {
+   iday = date.getDate();
+   var wday = date.getDay();
+   cell.className = "day";
+   cell.pos = i << 4 | j;
+   dpos[j] = cell;
+   var current_month = (date.getMonth() == month);
+   if (!current_month) {
+    if (this.showsOtherMonths) {
+     cell.className += " othermonth";
+     cell.otherMonth = true;
+    } else {
+     cell.className = "emptycell";
+     cell.innerHTML = " ";
+     cell.disabled = true;
+     continue;
+    }
+   } else {
+    cell.otherMonth = false;
+    hasdays = true;
+   }
+   cell.disabled = false;
+   cell.innerHTML = this.getDateText ? this.getDateText(date, iday) : iday;
+   if (dates)
+    dates[date.print("%Y%m%d")] = cell;
+   if (this.getDateStatus) {
+    var status = this.getDateStatus(date, year, month, iday);
+    if (this.getDateToolTip) {
+     var toolTip = this.getDateToolTip(date, year, month, iday);
+     if (toolTip)
+      cell.title = toolTip;
+    }
+    if (status === true) {
+     cell.className += " disabled";
+     cell.disabled = true;
+    } else {
+     if (/disabled/i.test(status))
+      cell.disabled = true;
+     cell.className += " " + status;
+    }
+   }
+   if (!cell.disabled) {
+    cell.caldate = new Date(date);
+    cell.ttip = "_";
+    if (!this.multiple && current_month
+        && iday == mday && this.hiliteToday) {
+     cell.className += " selected";
+     this.currentDateEl = cell;
+    }
+    if (date.getFullYear() == TY &&
+        date.getMonth() == TM &&
+        iday == TD) {
+     cell.className += " today";
+     cell.ttip += Calendar._TT["PART_TODAY"];
+    }
+    if (weekend.indexOf(wday.toString()) != -1)
+     cell.className += cell.otherMonth ? " oweekend" : " weekend";
+   }
+  }
+  if (!(hasdays || this.showsOtherMonths))
+   row.className = "emptyrow";
+ }
+ this.title.innerHTML = Calendar._MN[month] + ", " + year;
+ this.onSetTime();
+ this.table.style.visibility = "visible";
+ this._initMultipleDates();
+ // PROFILE
+ // this.tooltips.innerHTML = "Generated in " + ((new Date()) - today) + " ms";
 };
 
 Calendar.prototype._initMultipleDates = function() {
-	if (this.multiple) {
-		for (var i in this.multiple) {
-			var cell = this.datesCells[i];
-			var d = this.multiple[i];
-			if (!d)
-				continue;
-			if (cell)
-				cell.className += " selected";
-		}
-	}
+ if (this.multiple) {
+  for (var i in this.multiple) {
+   var cell = this.datesCells[i];
+   var d = this.multiple[i];
+   if (!d)
+    continue;
+   if (cell)
+    cell.className += " selected";
+  }
+ }
 };
 
 Calendar.prototype._toggleMultipleDate = function(date) {
-	if (this.multiple) {
-		var ds = date.print("%Y%m%d");
-		var cell = this.datesCells[ds];
-		if (cell) {
-			var d = this.multiple[ds];
-			if (!d) {
-				Calendar.addClass(cell, "selected");
-				this.multiple[ds] = date;
-			} else {
-				Calendar.removeClass(cell, "selected");
-				delete this.multiple[ds];
-			}
-		}
-	}
+ if (this.multiple) {
+  var ds = date.print("%Y%m%d");
+  var cell = this.datesCells[ds];
+  if (cell) {
+   var d = this.multiple[ds];
+   if (!d) {
+    Calendar.addClass(cell, "selected");
+    this.multiple[ds] = date;
+   } else {
+    Calendar.removeClass(cell, "selected");
+    delete this.multiple[ds];
+   }
+  }
+ }
 };
 
 Calendar.prototype.setDateToolTipHandler = function (unaryFunction) {
-	this.getDateToolTip = unaryFunction;
+ this.getDateToolTip = unaryFunction;
 };
 
 /**
@@ -1231,9 +1231,9 @@ Calendar.prototype.setDateToolTipHandler = function (unaryFunction) {
  *  date is different than the currently selected one).
  */
 Calendar.prototype.setDate = function (date) {
-	if (!date.equalsTo(this.date)) {
-		this._init(this.firstDayOfWeek, date);
-	}
+ if (!date.equalsTo(this.date)) {
+  this._init(this.firstDayOfWeek, date);
+ }
 };
 
 /**
@@ -1243,13 +1243,13 @@ Calendar.prototype.setDate = function (date) {
  *  should * change.
  */
 Calendar.prototype.refresh = function () {
-	this._init(this.firstDayOfWeek, this.date);
+ this._init(this.firstDayOfWeek, this.date);
 };
 
 /** Modifies the "firstDayOfWeek" parameter (pass 0 for Synday, 1 for Monday, etc.). */
 Calendar.prototype.setFirstDayOfWeek = function (firstDayOfWeek) {
-	this._init(firstDayOfWeek, this.date);
-	this._displayWeekdays();
+ this._init(firstDayOfWeek, this.date);
+ this._displayWeekdays();
 };
 
 /**
@@ -1259,36 +1259,36 @@ Calendar.prototype.setFirstDayOfWeek = function (firstDayOfWeek) {
  *  the passed date will be marked as disabled.
  */
 Calendar.prototype.setDateStatusHandler = Calendar.prototype.setDisabledHandler = function (unaryFunction) {
-	this.getDateStatus = unaryFunction;
+ this.getDateStatus = unaryFunction;
 };
 
 /** Customization of allowed year range for the calendar. */
 Calendar.prototype.setRange = function (a, z) {
-	this.minYear = a;
-	this.maxYear = z;
+ this.minYear = a;
+ this.maxYear = z;
 };
 
 /** Calls the first user handler (selectedHandler). */
 Calendar.prototype.callHandler = function () {
-	if (this.onSelected) {
-		this.onSelected(this, this.date.print(this.dateFormat));
-	}
+ if (this.onSelected) {
+  this.onSelected(this, this.date.print(this.dateFormat));
+ }
 };
 
 /** Calls the second user handler (closeHandler). */
 Calendar.prototype.callCloseHandler = function () {
-	if (this.onClose) {
-		this.onClose(this);
-	}
-	this.hideShowCovered();
+ if (this.onClose) {
+  this.onClose(this);
+ }
+ this.hideShowCovered();
 };
 
 /** Removes the calendar object from the DOM tree and destroys it. */
 Calendar.prototype.destroy = function () {
-	var el = this.element.parentNode;
-	el.removeChild(this.element);
-	Calendar._C = null;
-	window._dynarch_popupCalendar = null;
+ var el = this.element.parentNode;
+ el.removeChild(this.element);
+ Calendar._C = null;
+ window._dynarch_popupCalendar = null;
 };
 
 /**
@@ -1296,50 +1296,50 @@ Calendar.prototype.destroy = function () {
  *  its parent).
  */
 Calendar.prototype.reparent = function (new_parent) {
-	var el = this.element;
-	el.parentNode.removeChild(el);
-	new_parent.appendChild(el);
+ var el = this.element;
+ el.parentNode.removeChild(el);
+ new_parent.appendChild(el);
 };
 
 // This gets called when the user presses a mouse button anywhere in the
 // document, if the calendar is shown.  If the click was outside the open
 // calendar this function closes it.
 Calendar._checkCalendar = function(ev) {
-	var calendar = window._dynarch_popupCalendar;
-	if (!calendar) {
-		return false;
-	}
-	var el = Calendar.is_ie ? Calendar.getElement(ev) : Calendar.getTargetElement(ev);
-	for (; el != null && el != calendar.element; el = el.parentNode);
-	if (el == null) {
-		// calls closeHandler which should hide the calendar.
-		window._dynarch_popupCalendar.callCloseHandler();
-		return Calendar.stopEvent(ev);
-	}
+ var calendar = window._dynarch_popupCalendar;
+ if (!calendar) {
+  return false;
+ }
+ var el = Calendar.is_ie ? Calendar.getElement(ev) : Calendar.getTargetElement(ev);
+ for (; el != null && el != calendar.element; el = el.parentNode);
+ if (el == null) {
+  // calls closeHandler which should hide the calendar.
+  window._dynarch_popupCalendar.callCloseHandler();
+  return Calendar.stopEvent(ev);
+ }
 };
 
 /** Shows the calendar. */
 Calendar.prototype.show = function () {
-	var rows = this.table.getElementsByTagName("tr");
-	for (var i = rows.length; i > 0;) {
-		var row = rows[--i];
-		Calendar.removeClass(row, "rowhilite");
-		var cells = row.getElementsByTagName("td");
-		for (var j = cells.length; j > 0;) {
-			var cell = cells[--j];
-			Calendar.removeClass(cell, "hilite");
-			Calendar.removeClass(cell, "active");
-		}
-	}
-	this.element.style.display = "block";
-	this.hidden = false;
-	if (this.isPopup) {
-		window._dynarch_popupCalendar = this;
-		Calendar.addEvent(document, "keydown", Calendar._keyEvent);
-		Calendar.addEvent(document, "keypress", Calendar._keyEvent);
-		Calendar.addEvent(document, "mousedown", Calendar._checkCalendar);
-	}
-	this.hideShowCovered();
+ var rows = this.table.getElementsByTagName("tr");
+ for (var i = rows.length; i > 0;) {
+  var row = rows[--i];
+  Calendar.removeClass(row, "rowhilite");
+  var cells = row.getElementsByTagName("td");
+  for (var j = cells.length; j > 0;) {
+   var cell = cells[--j];
+   Calendar.removeClass(cell, "hilite");
+   Calendar.removeClass(cell, "active");
+  }
+ }
+ this.element.style.display = "block";
+ this.hidden = false;
+ if (this.isPopup) {
+  window._dynarch_popupCalendar = this;
+  Calendar.addEvent(document, "keydown", Calendar._keyEvent);
+  Calendar.addEvent(document, "keypress", Calendar._keyEvent);
+  Calendar.addEvent(document, "mousedown", Calendar._checkCalendar);
+ }
+ this.hideShowCovered();
 };
 
 /**
@@ -1347,14 +1347,14 @@ Calendar.prototype.show = function () {
  *  element.
  */
 Calendar.prototype.hide = function () {
-	if (this.isPopup) {
-		Calendar.removeEvent(document, "keydown", Calendar._keyEvent);
-		Calendar.removeEvent(document, "keypress", Calendar._keyEvent);
-		Calendar.removeEvent(document, "mousedown", Calendar._checkCalendar);
-	}
-	this.element.style.display = "none";
-	this.hidden = true;
-	this.hideShowCovered();
+ if (this.isPopup) {
+  Calendar.removeEvent(document, "keydown", Calendar._keyEvent);
+  Calendar.removeEvent(document, "keypress", Calendar._keyEvent);
+  Calendar.removeEvent(document, "mousedown", Calendar._checkCalendar);
+ }
+ this.element.style.display = "none";
+ this.hidden = true;
+ this.hideShowCovered();
 };
 
 /**
@@ -1363,90 +1363,90 @@ Calendar.prototype.hide = function () {
  *  to the parent's containing rectangle).
  */
 Calendar.prototype.showAt = function (x, y) {
-	var s = this.element.style;
-	s.left = x + "px";
-	s.top = y + "px";
-	this.show();
+ var s = this.element.style;
+ s.left = x + "px";
+ s.top = y + "px";
+ this.show();
 };
 
 /** Shows the calendar near a given element. */
 Calendar.prototype.showAtElement = function (el, opts) {
-	var self = this;
-	var p = Calendar.getAbsolutePos(el);
-	if (!opts || typeof opts != "string") {
-		this.showAt(p.x, p.y + el.offsetHeight);
-		return true;
-	}
-	function fixPosition(box) {
-		if (box.x < 0)
-			box.x = 0;
-		if (box.y < 0)
-			box.y = 0;
-		var cp = Calendar.createElement("div");
-		var s = cp.style;
-		s.position = "absolute";
-		s.right = s.bottom = s.width = s.height = "0px";
-		document.body.appendChild(cp);
-		var br = Calendar.getAbsolutePos(cp);
-		document.body.removeChild(cp);
-		if (Calendar.is_ie) {
-			br.y += document.body.scrollTop;
-			br.x += document.body.scrollLeft;
-		} else {
-			br.y += window.scrollY;
-			br.x += window.scrollX;
-		}
-		var tmp = box.x + box.width - br.x;
-		if (tmp > 0) box.x -= tmp;
-		tmp = box.y + box.height - br.y;
-		if (tmp > 0) box.y -= tmp;
-	};
-	this.element.style.display = "block";
-	Calendar.continuation_for_the_fucking_khtml_browser = function() {
-		var w = self.element.offsetWidth;
-		var h = self.element.offsetHeight;
-		self.element.style.display = "none";
-		var valign = opts.substr(0, 1);
-		var halign = "l";
-		if (opts.length > 1) {
-			halign = opts.substr(1, 1);
-		}
-		// vertical alignment
-		switch (valign) {
-		    case "T": p.y -= h; break;
-		    case "B": p.y += el.offsetHeight; break;
-		    case "C": p.y += (el.offsetHeight - h) / 2; break;
-		    case "t": p.y += el.offsetHeight - h; break;
-		    case "b": break; // already there
-		}
-		// horizontal alignment
-		switch (halign) {
-		    case "L": p.x -= w; break;
-		    case "R": p.x += el.offsetWidth; break;
-		    case "C": p.x += (el.offsetWidth - w) / 2; break;
-		    case "l": p.x += el.offsetWidth - w; break;
-		    case "r": break; // already there
-		}
-		p.width = w;
-		p.height = h + 40;
-		self.monthsCombo.style.display = "none";
-		fixPosition(p);
-		self.showAt(p.x, p.y);
-	};
-	if (Calendar.is_khtml)
-		setTimeout("Calendar.continuation_for_the_fucking_khtml_browser()", 10);
-	else
-		Calendar.continuation_for_the_fucking_khtml_browser();
+ var self = this;
+ var p = Calendar.getAbsolutePos(el);
+ if (!opts || typeof opts != "string") {
+  this.showAt(p.x, p.y + el.offsetHeight);
+  return true;
+ }
+ function fixPosition(box) {
+  if (box.x < 0)
+   box.x = 0;
+  if (box.y < 0)
+   box.y = 0;
+  var cp = Calendar.createElement("div");
+  var s = cp.style;
+  s.position = "absolute";
+  s.right = s.bottom = s.width = s.height = "0px";
+  document.body.appendChild(cp);
+  var br = Calendar.getAbsolutePos(cp);
+  document.body.removeChild(cp);
+  if (Calendar.is_ie) {
+   br.y += document.body.scrollTop;
+   br.x += document.body.scrollLeft;
+  } else {
+   br.y += window.scrollY;
+   br.x += window.scrollX;
+  }
+  var tmp = box.x + box.width - br.x;
+  if (tmp > 0) box.x -= tmp;
+  tmp = box.y + box.height - br.y;
+  if (tmp > 0) box.y -= tmp;
+ };
+ this.element.style.display = "block";
+ Calendar.continuation_for_the_fucking_khtml_browser = function() {
+  var w = self.element.offsetWidth;
+  var h = self.element.offsetHeight;
+  self.element.style.display = "none";
+  var valign = opts.substr(0, 1);
+  var halign = "l";
+  if (opts.length > 1) {
+   halign = opts.substr(1, 1);
+  }
+  // vertical alignment
+  switch (valign) {
+      case "T": p.y -= h; break;
+      case "B": p.y += el.offsetHeight; break;
+      case "C": p.y += (el.offsetHeight - h) / 2; break;
+      case "t": p.y += el.offsetHeight - h; break;
+      case "b": break; // already there
+  }
+  // horizontal alignment
+  switch (halign) {
+      case "L": p.x -= w; break;
+      case "R": p.x += el.offsetWidth; break;
+      case "C": p.x += (el.offsetWidth - w) / 2; break;
+      case "l": p.x += el.offsetWidth - w; break;
+      case "r": break; // already there
+  }
+  p.width = w;
+  p.height = h + 40;
+  self.monthsCombo.style.display = "none";
+  fixPosition(p);
+  self.showAt(p.x, p.y);
+ };
+ if (Calendar.is_khtml)
+  setTimeout("Calendar.continuation_for_the_fucking_khtml_browser()", 10);
+ else
+  Calendar.continuation_for_the_fucking_khtml_browser();
 };
 
 /** Customizes the date format. */
 Calendar.prototype.setDateFormat = function (str) {
-	this.dateFormat = str;
+ this.dateFormat = str;
 };
 
 /** Customizes the tooltip date format. */
 Calendar.prototype.setTtDateFormat = function (str) {
-	this.ttDateFormat = str;
+ this.ttDateFormat = str;
 };
 
 /**
@@ -1454,119 +1454,119 @@ Calendar.prototype.setTtDateFormat = function (str) {
  *  calls this.setDate which moves the calendar to the given date.
  */
 Calendar.prototype.parseDate = function(str, fmt) {
-	if (!fmt)
-		fmt = this.dateFormat;
-	this.setDate(Date.parseDate(str, fmt));
+ if (!fmt)
+  fmt = this.dateFormat;
+ this.setDate(Date.parseDate(str, fmt));
 };
 
 Calendar.prototype.hideShowCovered = function () {
-	if (!Calendar.is_ie && !Calendar.is_opera)
-		return;
-	function getVisib(obj){
-		var value = obj.style.visibility;
-		if (!value) {
-			if (document.defaultView && typeof (document.defaultView.getComputedStyle) == "function") { // Gecko, W3C
-				if (!Calendar.is_khtml)
-					value = document.defaultView.
-						getComputedStyle(obj, "").getPropertyValue("visibility");
-				else
-					value = '';
-			} else if (obj.currentStyle) { // IE
-				value = obj.currentStyle.visibility;
-			} else
-				value = '';
-		}
-		return value;
-	};
-
-	var tags = new Array("applet", "iframe", "select");
-	var el = this.element;
-
-	var p = Calendar.getAbsolutePos(el);
-	var EX1 = p.x;
-	var EX2 = el.offsetWidth + EX1;
-	var EY1 = p.y;
-	var EY2 = el.offsetHeight + EY1;
-
-	for (var k = tags.length; k > 0; ) {
-		var ar = document.getElementsByTagName(tags[--k]);
-		var cc = null;
-
-		for (var i = ar.length; i > 0;) {
-			cc = ar[--i];
-
-			p = Calendar.getAbsolutePos(cc);
-			var CX1 = p.x;
-			var CX2 = cc.offsetWidth + CX1;
-			var CY1 = p.y;
-			var CY2 = cc.offsetHeight + CY1;
-
-			if (this.hidden || (CX1 > EX2) || (CX2 < EX1) || (CY1 > EY2) || (CY2 < EY1)) {
-				if (!cc.__msh_save_visibility) {
-					cc.__msh_save_visibility = getVisib(cc);
-				}
-				cc.style.visibility = cc.__msh_save_visibility;
-			} else {
-				if (!cc.__msh_save_visibility) {
-					cc.__msh_save_visibility = getVisib(cc);
-				}
-				cc.style.visibility = "hidden";
-			}
-		}
-	}
+ if (!Calendar.is_ie && !Calendar.is_opera)
+  return;
+ function getVisib(obj){
+  var value = obj.style.visibility;
+  if (!value) {
+   if (document.defaultView && typeof (document.defaultView.getComputedStyle) == "function") { // Gecko, W3C
+    if (!Calendar.is_khtml)
+     value = document.defaultView.
+      getComputedStyle(obj, "").getPropertyValue("visibility");
+    else
+     value = '';
+   } else if (obj.currentStyle) { // IE
+    value = obj.currentStyle.visibility;
+   } else
+    value = '';
+  }
+  return value;
+ };
+
+ var tags = new Array("applet", "iframe", "select");
+ var el = this.element;
+
+ var p = Calendar.getAbsolutePos(el);
+ var EX1 = p.x;
+ var EX2 = el.offsetWidth + EX1;
+ var EY1 = p.y;
+ var EY2 = el.offsetHeight + EY1;
+
+ for (var k = tags.length; k > 0; ) {
+  var ar = document.getElementsByTagName(tags[--k]);
+  var cc = null;
+
+  for (var i = ar.length; i > 0;) {
+   cc = ar[--i];
+
+   p = Calendar.getAbsolutePos(cc);
+   var CX1 = p.x;
+   var CX2 = cc.offsetWidth + CX1;
+   var CY1 = p.y;
+   var CY2 = cc.offsetHeight + CY1;
+
+   if (this.hidden || (CX1 > EX2) || (CX2 < EX1) || (CY1 > EY2) || (CY2 < EY1)) {
+    if (!cc.__msh_save_visibility) {
+     cc.__msh_save_visibility = getVisib(cc);
+    }
+    cc.style.visibility = cc.__msh_save_visibility;
+   } else {
+    if (!cc.__msh_save_visibility) {
+     cc.__msh_save_visibility = getVisib(cc);
+    }
+    cc.style.visibility = "hidden";
+   }
+  }
+ }
 };
 
 /** Internal function; it displays the bar with the names of the weekday. */
 Calendar.prototype._displayWeekdays = function () {
-	var fdow = this.firstDayOfWeek;
-	var cell = this.firstdayname;
-	var weekend = Calendar._TT["WEEKEND"];
-	for (var i = 0; i < 7; ++i) {
-		cell.className = "day name";
-		var realday = (i + fdow) % 7;
-		if (i) {
-			cell.ttip = Calendar._TT["DAY_FIRST"].replace("%s", Calendar._DN[realday]);
-			cell.navtype = 100;
-			cell.calendar = this;
-			cell.fdow = realday;
-			Calendar._add_evs(cell);
-		}
-		if (weekend.indexOf(realday.toString()) != -1) {
-			Calendar.addClass(cell, "weekend");
-		}
-		cell.innerHTML = Calendar._SDN[(i + fdow) % 7];
-		cell = cell.nextSibling;
-	}
+ var fdow = this.firstDayOfWeek;
+ var cell = this.firstdayname;
+ var weekend = Calendar._TT["WEEKEND"];
+ for (var i = 0; i < 7; ++i) {
+  cell.className = "day name";
+  var realday = (i + fdow) % 7;
+  if (i) {
+   cell.ttip = Calendar._TT["DAY_FIRST"].replace("%s", Calendar._DN[realday]);
+   cell.navtype = 100;
+   cell.calendar = this;
+   cell.fdow = realday;
+   Calendar._add_evs(cell);
+  }
+  if (weekend.indexOf(realday.toString()) != -1) {
+   Calendar.addClass(cell, "weekend");
+  }
+  cell.innerHTML = Calendar._SDN[(i + fdow) % 7];
+  cell = cell.nextSibling;
+ }
 };
 
 /** Internal function.  Hides all combo boxes that might be displayed. */
 Calendar.prototype._hideCombos = function () {
-	this.monthsCombo.style.display = "none";
-	this.yearsCombo.style.display = "none";
+ this.monthsCombo.style.display = "none";
+ this.yearsCombo.style.display = "none";
 };
 
 /** Internal function.  Starts dragging the element. */
 Calendar.prototype._dragStart = function (ev) {
-	if (this.dragging) {
-		return;
-	}
-	this.dragging = true;
-	var posX;
-	var posY;
-	if (Calendar.is_ie) {
-		posY = window.event.clientY + document.body.scrollTop;
-		posX = window.event.clientX + document.body.scrollLeft;
-	} else {
-		posY = ev.clientY + window.scrollY;
-		posX = ev.clientX + window.scrollX;
-	}
-	var st = this.element.style;
-	this.xOffs = posX - parseInt(st.left);
-	this.yOffs = posY - parseInt(st.top);
-	with (Calendar) {
-		addEvent(document, "mousemove", calDragIt);
-		addEvent(document, "mouseup", calDragEnd);
-	}
+ if (this.dragging) {
+  return;
+ }
+ this.dragging = true;
+ var posX;
+ var posY;
+ if (Calendar.is_ie) {
+  posY = window.event.clientY + document.body.scrollTop;
+  posX = window.event.clientX + document.body.scrollLeft;
+ } else {
+  posY = ev.clientY + window.scrollY;
+  posX = ev.clientX + window.scrollX;
+ }
+ var st = this.element.style;
+ this.xOffs = posX - parseInt(st.left);
+ this.yOffs = posY - parseInt(st.top);
+ with (Calendar) {
+  addEvent(document, "mousemove", calDragIt);
+  addEvent(document, "mouseup", calDragEnd);
+ }
 };
 
 // BEGIN: DATE OBJECT PATCHES
@@ -1582,221 +1582,221 @@ Date.DAY    = 24 * Date.HOUR;
 Date.WEEK   =  7 * Date.DAY;
 
 Date.parseDate = function(str, fmt) {
-	var today = new Date();
-	var y = 0;
-	var m = -1;
-	var d = 0;
-	var a = str.split(/\W+/);
-	var b = fmt.match(/%./g);
-	var i = 0, j = 0;
-	var hr = 0;
-	var min = 0;
-	for (i = 0; i < a.length; ++i) {
-		if (!a[i])
-			continue;
-		switch (b[i]) {
-		    case "%d":
-		    case "%e":
-			d = parseInt(a[i], 10);
-			break;
-
-		    case "%m":
-			m = parseInt(a[i], 10) - 1;
-			break;
-
-		    case "%Y":
-		    case "%y":
-			y = parseInt(a[i], 10);
-			(y < 100) && (y += (y > 29) ? 1900 : 2000);
-			break;
-
-		    case "%b":
-		    case "%B":
-			for (j = 0; j < 12; ++j) {
-				if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { m = j; break; }
-			}
-			break;
-
-		    case "%H":
-		    case "%I":
-		    case "%k":
-		    case "%l":
-			hr = parseInt(a[i], 10);
-			break;
-
-		    case "%P":
-		    case "%p":
-			if (/pm/i.test(a[i]) && hr < 12)
-				hr += 12;
-			else if (/am/i.test(a[i]) && hr >= 12)
-				hr -= 12;
-			break;
-
-		    case "%M":
-			min = parseInt(a[i], 10);
-			break;
-		}
-	}
-	if (isNaN(y)) y = today.getFullYear();
-	if (isNaN(m)) m = today.getMonth();
-	if (isNaN(d)) d = today.getDate();
-	if (isNaN(hr)) hr = today.getHours();
-	if (isNaN(min)) min = today.getMinutes();
-	if (y != 0 && m != -1 && d != 0)
-		return new Date(y, m, d, hr, min, 0);
-	y = 0; m = -1; d = 0;
-	for (i = 0; i < a.length; ++i) {
-		if (a[i].search(/[a-zA-Z]+/) != -1) {
-			var t = -1;
-			for (j = 0; j < 12; ++j) {
-				if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { t = j; break; }
-			}
-			if (t != -1) {
-				if (m != -1) {
-					d = m+1;
-				}
-				m = t;
-			}
-		} else if (parseInt(a[i], 10) <= 12 && m == -1) {
-			m = a[i]-1;
-		} else if (parseInt(a[i], 10) > 31 && y == 0) {
-			y = parseInt(a[i], 10);
-			(y < 100) && (y += (y > 29) ? 1900 : 2000);
-		} else if (d == 0) {
-			d = a[i];
-		}
-	}
-	if (y == 0)
-		y = today.getFullYear();
-	if (m != -1 && d != 0)
-		return new Date(y, m, d, hr, min, 0);
-	return today;
+ var today = new Date();
+ var y = 0;
+ var m = -1;
+ var d = 0;
+ var a = str.split(/\W+/);
+ var b = fmt.match(/%./g);
+ var i = 0, j = 0;
+ var hr = 0;
+ var min = 0;
+ for (i = 0; i < a.length; ++i) {
+  if (!a[i])
+   continue;
+  switch (b[i]) {
+      case "%d":
+      case "%e":
+   d = parseInt(a[i], 10);
+   break;
+
+      case "%m":
+   m = parseInt(a[i], 10) - 1;
+   break;
+
+      case "%Y":
+      case "%y":
+   y = parseInt(a[i], 10);
+   (y < 100) && (y += (y > 29) ? 1900 : 2000);
+   break;
+
+      case "%b":
+      case "%B":
+   for (j = 0; j < 12; ++j) {
+    if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { m = j; break; }
+   }
+   break;
+
+      case "%H":
+      case "%I":
+      case "%k":
+      case "%l":
+   hr = parseInt(a[i], 10);
+   break;
+
+      case "%P":
+      case "%p":
+   if (/pm/i.test(a[i]) && hr < 12)
+    hr += 12;
+   else if (/am/i.test(a[i]) && hr >= 12)
+    hr -= 12;
+   break;
+
+      case "%M":
+   min = parseInt(a[i], 10);
+   break;
+  }
+ }
+ if (isNaN(y)) y = today.getFullYear();
+ if (isNaN(m)) m = today.getMonth();
+ if (isNaN(d)) d = today.getDate();
+ if (isNaN(hr)) hr = today.getHours();
+ if (isNaN(min)) min = today.getMinutes();
+ if (y != 0 && m != -1 && d != 0)
+  return new Date(y, m, d, hr, min, 0);
+ y = 0; m = -1; d = 0;
+ for (i = 0; i < a.length; ++i) {
+  if (a[i].search(/[a-zA-Z]+/) != -1) {
+   var t = -1;
+   for (j = 0; j < 12; ++j) {
+    if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { t = j; break; }
+   }
+   if (t != -1) {
+    if (m != -1) {
+     d = m+1;
+    }
+    m = t;
+   }
+  } else if (parseInt(a[i], 10) <= 12 && m == -1) {
+   m = a[i]-1;
+  } else if (parseInt(a[i], 10) > 31 && y == 0) {
+   y = parseInt(a[i], 10);
+   (y < 100) && (y += (y > 29) ? 1900 : 2000);
+  } else if (d == 0) {
+   d = a[i];
+  }
+ }
+ if (y == 0)
+  y = today.getFullYear();
+ if (m != -1 && d != 0)
+  return new Date(y, m, d, hr, min, 0);
+ return today;
 };
 
 /** Returns the number of days in the current month */
 Date.prototype.getMonthDays = function(month) {
-	var year = this.getFullYear();
-	if (typeof month == "undefined") {
-		month = this.getMonth();
-	}
-	if (((0 == (year%4)) && ( (0 != (year%100)) || (0 == (year%400)))) && month == 1) {
-		return 29;
-	} else {
-		return Date._MD[month];
-	}
+ var year = this.getFullYear();
+ if (typeof month == "undefined") {
+  month = this.getMonth();
+ }
+ if (((0 == (year%4)) && ( (0 != (year%100)) || (0 == (year%400)))) && month == 1) {
+  return 29;
+ } else {
+  return Date._MD[month];
+ }
 };
 
 /** Returns the number of day in the year. */
 Date.prototype.getDayOfYear = function() {
-	var now = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
-	var then = new Date(this.getFullYear(), 0, 0, 0, 0, 0);
-	var time = now - then;
-	return Math.floor(time / Date.DAY);
+ var now = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
+ var then = new Date(this.getFullYear(), 0, 0, 0, 0, 0);
+ var time = now - then;
+ return Math.floor(time / Date.DAY);
 };
 
 /** Returns the number of the week in year, as defined in ISO 8601. */
 Date.prototype.getWeekNumber = function() {
-	var d = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
-	var DoW = d.getDay();
-	d.setDate(d.getDate() - (DoW + 6) % 7 + 3); // Nearest Thu
-	var ms = d.valueOf(); // GMT
-	d.setMonth(0);
-	d.setDate(4); // Thu in Week 1
-	return Math.round((ms - d.valueOf()) / (7 * 864e5)) + 1;
+ var d = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
+ var DoW = d.getDay();
+ d.setDate(d.getDate() - (DoW + 6) % 7 + 3); // Nearest Thu
+ var ms = d.valueOf(); // GMT
+ d.setMonth(0);
+ d.setDate(4); // Thu in Week 1
+ return Math.round((ms - d.valueOf()) / (7 * 864e5)) + 1;
 };
 
 /** Checks date and time equality */
 Date.prototype.equalsTo = function(date) {
-	return ((this.getFullYear() == date.getFullYear()) &&
-		(this.getMonth() == date.getMonth()) &&
-		(this.getDate() == date.getDate()) &&
-		(this.getHours() == date.getHours()) &&
-		(this.getMinutes() == date.getMinutes()));
+ return ((this.getFullYear() == date.getFullYear()) &&
+  (this.getMonth() == date.getMonth()) &&
+  (this.getDate() == date.getDate()) &&
+  (this.getHours() == date.getHours()) &&
+  (this.getMinutes() == date.getMinutes()));
 };
 
 /** Set only the year, month, date parts (keep existing time) */
 Date.prototype.setDateOnly = function(date) {
-	var tmp = new Date(date);
-	this.setDate(1);
-	this.setFullYear(tmp.getFullYear());
-	this.setMonth(tmp.getMonth());
-	this.setDate(tmp.getDate());
+ var tmp = new Date(date);
+ this.setDate(1);
+ this.setFullYear(tmp.getFullYear());
+ this.setMonth(tmp.getMonth());
+ this.setDate(tmp.getDate());
 };
 
 /** Prints the date in a string according to the given format. */
 Date.prototype.print = function (str) {
-	var m = this.getMonth();
-	var d = this.getDate();
-	var y = this.getFullYear();
-	var wn = this.getWeekNumber();
-	var w = this.getDay();
-	var s = {};
-	var hr = this.getHours();
-	var pm = (hr >= 12);
-	var ir = (pm) ? (hr - 12) : hr;
-	var dy = this.getDayOfYear();
-	if (ir == 0)
-		ir = 12;
-	var min = this.getMinutes();
-	var sec = this.getSeconds();
-	s["%a"] = Calendar._SDN[w]; // abbreviated weekday name [FIXME: I18N]
-	s["%A"] = Calendar._DN[w]; // full weekday name
-	s["%b"] = Calendar._SMN[m]; // abbreviated month name [FIXME: I18N]
-	s["%B"] = Calendar._MN[m]; // full month name
-	// FIXME: %c : preferred date and time representation for the current locale
-	s["%C"] = 1 + Math.floor(y / 100); // the century number
-	s["%d"] = (d < 10) ? ("0" + d) : d; // the day of the month (range 01 to 31)
-	s["%e"] = d; // the day of the month (range 1 to 31)
-	// FIXME: %D : american date style: %m/%d/%y
-	// FIXME: %E, %F, %G, %g, %h (man strftime)
-	s["%H"] = (hr < 10) ? ("0" + hr) : hr; // hour, range 00 to 23 (24h format)
-	s["%I"] = (ir < 10) ? ("0" + ir) : ir; // hour, range 01 to 12 (12h format)
-	s["%j"] = (dy < 100) ? ((dy < 10) ? ("00" + dy) : ("0" + dy)) : dy; // day of the year (range 001 to 366)
-	s["%k"] = hr;		// hour, range 0 to 23 (24h format)
-	s["%l"] = ir;		// hour, range 1 to 12 (12h format)
-	s["%m"] = (m < 9) ? ("0" + (1+m)) : (1+m); // month, range 01 to 12
-	s["%M"] = (min < 10) ? ("0" + min) : min; // minute, range 00 to 59
-	s["%n"] = "\n";		// a newline character
-	s["%p"] = pm ? "PM" : "AM";
-	s["%P"] = pm ? "pm" : "am";
-	// FIXME: %r : the time in am/pm notation %I:%M:%S %p
-	// FIXME: %R : the time in 24-hour notation %H:%M
-	s["%s"] = Math.floor(this.getTime() / 1000);
-	s["%S"] = (sec < 10) ? ("0" + sec) : sec; // seconds, range 00 to 59
-	s["%t"] = "\t";		// a tab character
-	// FIXME: %T : the time in 24-hour notation (%H:%M:%S)
-	s["%U"] = s["%W"] = s["%V"] = (wn < 10) ? ("0" + wn) : wn;
-	s["%u"] = w + 1;	// the day of the week (range 1 to 7, 1 = MON)
-	s["%w"] = w;		// the day of the week (range 0 to 6, 0 = SUN)
-	// FIXME: %x : preferred date representation for the current locale without the time
-	// FIXME: %X : preferred time representation for the current locale without the date
-	s["%y"] = ('' + y).substr(2, 2); // year without the century (range 00 to 99)
-	s["%Y"] = y;		// year with the century
-	s["%%"] = "%";		// a literal '%' character
-
-	var re = /%./g;
-	if (!Calendar.is_ie5 && !Calendar.is_khtml)
-		return str.replace(re, function (par) { return s[par] || par; });
-
-	var a = str.match(re);
-	for (var i = 0; i < a.length; i++) {
-		var tmp = s[a[i]];
-		if (tmp) {
-			re = new RegExp(a[i], 'g');
-			str = str.replace(re, tmp);
-		}
-	}
-
-	return str;
+ var m = this.getMonth();
+ var d = this.getDate();
+ var y = this.getFullYear();
+ var wn = this.getWeekNumber();
+ var w = this.getDay();
+ var s = {};
+ var hr = this.getHours();
+ var pm = (hr >= 12);
+ var ir = (pm) ? (hr - 12) : hr;
+ var dy = this.getDayOfYear();
+ if (ir == 0)
+  ir = 12;
+ var min = this.getMinutes();
+ var sec = this.getSeconds();
+ s["%a"] = Calendar._SDN[w]; // abbreviated weekday name [FIXME: I18N]
+ s["%A"] = Calendar._DN[w]; // full weekday name
+ s["%b"] = Calendar._SMN[m]; // abbreviated month name [FIXME: I18N]
+ s["%B"] = Calendar._MN[m]; // full month name
+ // FIXME: %c : preferred date and time representation for the current locale
+ s["%C"] = 1 + Math.floor(y / 100); // the century number
+ s["%d"] = (d < 10) ? ("0" + d) : d; // the day of the month (range 01 to 31)
+ s["%e"] = d; // the day of the month (range 1 to 31)
+ // FIXME: %D : american date style: %m/%d/%y
+ // FIXME: %E, %F, %G, %g, %h (man strftime)
+ s["%H"] = (hr < 10) ? ("0" + hr) : hr; // hour, range 00 to 23 (24h format)
+ s["%I"] = (ir < 10) ? ("0" + ir) : ir; // hour, range 01 to 12 (12h format)
+ s["%j"] = (dy < 100) ? ((dy < 10) ? ("00" + dy) : ("0" + dy)) : dy; // day of the year (range 001 to 366)
+ s["%k"] = hr;  // hour, range 0 to 23 (24h format)
+ s["%l"] = ir;  // hour, range 1 to 12 (12h format)
+ s["%m"] = (m < 9) ? ("0" + (1+m)) : (1+m); // month, range 01 to 12
+ s["%M"] = (min < 10) ? ("0" + min) : min; // minute, range 00 to 59
+ s["%n"] = "\n";  // a newline character
+ s["%p"] = pm ? "PM" : "AM";
+ s["%P"] = pm ? "pm" : "am";
+ // FIXME: %r : the time in am/pm notation %I:%M:%S %p
+ // FIXME: %R : the time in 24-hour notation %H:%M
+ s["%s"] = Math.floor(this.getTime() / 1000);
+ s["%S"] = (sec < 10) ? ("0" + sec) : sec; // seconds, range 00 to 59
+ s["%t"] = "\t";  // a tab character
+ // FIXME: %T : the time in 24-hour notation (%H:%M:%S)
+ s["%U"] = s["%W"] = s["%V"] = (wn < 10) ? ("0" + wn) : wn;
+ s["%u"] = w + 1; // the day of the week (range 1 to 7, 1 = MON)
+ s["%w"] = w;  // the day of the week (range 0 to 6, 0 = SUN)
+ // FIXME: %x : preferred date representation for the current locale without the time
+ // FIXME: %X : preferred time representation for the current locale without the date
+ s["%y"] = ('' + y).substr(2, 2); // year without the century (range 00 to 99)
+ s["%Y"] = y;  // year with the century
+ s["%%"] = "%";  // a literal '%' character
+
+ var re = /%./g;
+ if (!Calendar.is_ie5 && !Calendar.is_khtml)
+  return str.replace(re, function (par) { return s[par] || par; });
+
+ var a = str.match(re);
+ for (var i = 0; i < a.length; i++) {
+  var tmp = s[a[i]];
+  if (tmp) {
+   re = new RegExp(a[i], 'g');
+   str = str.replace(re, tmp);
+  }
+ }
+
+ return str;
 };
 
 Date.prototype.__msh_oldSetFullYear = Date.prototype.setFullYear;
 Date.prototype.setFullYear = function(y) {
-	var d = new Date(this);
-	d.__msh_oldSetFullYear(y);
-	if (d.getMonth() != this.getMonth())
-		this.setDate(28);
-	this.__msh_oldSetFullYear(y);
+ var d = new Date(this);
+ d.__msh_oldSetFullYear(y);
+ if (d.getMonth() != this.getMonth())
+  this.setDate(28);
+ this.__msh_oldSetFullYear(y);
 };
 
 // END: DATE OBJECT PATCHES
diff --git a/Open-ILS/web/opac/common/js/jscalendar/lang/calendar-big5-utf8.js b/Open-ILS/web/opac/common/js/jscalendar/lang/calendar-big5-utf8.js
index 14e0d5ddee..429c90a095 100644
--- a/Open-ILS/web/opac/common/js/jscalendar/lang/calendar-big5-utf8.js
+++ b/Open-ILS/web/opac/common/js/jscalendar/lang/calendar-big5-utf8.js
@@ -8,7 +8,7 @@
 // For translators: please use UTF-8 if possible.  We strongly believe that
 // Unicode is the answer to a real internationalized world.  Also please
 // include your contact information in the header, as can be seen above.
-	
+ 
 // full day names
 Calendar._DN = new Array
 ("星期日",
diff --git a/Open-ILS/web/opac/common/js/jscalendar/lang/calendar-big5.js b/Open-ILS/web/opac/common/js/jscalendar/lang/calendar-big5.js
index a58935873f..3d497107b3 100644
--- a/Open-ILS/web/opac/common/js/jscalendar/lang/calendar-big5.js
+++ b/Open-ILS/web/opac/common/js/jscalendar/lang/calendar-big5.js
@@ -8,7 +8,7 @@
 // For translators: please use UTF-8 if possible.  We strongly believe that
 // Unicode is the answer to a real internationalized world.  Also please
 // include your contact information in the header, as can be seen above.
-	
+ 
 // full day names
 Calendar._DN = new Array
 ("¬P´Á¤é",
diff --git a/Open-ILS/web/opac/common/js/jscalendar/lang/calendar-cs-utf8.js b/Open-ILS/web/opac/common/js/jscalendar/lang/calendar-cs-utf8.js
index f6bbbeba14..535d7f557b 100644
--- a/Open-ILS/web/opac/common/js/jscalendar/lang/calendar-cs-utf8.js
+++ b/Open-ILS/web/opac/common/js/jscalendar/lang/calendar-cs-utf8.js
@@ -1,9 +1,9 @@
 /* 
-	calendar-cs-win.js
-	language: Czech
-	encoding: windows-1250
-	author: Lubos Jerabek (xnet@seznam.cz)
-	        Jan Uhlir (espinosa@centrum.cz)
+ calendar-cs-win.js
+ language: Czech
+ encoding: windows-1250
+ author: Lubos Jerabek (xnet@seznam.cz)
+         Jan Uhlir (espinosa@centrum.cz)
 */
 
 // ** I18N
diff --git a/Open-ILS/web/opac/common/js/jscalendar/lang/calendar-cs-win.js b/Open-ILS/web/opac/common/js/jscalendar/lang/calendar-cs-win.js
index 140dff318c..6c7c8c09dd 100644
--- a/Open-ILS/web/opac/common/js/jscalendar/lang/calendar-cs-win.js
+++ b/Open-ILS/web/opac/common/js/jscalendar/lang/calendar-cs-win.js
@@ -1,9 +1,9 @@
 /* 
-	calendar-cs-win.js
-	language: Czech
-	encoding: windows-1250
-	author: Lubos Jerabek (xnet@seznam.cz)
-	        Jan Uhlir (espinosa@centrum.cz)
+ calendar-cs-win.js
+ language: Czech
+ encoding: windows-1250
+ author: Lubos Jerabek (xnet@seznam.cz)
+         Jan Uhlir (espinosa@centrum.cz)
 */
 
 // ** I18N
diff --git a/Open-ILS/web/opac/common/js/jscalendar/lang/calendar-tr.js b/Open-ILS/web/opac/common/js/jscalendar/lang/calendar-tr.js
index 2164687fbb..4864fb6d6c 100644
--- a/Open-ILS/web/opac/common/js/jscalendar/lang/calendar-tr.js
+++ b/Open-ILS/web/opac/common/js/jscalendar/lang/calendar-tr.js
@@ -1,13 +1,13 @@
 //////////////////////////////////////////////////////////////////////////////////////////////
-//	Turkish Translation by Nuri AKMAN
-//	Location: Ankara/TURKEY
-//	e-mail	: nuriakman@hotmail.com
-//	Date	: April, 9 2003
+// Turkish Translation by Nuri AKMAN
+// Location: Ankara/TURKEY
+// e-mail : nuriakman@hotmail.com
+// Date : April, 9 2003
 //
-//	Note: if Turkish Characters does not shown on you screen
-//		  please include falowing line your html code:
+// Note: if Turkish Characters does not shown on you screen
+//    please include falowing line your html code:
 //
-//		  <meta http-equiv="Content-Type" content="text/html; charset=windows-1254">
+//    <meta http-equiv="Content-Type" content="text/html; charset=windows-1254">
 //
 //////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/Open-ILS/web/opac/common/js/opac_utils.js b/Open-ILS/web/opac/common/js/opac_utils.js
index 7d739f9cf2..a3c4ce7bc3 100644
--- a/Open-ILS/web/opac/common/js/opac_utils.js
+++ b/Open-ILS/web/opac/common/js/opac_utils.js
@@ -12,160 +12,160 @@ var __ilsEvent; /* the last event the occurred */
 var DEBUGSLIM;
 function Request(type) {
 
-	var s = type.split(":");
-	if(s[2] == "1" && isXUL()) s[1] += ".staff";
-	this.request = new RemoteRequest(s[0], s[1]);
-	var p = [];
-
-	if(isXUL()) {
-		if(!location.href.match(/^https:/))
-			this.request.setSecure(false);
-
-	} else {
-
-		if( G.user && G.user.session ) {
-			/* if the user is logged in, all activity resets the timeout 
-				This is not entirely accurate in the sense that not all 
-				requests will reset the server timeout - this should
-				get close enough, however.
-			*/
-			var at = getAuthtime();
-			if(at) new AuthTimer(at).run(); 
-		}
-	}
-
-	for( var x = 1; x!= arguments.length; x++ ) {
-		p.push(arguments[x]);
-		this.request.addParam(arguments[x]);
-	}
-
-	if( getDebug() ) {
-		var str = "";
-		for( var i = 0; i != p.length; i++ ) {
-			if( i > 0 ) str += ", "
-			str += js2JSON(p[i]);
-		}
-		_debug('request ' + s[0] + ' ' + s[1] + ' ' + str );
-
-	} else if( DEBUGSLIM ) {
-		_debug('request ' + s[1]);
-	}
+ var s = type.split(":");
+ if(s[2] == "1" && isXUL()) s[1] += ".staff";
+ this.request = new RemoteRequest(s[0], s[1]);
+ var p = [];
+
+ if(isXUL()) {
+  if(!location.href.match(/^https:/))
+   this.request.setSecure(false);
+
+ } else {
+
+  if( G.user && G.user.session ) {
+   /* if the user is logged in, all activity resets the timeout 
+    This is not entirely accurate in the sense that not all 
+    requests will reset the server timeout - this should
+    get close enough, however.
+   */
+   var at = getAuthtime();
+   if(at) new AuthTimer(at).run(); 
+  }
+ }
+
+ for( var x = 1; x!= arguments.length; x++ ) {
+  p.push(arguments[x]);
+  this.request.addParam(arguments[x]);
+ }
+
+ if( getDebug() ) {
+  var str = "";
+  for( var i = 0; i != p.length; i++ ) {
+   if( i > 0 ) str += ", "
+   str += js2JSON(p[i]);
+  }
+  _debug('request ' + s[0] + ' ' + s[1] + ' ' + str );
+
+ } else if( DEBUGSLIM ) {
+  _debug('request ' + s[1]);
+ }
 }
 
 Request.prototype.callback = function(cal) {this.request.setCompleteCallback(cal);}
-Request.prototype.send		= function(block){this.request.send(block);}
-Request.prototype.result	= function(){return this.request.getResultObject();}
+Request.prototype.send  = function(block){this.request.send(block);}
+Request.prototype.result = function(){return this.request.getResultObject();}
 
 function showCanvas() {
-	for( var x in G.ui.altcanvas ) {
-		hideMe(G.ui.altcanvas[x]);
-	}
-	hideMe(G.ui.common.loading);
-	unHideMe(G.ui.common.canvas_main);
-	try{G.ui.searchbar.text.focus();}catch(e){}
+ for( var x in G.ui.altcanvas ) {
+  hideMe(G.ui.altcanvas[x]);
+ }
+ hideMe(G.ui.common.loading);
+ unHideMe(G.ui.common.canvas_main);
+ try{G.ui.searchbar.text.focus();}catch(e){}
 }
 
 function swapCanvas(newNode) {
-	for( var x in G.ui.altcanvas ) 
-		hideMe(G.ui.altcanvas[x]);
+ for( var x in G.ui.altcanvas ) 
+  hideMe(G.ui.altcanvas[x]);
 
-	hideMe(G.ui.common.loading);
-	hideMe(G.ui.common.canvas_main);
-	unHideMe(newNode);
+ hideMe(G.ui.common.loading);
+ hideMe(G.ui.common.canvas_main);
+ unHideMe(newNode);
 }
 
 /* finds the name of the current page */
 var currentPage = null;
 function findCurrentPage() {
-	if(currentPage) return currentPage;
-
-	var pages = [];
-	for( var p in config.page ) pages.push(config.page[p]);
-	pages = pages.sort( function(a,b){ return - (a.length - b.length); } );
-
-	var path = location.pathname;
-	if(!path.match(/.*\.xml$/))
-		path += "index.xml"; /* in case they go to  / */
-
-	var page = null;
-	for( var p in pages ) {
-		if( path.indexOf(pages[p]) != -1)
-			page = pages[p];
-	}
-
-	for( var p in config.page ) {
-		if(config.page[p] == page) {
-			currentPage = p;
-			return p;
-		}
-	}
-	return null;
+ if(currentPage) return currentPage;
+
+ var pages = [];
+ for( var p in config.page ) pages.push(config.page[p]);
+ pages = pages.sort( function(a,b){ return - (a.length - b.length); } );
+
+ var path = location.pathname;
+ if(!path.match(/.*\.xml$/))
+  path += "index.xml"; /* in case they go to  / */
+
+ var page = null;
+ for( var p in pages ) {
+  if( path.indexOf(pages[p]) != -1)
+   page = pages[p];
+ }
+
+ for( var p in config.page ) {
+  if(config.page[p] == page) {
+   currentPage = p;
+   return p;
+  }
+ }
+ return null;
 }
 
 
 /* sets all of the params values  ----------------------------- */
 function initParams() {
-	var cgi	= new CGI();	
+ var cgi = new CGI(); 
 
-	/* handle the location var */
-	var org;
-	var loc = cgi.param(PARAM_LOCATION);
-	var lasso = cgi.param(PARAM_LASSO);
+ /* handle the location var */
+ var org;
+ var loc = cgi.param(PARAM_LOCATION);
+ var lasso = cgi.param(PARAM_LASSO);
 
     if ( lasso ) {
-		lasso = findOrgLasso( lasso );
-		LASSO = lasso ? lasso.id() : null;
-	}
+  lasso = findOrgLasso( lasso );
+  LASSO = lasso ? lasso.id() : null;
+ }
 
     if (loc) {
-		org = findOrgUnit(loc);
-		LOCATION = org ? org.id() : null;
+  org = findOrgUnit(loc);
+  LOCATION = org ? org.id() : null;
 
-		if ( !LOCATION ){
-			org = findOrgUnit(loc);
-			LOCATION = org ? org.id() : null;
-		}
+  if ( !LOCATION ){
+   org = findOrgUnit(loc);
+   LOCATION = org ? org.id() : null;
+  }
     }
 
-	org = null;
-	loc = cgi.param(PARAM_ORIGLOC);
-	if( loc ) {
-		org = findOrgUnit(loc);
-		if(!org) org = findOrgUnitSN(loc);
-	}
-	ORIGLOC = (org) ? org.id() : null;
-
-
-	DEPTH = parseInt(cgi.param(PARAM_DEPTH));
-	if(isNaN(DEPTH)) DEPTH = null;
-
-
-	TERM		= cgi.param(PARAM_TERM);
-	STYPE		= cgi.param(PARAM_STYPE);
-	FORM		= cgi.param(PARAM_FORM);
-	//DEPTH		= parseInt(cgi.param(PARAM_DEPTH));
-	OFFSET	= parseInt(cgi.param(PARAM_OFFSET));
-	COUNT		= parseInt(cgi.param(PARAM_COUNT));
-	HITCOUNT	= parseInt(cgi.param(PARAM_HITCOUNT));
-	MRID		= parseInt(cgi.param(PARAM_MRID));
-	RID		= parseInt(cgi.param(PARAM_RID));
-	AUTHTIME	= parseInt(cgi.param(PARAM_AUTHTIME));
-	ADVTERM	= cgi.param(PARAM_ADVTERM);
-	ADVTYPE	= cgi.param(PARAM_ADVTYPE);
-	RTYPE		= cgi.param(PARAM_RTYPE);
-	SORT		= cgi.param(PARAM_SORT);
-	SORT_DIR	= cgi.param(PARAM_SORT_DIR);
-	DEBUG		= cgi.param(PARAM_DEBUG);
-	CALLNUM	= cgi.param(PARAM_CN);
-	LITFORM	= cgi.param(PARAM_LITFORM);
-	ITEMFORM	= cgi.param(PARAM_ITEMFORM);
-	ITEMTYPE	= cgi.param(PARAM_ITEMTYPE);
-	BIBLEVEL	= cgi.param(PARAM_BIBLEVEL);
-	AUDIENCE	= cgi.param(PARAM_AUDIENCE);
-	SEARCHES = cgi.param(PARAM_SEARCHES);
-	LANGUAGE	= cgi.param(PARAM_LANGUAGE);
-	TFORM		= cgi.param(PARAM_TFORM);
-	RDEPTH	= cgi.param(PARAM_RDEPTH);
+ org = null;
+ loc = cgi.param(PARAM_ORIGLOC);
+ if( loc ) {
+  org = findOrgUnit(loc);
+  if(!org) org = findOrgUnitSN(loc);
+ }
+ ORIGLOC = (org) ? org.id() : null;
+
+
+ DEPTH = parseInt(cgi.param(PARAM_DEPTH));
+ if(isNaN(DEPTH)) DEPTH = null;
+
+
+ TERM  = cgi.param(PARAM_TERM);
+ STYPE  = cgi.param(PARAM_STYPE);
+ FORM  = cgi.param(PARAM_FORM);
+ //DEPTH  = parseInt(cgi.param(PARAM_DEPTH));
+ OFFSET = parseInt(cgi.param(PARAM_OFFSET));
+ COUNT  = parseInt(cgi.param(PARAM_COUNT));
+ HITCOUNT = parseInt(cgi.param(PARAM_HITCOUNT));
+ MRID  = parseInt(cgi.param(PARAM_MRID));
+ RID  = parseInt(cgi.param(PARAM_RID));
+ AUTHTIME = parseInt(cgi.param(PARAM_AUTHTIME));
+ ADVTERM = cgi.param(PARAM_ADVTERM);
+ ADVTYPE = cgi.param(PARAM_ADVTYPE);
+ RTYPE  = cgi.param(PARAM_RTYPE);
+ SORT  = cgi.param(PARAM_SORT);
+ SORT_DIR = cgi.param(PARAM_SORT_DIR);
+ DEBUG  = cgi.param(PARAM_DEBUG);
+ CALLNUM = cgi.param(PARAM_CN);
+ LITFORM = cgi.param(PARAM_LITFORM);
+ ITEMFORM = cgi.param(PARAM_ITEMFORM);
+ ITEMTYPE = cgi.param(PARAM_ITEMTYPE);
+ BIBLEVEL = cgi.param(PARAM_BIBLEVEL);
+ AUDIENCE = cgi.param(PARAM_AUDIENCE);
+ SEARCHES = cgi.param(PARAM_SEARCHES);
+ LANGUAGE = cgi.param(PARAM_LANGUAGE);
+ TFORM  = cgi.param(PARAM_TFORM);
+ RDEPTH = cgi.param(PARAM_RDEPTH);
     AVAIL   = cgi.param(PARAM_AVAIL);
     COPYLOCS   = cgi.param(PARAM_COPYLOCS);
     PUBD_BEFORE = cgi.param(PARAM_PUBD_BEFORE);
@@ -174,43 +174,43 @@ function initParams() {
     PUBD_DURING = cgi.param(PARAM_PUBD_DURING);
 
     
-	/* set up some sane defaults */
-	//if(isNaN(DEPTH))	DEPTH		= 0;
-	if(isNaN(RDEPTH))	RDEPTH	= 0;
-	if(isNaN(OFFSET))	OFFSET	= 0;
-	if(isNaN(COUNT))	COUNT		= 10;
-	if(isNaN(HITCOUNT))	HITCOUNT	= 0;
-	if(isNaN(MRID))		MRID		= 0;
-	if(isNaN(RID))		RID		= 0;
-	if(isNaN(ORIGLOC))	ORIGLOC	= 0; /* so we know it hasn't been set */
-	if(isNaN(AUTHTIME))	AUTHTIME	= 0;
-	if(ADVTERM==null)	ADVTERM	= "";
+ /* set up some sane defaults */
+ //if(isNaN(DEPTH)) DEPTH  = 0;
+ if(isNaN(RDEPTH)) RDEPTH = 0;
+ if(isNaN(OFFSET)) OFFSET = 0;
+ if(isNaN(COUNT)) COUNT  = 10;
+ if(isNaN(HITCOUNT)) HITCOUNT = 0;
+ if(isNaN(MRID))  MRID  = 0;
+ if(isNaN(RID))  RID  = 0;
+ if(isNaN(ORIGLOC)) ORIGLOC = 0; /* so we know it hasn't been set */
+ if(isNaN(AUTHTIME)) AUTHTIME = 0;
+ if(ADVTERM==null) ADVTERM = "";
     if(isNaN(AVAIL))    AVAIL = 0;
 }
 
 function clearSearchParams() {
-	TERM        = null;
-	STYPE       = null;
-	FORM        = null;
-	OFFSET      = 0;
-	HITCOUNT    = 0;  
-	ADVTERM     = null;
-	ADVTYPE     = null;
-	MRID        = null;
-	RID         = null;
-	RTYPE       = null;
-	SORT        = null;
-	SORT_DIR    = null;
-	RLIST       = null;
-	CALLNUM	    = null;
-	LITFORM	    = null;
-	ITEMFORM    = null;
-	ITEMTYPE    = null;
-	BIBLEVEL    = null;
-	AUDIENCE    = null;
-	SEARCHES    = null;
-	LANGUAGE    = null;
-	RDEPTH      = null;
+ TERM        = null;
+ STYPE       = null;
+ FORM        = null;
+ OFFSET      = 0;
+ HITCOUNT    = 0;  
+ ADVTERM     = null;
+ ADVTYPE     = null;
+ MRID        = null;
+ RID         = null;
+ RTYPE       = null;
+ SORT        = null;
+ SORT_DIR    = null;
+ RLIST       = null;
+ CALLNUM     = null;
+ LITFORM     = null;
+ ITEMFORM    = null;
+ ITEMTYPE    = null;
+ BIBLEVEL    = null;
+ AUDIENCE    = null;
+ SEARCHES    = null;
+ LANGUAGE    = null;
+ RDEPTH      = null;
     AVAIL       = null;
     COPYLOCS    = null;
     PUBD_BEFORE = null;
@@ -221,11 +221,11 @@ function clearSearchParams() {
 
 
 function initCookies() {
-	FONTSIZE = "regular";
-	var font = cookieManager.read(COOKIE_FONT);
-	scaleFonts(font);
-	if(font) FONTSIZE = font;
-	SKIN = cookieManager.read(COOKIE_SKIN);
+ FONTSIZE = "regular";
+ var font = cookieManager.read(COOKIE_FONT);
+ scaleFonts(font);
+ if(font) FONTSIZE = font;
+ SKIN = cookieManager.read(COOKIE_SKIN);
     if(findCurrentPage() == HOME)
         cookieManager.remove(COOKIE_SEARCH);
 }
@@ -272,185 +272,185 @@ function getPubdDuring() { return PUBD_DURING; }
 
 
 function findBasePath() {
-	var path = location.pathname;
-	if(!path.match(/.*\.xml$/)) path += "index.xml"; 
-	var idx = path.indexOf(config.page[findCurrentPage()]);
-	return path.substring(0, idx);
+ var path = location.pathname;
+ if(!path.match(/.*\.xml$/)) path += "index.xml"; 
+ var idx = path.indexOf(config.page[findCurrentPage()]);
+ return path.substring(0, idx);
 }
 
 function findBaseURL(ssl) {
-	var path = findBasePath();
-	var proto = (ssl) ? "https:" : "http:";
+ var path = findBasePath();
+ var proto = (ssl) ? "https:" : "http:";
 
-	/* strip port numbers.  This is necessary for browsers that
-	send an explicit  <host>:80, 443 - explicit ports
-	break links that need to change ports (e.g. http -> https) */
-	var h = location.host.replace(/:.*/,''); 
+ /* strip port numbers.  This is necessary for browsers that
+ send an explicit  <host>:80, 443 - explicit ports
+ break links that need to change ports (e.g. http -> https) */
+ var h = location.host.replace(/:.*/,''); 
 
-	return proto + "//" + h + path;
+ return proto + "//" + h + path;
 }
 
 /*
 function buildISBNSrc(isbn) {
-	return "http://" + location.host + "/jackets/" + isbn;
+ return "http://" + location.host + "/jackets/" + isbn;
 }
 */
 
 function buildImageLink(name, ssl) {
-	return findBaseURL(ssl) + "../../../../images/" + name;
+ return findBaseURL(ssl) + "../../../../images/" + name;
 }
 
 function buildExtrasLink(name, ssl) {
-	return findBaseURL(ssl) + "../../../../extras/" + name;
+ return findBaseURL(ssl) + "../../../../extras/" + name;
 }
 
 var consoleService;
 function _debug(str) { 
-	try { dump('dbg: ' + str + '\n'); } catch(e) {} 
-
-	/* potentially useful, but usually just annoying */
-	/*
-	if(!IE) {
-		if(!consoleService) {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				this.consoleService = Components.classes['@mozilla.org/consoleservice;1']
-					.getService(Components.interfaces.nsIConsoleService);
-			} catch(e) {}
-		}
-	
-		try {
-			if(consoleService) {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				consoleService.logStringMessage(str + '\n');
-			}
-		} catch(e){}
-	}
-	*/
+ try { dump('dbg: ' + str + '\n'); } catch(e) {} 
+
+ /* potentially useful, but usually just annoying */
+ /*
+ if(!IE) {
+  if(!consoleService) {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    this.consoleService = Components.classes['@mozilla.org/consoleservice;1']
+     .getService(Components.interfaces.nsIConsoleService);
+   } catch(e) {}
+  }
+ 
+  try {
+   if(consoleService) {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    consoleService.logStringMessage(str + '\n');
+   }
+  } catch(e){}
+ }
+ */
 }
 
 function  buildOPACLink(args, slim, ssl) {
 
-	if(!args) args = {};
-	var string = "";
-
-	if(!slim) {
-		string = findBaseURL(ssl);
-		if(args.page) string += config.page[args.page];
-		else string += config.page[findCurrentPage()];
-	}
-
-	/* this may seem unnecessary.. safety precaution for now */
-	/*
-	if( args[PARAM_DEPTH] == null )
-		args[PARAM_DEPTH] = getDepth();
-		*/
-
-	string += "?";
-
-	for( var x in args ) {
-		var v = args[x];
-		if(x == "page" || v == null || v == undefined || v+'' == 'NaN' ) continue;
-		if(x == PARAM_OFFSET && v == 0) continue;
-		if(x == PARAM_COUNT && v == 10) continue;
-		if(x == PARAM_FORM && v == 'all' ) continue;
-		if( instanceOf(v, Array) && v.length ) {
-			for( var i = 0; i < v.length; i++ ) {
-				string += "&" + x + "=" + encodeURIComponent(v[i]);
-			}
-		} else {
-			string += "&" + x + "=" + encodeURIComponent(v);
-		}
-	}
-
-	if(getDebug())
-		string += _appendParam(DEBUG,		PARAM_DEBUG, args, getDebug, string);
-	if(getOrigLocation() != 1) 
-		string += _appendParam(ORIGLOC,	PARAM_ORIGLOC, args, getOrigLocation, string);
-	if(getTerm()) 
-		string += _appendParam(TERM,		PARAM_TERM, args, getTerm, string);
-	if(getStype()) 
-		string += _appendParam(STYPE,		PARAM_STYPE, args, getStype, string);
-	if(getLocation() != 1) 
-		string += _appendParam(LOCATION, PARAM_LOCATION, args, getLocation, string);
-	if(getLasso() != null) 
-		string += _appendParam(LASSO, PARAM_LASSO, args, getLasso, string);
-	if(getDepth() != null) 
-		string += _appendParam(DEPTH,		PARAM_DEPTH, args, getDepth, string);
-	if(getForm() && (getForm() != 'all') ) 
-		string += _appendParam(FORM,		PARAM_FORM, args, getForm, string);
-	if(getTform() && (getTform() != 'all') ) 
-		string += _appendParam(TFORM,		PARAM_TFORM, args, getTform, string);
-	if(getOffset() != 0) 
-		string += _appendParam(OFFSET,	PARAM_OFFSET, args, getOffset, string);
-	if(getDisplayCount() != 10) 
-		string += _appendParam(COUNT,		PARAM_COUNT, args, getDisplayCount, string);
-	if(getHitCount()) 
-		string += _appendParam(HITCOUNT, PARAM_HITCOUNT, args, getHitCount, string);
-	if(getMrid())
-		string += _appendParam(MRID,		PARAM_MRID, args, getMrid, string);
-	if(getRid())
-		string += _appendParam(RID,		PARAM_RID, args, getRid, string);
-	if(getAuthtime())
-		string += _appendParam(AUTHTIME,	PARAM_AUTHTIME, args, getAuthtime, string);
-	if(getAdvTerm())
-		string += _appendParam(ADVTERM,	PARAM_ADVTERM, args, getAdvTerm, string);
-	if(getAdvType())
-		string += _appendParam(ADVTYPE,	PARAM_ADVTYPE, args, getAdvType, string);
-	if(getRtype())
-		string += _appendParam(RTYPE,		PARAM_RTYPE, args, getRtype, string);
-	if(getItemForm())
-		string += _appendParam(ITEMFORM,	PARAM_ITEMFORM, args, getItemForm, string);
-	if(getItemType())
-		string += _appendParam(ITEMTYPE,	PARAM_ITEMTYPE, args, getItemType, string);
-	if(getBibLevel())
-		string += _appendParam(BIBLEVEL,	PARAM_BIBLEVEL, args, getBibLevel, string);
-	if(getLitForm())
-		string += _appendParam(LITFORM,	PARAM_LITFORM, args, getLitForm, string);
-	if(getAudience())
-		string += _appendParam(AUDIENCE,	PARAM_AUDIENCE, args, getAudience, string);
-	if(getSearches())
-		string += _appendParam(SEARCHES,	PARAM_SEARCHES, args, getSearches, string);
-	if(getLanguage())
-		string += _appendParam(LANGUAGE,	PARAM_LANGUAGE, args, getLanguage, string);
-	if(getRdepth() != null)
-		string += _appendParam(RDEPTH,	PARAM_RDEPTH, args, getRdepth, string);
-	if(getSort() != null)
-		string += _appendParam(SORT,	PARAM_SORT, args, getSort, string);
-	if(getSortDir() != null)
-		string += _appendParam(SORT_DIR,	PARAM_SORT_DIR, args, getSortDir, string);
-	if(getAvail())
-		string += _appendParam(AVAIL, PARAM_AVAIL, args, getAvail, string);
-	if(getCopyLocs())
-		string += _appendParam(COPYLOCS, PARAM_COPYLOCS, args, getCopyLocs, string);
+ if(!args) args = {};
+ var string = "";
+
+ if(!slim) {
+  string = findBaseURL(ssl);
+  if(args.page) string += config.page[args.page];
+  else string += config.page[findCurrentPage()];
+ }
+
+ /* this may seem unnecessary.. safety precaution for now */
+ /*
+ if( args[PARAM_DEPTH] == null )
+  args[PARAM_DEPTH] = getDepth();
+  */
+
+ string += "?";
+
+ for( var x in args ) {
+  var v = args[x];
+  if(x == "page" || v == null || v == undefined || v+'' == 'NaN' ) continue;
+  if(x == PARAM_OFFSET && v == 0) continue;
+  if(x == PARAM_COUNT && v == 10) continue;
+  if(x == PARAM_FORM && v == 'all' ) continue;
+  if( instanceOf(v, Array) && v.length ) {
+   for( var i = 0; i < v.length; i++ ) {
+    string += "&" + x + "=" + encodeURIComponent(v[i]);
+   }
+  } else {
+   string += "&" + x + "=" + encodeURIComponent(v);
+  }
+ }
+
+ if(getDebug())
+  string += _appendParam(DEBUG,  PARAM_DEBUG, args, getDebug, string);
+ if(getOrigLocation() != 1) 
+  string += _appendParam(ORIGLOC, PARAM_ORIGLOC, args, getOrigLocation, string);
+ if(getTerm()) 
+  string += _appendParam(TERM,  PARAM_TERM, args, getTerm, string);
+ if(getStype()) 
+  string += _appendParam(STYPE,  PARAM_STYPE, args, getStype, string);
+ if(getLocation() != 1) 
+  string += _appendParam(LOCATION, PARAM_LOCATION, args, getLocation, string);
+ if(getLasso() != null) 
+  string += _appendParam(LASSO, PARAM_LASSO, args, getLasso, string);
+ if(getDepth() != null) 
+  string += _appendParam(DEPTH,  PARAM_DEPTH, args, getDepth, string);
+ if(getForm() && (getForm() != 'all') ) 
+  string += _appendParam(FORM,  PARAM_FORM, args, getForm, string);
+ if(getTform() && (getTform() != 'all') ) 
+  string += _appendParam(TFORM,  PARAM_TFORM, args, getTform, string);
+ if(getOffset() != 0) 
+  string += _appendParam(OFFSET, PARAM_OFFSET, args, getOffset, string);
+ if(getDisplayCount() != 10) 
+  string += _appendParam(COUNT,  PARAM_COUNT, args, getDisplayCount, string);
+ if(getHitCount()) 
+  string += _appendParam(HITCOUNT, PARAM_HITCOUNT, args, getHitCount, string);
+ if(getMrid())
+  string += _appendParam(MRID,  PARAM_MRID, args, getMrid, string);
+ if(getRid())
+  string += _appendParam(RID,  PARAM_RID, args, getRid, string);
+ if(getAuthtime())
+  string += _appendParam(AUTHTIME, PARAM_AUTHTIME, args, getAuthtime, string);
+ if(getAdvTerm())
+  string += _appendParam(ADVTERM, PARAM_ADVTERM, args, getAdvTerm, string);
+ if(getAdvType())
+  string += _appendParam(ADVTYPE, PARAM_ADVTYPE, args, getAdvType, string);
+ if(getRtype())
+  string += _appendParam(RTYPE,  PARAM_RTYPE, args, getRtype, string);
+ if(getItemForm())
+  string += _appendParam(ITEMFORM, PARAM_ITEMFORM, args, getItemForm, string);
+ if(getItemType())
+  string += _appendParam(ITEMTYPE, PARAM_ITEMTYPE, args, getItemType, string);
+ if(getBibLevel())
+  string += _appendParam(BIBLEVEL, PARAM_BIBLEVEL, args, getBibLevel, string);
+ if(getLitForm())
+  string += _appendParam(LITFORM, PARAM_LITFORM, args, getLitForm, string);
+ if(getAudience())
+  string += _appendParam(AUDIENCE, PARAM_AUDIENCE, args, getAudience, string);
+ if(getSearches())
+  string += _appendParam(SEARCHES, PARAM_SEARCHES, args, getSearches, string);
+ if(getLanguage())
+  string += _appendParam(LANGUAGE, PARAM_LANGUAGE, args, getLanguage, string);
+ if(getRdepth() != null)
+  string += _appendParam(RDEPTH, PARAM_RDEPTH, args, getRdepth, string);
+ if(getSort() != null)
+  string += _appendParam(SORT, PARAM_SORT, args, getSort, string);
+ if(getSortDir() != null)
+  string += _appendParam(SORT_DIR, PARAM_SORT_DIR, args, getSortDir, string);
+ if(getAvail())
+  string += _appendParam(AVAIL, PARAM_AVAIL, args, getAvail, string);
+ if(getCopyLocs())
+  string += _appendParam(COPYLOCS, PARAM_COPYLOCS, args, getCopyLocs, string);
     if(getPubdBefore())
-		string += _appendParam(PUBD_BEFORE, PARAM_PUBD_BEFORE, args, getPubdBefore, string);
+  string += _appendParam(PUBD_BEFORE, PARAM_PUBD_BEFORE, args, getPubdBefore, string);
     if(getPubdAfter())
-		string += _appendParam(PUBD_AFTER, PARAM_PUBD_AFTER, args, getPubdAfter, string);
+  string += _appendParam(PUBD_AFTER, PARAM_PUBD_AFTER, args, getPubdAfter, string);
     if(getPubdBetween())
-		string += _appendParam(PUBD_BETWEEN, PARAM_PUBD_BETWEEN, args, getPubdBetween, string);
+  string += _appendParam(PUBD_BETWEEN, PARAM_PUBD_BETWEEN, args, getPubdBetween, string);
     if(getPubdDuring())
-		string += _appendParam(PUBD_DURING, PARAM_PUBD_DURING, args, getPubdDuring, string);
+  string += _appendParam(PUBD_DURING, PARAM_PUBD_DURING, args, getPubdDuring, string);
 
 
-	return string.replace(/\&$/,'').replace(/\?\&/,"?");	
+ return string.replace(/\&$/,'').replace(/\?\&/,"?"); 
 }
 
 var xx = 1;
 function _appendParam( fieldVar, fieldName, overrideArgs, getFunc, string ) {
 
-	var ret = "";
+ var ret = "";
 
-	if(	fieldVar != null && 
-			(fieldVar +'' != 'NaN') && 
-			overrideArgs[fieldName] == null &&
-			getFunc() != null &&
-			getFunc()+'' != '' ) {
+ if( fieldVar != null && 
+   (fieldVar +'' != 'NaN') && 
+   overrideArgs[fieldName] == null &&
+   getFunc() != null &&
+   getFunc()+'' != '' ) {
 
-		ret = "&" + fieldName + "=" + encodeURIComponent(getFunc());
-	}
+  ret = "&" + fieldName + "=" + encodeURIComponent(getFunc());
+ }
 
-	return ret;
+ return ret;
 }
 
 /* ----------------------------------------------------------------------- */
@@ -466,52 +466,52 @@ function cleanISBN(isbn) {
 
 /* builds a link that goes to the title listings for a metarecord */
 function buildTitleLink(rec, link) {
-	if(!rec) return;
-	link.appendChild(text(normalize(truncate(rec.title(), 65))));
-	var args = {};
-	args.page = RRESULT;
-	args[PARAM_OFFSET] = 0;
-	args[PARAM_MRID] = rec.doc_id();
-	args[PARAM_RTYPE] = RTYPE_MRID;
+ if(!rec) return;
+ link.appendChild(text(normalize(truncate(rec.title(), 65))));
+ var args = {};
+ args.page = RRESULT;
+ args[PARAM_OFFSET] = 0;
+ args[PARAM_MRID] = rec.doc_id();
+ args[PARAM_RTYPE] = RTYPE_MRID;
     var linkText = link.innerHTML; // IE
-	link.setAttribute("href", buildOPACLink(args));
+ link.setAttribute("href", buildOPACLink(args));
     link.innerHTML = linkText; // IE
 }
 
 function buildTitleDetailLink(rec, link) {
-	if(!rec) return;
-	link.appendChild(text(normalize(truncate(rec.title(), 65))));
-	var args = {};
-	args.page = RDETAIL;
-	args[PARAM_RID] = rec.doc_id();
+ if(!rec) return;
+ link.appendChild(text(normalize(truncate(rec.title(), 65))));
+ var args = {};
+ args.page = RDETAIL;
+ args[PARAM_RID] = rec.doc_id();
     // in IE, if the link text contains a '@', it replaces the innerHTML text 
     // with the value of the href attribute.  Wait, what?  Yes.  Capture the
     // innerHTML and put it back into place after the href is set
     var linkText = link.innerHTML; // IE
-	link.setAttribute("href", buildOPACLink(args));
+ link.setAttribute("href", buildOPACLink(args));
     link.innerHTML = linkText; // IE
 }
 
 /* 'type' is one of STYPE_AUTHOR, STYPE_SUBJECT, ... found in config.js 
-	'trunc' is the number of characters to show in the string, defaults to 65 */
+ 'trunc' is the number of characters to show in the string, defaults to 65 */
 function buildSearchLink(type, string, linknode, trunc) {
-	if(!trunc) trunc = 65;
-	var args = {};
-	if( SHOW_MR_DEFAULT) {
-		args.page = MRESULT;
-	} else {
-		args.page = RRESULT;
-		args[PARAM_RTYPE] = type;
-	}
-	args[PARAM_OFFSET] = 0;
-	args[PARAM_TERM] = string;
-	args[PARAM_STYPE] = type;
-	linknode.appendChild(text(normalize(truncate(string, trunc))));
-	linknode.setAttribute("href", buildOPACLink(args));
+ if(!trunc) trunc = 65;
+ var args = {};
+ if( SHOW_MR_DEFAULT) {
+  args.page = MRESULT;
+ } else {
+  args.page = RRESULT;
+  args[PARAM_RTYPE] = type;
+ }
+ args[PARAM_OFFSET] = 0;
+ args[PARAM_TERM] = string;
+ args[PARAM_STYPE] = type;
+ linknode.appendChild(text(normalize(truncate(string, trunc))));
+ linknode.setAttribute("href", buildOPACLink(args));
 }
 
 function setSessionCookie(ses) {
-	cookieManager.write(COOKIE_SES, ses, -1);
+ cookieManager.write(COOKIE_SES, ses, -1);
 }
 
 
@@ -520,171 +520,171 @@ function setSessionCookie(ses) {
 /* user session handling */
 /* ----------------------------------------------------------------------- */
 /* session is the login session.  If no session is provided, we attempt
-	to find one in the cookies.  If 'force' is true we retrieve the 
-	user from the server even if there is already a global user present.
-	if ses != G.user.session, we also force a grab */
+ to find one in the cookies.  If 'force' is true we retrieve the 
+ user from the server even if there is already a global user present.
+ if ses != G.user.session, we also force a grab */
 function grabUser(ses, force) {
 
-	if(!ses && isXUL()) {
-		stash = fetchXULStash();
-		ses = stash.session.key
-		_debug("stash auth token = " + ses);
-	}
+ if(!ses && isXUL()) {
+  stash = fetchXULStash();
+  ses = stash.session.key
+  _debug("stash auth token = " + ses);
+ }
 
-	if(!ses) {
-		ses = cookieManager.read(COOKIE_SES);
-		/* https cookies don't show up in http servers.. */
-	}
+ if(!ses) {
+  ses = cookieManager.read(COOKIE_SES);
+  /* https cookies don't show up in http servers.. */
+ }
 
-	if(!ses) return false;
+ if(!ses) return false;
 
-	if(!force) 
-		if(G.user && G.user.session == ses)
-			return G.user;
+ if(!force) 
+  if(G.user && G.user.session == ses)
+   return G.user;
 
-	/* first make sure the session is valid */
-	var request = new Request(FETCH_SESSION, ses, 1 );
-	request.request.alertEvent = false;
-	request.send(true);
-	var user = request.result();
+ /* first make sure the session is valid */
+ var request = new Request(FETCH_SESSION, ses, 1 );
+ request.request.alertEvent = false;
+ request.send(true);
+ var user = request.result();
 
-	if(!user) {
-		doLogout();
-		return false; /* unable to grab the session */
-	}
+ if(!user) {
+  doLogout();
+  return false; /* unable to grab the session */
+ }
 
-	if( !(typeof user == 'object' && user._isfieldmapper) ) {
-		doLogout();
-		return false;
-	}
+ if( !(typeof user == 'object' && user._isfieldmapper) ) {
+  doLogout();
+  return false;
+ }
 
-	G.user = user;
-	G.user.fleshed = false;
-	G.user.session = ses;
-	setSessionCookie(ses);
+ G.user = user;
+ G.user.fleshed = false;
+ G.user.session = ses;
+ setSessionCookie(ses);
 
-	grabUserPrefs();
-	if(G.user.prefs['opac.hits_per_page'])
-		COUNT = parseInt(G.user.prefs['opac.hits_per_page']);
+ grabUserPrefs();
+ if(G.user.prefs['opac.hits_per_page'])
+  COUNT = parseInt(G.user.prefs['opac.hits_per_page']);
 
-	if(G.user.prefs[PREF_DEF_FONT]) 
-		setFontSize(G.user.prefs[PREF_DEF_FONT]);
+ if(G.user.prefs[PREF_DEF_FONT]) 
+  setFontSize(G.user.prefs[PREF_DEF_FONT]);
 
-	var at = getAuthtime();
-	//if(isXUL()) at = xulG['authtime'];
+ var at = getAuthtime();
+ //if(isXUL()) at = xulG['authtime'];
 
-	if(at && !isXUL()) new AuthTimer(at).run(); 
-	return G.user;
+ if(at && !isXUL()) new AuthTimer(at).run(); 
+ return G.user;
 }
 
 
 /* sets the 'prefs' field of the user object to their preferences 
-	and returns the preferences */
+ and returns the preferences */
 function grabUserPrefs(user, force) {
-	if(user == null) user = G.user;
-	if(!force && user.prefs) return user.prefs;	
-	var req = new Request(FETCH_USER_PREFS, G.user.session, user.id());
-	req.send(true);
-	user.prefs = req.result();
-	return user.prefs;
+ if(user == null) user = G.user;
+ if(!force && user.prefs) return user.prefs; 
+ var req = new Request(FETCH_USER_PREFS, G.user.session, user.id());
+ req.send(true);
+ user.prefs = req.result();
+ return user.prefs;
 }
 
 function grabFleshedUser() {
 
-	if(!G.user || !G.user.session) {
-		grabUser();	
-		if(!G.user || !G.user.session) return null;
-	}
+ if(!G.user || !G.user.session) {
+  grabUser(); 
+  if(!G.user || !G.user.session) return null;
+ }
 
-	if(G.user.fleshed) return G.user;
+ if(G.user.fleshed) return G.user;
 
    var req = new Request(FETCH_FLESHED_USER, G.user.session);
-  	req.send(true);
+   req.send(true);
 
-  	G.user = req.result();
+   G.user = req.result();
 
-	if(!G.user || G.user.length == 0) { 
-		G.user = null; return false; 
-		cookieManager.write(COOKIE_SES,"");
-	}
+ if(!G.user || G.user.length == 0) { 
+  G.user = null; return false; 
+  cookieManager.write(COOKIE_SES,"");
+ }
 
-	G.user.session = ses;
-	G.user.fleshed = true;
+ G.user.session = ses;
+ G.user.fleshed = true;
 
-	setSessionCookie(ses);
-	return G.user;
+ setSessionCookie(ses);
+ return G.user;
 }
 
 function checkUserSkin(new_skin) {
 
-	return; /* XXX do some debugging with this... */
+ return; /* XXX do some debugging with this... */
 
-	var user_skin = getSkin();
-	var cur_skin = grabSkinFromURL();
+ var user_skin = getSkin();
+ var cur_skin = grabSkinFromURL();
 
-	if(new_skin) user_skin = new_skin;
+ if(new_skin) user_skin = new_skin;
 
-	if(!user_skin) {
+ if(!user_skin) {
 
-		if(grabUser()) {
-			if(grabUserPrefs()) {
-				user_skin = G.user.prefs["opac.skin"];
-				cookieManager.write( COOKIE_SKIN, user_skin, '+1y' );
-			}
-		}
-	}
+  if(grabUser()) {
+   if(grabUserPrefs()) {
+    user_skin = G.user.prefs["opac.skin"];
+    cookieManager.write( COOKIE_SKIN, user_skin, '+1y' );
+   }
+  }
+ }
 
-	if(!user_skin) return;
+ if(!user_skin) return;
 
-	if( cur_skin != user_skin ) {
-		var url = buildOPACLink();
-		goTo(url.replace(cur_skin, user_skin));
-	}
+ if( cur_skin != user_skin ) {
+  var url = buildOPACLink();
+  goTo(url.replace(cur_skin, user_skin));
+ }
 }
 
 function updateUserSetting(setting, value, user) {
-	if(user == null) user = G.user;
-	var a = {};
-	a[setting] = value;
-	var req = new Request( UPDATE_USER_PREFS, user.session, a );
-	req.send(true);
-	return req.result();
+ if(user == null) user = G.user;
+ var a = {};
+ a[setting] = value;
+ var req = new Request( UPDATE_USER_PREFS, user.session, a );
+ req.send(true);
+ return req.result();
 }
 
 function commitUserPrefs() {
-	var req = new Request( 
-		UPDATE_USER_PREFS, G.user.session, null, G.user.prefs );
-	req.send(true);
-	return req.result();
+ var req = new Request( 
+  UPDATE_USER_PREFS, G.user.session, null, G.user.prefs );
+ req.send(true);
+ return req.result();
 }
 
 function grabSkinFromURL() {
-	var path = findBasePath();
-	path = path.replace("/xml/", "");
-	var skin = "";
-	for( var i = path.length - 1; i >= 0; i-- ) {
-		var ch = path.charAt(i);
-		if(ch == "/") break;
-		skin += ch;
-	}
-
-	var skin2 = "";
-	for( i = skin.length - 1; i >= 0; i--)
-		skin2 += skin.charAt(i);
-
-	return skin2;
+ var path = findBasePath();
+ path = path.replace("/xml/", "");
+ var skin = "";
+ for( var i = path.length - 1; i >= 0; i-- ) {
+  var ch = path.charAt(i);
+  if(ch == "/") break;
+  skin += ch;
+ }
+
+ var skin2 = "";
+ for( i = skin.length - 1; i >= 0; i--)
+  skin2 += skin.charAt(i);
+
+ return skin2;
 }
 
 
 /* returns a fleshed G.user on success, false on failure */
 function doLogin(suppressEvents) {
 
-	abortAllRequests();
+ abortAllRequests();
 
-	var uname = G.ui.login.username.value;
-	var passwd = G.ui.login.password.value;	
+ var uname = G.ui.login.username.value;
+ var passwd = G.ui.login.password.value; 
 
-	var init_request = new Request( LOGIN_INIT, uname );
+ var init_request = new Request( LOGIN_INIT, uname );
    init_request.send(true);
    var seed = init_request.result();
 
@@ -693,74 +693,74 @@ function doLogin(suppressEvents) {
       return null;
    }
 
-	var args = {
-		password : hex_md5(seed + hex_md5(passwd)), 
-		type		: "opac", 
-		org		: getOrigLocation()
-	};
+ var args = {
+  password : hex_md5(seed + hex_md5(passwd)), 
+  type  : "opac", 
+  org  : getOrigLocation()
+ };
 
     r = fetchOrgSettingDefault(globalOrgTree.id(), 'opac.barcode_regex');
     if(r) REGEX_BARCODE = new RegExp(r);
     
     if( uname.match(REGEX_BARCODE) ) args.barcode = uname;
-	else args.username = uname;
+ else args.username = uname;
 
    var auth_request = new Request( LOGIN_COMPLETE, args );
 
-	auth_request.request.alertEvent = false;
+ auth_request.request.alertEvent = false;
    auth_request.send(true);
    var auth_result = auth_request.result();
 
-	if(!auth_result) {
-		alertId('patron_login_failed');
-		return null;
-	}
+ if(!auth_result) {
+  alertId('patron_login_failed');
+  return null;
+ }
 
-	if( checkILSEvent(auth_result) ) {
+ if( checkILSEvent(auth_result) ) {
 
-		if( auth_result.textcode == 'PATRON_INACTIVE' ) {
-			alertId('patron_inactive_alert');
-			return;
-		}
+  if( auth_result.textcode == 'PATRON_INACTIVE' ) {
+   alertId('patron_inactive_alert');
+   return;
+  }
 
-		if( auth_result.textcode == 'PATRON_CARD_INACTIVE' ) {
-			alertId('patron_card_inactive_alert');
-			return;
-		}
+  if( auth_result.textcode == 'PATRON_CARD_INACTIVE' ) {
+   alertId('patron_card_inactive_alert');
+   return;
+  }
 
-		if( auth_result.textcode == 'LOGIN_FAILED' || 
-				auth_result.textcode == 'PERM_FAILURE' ) {
-			alertId('patron_login_failed');
-			return;
-		}
-	}
+  if( auth_result.textcode == 'LOGIN_FAILED' || 
+    auth_result.textcode == 'PERM_FAILURE' ) {
+   alertId('patron_login_failed');
+   return;
+  }
+ }
 
 
-	AUTHTIME = parseInt(auth_result.payload.authtime);
-	var u = grabUser(auth_result.payload.authtoken, true);
-	if(u && ! suppressEvents) 
-		runEvt( "common", "locationChanged", u.ws_ou(), findOrgDepth(u.ws_ou()) );
+ AUTHTIME = parseInt(auth_result.payload.authtime);
+ var u = grabUser(auth_result.payload.authtoken, true);
+ if(u && ! suppressEvents) 
+  runEvt( "common", "locationChanged", u.ws_ou(), findOrgDepth(u.ws_ou()) );
 
-	checkUserSkin();
+ checkUserSkin();
 
-	return u;
+ return u;
 }
 
 function doLogout() {
 
-	/* cancel everything else */
-	abortAllRequests();
+ /* cancel everything else */
+ abortAllRequests();
 
-	/* be nice and delete the session from the server */
-	if(G.user && G.user.session) { 
-		var req = new Request(LOGIN_DELETE, G.user.session);
+ /* be nice and delete the session from the server */
+ if(G.user && G.user.session) { 
+  var req = new Request(LOGIN_DELETE, G.user.session);
       req.send(true);
-		try { req.result(); } catch(E){}
+  try { req.result(); } catch(E){}
     }
 
-	G.user = null;
+ G.user = null;
 
-	/* remove any cached data */
+ /* remove any cached data */
     dojo.require('dojo.cookie');
     dojo.cookie(COOKIE_SES, '', {expires:-1});
     dojo.cookie(COOKIE_RIDS, '', {expires:-1});
@@ -768,20 +768,20 @@ function doLogout() {
     dojo.cookie(COOKIE_SEARCH, '', {expires:-1});
 
 
-	checkUserSkin("default");
-	COUNT = 10;
+ checkUserSkin("default");
+ COUNT = 10;
 
 
-	var args = {};
-	args[PARAM_TERM] = "";
-	args[PARAM_LOCATION] = getOrigLocation();
-	args[PARAM_DEPTH] = findOrgDepth(getOrigLocation());
-	args.page = "home";
+ var args = {};
+ args[PARAM_TERM] = "";
+ args[PARAM_LOCATION] = getOrigLocation();
+ args[PARAM_DEPTH] = findOrgDepth(getOrigLocation());
+ args.page = "home";
 
-	
-	var nored = false;
-	try{ if(isFrontPage) nored = true; } catch(e){nored = false;}
-	if(!nored) goTo(buildOPACLink(args));
+ 
+ var nored = false;
+ try{ if(isFrontPage) nored = true; } catch(e){nored = false;}
+ if(!nored) goTo(buildOPACLink(args));
 }
 
 
@@ -793,46 +793,46 @@ function unHideMe(obj) { removeCSSClass(obj, config.css.hide_me); }
 /* build the org tree */
 /* ----------------------------------------------------------------------- */
 function drawOrgTree() {
-	//setTimeout( 'buildOrgSelector(G.ui.common.org_tree, orgTreeSelector);', 10 );
-	setTimeout( 'buildOrgSelector(G.ui.common.org_tree, orgTreeSelector);', 1 );
+ //setTimeout( 'buildOrgSelector(G.ui.common.org_tree, orgTreeSelector);', 10 );
+ setTimeout( 'buildOrgSelector(G.ui.common.org_tree, orgTreeSelector);', 1 );
 }
-	
+ 
 var orgTreeSelector;
 function buildOrgSelector(node) {
-	var tree = new SlimTree(node,'orgTreeSelector');
-	orgTreeSelector = tree;
-	for( var i in orgArraySearcher ) { 
-		var node = orgArraySearcher[i];
-		if( node == null ) continue;
+ var tree = new SlimTree(node,'orgTreeSelector');
+ orgTreeSelector = tree;
+ for( var i in orgArraySearcher ) { 
+  var node = orgArraySearcher[i];
+  if( node == null ) continue;
         if(!isXUL() && !isTrue(node.opac_visible())) continue; 
-		if(node.parent_ou() == null)
-			tree.addNode(node.id(), -1, node.name(), 
-				"javascript:orgSelect(" + node.id() + ");", node.name());
-		else {
-			tree.addNode(node.id(), node.parent_ou(), node.name(), 
-				"javascript:orgSelect(" + node.id() + ");", node.name());
-		}
-	}
-	hideMe($('org_loading_div'));
-	unHideMe($('org_selector_tip'));
-	return tree;
+  if(node.parent_ou() == null)
+   tree.addNode(node.id(), -1, node.name(), 
+    "javascript:orgSelect(" + node.id() + ");", node.name());
+  else {
+   tree.addNode(node.id(), node.parent_ou(), node.name(), 
+    "javascript:orgSelect(" + node.id() + ");", node.name());
+  }
+ }
+ hideMe($('org_loading_div'));
+ unHideMe($('org_selector_tip'));
+ return tree;
 }
 
 function orgSelect(id) {
-	showCanvas();
-	runEvt("common", "locationChanged", id, findOrgDepth(id) );
+ showCanvas();
+ runEvt("common", "locationChanged", id, findOrgDepth(id) );
 
 
-	var loc = findOrgLasso(getLasso());
-	if (!loc) loc = findOrgUnit(id);
+ var loc = findOrgLasso(getLasso());
+ if (!loc) loc = findOrgUnit(id);
 
-	removeChildren(G.ui.common.now_searching);
-	G.ui.common.now_searching.appendChild(text(loc.name()));
+ removeChildren(G.ui.common.now_searching);
+ G.ui.common.now_searching.appendChild(text(loc.name()));
 }
 
 function setFontSize(size) {
-	scaleFonts(size);
-	cookieManager.write(COOKIE_FONT, size, '+1y');
+ scaleFonts(size);
+ cookieManager.write(COOKIE_FONT, size, '+1y');
 }
 
 var resourceFormats = [
@@ -906,191 +906,191 @@ function MARCFormatToMods(format) {
 }
 
 function MARCTypeToFriendly(format) {
-	var words = $('format_words');
-	switch(format) {
-		case 'a' :
-		case 't' : return $n(words, 'at').innerHTML;
-		default:
-			var node = $n(words,format);
-			if( node ) return node.innerHTML;
-	}
-	return "";
+ var words = $('format_words');
+ switch(format) {
+  case 'a' :
+  case 't' : return $n(words, 'at').innerHTML;
+  default:
+   var node = $n(words,format);
+   if( node ) return node.innerHTML;
+ }
+ return "";
 }
 
 function setResourcePic( img, resource ) {
-	img.setAttribute( "src", "../../../../images/tor/" + resource + ".jpg");
-	img.title = resource;
+ img.setAttribute( "src", "../../../../images/tor/" + resource + ".jpg");
+ img.title = resource;
 }
 
 
 
 function msg( text ) {
-	try { alert( text ); } catch(e) {}
+ try { alert( text ); } catch(e) {}
 }
 
 function findRecord(id,type) {
-	try {
-		for( var i = 0; i != recordsCache.length; i++ ) {
-			var rec = recordsCache[i];
-			if( rec && rec.doc_id() == id ) return rec;
-		}
-	} catch(E){}
-	var meth = FETCH_RMODS
-	if(type == 'M') meth = FETCH_MRMODS;
-	var req = new Request(meth, id);
-	req.request.alertEvent = false;
-	req.send(true);
-	var res = req.result();
-	if( checkILSEvent(res) ) return null; 
-	return res;
+ try {
+  for( var i = 0; i != recordsCache.length; i++ ) {
+   var rec = recordsCache[i];
+   if( rec && rec.doc_id() == id ) return rec;
+  }
+ } catch(E){}
+ var meth = FETCH_RMODS
+ if(type == 'M') meth = FETCH_MRMODS;
+ var req = new Request(meth, id);
+ req.request.alertEvent = false;
+ req.send(true);
+ var res = req.result();
+ if( checkILSEvent(res) ) return null; 
+ return res;
 }
 
 function Timer(name, node){
-	this.name = name;
-	this.count = 1;
-	this.node = node;
+ this.name = name;
+ this.count = 1;
+ this.node = node;
 }
 Timer.prototype.start = 
-	function(){_timerRun(this.name);}
+ function(){_timerRun(this.name);}
 Timer.prototype.stop = 
-	function(){this.done = true;}
+ function(){this.done = true;}
 function _timerRun(tname) {
-	var _t;
-	eval('_t='+tname);
-	if(_t.done) return;
-	if(_t.count > 100) return;
-	var str = ' . ';
-	if( (_t.count % 5) == 0 ) 
-		str = _t.count / 5;
-	_t.node.appendChild(text(str));
-	setTimeout("_timerRun('"+tname+"');", 200);
-	_t.count++;
+ var _t;
+ eval('_t='+tname);
+ if(_t.done) return;
+ if(_t.count > 100) return;
+ var str = ' . ';
+ if( (_t.count % 5) == 0 ) 
+  str = _t.count / 5;
+ _t.node.appendChild(text(str));
+ setTimeout("_timerRun('"+tname+"');", 200);
+ _t.count++;
 }
 
 function checkILSEvent(obj) {
-	if( obj && obj.ilsevent != null && obj.ilsevent != 0 )
-		return parseInt(obj.ilsevent);
-	return null;
+ if( obj && obj.ilsevent != null && obj.ilsevent != 0 )
+  return parseInt(obj.ilsevent);
+ return null;
 }
 
 
 function alertILSEvent(evt, msg) {
    if(!msg) msg = "";
-	if(msg)
-		alert(msg +'\n' + evt.textcode + '\n' + evt.desc );
-	else 
-		alert(evt.textcode + '\n' + evt.desc );
+ if(msg)
+  alert(msg +'\n' + evt.textcode + '\n' + evt.desc );
+ else 
+  alert(evt.textcode + '\n' + evt.desc );
 }
 
 
 var __authTimer;
 function AuthTimer(time) { 
-	this.time = (time - LOGOUT_WARNING_TIME) * 1000; 
-	if(__authTimer) 
-		try {clearTimeout(__authTimer.id)} catch(e){}
-	__authTimer = this;
+ this.time = (time - LOGOUT_WARNING_TIME) * 1000; 
+ if(__authTimer) 
+  try {clearTimeout(__authTimer.id)} catch(e){}
+ __authTimer = this;
 }
 
 AuthTimer.prototype.run = function() {
-	this.id = setTimeout('_authTimerAlert()', this.time);
+ this.id = setTimeout('_authTimerAlert()', this.time);
 }
 
 function _authTimerAlert() {
-	alert( $('auth_session_expiring').innerHTML );
-	if(!grabUser(null, true)) doLogout();
+ alert( $('auth_session_expiring').innerHTML );
+ if(!grabUser(null, true)) doLogout();
 }
 
 
 function grabUserByBarcode( authtoken, barcode ) {
-	var req = new Request( FETCH_USER_BYBARCODE, authtoken, barcode );
-	req.send(true);
-	return req.result();
+ var req = new Request( FETCH_USER_BYBARCODE, authtoken, barcode );
+ req.send(true);
+ return req.result();
 }
 
 
 function goHome() {
-	goTo(buildOPACLink({page:HOME}));
+ goTo(buildOPACLink({page:HOME}));
 }
 
 
 function buildOrgSel(selector, org, offset, namecol) {
     if(!namecol) namecol = 'name';
     if(!isXUL() && !isTrue(org.opac_visible())) return;
-	insertSelectorVal( selector, -1, 
-		org[namecol](), org.id(), null, findOrgDepth(org) - offset );
-	for( var c in org.children() )
-		buildOrgSel( selector, org.children()[c], offset, namecol);
+ insertSelectorVal( selector, -1, 
+  org[namecol](), org.id(), null, findOrgDepth(org) - offset );
+ for( var c in org.children() )
+  buildOrgSel( selector, org.children()[c], offset, namecol);
 }
 
 function buildMergedOrgSel(selector, org_list, offset, namecol) {
     if(!namecol) namecol = 'name';
     for(var i = 0; i < org_list.length; i++) {
         var org = findOrgUnit(org_list[i]);
-    	insertSelectorVal( selector, -1, 
-		    org[namecol](), org.id(), null, findOrgDepth(org) - offset );
-	    for( var c in org.children() )
-		    buildOrgSel( selector, org.children()[c], offset, namecol);
+     insertSelectorVal( selector, -1, 
+      org[namecol](), org.id(), null, findOrgDepth(org) - offset );
+     for( var c in org.children() )
+      buildOrgSel( selector, org.children()[c], offset, namecol);
     }
 }
 
 
 function parseForm(form) {
-	if(!form) return {};
+ if(!form) return {};
 
-	var it = form.replace(/-\w+$/,"");
-	var itf = null;
-	var item_form;
-	var item_type;
+ var it = form.replace(/-\w+$/,"");
+ var itf = null;
+ var item_form;
+ var item_type;
 
-	if(form.match(/-/)) itf = form.replace(/^\w+-/,"");
+ if(form.match(/-/)) itf = form.replace(/^\w+-/,"");
 
-	if(it) {
-		item_type = [];
-		for( var i = 0; i < it.length; i++ ) 
-			item_type.push( it.charAt(i) );
-	}
+ if(it) {
+  item_type = [];
+  for( var i = 0; i < it.length; i++ ) 
+   item_type.push( it.charAt(i) );
+ }
 
-	if(itf) {
-		item_form = [];
-		for( var i = 0; i < itf.length; i++ ) 
-			item_form.push( itf.charAt(i) );
-	}
+ if(itf) {
+  item_form = [];
+  for( var i = 0; i < itf.length; i++ ) 
+   item_form.push( itf.charAt(i) );
+ }
 
-	return {item_type: item_type, item_form:item_form};
+ return {item_type: item_type, item_form:item_form};
 }
 
 
 function isTrue(x) { return ( x && x != "0" && !(x+'').match(/^f$/i) ); }
 
 function fetchPermOrgs() {
-	var a = []; /* why does arguments come accross as an object and not an array? */
-	for( var i = 0; i < arguments.length; i++ ) 
-		a.push(arguments[i])
-
-	var preq = new Request(FETCH_HIGHEST_PERM_ORG, 
-		G.user.session, G.user.id(), a );
-	preq.send(true);
-	return preq.result();
+ var a = []; /* why does arguments come accross as an object and not an array? */
+ for( var i = 0; i < arguments.length; i++ ) 
+  a.push(arguments[i])
+
+ var preq = new Request(FETCH_HIGHEST_PERM_ORG, 
+  G.user.session, G.user.id(), a );
+ preq.send(true);
+ return preq.result();
 }
 
 
 function print_tabs(t) {
-	var r = '';
-	for (var j = 0; j < t; j++ ) { r = r + "  "; }
-	return r;
+ var r = '';
+ for (var j = 0; j < t; j++ ) { r = r + "  "; }
+ return r;
 }
 function formatJSON(s) {
-	var r = ''; var t = 0;
-	for (var i in s) {
-		if (s[i] == '{' || s[i] == '[' ) {
-			r = r + s[i] + "\n" + print_tabs(++t);
-		} else if (s[i] == '}' || s[i] == ']') {
-			t--; r = r + "\n" + print_tabs(t) + s[i];
-		} else if (s[i] == ',') {
-			r = r + s[i] + "\n" + print_tabs(t);
-		} else {
-			r = r + s[i];
-		}
-	}
-	return r;
+ var r = ''; var t = 0;
+ for (var i in s) {
+  if (s[i] == '{' || s[i] == '[' ) {
+   r = r + s[i] + "\n" + print_tabs(++t);
+  } else if (s[i] == '}' || s[i] == ']') {
+   t--; r = r + "\n" + print_tabs(t) + s[i];
+  } else if (s[i] == ',') {
+   r = r + s[i] + "\n" + print_tabs(t);
+  } else {
+   r = r + s[i];
+  }
+ }
+ return r;
 }
diff --git a/Open-ILS/web/opac/common/js/org_utils.js b/Open-ILS/web/opac/common/js/org_utils.js
index 9fe33f47d9..e39a09b7ac 100644
--- a/Open-ILS/web/opac/common/js/org_utils.js
+++ b/Open-ILS/web/opac/common/js/org_utils.js
@@ -24,42 +24,42 @@ function fetchBatchOrgSetting(orgId, nameList, onload) {
 
 /* takes an org unit or id and return the numeric depth */
 function findOrgDepth(org_id_or_node) {
-	var org = findOrgUnit(org_id_or_node);
-	if(!org) return -1;
-	var type = findOrgType(org.ou_type());
-	if(type) return type.depth();
-	return -1;
+ var org = findOrgUnit(org_id_or_node);
+ if(!org) return -1;
+ var type = findOrgType(org.ou_type());
+ if(type) return type.depth();
+ return -1;
 }
 
 function findOrgTypeFromDepth(depth) {
-	if( depth == null ) return null;
-	for( var type in globalOrgTypes ) {
-		var t = globalOrgTypes[type];
-		if( t.depth() == depth ) return t;
-	}
+ if( depth == null ) return null;
+ for( var type in globalOrgTypes ) {
+  var t = globalOrgTypes[type];
+  if( t.depth() == depth ) return t;
+ }
 }
 
 /* takes the org type id from orgunit.ou_type() field and returns
-	the org type object */
+ the org type object */
 function findOrgType(type_id) {
-	if(typeof type_id == 'object') return type_id;
-	for(var type in globalOrgTypes) {
-		var t =globalOrgTypes[type]; 
-		if( t.id() == type_id || t.id() == parseInt(type_id) ) 
-			return t;
-	}
-	return null;
+ if(typeof type_id == 'object') return type_id;
+ for(var type in globalOrgTypes) {
+  var t =globalOrgTypes[type]; 
+  if( t.id() == type_id || t.id() == parseInt(type_id) ) 
+   return t;
+ }
+ return null;
 }
 
 
 /* returns an org unit by id.  if an object is passed in as the id,
-	then the object is assumed to be an org unit and is returned */
+ then the object is assumed to be an org unit and is returned */
 function findOrgUnit(org_id) {
-	return (typeof org_id == 'object') ? org_id : orgArraySearcher[org_id];
+ return (typeof org_id == 'object') ? org_id : orgArraySearcher[org_id];
 }
 
 function findOrgLasso(lasso_id) {
-	if (typeof lasso_id == 'object') return lasso_id;
+ if (typeof lasso_id == 'object') return lasso_id;
     for (var i in _lasso) {
         if (_lasso[i].id() == lasso_id) return _lasso[i];
     }
@@ -68,39 +68,39 @@ function findOrgLasso(lasso_id) {
 
 var orgArraySearcherSN = {};
 function findOrgUnitSN(shortname) {
-	if (typeof shortname == 'object') return shortname;
-	if( orgArraySearcherSN[shortname] ) return orgArraySearcherSN[shortname];
-	_debug("fetching org by shortname "+shortname);
-	var req = new Request(FETCH_ORG_BY_SHORTNAME, shortname);
-	req.request.alertEvent = false;
-	req.send(true);
-	return req.result();
+ if (typeof shortname == 'object') return shortname;
+ if( orgArraySearcherSN[shortname] ) return orgArraySearcherSN[shortname];
+ _debug("fetching org by shortname "+shortname);
+ var req = new Request(FETCH_ORG_BY_SHORTNAME, shortname);
+ req.request.alertEvent = false;
+ req.send(true);
+ return req.result();
 }
 
 
 /* builds a trail from the top of the org tree to the node provide.
-	basically fleshes out 'my orgs' 
-	Returns an array of [org0, org1, ..., myorg] */
+ basically fleshes out 'my orgs' 
+ Returns an array of [org0, org1, ..., myorg] */
 function orgNodeTrail(node) {
-	var na = new Array();
-	while( node ) {
-		na.push(node);
-		node = findOrgUnit(node.parent_ou());
-	}
-	return na.reverse();
+ var na = new Array();
+ while( node ) {
+  na.push(node);
+  node = findOrgUnit(node.parent_ou());
+ }
+ return na.reverse();
 }
 
 function findSiblingOrgs(node) { return findOrgUnit(node.parent_ou()).children(); }
 
 /* true if 'org' is 'me' or a child of mine */
 function orgIsMine(me, org) {
-	if(!me || !org) return false;
-	if(me.id() == org.id()) return true;
-	for( var i in me.children() ) {
-		if(orgIsMine(me.children()[i], org))
-			return true;
-	}
-	return false;
+ if(!me || !org) return false;
+ if(me.id() == org.id()) return true;
+ for( var i in me.children() ) {
+  if(orgIsMine(me.children()[i], org))
+   return true;
+ }
+ return false;
 }
 
 function orgIsMineFromSet(meList, org) {
@@ -115,37 +115,37 @@ function orgIsMineFromSet(meList, org) {
 var orgArraySearcher = {};
 var globalOrgTree;
 for (var i in _l) {
-	var x = new aou();
-	x.id(_l[i][0]);
-	x.ou_type(_l[i][1]);
-	x.parent_ou(_l[i][2]);
-	x.name(_l[i][3]);
+ var x = new aou();
+ x.id(_l[i][0]);
+ x.ou_type(_l[i][1]);
+ x.parent_ou(_l[i][2]);
+ x.name(_l[i][3]);
     x.opac_visible(_l[i][4]);
     x.shortname(_l[i][5]);
-	orgArraySearcher[x.id()] = x;
+ orgArraySearcher[x.id()] = x;
 }
 for (var i in orgArraySearcher) {
-	var x = orgArraySearcher[i];
-	if (x.parent_ou() == null || x.parent_ou() == '') {
-		globalOrgTree = x;
-		continue;
-	} 
-
-	var par = findOrgUnit(x.parent_ou());
-	if (!par.children()) par.children(new Array());
-	par.children().push(x);
+ var x = orgArraySearcher[i];
+ if (x.parent_ou() == null || x.parent_ou() == '') {
+  globalOrgTree = x;
+  continue;
+ } 
+
+ var par = findOrgUnit(x.parent_ou());
+ if (!par.children()) par.children(new Array());
+ par.children().push(x);
 }
 
 function _tree_killer () {
-	for (var i in orgArraySearcher) {
-		x=orgArraySearcher[i];
-		x.children(null);
-		x.parent_ou(null);
-		orgArraySearcher[i]=null;
-	}
-	globalOrgTree = null;
-	orgArraySearcher = null;
-	globalOrgTypes = null;
+ for (var i in orgArraySearcher) {
+  x=orgArraySearcher[i];
+  x.children(null);
+  x.parent_ou(null);
+  orgArraySearcher[i]=null;
+ }
+ globalOrgTree = null;
+ orgArraySearcher = null;
+ globalOrgTypes = null;
 }
 
 
diff --git a/Open-ILS/web/opac/common/js/slimtree.js b/Open-ILS/web/opac/common/js/slimtree.js
index e047dd018a..04d4ab848c 100644
--- a/Open-ILS/web/opac/common/js/slimtree.js
+++ b/Open-ILS/web/opac/common/js/slimtree.js
@@ -1,12 +1,12 @@
 /*
-var stpicopen	= '../../../../images/slimtree/folder.gif';
+var stpicopen = '../../../../images/slimtree/folder.gif';
 var stpicclose = '../../../../images/slimtree/folderopen.gif';
 */
-var stpicopen	= '../../../../images/slimtree/folder2.gif';
+var stpicopen = '../../../../images/slimtree/folder2.gif';
 var stpicclose = '../../../../images/slimtree/folderopen2.gif';
 var stpicblank = '../../../../images/slimtree/page.gif';
-var stpicline	= '../../../../images/slimtree/line.gif';
-var stpicjoin	= '../../../../images/slimtree/join.gif';
+var stpicline = '../../../../images/slimtree/line.gif';
+var stpicjoin = '../../../../images/slimtree/join.gif';
 var stpicjoinb = '../../../../images/slimtree/joinbottom.gif';
 
 var stimgopen;
@@ -18,140 +18,140 @@ var stimgjoin;
 function _apc(root,node) { root.appendChild(node); }
 
 function SlimTree(context, handle, rootimg) { 
-	
-	if(!stimgopen) {
-		stimgopen       = elem('img',{src:stpicopen,border:0, style:'height:13px;width:31px;'});
-		stimgclose      = elem('img',{src:stpicclose,border:0, style:'height:13px;width:31px;'});
-		stimgblank      = elem('img',{src:stpicblank,border:0, style:'height:18px;width:18px;'});
-		stimgline       = elem('img',{src:stpicline,border:0, style:'height:18px;width:18px;'});
-		stimgjoin       = elem('img',{src:stpicjoin,border:0, style:'display:inline;height:18px;width:18px;'});
-	}
-
-	this.context	= context; 
-	this.handle		= handle;
-	this.cache		= new Object();
-	if(rootimg) 
-		this.rootimg = elem('img', 
-			{src:rootimg,border:0,style:'padding-right: 4px;'});
+ 
+ if(!stimgopen) {
+  stimgopen       = elem('img',{src:stpicopen,border:0, style:'height:13px;width:31px;'});
+  stimgclose      = elem('img',{src:stpicclose,border:0, style:'height:13px;width:31px;'});
+  stimgblank      = elem('img',{src:stpicblank,border:0, style:'height:18px;width:18px;'});
+  stimgline       = elem('img',{src:stpicline,border:0, style:'height:18px;width:18px;'});
+  stimgjoin       = elem('img',{src:stpicjoin,border:0, style:'display:inline;height:18px;width:18px;'});
+ }
+
+ this.context = context; 
+ this.handle  = handle;
+ this.cache  = new Object();
+ if(rootimg) 
+  this.rootimg = elem('img', 
+   {src:rootimg,border:0,style:'padding-right: 4px;'});
 }
 
 SlimTree.prototype.addCachedChildren = function(pid) {
-	var child;
-	while( child = this.cache[pid].shift() ) 
-		this.addNode( child.id, child.pid, 
-			child.name, child.action, child.title );
-	this.cache[pid] = null;
+ var child;
+ while( child = this.cache[pid].shift() ) 
+  this.addNode( child.id, child.pid, 
+   child.name, child.action, child.title );
+ this.cache[pid] = null;
 }
 
 SlimTree.prototype.addNode = function( id, pid, name, action, title, cls ) {
 
-	if( pid != -1 && !$(pid)) {
-		if(!this.cache[pid]) this.cache[pid] = new Array();
-		this.cache[pid].push(
-			{id:id,pid:pid,name:name,action:action,title:title });
-		return;
-	}
-
-	if(!action)
-		action='javascript:'+this.handle+'.toggle("'+id+'");';
-
-	var actionref;
-	if( typeof action == 'string' )
-		actionref = elem('a',{href:action}, name);
-	else {
-		actionref = elem('a',{href:'javascript:void(0);'}, name);
-		actionref.onclick = action;
-	}
-
-	var div			= elem('div',{id:id});
-	var topdiv		= elem('div',{style:'vertical-align:middle'});
-	var link			= elem('a', {id:'stlink_' + id}); 
-	var contdiv		= elem('div',{id:'stcont_' + id});
-
-	if(cls) addCSSClass(actionref, cls);
-
-	//actionref.setAttribute('href',action);
-	if(title) actionref.setAttribute('title',title);
-	else actionref.setAttribute('title',name);
-
-	_apc(topdiv,link);
-	_apc(topdiv,actionref);
-	_apc(div,topdiv);
-	_apc(div,contdiv);
-
-	if( pid == -1 ) { 
-
-		this.rootid = id;
-		_apc(this.context,div);
-		if(this.rootimg) _apc(link,this.rootimg.cloneNode(true));
-		else _apc(link,stimgblank.cloneNode(true));
-
-	} else {
-
-		if(pid == this.rootid) this.open(pid);
-		else this.close(pid);
-		$(pid).setAttribute('haschild','1');
-		_apc(link,stimgblank.cloneNode(true));
-		div.style.paddingLeft = '18px';
-		div.style.backgroundImage = 'url('+stpicjoinb+')';
-		div.style.backgroundRepeat = 'no-repeat';
-		_apc($('stcont_' + pid), div);
-		if (div.previousSibling) stMakePaths(div);
-	}
-	if(this.cache[id]) this.addCachedChildren(id);
+ if( pid != -1 && !$(pid)) {
+  if(!this.cache[pid]) this.cache[pid] = new Array();
+  this.cache[pid].push(
+   {id:id,pid:pid,name:name,action:action,title:title });
+  return;
+ }
+
+ if(!action)
+  action='javascript:'+this.handle+'.toggle("'+id+'");';
+
+ var actionref;
+ if( typeof action == 'string' )
+  actionref = elem('a',{href:action}, name);
+ else {
+  actionref = elem('a',{href:'javascript:void(0);'}, name);
+  actionref.onclick = action;
+ }
+
+ var div   = elem('div',{id:id});
+ var topdiv  = elem('div',{style:'vertical-align:middle'});
+ var link   = elem('a', {id:'stlink_' + id}); 
+ var contdiv  = elem('div',{id:'stcont_' + id});
+
+ if(cls) addCSSClass(actionref, cls);
+
+ //actionref.setAttribute('href',action);
+ if(title) actionref.setAttribute('title',title);
+ else actionref.setAttribute('title',name);
+
+ _apc(topdiv,link);
+ _apc(topdiv,actionref);
+ _apc(div,topdiv);
+ _apc(div,contdiv);
+
+ if( pid == -1 ) { 
+
+  this.rootid = id;
+  _apc(this.context,div);
+  if(this.rootimg) _apc(link,this.rootimg.cloneNode(true));
+  else _apc(link,stimgblank.cloneNode(true));
+
+ } else {
+
+  if(pid == this.rootid) this.open(pid);
+  else this.close(pid);
+  $(pid).setAttribute('haschild','1');
+  _apc(link,stimgblank.cloneNode(true));
+  div.style.paddingLeft = '18px';
+  div.style.backgroundImage = 'url('+stpicjoinb+')';
+  div.style.backgroundRepeat = 'no-repeat';
+  _apc($('stcont_' + pid), div);
+  if (div.previousSibling) stMakePaths(div);
+ }
+ if(this.cache[id]) this.addCachedChildren(id);
 }
 
 function stMakePaths(div) {
-	_apc(div.previousSibling.firstChild,stimgjoin.cloneNode(true));
-	_apc(div.previousSibling.firstChild,div.previousSibling.firstChild.firstChild);
-	_apc(div.previousSibling.firstChild,div.previousSibling.firstChild.firstChild);
-	div.previousSibling.firstChild.firstChild.style.marginLeft = '-18px';
-	div.previousSibling.style.backgroundImage = 'url('+stpicline+')';
-	div.previousSibling.style.backgroundRepeat = 'repeat-y';
+ _apc(div.previousSibling.firstChild,stimgjoin.cloneNode(true));
+ _apc(div.previousSibling.firstChild,div.previousSibling.firstChild.firstChild);
+ _apc(div.previousSibling.firstChild,div.previousSibling.firstChild.firstChild);
+ div.previousSibling.firstChild.firstChild.style.marginLeft = '-18px';
+ div.previousSibling.style.backgroundImage = 'url('+stpicline+')';
+ div.previousSibling.style.backgroundRepeat = 'repeat-y';
 }
 
 SlimTree.prototype.expandAll = function() { this.flex(this.rootid, 'open'); }
 SlimTree.prototype.closeAll = function() { this.flex(this.rootid,'close'); }
 SlimTree.prototype.flex = function(id, type) {
-	if(type=='open') this.open(id);
-	else { if (id != this.rootid) this.close(id); }
-	var n = $('stcont_' + id);
-	for( var c = 0; c != n.childNodes.length; c++ ) {
-		var ch = n.childNodes[c];
-		if(ch.nodeName.toLowerCase() == 'div') {
-			if($(ch.id).getAttribute('haschild') == '1') 
-				this.flex(ch.id, type);
-		}
-	}
+ if(type=='open') this.open(id);
+ else { if (id != this.rootid) this.close(id); }
+ var n = $('stcont_' + id);
+ for( var c = 0; c != n.childNodes.length; c++ ) {
+  var ch = n.childNodes[c];
+  if(ch.nodeName.toLowerCase() == 'div') {
+   if($(ch.id).getAttribute('haschild') == '1') 
+    this.flex(ch.id, type);
+  }
+ }
 }
 
 SlimTree.prototype.toggle = function(id) {
-	if($(id).getAttribute('ostate') == '1') this.open(id);
-	else if($(id).getAttribute('ostate') == '2') this.close(id);
+ if($(id).getAttribute('ostate') == '1') this.open(id);
+ else if($(id).getAttribute('ostate') == '2') this.close(id);
 }
 
 SlimTree.prototype.open = function(id) {
-	if($(id).getAttribute('ostate') == '2') return;
-	var link = $('stlink_' + id);
-	if(!link) return;
-	if(id != this.rootid || !this.rootimg) {
-		removeChildren(link);
-		_apc(link,stimgclose.cloneNode(true));
-	}
-	link.setAttribute('href','javascript:' + this.handle + '.close("'+id+'");');
-	unHideMe($('stcont_' + id));
-	$(id).setAttribute('ostate','2');
+ if($(id).getAttribute('ostate') == '2') return;
+ var link = $('stlink_' + id);
+ if(!link) return;
+ if(id != this.rootid || !this.rootimg) {
+  removeChildren(link);
+  _apc(link,stimgclose.cloneNode(true));
+ }
+ link.setAttribute('href','javascript:' + this.handle + '.close("'+id+'");');
+ unHideMe($('stcont_' + id));
+ $(id).setAttribute('ostate','2');
 }
 
 SlimTree.prototype.close = function(id) {
-	var link = $('stlink_' + id);
-	if(!link) return;
-	if(id != this.rootid || !this.rootimg) {
-		removeChildren(link);
-		_apc(link,stimgopen.cloneNode(true));
-	}
-	link.setAttribute('href','javascript:' + this.handle + '.open("'+id+'");');
-	hideMe($('stcont_' + id));
-	$(id).setAttribute('ostate','1');
+ var link = $('stlink_' + id);
+ if(!link) return;
+ if(id != this.rootid || !this.rootimg) {
+  removeChildren(link);
+  _apc(link,stimgopen.cloneNode(true));
+ }
+ link.setAttribute('href','javascript:' + this.handle + '.open("'+id+'");');
+ hideMe($('stcont_' + id));
+ $(id).setAttribute('ostate','1');
 }
 
diff --git a/Open-ILS/web/opac/common/js/sorttable.js b/Open-ILS/web/opac/common/js/sorttable.js
index 710da47578..f289da8fd6 100644
--- a/Open-ILS/web/opac/common/js/sorttable.js
+++ b/Open-ILS/web/opac/common/js/sorttable.js
@@ -1,7 +1,7 @@
 /* 
-	Changed HTML entities to hex encoded entities
-	bill erickson
-	*/
+ Changed HTML entities to hex encoded entities
+ bill erickson
+ */
 
 addEvent(window, "load", sortables_init);
 
@@ -31,29 +31,29 @@ function ts_makeSortable(table) {
         var cell = firstRow.cells[i];
         var txt = ts_getInnerText(cell);
         cell.innerHTML = '<a href="#" class="sortheader" onclick="ts_resortTable(this);return false;">'
-			+ txt +'<span class="sortarrow">&#160;&#160;&#160;</span></a>';
+   + txt +'<span class="sortarrow">&#160;&#160;&#160;</span></a>';
     }
 }
 
 function ts_getInnerText(el) {
-	if (typeof el == "string") return el;
-	if (typeof el == "undefined") { return el };
-	if (el.innerText) return el.innerText;	//Not needed but it is faster
-	var str = "";
-	
-	var cs = el.childNodes;
-	var l = cs.length;
-	for (var i = 0; i < l; i++) {
-		switch (cs[i].nodeType) {
-			case 1: //ELEMENT_NODE
-				str += ts_getInnerText(cs[i]);
-				break;
-			case 3:	//TEXT_NODE
-				str += cs[i].nodeValue;
-				break;
-		}
-	}
-	return str;
+ if (typeof el == "string") return el;
+ if (typeof el == "undefined") { return el };
+ if (el.innerText) return el.innerText; //Not needed but it is faster
+ var str = "";
+ 
+ var cs = el.childNodes;
+ var l = cs.length;
+ for (var i = 0; i < l; i++) {
+  switch (cs[i].nodeType) {
+   case 1: //ELEMENT_NODE
+    str += ts_getInnerText(cs[i]);
+    break;
+   case 3: //TEXT_NODE
+    str += cs[i].nodeValue;
+    break;
+  }
+ }
+ return str;
 }
 
 function ts_resortTable(lnk) {
@@ -70,7 +70,7 @@ function ts_resortTable(lnk) {
     // Work out a type for the column
     if (table.rows.length <= 1) return;
     var itm = ts_getInnerText(table.rows[1].cells[column]);
-	 if(!itm) return;
+  if(!itm) return;
     sortfn = ts_sort_caseinsensitive;
     if (itm.match(/^\d\d[\/-]\d\d[\/-]\d\d\d\d$/)) sortfn = ts_sort_date;
     if (itm.match(/^\d\d[\/-]\d\d[\/-]\d\d$/)) sortfn = ts_sort_date;
@@ -113,11 +113,11 @@ function ts_resortTable(lnk) {
 }
 
 function getParent(el, pTagName) {
-	if (el == null) return null;
-	else if (el.nodeType == 1 && el.tagName.toLowerCase() == pTagName.toLowerCase())	// Gecko bug, supposed to be uppercase
-		return el;
-	else
-		return getParent(el.parentNode, pTagName);
+ if (el == null) return null;
+ else if (el.nodeType == 1 && el.tagName.toLowerCase() == pTagName.toLowerCase()) // Gecko bug, supposed to be uppercase
+  return el;
+ else
+  return getParent(el.parentNode, pTagName);
 }
 function ts_sort_date(a,b) {
     // y2k notes: two digit years less than 50 are treated as 20XX, greater than 50 are treated as 19XX
diff --git a/Open-ILS/web/opac/common/js/utils.js b/Open-ILS/web/opac/common/js/utils.js
index aeae80decf..3d3d77db73 100644
--- a/Open-ILS/web/opac/common/js/utils.js
+++ b/Open-ILS/web/opac/common/js/utils.js
@@ -1,55 +1,55 @@
 function $(id) { return getId(id); }
 function getId(id) {
-	return document.getElementById(id);
+ return document.getElementById(id);
 }
 
 function swapCSSClass(obj, old, newc ) {
-	removeCSSClass(obj, old );
-	addCSSClass(obj, newc );
+ removeCSSClass(obj, old );
+ addCSSClass(obj, newc );
 }
 
 
 function addCSSClass(e,c) {
-	if(!e || !c) return;
+ if(!e || !c) return;
 
-	var css_class_string = e.className;
-	var css_class_array;
+ var css_class_string = e.className;
+ var css_class_array;
 
-	if(css_class_string)
-		css_class_array = css_class_string.split(/\s+/);
+ if(css_class_string)
+  css_class_array = css_class_string.split(/\s+/);
 
-	var string_ip = ""; /*strip out nulls*/
-	for (var css_class in css_class_array) {
-		if (css_class_array[css_class] == c) { return; }
-		if(css_class_array[css_class] !=null)
-			string_ip += css_class_array[css_class] + " ";
-	}
-	string_ip += c;
-	e.className = string_ip;
+ var string_ip = ""; /*strip out nulls*/
+ for (var css_class in css_class_array) {
+  if (css_class_array[css_class] == c) { return; }
+  if(css_class_array[css_class] !=null)
+   string_ip += css_class_array[css_class] + " ";
+ }
+ string_ip += c;
+ e.className = string_ip;
 }
 
 function removeCSSClass(e, c) {
-	if(!e || !c) return;
+ if(!e || !c) return;
 
-	var css_class_string = '';
+ var css_class_string = '';
 
-	var css_class_array = e.className;
-	if( css_class_array )
-		css_class_array = css_class_array.split(/\s+/);
+ var css_class_array = e.className;
+ if( css_class_array )
+  css_class_array = css_class_array.split(/\s+/);
 
-	var first = 1;
-	for (var css_class in css_class_array) {
-		if (css_class_array[css_class] != c) {
-			if (first == 1) {
-				css_class_string = css_class_array[css_class];
-				first = 0;
-			} else {
-				css_class_string = css_class_string + ' ' +
-					css_class_array[css_class];
-			}
-		}
-	}
-	e.className = css_class_string;
+ var first = 1;
+ for (var css_class in css_class_array) {
+  if (css_class_array[css_class] != c) {
+   if (first == 1) {
+    css_class_string = css_class_array[css_class];
+    first = 0;
+   } else {
+    css_class_string = css_class_string + ' ' +
+     css_class_array[css_class];
+   }
+  }
+ }
+ e.className = css_class_string;
 }
 
 
@@ -72,21 +72,21 @@ function userPressedEnter(evt) {
 
 
 function goTo(url) {
-	/* setTimeout because ie sux */
-	setTimeout( function(){ location.href = url; }, 0 );
+ /* setTimeout because ie sux */
+ setTimeout( function(){ location.href = url; }, 0 );
 }
 
 
 function removeChildren(dom) {
-	if(!dom) return;
-	while(dom.childNodes[0])
-		dom.removeChild(dom.childNodes[0]);
+ if(!dom) return;
+ while(dom.childNodes[0])
+  dom.removeChild(dom.childNodes[0]);
 }
 
 function appendClear(node, child) {
-	if(typeof child =='string') child = text(child);
-	removeChildren(node);
-	node.appendChild(child);
+ if(typeof child =='string') child = text(child);
+ removeChildren(node);
+ node.appendChild(child);
 }
 
 
@@ -142,16 +142,16 @@ detect_browser();
 
 
 function text(t) {
-	if(t == null) t = "";
-	return document.createTextNode(t);
+ if(t == null) t = "";
+ return document.createTextNode(t);
 }
 
 function elem(name, attrs, txt) {
     var e = document.createElement(name);
     if (attrs) {
         for (key in attrs) {
-			  if( key == 'id') e.id = attrs[key];
-			  else e.setAttribute(key, attrs[key]);
+     if( key == 'id') e.id = attrs[key];
+     else e.setAttribute(key, attrs[key]);
         }
     }
     if (txt) e.appendChild(text(txt));
@@ -160,207 +160,207 @@ function elem(name, attrs, txt) {
 
 
 /* sel is the selector object, sets selected on the 
-	option with the given value. case does not matter...*/
+ option with the given value. case does not matter...*/
 function setSelector( sel, value ) {
-	if(sel && value != null) {
-		for( var i = 0; i!= sel.options.length; i++ ) { 
-			if( sel.options[i] ) {
-				var val = sel.options[i].value;
-				if( val == null || val == "" ) /* for IE */
-					val = sel.options[i].innerHTML;
-				value += ""; /* in case of number */ 
-				if( val && val.toLowerCase() == value.toLowerCase() ) {
-					sel.selectedIndex = i;
-					sel.options[i].selected = true;
-					return true;
-				}
-			}
-		}
-	}
-	return false;
+ if(sel && value != null) {
+  for( var i = 0; i!= sel.options.length; i++ ) { 
+   if( sel.options[i] ) {
+    var val = sel.options[i].value;
+    if( val == null || val == "" ) /* for IE */
+     val = sel.options[i].innerHTML;
+    value += ""; /* in case of number */ 
+    if( val && val.toLowerCase() == value.toLowerCase() ) {
+     sel.selectedIndex = i;
+     sel.options[i].selected = true;
+     return true;
+    }
+   }
+  }
+ }
+ return false;
 }
 
 function setSelectorRegex( sel, regex ) {
-	if(sel && regex != null) {
-		for( var i = 0; i!= sel.options.length; i++ ) { 
-			if( sel.options[i] ) {
-				var val = sel.options[i].value;
-				if( val == null || val == "" ) /* for IE */
-					val = sel.options[i].innerHTML;
-				value += ""; /* in case of number */ 
-				if( val && val.match(regex) ) {
-					sel.selectedIndex = i;
-					sel.options[i].selected = true;
-					return true;
-				}
-			}
-		}
-	}
-	return false;
+ if(sel && regex != null) {
+  for( var i = 0; i!= sel.options.length; i++ ) { 
+   if( sel.options[i] ) {
+    var val = sel.options[i].value;
+    if( val == null || val == "" ) /* for IE */
+     val = sel.options[i].innerHTML;
+    value += ""; /* in case of number */ 
+    if( val && val.match(regex) ) {
+     sel.selectedIndex = i;
+     sel.options[i].selected = true;
+     return true;
+    }
+   }
+  }
+ }
+ return false;
 }
 
 function getSelectorVal( sel ) {
-	if(!sel) return null;
-	var idx = sel.selectedIndex;
-	if( idx < 0 ) return null;
-	var o = sel.options[idx];
-	var v = o.value; 
-	if(v == null) v = o.innerHTML;
-	return v;
+ if(!sel) return null;
+ var idx = sel.selectedIndex;
+ if( idx < 0 ) return null;
+ var o = sel.options[idx];
+ var v = o.value; 
+ if(v == null) v = o.innerHTML;
+ return v;
 }
 
 function getSelectorName( sel ) {
-	var o = sel.options[sel.selectedIndex];
-	var v = o.name;
-	if(v == null || v == undefined || v == "") v = o.innerHTML;
-	return v;
+ var o = sel.options[sel.selectedIndex];
+ var v = o.name;
+ if(v == null || v == undefined || v == "") v = o.innerHTML;
+ return v;
 }
 
 function setSelectorByName( sel, name ) {
-	for( var o in sel.options ) {
-		var opt = sel.options[o];
-		if( opt.name == name || opt.innerHTML == name ) {
-			sel.selectedIndex = o;
-			opt.selected = true;
-		}
-	}
+ for( var o in sel.options ) {
+  var opt = sel.options[o];
+  if( opt.name == name || opt.innerHTML == name ) {
+   sel.selectedIndex = o;
+   opt.selected = true;
+  }
+ }
 }
 
 function findSelectorOptByValue( sel, val ) {
-	for( var i = 0; i < sel.options.length; i++ ) {
-		var opt = sel.options[i];
-		if( opt.value == val ) return opt;
-	}
-	return null;
+ for( var i = 0; i < sel.options.length; i++ ) {
+  var opt = sel.options[i];
+  if( opt.value == val ) return opt;
+ }
+ return null;
 }
 
 function debugSelector(sel) {
-	var s = 'Selector\n';
-	for( var i = 0; i != sel.options.length; i++ ) {
-		var o = sel.options[i];
-		s += "\t" + o.innerHTML + "\n";
-	}
-	return s;
+ var s = 'Selector\n';
+ for( var i = 0; i != sel.options.length; i++ ) {
+  var o = sel.options[i];
+  s += "\t" + o.innerHTML + "\n";
+ }
+ return s;
 }
 
 function findParentByNodeName(node, name) {
-	while( ( node = node.parentNode) ) 
-		if (node.nodeName == name) return node;
-	return null;
+ while( ( node = node.parentNode) ) 
+  if (node.nodeName == name) return node;
+ return null;
 }
 
 /* returns only elements in nodes childNodes list, not sub-children */
 function getElementsByTagNameFlat( node, name ) {
-	var elements = [];
-	for( var e in node.childNodes ) {
-		var n = node.childNodes[e];
-		if( n && n.nodeName == name ) elements.push(n);
-	}
-	return elements;
+ var elements = [];
+ for( var e in node.childNodes ) {
+  var n = node.childNodes[e];
+  if( n && n.nodeName == name ) elements.push(n);
+ }
+ return elements;
 }
 
 /* expects a tree with a id() method on each node and a 
 children() method to get to each node */
 function findTreeItemById( tree, id ) {
-	if( tree.id() == id ) return tree;
-	for( var c in tree.children() ) {
-		var found = findTreeItemById( tree.children()[c], id );
-		if(found) return found;
-	}
-	return null;
+ if( tree.id() == id ) return tree;
+ for( var c in tree.children() ) {
+  var found = findTreeItemById( tree.children()[c], id );
+  if(found) return found;
+ }
+ return null;
 }
 
 /* returns null if none of the tests are true.  returns sub-array of 
 matching array items otherwise */
 function grep( arr, func ) {
-	var results = [];
-	if(!arr) return null;
-	if( arr.constructor == Array ) {
-		for( var i = 0; i < arr.length; i++ ) {
-			if( func(arr[i]) ) 
-				results.push(arr[i]);
-		}
-	} else {
-		for( var i in arr ) {
-			if( func(arr[i]) ) 
-				results.push(arr[i]);
-		}
-	}
-	if(results.length > 0) return results;
-	return null;
+ var results = [];
+ if(!arr) return null;
+ if( arr.constructor == Array ) {
+  for( var i = 0; i < arr.length; i++ ) {
+   if( func(arr[i]) ) 
+    results.push(arr[i]);
+  }
+ } else {
+  for( var i in arr ) {
+   if( func(arr[i]) ) 
+    results.push(arr[i]);
+  }
+ }
+ if(results.length > 0) return results;
+ return null;
 }
 
 function ogrep( obj, func ) {
-	var results = {};
-	var found = false;
-	for( var i in obj ) {
-		if( func(obj[i]) ) {
-			results[i] = obj[i];
-			found = true;
-		}
-	}
-	if(found) return results;
-	return null;
+ var results = {};
+ var found = false;
+ for( var i in obj ) {
+  if( func(obj[i]) ) {
+   results[i] = obj[i];
+   found = true;
+  }
+ }
+ if(found) return results;
+ return null;
 }
 
 function doSelectorActions(sel) {
-	if((IE || Safari) && sel) { 
-		sel.onchange = function() {
-			var o = sel.options[sel.selectedIndex];
-			if(o && o.onclick) o.onclick()
-		}
-	}
+ if((IE || Safari) && sel) { 
+  sel.onchange = function() {
+   var o = sel.options[sel.selectedIndex];
+   if(o && o.onclick) o.onclick()
+  }
+ }
 }
 
 /* if index < 0, the item is pushed onto the end */
 function insertSelectorVal( selector, index, name, value, action, indent ) {
-	if( index < 0 ) index = selector.options.length;
-	var a = [];
-	for( var i = selector.options.length; i != index; i-- ) 
-		a[i] = selector.options[i-1];
+ if( index < 0 ) index = selector.options.length;
+ var a = [];
+ for( var i = selector.options.length; i != index; i-- ) 
+  a[i] = selector.options[i-1];
 
-	var opt = setSelectorVal( selector, index, name, value, action, indent );
+ var opt = setSelectorVal( selector, index, name, value, action, indent );
 
-	for( var i = index + 1; i < a.length; i++ ) 
-		selector.options[i] = a[i];
+ for( var i = index + 1; i < a.length; i++ ) 
+  selector.options[i] = a[i];
 
-	return opt;
+ return opt;
 }
 
 /* changes the value of the option at the specified index */
 function setSelectorVal( selector, index, name, value, action, indent ) {
-	if(!indent || indent < 0) indent = 0;
-	indent = parseInt(indent);
+ if(!indent || indent < 0) indent = 0;
+ indent = parseInt(indent);
 
-	var option;
+ var option;
 
-	if(IE) {
-		var pre = elem("pre");
-		for( var i = 0; i != indent; i++ )
-			pre.appendChild(text("   "));
+ if(IE) {
+  var pre = elem("pre");
+  for( var i = 0; i != indent; i++ )
+   pre.appendChild(text("   "));
 
-		pre.appendChild(text(name));
-		option = new Option("", value);
-		selector.options[index] = option;
-		option.appendChild(pre);
-	
-	} else {
-		indent = indent * 14;
-		option= new Option(name, value);
-		option.setAttribute("style", "padding-left: "+indent+'px;');
-		selector.options[index] = option;
-		if(action) option.onclick = action;
-	}
+  pre.appendChild(text(name));
+  option = new Option("", value);
+  selector.options[index] = option;
+  option.appendChild(pre);
+ 
+ } else {
+  indent = indent * 14;
+  option= new Option(name, value);
+  option.setAttribute("style", "padding-left: "+indent+'px;');
+  selector.options[index] = option;
+  if(action) option.onclick = action;
+ }
 
-	if(action) option.onclick = action;
-	return option;
+ if(action) option.onclick = action;
+ return option;
 }
 
 
 /* split on spaces.  capitalize the first /\w/ character in
    each substring */
 function normalize(val) {
-	return val; /* disable me for now */
+ return val; /* disable me for now */
 
    if(!val) return ""; 
 
@@ -398,10 +398,10 @@ function normalize(val) {
 
 /* returns true if n is null or stringifies to 'undefined' */
 function isNull(n) {
-	if( n == null || n == undefined || n.toString().toLowerCase() == "undefined" 
-		|| n.toString().toLowerCase() == "null" )
-		return true;
-	return false;
+ if( n == null || n == undefined || n.toString().toLowerCase() == "undefined" 
+  || n.toString().toLowerCase() == "null" )
+  return true;
+ return false;
 }
 
 
@@ -410,43 +410,43 @@ function isNull(n) {
 function $n( root, nodeName ) { return findNodeByName(root,nodeName); }
 
 function findNodeByName(root, nodeName) {
-	if( !root || !nodeName) return null;
+ if( !root || !nodeName) return null;
 
-	if(root.nodeType != 1) return null;
+ if(root.nodeType != 1) return null;
 
-	if(root.getAttribute("name") == nodeName || root.name == nodeName ) 
-		return root;
+ if(root.getAttribute("name") == nodeName || root.name == nodeName ) 
+  return root;
 
-	var children = root.childNodes;
+ var children = root.childNodes;
 
-	for( var i = 0; i != children.length; i++ ) {
-		var n = findNodeByName(children[i], nodeName);
-		if(n) return n;
-	}
+ for( var i = 0; i != children.length; i++ ) {
+  var n = findNodeByName(children[i], nodeName);
+  if(n) return n;
+ }
 
-	return null;
+ return null;
 }
 
 
 /* truncates the string at 'size' characters and appends a '...' to the end */
 function truncate(string, size) {
-	if(string && size != null && 
-			size > -1 && string.length > size) 
-		return string.substr(0, size) + "... "; 
-	return string;
+ if(string && size != null && 
+   size > -1 && string.length > size) 
+  return string.substr(0, size) + "... "; 
+ return string;
 }
 
 
 /* style sheets must have a 'name' attribute for these functions to work */
 function setActivateStyleSheet(name) {
-	var i, a, main;
-	for (i = 0; (a = document.getElementsByTagName ("link")[i]); i++) {
-		if (a.getAttribute ("rel").indexOf ("style") != -1 && a.getAttribute ("name")) {
-			a.disabled = true;
-			if (a.getAttribute ("name").indexOf(name) != -1)
-				a.disabled = false;
-		}
-	}
+ var i, a, main;
+ for (i = 0; (a = document.getElementsByTagName ("link")[i]); i++) {
+  if (a.getAttribute ("rel").indexOf ("style") != -1 && a.getAttribute ("name")) {
+   a.disabled = true;
+   if (a.getAttribute ("name").indexOf(name) != -1)
+    a.disabled = false;
+  }
+ }
 }
 
 
@@ -454,65 +454,65 @@ function setActivateStyleSheet(name) {
 var currentFontSize;
 function scaleFonts(type) {
 
-	var size		= "";
-	var ssize	= "";
-	var size2	= "";
-	var a;
-	
-	if(!currentFontSize) currentFontSize = 'regular';
-	if(currentFontSize == 'regular' && type == 'regular' ) return;
-	if( currentFontSize == type ) return;
-	currentFontSize = type;
-
-	switch(type) {
-		case "large":  /* these are arbitrary.. but they seem to work ok in FF/IE */
-			size = "142%"; 
-			size2 = "107%"; 
-			ssize = "94%";
-			break;
-	}
-
-	document.getElementsByTagName('body')[0].style.fontSize = size;
-	for (i = 0; (a = document.getElementsByTagName ("td")[i]); i++) a.style.fontSize = size;;
-	for (i = 0; (a = document.getElementsByTagName ("div")[i]); i++) a.style.fontSize = ssize;
-	for (i = 0; (a = document.getElementsByTagName ("option")[i]); i++) a.style.fontSize = ssize;
-	for (i = 0; (a = document.getElementsByTagName ("li")[i]); i++) a.style.fontSize = ssize;
-	for (i = 0; (a = document.getElementsByTagName ("span")[i]); i++) a.style.fontSize = ssize;
-	for (i = 0; (a = document.getElementsByTagName ("select")[i]); i++) a.style.fontSize = ssize;
-	for (i = 0; (a = document.getElementsByTagName ("a")[i]); i++) a.style.fontSize = size2;
+ var size  = "";
+ var ssize = "";
+ var size2 = "";
+ var a;
+ 
+ if(!currentFontSize) currentFontSize = 'regular';
+ if(currentFontSize == 'regular' && type == 'regular' ) return;
+ if( currentFontSize == type ) return;
+ currentFontSize = type;
+
+ switch(type) {
+  case "large":  /* these are arbitrary.. but they seem to work ok in FF/IE */
+   size = "142%"; 
+   size2 = "107%"; 
+   ssize = "94%";
+   break;
+ }
+
+ document.getElementsByTagName('body')[0].style.fontSize = size;
+ for (i = 0; (a = document.getElementsByTagName ("td")[i]); i++) a.style.fontSize = size;;
+ for (i = 0; (a = document.getElementsByTagName ("div")[i]); i++) a.style.fontSize = ssize;
+ for (i = 0; (a = document.getElementsByTagName ("option")[i]); i++) a.style.fontSize = ssize;
+ for (i = 0; (a = document.getElementsByTagName ("li")[i]); i++) a.style.fontSize = ssize;
+ for (i = 0; (a = document.getElementsByTagName ("span")[i]); i++) a.style.fontSize = ssize;
+ for (i = 0; (a = document.getElementsByTagName ("select")[i]); i++) a.style.fontSize = ssize;
+ for (i = 0; (a = document.getElementsByTagName ("a")[i]); i++) a.style.fontSize = size2;
 }
 
 
 function sortWordsIgnoreCase(a, b) {
-	a = a.toLowerCase();
-	b = b.toLowerCase();
-	if(a>b) return 1;
-	if(a<b) return -1;
-	return 0;
+ a = a.toLowerCase();
+ b = b.toLowerCase();
+ if(a>b) return 1;
+ if(a<b) return -1;
+ return 0;
 }
 
 
 function getSelectedList(sel) {
-	if(!sel) return [];
-	var vals = [];
-	for( var i = 0; i != sel.options.length; i++ ) {
-		if(sel.options[i].selected)
-			vals.push(sel.options[i].value);
-	}
-	return vals;
+ if(!sel) return [];
+ var vals = [];
+ for( var i = 0; i != sel.options.length; i++ ) {
+  if(sel.options[i].selected)
+   vals.push(sel.options[i].value);
+ }
+ return vals;
 }
 
 
 function setEnterFunc(node, func) {
-	if(!(node && func)) return;
-	node.onkeydown = function(evt) {
-		if( userPressedEnter(evt)) func();
-	}
+ if(!(node && func)) return;
+ node.onkeydown = function(evt) {
+  if( userPressedEnter(evt)) func();
+ }
 }
 
 function iterate( arr, callback ) {
-	for( var i = 0; arr && i < arr.length; i++ ) 
-		callback(arr[i]);
+ for( var i = 0; arr && i < arr.length; i++ ) 
+  callback(arr[i]);
 }
 
 
@@ -525,61 +525,61 @@ it sees that, and the staff client uses both this file and the
 JSAN library*/
 function interval_to_seconds( $interval ) {
 
-	$interval = $interval.replace( /and/, ',' );
-	$interval = $interval.replace( /,/, ' ' );
-	
-	var $amount = 0;
-	var results = $interval.match( /\s*\+?\s*(\d+)\s*(\w{1})\w*\s*/g);  
-	for( var i = 0; i < results.length; i++ ) {
-		if(!results[i]) continue;
-		var result = results[i].match( /\s*\+?\s*(\d+)\s*(\w{1})\w*\s*/ );
-		if (result[2] == 's') $amount += result[1] ;
-		if (result[2] == 'm') $amount += 60 * result[1] ;
-		if (result[2] == 'h') $amount += 60 * 60 * result[1] ;
-		if (result[2] == 'd') $amount += 60 * 60 * 24 * result[1] ;
-		if (result[2] == 'w') $amount += 60 * 60 * 24 * 7 * result[1] ;
-		if (result[2] == 'M') $amount += ((60 * 60 * 24 * 365)/12) * result[1] ;
-		if (result[2] == 'y') $amount += 60 * 60 * 24 * 365 * result[1] ;
-	}
-	return $amount;
+ $interval = $interval.replace( /and/, ',' );
+ $interval = $interval.replace( /,/, ' ' );
+ 
+ var $amount = 0;
+ var results = $interval.match( /\s*\+?\s*(\d+)\s*(\w{1})\w*\s*/g);  
+ for( var i = 0; i < results.length; i++ ) {
+  if(!results[i]) continue;
+  var result = results[i].match( /\s*\+?\s*(\d+)\s*(\w{1})\w*\s*/ );
+  if (result[2] == 's') $amount += result[1] ;
+  if (result[2] == 'm') $amount += 60 * result[1] ;
+  if (result[2] == 'h') $amount += 60 * 60 * result[1] ;
+  if (result[2] == 'd') $amount += 60 * 60 * 24 * result[1] ;
+  if (result[2] == 'w') $amount += 60 * 60 * 24 * 7 * result[1] ;
+  if (result[2] == 'M') $amount += ((60 * 60 * 24 * 365)/12) * result[1] ;
+  if (result[2] == 'y') $amount += 60 * 60 * 24 * 365 * result[1] ;
+ }
+ return $amount;
 }
 
 
 function openWindow( data ) {
-	if( isXUL() ) {
-		var data = window.escape(
-			'<html><head><title></title></head><body>' + data + '</body></html>');
+ if( isXUL() ) {
+  var data = window.escape(
+   '<html><head><title></title></head><body>' + data + '</body></html>');
 
-		xulG.window_open(
-			'data:text/html,' + data,
-			'', 
-			'chrome,resizable,width=700,height=500'); 
+  xulG.window_open(
+   'data:text/html,' + data,
+   '', 
+   'chrome,resizable,width=700,height=500'); 
 
-	} else {
-		win = window.open('','', 'resizable,width=700,height=500,scrollbars=1'); 
-		win.document.body.innerHTML = data;
-	}
+ } else {
+  win = window.open('','', 'resizable,width=700,height=500,scrollbars=1'); 
+  win.document.body.innerHTML = data;
+ }
 }
 
 
 /* alerts the innerhtml of the node with the given id */
 function alertId(id) {
-	var node = $(id);
-	if(node) alert(node.innerHTML);
+ var node = $(id);
+ if(node) alert(node.innerHTML);
 }
 
 function alertIdText(id, text) {
-	var node = $(id);
+ var node = $(id);
    if(!node) return;
    if(text)
       alert(text + '\n\n' + node.innerHTML);
    else 
-	   alert(node.innerHTML);
+    alert(node.innerHTML);
 }
 
 function confirmId(id) {
-	var node = $(id);
-	if(node) return confirm(node.innerHTML);
+ var node = $(id);
+ if(node) return confirm(node.innerHTML);
 }
 
 
@@ -588,97 +588,97 @@ function goForward() { history.forward(); }
 
 
 function uniquify(arr) {
-	if(!arr) return [];
-	var newarr = [];
-	for( var i = 0; i < arr.length; i++ ) {
-		var item = arr[i];
-		if( ! grep( newarr, function(x) {return (x == item);}))
-			newarr.push(item);
-	}
-	return newarr;
+ if(!arr) return [];
+ var newarr = [];
+ for( var i = 0; i < arr.length; i++ ) {
+  var item = arr[i];
+  if( ! grep( newarr, function(x) {return (x == item);}))
+   newarr.push(item);
+ }
+ return newarr;
 }
 
 function contains(arr, item) {
-	for( var i = 0; i < arr.length; i++ ) 
-		if( arr[i] == item ) return true;
-	return false;
+ for( var i = 0; i < arr.length; i++ ) 
+  if( arr[i] == item ) return true;
+ return false;
 }
 
 function isTrue(i) {
-	return (i && !(i+'').match(/f/i) );
+ return (i && !(i+'').match(/f/i) );
 }
 
 
 /* builds a JS date object with the given info.  The given data
-	has to be valid (e.g. months == 30 is not valid).  Returns NULL on 
-	invalid date 
-	Months are 1-12 (unlike the JS date object)
-	*/
+ has to be valid (e.g. months == 30 is not valid).  Returns NULL on 
+ invalid date 
+ Months are 1-12 (unlike the JS date object)
+ */
 
 function buildDate( year, month, day, hours, minutes, seconds ) {
 
-	if(!year) year = 0;
-	if(!month) month = 1;
-	if(!day) day = 1;
-	if(!hours) hours = 0;
-	if(!minutes) minutes = 0;
-	if(!seconds) seconds = 0;
-
-	var d = new Date(year, month - 1, day, hours, minutes, seconds);
-	
-	_debug('created date with ' +
-		(d.getYear() + 1900) +'-'+
-		(d.getMonth() + 1) +'-'+
-		d.getDate()+' '+
-		d.getHours()+':'+
-		d.getMinutes()+':'+
-		d.getSeconds());
-
-
-	if( 
-		(d.getYear() + 1900) == year &&
-		d.getMonth()	== (month - 1) &&
-		d.getDate()		== new Number(day) &&
-		d.getHours()	== new Number(hours) &&
-		d.getMinutes() == new Number(minutes) &&
-		d.getSeconds() == new Number(seconds) ) {
-		return d;
-	}
-
-	return null;
+ if(!year) year = 0;
+ if(!month) month = 1;
+ if(!day) day = 1;
+ if(!hours) hours = 0;
+ if(!minutes) minutes = 0;
+ if(!seconds) seconds = 0;
+
+ var d = new Date(year, month - 1, day, hours, minutes, seconds);
+ 
+ _debug('created date with ' +
+  (d.getYear() + 1900) +'-'+
+  (d.getMonth() + 1) +'-'+
+  d.getDate()+' '+
+  d.getHours()+':'+
+  d.getMinutes()+':'+
+  d.getSeconds());
+
+
+ if( 
+  (d.getYear() + 1900) == year &&
+  d.getMonth() == (month - 1) &&
+  d.getDate()  == new Number(day) &&
+  d.getHours() == new Number(hours) &&
+  d.getMinutes() == new Number(minutes) &&
+  d.getSeconds() == new Number(seconds) ) {
+  return d;
+ }
+
+ return null;
 }
 
 function mkYearMonDay(date) {
-	if(!date) date = new Date();
-	var y = date.getYear() + 1900;
-	var m = (date.getMonth() + 1)+'';
-	var d = date.getDate()+'';
-	if(m.length == 1) m = '0'+m;
-	if(d.length == 1) d = '0'+d;
-	return y+'-'+m+'-'+d;
+ if(!date) date = new Date();
+ var y = date.getYear() + 1900;
+ var m = (date.getMonth() + 1)+'';
+ var d = date.getDate()+'';
+ if(m.length == 1) m = '0'+m;
+ if(d.length == 1) d = '0'+d;
+ return y+'-'+m+'-'+d;
 }
 
 
 function debugFMObject(obj) {
-	if(typeof obj != 'object' ) return obj;
-	_debug("---------------------");
-	var keys = fmclasses[obj.classname];
-	if(!keys) { _debug(formatJSON(js2JSON(obj))); return; }
-
-	keys.sort();
-	for( var i = 0; i < keys.length; i++ ) {
-		var key = keys[i];
-		while( key.length < 12 ) key += ' ';
-		var val = obj[keys[i]]();
-		if( typeof val == 'object' ) {
-			_debug(key+' :=\n');
-			_debugFMObject(val);
-		} else {
-			_debug(key+' = ' +val);
-		}
-
-	}
-	_debug("---------------------");
+ if(typeof obj != 'object' ) return obj;
+ _debug("---------------------");
+ var keys = fmclasses[obj.classname];
+ if(!keys) { _debug(formatJSON(js2JSON(obj))); return; }
+
+ keys.sort();
+ for( var i = 0; i < keys.length; i++ ) {
+  var key = keys[i];
+  while( key.length < 12 ) key += ' ';
+  var val = obj[keys[i]]();
+  if( typeof val == 'object' ) {
+   _debug(key+' :=\n');
+   _debugFMObject(val);
+  } else {
+   _debug(key+' = ' +val);
+  }
+
+ }
+ _debug("---------------------");
 }
 
 
diff --git a/Open-ILS/web/opac/extras/bbags.js b/Open-ILS/web/opac/extras/bbags.js
index be5fdc1a39..15fe780801 100644
--- a/Open-ILS/web/opac/extras/bbags.js
+++ b/Open-ILS/web/opac/extras/bbags.js
@@ -3,45 +3,45 @@
 /* maybe also a 'skin' var */
 
 function bbInit() {
-	var cgi	= new CGI();
-	var bb	= cgi.param('bb');
-	if(!bb) { unHideMe($('not_found')); return; }
-	var req = new Request(FLESH_PUBLIC_CONTAINER, 'biblio', bb);
-	req.callback( bbShow );
-	req.send();
+ var cgi = new CGI();
+ var bb = cgi.param('bb');
+ if(!bb) { unHideMe($('not_found')); return; }
+ var req = new Request(FLESH_PUBLIC_CONTAINER, 'biblio', bb);
+ req.callback( bbShow );
+ req.send();
 }
 
 
 var template;
 function bbShow(r) {
 
-	var bb = r.getResultObject();
-	if(!bb || !bb.pub()) { unHideMe($('not_found')); return; }
-	$('bb_name').appendChild(text(bb.name()));
+ var bb = r.getResultObject();
+ if(!bb || !bb.pub()) { unHideMe($('not_found')); return; }
+ $('bb_name').appendChild(text(bb.name()));
 
-	var tbody = $('tbody');
-	if(!template) template = tbody.removeChild($('row_template'));
+ var tbody = $('tbody');
+ if(!template) template = tbody.removeChild($('row_template'));
 
-	for( var i in bb.items() ) 
-		tbody.appendChild(bbShowItem( template, bb.items()[i] ));
+ for( var i in bb.items() ) 
+  tbody.appendChild(bbShowItem( template, bb.items()[i] ));
 }
 
 function bbShowItem( template, item ) {
-	var row = template.cloneNode(true);
-
-	var req = new Request( FETCH_RMODS, item.target_biblio_record_entry() );
-	req.request.tlink = $n(row, 'title');
-	req.request.alink = $n(row, 'author');
-	req.request.blink = $n(row, 'by');
-
-	req.callback( function(r) { 
-		var rec = r.getResultObject();
-		buildTitleDetailLink(rec, r.tlink); 
-		r.tlink.setAttribute('href', '/opac/en-US/skin/default/xml/rdetail.xml?r='+rec.doc_id());
-		r.alink.appendChild(text(rec.author()));
-		unHideMe(r.blink);
-	});
-
-	req.send();
-	return row;
+ var row = template.cloneNode(true);
+
+ var req = new Request( FETCH_RMODS, item.target_biblio_record_entry() );
+ req.request.tlink = $n(row, 'title');
+ req.request.alink = $n(row, 'author');
+ req.request.blink = $n(row, 'by');
+
+ req.callback( function(r) { 
+  var rec = r.getResultObject();
+  buildTitleDetailLink(rec, r.tlink); 
+  r.tlink.setAttribute('href', '/opac/en-US/skin/default/xml/rdetail.xml?r='+rec.doc_id());
+  r.alink.appendChild(text(rec.author()));
+  unHideMe(r.blink);
+ });
+
+ req.send();
+ return row;
 }
diff --git a/Open-ILS/web/opac/extras/os.css b/Open-ILS/web/opac/extras/os.css
index 50ce529a12..edc515d660 100644
--- a/Open-ILS/web/opac/extras/os.css
+++ b/Open-ILS/web/opac/extras/os.css
@@ -1,81 +1,81 @@
 body {
-	font-family: Arial, Helvetica, Sans-serif;
-	font-size: 0.9em;
-	}
+ font-family: Arial, Helvetica, Sans-serif;
+ font-size: 0.9em;
+ }
 p.nav {
-	text-align: center;
-	border-top: solid lightgray 1px;
-	border-bottom: solid lightgray 1px;
+ text-align: center;
+ border-top: solid lightgray 1px;
+ border-bottom: solid lightgray 1px;
 }
 h1 {
-	font-size: 1.5em;
-	}
+ font-size: 1.5em;
+ }
 
 input.searchbox {
-	font-size: 0.9em;
-	width: 20em;
+ font-size: 0.9em;
+ width: 20em;
 }
 
 div#searchdiv {
-	/*
-	z-index:10;
-	position: absolute;
-	top: 0;
-	right: 0;
-	*/
-	/*width:11em;*/
-	background-color: lightgray;
-	border:2px solid lightblue;
-	/*
-	border-right: 0px;
-	border-top: 0px;
-	filter: alpha(opacity=50);
-	-moz-opacity: .5;
-	*/
+ /*
+ z-index:10;
+ position: absolute;
+ top: 0;
+ right: 0;
+ */
+ /*width:11em;*/
+ background-color: lightgray;
+ border:2px solid lightblue;
+ /*
+ border-right: 0px;
+ border-top: 0px;
+ filter: alpha(opacity=50);
+ -moz-opacity: .5;
+ */
 }
 
 /*
 html>body div#searchdiv {
-	position: fixed;
+ position: fixed;
 }
 */
 
 div#header img {
-	position: absolute;
-	top: 0;
-	right: 0;
-	}
+ position: absolute;
+ top: 0;
+ right: 0;
+ }
 h1, div#header p, form p {
-	margin: 0;
-	padding: 0;
-	}
+ margin: 0;
+ padding: 0;
+ }
 form {
-	margin: 1em 0 0 3em;
-	font-size: 0.8em;
-	}
+ margin: 1em 0 0 3em;
+ font-size: 0.8em;
+ }
 input {
-	margin-right: 0.5em;
-	}
+ margin-right: 0.5em;
+ }
 dt {
-	margin-top: 1.2em;
-	}
+ margin-top: 1.2em;
+ }
 dd {
-	font-style: italic;
-	margin: 0;
-	width: 80%;
-	margin-left: 1em;
-	}
+ font-style: italic;
+ margin: 0;
+ width: 80%;
+ margin-left: 1em;
+ }
 dd.desc {
-	font-style: normal;
-	}
+ font-style: normal;
+ }
 dd.url {
-	color: #999999;
-	font-style: normal;
-	margin-left: 0;
-	}
+ color: #999999;
+ font-style: normal;
+ margin-left: 0;
+ }
 #footer {
-	text-align: center;
-	}
+ text-align: center;
+ }
 .escape { /* part of hack used to handle web browsers that don't support disable-output-escaping (e.g. Mozilla) */
-	display: inline;
-	}
+ display: inline;
+ }
diff --git a/Open-ILS/web/opac/extras/selfcheck/selfcheck.js b/Open-ILS/web/opac/extras/selfcheck/selfcheck.js
index d8ab3de700..ec2141dd9d 100644
--- a/Open-ILS/web/opac/extras/selfcheck/selfcheck.js
+++ b/Open-ILS/web/opac/extras/selfcheck/selfcheck.js
@@ -109,7 +109,7 @@ function selfckFetchOrgDetails() {
 
 function selfckSetupPrinter() {
     try { // Mozilla only
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
         netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
         netscape.security.PrivilegeManager.enablePrivilege('UniversalPreferencesRead');
         netscape.security.PrivilegeManager.enablePrivilege('UniversalPreferencesWrite');
@@ -202,7 +202,7 @@ function selfckPatronLogin(barcode) {
         'open-ils.actor:open-ils.actor.user.fleshed.retrieve_by_barcode',
         G.user.session, barcode);
 
-	bcReq.request.alertEvent = false;
+ bcReq.request.alertEvent = false;
 
     bcReq.callback(function(r) {
         patron = r.getResultObject();
@@ -284,7 +284,7 @@ function selfckCheckout(override) {
         'open-ils.circ:open-ils.circ.checkout.full' + ((override) ? '.override' : ''),
         G.user.session, {patron_id:patron.id(), copy_barcode:itemBarcode});
 
-	coReq.request.alertEvent = false;
+ coReq.request.alertEvent = false;
     coReq.callback(selfckHandleCoResult);
     coReq.send();
 }
@@ -374,8 +374,8 @@ function selfckDislplayCheckout(evt) {
     var circ = evt.payload.circ;
 
     if(record.isbn()) {
-	    var pic = $n(template, 'selfck.jacket');
-	    pic.setAttribute('src', '../ac/jacket/small/'+cleanISBN(record.isbn()));
+     var pic = $n(template, 'selfck.jacket');
+     pic.setAttribute('src', '../ac/jacket/small/'+cleanISBN(record.isbn()));
     }
     $n(template, 'selfck.barcode').appendChild(text(copy.barcode()));
     $n(template, 'selfck.title').appendChild(text(record.title()));
diff --git a/Open-ILS/web/opac/extras/slimpac/advanced.html b/Open-ILS/web/opac/extras/slimpac/advanced.html
index fcff938ea9..246644af02 100644
--- a/Open-ILS/web/opac/extras/slimpac/advanced.html
+++ b/Open-ILS/web/opac/extras/slimpac/advanced.html
@@ -7,232 +7,232 @@
 ]>
 
 <html>
-	<head>
-		<title>&opac.navigate.advanced;</title>
-		<style type="text/css">
-			.maintable {
-				border-collapse: collapse;
-				border: 3px solid #A7EA9D;
-				-moz-border-radius: 6px;
-				padding: 6px;
-				margin-top: 65px;
-			}
-			
-			.greenrow {
-				border: 1px solid #D0D0D0;
-				background: #A7EA9D;
-				height: 20px;
-			}
-
-			.bluerow {
-				border: 1px solid #D0D0D0;
-				background: #E0F6E0;
-				height: 20px;
-			}
-
-			.search_field {
-				width: 100%;
-				text-align: center;
-			}
-
-			.rowpad {
-				height: 20px;
-			}
-
-			.footer {
-				width: 100%;
-				text-align: center;
-				vertical-align: bottom;
-				margin: auto;
-				margin-top: 20px;
-			}
-
-			.footer_links {
-				width: 60%;
-				text-align: center;
-				padding: 10px;
-				font-size: 8pt;
-				margin: auto;
-			}
-
-			.footer_link {
-				margin-left: 10px; 
-				margin-right: 10px;
-			}
-
-			.copyright {
-				margin-top: 4px;
-				font-size: 7pt;
-			}
-
-			.indent0 {
-				padding-left: 0px; 
-			}
-
-			.indent1 {
-				padding-left: 10px; 
-			}
-
-			.indent2 {
-				padding-left: 20px; 
-			}
-
-			th {
-				text-align: right;
-				padding-right: 5px;
-			}
-
-		</style>
-	</head>
-	<body>
-		<center>
-
-
-		<table class="maintable">
-			<tbody>
-				<tr><td colspan="2" align="center"><b>&opac.navigate.advanced;</b></td></tr>
-				<tr class="rowpad"><td></td></tr>
-				<form method="GET" action="/opac/extras/opensearch/1.1/-/html-full">
-				<tr class="bluerow">
-					<th>&slimpac.start.nowSearching;</th>
-					<td>
-						<select name="searchOrg">
-							<!--#include file="${locale}/lib_list.inc" -->
-						</select>
-					</td>
-				</tr>
-				<tr class="rowpad"><td></td></tr>
-				<tr class="greenrow">
-					<th> &common.keywords.label; </th><td><input type="text" name="kw" size="40"/></td>
-				</tr>
-				<tr class="greenrow">
-					<th> &common.title.label; </th><td><input type="text" name="ti" size="40"/></td>
-				</tr>
-				<tr class="greenrow">
-					<th> &common.author.label; </th><td><input type="text" name="au" size="40"/></td>
-				</tr>
-				<tr class="greenrow">
-					<th> &common.subject.label; </th><td><input type="text" name="su" size="40"/></td>
-				</tr>
-				<tr class="greenrow">
-					<th> &common.series.label; </th><td><input type="text" name="se" size="40"/></td>
-				</tr>
-				<tr class="rowpad"><td></td></tr>
-				<tr class="bluerow">
-					<th>&advanced.language;</th>
-					<td>
-						<select name="searchLang">
-							<option value="">-- All --</option>
-							<option value="eng">English</option>
-							<option value="spa">Spanish</option>
-							<option value="fre">French</option>
-							<option value="ger">German</option>
-							<option value="ita">Italian</option>
-							<option value="chi">Chinese</option>
-							<option value="jpn">Japanese</option>
-							<option value="kor">Korean</option>
-							<option value="dut">Dutch</option>
-							<option value="gre">Greek, Modern (1453- )</option>
-							<option value="lat">Latin</option>
-							<option value="vie">Vietnamese</option>
-							<option value="rus">Russian</option>
-							<option value="nor">Norwegian</option>
-							<option value="wel">Welsh</option>
-							<option value="pau">Palauan</option>
-							<option value="swe">Swedish</option>
-							<option value="nav">Navajo</option>
-							<option value="und">Undetermined</option>
-						</select>
-					</td>
-				</tr>
-				<tr class="bluerow">
-					<th>&advanced.sort.criteria;</th>
-					<td>
-						<select name="searchSort">
-							<option value="">&advanced.relevance;</option>
-							<option value="title">&common.title;</option>
-							<option value="author">&common.author;</option>
-							<option value="pubdate">&advanced.pubdate;</option>
-							<option value="create_date">&slimpac.advanced.create_date;</option>
-							<option value="edit_date">&slimpac.advanced.edit_date;</option>
-						</select>
-					</td>
-				</tr>
-				<!--
-				<tr class="bluerow">
-					<th/>
-					<td>
-						<select name="searchSortDir">
-							<option value="asc">Ascending / A-Z / First-Last</option>
-							<option value="desc">Descending / Z-A / Last-First</option>
-						</select>
-					</td>
-				</tr>
-				-->
-				<tr class="rowpad"><td align="center" colspan="2"><input type="submit" value="&button.go;"/></td></tr>
-				</form>
-				<tr class="greenrow"><td colspan="2"></td></tr>
-				<form method="GET">
-				<tr class="bluerow">
-					<td colspan="2">
-						<div class='search_field'>
-								<!--#include file="locales.inc"-->
-								<input type="submit" value="&slimpac.language.select;"/>
-						</div>
-					</td>
-				</tr>
-				</form>
-
-			</tbody>
-		</table>
-
-		<div class="footer">
-			<center>
-			<div class="footer_links">
-
-				<span class='footer_link'>
-					<a class='classic_link' href='/'>&slimpac.start.dynamic;</a>
-				</span> 
-
-				<span> | </span>
-
-				<span class='footer_link'>
-					<a class='classic_link' href='start.html'>&slimpac.start.title;</a>
-				</span> 
-
-				<span> | </span>
-
-				<span class='footer_link'>
-					<a target='_blank' class='classic_link' href='&footer.find.url;'>&footer.find.library;</a>
-				</span> 
-
-				<span> | </span>
-				
-				<span class='footer_link'>
-					<a target='_blank' class='classic_link' href='&footer.help.url;'>&footer.help;</a>
-				</span>
-
-				<span> | </span>
-
-				<span class='footer_link'>
-					<a target='_blank' class='classic_link' href='&footer.library.url;'>&footer.library.about;</a>
-				</span>
-
-				<span> | </span>
-
-				<span class='footer_link'>
-					<a target='' class='classic_link' id='eg_gal_link' href='&footer.union.url;'>&footer.union;</a>
-				</span>
-				<br/>
-				<div class="copyright">
-					<span>&footer.copyright;</span>
-				</div>
-			</div>
-			</center>
-		</div>
-
-		</center>
-
-	</body>
+ <head>
+  <title>&opac.navigate.advanced;</title>
+  <style type="text/css">
+   .maintable {
+    border-collapse: collapse;
+    border: 3px solid #A7EA9D;
+    -moz-border-radius: 6px;
+    padding: 6px;
+    margin-top: 65px;
+   }
+   
+   .greenrow {
+    border: 1px solid #D0D0D0;
+    background: #A7EA9D;
+    height: 20px;
+   }
+
+   .bluerow {
+    border: 1px solid #D0D0D0;
+    background: #E0F6E0;
+    height: 20px;
+   }
+
+   .search_field {
+    width: 100%;
+    text-align: center;
+   }
+
+   .rowpad {
+    height: 20px;
+   }
+
+   .footer {
+    width: 100%;
+    text-align: center;
+    vertical-align: bottom;
+    margin: auto;
+    margin-top: 20px;
+   }
+
+   .footer_links {
+    width: 60%;
+    text-align: center;
+    padding: 10px;
+    font-size: 8pt;
+    margin: auto;
+   }
+
+   .footer_link {
+    margin-left: 10px; 
+    margin-right: 10px;
+   }
+
+   .copyright {
+    margin-top: 4px;
+    font-size: 7pt;
+   }
+
+   .indent0 {
+    padding-left: 0px; 
+   }
+
+   .indent1 {
+    padding-left: 10px; 
+   }
+
+   .indent2 {
+    padding-left: 20px; 
+   }
+
+   th {
+    text-align: right;
+    padding-right: 5px;
+   }
+
+  </style>
+ </head>
+ <body>
+  <center>
+
+
+  <table class="maintable">
+   <tbody>
+    <tr><td colspan="2" align="center"><b>&opac.navigate.advanced;</b></td></tr>
+    <tr class="rowpad"><td></td></tr>
+    <form method="GET" action="/opac/extras/opensearch/1.1/-/html-full">
+    <tr class="bluerow">
+     <th>&slimpac.start.nowSearching;</th>
+     <td>
+      <select name="searchOrg">
+       <!--#include file="${locale}/lib_list.inc" -->
+      </select>
+     </td>
+    </tr>
+    <tr class="rowpad"><td></td></tr>
+    <tr class="greenrow">
+     <th> &common.keywords.label; </th><td><input type="text" name="kw" size="40"/></td>
+    </tr>
+    <tr class="greenrow">
+     <th> &common.title.label; </th><td><input type="text" name="ti" size="40"/></td>
+    </tr>
+    <tr class="greenrow">
+     <th> &common.author.label; </th><td><input type="text" name="au" size="40"/></td>
+    </tr>
+    <tr class="greenrow">
+     <th> &common.subject.label; </th><td><input type="text" name="su" size="40"/></td>
+    </tr>
+    <tr class="greenrow">
+     <th> &common.series.label; </th><td><input type="text" name="se" size="40"/></td>
+    </tr>
+    <tr class="rowpad"><td></td></tr>
+    <tr class="bluerow">
+     <th>&advanced.language;</th>
+     <td>
+      <select name="searchLang">
+       <option value="">-- All --</option>
+       <option value="eng">English</option>
+       <option value="spa">Spanish</option>
+       <option value="fre">French</option>
+       <option value="ger">German</option>
+       <option value="ita">Italian</option>
+       <option value="chi">Chinese</option>
+       <option value="jpn">Japanese</option>
+       <option value="kor">Korean</option>
+       <option value="dut">Dutch</option>
+       <option value="gre">Greek, Modern (1453- )</option>
+       <option value="lat">Latin</option>
+       <option value="vie">Vietnamese</option>
+       <option value="rus">Russian</option>
+       <option value="nor">Norwegian</option>
+       <option value="wel">Welsh</option>
+       <option value="pau">Palauan</option>
+       <option value="swe">Swedish</option>
+       <option value="nav">Navajo</option>
+       <option value="und">Undetermined</option>
+      </select>
+     </td>
+    </tr>
+    <tr class="bluerow">
+     <th>&advanced.sort.criteria;</th>
+     <td>
+      <select name="searchSort">
+       <option value="">&advanced.relevance;</option>
+       <option value="title">&common.title;</option>
+       <option value="author">&common.author;</option>
+       <option value="pubdate">&advanced.pubdate;</option>
+       <option value="create_date">&slimpac.advanced.create_date;</option>
+       <option value="edit_date">&slimpac.advanced.edit_date;</option>
+      </select>
+     </td>
+    </tr>
+    <!--
+    <tr class="bluerow">
+     <th/>
+     <td>
+      <select name="searchSortDir">
+       <option value="asc">Ascending / A-Z / First-Last</option>
+       <option value="desc">Descending / Z-A / Last-First</option>
+      </select>
+     </td>
+    </tr>
+    -->
+    <tr class="rowpad"><td align="center" colspan="2"><input type="submit" value="&button.go;"/></td></tr>
+    </form>
+    <tr class="greenrow"><td colspan="2"></td></tr>
+    <form method="GET">
+    <tr class="bluerow">
+     <td colspan="2">
+      <div class='search_field'>
+        <!--#include file="locales.inc"-->
+        <input type="submit" value="&slimpac.language.select;"/>
+      </div>
+     </td>
+    </tr>
+    </form>
+
+   </tbody>
+  </table>
+
+  <div class="footer">
+   <center>
+   <div class="footer_links">
+
+    <span class='footer_link'>
+     <a class='classic_link' href='/'>&slimpac.start.dynamic;</a>
+    </span> 
+
+    <span> | </span>
+
+    <span class='footer_link'>
+     <a class='classic_link' href='start.html'>&slimpac.start.title;</a>
+    </span> 
+
+    <span> | </span>
+
+    <span class='footer_link'>
+     <a target='_blank' class='classic_link' href='&footer.find.url;'>&footer.find.library;</a>
+    </span> 
+
+    <span> | </span>
+    
+    <span class='footer_link'>
+     <a target='_blank' class='classic_link' href='&footer.help.url;'>&footer.help;</a>
+    </span>
+
+    <span> | </span>
+
+    <span class='footer_link'>
+     <a target='_blank' class='classic_link' href='&footer.library.url;'>&footer.library.about;</a>
+    </span>
+
+    <span> | </span>
+
+    <span class='footer_link'>
+     <a target='' class='classic_link' id='eg_gal_link' href='&footer.union.url;'>&footer.union;</a>
+    </span>
+    <br/>
+    <div class="copyright">
+     <span>&footer.copyright;</span>
+    </div>
+   </div>
+   </center>
+  </div>
+
+  </center>
+
+ </body>
 </html>
 
diff --git a/Open-ILS/web/opac/extras/slimpac/start.html b/Open-ILS/web/opac/extras/slimpac/start.html
index e5cc48abb6..f5002038e5 100644
--- a/Open-ILS/web/opac/extras/slimpac/start.html
+++ b/Open-ILS/web/opac/extras/slimpac/start.html
@@ -7,187 +7,187 @@
 ]>
 
 <html>
-	<head>
-		<title>&slimpac.start.title;</title>
-		<style type="text/css">
-			.maintable {
-				border-collapse: collapse;
-				border: 3px solid #A7EA9D;
-				-moz-border-radius: 6px;
-				padding: 6px;
-				margin-top: 65px;
-			}
-			
-			.greenrow {
-				border: 1px solid #D0D0D0;
-				background: #A7EA9D;
-				height: 20px;
-			}
-
-			.bluerow {
-				border: 1px solid #D0D0D0;
-				background: #E0F6E0;
-				height: 20px;
-			}
-
-			.rowpad {
-				height: 20px;
-			}
-
-			.footer {
-				width: 100%;
-				text-align: center;
-				vertical-align: bottom;
-				margin: auto;
-				margin-top: 20px;
-			}
-
-			.footer_links {
-				width: 60%;
-				text-align: center;
-				padding: 10px;
-				font-size: 8pt;
-				margin: auto;
-			}
-
-			.footer_link {
-				margin-left: 10px; 
-				margin-right: 10px;
-			}
-
-			.copyright {
-				margin-top: 4px;
-				font-size: 7pt;
-			}
-
-			.indent0 {
-				padding-left: 0px; 
-			}
-
-			.indent1 {
-				padding-left: 10px; 
-			}
-
-			.indent2 {
-				padding-left: 20px; 
-			}
-
-			.search_field {
-				width: 100%;
-				text-align: center;
-				margin: auto;
-			}
-
-		</style>
-	</head>
-	<body>
-		<center>
-
-
-		<table class="maintable">
-			<tbody>
-				<tr>
-					<td>
-						<div class='search_field'>
-							<img src='/opac/images/main_logo.jpg' alt=''/>
-						</div>
-					</td>
-				</tr>
-				<tr class="rowpad"><td></td></tr>
-				<form method="GET" action="/opac/extras/opensearch/1.1/-/html-full">
-				<tr class="bluerow">
-					<td>
-						<div class='search_field'>
-							<span>&slimpac.start.nowSearching;</span>
-							<select name="searchOrg">
-								<!--#include file="${locale}/lib_list.inc" -->
-							</select>
-						</div>
-					</td>
-				</tr>
-				<tr class="rowpad"><td></td></tr>
-				<tr class="greenrow">
-					<td>
-						<div class='search_field'>
-
-							<input type="text" name="searchTerms" size="40"/>
-
-							<select name="searchClass">
-								<option value="keyword">&common.keyword;</option>
-								<option value="title">&common.title;</option>
-								<option value="author">&common.author;</option>
-								<option value="subject">&common.subject;</option>
-								<option value="series">&common.series;</option>
-							</select>
-
-							<input type="submit" value="&button.go;"/>
-						</div>
-					</td>
-				</tr>
-				</form>
-				<tr class="bluerow"><td></td></tr>
-				<form method="GET">
-				<tr class="greenrow">
-					<td>
-						<div class='search_field'>
-								<!--#include file="locales.inc"-->
-								<input type="submit" value="&slimpac.language.select;"/>
-						</div>
-					</td>
-				</tr>
-				</form>
-				<tr class="rowpad"><td></td></tr>
-			</tbody>
-		</table>
-
-
-		<div class="footer">
-			<center>
-			<div class="footer_links">
-
-				<span class='footer_link'>
-					<a class='classic_link' href='/'>&slimpac.start.dynamic;</a>
-				</span> 
-
-				<span> | </span>
-
-				<span class='footer_link'>
-					<a class='classic_link' href='advanced.html'>&opac.navigate.advanced;</a>
-				</span> 
-
-				<span> | </span>
-
-				<span class='footer_link'>
-					<a target='_blank' class='classic_link' href='&footer.find.url;'>&footer.find.library;</a>
-				</span> 
-
-				<span> | </span>
-				
-				<span class='footer_link'>
-					<a target='_blank' class='classic_link' href='&footer.help.url;'>&footer.help;</a>
-				</span>
-
-				<span> | </span>
-
-				<span class='footer_link'>
-					<a target='_blank' class='classic_link' href='&footer.library.url;'>&footer.library.about;</a>
-				</span>
-
-				<span> | </span>
-
-				<span class='footer_link'>
-					<a target='' class='classic_link' id='eg_gal_link' href='&footer.union.url;'>&footer.union;</a>
-				</span>
-				<br/>
-				<div class="copyright">
-					<span>&footer.copyright;</span>
-				</div>
-			</div>
-			</center>
-		</div>
-
-		</center>
-
-	</body>
+ <head>
+  <title>&slimpac.start.title;</title>
+  <style type="text/css">
+   .maintable {
+    border-collapse: collapse;
+    border: 3px solid #A7EA9D;
+    -moz-border-radius: 6px;
+    padding: 6px;
+    margin-top: 65px;
+   }
+   
+   .greenrow {
+    border: 1px solid #D0D0D0;
+    background: #A7EA9D;
+    height: 20px;
+   }
+
+   .bluerow {
+    border: 1px solid #D0D0D0;
+    background: #E0F6E0;
+    height: 20px;
+   }
+
+   .rowpad {
+    height: 20px;
+   }
+
+   .footer {
+    width: 100%;
+    text-align: center;
+    vertical-align: bottom;
+    margin: auto;
+    margin-top: 20px;
+   }
+
+   .footer_links {
+    width: 60%;
+    text-align: center;
+    padding: 10px;
+    font-size: 8pt;
+    margin: auto;
+   }
+
+   .footer_link {
+    margin-left: 10px; 
+    margin-right: 10px;
+   }
+
+   .copyright {
+    margin-top: 4px;
+    font-size: 7pt;
+   }
+
+   .indent0 {
+    padding-left: 0px; 
+   }
+
+   .indent1 {
+    padding-left: 10px; 
+   }
+
+   .indent2 {
+    padding-left: 20px; 
+   }
+
+   .search_field {
+    width: 100%;
+    text-align: center;
+    margin: auto;
+   }
+
+  </style>
+ </head>
+ <body>
+  <center>
+
+
+  <table class="maintable">
+   <tbody>
+    <tr>
+     <td>
+      <div class='search_field'>
+       <img src='/opac/images/main_logo.jpg' alt=''/>
+      </div>
+     </td>
+    </tr>
+    <tr class="rowpad"><td></td></tr>
+    <form method="GET" action="/opac/extras/opensearch/1.1/-/html-full">
+    <tr class="bluerow">
+     <td>
+      <div class='search_field'>
+       <span>&slimpac.start.nowSearching;</span>
+       <select name="searchOrg">
+        <!--#include file="${locale}/lib_list.inc" -->
+       </select>
+      </div>
+     </td>
+    </tr>
+    <tr class="rowpad"><td></td></tr>
+    <tr class="greenrow">
+     <td>
+      <div class='search_field'>
+
+       <input type="text" name="searchTerms" size="40"/>
+
+       <select name="searchClass">
+        <option value="keyword">&common.keyword;</option>
+        <option value="title">&common.title;</option>
+        <option value="author">&common.author;</option>
+        <option value="subject">&common.subject;</option>
+        <option value="series">&common.series;</option>
+       </select>
+
+       <input type="submit" value="&button.go;"/>
+      </div>
+     </td>
+    </tr>
+    </form>
+    <tr class="bluerow"><td></td></tr>
+    <form method="GET">
+    <tr class="greenrow">
+     <td>
+      <div class='search_field'>
+        <!--#include file="locales.inc"-->
+        <input type="submit" value="&slimpac.language.select;"/>
+      </div>
+     </td>
+    </tr>
+    </form>
+    <tr class="rowpad"><td></td></tr>
+   </tbody>
+  </table>
+
+
+  <div class="footer">
+   <center>
+   <div class="footer_links">
+
+    <span class='footer_link'>
+     <a class='classic_link' href='/'>&slimpac.start.dynamic;</a>
+    </span> 
+
+    <span> | </span>
+
+    <span class='footer_link'>
+     <a class='classic_link' href='advanced.html'>&opac.navigate.advanced;</a>
+    </span> 
+
+    <span> | </span>
+
+    <span class='footer_link'>
+     <a target='_blank' class='classic_link' href='&footer.find.url;'>&footer.find.library;</a>
+    </span> 
+
+    <span> | </span>
+    
+    <span class='footer_link'>
+     <a target='_blank' class='classic_link' href='&footer.help.url;'>&footer.help;</a>
+    </span>
+
+    <span> | </span>
+
+    <span class='footer_link'>
+     <a target='_blank' class='classic_link' href='&footer.library.url;'>&footer.library.about;</a>
+    </span>
+
+    <span> | </span>
+
+    <span class='footer_link'>
+     <a target='' class='classic_link' id='eg_gal_link' href='&footer.union.url;'>&footer.union;</a>
+    </span>
+    <br/>
+    <div class="copyright">
+     <span>&footer.copyright;</span>
+    </div>
+   </div>
+   </center>
+  </div>
+
+  </center>
+
+ </body>
 </html>
 
diff --git a/Open-ILS/web/opac/skin/craftsman/css/layout.css b/Open-ILS/web/opac/skin/craftsman/css/layout.css
index fbb8606aab..763ce84272 100644
--- a/Open-ILS/web/opac/skin/craftsman/css/layout.css
+++ b/Open-ILS/web/opac/skin/craftsman/css/layout.css
@@ -1,8 +1,8 @@
-.main_header	{ width: 100%; }
-.space			{ padding-right:5px; }
-.vert_space		{ padding-top: 82px; width: 100%;}
-.right			{ position:absolute; right: 0px; }
-.hide_me			{ display:none; visibility: hidden; }
+.main_header { width: 100%; }
+.space   { padding-right:5px; }
+.vert_space  { padding-top: 82px; width: 100%;}
+.right   { position:absolute; right: 0px; }
+.hide_me   { display:none; visibility: hidden; }
 
 table { border-collapse: collapse; }
 
@@ -132,16 +132,16 @@ table { border-collapse: collapse; }
 .dim2_border { border: 1px solid #F06000; -moz-border-radius: 3px;}
 
 .dim2 { 
-	filter:alpha(opacity=50); 
-	-moz-opacity:0.5; 
-	opacity: 0.5; 
-	text-decoration: none; }
+ filter:alpha(opacity=50); 
+ -moz-opacity:0.5; 
+ opacity: 0.5; 
+ text-decoration: none; }
 
 .dim { 
-	filter:alpha(opacity=10); 
-	-moz-opacity:0.1; 
-	opacity: 0.1; 
-	text-decoration: none; }
+ filter:alpha(opacity=10); 
+ -moz-opacity:0.1; 
+ opacity: 0.1; 
+ text-decoration: none; }
 
 /* ---------------------------------------------------------------------- */
 
@@ -159,15 +159,15 @@ table { border-collapse: collapse; }
 
 
 .lowhits_div { width: 100%; border-top: 1px solid #E0E0E0; text-align: center; 
-	padding-top: 8px; padding-bottom: 8px; }
+ padding-top: 8px; padding-bottom: 8px; }
 
 .rdetail_extras_div {
-	}
+ }
 
 .copy_info_region_row {
-	padding: 6px;
-	border: 2px solid #E0E0E0;
-	font-weight: 600;
+ padding: 6px;
+ border: 2px solid #E0E0E0;
+ font-weight: 600;
 }
 
 .rdetail_extras_td { padding-right: 15px; padding-left: 15px; border-right: 1px solid #888; }
@@ -178,12 +178,12 @@ table { border-collapse: collapse; }
 .cn_browse_info { padding: 4px; border-bottom: 1px dashed #E0E0E0;}
 
 .bookshelf {
-	 /*background-image: url(http://10.4.0.10/woodgrain.jpeg);*/
-	 /*
-	 background-image: url(http://dev.gapines.org/opac/images/woodgrain.jpg);
-	 background-repeat: repeat;
-	 */
-	 border-bottom: 1px solid black;
+  /*background-image: url(http://10.4.0.10/woodgrain.jpeg);*/
+  /*
+  background-image: url(http://dev.gapines.org/opac/images/woodgrain.jpg);
+  background-repeat: repeat;
+  */
+  border-bottom: 1px solid black;
 }
 
 .cn_browse_loading { width: 95%; padding: 15px; text-align: center; background: #E0F0E0; }
diff --git a/Open-ILS/web/opac/skin/default/css/layout.css b/Open-ILS/web/opac/skin/default/css/layout.css
index 561e488f4c..1b1b3b5a56 100644
--- a/Open-ILS/web/opac/skin/default/css/layout.css
+++ b/Open-ILS/web/opac/skin/default/css/layout.css
@@ -1,11 +1,11 @@
 body { margin: 6px; }
 body { background-color: white; }
 
-.main_header	{ width: 100%; }
-.space			{ padding-right:5px; }
-.vert_space		{ padding-top: 82px; width: 100%;}
-.right			{ position:absolute; right: 0px; }
-.hide_me			{ display:none; visibility: hidden; }
+.main_header { width: 100%; }
+.space   { padding-right:5px; }
+.vert_space  { padding-top: 82px; width: 100%;}
+.right   { position:absolute; right: 0px; }
+.hide_me   { display:none; visibility: hidden; }
 
 table { border-collapse: collapse; }
 
@@ -136,16 +136,16 @@ table { border-collapse: collapse; }
 .dim2_border { border: 1px solid #F06000; -moz-border-radius: 3px;}
 
 .dim2 { 
-	filter:alpha(opacity=50); 
-	-moz-opacity:0.5; 
-	opacity: 0.5; 
-	text-decoration: none; }
+ filter:alpha(opacity=50); 
+ -moz-opacity:0.5; 
+ opacity: 0.5; 
+ text-decoration: none; }
 
 .dim { 
-	filter:alpha(opacity=10); 
-	-moz-opacity:0.1; 
-	opacity: 0.1; 
-	text-decoration: none; }
+ filter:alpha(opacity=10); 
+ -moz-opacity:0.1; 
+ opacity: 0.1; 
+ text-decoration: none; }
 
 /* ---------------------------------------------------------------------- */
 
@@ -162,15 +162,15 @@ table { border-collapse: collapse; }
 .myopac_update_span { padding: 5px;}
 
 .lowhits_div { width: 100%; border-top: 1px solid #E0E0E0; text-align: center; 
-	padding-top: 8px; padding-bottom: 8px; }
+ padding-top: 8px; padding-bottom: 8px; }
 
 .rdetail_extras_div {
-	border-top: 3px solid #E0E0E0;margin-top: 3px; padding-top: 5px; width: 100%;}
+ border-top: 3px solid #E0E0E0;margin-top: 3px; padding-top: 5px; width: 100%;}
 
 .copy_info_region_row {
-	padding: 6px;
-	border: 2px solid #E0E0E0;
-	font-weight: 600;
+ padding: 6px;
+ border: 2px solid #E0E0E0;
+ font-weight: 600;
 }
 
 .rdetail_extras_td { padding-right: 15px; padding-left: 15px; border-right: 1px solid #888; }
@@ -181,12 +181,12 @@ table { border-collapse: collapse; }
 .cn_browse_info { padding: 4px; border-bottom: 1px dashed #E0E0E0;}
 
 .bookshelf {
-	 /*background-image: url(http://10.4.0.10/woodgrain.jpeg);*/
-	 /*
-	 background-image: url(http://dev.gapines.org/opac/images/woodgrain.jpg);
-	 background-repeat: repeat;
-	 */
-	 border-bottom: 1px solid black;
+  /*background-image: url(http://10.4.0.10/woodgrain.jpeg);*/
+  /*
+  background-image: url(http://dev.gapines.org/opac/images/woodgrain.jpg);
+  background-repeat: repeat;
+  */
+  border-bottom: 1px solid black;
 }
 
 .cn_browse_loading { width: 95%; padding: 15px; text-align: center; background: #E0F0E0; }
diff --git a/Open-ILS/web/opac/skin/default/js/adv_global.js b/Open-ILS/web/opac/skin/default/js/adv_global.js
index 2077845601..7c47c19885 100644
--- a/Open-ILS/web/opac/skin/default/js/adv_global.js
+++ b/Open-ILS/web/opac/skin/default/js/adv_global.js
@@ -7,41 +7,41 @@ var advSelectedOrg = null;
 
 function advgInit() {
 
-	/* XXX */
-	if( cookieManager.read(COOKIE_NOGROUP_RECORDS) || SHOW_MR_DEFAULT )
-		$('adv_group_titles').checked = true;
-
-	$n($('adv_global_tbody'), 'term').focus();
-
-	var extras = [ 
-		FETCH_LIT_FORMS, 
-		FETCH_ITEM_FORMS, 
-		FETCH_ITEM_TYPES, 
-		FETCH_AUDIENCES,
-		FETCH_BIB_LEVELS 
+ /* XXX */
+ if( cookieManager.read(COOKIE_NOGROUP_RECORDS) || SHOW_MR_DEFAULT )
+  $('adv_group_titles').checked = true;
+
+ $n($('adv_global_tbody'), 'term').focus();
+
+ var extras = [ 
+  FETCH_LIT_FORMS, 
+  FETCH_ITEM_FORMS, 
+  FETCH_ITEM_TYPES, 
+  FETCH_AUDIENCES,
+  FETCH_BIB_LEVELS 
     ];
 
-	for( var x in extras ) {
+ for( var x in extras ) {
 
-		var req = new Request(extras[x]);
+  var req = new Request(extras[x]);
 
-		if(x == 0) req.request.sel = $('adv_global_lit_form');
-		if(x == 1) req.request.sel = $('adv_global_item_form');
-		if(x == 2) req.request.sel = $('adv_global_item_type');
-		if(x == 3) req.request.sel = $('adv_global_audience');
-		if(x == 4) req.request.sel = $('adv_global_bib_level');
+  if(x == 0) req.request.sel = $('adv_global_lit_form');
+  if(x == 1) req.request.sel = $('adv_global_item_form');
+  if(x == 2) req.request.sel = $('adv_global_item_type');
+  if(x == 3) req.request.sel = $('adv_global_audience');
+  if(x == 4) req.request.sel = $('adv_global_bib_level');
 
-		req.callback(advDrawBibExtras);
-		req.send();
-	}
+  req.callback(advDrawBibExtras);
+  req.send();
+ }
 
-	var input = $n($('adv_global_trow'), 'term');
-	input.focus();
-	setEnterFunc(input, advSubmitGlobal);
+ var input = $n($('adv_global_trow'), 'term');
+ input.focus();
+ setEnterFunc(input, advSubmitGlobal);
 
     if(getSort() && getSortDir()) {
-	    setSelector($('adv_global_sort_by'), getSort());
-	    setSelector($('adv_global_sort_dir'), getSortDir());
+     setSelector($('adv_global_sort_by'), getSort());
+     setSelector($('adv_global_sort_dir'), getSortDir());
         if(getSort() != 'rel')
             $('adv_global_sort_dir').disabled = false;
     }
@@ -146,177 +146,177 @@ function initSearchBoxes() {
 }
 
 function advAddGblRow() {
-	var tbody = $("adv_global_tbody");
-	var newrow = $("adv_global_trow").cloneNode(true);
-	tbody.insertBefore(newrow, $("adv_global_addrow"));
-	var input = $n(newrow, "term");
-	input.value = "";
-	setEnterFunc(input, advSubmitGlobal);
-	$n(newrow, 'type').focus();
+ var tbody = $("adv_global_tbody");
+ var newrow = $("adv_global_trow").cloneNode(true);
+ tbody.insertBefore(newrow, $("adv_global_addrow"));
+ var input = $n(newrow, "term");
+ input.value = "";
+ setEnterFunc(input, advSubmitGlobal);
+ $n(newrow, 'type').focus();
 }
 
 function advDrawBibExtras(r) {
-	var data = r.getResultObject();
-	var sel = r.sel;
-
-	data = data.sort( /* sort alphabetically */
-		function(a,b) { 
-			if( a.value() < b.value() ) return -1;
-			if( a.value() > b.value() ) return 1;
-			return 0;
-		}
-	);
-
-	for( var d = 0; d < data.length; d++ ) {
-		var thing = data[d];
-		var opt = insertSelectorVal( sel, -1, thing.value(), thing.code() );
-		opt.setAttribute('title', thing.value());
-	}
+ var data = r.getResultObject();
+ var sel = r.sel;
+
+ data = data.sort( /* sort alphabetically */
+  function(a,b) { 
+   if( a.value() < b.value() ) return -1;
+   if( a.value() > b.value() ) return 1;
+   return 0;
+  }
+ );
+
+ for( var d = 0; d < data.length; d++ ) {
+  var thing = data[d];
+  var opt = insertSelectorVal( sel, -1, thing.value(), thing.code() );
+  opt.setAttribute('title', thing.value());
+ }
 }
 
 function advSelToStringList(sel) {
-	var list = getSelectedList(sel);
-	var vals = [];
-	for( var i = 0; i < list.length; i++ ) {
-		var str = list[i];
-		for( var j = 0; j < str.length; j++ ) {
-			//if(str.charAt(j) == ' ') continue;
-			vals.push(str.charAt(j));
-		}
-	}
-	return vals.toString();
+ var list = getSelectedList(sel);
+ var vals = [];
+ for( var i = 0; i < list.length; i++ ) {
+  var str = list[i];
+  for( var j = 0; j < str.length; j++ ) {
+   //if(str.charAt(j) == ' ') continue;
+   vals.push(str.charAt(j));
+  }
+ }
+ return vals.toString();
 }
 
 function advGetVisSelectorVals(id) {
-	var basic = id + '_basic';
-	if(! $(id).className.match(/hide_me/)) 
-		return advSelToStringList($(id));
-	return advSelToStringList($(basic));
+ var basic = id + '_basic';
+ if(! $(id).className.match(/hide_me/)) 
+  return advSelToStringList($(id));
+ return advSelToStringList($(basic));
 }
 
 function advSubmitGlobal() {
-	
-	var sortdir = getSelectorVal($('adv_global_sort_dir'));
-	var sortby  = getSelectorVal($('adv_global_sort_by'));
-
-	var litforms  = advGetVisSelectorVals('adv_global_lit_form');
-	var itemforms = advGetVisSelectorVals('adv_global_item_form');
-	var itemtypes = advGetVisSelectorVals('adv_global_item_type');
-	var audiences = advGetVisSelectorVals('adv_global_audience');
-	var biblevels = advGetVisSelectorVals('adv_global_bib_level');
+ 
+ var sortdir = getSelectorVal($('adv_global_sort_dir'));
+ var sortby  = getSelectorVal($('adv_global_sort_by'));
+
+ var litforms  = advGetVisSelectorVals('adv_global_lit_form');
+ var itemforms = advGetVisSelectorVals('adv_global_item_form');
+ var itemtypes = advGetVisSelectorVals('adv_global_item_type');
+ var audiences = advGetVisSelectorVals('adv_global_audience');
+ var biblevels = advGetVisSelectorVals('adv_global_bib_level');
     var locations = getSelectedList($('adv_copy_location_filter_select')) + '';
-	var languages = getSelectedList($('adv_global_lang')) + '';	
+ var languages = getSelectedList($('adv_global_lang')) + ''; 
     var limit2avail = $('opac.result.limit2avail').checked ? 1 : ''
 
-	var searches = advBuildSearchBlob();
-	if(!searches) return;
-
-	clearSearchParams();
-
-	var args = {};
-	args.page = MRESULT;
-	args[PARAM_ITEMFORM] = itemforms;
-	args[PARAM_ITEMTYPE] = itemtypes;
-	args[PARAM_BIBLEVEL] = biblevels;
-	args[PARAM_LITFORM]	= litforms;
-	args[PARAM_AUDIENCE]	= audiences;
-	args[PARAM_LANGUAGE] = languages;
-	args[PARAM_COPYLOCS] = locations;
-	//args[PARAM_SEARCHES]	= js2JSON(searches); /* break these out */
-	args[PARAM_DEPTH]		= depthSelGetDepth();
-	args[PARAM_LOCATION]	= depthSelGetNewLoc();
-	args[PARAM_SORT]		= sortby;
-	args[PARAM_SORT_DIR]	= sortdir;
-	args[PARAM_ADVTYPE]	= ADVTYPE_MULTI;
-	args[PARAM_STYPE]		= "";
-	args[PARAM_TERM]		= searches;
-	args[PARAM_AVAIL]		= limit2avail;
+ var searches = advBuildSearchBlob();
+ if(!searches) return;
+
+ clearSearchParams();
+
+ var args = {};
+ args.page = MRESULT;
+ args[PARAM_ITEMFORM] = itemforms;
+ args[PARAM_ITEMTYPE] = itemtypes;
+ args[PARAM_BIBLEVEL] = biblevels;
+ args[PARAM_LITFORM] = litforms;
+ args[PARAM_AUDIENCE] = audiences;
+ args[PARAM_LANGUAGE] = languages;
+ args[PARAM_COPYLOCS] = locations;
+ //args[PARAM_SEARCHES] = js2JSON(searches); /* break these out */
+ args[PARAM_DEPTH]  = depthSelGetDepth();
+ args[PARAM_LOCATION] = depthSelGetNewLoc();
+ args[PARAM_SORT]  = sortby;
+ args[PARAM_SORT_DIR] = sortdir;
+ args[PARAM_ADVTYPE] = ADVTYPE_MULTI;
+ args[PARAM_STYPE]  = "";
+ args[PARAM_TERM]  = searches;
+ args[PARAM_AVAIL]  = limit2avail;
 
     // publicate year filtering
     var pub1;
     if( (pub1 = $('adv_global_pub_date_1').value) && (''+pub1).match(/\d{4}/)) {
         switch(getSelectorVal($('adv_global_pub_date_type'))) {
             case 'equals':
-	            args[PARAM_PUBD_BETWEEN] = pub1+','+pub1;
+             args[PARAM_PUBD_BETWEEN] = pub1+','+pub1;
                 break;
             case 'before':
-	            args[PARAM_PUBD_BEFORE] = pub1;
+             args[PARAM_PUBD_BEFORE] = pub1;
                 break;
             case 'after':
-	            args[PARAM_PUBD_AFTER] = pub1;
+             args[PARAM_PUBD_AFTER] = pub1;
                 break;
             case 'between':
                 var pub2 = $('adv_global_pub_date_2').value;
                 if((''+pub2).match(/\d{4}/))
-	                args[PARAM_PUBD_BETWEEN] = pub1+','+pub2;
+                 args[PARAM_PUBD_BETWEEN] = pub1+','+pub2;
                 break;
         }
     }
 
-	/* pubdate sorting causes a record (not metarecord) search */
-	if( sortby == SORT_TYPE_PUBDATE || !$('adv_group_titles').checked ) {
-		args.page = RRESULT;
-		args[PARAM_RTYPE] = RTYPE_MULTI;
-	}
+ /* pubdate sorting causes a record (not metarecord) search */
+ if( sortby == SORT_TYPE_PUBDATE || !$('adv_group_titles').checked ) {
+  args.page = RRESULT;
+  args[PARAM_RTYPE] = RTYPE_MULTI;
+ }
 
-	if($('adv_group_titles').checked ) 
-		cookieManager.write(COOKIE_NOGROUP_RECORDS,'1',-1);
-	else
-		cookieManager.write(COOKIE_NOGROUP_RECORDS,'');
+ if($('adv_group_titles').checked ) 
+  cookieManager.write(COOKIE_NOGROUP_RECORDS,'1',-1);
+ else
+  cookieManager.write(COOKIE_NOGROUP_RECORDS,'');
 
 
-	goTo(buildOPACLink(args));
+ goTo(buildOPACLink(args));
 }
 
 
 function advBuildSearchBlob() {
 
-	var searches = '';
-	var tbody    = $('adv_global_tbody');
-	var rows     = tbody.getElementsByTagName('tr');
-
-	for( var i = 0; i < rows.length; i++ ) {
-
-		var row = rows[i];
-		if(!(row && typeof row == 'object')) continue;
-		if(!row.getAttribute('type')) continue;
-		
-		var stype	 = getSelectorVal($n(row, 'type'));
-		var contains = getSelectorVal($n(row, 'contains'));
-		var term		 = $n(row, 'term').value;
-		if(!term) continue;
-
-		var string = "";
-		switch(contains) {
-			case 'contains' : 
-				string += " " + term; 
-				break;
-
-			case 'nocontains' : {
-				var words = term.split(" ");
-					for( var j in words ) 
-						string += " -" + words[j];
-				}
-				break;
-
-			case 'exact' : 
-				if(term.indexOf('"') > -1) string += " " + term;
-				else string += " \"" + term + "\"";
-				break;
-		}
-		if(string) {
-			string = string.replace(/'/g,' ');
-			string = string.replace(/\\/g,' ');
+ var searches = '';
+ var tbody    = $('adv_global_tbody');
+ var rows     = tbody.getElementsByTagName('tr');
+
+ for( var i = 0; i < rows.length; i++ ) {
+
+  var row = rows[i];
+  if(!(row && typeof row == 'object')) continue;
+  if(!row.getAttribute('type')) continue;
+  
+  var stype  = getSelectorVal($n(row, 'type'));
+  var contains = getSelectorVal($n(row, 'contains'));
+  var term   = $n(row, 'term').value;
+  if(!term) continue;
+
+  var string = "";
+  switch(contains) {
+   case 'contains' : 
+    string += " " + term; 
+    break;
+
+   case 'nocontains' : {
+    var words = term.split(" ");
+     for( var j in words ) 
+      string += " -" + words[j];
+    }
+    break;
+
+   case 'exact' : 
+    if(term.indexOf('"') > -1) string += " " + term;
+    else string += " \"" + term + "\"";
+    break;
+  }
+  if(string) {
+   string = string.replace(/'/g,' ');
+   string = string.replace(/\\/g,' ');
             string = string.replace(/^\s*/,'');
             string = string.replace(/\s*$/,'');
-			//searches[stype].term = string;
+   //searches[stype].term = string;
             if(searches) searches += ' ';
             searches += stype + ':'+ string;
-		}
-	}
+  }
+ }
 
     _debug("created search query " + searches);
-	return searches;
+ return searches;
 }
 
 
diff --git a/Open-ILS/web/opac/skin/default/js/advanced.js b/Open-ILS/web/opac/skin/default/js/advanced.js
index 12728c123c..8ffc8f8375 100644
--- a/Open-ILS/web/opac/skin/default/js/advanced.js
+++ b/Open-ILS/web/opac/skin/default/js/advanced.js
@@ -4,147 +4,147 @@ attachEvt("common", "run", advInit);
 
 function advInit() { 
 
-	/* propogate these? */
+ /* propogate these? */
 
-	depthSelInit(); 
-	setEnterFunc( $n( $('advanced.marc.tbody'), 'advanced.marc.value'), advMARCRun );
+ depthSelInit(); 
+ setEnterFunc( $n( $('advanced.marc.tbody'), 'advanced.marc.value'), advMARCRun );
 
-	unHideMe($('adv_quick_search_sidebar'));
+ unHideMe($('adv_quick_search_sidebar'));
 
-	/*
-	if(isXUL()) 
-		setSelector($('adv_quick_type'), 'tcn'); */
+ /*
+ if(isXUL()) 
+  setSelector($('adv_quick_type'), 'tcn'); */
 
-	setEnterFunc($('adv_quick_text'), advGenericSearch);
+ setEnterFunc($('adv_quick_text'), advGenericSearch);
 
-	unHideMe($('adv_marc_search_sidebar'));
+ unHideMe($('adv_marc_search_sidebar'));
 }
 
 
 function advAddMARC() {
-	var newt = $('adv_sdbar_table').cloneNode(true);
-	newt.id = "";
-	unHideMe($n(newt, 'crow'));
-	$n(newt, 'advanced.marc.tag').value = "";
-	$n(newt, 'advanced.marc.subfield').value = "";
-	$n(newt, 'advanced.marc.value').value = "";
-	$('adv_marc_search_sidebar').insertBefore(newt, $('adv_marc_submit'));
+ var newt = $('adv_sdbar_table').cloneNode(true);
+ newt.id = "";
+ unHideMe($n(newt, 'crow'));
+ $n(newt, 'advanced.marc.tag').value = "";
+ $n(newt, 'advanced.marc.subfield').value = "";
+ $n(newt, 'advanced.marc.value').value = "";
+ $('adv_marc_search_sidebar').insertBefore(newt, $('adv_marc_submit'));
 }
 
 function advMARCRun() {
 
-	clearSearchParams();
+ clearSearchParams();
 
-	var div = $('adv_marc_search_sidebar');
-	var tbodies = div.getElementsByTagName('tbody');
-	var searches = [];
+ var div = $('adv_marc_search_sidebar');
+ var tbodies = div.getElementsByTagName('tbody');
+ var searches = [];
 
-	for( var i = 0; i < tbodies.length; i++ ) {
-		var tbody = tbodies[i];
-		var val = advExtractMARC(tbody);
-		if(val) searches.push(val);
-	}
+ for( var i = 0; i < tbodies.length; i++ ) {
+  var tbody = tbodies[i];
+  var val = advExtractMARC(tbody);
+  if(val) searches.push(val);
+ }
 
-	if(searches.length == 0) return;
+ if(searches.length == 0) return;
 
-	var arg = {};
-	arg.page = RRESULT;
-	arg[PARAM_FORM] = 'all'
-	arg[PARAM_RTYPE] = RTYPE_MARC;
-	arg[PARAM_OFFSET] = 0;
-	arg[PARAM_DEPTH]	= depthSelGetDepth();
-	arg[PARAM_LOCATION]	= depthSelGetNewLoc();
-	arg[PARAM_SEARCHES] = js2JSON(searches);
-	arg[PARAM_ADVTYPE] = ADVTYPE_MARC;
-	arg[PARAM_TERM] = "";
+ var arg = {};
+ arg.page = RRESULT;
+ arg[PARAM_FORM] = 'all'
+ arg[PARAM_RTYPE] = RTYPE_MARC;
+ arg[PARAM_OFFSET] = 0;
+ arg[PARAM_DEPTH] = depthSelGetDepth();
+ arg[PARAM_LOCATION] = depthSelGetNewLoc();
+ arg[PARAM_SEARCHES] = js2JSON(searches);
+ arg[PARAM_ADVTYPE] = ADVTYPE_MARC;
+ arg[PARAM_TERM] = "";
 
-	goTo(buildOPACLink(arg));
+ goTo(buildOPACLink(arg));
 }
 
 
 /* EXAMPLE => {"term":"0516011901","restrict":[{"tag":"020","subfield":"a"}]} */
 function advExtractMARC(tbody) {
-	if(!tbody) return null;
-	var term = $n(tbody, 'advanced.marc.value').value;
-	if(!term) return null;
+ if(!tbody) return null;
+ var term = $n(tbody, 'advanced.marc.value').value;
+ if(!term) return null;
 
-	var subfield = $n(tbody, 'advanced.marc.subfield').value;
-	if(!subfield) subfield = "_";
+ var subfield = $n(tbody, 'advanced.marc.subfield').value;
+ if(!subfield) subfield = "_";
 
-	var tag = $n(tbody, 'advanced.marc.tag').value;
-	if(!tag) return null;
+ var tag = $n(tbody, 'advanced.marc.tag').value;
+ if(!tag) return null;
 
-	return { 'term' : term.toLowerCase(), 'restrict' :  [ { 'tag' : tag, 'subfield' : subfield } ] };
+ return { 'term' : term.toLowerCase(), 'restrict' :  [ { 'tag' : tag, 'subfield' : subfield } ] };
 }
 
 function advGenericSearch() {
-	clearSearchParams();
-	var type = getSelectorVal($('adv_quick_type'));
-	
-	var term = $('adv_quick_text').value;
-	if(!term) return;
-
-	var arg = {};
-
-	switch(type) {
-
-		case 'isbn' :
-			arg.page					= RRESULT;
-			arg[PARAM_STYPE]		= "";
-			arg[PARAM_TERM]		= "";
-			arg[PARAM_RTYPE]		= RTYPE_ISBN;
-			arg[PARAM_OFFSET]		= 0;
-			arg[PARAM_ADVTERM]	= term.toLowerCase();
-			break;
-		
-		case 'issn' :
-			arg.page					= RRESULT;
-			arg[PARAM_STYPE]		= "";
-			arg[PARAM_TERM]		= "";
-			arg[PARAM_ADVTERM]	= term.toLowerCase();
-			arg[PARAM_OFFSET]		= 0;
-			arg[PARAM_RTYPE]		= RTYPE_ISSN;
-			break;
-
-		case 'tcn' :
-			arg.page					= RRESULT;
-			arg[PARAM_STYPE]		= "";
-			arg[PARAM_TERM]		= "";
-			arg[PARAM_ADVTERM]	= term;
-			arg[PARAM_OFFSET]		= 0;
-			arg[PARAM_RTYPE]		= RTYPE_TCN;
-			break;
+ clearSearchParams();
+ var type = getSelectorVal($('adv_quick_type'));
+ 
+ var term = $('adv_quick_text').value;
+ if(!term) return;
+
+ var arg = {};
+
+ switch(type) {
+
+  case 'isbn' :
+   arg.page     = RRESULT;
+   arg[PARAM_STYPE]  = "";
+   arg[PARAM_TERM]  = "";
+   arg[PARAM_RTYPE]  = RTYPE_ISBN;
+   arg[PARAM_OFFSET]  = 0;
+   arg[PARAM_ADVTERM] = term.toLowerCase();
+   break;
+  
+  case 'issn' :
+   arg.page     = RRESULT;
+   arg[PARAM_STYPE]  = "";
+   arg[PARAM_TERM]  = "";
+   arg[PARAM_ADVTERM] = term.toLowerCase();
+   arg[PARAM_OFFSET]  = 0;
+   arg[PARAM_RTYPE]  = RTYPE_ISSN;
+   break;
+
+  case 'tcn' :
+   arg.page     = RRESULT;
+   arg[PARAM_STYPE]  = "";
+   arg[PARAM_TERM]  = "";
+   arg[PARAM_ADVTERM] = term;
+   arg[PARAM_OFFSET]  = 0;
+   arg[PARAM_RTYPE]  = RTYPE_TCN;
+   break;
 
         case 'barcode':
             advFindBarcode(term);
             break;
 
 
-		case 'cn':
-			arg.page			= CNBROWSE;
-			arg[PARAM_CN]	= term;
-			arg[PARAM_DEPTH]		= depthSelGetDepth();
-			arg[PARAM_LOCATION]	= depthSelGetNewLoc();
-			break;
+  case 'cn':
+   arg.page   = CNBROWSE;
+   arg[PARAM_CN] = term;
+   arg[PARAM_DEPTH]  = depthSelGetDepth();
+   arg[PARAM_LOCATION] = depthSelGetNewLoc();
+   break;
 
-		case 'lccn':
-			arg.page = RRESULT;
-			arg[PARAM_FORM] = 'all'
-			arg[PARAM_RTYPE] = RTYPE_MARC;
-			arg[PARAM_OFFSET] = 0;
-			arg[PARAM_DEPTH]	= depthSelGetDepth();
-			arg[PARAM_LOCATION]	= depthSelGetNewLoc();
-			arg[PARAM_SEARCHES] = js2JSON([{ 'term' : term.toLowerCase(), 
-					'restrict' :  [ { 'tag' : '010', 'subfield' : '_' } ] }]);
-			arg[PARAM_ADVTYPE] = ADVTYPE_MARC;
-			arg[PARAM_TERM] = "";
-			break;
+  case 'lccn':
+   arg.page = RRESULT;
+   arg[PARAM_FORM] = 'all'
+   arg[PARAM_RTYPE] = RTYPE_MARC;
+   arg[PARAM_OFFSET] = 0;
+   arg[PARAM_DEPTH] = depthSelGetDepth();
+   arg[PARAM_LOCATION] = depthSelGetNewLoc();
+   arg[PARAM_SEARCHES] = js2JSON([{ 'term' : term.toLowerCase(), 
+     'restrict' :  [ { 'tag' : '010', 'subfield' : '_' } ] }]);
+   arg[PARAM_ADVTYPE] = ADVTYPE_MARC;
+   arg[PARAM_TERM] = "";
+   break;
 
 
-		default: alert('not done');
-	}
+  default: alert('not done');
+ }
 
-	if(arg.page) goTo(buildOPACLink(arg));
+ if(arg.page) goTo(buildOPACLink(arg));
 }
 
 
diff --git a/Open-ILS/web/opac/skin/default/js/cn_browse.js b/Open-ILS/web/opac/skin/default/js/cn_browse.js
index 232e37d4c0..24a23a2328 100644
--- a/Open-ILS/web/opac/skin/default/js/cn_browse.js
+++ b/Open-ILS/web/opac/skin/default/js/cn_browse.js
@@ -4,69 +4,69 @@ var cnBrowseCN;
 var cnBrowseOrg;
 
 if( findCurrentPage() == CNBROWSE ) {
-	attachEvt("common", "run", cnBrowseLoadSearch);
-	attachEvt( "common", "locationUpdated", cnBrowseResubmit );
-	attachEvt( "common", "depthChanged", cnBrowseResubmit );
+ attachEvt("common", "run", cnBrowseLoadSearch);
+ attachEvt( "common", "locationUpdated", cnBrowseResubmit );
+ attachEvt( "common", "depthChanged", cnBrowseResubmit );
 }
 
 
 function cnBrowseLoadSearch() {
-	unHideMe($('cn_browse'));
-	cnBrowseGo(getCallnumber(), getLocation(), getDepth());
+ unHideMe($('cn_browse'));
+ cnBrowseGo(getCallnumber(), getLocation(), getDepth());
 }
 
 
 function cnBrowseResubmit() {
-	var args = {}
-	args[PARAM_CN] = cnBrowseCN;
-	args[PARAM_DEPTH] = depthSelGetDepth();
-	args[PARAM_LOCATION] = getNewSearchLocation();
-	goTo(buildOPACLink(args));
+ var args = {}
+ args[PARAM_CN] = cnBrowseCN;
+ args[PARAM_DEPTH] = depthSelGetDepth();
+ args[PARAM_LOCATION] = getNewSearchLocation();
+ goTo(buildOPACLink(args));
 }
 
 
 
 function cnBrowseGo(cn, org, depth) { 
-	if(depth == null) depth = getDepth();
+ if(depth == null) depth = getDepth();
 
-	org = findOrgUnit(org);
-	cnOffset = 0;
+ org = findOrgUnit(org);
+ cnOffset = 0;
 
-	do {
-		var t = findOrgType(org.ou_type());
-		if( t.depth() > depth ) 
-			org = findOrgUnit(org.parent_ou());
-		else break;
-	} while(true); 
+ do {
+  var t = findOrgType(org.ou_type());
+  if( t.depth() > depth ) 
+   org = findOrgUnit(org.parent_ou());
+  else break;
+ } while(true); 
 
-	cnBrowseOrg = org;
-	cnBrowseCN = cn;
+ cnBrowseOrg = org;
+ cnBrowseCN = cn;
 
-	_cnBrowseGo( cn, org );
-	appendClear($('cn_browse_where'), text(org.name()));
+ _cnBrowseGo( cn, org );
+ appendClear($('cn_browse_where'), text(org.name()));
 }
 
 
 function _cnBrowseGo( cn, org ) {
-	var req = new Request( FETCH_CNBROWSE, cn, org.id(), cnCount, cnOffset );
-	req.callback( cnBrowseDraw );
-	req.send();
+ var req = new Request( FETCH_CNBROWSE, cn, org.id(), cnCount, cnOffset );
+ req.callback( cnBrowseDraw );
+ req.send();
 }
 
 function cnBrowseNext() {
-	cnOffset++;
-	_cnBrowseGo( cnBrowseCN, cnBrowseOrg );
+ cnOffset++;
+ _cnBrowseGo( cnBrowseCN, cnBrowseOrg );
 }
 
 function cnBrowsePrev() {
-	cnOffset--;
-	_cnBrowseGo( cnBrowseCN, cnBrowseOrg );
+ cnOffset--;
+ _cnBrowseGo( cnBrowseCN, cnBrowseOrg );
 }
 
 
 function cnBrowseDraw( r ) {
-	var list = r.getResultObject();
-	_cnBrowseDraw(list);
+ var list = r.getResultObject();
+ _cnBrowseDraw(list);
 }
 
 
@@ -75,60 +75,60 @@ var cnRowT;
 var cnTdT;
 function _cnBrowseDraw( list ) {
 
-	if(!cnTbody) {
-		cnTbody = $('cn_tbody');
-		cnRowT = $('cn_browse_row');
-		cnTdT = cnRowT.removeChild($('cn_browse_td'));
-		cnTbody.removeChild(cnRowT);
-	}
-	removeChildren(cnTbody);
-
-	var counter = 1;
-	var currentRow = cnRowT.cloneNode(true);
-	cnTbody.appendChild(currentRow);
-
-	for( var idx in list ) {
-		
-
-		var currentTd = cnTdT.cloneNode(true);
-		currentRow.appendChild(currentTd);
-
-		var td = cnTdT.cloneNode(true);
-
-		var obj	= list[idx];
-		var cn	= obj.cn;
-		var mods = obj.mods;
-
-		var cn_td			= $n(currentTd, 'cn_browse_cn');
-		var lib_td			= $n(currentTd, 'cn_browse_lib');
-		var title_td		= $n(currentTd, 'cn_browse_title');
-		var author_td		= $n(currentTd, 'cn_browse_author');
-		var pic_td			= $n(currentTd, 'cn_browse_pic');
-
-		cn_td.appendChild(text(cn.label()));
-		lib_td.appendChild(text(findOrgUnit(cn.owning_lib()).name()));
-		cnBrowseDrawTitle(mods, title_td, author_td, pic_td);
-
-		if( counter++ % 3 == 0 ) {
-			counter = 1;
-			currentRow = cnRowT.cloneNode(true);
-			cnTbody.appendChild(currentRow);
-		}
-	}
+ if(!cnTbody) {
+  cnTbody = $('cn_tbody');
+  cnRowT = $('cn_browse_row');
+  cnTdT = cnRowT.removeChild($('cn_browse_td'));
+  cnTbody.removeChild(cnRowT);
+ }
+ removeChildren(cnTbody);
+
+ var counter = 1;
+ var currentRow = cnRowT.cloneNode(true);
+ cnTbody.appendChild(currentRow);
+
+ for( var idx in list ) {
+  
+
+  var currentTd = cnTdT.cloneNode(true);
+  currentRow.appendChild(currentTd);
+
+  var td = cnTdT.cloneNode(true);
+
+  var obj = list[idx];
+  var cn = obj.cn;
+  var mods = obj.mods;
+
+  var cn_td   = $n(currentTd, 'cn_browse_cn');
+  var lib_td   = $n(currentTd, 'cn_browse_lib');
+  var title_td  = $n(currentTd, 'cn_browse_title');
+  var author_td  = $n(currentTd, 'cn_browse_author');
+  var pic_td   = $n(currentTd, 'cn_browse_pic');
+
+  cn_td.appendChild(text(cn.label()));
+  lib_td.appendChild(text(findOrgUnit(cn.owning_lib()).name()));
+  cnBrowseDrawTitle(mods, title_td, author_td, pic_td);
+
+  if( counter++ % 3 == 0 ) {
+   counter = 1;
+   currentRow = cnRowT.cloneNode(true);
+   cnTbody.appendChild(currentRow);
+  }
+ }
 }
 
 
 function cnBrowseDrawTitle(mods, title_td, author_td, pic_td) {
 
-	buildTitleDetailLink(mods, title_td); 
-	buildSearchLink(STYPE_AUTHOR, mods.author(), author_td);
-	pic_td.setAttribute("src", buildISBNSrc(cleanISBN(mods.isbn())));
+ buildTitleDetailLink(mods, title_td); 
+ buildSearchLink(STYPE_AUTHOR, mods.author(), author_td);
+ pic_td.setAttribute("src", buildISBNSrc(cleanISBN(mods.isbn())));
 
-	var args = {};
-	args.page = RDETAIL;
-	args[PARAM_OFFSET] = 0;
-	args[PARAM_RID] = mods.doc_id();
-	args[PARAM_MRID] = 0;
-	pic_td.parentNode.setAttribute("href", buildOPACLink(args));
+ var args = {};
+ args.page = RDETAIL;
+ args[PARAM_OFFSET] = 0;
+ args[PARAM_RID] = mods.doc_id();
+ args[PARAM_MRID] = 0;
+ pic_td.parentNode.setAttribute("href", buildOPACLink(args));
 }
 
diff --git a/Open-ILS/web/opac/skin/default/js/container.js b/Open-ILS/web/opac/skin/default/js/container.js
index c898663642..32d7862e34 100644
--- a/Open-ILS/web/opac/skin/default/js/container.js
+++ b/Open-ILS/web/opac/skin/default/js/container.js
@@ -1,67 +1,67 @@
 
 function containerDoRequest( req, callback, args ) {
 
-	if( callback ) {
-		req.callback( callback );
-		req.request.args = args;
-		req.send();
-		return null;
-	}
-
-	req.send(true); 
-	return req.result();
+ if( callback ) {
+  req.callback( callback );
+  req.request.args = args;
+  req.send();
+  return null;
+ }
+
+ req.send(true); 
+ return req.result();
 }
 
 
 function containerFetchAll( callback, args ) {
-	var req = new Request( 
-		FETCH_CONTAINERS, G.user.session, G.user.id(), 'biblio', 'bookbag' );
-	return containerDoRequest( req, callback, args );
+ var req = new Request( 
+  FETCH_CONTAINERS, G.user.session, G.user.id(), 'biblio', 'bookbag' );
+ return containerDoRequest( req, callback, args );
 }
 
 function containerFlesh( id, callback, args ) {
-	var req = new Request( FLESH_CONTAINER, G.user.session, 'biblio', id );
-	return containerDoRequest( req, callback, args );
+ var req = new Request( FLESH_CONTAINER, G.user.session, 'biblio', id );
+ return containerDoRequest( req, callback, args );
 }
 
 function containerDelete( id, callback, args ) {
-	var req = new Request( DELETE_CONTAINER, G.user.session, 'biblio', id );
-	return containerDoRequest(req, callback, args );
+ var req = new Request( DELETE_CONTAINER, G.user.session, 'biblio', id );
+ return containerDoRequest(req, callback, args );
 }
 
 
 function containerCreate( name, pub, callback, args ) {
 
-	var container = new cbreb();
-	container.btype('bookbag');
-	container.owner( G.user.id() );
-	container.name( name );
-	if(pub) container.pub('t');
-	else container.pub('f');
+ var container = new cbreb();
+ container.btype('bookbag');
+ container.owner( G.user.id() );
+ container.name( name );
+ if(pub) container.pub('t');
+ else container.pub('f');
 
-	var req = new Request( 
-		CREATE_CONTAINER, G.user.session, 'biblio', container );
-	return containerDoRequest( req, callback, args );
+ var req = new Request( 
+  CREATE_CONTAINER, G.user.session, 'biblio', container );
+ return containerDoRequest( req, callback, args );
 }
 
 function containerUpdate( container, callback, args ) {
-	var req = new Request(UPDATE_CONTAINER, G.user.session, 'biblio', container);
-	return containerDoRequest(req, callback, args);
+ var req = new Request(UPDATE_CONTAINER, G.user.session, 'biblio', container);
+ return containerDoRequest(req, callback, args);
 }
 
 function containerCreateItem( containerId, target, callback, args ) {
 
-	var item = new cbrebi();
-	item.target_biblio_record_entry(target);
-	item.bucket(containerId);
+ var item = new cbrebi();
+ item.target_biblio_record_entry(target);
+ item.bucket(containerId);
 
-	var req = new Request( CREATE_CONTAINER_ITEM, 
-		G.user.session, 'biblio', item );
+ var req = new Request( CREATE_CONTAINER_ITEM, 
+  G.user.session, 'biblio', item );
 
-	return containerDoRequest( req, callback, args );
+ return containerDoRequest( req, callback, args );
 }
 
 function containerRemoveItem( id, callback, args ) {
-	var req = new Request( DELETE_CONTAINER_ITEM, G.user.session, 'biblio', id );
-	return containerDoRequest( req, callback, args );
+ var req = new Request( DELETE_CONTAINER_ITEM, G.user.session, 'biblio', id );
+ return containerDoRequest( req, callback, args );
 }
diff --git a/Open-ILS/web/opac/skin/default/js/copy_details.js b/Open-ILS/web/opac/skin/default/js/copy_details.js
index 762b13ee18..58105b00e5 100644
--- a/Open-ILS/web/opac/skin/default/js/copy_details.js
+++ b/Open-ILS/web/opac/skin/default/js/copy_details.js
@@ -4,349 +4,349 @@ var cpdNodes = {};
 
 function cpdBuild( contextTbody, contextRow, record, callnumber, orgid, depth, copy_location ) {
 var i = cpdCheckExisting(contextRow);
-	if(i) return i;
-
-	var counter = cpdCounter++;
-
-	/* yank out all of the template rows */
-	if(!cpdTemplate) cpdTemplate = $('rdetail_volume_details_row');
-	var templateRow = cpdTemplate.cloneNode(true);
-	templateRow.id = 'cpd_row_' + counter;
-
-	/* shove a dummy a tag in before the context previous sibling */
-	/*
-	contextTbody.insertBefore( 
-		elem('a',{name:'slot_'+templateRow.id}), contextRow.previousSibling);
-	goTo('#slot_'+templateRow.id);
-	*/
-
-	if(isXUL()) {
-		/* unhide before we unhide/clone the parent */
-		unHideMe($n(templateRow, 'age_protect_label'));
-		unHideMe($n(templateRow, 'create_date_label'));
-		unHideMe($n(templateRow, 'holdable_label'));
-		unHideMe($n(templateRow, 'due_date_label'));
-	}
-
-	unHideMe(templateRow);
-
-	var print = $n(templateRow,'print');
-	print.onclick = function() { cpdBuildPrintPane(
-		contextRow, record, callnumber, orgid, depth) };
-
-	var mainTbody = $n(templateRow, 'copies_tbody');
-	var extrasRow = mainTbody.removeChild($n(mainTbody, 'copy_extras_row'));
-
-	var req = new Request(FETCH_COPIES_FROM_VOLUME, record.doc_id(), callnumber, orgid);
-	req.callback(cpdDrawCopies);
-
-	req.request.args = { 
-		contextTbody	: contextTbody, /* tbody that holds the contextrow */
-		contextRow		: contextRow, /* the row our new row will be inserted after */
-		record			: record,
-		callnumber		: callnumber, 
-		orgid				: orgid,
-		depth				: depth,
-		templateRow		: templateRow, /* contains everything */
-		copy_location		: copy_location,
-		mainTbody		: mainTbody, /* holds the copy rows */
-		extrasRow		: extrasRow, /* wrapper row for all extras */
-		counter			: counter
-	};
-
-	if( contextRow.nextSibling ) 
-		contextTbody.insertBefore( templateRow, contextRow.nextSibling );
-	else
-		contextTbody.appendChild( templateRow );
-
-	req.send();
-	_debug('creating new details row with id ' + templateRow.id);
-	cpdNodes[templateRow.id] = { templateRow : templateRow };
-	return templateRow.id;
+ if(i) return i;
+
+ var counter = cpdCounter++;
+
+ /* yank out all of the template rows */
+ if(!cpdTemplate) cpdTemplate = $('rdetail_volume_details_row');
+ var templateRow = cpdTemplate.cloneNode(true);
+ templateRow.id = 'cpd_row_' + counter;
+
+ /* shove a dummy a tag in before the context previous sibling */
+ /*
+ contextTbody.insertBefore( 
+  elem('a',{name:'slot_'+templateRow.id}), contextRow.previousSibling);
+ goTo('#slot_'+templateRow.id);
+ */
+
+ if(isXUL()) {
+  /* unhide before we unhide/clone the parent */
+  unHideMe($n(templateRow, 'age_protect_label'));
+  unHideMe($n(templateRow, 'create_date_label'));
+  unHideMe($n(templateRow, 'holdable_label'));
+  unHideMe($n(templateRow, 'due_date_label'));
+ }
+
+ unHideMe(templateRow);
+
+ var print = $n(templateRow,'print');
+ print.onclick = function() { cpdBuildPrintPane(
+  contextRow, record, callnumber, orgid, depth) };
+
+ var mainTbody = $n(templateRow, 'copies_tbody');
+ var extrasRow = mainTbody.removeChild($n(mainTbody, 'copy_extras_row'));
+
+ var req = new Request(FETCH_COPIES_FROM_VOLUME, record.doc_id(), callnumber, orgid);
+ req.callback(cpdDrawCopies);
+
+ req.request.args = { 
+  contextTbody : contextTbody, /* tbody that holds the contextrow */
+  contextRow  : contextRow, /* the row our new row will be inserted after */
+  record   : record,
+  callnumber  : callnumber, 
+  orgid    : orgid,
+  depth    : depth,
+  templateRow  : templateRow, /* contains everything */
+  copy_location  : copy_location,
+  mainTbody  : mainTbody, /* holds the copy rows */
+  extrasRow  : extrasRow, /* wrapper row for all extras */
+  counter   : counter
+ };
+
+ if( contextRow.nextSibling ) 
+  contextTbody.insertBefore( templateRow, contextRow.nextSibling );
+ else
+  contextTbody.appendChild( templateRow );
+
+ req.send();
+ _debug('creating new details row with id ' + templateRow.id);
+ cpdNodes[templateRow.id] = { templateRow : templateRow };
+ return templateRow.id;
 }
 
 
 function cpdBuildPrintWindow(record, orgid) {
-	var div = $('rdetail_print_details').cloneNode(true);
-	div.id = "";
-
-	$n(div, 'lib').appendChild(text(findOrgUnit(orgid).name()));
-	$n(div, 'title').appendChild(text(record.title()));
-	$n(div, 'author').appendChild(text(record.author()));
-	$n(div, 'edition').appendChild(text(record.edition()));
-	$n(div, 'pubdate').appendChild(text(record.pubdate()));
-	$n(div, 'publisher').appendChild(text(record.publisher()));
-	$n(div, 'phys').appendChild(text(record.physical_description()));
-
-	return div;
+ var div = $('rdetail_print_details').cloneNode(true);
+ div.id = "";
+
+ $n(div, 'lib').appendChild(text(findOrgUnit(orgid).name()));
+ $n(div, 'title').appendChild(text(record.title()));
+ $n(div, 'author').appendChild(text(record.author()));
+ $n(div, 'edition').appendChild(text(record.edition()));
+ $n(div, 'pubdate').appendChild(text(record.pubdate()));
+ $n(div, 'publisher').appendChild(text(record.publisher()));
+ $n(div, 'phys').appendChild(text(record.physical_description()));
+
+ return div;
 }
 
 function cpdStylePopupWindow(div) {
-	var tds = div.getElementsByTagName('td');
-	for( var i = 0; i < tds.length ; i++ ) {
-		var td = tds[i];
-		var sty = td.getAttribute('style');
-		if(!sty) sty = "";
-		td.setAttribute('style', sty + 'padding: 2px; border: 1px solid #F0F0E0;');
-		if( td.className && td.className.match(/hide_me/) ) 
-			td.parentNode.removeChild(td);
-	}
+ var tds = div.getElementsByTagName('td');
+ for( var i = 0; i < tds.length ; i++ ) {
+  var td = tds[i];
+  var sty = td.getAttribute('style');
+  if(!sty) sty = "";
+  td.setAttribute('style', sty + 'padding: 2px; border: 1px solid #F0F0E0;');
+  if( td.className && td.className.match(/hide_me/) ) 
+   td.parentNode.removeChild(td);
+ }
 }
 
 
 /* builds a friendly print window for this CNs data */
 function cpdBuildPrintPane(contextRow, record, callnumber, orgid, depth) {
 
-	var div = cpdBuildPrintWindow( record, orgid);
+ var div = cpdBuildPrintWindow( record, orgid);
 
-	$n(div, 'cn').appendChild(text(callnumber));
+ $n(div, 'cn').appendChild(text(callnumber));
 
-	unHideMe($n(div, 'copy_header'));
+ unHideMe($n(div, 'copy_header'));
 
-	var subtbody = $n(contextRow.nextSibling, 'copies_tbody');
-	var rows = subtbody.getElementsByTagName('tr');
+ var subtbody = $n(contextRow.nextSibling, 'copies_tbody');
+ var rows = subtbody.getElementsByTagName('tr');
 
-	for( var r = 0; r < rows.length; r++ ) {
-		var row = rows[r];
-		if(!row) continue;
-		var name = row.getAttribute('name');
-		if( name.match(/extras_row/) ) continue; /* hide the copy notes, stat-cats */
-		var clone = row.cloneNode(true);
-		var links = clone.getElementsByTagName('a');
-		for( var i = 0; i < links.length; i++ ) 
-			links[i].style.display = 'none';
+ for( var r = 0; r < rows.length; r++ ) {
+  var row = rows[r];
+  if(!row) continue;
+  var name = row.getAttribute('name');
+  if( name.match(/extras_row/) ) continue; /* hide the copy notes, stat-cats */
+  var clone = row.cloneNode(true);
+  var links = clone.getElementsByTagName('a');
+  for( var i = 0; i < links.length; i++ ) 
+   links[i].style.display = 'none';
 
-		$n(div, 'tbody').appendChild(clone);
-	}
+  $n(div, 'tbody').appendChild(clone);
+ }
 
-	cpdStylePopupWindow(div);
-	openWindow( div.innerHTML);
+ cpdStylePopupWindow(div);
+ openWindow( div.innerHTML);
 }
 
 
 
 /* hide any open tables and if we've already 
-	fleshed this cn, just unhide it */
+ fleshed this cn, just unhide it */
 function cpdCheckExisting( contextRow ) {
 
-	var existingid;
-	var next = contextRow.nextSibling;
-
-	if( next && next.getAttribute('templateRow') ) {
-		var obj = cpdNodes[next.id];
-		if(obj.templateRow.className.match(/hide_me/)) 
-			unHideMe(obj.templateRow);
-		else hideMe(obj.templateRow);
-		existingid = next.id;
-	}
-
-	if(existingid) _debug('row exists with id ' + existingid);
-
-	for( var o in cpdNodes ) {
-		var node = cpdNodes[o];
-		if( existingid && o == existingid ) continue;
-		hideMe(node.templateRow);
-		removeCSSClass(node.templateRow.previousSibling, 'rdetail_context_row');
-	}
-
-	addCSSClass(contextRow, 'rdetail_context_row');
-	if(existingid) return existingid;
-	return null;
+ var existingid;
+ var next = contextRow.nextSibling;
+
+ if( next && next.getAttribute('templateRow') ) {
+  var obj = cpdNodes[next.id];
+  if(obj.templateRow.className.match(/hide_me/)) 
+   unHideMe(obj.templateRow);
+  else hideMe(obj.templateRow);
+  existingid = next.id;
+ }
+
+ if(existingid) _debug('row exists with id ' + existingid);
+
+ for( var o in cpdNodes ) {
+  var node = cpdNodes[o];
+  if( existingid && o == existingid ) continue;
+  hideMe(node.templateRow);
+  removeCSSClass(node.templateRow.previousSibling, 'rdetail_context_row');
+ }
+
+ addCSSClass(contextRow, 'rdetail_context_row');
+ if(existingid) return existingid;
+ return null;
 }
 
 /*
 function cpdFetchCopies(r) {
-	var args = r.args;
-	args.cn	= r.getResultObject();
-	var req = new Request(FETCH_COPIES_FROM_VOLUME, args.cn.id());
-	req.request.args = args;
-	req.callback(cpdDrawCopies);
-	req.send();
+ var args = r.args;
+ args.cn = r.getResultObject();
+ var req = new Request(FETCH_COPIES_FROM_VOLUME, args.cn.id());
+ req.request.args = args;
+ req.callback(cpdDrawCopies);
+ req.send();
 }
 */
 
 function cpdDrawCopies(r) {
 
-	var copies		= r.getResultObject();
-	var args			= r.args;
-	var copytbody	= $n(args.templateRow, 'copies_tbody');
-	var copyrow		= copytbody.removeChild($n(copytbody, 'copies_row'));
-
-	if(isXUL()) {
-		/* unhide before we unhide/clone the parent */
-		unHideMe($n(copyrow, 'age_protect_value'));
-		unHideMe($n(copyrow, 'create_date_value'));
-		unHideMe($n(copyrow, 'copy_holdable_td'));
-		unHideMe($n(copyrow, 'copy_due_date_td'));
-	}
-
-	for( var i = 0; i < copies.length; i++ ) {
-		var row = copyrow.cloneNode(true);
-		var copyid = copies[i];
-		var req = new Request(FETCH_FLESHED_COPY, copies[i]);
-		req.callback(cpdDrawCopy);
-		req.request.args = r.args;
-		req.request.row = row;
-		req.send();
-		copytbody.appendChild(row);
-	}
+ var copies  = r.getResultObject();
+ var args   = r.args;
+ var copytbody = $n(args.templateRow, 'copies_tbody');
+ var copyrow  = copytbody.removeChild($n(copytbody, 'copies_row'));
+
+ if(isXUL()) {
+  /* unhide before we unhide/clone the parent */
+  unHideMe($n(copyrow, 'age_protect_value'));
+  unHideMe($n(copyrow, 'create_date_value'));
+  unHideMe($n(copyrow, 'copy_holdable_td'));
+  unHideMe($n(copyrow, 'copy_due_date_td'));
+ }
+
+ for( var i = 0; i < copies.length; i++ ) {
+  var row = copyrow.cloneNode(true);
+  var copyid = copies[i];
+  var req = new Request(FETCH_FLESHED_COPY, copies[i]);
+  req.callback(cpdDrawCopy);
+  req.request.args = r.args;
+  req.request.row = row;
+  req.send();
+  copytbody.appendChild(row);
+ }
 }
 
 function cpdDrawCopy(r) {
-	var copy = r.getResultObject();
-	var row  = r.row;
+ var copy = r.getResultObject();
+ var row  = r.row;
 
     if (r.args.copy_location && copy.location().name() != r.args.copy_location) {
         hideMe(row);
         return;
     }
 
-	$n(row, 'barcode').appendChild(text(copy.barcode()));
-	$n(row, 'location').appendChild(text(copy.location().name()));
-	$n(row, 'status').appendChild(text(copy.status().name()));
-
-	if(isXUL()) {
-		/* show the hold link */
-		var l = $n(row, 'copy_hold_link');
-		unHideMe(l);
-		l.onclick = function() {
-			holdsDrawEditor( 
-				{ 
-					type			: 'C',
-					copyObject	: copy,
-					onComplete	: function(){}
-				}
-			);
-		}
-
-		if( copy.age_protect() ) 
-			appendClear($n(row, 'age_protect_value'), text(copy.age_protect().name()));
-
-		var cd = copy.create_date();
-		cd = cd.replace(/T.*/, '');
-		$n(row, 'create_date_value').appendChild(text(cd));
-
-		var yes = $('rdetail.yes').innerHTML;
-		var no = $('rdetail.no').innerHTML;
-
-		if( isTrue(copy.holdable()) &&
-				isTrue(copy.location().holdable()) &&
-				isTrue(copy.status().holdable()) ) {
-			$n(row, 'copy_is_holdable').appendChild(text(yes));	
-		} else {
-			$n(row, 'copy_is_holdable').appendChild(text(no));	
-		}
-
-		var circ;
-		if( copy.circulations() ) {
-			circ = copy.circulations()[0];
-			if( circ ) {
-				$n(row, 'copy_due_date').appendChild(text(circ.due_date().replace(/[T ].*/,'')));
-			}
-		}
-
-	}
-
-	r.args.copy = copy;
-	r.args.copyrow = row;
-	cpdShowNotes(copy, r.args)
-	cpdShowStats(copy, r.args);
+ $n(row, 'barcode').appendChild(text(copy.barcode()));
+ $n(row, 'location').appendChild(text(copy.location().name()));
+ $n(row, 'status').appendChild(text(copy.status().name()));
+
+ if(isXUL()) {
+  /* show the hold link */
+  var l = $n(row, 'copy_hold_link');
+  unHideMe(l);
+  l.onclick = function() {
+   holdsDrawEditor( 
+    { 
+     type   : 'C',
+     copyObject : copy,
+     onComplete : function(){}
+    }
+   );
+  }
+
+  if( copy.age_protect() ) 
+   appendClear($n(row, 'age_protect_value'), text(copy.age_protect().name()));
+
+  var cd = copy.create_date();
+  cd = cd.replace(/T.*/, '');
+  $n(row, 'create_date_value').appendChild(text(cd));
+
+  var yes = $('rdetail.yes').innerHTML;
+  var no = $('rdetail.no').innerHTML;
+
+  if( isTrue(copy.holdable()) &&
+    isTrue(copy.location().holdable()) &&
+    isTrue(copy.status().holdable()) ) {
+   $n(row, 'copy_is_holdable').appendChild(text(yes)); 
+  } else {
+   $n(row, 'copy_is_holdable').appendChild(text(no)); 
+  }
+
+  var circ;
+  if( copy.circulations() ) {
+   circ = copy.circulations()[0];
+   if( circ ) {
+    $n(row, 'copy_due_date').appendChild(text(circ.due_date().replace(/[T ].*/,'')));
+   }
+  }
+
+ }
+
+ r.args.copy = copy;
+ r.args.copyrow = row;
+ cpdShowNotes(copy, r.args)
+ cpdShowStats(copy, r.args);
 
 }
 
 function _cpdExtrasInit(args) {
 
-	var newrid	= 'extras_row_' + args.copy.barcode();
-	var newrow	= $(newrid);
-	if(!newrow) newrow = args.extrasRow.cloneNode(true);
-	var tbody	= $n(newrow, 'extras_tbody');
-	var rowt		= $n(tbody, 'extras_row');
-	newrow.id	= newrid;
+ var newrid = 'extras_row_' + args.copy.barcode();
+ var newrow = $(newrid);
+ if(!newrow) newrow = args.extrasRow.cloneNode(true);
+ var tbody = $n(newrow, 'extras_tbody');
+ var rowt  = $n(tbody, 'extras_row');
+ newrow.id = newrid;
 
-	var cr = args.copyrow;
-	var nr = cr.nextSibling;
-	var np = args.mainTbody;
+ var cr = args.copyrow;
+ var nr = cr.nextSibling;
+ var np = args.mainTbody;
 
-	/* insert the extras row into the main table */
-	if(nr) np.insertBefore( newrow, nr );
-	else np.appendChild(newrow);
+ /* insert the extras row into the main table */
+ if(nr) np.insertBefore( newrow, nr );
+ else np.appendChild(newrow);
 
-	var link = $n(args.copyrow, 'details_link');
-	var link2 = $n(args.copyrow, 'less_details_link');
-	var id = newrow.id;
-	link.id = id + '_morelink';
-	link2.id = id + '_lesslink';
-	unHideMe(link);
-	hideMe(link2);
+ var link = $n(args.copyrow, 'details_link');
+ var link2 = $n(args.copyrow, 'less_details_link');
+ var id = newrow.id;
+ link.id = id + '_morelink';
+ link2.id = id + '_lesslink';
+ unHideMe(link);
+ hideMe(link2);
 
-	link.setAttribute('href', 
-			'javascript:unHideMe($("'+link2.id+'")); hideMe($("'+link.id+'"));unHideMe($("'+newrow.id+'"));');
+ link.setAttribute('href', 
+   'javascript:unHideMe($("'+link2.id+'")); hideMe($("'+link.id+'"));unHideMe($("'+newrow.id+'"));');
 
-	link2.setAttribute('href', 
-			'javascript:unHideMe($("'+link.id+'")); hideMe($("'+link2.id+'"));hideMe($("'+newrow.id+'"));');
+ link2.setAttribute('href', 
+   'javascript:unHideMe($("'+link.id+'")); hideMe($("'+link2.id+'"));hideMe($("'+newrow.id+'"));');
 
-	return [ tbody, rowt ];
+ return [ tbody, rowt ];
 }
 
 function cpdShowNotes(copy, args) {
-	var notes = copy.notes();
-	if(!notes || notes.length == 0) return;
-
-	var a = _cpdExtrasInit(args);
-	var tbody = a[0];
-	var rowt = a[1];
-
-	for( var n in notes ) {
-		var note = notes[n];
-		if(!isTrue(note.pub())) continue;
-		var row = rowt.cloneNode(true);
-		$n(row, 'key').appendChild(text(note.title()));
-		$n(row, 'value').appendChild(text(note.value()));
-		unHideMe($n(row, 'note'));
-		unHideMe(row);
-		tbody.appendChild(row);
-	}
+ var notes = copy.notes();
+ if(!notes || notes.length == 0) return;
+
+ var a = _cpdExtrasInit(args);
+ var tbody = a[0];
+ var rowt = a[1];
+
+ for( var n in notes ) {
+  var note = notes[n];
+  if(!isTrue(note.pub())) continue;
+  var row = rowt.cloneNode(true);
+  $n(row, 'key').appendChild(text(note.title()));
+  $n(row, 'value').appendChild(text(note.value()));
+  unHideMe($n(row, 'note'));
+  unHideMe(row);
+  tbody.appendChild(row);
+ }
 }
 
 
 function cpdShowStats(copy, args) {
-	var entries = copy.stat_cat_entry_copy_maps();
-	if(!entries || entries.length == 0) return;
-
-	var visibleStatCat = false;
-
-	/*
-		check all copy stat cats; if we find one that's OPAC visible,
-		set the flag and break the loop. If we've found one, or we're
-		in the staff client, build the table. if not, we return doing
-		nothing, as though the stat_cat_entry_copy_map was empty or null
-	*/
-
-	for( var n in entries )
-	{
-			var entry = entries[n];
-			if(isTrue(entry.stat_cat().opac_visible()))
-			{
-				visibleStatCat = true;
-				break;
-			}
-	}
-
-	if(!(isXUL() || visibleStatCat)) return;
-
-	var a = _cpdExtrasInit(args);
-	var tbody = a[0];
-	var rowt = a[1];
-
-	for( var n in entries ) {
-		var entry = entries[n];
-		if(!(isXUL() || isTrue(entry.stat_cat().opac_visible()))) continue;
-		var row = rowt.cloneNode(true);
-		$n(row, 'key').appendChild(text(entry.stat_cat().name()));
-		$n(row, 'value').appendChild(text(entry.stat_cat_entry().value()));
-		unHideMe($n(row, 'cat'));
-		unHideMe(row);
-		tbody.appendChild(row);
-	}
+ var entries = copy.stat_cat_entry_copy_maps();
+ if(!entries || entries.length == 0) return;
+
+ var visibleStatCat = false;
+
+ /*
+  check all copy stat cats; if we find one that's OPAC visible,
+  set the flag and break the loop. If we've found one, or we're
+  in the staff client, build the table. if not, we return doing
+  nothing, as though the stat_cat_entry_copy_map was empty or null
+ */
+
+ for( var n in entries )
+ {
+   var entry = entries[n];
+   if(isTrue(entry.stat_cat().opac_visible()))
+   {
+    visibleStatCat = true;
+    break;
+   }
+ }
+
+ if(!(isXUL() || visibleStatCat)) return;
+
+ var a = _cpdExtrasInit(args);
+ var tbody = a[0];
+ var rowt = a[1];
+
+ for( var n in entries ) {
+  var entry = entries[n];
+  if(!(isXUL() || isTrue(entry.stat_cat().opac_visible()))) continue;
+  var row = rowt.cloneNode(true);
+  $n(row, 'key').appendChild(text(entry.stat_cat().name()));
+  $n(row, 'value').appendChild(text(entry.stat_cat_entry().value()));
+  unHideMe($n(row, 'cat'));
+  unHideMe(row);
+  tbody.appendChild(row);
+ }
 }
 
diff --git a/Open-ILS/web/opac/skin/default/js/depth_selector.js b/Open-ILS/web/opac/skin/default/js/depth_selector.js
index 1bd983ee48..8fba3b61b5 100644
--- a/Open-ILS/web/opac/skin/default/js/depth_selector.js
+++ b/Open-ILS/web/opac/skin/default/js/depth_selector.js
@@ -8,88 +8,88 @@ var _dselspan;
 var _newlocation = null;
 
 function depthSelInit() {
-	_ds = $('depth_selector'); 
-	_ds.onchange = depthSelectorChanged;
-	_libselspan = $('lib_selector_span');
-	_libsellink = $('lib_selector_link');
-	_dselspan = $('depth_selector_span');
-
-	if( getLocation() == globalOrgTree.id() ) {
-		unHideMe( _libselspan );
-		_libsellink.onclick = _opacHandleLocationTagClick;
-	} else {
-		unHideMe( _dselspan );
-		buildLocationSelector();
-	}
-
-	setSelector(_ds,	getDepth());
-	_newlocation = getLocation();
+ _ds = $('depth_selector'); 
+ _ds.onchange = depthSelectorChanged;
+ _libselspan = $('lib_selector_span');
+ _libsellink = $('lib_selector_link');
+ _dselspan = $('depth_selector_span');
+
+ if( getLocation() == globalOrgTree.id() ) {
+  unHideMe( _libselspan );
+  _libsellink.onclick = _opacHandleLocationTagClick;
+ } else {
+  unHideMe( _dselspan );
+  buildLocationSelector();
+ }
+
+ setSelector(_ds, getDepth());
+ _newlocation = getLocation();
 }
 
 
 var orgTreeIsBuilt = false;
 function _opacHandleLocationTagClick() {
 
-	swapCanvas(G.ui.common.org_container);
+ swapCanvas(G.ui.common.org_container);
 
-	if(!orgTreeIsBuilt) {
-		drawOrgTree();
-		orgTreeIsBuilt = true;
-	}
+ if(!orgTreeIsBuilt) {
+  drawOrgTree();
+  orgTreeIsBuilt = true;
+ }
 
 }
 
 function depthSelGetDepth() {
-	var depth = parseInt(_ds.options[_ds.selectedIndex].value);
-	if(isNaN(depth)) depth = 0;
-	return depth;
+ var depth = parseInt(_ds.options[_ds.selectedIndex].value);
+ if(isNaN(depth)) depth = 0;
+ return depth;
 }
 
 function depthSelectorChanged() {
-	var i = _ds.selectedIndex;
-	if( i == _ds.options.length - 1 ) {
-		setSelector( _ds, getDepth() );
-		_opacHandleLocationTagClick();
-	} else { 
-		/* this re-submits the search when they change the search range
-			disabled for testing...
-			*/
-		/*runEvt('common', 'depthChanged');*/ 
-	}
+ var i = _ds.selectedIndex;
+ if( i == _ds.options.length - 1 ) {
+  setSelector( _ds, getDepth() );
+  _opacHandleLocationTagClick();
+ } else { 
+  /* this re-submits the search when they change the search range
+   disabled for testing...
+   */
+  /*runEvt('common', 'depthChanged');*/ 
+ }
 }
 
 var chooseAnotherNode;
 function buildLocationSelector(newLoc) {
 
-	var loc;
-	if(newLoc != null) loc = newLoc;
-	else loc = getLocation();
-
-	if( loc == globalOrgTree.id() ) return;
-
-	var selector = _ds;
-	if(!chooseAnotherNode) 
-		chooseAnotherNode = selector.removeChild(
-			selector.getElementsByTagName("option")[0]);
-	var node = chooseAnotherNode;
-	removeChildren(selector);
-	
-	var location = findOrgUnit(loc);
-	var type;
-	if (location) type = findOrgType(location.ou_type());
-
-	while( type && location ) {
-		var n = node.cloneNode(true);	
-		n.setAttribute("value", type.depth());
-		removeChildren(n);
-		n.appendChild(text(type.opac_label()));
-		selector.appendChild(n);
-		location = findOrgUnit(location.parent_ou());
-		if(location) type = findOrgType(location.ou_type());
-		else type = null;
-	}
-
-	selector.appendChild(node);
+ var loc;
+ if(newLoc != null) loc = newLoc;
+ else loc = getLocation();
+
+ if( loc == globalOrgTree.id() ) return;
+
+ var selector = _ds;
+ if(!chooseAnotherNode) 
+  chooseAnotherNode = selector.removeChild(
+   selector.getElementsByTagName("option")[0]);
+ var node = chooseAnotherNode;
+ removeChildren(selector);
+ 
+ var location = findOrgUnit(loc);
+ var type;
+ if (location) type = findOrgType(location.ou_type());
+
+ while( type && location ) {
+  var n = node.cloneNode(true); 
+  n.setAttribute("value", type.depth());
+  removeChildren(n);
+  n.appendChild(text(type.opac_label()));
+  selector.appendChild(n);
+  location = findOrgUnit(location.parent_ou());
+  if(location) type = findOrgType(location.ou_type());
+  else type = null;
+ }
+
+ selector.appendChild(node);
 }
 
 function getNewSearchDepth() { return newSearchDepth; }
@@ -97,25 +97,25 @@ function getNewSearchLocation() { return (isNull(_newlocation)) ? LOCATION : _ne
 function depthSelGetNewLoc() { return getNewSearchLocation(); }
 
 function updateLoc(location, depth) {
-	if( depth != null ) {
-		if(depth != 0 ){
-			_libsellink.onclick = _opacHandleLocationTagClick;
-			if( location == globalOrgTree.id() ) {
-				hideMe( _dselspan );
-				unHideMe( _libselspan );
-			} else {
-				buildLocationSelector(location);
-				hideMe( _libselspan );
-				unHideMe( _dselspan );
-			}
-		}
-
-		setSelector(_ds, depth);
-		newSearchDepth = depth;
-	}
-
-	_newlocation = location;
-	runEvt('common','locationUpdated', location);
+ if( depth != null ) {
+  if(depth != 0 ){
+   _libsellink.onclick = _opacHandleLocationTagClick;
+   if( location == globalOrgTree.id() ) {
+    hideMe( _dselspan );
+    unHideMe( _libselspan );
+   } else {
+    buildLocationSelector(location);
+    hideMe( _libselspan );
+    unHideMe( _dselspan );
+   }
+  }
+
+  setSelector(_ds, depth);
+  newSearchDepth = depth;
+ }
+
+ _newlocation = location;
+ runEvt('common','locationUpdated', location);
 }
 
 
diff --git a/Open-ILS/web/opac/skin/default/js/holds.js b/Open-ILS/web/opac/skin/default/js/holds.js
index 4538d08be5..c985aec5ec 100644
--- a/Open-ILS/web/opac/skin/default/js/holds.js
+++ b/Open-ILS/web/opac/skin/default/js/holds.js
@@ -16,14 +16,14 @@ function holdsHandleStaff() {
     // if we know the recipient's barcode, use it
     if(xulG.patron_barcode) return _holdsHandleStaff();
 
-	swapCanvas($('xulholds_box'));
-	$('xul_recipient_barcode').focus();
-	$('xul_recipient_barcode').onkeypress = function(evt) 
-		{if(userPressedEnter(evt)) { _holdsHandleStaff(); } };
-	$('xul_recipient_barcode_submit').onclick = _holdsHandleStaff;
-	$('xul_recipient_me').onclick = _holdsHandleStaffMe;
-
-	$('xul_recipient_barcode').onkeyup = function(evt) {
+ swapCanvas($('xulholds_box'));
+ $('xul_recipient_barcode').focus();
+ $('xul_recipient_barcode').onkeypress = function(evt) 
+  {if(userPressedEnter(evt)) { _holdsHandleStaff(); } };
+ $('xul_recipient_barcode_submit').onclick = _holdsHandleStaff;
+ $('xul_recipient_me').onclick = _holdsHandleStaffMe;
+
+ $('xul_recipient_barcode').onkeyup = function(evt) {
         if($('xul_recipient_barcode').value == '') 
             $('xul_recipient_me').disabled = false;
         else
@@ -37,29 +37,29 @@ $('holds_frozen_thaw_input').onkeyup =
         function(){holdsVerifyThawDateUI('holds_frozen_thaw_input');}
 
 function _holdsHandleStaffMe() {
-	holdArgs.recipient = G.user;
-	holdsDrawEditor();
+ holdArgs.recipient = G.user;
+ holdsDrawEditor();
 }
 
 function _holdsHandleStaff() {
-	var barcode = xulG.patron_barcode || $('xul_recipient_barcode').value;
-	var user = grabUserByBarcode( G.user.session, barcode );
+ var barcode = xulG.patron_barcode || $('xul_recipient_barcode').value;
+ var user = grabUserByBarcode( G.user.session, barcode );
 
-	var evt;
-	if(evt = checkILSEvent(user)) {
-		alertILSEvent(user);
-		return;
-	}
+ var evt;
+ if(evt = checkILSEvent(user)) {
+  alertILSEvent(user);
+  return;
+ }
 
-	if(!barcode || !user) {
-		alertId('holds_invalid_recipient', barcode);
-		return
-	}
+ if(!barcode || !user) {
+  alertId('holds_invalid_recipient', barcode);
+  return
+ }
 
-	grabUserPrefs(user);
+ grabUserPrefs(user);
 
-	holdArgs.recipient = user;
-	holdsDrawEditor();
+ holdArgs.recipient = user;
+ holdsDrawEditor();
 }
 
 
@@ -71,7 +71,7 @@ function _holdsHandleStaff() {
 
 function holdsDrawEditor(args) {
 
-	holdArgs = (args) ? args : holdArgs;
+ holdArgs = (args) ? args : holdArgs;
 
     if(!noEmailMessage)
         noEmailMessage = $('holds_email').removeChild($('holds.no_email'));
@@ -79,75 +79,75 @@ function holdsDrawEditor(args) {
     if(!noEmailMessageXUL)
         noEmailMessageXUL = $('holds_email').removeChild($('holds.no_email.xul'));
 
-	if(isXUL() && holdArgs.recipient == null 
-			&& holdArgs.editHold == null) {
-		holdsHandleStaff();
-		return;
-	}
+ if(isXUL() && holdArgs.recipient == null 
+   && holdArgs.editHold == null) {
+  holdsHandleStaff();
+  return;
+ }
 
-	if(!holdArgs.recipient) holdArgs.recipient = G.user;
-	if(!holdArgs.requestor) holdArgs.requestor = G.user;
+ if(!holdArgs.recipient) holdArgs.recipient = G.user;
+ if(!holdArgs.requestor) holdArgs.requestor = G.user;
 
-	if(!(holdArgs.requestor && holdArgs.requestor.session)) {
-		detachAllEvt('common','locationChanged');
-		attachEvt('common','loggedIn', holdsDrawEditor)
-		initLogin();
-		return;
-	}
+ if(!(holdArgs.requestor && holdArgs.requestor.session)) {
+  detachAllEvt('common','locationChanged');
+  attachEvt('common','loggedIn', holdsDrawEditor)
+  initLogin();
+  return;
+ }
 
-	if(holdArgs.editHold) // flesh the args with the existing hold 
-		holdArgsFromHold(holdArgs.editHold, holdArgs);
+ if(holdArgs.editHold) // flesh the args with the existing hold 
+  holdArgsFromHold(holdArgs.editHold, holdArgs);
 
-	holdsDrawWindow();
+ holdsDrawWindow();
 }
 
 
 // updates the edit window with the existing hold's data 
 function _holdsUpdateEditHold() {
 
-	var hold = holdArgs.editHold;
-	var qstats = holdArgs.status;
+ var hold = holdArgs.editHold;
+ var qstats = holdArgs.status;
 
-	var orgsel = $('holds_org_selector');
+ var orgsel = $('holds_org_selector');
     var frozenbox = $('holds_frozen_chkbox');
 
-	setSelector(orgsel, hold.pickup_lib());
+ setSelector(orgsel, hold.pickup_lib());
 
-	if( hold.capture_time() || qstats.status > 2 ) {
+ if( hold.capture_time() || qstats.status > 2 ) {
         frozenbox.disabled = true;
         $('holds_frozen_thaw_input').disabled = true;
         if(qstats.status == 3) {
             // no pickup lib changes while in-transit
-		    orgsel.disabled = true;
+      orgsel.disabled = true;
         } else {
             var orgs = fetchPermOrgs('UPDATE_PICKUP_LIB_FROM_HOLDS_SHELF');
             if(orgs[0] == -1)
-		        orgsel.disabled = true;
+          orgsel.disabled = true;
         }
     } else {
-		orgsel.disabled = false;
+  orgsel.disabled = false;
         frozenbox.disabled = false;
     }
 
 
-	$('holds_submit').onclick = holdsEditHold;
-	$('holds_update').onclick = holdsEditHold;
+ $('holds_submit').onclick = holdsEditHold;
+ $('holds_update').onclick = holdsEditHold;
 
-	if(hold.phone_notify()) {
-		$('holds_enable_phone').checked = true;
-		$('holds_phone').value = hold.phone_notify();
+ if(hold.phone_notify()) {
+  $('holds_enable_phone').checked = true;
+  $('holds_phone').value = hold.phone_notify();
 
-	} else {
-		$('holds_phone').disabled = true;
-		$('holds_enable_phone').checked = false;
-	}
+ } else {
+  $('holds_phone').disabled = true;
+  $('holds_enable_phone').checked = false;
+ }
 
-	if(isTrue(hold.email_notify())) {
-		$('holds_enable_email').checked = true;
+ if(isTrue(hold.email_notify())) {
+  $('holds_enable_email').checked = true;
 
-	} else {
-		$('holds_enable_email').checked = false;
-	}
+ } else {
+  $('holds_enable_email').checked = false;
+ }
 
     dijit.byId('holds_expire_time').setValue(dojo.date.stamp.fromISOString(hold.expire_time()));
 
@@ -168,326 +168,326 @@ function _holdsUpdateEditHold() {
 }
 
 function holdsEditHold() {
-	var hold = holdsBuildHoldFromWindow();
-	if(!hold) return;
-	holdsUpdate(hold);
-	showCanvas();
-	if(holdArgs.onComplete)
-		holdArgs.onComplete(hold);
+ var hold = holdsBuildHoldFromWindow();
+ if(!hold) return;
+ holdsUpdate(hold);
+ showCanvas();
+ if(holdArgs.onComplete)
+  holdArgs.onComplete(hold);
 }
 
 function holdArgsFromHold(hold, oargs) {
-	var args = (oargs) ? oargs : {};
-	args.type = hold.hold_type();
-	var target = hold.target();
-
-	switch(args.type) {
-		case 'M':
-			args.metarecord = target;
-			break;
-		case 'T':
-			args.record = target;
-			break;
-		case 'V':
-			args.volume = target;
-			break;
-		case 'C':
-			args.copy = target;
-			break;
-	}
-	return args;
+ var args = (oargs) ? oargs : {};
+ args.type = hold.hold_type();
+ var target = hold.target();
+
+ switch(args.type) {
+  case 'M':
+   args.metarecord = target;
+   break;
+  case 'T':
+   args.record = target;
+   break;
+  case 'V':
+   args.volume = target;
+   break;
+  case 'C':
+   args.copy = target;
+   break;
+ }
+ return args;
 }
 
 function holdFetchObjects(hold, doneCallback) {
 
-	var args = (hold) ? holdArgsFromHold(hold) : holdArgs;
-
-	var type = args.type;
-
-	if( type == 'C' ) {
-
-		if( args.copyObject ) {
-
-			args.copy = args.copyObject.id();
-			args.volume = args.copyObject.call_number();
-			_h_set_vol(args, doneCallback);
-
-		} else {
-			var creq = new Request(FETCH_COPY, args.copy);
-
-			creq.callback(
-				function(r) {
-					var cp = r.getResultObject();
-					args.copyObject = cp;
-					args.volume = args.copyObject.call_number();
-					_h_set_vol(args, doneCallback);
-				}
-			);
-			creq.send();
-		}
-	} else {
-		if( type == 'V' ) {
-			_h_set_vol(args, doneCallback);
-
-		} else {
-			if( type == 'T' ) {
-				_h_set_rec(args, doneCallback);
-			} else {
-				_h_set_rec_descriptors(args, doneCallback);
-			}
-		}
-	}
-
-	return args;
+ var args = (hold) ? holdArgsFromHold(hold) : holdArgs;
+
+ var type = args.type;
+
+ if( type == 'C' ) {
+
+  if( args.copyObject ) {
+
+   args.copy = args.copyObject.id();
+   args.volume = args.copyObject.call_number();
+   _h_set_vol(args, doneCallback);
+
+  } else {
+   var creq = new Request(FETCH_COPY, args.copy);
+
+   creq.callback(
+    function(r) {
+     var cp = r.getResultObject();
+     args.copyObject = cp;
+     args.volume = args.copyObject.call_number();
+     _h_set_vol(args, doneCallback);
+    }
+   );
+   creq.send();
+  }
+ } else {
+  if( type == 'V' ) {
+   _h_set_vol(args, doneCallback);
+
+  } else {
+   if( type == 'T' ) {
+    _h_set_rec(args, doneCallback);
+   } else {
+    _h_set_rec_descriptors(args, doneCallback);
+   }
+  }
+ }
+
+ return args;
 }
 
 function _h_set_vol(args, doneCallback) {
 
-	if( args.volumeObject ) {
-		args.volume = args.volumeObject.id();
-		args.record = args.volumeObject.record();
-		_h_set_rec(args, doneCallback);
-
-	} else {
-
-		var vreq = new Request(FETCH_VOLUME, args.volume);
-		vreq.callback(
-			function(r) {
-				var vol = r.getResultObject();
-				args.volumeObject = vol;
-				args.record = vol.record();
-				_h_set_rec(args, doneCallback);
-			}
-		);
-		vreq.send();
-	}
+ if( args.volumeObject ) {
+  args.volume = args.volumeObject.id();
+  args.record = args.volumeObject.record();
+  _h_set_rec(args, doneCallback);
+
+ } else {
+
+  var vreq = new Request(FETCH_VOLUME, args.volume);
+  vreq.callback(
+   function(r) {
+    var vol = r.getResultObject();
+    args.volumeObject = vol;
+    args.record = vol.record();
+    _h_set_rec(args, doneCallback);
+   }
+  );
+  vreq.send();
+ }
 }
 
 function _h_set_rec(args, doneCallback) {
 
-	if(args.recordObject) 
-		args.record = args.recordObject.doc_id();
-	else 
-		args.recordObject = findRecord( args.record, 'T' );
-	
-	if( args.type == 'T' || args.type == 'M' ) 
-		_h_set_rec_descriptors(args, doneCallback);
-	else 
-		if(doneCallback) doneCallback(args);
+ if(args.recordObject) 
+  args.record = args.recordObject.doc_id();
+ else 
+  args.recordObject = findRecord( args.record, 'T' );
+ 
+ if( args.type == 'T' || args.type == 'M' ) 
+  _h_set_rec_descriptors(args, doneCallback);
+ else 
+  if(doneCallback) doneCallback(args);
 }
 
 
 function _h_set_rec_descriptors(args, doneCallback) {
 
-	// grab the list of record desciptors attached to this records metarecord 
-	if( ! args.recordDescriptors )  {
-		var params = { record: args.record };
-
-		if( ! args.record ) {
-			if( args.metarecord )
-				params = { metarecord : args.metarecord };
-			else 
-				params = { metarecord : args.metarecordObject.doc_id() };
-		}
-
-		var req = new Request(FETCH_MR_DESCRIPTORS, params );
-		req.callback(
-			function(r) {
-				var data = r.getResultObject();
-				args.recordDescriptors = data.descriptors;
-				args.metarecord = data.metarecord;
-				if( args.type == 'M' && ! args.metarecordObject) 
-					args.metarecordObject = findRecord(args.metarecord, 'M');	
-				 
-				if(doneCallback) doneCallback(args);
-			}
-		);
-		req.send();
-
-	} else {
-		if(doneCallback) doneCallback(args);
-	}
-
-	return args;
+ // grab the list of record desciptors attached to this records metarecord 
+ if( ! args.recordDescriptors )  {
+  var params = { record: args.record };
+
+  if( ! args.record ) {
+   if( args.metarecord )
+    params = { metarecord : args.metarecord };
+   else 
+    params = { metarecord : args.metarecordObject.doc_id() };
+  }
+
+  var req = new Request(FETCH_MR_DESCRIPTORS, params );
+  req.callback(
+   function(r) {
+    var data = r.getResultObject();
+    args.recordDescriptors = data.descriptors;
+    args.metarecord = data.metarecord;
+    if( args.type == 'M' && ! args.metarecordObject) 
+     args.metarecordObject = findRecord(args.metarecord, 'M'); 
+     
+    if(doneCallback) doneCallback(args);
+   }
+  );
+  req.send();
+
+ } else {
+  if(doneCallback) doneCallback(args);
+ }
+
+ return args;
 }
 
 
 
 function holdsDrawWindow() {
-	swapCanvas($('holds_box'));
-	$('holds_cancel').onclick = function(){ runEvt('common', 'holdUpdateCanceled'), showCanvas() };
-	$('holds_submit').onclick = function(){holdsPlaceHold(holdsBuildHoldFromWindow())};
-	$('holds_update').onclick = function(){holdsPlaceHold(holdsBuildHoldFromWindow())};
-	holdFetchObjects(null, 
-		function(){
-			__holdsDrawWindow();
-
-			if(holdArgs.editHold) {
-				hideMe($('holds_submit'));
-				unHideMe($('holds_update'));
-				var req = new Request(FETCH_HOLD_STATUS, 
-					G.user.session, holdArgs.editHold.id());
-				req.send(true);
-				holdArgs.status = req.result();
-				_holdsUpdateEditHold();
-			}  
-		}
-	);
+ swapCanvas($('holds_box'));
+ $('holds_cancel').onclick = function(){ runEvt('common', 'holdUpdateCanceled'), showCanvas() };
+ $('holds_submit').onclick = function(){holdsPlaceHold(holdsBuildHoldFromWindow())};
+ $('holds_update').onclick = function(){holdsPlaceHold(holdsBuildHoldFromWindow())};
+ holdFetchObjects(null, 
+  function(){
+   __holdsDrawWindow();
+
+   if(holdArgs.editHold) {
+    hideMe($('holds_submit'));
+    unHideMe($('holds_update'));
+    var req = new Request(FETCH_HOLD_STATUS, 
+     G.user.session, holdArgs.editHold.id());
+    req.send(true);
+    holdArgs.status = req.result();
+    _holdsUpdateEditHold();
+   }  
+  }
+ );
 }
 
 function __holdsDrawWindow() {
 
-	var rec = holdArgs.recordObject;
-	var vol = holdArgs.volumeObject;
-	var copy = holdArgs.copyObject;
-	var mr = holdArgs.metarecordObject;
-
-	rec = (rec) ? rec : mr;
-
-	if(!holdsOrgSelectorBuilt) {
-		holdsBuildOrgSelector(null,0);
-		holdsOrgSelectorBuilt = true;
-		var selector = $('holds_org_selector');
-
-		/*
-		var o_loc = findOrgUnit(getOrigLocation());
-		var t = findOrgType(o_loc.ou_type());
-		if( t.can_have_users() ) 
-			setSelector(selector, o_loc.id());
-		else 
-		*/
-
-		setSelector(selector, holdArgs.recipient.home_ou());
-	
-	}
-
-	/*
-	if(isXUL()) {
-		var dsel = $('holds_depth_selector');
-		unHideMe($('holds_depth_selector_row'));
-		if(dsel.getElementsByTagName('option').length == 0) {
-			var types = globalOrgTypes;
-			var depth = findOrgDepth(G.user.ws_ou());
-			iterate(types, 
-				function(t) {
-					if(t.depth() > depth) return;
-					insertSelectorVal(dsel, -1, t.opac_label(), t.depth());
-				}
-			);
-		}
-	}
-	*/
-
-	appendClear($('holds_recipient'), text(
-		holdArgs.recipient.family_name() + ', ' +  
-			holdArgs.recipient.first_given_name()));
-	appendClear($('holds_title'), text(rec.title()));
-	appendClear($('holds_author'), text(rec.author()));
-
-	if( holdArgs.type == 'V' || holdArgs.type == 'C' ) {
-
-		unHideMe($('holds_type_row'));
-		unHideMe($('holds_cn_row'));
-		appendClear($('holds_cn'), text(holdArgs.volumeObject.label()));
-
-		if( holdArgs.type == 'V'  ) {
-			unHideMe($('holds_is_cn'));
-			hideMe($('holds_is_copy'));
-
-		} else {
-			hideMe($('holds_is_cn'));
-			unHideMe($('holds_is_copy'));
-			unHideMe($('holds_copy_row'));
-			appendClear($('holds_copy'), text(holdArgs.copyObject.barcode()));
-		}
-
-	} else {
-		hideMe($('holds_type_row'));
-		hideMe($('holds_copy_row'));
-		hideMe($('holds_cn_row'));
-	}
-
-	removeChildren($('holds_format'));
-
-	var mods_formats = rec.types_of_resource();
-	var formats;
-
-	if(holdArgs.recordDescriptors)
-		formats = holdArgs.recordDescriptors[0].item_type();
-
-	if( holdArgs.type == 'T' ) {
-		var desc = grep( holdArgs.recordDescriptors,
-			function(i) {
-				return (i.record() == holdArgs.record);	
-			}
-		);
-		formats = desc[0].item_type();
-	}
-
-	if( holdArgs.type == 'M' ) {
-		var data = holdsParseMRFormats(holdArgs.editHold.holdable_formats());
-		mods_formats = data.mods_formats;
-		formats = data.formats;
-	}
-
-
-	for( var i in mods_formats ) {
-		var res = mods_formats[i];
-		var img = elem("img");
-		setResourcePic(img, res);
-		$('holds_format').appendChild(img);
-		if(formats)
-			$('holds_format').appendChild(text(' '+ MARCTypeToFriendly(formats[i]) +' '));
-		else
-			$('holds_format').appendChild(text(' '+ mods_formats[i] +' '));
-		$('holds_format').appendChild(elem('br'));
-	}
-
-
-	$('holds_phone').value = holdArgs.recipient.day_phone();
-	appendClear( $('holds_email'), text(holdArgs.recipient.email()));
-
-	var pref = holdArgs.recipient.prefs[PREF_HOLD_NOTIFY];
-
-	if(pref) {
-		if( ! pref.match(/email/i) ) {
-			$('holds_enable_email').checked = false;
-		} else {
-			$('holds_enable_email').checked = true;
-		}
-
-		if( ! pref.match(/phone/i) ) {
-			$('holds_phone').disabled = true;
-			$('holds_enable_phone').checked = false;
-		} else {
-			$('holds_phone').disabled = false;
-			$('holds_enable_phone').checked = true;
-		}
-	}
+ var rec = holdArgs.recordObject;
+ var vol = holdArgs.volumeObject;
+ var copy = holdArgs.copyObject;
+ var mr = holdArgs.metarecordObject;
+
+ rec = (rec) ? rec : mr;
+
+ if(!holdsOrgSelectorBuilt) {
+  holdsBuildOrgSelector(null,0);
+  holdsOrgSelectorBuilt = true;
+  var selector = $('holds_org_selector');
+
+  /*
+  var o_loc = findOrgUnit(getOrigLocation());
+  var t = findOrgType(o_loc.ou_type());
+  if( t.can_have_users() ) 
+   setSelector(selector, o_loc.id());
+  else 
+  */
+
+  setSelector(selector, holdArgs.recipient.home_ou());
+ 
+ }
+
+ /*
+ if(isXUL()) {
+  var dsel = $('holds_depth_selector');
+  unHideMe($('holds_depth_selector_row'));
+  if(dsel.getElementsByTagName('option').length == 0) {
+   var types = globalOrgTypes;
+   var depth = findOrgDepth(G.user.ws_ou());
+   iterate(types, 
+    function(t) {
+     if(t.depth() > depth) return;
+     insertSelectorVal(dsel, -1, t.opac_label(), t.depth());
+    }
+   );
+  }
+ }
+ */
+
+ appendClear($('holds_recipient'), text(
+  holdArgs.recipient.family_name() + ', ' +  
+   holdArgs.recipient.first_given_name()));
+ appendClear($('holds_title'), text(rec.title()));
+ appendClear($('holds_author'), text(rec.author()));
+
+ if( holdArgs.type == 'V' || holdArgs.type == 'C' ) {
+
+  unHideMe($('holds_type_row'));
+  unHideMe($('holds_cn_row'));
+  appendClear($('holds_cn'), text(holdArgs.volumeObject.label()));
+
+  if( holdArgs.type == 'V'  ) {
+   unHideMe($('holds_is_cn'));
+   hideMe($('holds_is_copy'));
+
+  } else {
+   hideMe($('holds_is_cn'));
+   unHideMe($('holds_is_copy'));
+   unHideMe($('holds_copy_row'));
+   appendClear($('holds_copy'), text(holdArgs.copyObject.barcode()));
+  }
+
+ } else {
+  hideMe($('holds_type_row'));
+  hideMe($('holds_copy_row'));
+  hideMe($('holds_cn_row'));
+ }
+
+ removeChildren($('holds_format'));
+
+ var mods_formats = rec.types_of_resource();
+ var formats;
+
+ if(holdArgs.recordDescriptors)
+  formats = holdArgs.recordDescriptors[0].item_type();
+
+ if( holdArgs.type == 'T' ) {
+  var desc = grep( holdArgs.recordDescriptors,
+   function(i) {
+    return (i.record() == holdArgs.record); 
+   }
+  );
+  formats = desc[0].item_type();
+ }
+
+ if( holdArgs.type == 'M' ) {
+  var data = holdsParseMRFormats(holdArgs.editHold.holdable_formats());
+  mods_formats = data.mods_formats;
+  formats = data.formats;
+ }
+
+
+ for( var i in mods_formats ) {
+  var res = mods_formats[i];
+  var img = elem("img");
+  setResourcePic(img, res);
+  $('holds_format').appendChild(img);
+  if(formats)
+   $('holds_format').appendChild(text(' '+ MARCTypeToFriendly(formats[i]) +' '));
+  else
+   $('holds_format').appendChild(text(' '+ mods_formats[i] +' '));
+  $('holds_format').appendChild(elem('br'));
+ }
+
+
+ $('holds_phone').value = holdArgs.recipient.day_phone();
+ appendClear( $('holds_email'), text(holdArgs.recipient.email()));
+
+ var pref = holdArgs.recipient.prefs[PREF_HOLD_NOTIFY];
+
+ if(pref) {
+  if( ! pref.match(/email/i) ) {
+   $('holds_enable_email').checked = false;
+  } else {
+   $('holds_enable_email').checked = true;
+  }
+
+  if( ! pref.match(/phone/i) ) {
+   $('holds_phone').disabled = true;
+   $('holds_enable_phone').checked = false;
+  } else {
+   $('holds_phone').disabled = false;
+   $('holds_enable_phone').checked = true;
+  }
+ }
 
     if(!holdArgs.recipient.email()) {
-		$('holds_enable_email').checked = false;	
-		$('holds_enable_email').disabled = true;
+  $('holds_enable_email').checked = false; 
+  $('holds_enable_email').disabled = true;
         var message;
         if(isXUL()) {
             message = noEmailMessageXUL.cloneNode(true);
-	        appendClear($('holds_email'), message);
+         appendClear($('holds_email'), message);
         } else {
             message = noEmailMessage.cloneNode(true);
-	        appendClear($('holds_email'), message);
+         appendClear($('holds_email'), message);
             $('holds.no_email.my_account').setAttribute('href', buildOPACLink({page:MYOPAC},null,true));
         }
         unHideMe(message);
     }
 
-	if(!$('holds_phone').value) 
-		$('holds_enable_phone').checked = false;	
+ if(!$('holds_phone').value) 
+  $('holds_enable_phone').checked = false; 
 
-	appendClear($('holds_physical_desc'), text(rec.physical_description()));
+ appendClear($('holds_physical_desc'), text(rec.physical_description()));
 
-	if(holdArgs.type == 'M') hideMe($('hold_physical_desc_row'));
+ if(holdArgs.type == 'M') hideMe($('hold_physical_desc_row'));
 
-	holdsSetFormatSelector();
+ holdsSetFormatSelector();
 
     $('holds_frozen_chkbox').checked = false;
     hideMe($('hold_frozen_thaw_row'));
@@ -503,240 +503,240 @@ function __holdsDrawWindow() {
 }
 
 function holdsParseMRFormats(str) {
-	var data = str.split(/-/);	
-
-	var formats = [];
-	var mods_formats = [];
-
-	for( var i = 0; i < data[0].length; i++ ) {
-		formats.push( data[0].charAt(i) );
-		mods_formats.push( MARCFormatToMods( formats[i] ) );
-	}
-	
-	formats = uniquify(formats);
-	mods_formats = uniquify(mods_formats);
-
-	return {
-		formats			: formats,
-		mods_formats	: mods_formats,
-		lang				: data[2],
-		largeprint		: data[1]
-	};
+ var data = str.split(/-/); 
+
+ var formats = [];
+ var mods_formats = [];
+
+ for( var i = 0; i < data[0].length; i++ ) {
+  formats.push( data[0].charAt(i) );
+  mods_formats.push( MARCFormatToMods( formats[i] ) );
+ }
+ 
+ formats = uniquify(formats);
+ mods_formats = uniquify(mods_formats);
+
+ return {
+  formats   : formats,
+  mods_formats : mods_formats,
+  lang    : data[2],
+  largeprint  : data[1]
+ };
 }
 
 
 function holdsSetFormatSelector() {
-	var type = holdArgs.type;
-	if( type == 'C' || type == 'V' || holdArgs.editHold ) return;
+ var type = holdArgs.type;
+ if( type == 'C' || type == 'V' || holdArgs.editHold ) return;
 
-	var data				= holdsGetFormats();
-	var avail_formats	= data.avail_formats;
-	var sel_formats	= data.sel_formats;
-	holdArgs.language = data.lang;
+ var data    = holdsGetFormats();
+ var avail_formats = data.avail_formats;
+ var sel_formats = data.sel_formats;
+ holdArgs.language = data.lang;
 
-	unHideMe($('holds_alt_formats_row_extras'));
-	var selector = $('hold_alt_form_selector');
+ unHideMe($('holds_alt_formats_row_extras'));
+ var selector = $('hold_alt_form_selector');
 
-	for( var i = 0; i < avail_formats.length; i++ ) {
-		var form = avail_formats[i];
-		unHideMe(findSelectorOptByValue(selector, form));
-	}
+ for( var i = 0; i < avail_formats.length; i++ ) {
+  var form = avail_formats[i];
+  unHideMe(findSelectorOptByValue(selector, form));
+ }
 }
 
 
 function holdsGetFormats() {
 
-	var lang;
-	var formats = [];
-	var sformats = []; // selected formats 
-
-	var type = holdArgs.type;
-	var desc = holdArgs.recordDescriptors;
-	var rec	= holdArgs.record;
-	var mrec = holdArgs.metarecord;
-
-	if( type == 'T' ) {
-
-		for( var i = 0; i < desc.length; i++ ) {
-			var d = desc[i];
-			if( d.record() == holdArgs.record ) {
-				lang = d.item_lang();
-				holdArgs.myFormat =  _t_f_2_format(d.item_type(), d.item_form());
-				sformats.push(holdArgs.myFormat);
-				break;
-			}
-		}
-	}
-
-	for( var i = 0; i < desc.length; i++ ) {
-		var d = desc[i];
-		if( d.item_lang() != lang ) continue;
-		formats.push( _t_f_2_format(d.item_type(), d.item_form()));
-	}
-
-	formats = uniquify(formats);
-
-	return {
-		lang : lang,
-		avail_formats : formats, 
-		sel_formats : sformats
-	};
+ var lang;
+ var formats = [];
+ var sformats = []; // selected formats 
+
+ var type = holdArgs.type;
+ var desc = holdArgs.recordDescriptors;
+ var rec = holdArgs.record;
+ var mrec = holdArgs.metarecord;
+
+ if( type == 'T' ) {
+
+  for( var i = 0; i < desc.length; i++ ) {
+   var d = desc[i];
+   if( d.record() == holdArgs.record ) {
+    lang = d.item_lang();
+    holdArgs.myFormat =  _t_f_2_format(d.item_type(), d.item_form());
+    sformats.push(holdArgs.myFormat);
+    break;
+   }
+  }
+ }
+
+ for( var i = 0; i < desc.length; i++ ) {
+  var d = desc[i];
+  if( d.item_lang() != lang ) continue;
+  formats.push( _t_f_2_format(d.item_type(), d.item_form()));
+ }
+
+ formats = uniquify(formats);
+
+ return {
+  lang : lang,
+  avail_formats : formats, 
+  sel_formats : sformats
+ };
 }
 
 
 
 function _t_f_2_format(type, form) {
-	if( form == 'd' ) return 'at-d';
-	return (type == 'a' || type == 't') ? 'at' : 
-		( type == 'i' || type == 'g' || type == 'j' ) ? type : null;
+ if( form == 'd' ) return 'at-d';
+ return (type == 'a' || type == 't') ? 'at' : 
+  ( type == 'i' || type == 'g' || type == 'j' ) ? type : null;
 }
 
 function holdsSetSelectedFormats() {
 
-	var cn = $('holds_alt_formats_row').className;
-	if( cn && cn.match(/hide_me/) ) return;
+ var cn = $('holds_alt_formats_row').className;
+ if( cn && cn.match(/hide_me/) ) return;
 
-	var selector = $('hold_alt_form_selector');
-	var vals = getSelectedList(selector);
+ var selector = $('hold_alt_form_selector');
+ var vals = getSelectedList(selector);
 
-	if(vals.length == 0) return;
+ if(vals.length == 0) return;
 
-	var fstring = "";
+ var fstring = "";
 
-	if( contains(vals, 'at-d') ) {
-		if( contains(vals, 'at') )
-			fstring = 'at';
-		else 
-			fstring = 'at-d';
-	} else {
-		if( contains(vals, 'at') )
-			fstring = 'at';
-	}
+ if( contains(vals, 'at-d') ) {
+  if( contains(vals, 'at') )
+   fstring = 'at';
+  else 
+   fstring = 'at-d';
+ } else {
+  if( contains(vals, 'at') )
+   fstring = 'at';
+ }
 
-	for( var i = 0; i < vals.length; i++ ) {
-		var val = vals[i];
-		if( !val.match(/at/) ) fstring = val + fstring;
-	}
+ for( var i = 0; i < vals.length; i++ ) {
+  var val = vals[i];
+  if( !val.match(/at/) ) fstring = val + fstring;
+ }
 
-	if( holdArgs.language ) {
-		if( fstring.match(/-/) )
-			fstring = fstring + '-' + holdArgs.language;
-		else
-			fstring = fstring + '--' + holdArgs.language;
-	}
+ if( holdArgs.language ) {
+  if( fstring.match(/-/) )
+   fstring = fstring + '-' + holdArgs.language;
+  else
+   fstring = fstring + '--' + holdArgs.language;
+ }
 
 
-	return fstring;
+ return fstring;
 }
 
 
 function holdsCheckPossibility(pickuplib, hold, recurse) {
 
-	var args = { 
-		titleid : holdArgs.record,
-		volume_id : holdArgs.volume,
-		copy_id : holdArgs.copy,
-		hold_type : holdArgs.type,
-		patronid : holdArgs.recipient.id(),
-		depth : 0, 
-		pickup_lib : pickuplib 
-	};
-
-	if(recurse) {
-		/* if we're calling create again (recursing), 
-			we know that the hold possibility check already succeeded */
-		holdHandleCreateResponse({_recurse:true, _hold:hold}, true );
-
-	} else {
-		_debug("hold possible args = "+js2JSON(args));
-	
-		var req = new Request(CHECK_HOLD_POSSIBLE, G.user.session, args );
-	
-		req.request.alertEvent = false;
-		req.request._hold = hold;
-		req.request._recurse = recurse;
-		req.callback(holdHandleCreateResponse);
-		req.send();
-	}
+ var args = { 
+  titleid : holdArgs.record,
+  volume_id : holdArgs.volume,
+  copy_id : holdArgs.copy,
+  hold_type : holdArgs.type,
+  patronid : holdArgs.recipient.id(),
+  depth : 0, 
+  pickup_lib : pickuplib 
+ };
+
+ if(recurse) {
+  /* if we're calling create again (recursing), 
+   we know that the hold possibility check already succeeded */
+  holdHandleCreateResponse({_recurse:true, _hold:hold}, true );
+
+ } else {
+  _debug("hold possible args = "+js2JSON(args));
+ 
+  var req = new Request(CHECK_HOLD_POSSIBLE, G.user.session, args );
+ 
+  req.request.alertEvent = false;
+  req.request._hold = hold;
+  req.request._recurse = recurse;
+  req.callback(holdHandleCreateResponse);
+  req.send();
+ }
 }
 
 
 function holdsBuildOrgSelector(node) {
 
-	if(!node) node = globalOrgTree;
+ if(!node) node = globalOrgTree;
     if(!isTrue(node.opac_visible())) return;
 
-	var selector = $('holds_org_selector');
-	var index = selector.options.length;
-
-	var type = findOrgType(node.ou_type());
-	var indent = type.depth() - 1;
-	var opt = setSelectorVal( selector, index, node.name(), node.id(), null, indent );
-	if(!type.can_have_users()) {
-		opt.disabled = true;
-		addCSSClass(opt, 'disabled_option');
-	}
-	
-	for( var i in node.children() ) {
-		var child = node.children()[i];
-		if(child) holdsBuildOrgSelector(child);
-	}
+ var selector = $('holds_org_selector');
+ var index = selector.options.length;
+
+ var type = findOrgType(node.ou_type());
+ var indent = type.depth() - 1;
+ var opt = setSelectorVal( selector, index, node.name(), node.id(), null, indent );
+ if(!type.can_have_users()) {
+  opt.disabled = true;
+  addCSSClass(opt, 'disabled_option');
+ }
+ 
+ for( var i in node.children() ) {
+  var child = node.children()[i];
+  if(child) holdsBuildOrgSelector(child);
+ }
 }
 
 function holdsBuildHoldFromWindow() {
 
-	var org = getSelectorVal($('holds_org_selector'));
-	var node = findOrgUnit(org);
-	var ntype = findOrgType(node.ou_type());
-	if(!ntype.can_have_users()) {
-		alertId('holds_pick_good_org');
-		return;
-	}
-
-	var hold = new ahr();
-	if(holdArgs.editHold) {
-		hold = holdArgs.editHold;
-		holdArgs.editHold = null;
-	}
-
-	if( $('holds_enable_phone').checked ) {
-		var phone = $('holds_phone').value;
-		if( !phone || !phone.match(REGEX_PHONE) ) {
-			alert($('holds_bad_phone').innerHTML);
-			return null;
-		}
-		hold.phone_notify(phone);
-
-	} else {
-		hold.phone_notify("");
-	}
-
-	if( $('holds_enable_email').checked ) 
-		hold.email_notify(1);
-	else
-		hold.email_notify(0);
-
-	var target;
-
-	switch(holdArgs.type) {
-		case 'M':
-			target = holdArgs.metarecord; break;
-		case 'T':
-			target = holdArgs.record; break;
-		case 'V':
-			target = holdArgs.volume; break;
-		case 'C':
-			target = holdArgs.copy; break;
-	}
-
-
-
-	hold.pickup_lib(org); 
-	//hold.request_lib(org); 
-	hold.requestor(holdArgs.requestor.id());
-	hold.usr(holdArgs.recipient.id());
-	hold.target(target);
-	hold.hold_type(holdArgs.type);
+ var org = getSelectorVal($('holds_org_selector'));
+ var node = findOrgUnit(org);
+ var ntype = findOrgType(node.ou_type());
+ if(!ntype.can_have_users()) {
+  alertId('holds_pick_good_org');
+  return;
+ }
+
+ var hold = new ahr();
+ if(holdArgs.editHold) {
+  hold = holdArgs.editHold;
+  holdArgs.editHold = null;
+ }
+
+ if( $('holds_enable_phone').checked ) {
+  var phone = $('holds_phone').value;
+  if( !phone || !phone.match(REGEX_PHONE) ) {
+   alert($('holds_bad_phone').innerHTML);
+   return null;
+  }
+  hold.phone_notify(phone);
+
+ } else {
+  hold.phone_notify("");
+ }
+
+ if( $('holds_enable_email').checked ) 
+  hold.email_notify(1);
+ else
+  hold.email_notify(0);
+
+ var target;
+
+ switch(holdArgs.type) {
+  case 'M':
+   target = holdArgs.metarecord; break;
+  case 'T':
+   target = holdArgs.record; break;
+  case 'V':
+   target = holdArgs.volume; break;
+  case 'C':
+   target = holdArgs.copy; break;
+ }
+
+
+
+ hold.pickup_lib(org); 
+ //hold.request_lib(org); 
+ hold.requestor(holdArgs.requestor.id());
+ hold.usr(holdArgs.recipient.id());
+ hold.target(target);
+ hold.hold_type(holdArgs.type);
 
     var expDate = dijit.byId('holds_expire_time').getValue();
     if(expDate) {
@@ -767,105 +767,105 @@ function holdsBuildHoldFromWindow() {
         hold.thaw_date(null);
     }
 
-	//check for alternate hold formats 
-	var fstring = holdsSetSelectedFormats();
-	if(fstring) { 
-		hold.hold_type('M'); 
-		hold.holdable_formats(fstring);
-		hold.target(holdArgs.metarecord);
-	}
-	return hold;
+ //check for alternate hold formats 
+ var fstring = holdsSetSelectedFormats();
+ if(fstring) { 
+  hold.hold_type('M'); 
+  hold.holdable_formats(fstring);
+  hold.target(holdArgs.metarecord);
+ }
+ return hold;
 }
-	
+ 
 function holdsPlaceHold(hold, recurse) {
-	if(!hold) return;
-	swapCanvas($('check_holds_box'));
-	holdsCheckPossibility(hold.pickup_lib(), hold, recurse);
+ if(!hold) return;
+ swapCanvas($('check_holds_box'));
+ holdsCheckPossibility(hold.pickup_lib(), hold, recurse);
 }
 
 
 function holdHandleCreateResponse(r, recurse) {
 
-	if(!recurse) {
-		var res = r.getResultObject();
-		if(checkILSEvent(res) || res.success != 1) {
-			if(res.success != 1) {
-				alert($('hold_not_allowed').innerHTML);
-			} else {
-				if( res.textcode == 'PATRON_BARRED' ) {
-					alertId('hold_failed_patron_barred');
-			} else {
-					alert($('hold_not_allowed').innerHTML);
-				}
-			}
-			swapCanvas($('holds_box'));
-			return;
-		}
+ if(!recurse) {
+  var res = r.getResultObject();
+  if(checkILSEvent(res) || res.success != 1) {
+   if(res.success != 1) {
+    alert($('hold_not_allowed').innerHTML);
+   } else {
+    if( res.textcode == 'PATRON_BARRED' ) {
+     alertId('hold_failed_patron_barred');
+   } else {
+     alert($('hold_not_allowed').innerHTML);
+    }
+   }
+   swapCanvas($('holds_box'));
+   return;
+  }
         r._hold.selection_depth(res.depth);
-	}	
+ } 
 
-	holdCreateHold(r._recurse, r._hold);
+ holdCreateHold(r._recurse, r._hold);
 }
 
 
 function holdCreateHold( recurse, hold ) {
-	var method = CREATE_HOLD;
-	if(recurse) method = CREATE_HOLD_OVERRIDE;
-	var req = new Request( method, holdArgs.requestor.session, hold );
-	req.request.alertEvent = false;
-	req.send(true);
-	var res = req.result();
-	holdProcessResult(hold, res, recurse);
-	
-	showCanvas();
-
-	runEvt('common', 'holdUpdated');
+ var method = CREATE_HOLD;
+ if(recurse) method = CREATE_HOLD_OVERRIDE;
+ var req = new Request( method, holdArgs.requestor.session, hold );
+ req.request.alertEvent = false;
+ req.send(true);
+ var res = req.result();
+ holdProcessResult(hold, res, recurse);
+ 
+ showCanvas();
+
+ runEvt('common', 'holdUpdated');
 }
 
 
 function holdProcessResult( hold, res, recurse ) {
 
-	if( res == '1' ) {
-		alert($('holds_success').innerHTML);
-		holdArgs = null;
+ if( res == '1' ) {
+  alert($('holds_success').innerHTML);
+  holdArgs = null;
 
-	} else {
+ } else {
 
-		if( recurse ) {
-			alert($('holds_failure').innerHTML);
-			return;
-		}
+  if( recurse ) {
+   alert($('holds_failure').innerHTML);
+   return;
+  }
 
-		if( grep(res, function(e) { return (e.textcode == 'HOLD_EXISTS'); }) ) {
-			if( fetchPermOrgs('HOLD_EXISTS.override')[0] != -1 ) {
-				if( confirm($('hold_dup_exists_override').innerHTML) ) {
-					return holdsPlaceHold(hold, true);
-				}
+  if( grep(res, function(e) { return (e.textcode == 'HOLD_EXISTS'); }) ) {
+   if( fetchPermOrgs('HOLD_EXISTS.override')[0] != -1 ) {
+    if( confirm($('hold_dup_exists_override').innerHTML) ) {
+     return holdsPlaceHold(hold, true);
+    }
 
-			} else {
-				return alert($('hold_dup_exists').innerHTML);
-			}
-		}
+   } else {
+    return alert($('hold_dup_exists').innerHTML);
+   }
+  }
 
-		alert($('holds_failure').innerHTML);
-	}
+  alert($('holds_failure').innerHTML);
+ }
 }
 
 
 function holdsCancel(holdid, user) {
-	if(!user) user = G.user;
-	var req = new Request(CANCEL_HOLD, user.session, holdid, /* Patron via OPAC */ 6);
-	req.send(true);
-	return req.result();
-	runEvt('common', 'holdUpdated');
+ if(!user) user = G.user;
+ var req = new Request(CANCEL_HOLD, user.session, holdid, /* Patron via OPAC */ 6);
+ req.send(true);
+ return req.result();
+ runEvt('common', 'holdUpdated');
 }
 
 function holdsUpdate(hold, user) {
-	if(!user) user = G.user;
-	var req = new Request(UPDATE_HOLD, user.session, hold);
-	req.send(true);
-	var x = req.result(); // cause an exception if there is one 
-	runEvt('common', 'holdUpdated');
+ if(!user) user = G.user;
+ var req = new Request(UPDATE_HOLD, user.session, hold);
+ req.send(true);
+ var x = req.result(); // cause an exception if there is one 
+ runEvt('common', 'holdUpdated');
 }
 
 /* verify that the thaw date is valid and after today */
diff --git a/Open-ILS/web/opac/skin/default/js/mresult.js b/Open-ILS/web/opac/skin/default/js/mresult.js
index 51850529fc..bdbc592bdc 100644
--- a/Open-ILS/web/opac/skin/default/js/mresult.js
+++ b/Open-ILS/web/opac/skin/default/js/mresult.js
@@ -18,102 +18,102 @@ hideMe($('copyright_block'));
 function mresultDoSearch() {
 
 
-	TFORM = null; /* clear the rresult tform var so it's not propogated */
+ TFORM = null; /* clear the rresult tform var so it's not propogated */
 
-	swapCanvas($('loading_alt'));
-	table = G.ui.result.main_table;
+ swapCanvas($('loading_alt'));
+ table = G.ui.result.main_table;
 
-	while( table.parentNode.rows.length <= (getDisplayCount() + 1) )  
-		table.appendChild(G.ui.result.row_template.cloneNode(true));
+ while( table.parentNode.rows.length <= (getDisplayCount() + 1) )  
+  table.appendChild(G.ui.result.row_template.cloneNode(true));
 
-	if( (getSearches() || getAdvTerm()) && !getTerm() ) {
-		if(getAdvType() == ADVTYPE_MULTI ) mresultCollectAdvIds();
+ if( (getSearches() || getAdvTerm()) && !getTerm() ) {
+  if(getAdvType() == ADVTYPE_MULTI ) mresultCollectAdvIds();
 
-	} else {
-		_mresultCollectIds(); 
-		ADVTERM = "";
-		ADVTYPE = "";
-	}
+ } else {
+  _mresultCollectIds(); 
+  ADVTERM = "";
+  ADVTYPE = "";
+ }
 }
 
 function _mresultCollectIds() { 
-	resultCollectSearchIds(true, SEARCH_MRS_QUERY, mresultHandleMRIds ); 
+ resultCollectSearchIds(true, SEARCH_MRS_QUERY, mresultHandleMRIds ); 
 }
 
 function mresultCollectAdvIds() { 
-	resultCollectSearchIds(false, SEARCH_MRS_QUERY, mresultHandleMRIds ); 
+ resultCollectSearchIds(false, SEARCH_MRS_QUERY, mresultHandleMRIds ); 
 }
 
 
 function mresultHandleMRIds(r) {
-	var res = r.getResultObject();
+ var res = r.getResultObject();
     resultCompiledSearch = res.compiled_search;
     cookieManager.write(COOKIE_SEARCH, js2JSON(res.compiled_search), -1);
-	if(res.count != null) {
-		if( getOffset() == 0 ) HITCOUNT = res.count;
-		runEvt('result', 'hitCountReceived');
-	} 
-	runEvt('result', 'idsReceived', res.ids);
+ if(res.count != null) {
+  if( getOffset() == 0 ) HITCOUNT = res.count;
+  runEvt('result', 'hitCountReceived');
+ } 
+ runEvt('result', 'idsReceived', res.ids);
 }
 
 
 
 function mresultSetRecords(idstruct) {
-	if(!idstruct) return;
-	var o = getOffset();
-	for( var x = o; x < idstruct.length + o; x++ ) {
-		if( idstruct[x-o] != null ) {
-			var r = parseInt(idstruct[x - o][0]);
-			var ra = parseFloat(idstruct[x - o][1]);
-			var or = parseInt(idstruct[x - o][2]);
-			if(!isNull(r) && !isNaN(r)) records[x] = r;
-			if(!isNull(ra) && !isNaN(ra)) ranks[x] = ra;
-			if(!isNull(or) && !isNaN(or)) onlyrecord[x] = or;
-		}
-	}
-
-	TOPRANK = ranks[getOffset()];
+ if(!idstruct) return;
+ var o = getOffset();
+ for( var x = o; x < idstruct.length + o; x++ ) {
+  if( idstruct[x-o] != null ) {
+   var r = parseInt(idstruct[x - o][0]);
+   var ra = parseFloat(idstruct[x - o][1]);
+   var or = parseInt(idstruct[x - o][2]);
+   if(!isNull(r) && !isNaN(r)) records[x] = r;
+   if(!isNull(ra) && !isNaN(ra)) ranks[x] = ra;
+   if(!isNull(or) && !isNaN(or)) onlyrecord[x] = or;
+  }
+ }
+
+ TOPRANK = ranks[getOffset()];
 }
 
 
 
 function mresultCollectRecords() {
-	if(getHitCount() > 0 ) runEvt("result", "preCollectRecords");
-	var i = 0;
-	for( var x = getOffset(); x!= getDisplayCount() + getOffset(); x++ ) {
-		if(isNull(records[x])) break;
-		if(isNaN(records[x])) continue;
-		var req = new Request(FETCH_MRMODS, records[x]);
-
-		req.request.userdata = i++;
-
-		/* wait at most 10 seconds for the mods rec to come back */
-		/* this needs more testing  */
-		req.request.timeout(10); 
-		req.request.abortCallback(
-			function(){
-				recordsHandled++;
-				if(resultPageIsDone()) {
-					runEvt('result', 'allRecordsReceived', recordsCache);
-					unHideMe($('copyright_block'));
-				}
-			}
-		);
-
-		req.callback(mresultHandleMods);
-		req.send();
-	}
+ if(getHitCount() > 0 ) runEvt("result", "preCollectRecords");
+ var i = 0;
+ for( var x = getOffset(); x!= getDisplayCount() + getOffset(); x++ ) {
+  if(isNull(records[x])) break;
+  if(isNaN(records[x])) continue;
+  var req = new Request(FETCH_MRMODS, records[x]);
+
+  req.request.userdata = i++;
+
+  /* wait at most 10 seconds for the mods rec to come back */
+  /* this needs more testing  */
+  req.request.timeout(10); 
+  req.request.abortCallback(
+   function(){
+    recordsHandled++;
+    if(resultPageIsDone()) {
+     runEvt('result', 'allRecordsReceived', recordsCache);
+     unHideMe($('copyright_block'));
+    }
+   }
+  );
+
+  req.callback(mresultHandleMods);
+  req.send();
+ }
 }
 
 function mresultHandleMods(r) {
-	var rec = r.getResultObject();
-	var pagePosition = r.userdata;
-	runEvt('result', 'recordReceived', rec, pagePosition, true);
-	if(rec) resultCollectCopyCounts(rec, pagePosition, FETCH_MR_COPY_COUNTS);
-	if(resultPageIsDone()) {
-		runEvt('result', 'allRecordsReceived', recordsCache);
-		unHideMe($('copyright_block')); /* *** */
-	}
+ var rec = r.getResultObject();
+ var pagePosition = r.userdata;
+ runEvt('result', 'recordReceived', rec, pagePosition, true);
+ if(rec) resultCollectCopyCounts(rec, pagePosition, FETCH_MR_COPY_COUNTS);
+ if(resultPageIsDone()) {
+  runEvt('result', 'allRecordsReceived', recordsCache);
+  unHideMe($('copyright_block')); /* *** */
+ }
 }
 
 
diff --git a/Open-ILS/web/opac/skin/default/js/myopac.js b/Open-ILS/web/opac/skin/default/js/myopac.js
index 2be360cd78..1a77a0e2a7 100644
--- a/Open-ILS/web/opac/skin/default/js/myopac.js
+++ b/Open-ILS/web/opac/skin/default/js/myopac.js
@@ -13,15 +13,15 @@ var myopacRefWorksHost = 'http://www.refworks.com';
 
 
 function clearNodes( node, keepArray ) {
-	if(!node) return;
-	for( var n in keepArray ) node.removeChild(keepArray[n]);
-	removeChildren(node);
-	for( var n in keepArray ) node.appendChild(keepArray[n]);
+ if(!node) return;
+ for( var n in keepArray ) node.removeChild(keepArray[n]);
+ removeChildren(node);
+ for( var n in keepArray ) node.appendChild(keepArray[n]);
 }
 
 function myOPACInit() {
 
-	if(!(G.user && G.user.session)) {
+ if(!(G.user && G.user.session)) {
         initLogin();
 
     } else {
@@ -29,7 +29,7 @@ function myOPACInit() {
         allowPendingAddr = fetchOrgSettingDefault(G.user.home_ou(), 'opac.allow_pending_address');
         if(allowPendingAddr)
             unHideMe($('myopac_pending_addr_td'));
-	    myOPACChangePage( "summary" );
+     myOPACChangePage( "summary" );
     }
 
     $('myopac_holds_thaw_date_input').onkeyup = 
@@ -40,96 +40,96 @@ function myOPACInit() {
 }
 
 function myopacReload() {
-	//swapCanvas($('myopac_reloading'));
-	var a = {};
-	a[PARAM_LOCATION] = getNewSearchLocation();
-	a[PARAM_DEPTH] = getNewSearchDepth();
-	hideMe($('canvas_main'));
-	goTo(buildOPACLink(a, true));
+ //swapCanvas($('myopac_reloading'));
+ var a = {};
+ a[PARAM_LOCATION] = getNewSearchLocation();
+ a[PARAM_DEPTH] = getNewSearchDepth();
+ hideMe($('canvas_main'));
+ goTo(buildOPACLink(a, true));
 }
 
 
 function myOPACChangePage( page ) {
-	showCanvas();
-
-	var s = $("myopac_summary_td");
-	var c = $("myopac_checked_td");
-	var f = $("myopac_fines_td");
-	var h = $("myopac_holds_td");
-	var p = $("myopac_prefs_td");
-	var b = $('myopac_bookbag_td');
-
-	var ss = $("myopac_summary_div");
-	var cc = $("myopac_checked_div");
-	var ff = $("myopac_fines_div");
-	var hh = $("myopac_holds_div");
-	var pp = $("myopac_prefs_div");
-	var bb = $('myopac_bookbag_div');
-
-	var cls = "myopac_link";
-	var acls = "myopac_link_active";
-
-	hideMe(ss);
-	hideMe(cc); hideMe(ff);
-	hideMe(hh); hideMe(pp);
-	hideMe(bb);
-
-	removeCSSClass(s, acls );
-	removeCSSClass(c, acls );
-	removeCSSClass(f, acls );
-	removeCSSClass(h, acls );
-	removeCSSClass(p, acls );
-	removeCSSClass(b, acls );
-
-	switch( page ) {
-
-		case "summary": 
-			unHideMe(ss);
-			addCSSClass(s, acls );
-			myOPACShowSummary();
-			break;
-
-		case "checked": 
-			unHideMe(cc);
-			addCSSClass(c, acls );
-			myOPACShowChecked();
-			break;
-
-		case "holds": 
-			unHideMe(hh);
-			addCSSClass(h, acls );
-			myOPACShowHolds();
-			break;
-
-		case "fines": 
-			unHideMe(ff);
-			addCSSClass(f, acls );
-			myOPACShowFines();
-			break;
-
-		case "prefs": 
-			unHideMe(pp);
-			addCSSClass(p, acls );
-			myOPACShowPrefs();
-			break;
-
-		case 'bookbag':
-			unHideMe(bb);
-			addCSSClass(b, acls);
-			myOPACShowBookbags();
-			break;
-	}
+ showCanvas();
+
+ var s = $("myopac_summary_td");
+ var c = $("myopac_checked_td");
+ var f = $("myopac_fines_td");
+ var h = $("myopac_holds_td");
+ var p = $("myopac_prefs_td");
+ var b = $('myopac_bookbag_td');
+
+ var ss = $("myopac_summary_div");
+ var cc = $("myopac_checked_div");
+ var ff = $("myopac_fines_div");
+ var hh = $("myopac_holds_div");
+ var pp = $("myopac_prefs_div");
+ var bb = $('myopac_bookbag_div');
+
+ var cls = "myopac_link";
+ var acls = "myopac_link_active";
+
+ hideMe(ss);
+ hideMe(cc); hideMe(ff);
+ hideMe(hh); hideMe(pp);
+ hideMe(bb);
+
+ removeCSSClass(s, acls );
+ removeCSSClass(c, acls );
+ removeCSSClass(f, acls );
+ removeCSSClass(h, acls );
+ removeCSSClass(p, acls );
+ removeCSSClass(b, acls );
+
+ switch( page ) {
+
+  case "summary": 
+   unHideMe(ss);
+   addCSSClass(s, acls );
+   myOPACShowSummary();
+   break;
+
+  case "checked": 
+   unHideMe(cc);
+   addCSSClass(c, acls );
+   myOPACShowChecked();
+   break;
+
+  case "holds": 
+   unHideMe(hh);
+   addCSSClass(h, acls );
+   myOPACShowHolds();
+   break;
+
+  case "fines": 
+   unHideMe(ff);
+   addCSSClass(f, acls );
+   myOPACShowFines();
+   break;
+
+  case "prefs": 
+   unHideMe(pp);
+   addCSSClass(p, acls );
+   myOPACShowPrefs();
+   break;
+
+  case 'bookbag':
+   unHideMe(bb);
+   addCSSClass(b, acls);
+   myOPACShowBookbags();
+   break;
+ }
 }
 
 function myOPACShowChecked() {
-	if(checkedDrawn) return;
-	var req = new Request(FETCH_CHECKED_OUT_SUM, G.user.session, G.user.id());	
-	req.callback(myOPACDrawCheckedOutSlim);
-	req.send();
+ if(checkedDrawn) return;
+ var req = new Request(FETCH_CHECKED_OUT_SUM, G.user.session, G.user.id()); 
+ req.callback(myOPACDrawCheckedOutSlim);
+ req.send();
 
-	var nreq = new Request(FETCH_NON_CAT_CIRCS, G.user.session);
-	nreq.callback(myOPACDrawNonCatCircs);
-	nreq.send();
+ var nreq = new Request(FETCH_NON_CAT_CIRCS, G.user.session);
+ nreq.callback(myOPACDrawNonCatCircs);
+ nreq.send();
 }
 
 
@@ -138,35 +138,35 @@ var circsCache = new Array();
 var checkedDrawn = false;
 
 function moClearCheckedTable() {
-	var tbody			= $("myopac_checked_tbody");
-	var loading			= $("myopac_checked_loading");
-	var none				= $("myopac_checked_none");
-	clearNodes( tbody, [ loading, none ] );
+ var tbody   = $("myopac_checked_tbody");
+ var loading   = $("myopac_checked_loading");
+ var none    = $("myopac_checked_none");
+ clearNodes( tbody, [ loading, none ] );
 }
 
 var __can_renew_one = false;
 
 function myOPACDrawCheckedOutSlim(r) {
 
-	var checked			= r.getResultObject();
-	var tbody			= $("myopac_checked_tbody");
-	var loading			= $("myopac_checked_loading");
-	var none				= $("myopac_checked_none");
+ var checked   = r.getResultObject();
+ var tbody   = $("myopac_checked_tbody");
+ var loading   = $("myopac_checked_loading");
+ var none    = $("myopac_checked_none");
 
    __can_renew_one = false;
 
-	if(checkedDrawn) return;
-	checkedDrawn = true;
-	if(!checkedRowTemplate) 
-		checkedRowTemplate = tbody.removeChild($("myopac_checked_row"));
+ if(checkedDrawn) return;
+ checkedDrawn = true;
+ if(!checkedRowTemplate) 
+  checkedRowTemplate = tbody.removeChild($("myopac_checked_row"));
 
    moClearCheckedTable();
 
-	hideMe(loading); /* remove all children and start over */
-	if(!(checked && (checked.out || checked.overdue))) {
-		unHideMe(none);
-		return;
-	}
+ hideMe(loading); /* remove all children and start over */
+ if(!(checked && (checked.out || checked.overdue))) {
+  unHideMe(none);
+  return;
+ }
 
     var totalAsync = checked.overdue.length + checked.out.length;
     var fetchedCircs = [];
@@ -191,21 +191,21 @@ function myOPACDrawCheckedOutSlim(r) {
         );
     }
 
-	for( var i = 0; i < checked.overdue.length; i++ ) {
-		var req = new Request(FETCH_CIRC_BY_ID, G.user.session, checked.overdue[i]);
-		//req.request.tbody = tbody;
-		req.request.od = true;
-		req.callback(collectCircs);
-		req.send();
-	}
+ for( var i = 0; i < checked.overdue.length; i++ ) {
+  var req = new Request(FETCH_CIRC_BY_ID, G.user.session, checked.overdue[i]);
+  //req.request.tbody = tbody;
+  req.request.od = true;
+  req.callback(collectCircs);
+  req.send();
+ }
 
 
-	for( var i = 0; i < checked.out.length; i++ ) {
-		var req = new Request(FETCH_CIRC_BY_ID, G.user.session, checked.out[i]);
-		//req.request.tbody = tbody;
-		req.callback(collectCircs);
-		req.send();
-	}
+ for( var i = 0; i < checked.out.length; i++ ) {
+  var req = new Request(FETCH_CIRC_BY_ID, G.user.session, checked.out[i]);
+  //req.request.tbody = tbody;
+  req.callback(collectCircs);
+  req.send();
+ }
 
    appendClear($('mo_items_out_count'), 
       text(new String( parseInt(checked.overdue.length) + parseInt(checked.out.length) )) );
@@ -222,33 +222,33 @@ function myOPACDrawCheckedOutSlim(r) {
 //function myOPACDrawCheckedItem(r) {
 function myOPACDrawCheckedItem(circ, tbody) {
 
-	//var circ = r.getResultObject();
-	//var tbody = r.tbody;
-	var row = checkedRowTemplate.cloneNode(true);
-	row.id = 'myopac_checked_row_ ' + circ.id();
+ //var circ = r.getResultObject();
+ //var tbody = r.tbody;
+ var row = checkedRowTemplate.cloneNode(true);
+ row.id = 'myopac_checked_row_ ' + circ.id();
     row.setAttribute('circid', circ.id());
 
-	var due = _trimTime(circ.due_date());
+ var due = _trimTime(circ.due_date());
 
-	var dlink = $n( row, "myopac_checked_due" );
-	var rlink = $n( row, "myopac_checked_renewals" );
-	//var rnlink = $n( row, "myopac_checked_renew_link" );
+ var dlink = $n( row, "myopac_checked_due" );
+ var rlink = $n( row, "myopac_checked_renewals" );
+ //var rnlink = $n( row, "myopac_checked_renew_link" );
 
-	//if( r.od ) due = elem('b', {style:'color:red;font-size:110%'},due);
-	if( circ._od ) {
+ //if( r.od ) due = elem('b', {style:'color:red;font-size:110%'},due);
+ if( circ._od ) {
       due = elem('b', null, due);
       addCSSClass(due, 'overdue');
    } else {
       due = text(due);
    }
 
-	dlink.appendChild(due);
-	rlink.appendChild(text(circ.renewal_remaining()));
-	unHideMe(row);
-	//rnlink.setAttribute('href', 'javascript:myOPACRenewCirc("'+circ.id()+'");');
-	circsCache.push(circ);
+ dlink.appendChild(due);
+ rlink.appendChild(text(circ.renewal_remaining()));
+ unHideMe(row);
+ //rnlink.setAttribute('href', 'javascript:myOPACRenewCirc("'+circ.id()+'");');
+ circsCache.push(circ);
 
-	if( circ.renewal_remaining() < 1 ) {
+ if( circ.renewal_remaining() < 1 ) {
       $n(row, 'selectme').disabled = true;
       if(!__can_renew_one)
          $('mo_renew_button').disabled = true;
@@ -258,48 +258,48 @@ function myOPACDrawCheckedItem(circ, tbody) {
       $n(row, 'selectme').disabled = false;
    }
 
-	tbody.appendChild(row);
+ tbody.appendChild(row);
 
-	var req = new Request(FETCH_MODS_FROM_COPY, circ.target_copy() );
-	req.request.alertEvent = false;
-	req.request.circ = circ.id();
-	req.request.copy = circ.target_copy();
-	req.callback(myOPACDrawCheckedTitle);
-	req.send();
+ var req = new Request(FETCH_MODS_FROM_COPY, circ.target_copy() );
+ req.request.alertEvent = false;
+ req.request.circ = circ.id();
+ req.request.copy = circ.target_copy();
+ req.callback(myOPACDrawCheckedTitle);
+ req.send();
 }
 
 var __circ_titles = {};
 
 function myOPACDrawCheckedTitle(r) {
-	var record = r.getResultObject();
-	var circid = r.circ;
-
-	if(!record || checkILSEvent(record)) {
-		var req = new Request( FETCH_COPY, r.copy );
-		req.request.circ = circid
-		req.callback(myOPACDrawNonCatalogedItem);
-		req.send();
-		return;
-	}
-
-	var row = $('myopac_checked_row_ ' + circid);
-	var tlink = $n( row, "myopac_checked_title_link" );
-	var alink = $n( row, "myopac_checked_author_link" );
-	buildTitleDetailLink(record, tlink);
-	buildSearchLink(STYPE_AUTHOR, record.author(), alink);
+ var record = r.getResultObject();
+ var circid = r.circ;
+
+ if(!record || checkILSEvent(record)) {
+  var req = new Request( FETCH_COPY, r.copy );
+  req.request.circ = circid
+  req.callback(myOPACDrawNonCatalogedItem);
+  req.send();
+  return;
+ }
+
+ var row = $('myopac_checked_row_ ' + circid);
+ var tlink = $n( row, "myopac_checked_title_link" );
+ var alink = $n( row, "myopac_checked_author_link" );
+ buildTitleDetailLink(record, tlink);
+ buildSearchLink(STYPE_AUTHOR, record.author(), alink);
    __circ_titles[circid] = record.title();
 }
 
 function myOPACDrawNonCatalogedItem(r) {
-	var copy = r.getResultObject();
-	var circid = r.circ;
+ var copy = r.getResultObject();
+ var circid = r.circ;
 
-	var row = $('myopac_checked_row_ ' + circid);
-	var tlink = $n( row, "myopac_checked_title_link" );
-	var alink = $n( row, "myopac_checked_author_link" );
+ var row = $('myopac_checked_row_ ' + circid);
+ var tlink = $n( row, "myopac_checked_title_link" );
+ var alink = $n( row, "myopac_checked_author_link" );
 
-	tlink.parentNode.appendChild(text(copy.dummy_title()));
-	alink.parentNode.appendChild(text(copy.dummy_author()));
+ tlink.parentNode.appendChild(text(copy.dummy_title()));
+ alink.parentNode.appendChild(text(copy.dummy_author()));
    __circ_titles[circid] = copy.dummy_title();
 }
 
@@ -307,36 +307,36 @@ function myOPACDrawNonCatalogedItem(r) {
 /*
 function myOPACRenewCirc(circid) {
 
-	var circ;
-	for( var i = 0; i != circsCache.length; i++ ) 
-		if(circsCache[i].id() == circid)
-			circ = circsCache[i];
+ var circ;
+ for( var i = 0; i != circsCache.length; i++ ) 
+  if(circsCache[i].id() == circid)
+   circ = circsCache[i];
 
-	if(!confirm($('myopac_renew_confirm').innerHTML)) return;
+ if(!confirm($('myopac_renew_confirm').innerHTML)) return;
 
-	var req = new Request(RENEW_CIRC, G.user.session, 
-		{ patron : G.user.id(), copyid : circ.target_copy(), opac_renewal : 1 } );
-	req.request.alertEvent = false;
-	req.send(true);
-	var res = req.result();
+ var req = new Request(RENEW_CIRC, G.user.session, 
+  { patron : G.user.id(), copyid : circ.target_copy(), opac_renewal : 1 } );
+ req.request.alertEvent = false;
+ req.send(true);
+ var res = req.result();
 
-	if(checkILSEvent(res) || checkILSEvent(res[0])) {
-		alertId('myopac_renew_fail');
-		return;
-	}
+ if(checkILSEvent(res) || checkILSEvent(res[0])) {
+  alertId('myopac_renew_fail');
+  return;
+ }
 
-	alert($('myopac_renew_success').innerHTML);	
-	checkedDrawn = false;
-	myOPACShowChecked();
+ alert($('myopac_renew_success').innerHTML); 
+ checkedDrawn = false;
+ myOPACShowChecked();
 }
 */
 
 
 
 function myOPACShowHolds() {
-	var req = new Request(FETCH_HOLDS, G.user.session, G.user.id());	
-	req.callback(myOPACDrawHolds);
-	req.send();
+ var req = new Request(FETCH_HOLDS, G.user.session, G.user.id()); 
+ req.callback(myOPACDrawHolds);
+ req.send();
     $('myopac_holds_actions_none').selected = true;
 }
 
@@ -345,41 +345,41 @@ var holdsTemplateRow;
 var myopacForceHoldsRedraw = false;
 function myOPACDrawHolds(r) {
 
-	var tbody = $("myopac_holds_tbody");
-	if(holdsTemplateRow && !myopacForceHoldsRedraw) return;
+ var tbody = $("myopac_holds_tbody");
+ if(holdsTemplateRow && !myopacForceHoldsRedraw) return;
     myopacForceHoldsRedraw = false;
 
-	if(holdsTemplateRowOrig) {
-		holdsTemplateRow = holdsTemplateRowOrig;
-		removeChildren(tbody);
-	} else {
-		holdsTemplateRow = tbody.removeChild($("myopac_holds_row"));
-		holdsTemplateRowOrig = holdsTemplateRow;
-	}
+ if(holdsTemplateRowOrig) {
+  holdsTemplateRow = holdsTemplateRowOrig;
+  removeChildren(tbody);
+ } else {
+  holdsTemplateRow = tbody.removeChild($("myopac_holds_row"));
+  holdsTemplateRowOrig = holdsTemplateRow;
+ }
 
-	hideMe($('myopac_holds_loading'));
+ hideMe($('myopac_holds_loading'));
 
-	var holds = r.getResultObject();
+ var holds = r.getResultObject();
 
-	if(!holds || holds.length < 1) unHideMe($('myopac_holds_none'));
-	for( var i = 0; i != holds.length; i++ ) {
+ if(!holds || holds.length < 1) unHideMe($('myopac_holds_none'));
+ for( var i = 0; i != holds.length; i++ ) {
 
-		var h = holds[i];
-		holdCache[h.id()] = h;
+  var h = holds[i];
+  holdCache[h.id()] = h;
 
-		var row = holdsTemplateRow.cloneNode(true);
-		row.id = "myopac_holds_row_" + h.id();
+  var row = holdsTemplateRow.cloneNode(true);
+  row.id = "myopac_holds_row_" + h.id();
 
-		var form = $n(row, "myopac_holds_formats");
-		form.id = "myopac_holds_form_" + h.id();
+  var form = $n(row, "myopac_holds_formats");
+  form.id = "myopac_holds_form_" + h.id();
 
-		var orglink = $n(row, "myopac_holds_location");
-		orglink.appendChild(text(findOrgUnit(h.pickup_lib()).name()));
+  var orglink = $n(row, "myopac_holds_location");
+  orglink.appendChild(text(findOrgUnit(h.pickup_lib()).name()));
 
-		tbody.appendChild(row);
+  tbody.appendChild(row);
 
-		$n(row,'myopac_holds_edit_link').setAttribute(
-			'href','javascript:myOPACEditHold("'+ h.id()+'");'); 
+  $n(row,'myopac_holds_edit_link').setAttribute(
+   'href','javascript:myOPACEditHold("'+ h.id()+'");'); 
 
         if(isTrue(h.frozen())) {
             hideMe($n(row, 'myopac_hold_unfrozen_true'))
@@ -402,7 +402,7 @@ function myOPACDrawHolds(r) {
                 text(dojo.date.locale.format(exp_date, {selector:'date'})));
         }
 
-		unHideMe(row);
+  unHideMe(row);
 
         var interval = fetchOrgSettingDefault(G.user.home_ou(), 'circ.hold_expire_alert_interval');
         if(interval && exp_date) {
@@ -418,35 +418,35 @@ function myOPACDrawHolds(r) {
 }
 
 function myOPACEditHold(holdid) {
-	var hold = holdCache[holdid];
-
-	holdsDrawEditor( 
-		{ 
-			editHold : hold,
-			onComplete : function(){ 
-				holdsTemplateRow = null;
-				myOPACShowHolds(); 
-			}
-		}
-	);
+ var hold = holdCache[holdid];
+
+ holdsDrawEditor( 
+  { 
+   editHold : hold,
+   onComplete : function(){ 
+    holdsTemplateRow = null;
+    myOPACShowHolds(); 
+   }
+  }
+ );
 }
 
 
 function myOPACDrawHoldStatus(hold) {
-	var req = new Request(FETCH_HOLD_STATUS, G.user.session, hold.id() );
-	req.callback(myOShowHoldStatus);
-	req.request.hold = hold;
-	req.send();
+ var req = new Request(FETCH_HOLD_STATUS, G.user.session, hold.id() );
+ req.callback(myOShowHoldStatus);
+ req.request.hold = hold;
+ req.send();
 }
 
 var myopacShowHoldEstimate = false;
 function myOShowHoldStatus(r) {
 
-	var hold = r.hold;
-	var qstats = r.getResultObject();
+ var hold = r.hold;
+ var qstats = r.getResultObject();
     holdStatusCache[hold.id()] = qstats;
 
-	var row = $("myopac_holds_row_" + r.hold.id());
+ var row = $("myopac_holds_row_" + r.hold.id());
 
     if(qstats.estimated_wait || myopacShowHoldEstimate) {
         myopacShowHoldEstimate = true;
@@ -456,10 +456,10 @@ function myOShowHoldStatus(r) {
         unHideMe($n(row, 'myopac_holds_estimated_wait'));
     } 
 
-	if( qstats.status == 4 ) {
-		unHideMe($n(row, 'hold_status_available'));
-		hideMe($n(row, 'myopac_holds_cancel_link'));
-	}
+ if( qstats.status == 4 ) {
+  unHideMe($n(row, 'hold_status_available'));
+  hideMe($n(row, 'myopac_holds_cancel_link'));
+ }
 
     if(false) {
         var node = $n(row, 'hold_qstats');
@@ -468,125 +468,125 @@ function myOShowHoldStatus(r) {
         unHideMe(node);
 
     } else {
-	    if( qstats.status < 3 )
-		    unHideMe($n(row, 'hold_status_waiting'));
+     if( qstats.status < 3 )
+      unHideMe($n(row, 'hold_status_waiting'));
     
-	    if( qstats.status == 3 )
-		    unHideMe($n(row, 'hold_status_transit'));
+     if( qstats.status == 3 )
+      unHideMe($n(row, 'hold_status_transit'));
     }
 }
 
 
 function myOPACDrawHoldTitle(hold) {
-	var method;
+ var method;
 
-	if( hold.hold_type() == 'T' || hold.hold_type() == 'M' ) {
-		if(hold.hold_type() == "M") method = FETCH_MRMODS;
-		if(hold.hold_type() == "T") method = FETCH_RMODS;
-		var req = new Request(method, hold.target());
-		req.callback(myOPACFleshHoldTitle);
-		req.request.hold = hold;
-		req.request.alertEvent = false;
-		req.send();
+ if( hold.hold_type() == 'T' || hold.hold_type() == 'M' ) {
+  if(hold.hold_type() == "M") method = FETCH_MRMODS;
+  if(hold.hold_type() == "T") method = FETCH_RMODS;
+  var req = new Request(method, hold.target());
+  req.callback(myOPACFleshHoldTitle);
+  req.request.hold = hold;
+  req.request.alertEvent = false;
+  req.send();
 
-	} else {
-		holdFetchObjects(hold, 
-			function(a) { _myOPACFleshHoldTitle(hold, a);});
-	}
+ } else {
+  holdFetchObjects(hold, 
+   function(a) { _myOPACFleshHoldTitle(hold, a);});
+ }
 }
 
 function myOPACFleshHoldTitle(r) {
-	var rec = r.getResultObject();
-	_myOPACFleshHoldTitle(r.hold, {recordObject: rec});
+ var rec = r.getResultObject();
+ _myOPACFleshHoldTitle(r.hold, {recordObject: rec});
 }
 
 function _myOPACFleshHoldTitle(hold, holdObjects) {
 
-	var record = holdObjects.recordObject;
-	var volume	= holdObjects.volumeObject;
-	var copy	= holdObjects.copyObject;
+ var record = holdObjects.recordObject;
+ var volume = holdObjects.volumeObject;
+ var copy = holdObjects.copyObject;
 
-	var row = $("myopac_holds_row_" + hold.id());
-	var title_link = $n(row, "myopac_holds_title_link");
-	var author_link = $n(row, "myopac_holds_author_link");
+ var row = $("myopac_holds_row_" + hold.id());
+ var title_link = $n(row, "myopac_holds_title_link");
+ var author_link = $n(row, "myopac_holds_author_link");
 
-	if(!record || checkILSEvent(record) ) {
-		addCSSClass(row, 'invalid_hold');
-		$n(row, 'myopac_holds_edit_link').setAttribute('href', 'javascript:void(0);');
-		$n(row, 'myopac_holds_edit_link').onclick = function(){alertId('invalid_hold');};
-		return;
-	}
+ if(!record || checkILSEvent(record) ) {
+  addCSSClass(row, 'invalid_hold');
+  $n(row, 'myopac_holds_edit_link').setAttribute('href', 'javascript:void(0);');
+  $n(row, 'myopac_holds_edit_link').onclick = function(){alertId('invalid_hold');};
+  return;
+ }
 
-	buildTitleDetailLink(record, title_link);
-	buildSearchLink(STYPE_AUTHOR, record.author(), author_link);
+ buildTitleDetailLink(record, title_link);
+ buildSearchLink(STYPE_AUTHOR, record.author(), author_link);
 
-	if( volume ) {
-		$n(row, 'volume').appendChild(text(volume.label()));
-		unHideMe($n(row, 'vol_copy'));
-		if(copy) $n(row, 'copy').appendChild(text(copy.barcode()));
-	}
+ if( volume ) {
+  $n(row, 'volume').appendChild(text(volume.label()));
+  unHideMe($n(row, 'vol_copy'));
+  if(copy) $n(row, 'copy').appendChild(text(copy.barcode()));
+ }
 
-	var form = $("myopac_holds_form_" + hold.id());
+ var form = $("myopac_holds_form_" + hold.id());
 
-	if(form) {
-		var mods_formats = record.types_of_resource();
+ if(form) {
+  var mods_formats = record.types_of_resource();
 
-		if( hold.hold_type() == 'M' ) {
-			var data = holdsParseMRFormats(hold.holdable_formats());
-			mods_formats = data.mods_formats;
-		}
+  if( hold.hold_type() == 'M' ) {
+   var data = holdsParseMRFormats(hold.holdable_formats());
+   mods_formats = data.mods_formats;
+  }
 
-		for( var i = 0; i < mods_formats.length; i++ ) {
-			var img = elem("img");
-			setResourcePic(img, mods_formats[i]);
-			form.appendChild(img);
-		}
-	}
+  for( var i = 0; i < mods_formats.length; i++ ) {
+   var img = elem("img");
+   setResourcePic(img, mods_formats[i]);
+   form.appendChild(img);
+  }
+ }
 }
 
 var finesShown = false;
 function myOPACShowFines() {
-	if(finesShown) return; finesShown = true;
-	var req = new Request(FETCH_FINES_SUMMARY, G.user.session, G.user.id() );
-	req.callback(_myOPACShowFines);
-	req.send();
+ if(finesShown) return; finesShown = true;
+ var req = new Request(FETCH_FINES_SUMMARY, G.user.session, G.user.id() );
+ req.callback(_myOPACShowFines);
+ req.send();
 }
 
 function _myOPACShowFines(r) {
-	hideMe($('myopac_fines_summary_loading'));
-	unHideMe($('myopac_fines_summary_row'));
+ hideMe($('myopac_fines_summary_loading'));
+ unHideMe($('myopac_fines_summary_row'));
 
-	var summary = r.getResultObject();
-	var total	= "0.00"; /* localization? */
-	var paid		= "0.00";
-	var balance = "0.00";
-	if( instanceOf(summary,mous) ) {
+ var summary = r.getResultObject();
+ var total = "0.00"; /* localization? */
+ var paid  = "0.00";
+ var balance = "0.00";
+ if( instanceOf(summary,mous) ) {
 
-		total		= _finesFormatNumber(summary.total_owed());
-		paid		= _finesFormatNumber(summary.total_paid());
-		balance	= _finesFormatNumber(summary.balance_owed());
+  total  = _finesFormatNumber(summary.total_owed());
+  paid  = _finesFormatNumber(summary.total_paid());
+  balance = _finesFormatNumber(summary.balance_owed());
 
-		var req = new Request(FETCH_TRANSACTIONS, G.user.session, G.user.id() );
-		req.callback(myOPACShowTransactions);
-		req.send();
-	}
+  var req = new Request(FETCH_TRANSACTIONS, G.user.session, G.user.id() );
+  req.callback(myOPACShowTransactions);
+  req.send();
+ }
 
-	$('myopac_fines_summary_total').appendChild(text(total));
-	$('myopac_fines_summary_paid').appendChild(text(paid));
-	$('myopac_fines_summary_balance').appendChild(text(balance));
+ $('myopac_fines_summary_total').appendChild(text(total));
+ $('myopac_fines_summary_paid').appendChild(text(paid));
+ $('myopac_fines_summary_balance').appendChild(text(balance));
 }
 
 function _finesFormatNumber(num) {
-	if(isNull(num)) num = 0;
-	num = num + "";
-	if(num.length < 2 || !num.match(/\./)) num += ".00";
-	if(num.match(/\./) && num.charAt(num.length-2) == '.') num += "0";
-	return num;
+ if(isNull(num)) num = 0;
+ num = num + "";
+ if(num.length < 2 || !num.match(/\./)) num += ".00";
+ if(num.match(/\./) && num.charAt(num.length-2) == '.') num += "0";
+ return num;
 }          
 
 //function _trimTime(time) { if(!time) return ""; return time.replace(/\ .*/,""); }
 function _trimTime(time) { 
-	if(!time) return ""; 
+ if(!time) return ""; 
     var d = dojo.date.stamp.fromISOString(time);
     if(!d) return ""; /* date parse failed */
     return d.iso8601Format('YMD');
@@ -601,60 +601,60 @@ function _trimSeconds(time) {
 
 function myOPACShowTransactions(r) {
 
-	if(myopacGenericTransTemplate || myopacCircTransTemplate) return;
+ if(myopacGenericTransTemplate || myopacCircTransTemplate) return;
 
-	var transactions = r.getResultObject();
+ var transactions = r.getResultObject();
 
-	for( var idx in transactions ) {
+ for( var idx in transactions ) {
 
-		var trans	= transactions[idx].transaction;
-		var record	= transactions[idx].record;
-		var circ		= transactions[idx].circ;
+  var trans = transactions[idx].transaction;
+  var record = transactions[idx].record;
+  var circ  = transactions[idx].circ;
 
-		if(trans.xact_type() == 'circulation') 
-			myOPACShowCircTransaction(trans, record, circ);
+  if(trans.xact_type() == 'circulation') 
+   myOPACShowCircTransaction(trans, record, circ);
 
-		else if(trans.xact_type() == 'grocery' ) 
-			myopacShowGenericTransaction( trans );
-	}
+  else if(trans.xact_type() == 'grocery' ) 
+   myopacShowGenericTransaction( trans );
+ }
 }
 
 var myopacGenericTransTemplate;
 function myopacShowGenericTransaction( trans ) {
-	var tbody = $('myopac_trans_tbody');
+ var tbody = $('myopac_trans_tbody');
 
-	if(!myopacGenericTransTemplate) {
-		myopacGenericTransTemplate = 
-			tbody.removeChild($('myopac_trans_row'));
-		removeChildren(tbody);
-	}
+ if(!myopacGenericTransTemplate) {
+  myopacGenericTransTemplate = 
+   tbody.removeChild($('myopac_trans_row'));
+  removeChildren(tbody);
+ }
 
-	var row = myopacGenericTransTemplate.cloneNode(true);
+ var row = myopacGenericTransTemplate.cloneNode(true);
 
-	$n(row,'myopac_trans_start').appendChild(
-			text(_trimSeconds(trans.xact_start())));
+ $n(row,'myopac_trans_start').appendChild(
+   text(_trimSeconds(trans.xact_start())));
 
-	$n(row,'myopac_trans_last_payment').appendChild(
-			text(_trimSeconds(trans.last_payment_ts())));
+ $n(row,'myopac_trans_last_payment').appendChild(
+   text(_trimSeconds(trans.last_payment_ts())));
 
-	$n(row,'myopac_trans_init_amount').appendChild(
-			text(_finesFormatNumber(trans.total_owed())));
+ $n(row,'myopac_trans_init_amount').appendChild(
+   text(_finesFormatNumber(trans.total_owed())));
 
-	$n(row,'myopac_trans_total_paid').appendChild(
-			text(_finesFormatNumber(trans.total_paid())));
+ $n(row,'myopac_trans_total_paid').appendChild(
+   text(_finesFormatNumber(trans.total_paid())));
 
-	$n(row,'myopac_trans_balance').appendChild(
-			text(_finesFormatNumber(trans.balance_owed())));
+ $n(row,'myopac_trans_balance').appendChild(
+   text(_finesFormatNumber(trans.balance_owed())));
 
-	var req = new Request(FETCH_MONEY_BILLING, G.user.session, trans.id());
-	req.send(true);
-	var bills = req.result();
-	if(bills && bills[0])
-		$n(row,'myopac_trans_bill_type').appendChild(
-				text(bills[0].billing_type()));
+ var req = new Request(FETCH_MONEY_BILLING, G.user.session, trans.id());
+ req.send(true);
+ var bills = req.result();
+ if(bills && bills[0])
+  $n(row,'myopac_trans_bill_type').appendChild(
+    text(bills[0].billing_type()));
 
-	tbody.appendChild(row);
-	unHideMe($('myopac_trans_div'));
+ tbody.appendChild(row);
+ unHideMe($('myopac_trans_div'));
 }
 
 
@@ -662,173 +662,173 @@ function myopacShowGenericTransaction( trans ) {
 /* draws a circulation transaction summary */
 var myopacCircTransTemplate;
 function myOPACShowCircTransaction(trans, record, circ) {
-	var tbody = $('myopac_circ_trans_tbody');
+ var tbody = $('myopac_circ_trans_tbody');
 
-	if(!myopacCircTransTemplate) {
-		myopacCircTransTemplate = tbody.removeChild($('myopac_circ_trans_row'));
-		removeChildren(tbody);
-	}
+ if(!myopacCircTransTemplate) {
+  myopacCircTransTemplate = tbody.removeChild($('myopac_circ_trans_row'));
+  removeChildren(tbody);
+ }
 
-	var row = myopacCircTransTemplate.cloneNode(true);
+ var row = myopacCircTransTemplate.cloneNode(true);
 
-	if(record) {
-		buildTitleDetailLink(record, $n(row,'myopac_circ_trans_title'));
+ if(record) {
+  buildTitleDetailLink(record, $n(row,'myopac_circ_trans_title'));
 
-		$n(row,'myopac_circ_trans_author').appendChild(text(
-			normalize(truncate(record.author(), 65))));
+  $n(row,'myopac_circ_trans_author').appendChild(text(
+   normalize(truncate(record.author(), 65))));
 
-	} else {
+ } else {
 
-		var req = new Request( FETCH_COPY, circ.target_copy() );
-		req.alertEvents = false;
-		req.send(true);
-		var copy = req.result();
-		if( copy ) {
-			$n(row,'myopac_circ_trans_title').appendChild(text(copy.dummy_title()));
-			$n(row,'myopac_circ_trans_author').appendChild(text(copy.dummy_author()));
-		}
-	}
+  var req = new Request( FETCH_COPY, circ.target_copy() );
+  req.alertEvents = false;
+  req.send(true);
+  var copy = req.result();
+  if( copy ) {
+   $n(row,'myopac_circ_trans_title').appendChild(text(copy.dummy_title()));
+   $n(row,'myopac_circ_trans_author').appendChild(text(copy.dummy_author()));
+  }
+ }
 
 
-	$n(row,'myopac_circ_trans_start').
-		appendChild(text(_trimTime(trans.xact_start())));
+ $n(row,'myopac_circ_trans_start').
+  appendChild(text(_trimTime(trans.xact_start())));
 
    var due = _trimTime(circ.due_date());
-	var checkin = _trimTime(circ.stop_fines_time());
+ var checkin = _trimTime(circ.stop_fines_time());
 
-	$n(row,'myopac_circ_trans_due').appendChild(text(due))
-	if(checkin)
-		appendClear($n(row,'myopac_circ_trans_finished'), text(checkin));
-	if(circ.stop_fines() == 'LOST')
-		appendClear($n(row,'myopac_circ_trans_finished'), text(circ.stop_fines()));
-	if(circ.stop_fines() == 'CLAIMSRETURNED')
-		appendClear($n(row,'myopac_circ_trans_finished'), text(""));
+ $n(row,'myopac_circ_trans_due').appendChild(text(due))
+ if(checkin)
+  appendClear($n(row,'myopac_circ_trans_finished'), text(checkin));
+ if(circ.stop_fines() == 'LOST')
+  appendClear($n(row,'myopac_circ_trans_finished'), text(circ.stop_fines()));
+ if(circ.stop_fines() == 'CLAIMSRETURNED')
+  appendClear($n(row,'myopac_circ_trans_finished'), text(""));
 
 
-	$n(row,'myopac_circ_trans_balance').
-		appendChild(text(_finesFormatNumber(trans.balance_owed())));
+ $n(row,'myopac_circ_trans_balance').
+  appendChild(text(_finesFormatNumber(trans.balance_owed())));
 
-	tbody.appendChild(row);
-	unHideMe($('myopac_circ_trans_div'));
+ tbody.appendChild(row);
+ unHideMe($('myopac_circ_trans_div'));
 }
 
 
 function myOPACSavePrefs() {
-	G.user.prefs[PREF_HITS_PER] = getSelectorVal($('prefs_hits_per'));
-	G.user.prefs[PREF_DEF_FONT] = getSelectorVal($('prefs_def_font'));
-	G.user.prefs[PREF_HOLD_NOTIFY] = getSelectorVal($('prefs_hold_notify'));
-	G.user.prefs[PREF_DEF_DEPTH] = getSelectorVal($('prefs_def_range'));
+ G.user.prefs[PREF_HITS_PER] = getSelectorVal($('prefs_hits_per'));
+ G.user.prefs[PREF_DEF_FONT] = getSelectorVal($('prefs_def_font'));
+ G.user.prefs[PREF_HOLD_NOTIFY] = getSelectorVal($('prefs_hold_notify'));
+ G.user.prefs[PREF_DEF_DEPTH] = getSelectorVal($('prefs_def_range'));
 
-	if( $('myopac_pref_home_lib').checked == true )
-		G.user.prefs[PREF_DEF_LOCATION] = null;
-	else
-		G.user.prefs[PREF_DEF_LOCATION] = getSelectorVal($('prefs_def_location'));
+ if( $('myopac_pref_home_lib').checked == true )
+  G.user.prefs[PREF_DEF_LOCATION] = null;
+ else
+  G.user.prefs[PREF_DEF_LOCATION] = getSelectorVal($('prefs_def_location'));
 
-	if(commitUserPrefs())
-		alert($('prefs_update_success').innerHTML);
-	else alert($('prefs_update_failure').innerHTML);
+ if(commitUserPrefs())
+  alert($('prefs_update_success').innerHTML);
+ else alert($('prefs_update_failure').innerHTML);
 }
 
 
 function myOPACShowDefFont() {
-	var font;
-	if(G.user.prefs[PREF_DEF_FONT])
-		font = G.user.prefs[PREF_DEF_FONT];
-	else font = "regular";
-	setSelector($('prefs_def_font'), font);
+ var font;
+ if(G.user.prefs[PREF_DEF_FONT])
+  font = G.user.prefs[PREF_DEF_FONT];
+ else font = "regular";
+ setSelector($('prefs_def_font'), font);
 }
 
 function myOPACShowHoldNotify() {
-	var pref = G.user.prefs[PREF_HOLD_NOTIFY];
+ var pref = G.user.prefs[PREF_HOLD_NOTIFY];
 
-	if(pref) {
-		if(pref.match(/email/i) && pref.match(/phone/i)) {
-			setSelector($('prefs_hold_notify'), 'phone:email');
-		} else if( pref.match(/email/i) ) {
-			setSelector($('prefs_hold_notify'), 'email');
-		} else if( pref.match(/phone/i) ) {
-			setSelector($('prefs_hold_notify'), 'phone');
-		}
+ if(pref) {
+  if(pref.match(/email/i) && pref.match(/phone/i)) {
+   setSelector($('prefs_hold_notify'), 'phone:email');
+  } else if( pref.match(/email/i) ) {
+   setSelector($('prefs_hold_notify'), 'email');
+  } else if( pref.match(/phone/i) ) {
+   setSelector($('prefs_hold_notify'), 'phone');
+  }
 
-	} else {
-		setSelector($('prefs_hold_notify'), 'phone:email');
-	}
+ } else {
+  setSelector($('prefs_hold_notify'), 'phone:email');
+ }
 }
 
 function myOPACShowPrefs() {
-	grabUserPrefs();
-	myOPACShowHitsPer();
-	myOPACShowDefFont();
-	myOPACShowHoldNotify();
-	myOPACShowDefLocation();
-	hideMe($('myopac_prefs_loading'));
+ grabUserPrefs();
+ myOPACShowHitsPer();
+ myOPACShowDefFont();
+ myOPACShowHoldNotify();
+ myOPACShowDefLocation();
+ hideMe($('myopac_prefs_loading'));
 }
 
 var defSearchLocationDrawn = false;
 var defDepthIndex = 0;
 function myOPACShowDefLocation() {
 
-	var selector = $('prefs_def_location');
-	var rsel = $('prefs_def_range');
-
-	if(!defSearchLocationDrawn) {
+ var selector = $('prefs_def_location');
+ var rsel = $('prefs_def_range');
 
-		defSearchLocationDrawn = true;
+ if(!defSearchLocationDrawn) {
 
-		var org = G.user.prefs[PREF_DEF_LOCATION];
+  defSearchLocationDrawn = true;
 
-		if(!org) {
-			$('myopac_pref_home_lib').checked = true;
-			$('prefs_def_location').disabled = true;
-			org = G.user.home_ou();
-		}
+  var org = G.user.prefs[PREF_DEF_LOCATION];
 
-		buildOrgSel(selector, globalOrgTree, 0);
+  if(!org) {
+   $('myopac_pref_home_lib').checked = true;
+   $('prefs_def_location').disabled = true;
+   org = G.user.home_ou();
+  }
 
-		globalOrgTypes = globalOrgTypes.sort(
-			function(a, b) {
-				if( a.depth() < b.depth() ) return -1;
-				return 1;
-			}
-		);
+  buildOrgSel(selector, globalOrgTree, 0);
 
-		iterate(globalOrgTypes,
-			function(t) {
-				if( t.depth() <= findOrgDepth(org) ) {
-					setSelectorVal(rsel, defDepthIndex++, t.opac_label(), t.depth());
-					if( t.depth() == findOrgDepth(org) ) 
-						setSelector(rsel, t.depth());
-				}
-			}
-		);
-	}
+  globalOrgTypes = globalOrgTypes.sort(
+   function(a, b) {
+    if( a.depth() < b.depth() ) return -1;
+    return 1;
+   }
+  );
+
+  iterate(globalOrgTypes,
+   function(t) {
+    if( t.depth() <= findOrgDepth(org) ) {
+     setSelectorVal(rsel, defDepthIndex++, t.opac_label(), t.depth());
+     if( t.depth() == findOrgDepth(org) ) 
+      setSelector(rsel, t.depth());
+    }
+   }
+  );
+ }
 
-	setSelector(selector, org);
+ setSelector(selector, org);
 }
 
 function myOPACShowHitsPer() {
-	var hits = 10;
-	if(G.user.prefs[PREF_HITS_PER])
-		hits = G.user.prefs[PREF_HITS_PER];
-	var hitsSel = $('prefs_hits_per');
-	setSelector(hitsSel, hits);
+ var hits = 10;
+ if(G.user.prefs[PREF_HITS_PER])
+  hits = G.user.prefs[PREF_HITS_PER];
+ var hitsSel = $('prefs_hits_per');
+ setSelector(hitsSel, hits);
 }
 
 var userShown = false;
 function myOPACShowSummary() {
-	if(userShown) return; userShown = true;
-	var req = new Request(FETCH_FLESHED_USER,G.user.session, G.user.id());
-	req.callback(_myOPACSummaryShowUer);
-	req.send();
+ if(userShown) return; userShown = true;
+ var req = new Request(FETCH_FLESHED_USER,G.user.session, G.user.id());
+ req.callback(_myOPACSummaryShowUer);
+ req.send();
 }
 
 var addrRowTemplate;
 var notesTemplate;
 function _myOPACSummaryShowUer(r) {
 
-	var user = r.getResultObject();
-	fleshedUser = user;
-	if(!user) return;
+ var user = r.getResultObject();
+ fleshedUser = user;
+ if(!user) return;
 
     var expireDate = dojo.date.stamp.fromISOString(user.expire_date());
     if( expireDate < new Date() ) {
@@ -836,71 +836,71 @@ function _myOPACSummaryShowUer(r) {
         unHideMe($('myopac.expired.alert'));
     }
 
-	var iv1 = user.ident_value()+'';
+ var iv1 = user.ident_value()+'';
     if (iv1.length > 4 && iv1.match(/\d{4}/)) iv1 = iv1.substring(0,4) + '***********';
 
 
-	appendClear($('myopac_summary_prefix'),text(user.prefix()));
-	appendClear($('myopac_summary_first'),text(user.first_given_name()));
-	appendClear($('myopac_summary_middle'),text(user.second_given_name()));
-	appendClear($('myopac_summary_dayphone'),text(user.day_phone()));
-	appendClear($('myopac_summary_eveningphone'),text(user.evening_phone()));
-	appendClear($('myopac_summary_otherphone'),text(user.other_phone()));
-	appendClear($('myopac_summary_last'),text(user.family_name()));
-	appendClear($('myopac_summary_suffix'),text(user.suffix()));
-	appendClear($('myopac_summary_username'),text(user.usrname()));
-	appendClear($('myopac_summary_email'),text(user.email()));
-	appendClear($('myopac_summary_barcode'),text(user.card().barcode()));
-	appendClear($('myopac_summary_ident1'),text(iv1));
-	appendClear($('myopac_summary_homelib'),text(findOrgUnit(user.home_ou()).name()));
-	appendClear($('myopac_summary_create_date'),text(_trimTime(user.create_date())));
-
-	var req = new Request( 
-		FETCH_USER_NOTES, G.user.session, {pub:1, patronid:G.user.id()});
-	req.callback(myopacDrawNotes);
-	req.send();
-
-
-	var tbody = $('myopac_addr_tbody');
-	var template;
-
-	if(addrRowTemplate) { 
-		template = addrRowTemplate;
-	} else {
-		template = tbody.removeChild($('myopac_addr_row'));
-		addrRowTemplate = template;
-	}
-	removeChildren(tbody);
+ appendClear($('myopac_summary_prefix'),text(user.prefix()));
+ appendClear($('myopac_summary_first'),text(user.first_given_name()));
+ appendClear($('myopac_summary_middle'),text(user.second_given_name()));
+ appendClear($('myopac_summary_dayphone'),text(user.day_phone()));
+ appendClear($('myopac_summary_eveningphone'),text(user.evening_phone()));
+ appendClear($('myopac_summary_otherphone'),text(user.other_phone()));
+ appendClear($('myopac_summary_last'),text(user.family_name()));
+ appendClear($('myopac_summary_suffix'),text(user.suffix()));
+ appendClear($('myopac_summary_username'),text(user.usrname()));
+ appendClear($('myopac_summary_email'),text(user.email()));
+ appendClear($('myopac_summary_barcode'),text(user.card().barcode()));
+ appendClear($('myopac_summary_ident1'),text(iv1));
+ appendClear($('myopac_summary_homelib'),text(findOrgUnit(user.home_ou()).name()));
+ appendClear($('myopac_summary_create_date'),text(_trimTime(user.create_date())));
+
+ var req = new Request( 
+  FETCH_USER_NOTES, G.user.session, {pub:1, patronid:G.user.id()});
+ req.callback(myopacDrawNotes);
+ req.send();
+
+
+ var tbody = $('myopac_addr_tbody');
+ var template;
+
+ if(addrRowTemplate) { 
+  template = addrRowTemplate;
+ } else {
+  template = tbody.removeChild($('myopac_addr_row'));
+  addrRowTemplate = template;
+ }
+ removeChildren(tbody);
 
     var addrs = user.addresses();
-	for( var a in addrs ) {
+ for( var a in addrs ) {
         var addr = addrs[a];
         if(!allowPendingAddr && isTrue(addr.pending()))
             continue;
         if(addr.replaces() != null) continue;
-		var row = template.cloneNode(true);
-		myOPACDrawAddr(row, addr, addrs);
-		tbody.appendChild(row);
-	}
+  var row = template.cloneNode(true);
+  myOPACDrawAddr(row, addr, addrs);
+  tbody.appendChild(row);
+ }
 }
 
 
 function myopacDrawNotes(r) {
-	var notes = r.getResultObject();
-	var tbody = $('myopac.notes.tbody');
-	if(!notesTemplate)
-		notesTemplate = tbody.removeChild($('myopac.notes.tr'));
-	removeChildren(tbody);
+ var notes = r.getResultObject();
+ var tbody = $('myopac.notes.tbody');
+ if(!notesTemplate)
+  notesTemplate = tbody.removeChild($('myopac.notes.tr'));
+ removeChildren(tbody);
 
-	iterate(notes, 
-		function(note) {
-			unHideMe($('myopac.notes.div'));
-			var row = notesTemplate.cloneNode(true);
-			$n(row, 'title').appendChild(text(note.title()));
-			$n(row, 'value').appendChild(text(note.value()));
-			tbody.appendChild(row);
-		}
-	);
+ iterate(notes, 
+  function(note) {
+   unHideMe($('myopac.notes.div'));
+   var row = notesTemplate.cloneNode(true);
+   $n(row, 'title').appendChild(text(note.title()));
+   $n(row, 'value').appendChild(text(note.value()));
+   tbody.appendChild(row);
+  }
+ );
 }
 
 
@@ -989,7 +989,7 @@ function myopacSaveAddress(row, addr, deleteMe) {
         addr.post_code($n(row, 'myopac_pending_addr_zip').value);
     }
 
-	var req = new Request(
+ var req = new Request(
         'open-ils.actor:open-ils.actor.user.address.pending.cud', 
         G.user.session, addr);
 
@@ -1023,16 +1023,16 @@ function myopacSaveAddress(row, addr, deleteMe) {
 
 
 function myOPACUpdateUsername() {
-	var username = $('myopac_new_username').value;
-	if(username == null || username == "") {
-		alert($('myopac_username_error').innerHTML);
-		return;
-	}
+ var username = $('myopac_new_username').value;
+ if(username == null || username == "") {
+  alert($('myopac_username_error').innerHTML);
+  return;
+ }
 
-	if( username.match(/.*\s.*/) ) {
-		alert($('myopac_invalid_username').innerHTML);
-		return;
-	}
+ if( username.match(/.*\s.*/) ) {
+  alert($('myopac_invalid_username').innerHTML);
+  return;
+ }
 
     r = fetchOrgSettingDefault(globalOrgTree.id(), 'opac.barcode_regex');
     if(r) REGEX_BARCODE = new RegExp(r);
@@ -1042,91 +1042,91 @@ function myOPACUpdateUsername() {
         return;
     }
 
-	/* first see if the requested username is taken */
-	var req = new Request(CHECK_USERNAME, G.user.session, username);
-	req.send(true);
-	var res = req.result();
-	/* If the username does not already exist, res will be null;
-	 * we can move on to updating the username.
-	 * 
-	 * If the username does exist, then res will be the user ID.
-	 * G.user.id() gives us the currently authenticated user ID.
-	 * If res == G.user.id(), we try to update the username anyways.
-	 */
-	if( res !== null && res != G.user.id() ) {
-		alertId('myopac_username_dup');
-		return;
-	}
-
-	var req = new Request(UPDATE_USERNAME, G.user.session, username );
-	req.send(true);
-	if(req.result()) {
-
-		var evt;
-		var res = req.result();
-		if(evt = checkILSEvent(res)) {
-			alertILSEvent(res);
-			return;
-		}
-
-		G.user.usrname(username);
-		hideMe($('myopac_update_username_row'));
-		userShown = false;
-		alertId('myopac_username_success');
-		myOPACShowSummary();
-		return;
-	}
-
-	alert($('myopac_username_failure').innerHTML);
+ /* first see if the requested username is taken */
+ var req = new Request(CHECK_USERNAME, G.user.session, username);
+ req.send(true);
+ var res = req.result();
+ /* If the username does not already exist, res will be null;
+  * we can move on to updating the username.
+  * 
+  * If the username does exist, then res will be the user ID.
+  * G.user.id() gives us the currently authenticated user ID.
+  * If res == G.user.id(), we try to update the username anyways.
+  */
+ if( res !== null && res != G.user.id() ) {
+  alertId('myopac_username_dup');
+  return;
+ }
+
+ var req = new Request(UPDATE_USERNAME, G.user.session, username );
+ req.send(true);
+ if(req.result()) {
+
+  var evt;
+  var res = req.result();
+  if(evt = checkILSEvent(res)) {
+   alertILSEvent(res);
+   return;
+  }
+
+  G.user.usrname(username);
+  hideMe($('myopac_update_username_row'));
+  userShown = false;
+  alertId('myopac_username_success');
+  myOPACShowSummary();
+  return;
+ }
+
+ alert($('myopac_username_failure').innerHTML);
 }
 
 function myOPACUpdateEmail() {
-	var email = $('myopac_new_email').value;
-	if(email == null || email == "") {
-		alert($('myopac_email_error').innerHTML);
-		return;
-	}
+ var email = $('myopac_new_email').value;
+ if(email == null || email == "") {
+  alert($('myopac_email_error').innerHTML);
+  return;
+ }
 
-	var req = new Request(UPDATE_EMAIL, G.user.session, email );
-	req.send(true);
-	if(req.result()) {
-		G.user.usrname(email);
-		hideMe($('myopac_update_email_row'));
-		userShown = false;
-		alertId('myopac_email_success');
-		myOPACShowSummary();
-		return;
-	}
+ var req = new Request(UPDATE_EMAIL, G.user.session, email );
+ req.send(true);
+ if(req.result()) {
+  G.user.usrname(email);
+  hideMe($('myopac_update_email_row'));
+  userShown = false;
+  alertId('myopac_email_success');
+  myOPACShowSummary();
+  return;
+ }
 
-	alert($('myopac_email_failure').innerHTML);
+ alert($('myopac_email_failure').innerHTML);
 }
 
 
 function myOPACUpdatePassword() {
-	var curpassword = $('myopac_current_password').value;
-	var password = $('myopac_new_password').value;
-	var password2 = $('myopac_new_password2').value;
+ var curpassword = $('myopac_current_password').value;
+ var password = $('myopac_new_password').value;
+ var password2 = $('myopac_new_password2').value;
 
-	if(	curpassword == null || curpassword == "" || 
-			password == null || password == "" || 
-			password2 == null || password2 == "" || password != password2 ) {
-		alert($('myopac_password_error').innerHTML);
-		return;
-	}
+ if( curpassword == null || curpassword == "" || 
+   password == null || password == "" || 
+   password2 == null || password2 == "" || password != password2 ) {
+  alert($('myopac_password_error').innerHTML);
+  return;
+ }
 
-	if(!strongPassword(password, true)) return;
+ if(!strongPassword(password, true)) return;
 
-	var req = new Request(UPDATE_PASSWORD, G.user.session, password, curpassword );
-	req.send(true);
-	if(req.result()) {
-		hideMe($('myopac_update_password_row'));
-		userShown = false;
-		alertId('myopac_password_success');
-		myOPACShowSummary();
-		return;
-	}
+ var req = new Request(UPDATE_PASSWORD, G.user.session, password, curpassword );
+ req.send(true);
+ if(req.result()) {
+  hideMe($('myopac_update_password_row'));
+  userShown = false;
+  alertId('myopac_password_success');
+  myOPACShowSummary();
+  return;
+ }
 
-	alert($('myopac_password_failure').innerHTML);
+ alert($('myopac_password_failure').innerHTML);
 }
 
 
@@ -1135,203 +1135,203 @@ function myOPACUpdatePassword() {
 var containerTemplate;
 function myOPACShowBookbags(force) {
 
-	var tbody =$('myopac_bookbag_tbody') ;
-
-	if(!containerTemplate) 
-		containerTemplate = tbody.removeChild($('myopac_bookbag_tr'));
-	else if(!force) return;
-
-	removeChildren(tbody);
-
-	var containers = containerFetchAll();
-
-	var found = false;
-	for( var i in containers ) {
-		found = true;
-		var cont = containers[i];
-		var row = containerTemplate.cloneNode(true);
-		row.id = 'myopac_bookbag_row_' + cont.id();
-		var link = $n(row, 'myopac_expand_bookbag');
-		var dlink = $n(row, 'myopac_container_delete');
-		link.appendChild( text(cont.name()) );
-		link.setAttribute('href', 
-			'javascript:myOPACExpandBookbag("' + cont.id() + '","' + cont.name() + '");');
-		myOPACFetchBBItems( cont.id(), row );
-		dlink.setAttribute('href', 'javascript:myOPACDeleteBookbag("'+cont.id()+'");');
-
-		if( isTrue(cont.pub()) ) {
-			unHideMe($n(row, 'myopac_bb_published_yes'));
-			var link = $n(row, 'myopac_bb_published_view');
-			link.setAttribute('href', buildExtrasLink( 'feed/bookbag/html-full/'+cont.id(), false));  
-			link.setAttribute('target', '_blank' );
-			unHideMe(link);
-
-			link = $n(row, 'myopac_bb_published_atom');
-			link.setAttribute('href', buildExtrasLink( 'feed/bookbag/rss2-full/'+cont.id(), false));  
-			link.setAttribute('target', '_blank' );
-			unHideMe(link);
-
-			link = $n(row, 'myopac_bb_make_unpublished');
-			link.setAttribute('href', 'javascript:myOPACMakeBBPublished("'+cont.id()+'", true);');
-			unHideMe(link);
+ var tbody =$('myopac_bookbag_tbody') ;
+
+ if(!containerTemplate) 
+  containerTemplate = tbody.removeChild($('myopac_bookbag_tr'));
+ else if(!force) return;
+
+ removeChildren(tbody);
+
+ var containers = containerFetchAll();
+
+ var found = false;
+ for( var i in containers ) {
+  found = true;
+  var cont = containers[i];
+  var row = containerTemplate.cloneNode(true);
+  row.id = 'myopac_bookbag_row_' + cont.id();
+  var link = $n(row, 'myopac_expand_bookbag');
+  var dlink = $n(row, 'myopac_container_delete');
+  link.appendChild( text(cont.name()) );
+  link.setAttribute('href', 
+   'javascript:myOPACExpandBookbag("' + cont.id() + '","' + cont.name() + '");');
+  myOPACFetchBBItems( cont.id(), row );
+  dlink.setAttribute('href', 'javascript:myOPACDeleteBookbag("'+cont.id()+'");');
+
+  if( isTrue(cont.pub()) ) {
+   unHideMe($n(row, 'myopac_bb_published_yes'));
+   var link = $n(row, 'myopac_bb_published_view');
+   link.setAttribute('href', buildExtrasLink( 'feed/bookbag/html-full/'+cont.id(), false));  
+   link.setAttribute('target', '_blank' );
+   unHideMe(link);
+
+   link = $n(row, 'myopac_bb_published_atom');
+   link.setAttribute('href', buildExtrasLink( 'feed/bookbag/rss2-full/'+cont.id(), false));  
+   link.setAttribute('target', '_blank' );
+   unHideMe(link);
+
+   link = $n(row, 'myopac_bb_make_unpublished');
+   link.setAttribute('href', 'javascript:myOPACMakeBBPublished("'+cont.id()+'", true);');
+   unHideMe(link);
                         
-			var RW = $n(row, 'myopac_bb_exp_refworks');
-			if (RW && myopacEnableRefWorks) {
-				var here = (findOrgUnit(getLocation())).name();
-				var org_name = here.replace(" ", "+");
-				var cgi = new CGI();
-
-				RW.setAttribute('href',
-				myopacRefWorksHost + '/express/expressimport.asp?vendor='
-					+ org_name
-					+ '&filter=MARC+Format&database=All+MARC+Formats&encoding=65001&url=http%3A%2F%2F'
-					+ cgi.server_name + '/opac/extras/feed/bookbag/marctxt-full/'
-					+ cont.id()
-				);
-				RW.setAttribute('target', 'RefWorksMain');
-				unHideMe($n(row, 'myopac_bb_exp_refworks'));
-			}
-		} else { 
-			unHideMe($n(row, 'myopac_bb_published_no')); 
-			var link = $n(row, 'myopac_bb_make_published');
-			link.setAttribute('href', 'javascript:myOPACMakeBBPublished("'+cont.id()+'");');
-			unHideMe(link);
-		}
-
-		tbody.appendChild(row);	
-	}
-
-	if(!found) unHideMe($('myopac_bookbags_none'));
-	else unHideMe($('myopac_bookbag_table'));	
+   var RW = $n(row, 'myopac_bb_exp_refworks');
+   if (RW && myopacEnableRefWorks) {
+    var here = (findOrgUnit(getLocation())).name();
+    var org_name = here.replace(" ", "+");
+    var cgi = new CGI();
+
+    RW.setAttribute('href',
+    myopacRefWorksHost + '/express/expressimport.asp?vendor='
+     + org_name
+     + '&filter=MARC+Format&database=All+MARC+Formats&encoding=65001&url=http%3A%2F%2F'
+     + cgi.server_name + '/opac/extras/feed/bookbag/marctxt-full/'
+     + cont.id()
+    );
+    RW.setAttribute('target', 'RefWorksMain');
+    unHideMe($n(row, 'myopac_bb_exp_refworks'));
+   }
+  } else { 
+   unHideMe($n(row, 'myopac_bb_published_no')); 
+   var link = $n(row, 'myopac_bb_make_published');
+   link.setAttribute('href', 'javascript:myOPACMakeBBPublished("'+cont.id()+'");');
+   unHideMe(link);
+  }
+
+  tbody.appendChild(row); 
+ }
+
+ if(!found) unHideMe($('myopac_bookbags_none'));
+ else unHideMe($('myopac_bookbag_table')); 
 }
 
 function myOPACMakeBBPublished(bbid, hideme) {
 
-	var bb = fleshedContainers[bbid];
+ var bb = fleshedContainers[bbid];
 
-	if(hideme) {
-		if(!confirm($('myopac_make_unpublished_confirm').innerHTML)) return;
-		bb.pub('f');
-	} else {
-		if(!confirm($('myopac_make_published_confirm').innerHTML)) return;
-		bb.pub('t');
-	}
+ if(hideme) {
+  if(!confirm($('myopac_make_unpublished_confirm').innerHTML)) return;
+  bb.pub('f');
+ } else {
+  if(!confirm($('myopac_make_published_confirm').innerHTML)) return;
+  bb.pub('t');
+ }
 
-	var result = containerUpdate(bb);
+ var result = containerUpdate(bb);
 
-	var code = checkILSEvent(result);
-	if(code) { alertILSEvent(result); return; }
+ var code = checkILSEvent(result);
+ if(code) { alertILSEvent(result); return; }
 
-	alert($('myopac_bb_update_success').innerHTML);
-	myOPACShowBookbags(true);
+ alert($('myopac_bb_update_success').innerHTML);
+ myOPACShowBookbags(true);
 }
 
 
 
 function myOPACDeleteBookbag(id) {
-	if( confirm( $('myopac_delete_bookbag_warn').innerHTML ) ) {
-		var result = containerDelete(id);
-		var code = checkILSEvent(result);
-		if(code) { alertILSEvent(result); return; }
-		alert($('myopac_bb_update_success').innerHTML);
-		hideMe($('myopac_bookbag_items_table'));
-		hideMe($('myopac_bookbag_items_name'));
-		hideMe($('myopac_bookbag_no_items'));
-		myOPACShowBookbags(true);
-	}
+ if( confirm( $('myopac_delete_bookbag_warn').innerHTML ) ) {
+  var result = containerDelete(id);
+  var code = checkILSEvent(result);
+  if(code) { alertILSEvent(result); return; }
+  alert($('myopac_bb_update_success').innerHTML);
+  hideMe($('myopac_bookbag_items_table'));
+  hideMe($('myopac_bookbag_items_name'));
+  hideMe($('myopac_bookbag_no_items'));
+  myOPACShowBookbags(true);
+ }
 }
 
 function myOPACFetchBBItems( id, row, block ) {
-	if(!block) {
-		containerFlesh( id, _myOPACSetBBItems, { row: row }  );
-	} else {
-		var cont = containerFlesh(id);
-		myOPACSetBBItems( cont, row );
-	}
+ if(!block) {
+  containerFlesh( id, _myOPACSetBBItems, { row: row }  );
+ } else {
+  var cont = containerFlesh(id);
+  myOPACSetBBItems( cont, row );
+ }
 }
 
 function _myOPACSetBBItems(r) { myOPACSetBBItems( r.getResultObject(), r.args.row ); }
 
 function myOPACSetBBItems( container, row ) {
-	fleshedContainers[container.id()] = container;
-	var node = $n(row, 'myopac_bookbag_item_count');
-	removeChildren(node);
-	node.appendChild( text(container.items().length) );
+ fleshedContainers[container.id()] = container;
+ var node = $n(row, 'myopac_bookbag_item_count');
+ removeChildren(node);
+ node.appendChild( text(container.items().length) );
 }
 
 var BBItemsRow;
 function myOPACExpandBookbag( id, name ) {
-	
-	var tbody = $('myopac_bookbag_items_tbody');
-	if(!BBItemsRow) BBItemsRow = tbody.removeChild($('myopac_bookbag_items_row'));
-	removeChildren(tbody);
-	removeChildren($('myopac_bookbag_items_name'));
-
-	$('myopac_bookbag_items_name').appendChild(text(name));
-
-	if( fleshedContainers[id] ) {
-		var len = fleshedContainers[id].items().length;
-
-		if( len == 0 ) {
-			unHideMe($('myopac_bookbag_no_items'));
-			hideMe($('myopac_bookbag_items_table'));
-			return;
-		}
-
-		hideMe($('myopac_bookbag_no_items'));
-		unHideMe($('myopac_bookbag_items_table'));
-
-		for( var i = 0; i != len; i++ ) {
-			var row = BBItemsRow.cloneNode(true);
-			found = true;
-
-			var item = fleshedContainers[id].items()[i];
-			var tlink = $n(row,'myopac_bookbag_items_title');
-			var alink = $n(row,'myopac_bookbag_items_author');
-
-			var req = new Request( FETCH_RMODS, item.target_biblio_record_entry() );
-			req.request.tlink = tlink;
-			req.request.alink = alink;
-			req.callback(myOPACShowBBItem);
-			req.send();
+ 
+ var tbody = $('myopac_bookbag_items_tbody');
+ if(!BBItemsRow) BBItemsRow = tbody.removeChild($('myopac_bookbag_items_row'));
+ removeChildren(tbody);
+ removeChildren($('myopac_bookbag_items_name'));
+
+ $('myopac_bookbag_items_name').appendChild(text(name));
+
+ if( fleshedContainers[id] ) {
+  var len = fleshedContainers[id].items().length;
+
+  if( len == 0 ) {
+   unHideMe($('myopac_bookbag_no_items'));
+   hideMe($('myopac_bookbag_items_table'));
+   return;
+  }
+
+  hideMe($('myopac_bookbag_no_items'));
+  unHideMe($('myopac_bookbag_items_table'));
+
+  for( var i = 0; i != len; i++ ) {
+   var row = BBItemsRow.cloneNode(true);
+   found = true;
+
+   var item = fleshedContainers[id].items()[i];
+   var tlink = $n(row,'myopac_bookbag_items_title');
+   var alink = $n(row,'myopac_bookbag_items_author');
+
+   var req = new Request( FETCH_RMODS, item.target_biblio_record_entry() );
+   req.request.tlink = tlink;
+   req.request.alink = alink;
+   req.callback(myOPACShowBBItem);
+   req.send();
 
-			var clink = $n(row, 'myopac_bookbag_items_remove');
-			clink.setAttribute('href', 'javascript:myOPACRemoveBBItem("'+item.id()+'","'+id+'","'+name+'");');
+   var clink = $n(row, 'myopac_bookbag_items_remove');
+   clink.setAttribute('href', 'javascript:myOPACRemoveBBItem("'+item.id()+'","'+id+'","'+name+'");');
 
-			tbody.appendChild(row);
-		}
-	}
+   tbody.appendChild(row);
+  }
+ }
 }
 
 function myOPACRemoveBBItem( id, containerid, container_name ) {
-	if(!confirm($('myopac_remove_bb_item_confirm').innerHTML)) return;
-	var stat = containerRemoveItem( id );
-	if(stat) alert($('myopac_bb_update_success').innerHTML);
-	myOPACFetchBBItems( containerid, $('myopac_bookbag_row_' + containerid), true);
-	myOPACExpandBookbag( containerid, container_name );
+ if(!confirm($('myopac_remove_bb_item_confirm').innerHTML)) return;
+ var stat = containerRemoveItem( id );
+ if(stat) alert($('myopac_bb_update_success').innerHTML);
+ myOPACFetchBBItems( containerid, $('myopac_bookbag_row_' + containerid), true);
+ myOPACExpandBookbag( containerid, container_name );
 }
 
 function myOPACShowBBItem(r) {
-	var record = r.getResultObject();
-	buildTitleDetailLink(record, r.tlink);
-	buildSearchLink(STYPE_AUTHOR, record.author(), r.alink);
+ var record = r.getResultObject();
+ buildTitleDetailLink(record, r.tlink);
+ buildSearchLink(STYPE_AUTHOR, record.author(), r.alink);
 }
 
 function myOPACCreateBookbag() {
-	var name = $('myopac_bookbag_new_name').value;	
-	if(!name) return;
+ var name = $('myopac_bookbag_new_name').value; 
+ if(!name) return;
 
-	var exists = false;
-	for( var c in fleshedContainers ) { exists = true; break; }
+ var exists = false;
+ for( var c in fleshedContainers ) { exists = true; break; }
 
-	/* let them know what they are getting into... */
-	if(!exists) if(!confirm($('bb_create_warning').innerHTML)) return;
+ /* let them know what they are getting into... */
+ if(!exists) if(!confirm($('bb_create_warning').innerHTML)) return;
 
-	var result = containerCreate( name, $('bb_public_yes').checked );
-	var code = checkILSEvent(result);
-	if(code) { alertILSEvent(result); return; }
-	if(result) alert($('myopac_bb_update_success').innerHTML);
-	myOPACShowBookbags(true);
+ var result = containerCreate( name, $('bb_public_yes').checked );
+ var code = checkILSEvent(result);
+ if(code) { alertILSEvent(result); return; }
+ if(result) alert($('myopac_bb_update_success').innerHTML);
+ myOPACShowBookbags(true);
 }
 
 
@@ -1343,13 +1343,13 @@ var nonCatCircIds;
 var nonCatTypes;
 /* if we have some circs, grab the non-cat types */
 function myOPACDrawNonCatCircs(r) {
-	var ids = r.getResultObject();
-	if(ids.length == 0) return;
-	nonCatCircIds = ids;
-	unHideMe($('non_cat_circs_div'));
-	var req = new Request(FETCH_NON_CAT_TYPES, G.user.home_ou());
-	req.callback(myOPACDrawNonCatCircs2);
-	req.send();
+ var ids = r.getResultObject();
+ if(ids.length == 0) return;
+ nonCatCircIds = ids;
+ unHideMe($('non_cat_circs_div'));
+ var req = new Request(FETCH_NON_CAT_TYPES, G.user.home_ou());
+ req.callback(myOPACDrawNonCatCircs2);
+ req.send();
 }
 
 
@@ -1357,42 +1357,42 @@ function myOPACDrawNonCatCircs(r) {
 var nonCatTbody;
 var nonCatRow;
 function myOPACDrawNonCatCircs2(r) {
-	nonCatTypes = r.getResultObject();
-	nonCatTbody = $('non_cat_circs_tbody');
-	if(!nonCatRow) nonCatRow = 
-		nonCatTbody.removeChild($('non_cat_circs_row'));
-	removeChildren(nonCatTbody);
-	for( var i in nonCatCircIds ) {
-		var req = new Request(FETCH_NON_CAT_CIRC, G.user.session, nonCatCircIds[i]);
-		req.callback(myOPACDrawNonCatCirc);
-		req.send();
-	}
+ nonCatTypes = r.getResultObject();
+ nonCatTbody = $('non_cat_circs_tbody');
+ if(!nonCatRow) nonCatRow = 
+  nonCatTbody.removeChild($('non_cat_circs_row'));
+ removeChildren(nonCatTbody);
+ for( var i in nonCatCircIds ) {
+  var req = new Request(FETCH_NON_CAT_CIRC, G.user.session, nonCatCircIds[i]);
+  req.callback(myOPACDrawNonCatCirc);
+  req.send();
+ }
 }
 
 
 /* draw a single circ */
 function myOPACDrawNonCatCirc(r) {
-	var circ = r.getResultObject();
+ var circ = r.getResultObject();
 
 
-	var type = grep(nonCatTypes, 
-		function(i){
-			return (i.id() == circ.item_type());
-		}
-	)[0];
+ var type = grep(nonCatTypes, 
+  function(i){
+   return (i.id() == circ.item_type());
+  }
+ )[0];
 
 
-	var row = nonCatTbody.appendChild(nonCatRow.cloneNode(true));
-	appendClear($n(row, 'circ_lib'), text(findOrgUnit(circ.circ_lib()).name()));
-	appendClear($n(row, 'item_type'), text(type.name()));
+ var row = nonCatTbody.appendChild(nonCatRow.cloneNode(true));
+ appendClear($n(row, 'circ_lib'), text(findOrgUnit(circ.circ_lib()).name()));
+ appendClear($n(row, 'item_type'), text(type.name()));
 
-	var duration = interval_to_seconds(type.circ_duration());
-	duration = parseInt(duration + '000');
+ var duration = interval_to_seconds(type.circ_duration());
+ duration = parseInt(duration + '000');
 
-	var dtf = circ.circ_time();
+ var dtf = circ.circ_time();
     var start = dojo.date.stamp.fromISOString(circ.circ_time());
-	var due = new Date(  start.getTime() + duration );
-	appendClear($n(row, 'circ_time'), text(due.iso8601Format('YMDHM', null, true, true)));
+ var due = new Date(  start.getTime() + duration );
+ appendClear($n(row, 'circ_time'), text(due.iso8601Format('YMDHM', null, true, true)));
 }
 
 
@@ -1437,7 +1437,7 @@ var __success_count = 0;
 /* renews all selected circulations */
 function myOPACRenewSelected() {
    var rows = myopacGetCheckedOutRows();
-	if(!confirm($('myopac_renew_confirm').innerHTML)) return;
+ if(!confirm($('myopac_renew_confirm').innerHTML)) return;
    __success_count = 0;
 
    for( var i = 0; i < rows.length; i++ ) {
@@ -1446,10 +1446,10 @@ function myOPACRenewSelected() {
       if( ! $n(row, 'selectme').checked ) continue;
       var circ_id = row.getAttribute('circid');
 
-	   var circ;
-	   for( var j = 0; j != circsCache.length; j++ ) 
-		   if(circsCache[j].id() == circ_id)
-			   circ = circsCache[j];
+    var circ;
+    for( var j = 0; j != circsCache.length; j++ ) 
+     if(circsCache[j].id() == circ_id)
+      circ = circsCache[j];
 
       __renew_circs.push(circ);
    }
@@ -1503,7 +1503,7 @@ function myHandleRenewResponse(r) {
 
    __renew_circs = [];
 
-	if( __success_count > 0 )
+ if( __success_count > 0 )
       alertIdText('myopac_renew_success', __success_count);
 
    hideMe($('my_renewing'));
diff --git a/Open-ILS/web/opac/skin/default/js/rdetail.js b/Open-ILS/web/opac/skin/default/js/rdetail.js
index 66df72319f..ec017dd098 100644
--- a/Open-ILS/web/opac/skin/default/js/rdetail.js
+++ b/Open-ILS/web/opac/skin/default/js/rdetail.js
@@ -44,190 +44,190 @@ var rdetailEnd = null;
 
 /* serials are currently the only use of Dojo strings in the OPAC */
 if (rdetailDisplaySerialHoldings) {
-	dojo.require("dijit.Menu");
-	dojo.require("dijit.form.Button");
-	dojo.requireLocalization("openils.opac", "opac");
-	opac_strings = dojo.i18n.getLocalization("openils.opac", "opac");
+ dojo.require("dijit.Menu");
+ dojo.require("dijit.form.Button");
+ dojo.requireLocalization("openils.opac", "opac");
+ opac_strings = dojo.i18n.getLocalization("openils.opac", "opac");
 }
 
 function rdetailReload() {
-	var args = {};
-	args[PARAM_LOCATION] = getNewSearchLocation();
-	args[PARAM_DEPTH] = depthSelGetDepth();
-	goTo(buildOPACLink(args));
+ var args = {};
+ args[PARAM_LOCATION] = getNewSearchLocation();
+ args[PARAM_DEPTH] = depthSelGetDepth();
+ goTo(buildOPACLink(args));
 }
 
 /* looks to see if we have a next and/or previous record in the
    record cache, if so, set up the nav links */
 function rdetailSetPaging(ids) {
 
-	cachedRecords = {};
-	cachedRecords.ids = ids;
-
-	for( var i = 0; i < cachedRecords.ids.length; i++ ) {
-		var rec = cachedRecords.ids[i];
-		if( rec == getRid() ) {
-			if( i > 0 ) prevRecord = cachedRecords.ids[i-1];
-			if( i < cachedRecords.ids.length - 1 )
-				nextRecord = cachedRecords.ids[i+1];
-			break;
-		}
-	}
-
-	$('np_offset').appendChild(text(i + 1));
-	$('np_count').appendChild(text(getHitCount()));
-
-	if(prevRecord) {
-		unHideMe($('np_table'));
-		unHideMe($('np_prev'));
-		unHideMe($('np_start'));
-		rdetailPrev = function() { _rdetailNav(prevRecord); };
-		rdetailStart = function() { _rdetailNav(cachedRecords.ids[0]); };
-	}
-
-	if(nextRecord) {
-		unHideMe($('np_table'));
-		unHideMe($('np_next'));
-		unHideMe($('np_end'));
-		rdetailNext = function() { _rdetailNav(nextRecord); };
-		rdetailEnd = function() { _rdetailNav(cachedRecords.ids[cachedRecords.ids.length-1]); };
-	}
-
-	runEvt('rdetail', 'nextPrevDrawn', i, cachedRecords.ids.length);
+ cachedRecords = {};
+ cachedRecords.ids = ids;
+
+ for( var i = 0; i < cachedRecords.ids.length; i++ ) {
+  var rec = cachedRecords.ids[i];
+  if( rec == getRid() ) {
+   if( i > 0 ) prevRecord = cachedRecords.ids[i-1];
+   if( i < cachedRecords.ids.length - 1 )
+    nextRecord = cachedRecords.ids[i+1];
+   break;
+  }
+ }
+
+ $('np_offset').appendChild(text(i + 1));
+ $('np_count').appendChild(text(getHitCount()));
+
+ if(prevRecord) {
+  unHideMe($('np_table'));
+  unHideMe($('np_prev'));
+  unHideMe($('np_start'));
+  rdetailPrev = function() { _rdetailNav(prevRecord); };
+  rdetailStart = function() { _rdetailNav(cachedRecords.ids[0]); };
+ }
+
+ if(nextRecord) {
+  unHideMe($('np_table'));
+  unHideMe($('np_next'));
+  unHideMe($('np_end'));
+  rdetailNext = function() { _rdetailNav(nextRecord); };
+  rdetailEnd = function() { _rdetailNav(cachedRecords.ids[cachedRecords.ids.length-1]); };
+ }
+
+ runEvt('rdetail', 'nextPrevDrawn', i, cachedRecords.ids.length);
 }
 
 
 function _rdetailNav(id, offset) {
-	var args = {};
-	args[PARAM_RID] = id;
-	goTo(buildOPACLink(args));
+ var args = {};
+ args[PARAM_RID] = id;
+ goTo(buildOPACLink(args));
 }
 
 function rdetailDraw() {
 
-	detachAllEvt('common','depthChanged');
-	detachAllEvt('common','locationUpdated');
-	attachEvt('common','depthChanged', rdetailReload);
-	attachEvt('common','locationUpdated', rdetailReload);
-	attachEvt('common','holdUpdated', rdetailReload);
-	attachEvt('common','holdUpdateCanceled', rdetailReload);
-
-	copyRowParent = G.ui.rdetail.cp_info_row.parentNode;
-	copyRow = copyRowParent.removeChild(G.ui.rdetail.cp_info_row);
-	statusRow = G.ui.rdetail.cp_status.parentNode;
-	statusRow.id = '__rdsrow';
-
-	G.ui.rdetail.cp_info_local.onclick = rdetailShowLocalCopies;
-	G.ui.rdetail.cp_info_all.onclick = rdetailShowAllCopies;
-
-	if(getLocation() == globalOrgTree.id())
-		hideMe(G.ui.rdetail.cp_info_all);
-
-	var req = new Request(FETCH_RMODS, getRid());
-	req.callback(_rdetailDraw);
-	req.send();
-
-	if (rdetailDisplaySerialHoldings) {
-		var req = new Request(FETCH_MFHD_SUMMARY, getRid());
-		req.callback(_holdingsDraw);
-		req.send();
-		if (isXUL()) {
-			var here = findOrgUnit(getLocation());
-			dojo.place("<div id='mfhd_ad_menu></div>", "rdetail_details_table", "after");
-			var mfhd_add = new dijit.Menu({style:"float: right;"});
-			new dijit.MenuItem({onClick:function(){
-				var req = new Request(CREATE_MFHD_RECORD, G.user.session, 1, here.id(), getRid());
-				var res = req.send();
-				alert(dojo.string.substitute(opac_strings.CREATED_MFHD_RECORD, [here.name()]));
-			}, label:opac_strings.CREATE_MFHD}).placeAt(mfhd_add);
-			mfhd_add.placeAt(mfhd_ad_menu);
-		}
-	}
-
-	detachAllEvt("result", "idsReceived");
-	G.evt.result.hitCountReceived = [];
-	G.evt.result.recordReceived = [];
-	G.evt.result.copyCountsReceived = [];
-	G.evt.result.allRecordsReceived = [];
+ detachAllEvt('common','depthChanged');
+ detachAllEvt('common','locationUpdated');
+ attachEvt('common','depthChanged', rdetailReload);
+ attachEvt('common','locationUpdated', rdetailReload);
+ attachEvt('common','holdUpdated', rdetailReload);
+ attachEvt('common','holdUpdateCanceled', rdetailReload);
+
+ copyRowParent = G.ui.rdetail.cp_info_row.parentNode;
+ copyRow = copyRowParent.removeChild(G.ui.rdetail.cp_info_row);
+ statusRow = G.ui.rdetail.cp_status.parentNode;
+ statusRow.id = '__rdsrow';
+
+ G.ui.rdetail.cp_info_local.onclick = rdetailShowLocalCopies;
+ G.ui.rdetail.cp_info_all.onclick = rdetailShowAllCopies;
+
+ if(getLocation() == globalOrgTree.id())
+  hideMe(G.ui.rdetail.cp_info_all);
+
+ var req = new Request(FETCH_RMODS, getRid());
+ req.callback(_rdetailDraw);
+ req.send();
+
+ if (rdetailDisplaySerialHoldings) {
+  var req = new Request(FETCH_MFHD_SUMMARY, getRid());
+  req.callback(_holdingsDraw);
+  req.send();
+  if (isXUL()) {
+   var here = findOrgUnit(getLocation());
+   dojo.place("<div id='mfhd_ad_menu></div>", "rdetail_details_table", "after");
+   var mfhd_add = new dijit.Menu({style:"float: right;"});
+   new dijit.MenuItem({onClick:function(){
+    var req = new Request(CREATE_MFHD_RECORD, G.user.session, 1, here.id(), getRid());
+    var res = req.send();
+    alert(dojo.string.substitute(opac_strings.CREATED_MFHD_RECORD, [here.name()]));
+   }, label:opac_strings.CREATE_MFHD}).placeAt(mfhd_add);
+   mfhd_add.placeAt(mfhd_ad_menu);
+  }
+ }
+
+ detachAllEvt("result", "idsReceived");
+ G.evt.result.hitCountReceived = [];
+ G.evt.result.recordReceived = [];
+ G.evt.result.copyCountsReceived = [];
+ G.evt.result.allRecordsReceived = [];
 }
 
 function rdetailGetPageIds() {
-	attachEvt("result", "idsReceived", rdetailSetPaging );
-	resultFetchAllRecords = true;
-	rresultCollectIds(true);
+ attachEvt("result", "idsReceived", rdetailSetPaging );
+ resultFetchAllRecords = true;
+ rresultCollectIds(true);
 }
 
 
 function buildunAPISpan (span, type, id) {
-	var cgi = new CGI();
-	var d = new Date();
+ var cgi = new CGI();
+ var d = new Date();
 
-	addCSSClass(span,'unapi-id');
+ addCSSClass(span,'unapi-id');
 
-	span.setAttribute(
-			'title', 'tag:' + cgi.server_name + ',' +
-			d.getFullYear() + ':' + type + '/' + id
-			);
+ span.setAttribute(
+   'title', 'tag:' + cgi.server_name + ',' +
+   d.getFullYear() + ':' + type + '/' + id
+   );
 }
 
 function rdetailViewMarc(r,id) {
-	hideMe($('rdetail_extras_loading'));
-	$('rdetail_view_marc_box').innerHTML = r.getResultObject();
+ hideMe($('rdetail_extras_loading'));
+ $('rdetail_view_marc_box').innerHTML = r.getResultObject();
 
-	var div = elem('div', { "class" : 'hide_me' });
-	var span = div.appendChild( elem('abbr') );
+ var div = elem('div', { "class" : 'hide_me' });
+ var span = div.appendChild( elem('abbr') );
 
-	buildunAPISpan( span, 'biblio-record_entry', record.doc_id() );
+ buildunAPISpan( span, 'biblio-record_entry', record.doc_id() );
 
-	$('rdetail_view_marc_box').insertBefore(span, $('rdetail_view_marc_box').firstChild);
+ $('rdetail_view_marc_box').insertBefore(span, $('rdetail_view_marc_box').firstChild);
 }
 
 
 function rdetailShowLocalCopies() {
-	rdetailShowLocal = true;
-	rdetailBuildInfoRows();
-	hideMe(G.ui.rdetail.cp_info_local);
-	unHideMe(G.ui.rdetail.cp_info_all);
-	hideMe(G.ui.rdetail.cp_info_none); 
+ rdetailShowLocal = true;
+ rdetailBuildInfoRows();
+ hideMe(G.ui.rdetail.cp_info_local);
+ unHideMe(G.ui.rdetail.cp_info_all);
+ hideMe(G.ui.rdetail.cp_info_none); 
 }
 
 function rdetailShowAllCopies() {
 
-	rdetailShowLocal = false;
-	rdetailBuildInfoRows();
-	hideMe(G.ui.rdetail.cp_info_all);
-	unHideMe(G.ui.rdetail.cp_info_local);
-	hideMe(G.ui.rdetail.cp_info_none); 
+ rdetailShowLocal = false;
+ rdetailBuildInfoRows();
+ hideMe(G.ui.rdetail.cp_info_all);
+ unHideMe(G.ui.rdetail.cp_info_local);
+ hideMe(G.ui.rdetail.cp_info_none); 
 }
 
 function OpenMarcEditWindow(pcrud, rec) {
-	/*
-	   To run in Firefox directly, must set signed.applets.codebase_principal_support
-	   to true in about:config
-	 */
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-	win = window.open('/xul/server/cat/marcedit.xul'); // XXX version?
-	dojo.require('openils.PermaCrud');
-
-	win.xulG = {
-		"record": {"marc": rec.marc()},
-		"save": {
-			"label": opac_strings.SAVE_MFHD_LABEL,
-			"func": function(xmlString) {
-				rec.marc(xmlString);
-				rec.ischanged(true);
-				pcrud.update(rec);
-			}
-		}
-	};
+ /*
+    To run in Firefox directly, must set signed.applets.codebase_principal_support
+    to true in about:config
+  */
+ netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+ win = window.open('/xul/server/cat/marcedit.xul'); // XXX version?
+ dojo.require('openils.PermaCrud');
+
+ win.xulG = {
+  "record": {"marc": rec.marc()},
+  "save": {
+   "label": opac_strings.SAVE_MFHD_LABEL,
+   "func": function(xmlString) {
+    rec.marc(xmlString);
+    rec.ischanged(true);
+    pcrud.update(rec);
+   }
+  }
+ };
 }
 
 function loadMarcEditor(recId) {
-	var pcrud = new openils.PermaCrud({"authtoken": G.user.session});
-	var rec = pcrud.retrieve("sre", recId);
-	if (rec) {
-		OpenMarcEditWindow(pcrud, rec);
-	}
+ var pcrud = new openils.PermaCrud({"authtoken": G.user.session});
+ var rec = pcrud.retrieve("sre", recId);
+ if (rec) {
+  OpenMarcEditWindow(pcrud, rec);
+ }
 }
 
 /*
@@ -235,10 +235,10 @@ function loadMarcEditor(recId) {
  * Limited brain power means that I'm brute-forcing it for now
  */
 function _holdingsDraw(h) {
-	holdings = h.getResultObject();
-	if (!holdings) { return null; }
+ holdings = h.getResultObject();
+ if (!holdings) { return null; }
 
-	dojo.forEach(holdings, _holdingsDrawMFHD);
+ dojo.forEach(holdings, _holdingsDrawMFHD);
 
 }
 
@@ -248,731 +248,731 @@ function _holdingsDrawMFHD(holdings, entryNum) {
         if (getDepth() > 0 || getDepth === 0 ) {
                 while (getDepth() < findOrgDepth(here))
                 here = findOrgUnit( here.parent_ou() );
-		if (!orgIsMine(findOrgUnit(here), findOrgUnit(holdings.owning_lib()))) {
-			return null;
-		}
+  if (!orgIsMine(findOrgUnit(here), findOrgUnit(holdings.owning_lib()))) {
+   return null;
+  }
         }
 
-	var hh = holdings.holdings();
-	var hch = holdings.current_holdings();
-	var hs = holdings.supplements();
-	var hcs = holdings.current_supplements();
-	var hi = holdings.indexes();
-	var hci = holdings.current_indexes();
-	var ho = holdings.online();
-	var hm = holdings.missing();
-	var hinc = holdings.incomplete();
-	var hloc = holdings.location() || 'MFHD';
-
-	if (	hh.length == 0 && hch.length == 0 && hs.length == 0 &&
-		hcs.length == 0 && hi.length == 0 && hci.length == 0 &&
-		ho.length == 0 && hm.length == 0 && hinc.length == 0
-	) {
-
-		if (isXUL()) {
-			/* 
-			 * If we have a record, but nothing to show for it, then the
-			 * record is likely empty or corrupt. This gives cataloguers a
-			 * chance to add holdings or correct the record
-			 */
-			hh = 'PLACEHOLDER';
-		} else {
-			return null;
-		}
-	}
-
-	dojo.place("<table style='width: 100%;'><caption id='mfhdHoldingsCaption" + entryNum + "' class='rdetail_header color_1'>" +
-		dojo.string.substitute(opac_strings.HOLDINGS_TABLE_CAPTION, [hloc]) +
-		"</caption><tbody id='rdetail_holdings_tbody_" + entryNum +
-		"'></tbody></table>", "rdetail_details_table", "after"
-	);
-	if (hh.length > 0) { _holdingsDrawMFHDEntry(entryNum, opac_strings.HOLDINGS, hh); }
-	if (hch.length > 0) { _holdingsDrawMFHDEntry(entryNum, opac_strings.CURRENT_HOLDINGS, hch); }
-	if (hs.length > 0) { _holdingsDrawMFHDEntry(entryNum, opac_strings.SUPPLEMENTS, hs); }
-	if (hcs.length > 0) { _holdingsDrawMFHDEntry(entryNum, opac_strings.CURRENT_SUPPLEMENTS, hcs); }
-	if (hi.length > 0) { _holdingsDrawMFHDEntry(entryNum, opac_strings.INDEXES, hi); }
-	if (hci.length > 0) { _holdingsDrawMFHDEntry(entryNum, opac_strings.CURRENT_INDEXES, hci); }
-	if (ho.length > 0) { _holdingsDrawMFHDEntry(entryNum, opac_strings.ONLINE_VOLUMES, ho); }
-	if (hm.length > 0) { _holdingsDrawMFHDEntry(entryNum, opac_strings.MISSING_VOLUMES, hm); }
-	if (hinc.length > 0) { _holdingsDrawMFHDEntry(entryNum, opac_strings.INCOMPLETE_VOLUMES, hinc); }
-
-	if (isXUL()) {
-		dojo.require('openils.Event');
-		dojo.require('openils.PermaCrud');
-		var mfhd_edit = new dijit.Menu({});
-		new dijit.MenuItem({onClick: function(){loadMarcEditor(holdings.id())}, label:opac_strings.EDIT_MFHD_RECORD}).placeAt(mfhd_edit, "first");
-		new dijit.MenuItem({onClick:function(){
-			var pcrud = new openils.PermaCrud({"authtoken": G.user.session});
-			var mfhd_rec = pcrud.retrieve("sre", holdings.id());
-			if (mfhd_rec) {
-				pcrud.eliminate(mfhd_rec);
-				alert(dojo.string.substitute(opac_strings.DELETED_MFHD_RECORD, [holdings.id()]));
-			}
-		}, label:opac_strings.DELETE_MFHD}).placeAt(mfhd_edit, "last");
-		// new dijit.MenuItem({onClick:function(){alert("Edit properties " + holdings.id());}, label:opac_strings.EDIT_PROPERTIES}).placeAt(mfhd_edit, "last");
-		var mfhd_mb = new dijit.form.DropDownButton({dropDown: mfhd_edit, label:opac_strings.EDIT_MFHD_MENU, style:"float:right"});
-		mfhd_mb.placeAt("mfhdHoldingsCaption" + entryNum, "last");
-		mfhd_edit.startup();
-	}
+ var hh = holdings.holdings();
+ var hch = holdings.current_holdings();
+ var hs = holdings.supplements();
+ var hcs = holdings.current_supplements();
+ var hi = holdings.indexes();
+ var hci = holdings.current_indexes();
+ var ho = holdings.online();
+ var hm = holdings.missing();
+ var hinc = holdings.incomplete();
+ var hloc = holdings.location() || 'MFHD';
+
+ if ( hh.length == 0 && hch.length == 0 && hs.length == 0 &&
+  hcs.length == 0 && hi.length == 0 && hci.length == 0 &&
+  ho.length == 0 && hm.length == 0 && hinc.length == 0
+ ) {
+
+  if (isXUL()) {
+   /* 
+    * If we have a record, but nothing to show for it, then the
+    * record is likely empty or corrupt. This gives cataloguers a
+    * chance to add holdings or correct the record
+    */
+   hh = 'PLACEHOLDER';
+  } else {
+   return null;
+  }
+ }
+
+ dojo.place("<table style='width: 100%;'><caption id='mfhdHoldingsCaption" + entryNum + "' class='rdetail_header color_1'>" +
+  dojo.string.substitute(opac_strings.HOLDINGS_TABLE_CAPTION, [hloc]) +
+  "</caption><tbody id='rdetail_holdings_tbody_" + entryNum +
+  "'></tbody></table>", "rdetail_details_table", "after"
+ );
+ if (hh.length > 0) { _holdingsDrawMFHDEntry(entryNum, opac_strings.HOLDINGS, hh); }
+ if (hch.length > 0) { _holdingsDrawMFHDEntry(entryNum, opac_strings.CURRENT_HOLDINGS, hch); }
+ if (hs.length > 0) { _holdingsDrawMFHDEntry(entryNum, opac_strings.SUPPLEMENTS, hs); }
+ if (hcs.length > 0) { _holdingsDrawMFHDEntry(entryNum, opac_strings.CURRENT_SUPPLEMENTS, hcs); }
+ if (hi.length > 0) { _holdingsDrawMFHDEntry(entryNum, opac_strings.INDEXES, hi); }
+ if (hci.length > 0) { _holdingsDrawMFHDEntry(entryNum, opac_strings.CURRENT_INDEXES, hci); }
+ if (ho.length > 0) { _holdingsDrawMFHDEntry(entryNum, opac_strings.ONLINE_VOLUMES, ho); }
+ if (hm.length > 0) { _holdingsDrawMFHDEntry(entryNum, opac_strings.MISSING_VOLUMES, hm); }
+ if (hinc.length > 0) { _holdingsDrawMFHDEntry(entryNum, opac_strings.INCOMPLETE_VOLUMES, hinc); }
+
+ if (isXUL()) {
+  dojo.require('openils.Event');
+  dojo.require('openils.PermaCrud');
+  var mfhd_edit = new dijit.Menu({});
+  new dijit.MenuItem({onClick: function(){loadMarcEditor(holdings.id())}, label:opac_strings.EDIT_MFHD_RECORD}).placeAt(mfhd_edit, "first");
+  new dijit.MenuItem({onClick:function(){
+   var pcrud = new openils.PermaCrud({"authtoken": G.user.session});
+   var mfhd_rec = pcrud.retrieve("sre", holdings.id());
+   if (mfhd_rec) {
+    pcrud.eliminate(mfhd_rec);
+    alert(dojo.string.substitute(opac_strings.DELETED_MFHD_RECORD, [holdings.id()]));
+   }
+  }, label:opac_strings.DELETE_MFHD}).placeAt(mfhd_edit, "last");
+  // new dijit.MenuItem({onClick:function(){alert("Edit properties " + holdings.id());}, label:opac_strings.EDIT_PROPERTIES}).placeAt(mfhd_edit, "last");
+  var mfhd_mb = new dijit.form.DropDownButton({dropDown: mfhd_edit, label:opac_strings.EDIT_MFHD_MENU, style:"float:right"});
+  mfhd_mb.placeAt("mfhdHoldingsCaption" + entryNum, "last");
+  mfhd_edit.startup();
+ }
 }
 
 function _holdingsDrawMFHDEntry(entryNum, entryName, entry) {
-	var flatEntry = entry.toString().replace(/,/g, ', ');
-	dojo.place("<tr><td> </td><td nowrap='nowrap' class='rdetail_desc'>" + entryName + "</td><td class='rdetail_item'>" + flatEntry + "</td></tr>", "rdetail_holdings_tbody_" + entryNum, "last");
+ var flatEntry = entry.toString().replace(/,/g, ', ');
+ dojo.place("<tr><td> </td><td nowrap='nowrap' class='rdetail_desc'>" + entryName + "</td><td class='rdetail_item'>" + flatEntry + "</td></tr>", "rdetail_holdings_tbody_" + entryNum, "last");
 }
 
 function _rdetailDraw(r) {
-	record = r.getResultObject();
-
-	runEvt('rdetail', 'recordRetrieved', record.doc_id());
-
-	G.ui.rdetail.title.appendChild(text(record.title()));
-	buildSearchLink(STYPE_AUTHOR, record.author(), G.ui.rdetail.author);
-	G.ui.rdetail.isbn.appendChild(text(cleanISBN(record.isbn())));
-	G.ui.rdetail.edition.appendChild(text(record.edition()));
-	G.ui.rdetail.pubdate.appendChild(text(record.pubdate()));
-	G.ui.rdetail.publisher.appendChild(text(record.publisher()));
-	$('rdetail_physical_desc').appendChild(text(record.physical_description()));
-	r = record.types_of_resource();
-	if(r) {
-		G.ui.rdetail.tor.appendChild(text(r[0]));
-		setResourcePic( G.ui.rdetail.tor_pic, r[0]);
-	}
-	G.ui.rdetail.abstr.appendChild(text(record.synopsis()));
-
-	try{
-		if(record.isbn()) {
-			if(ENABLE_ADDED_CONTENT_ATTRIB_LINKS) {
-				unHideMe($('rdetail.jacket_attrib_div'));
-				var href = $('rdetail.jacket_attrib_link').getAttribute('href') +cleanISBN(record.isbn());
-				$('rdetail.jacket_attrib_link').setAttribute('href', href);
-			}
-			rdetailCheckForGBPreview();
-
-		} else {
-			hideMe($("rdetail.jacket_attrib_div"));
-			hideMe($("rdetail_img_link"));
-		}
-	} catch(E) {}
-
-
-	// see if the record has any external links 
-	var links = record.online_loc();
-	for( var i = 0; links && links.length > 0 && i < links.length; i = i + 3 ) {
-		var href = links[i];
-		// avoid matching "HTTP: The Complete Reference"
-		if( href.match(/https?:\/|ftps?:\/|mailto:/i) ) {
-			unHideMe($('rdetail_online_row'));
-			// MODS can contain a display label (used for the text of the link)
-			// as well as a note about the URL; many legacy systems conflate the
-			// two and generate MARC records that expect the note to be used as
-			// the text of the link, with no display label; here's the canonical
-			// format:
-			//
-			// 856 40 $uhttp://localhost$yDisplay label$zPublic note
-			//
-			// Note that the MARC21slim2MODS XSL concatenates $3 and $y together
-			// (as $y was defined later in MARC21's life as the display label)
-			var displayLabel = '' + links[i+1];
-			var note = '' + links[i+2];
-			if(!displayLabel || displayLabel.match(/https?:\/|ftps?:\/|mailto:/i)) {
-				if(!note || note.match(/https?:\/|ftps?:\/|mailto:/i)) {
-					displayLabel = href;
-				} else {
-					displayLabel = note;
-				}
-			}
-			$('rdetail_online').appendChild(elem('a', {href:href,'class':'classic_link'}, displayLabel));
-			if (note && note != displayLabel) {
-				$('rdetail_online').appendChild(elem('span', {'class':'url_note'}, ' - ' + note));
-			}
-			$('rdetail_online').appendChild(elem('br'));
-		}
-	}
-
-	// Fill in our unAPI ID, if anyone cares
-	var abbrs = document.getElementsByTagName('abbr');
-	var span;
-	for (var i = 0; i < abbrs.length; i = i + 1) {
-		if (abbrs[i].getAttribute('name') == 'unapi') {
-			span = abbrs[i];
-			break;
-		}
-	}
-	buildunAPISpan( span, 'biblio-record_entry', record.doc_id() );
-
-	$('rdetail_place_hold').setAttribute(
-			'href','javascript:holdsDrawEditor({record:"'+record.doc_id()+'",type:"T"});');
-
-	var RW = $('rdetail_exp_refworks');
-	if (RW && rdetailEnableRefWorks) {
-
-		var here = (findOrgUnit(getLocation())).name();
-		var org_name = here.replace(" ", "+");
-		var cgi = new CGI();
-
-		RW.setAttribute(
-			'href',
-			rdetailRefWorksHost + '/express/expressimport.asp?vendor='
-			+ org_name
-			+ '&filter=MARC+Format&database=All+MARC+Formats&encoding=65001&url=http%3A%2F%2F'
-			+ cgi.server_name + '/opac/extras/supercat/marctxt/record/'
-			+ record.doc_id()
-	       );
-
-		RW.setAttribute('target', 'RefWorksMain');
-
-		unHideMe($('rdetail_exp_refworks_span'));
-	}
-
-	$('rdetail_img_link').setAttribute('href', buildISBNSrc(cleanISBN(record.isbn()), 'large'));
-	G.ui.rdetail.image.setAttribute("src", buildISBNSrc(cleanISBN(record.isbn())));
-	runEvt("rdetail", "recordDrawn");
-	recordsCache.push(record);
-
-	rdetailSetExtrasSelector();
-
-	var breq = new Request(FETCH_BRE, [getRid()]);
-	breq.callback( rdetailCheckDeleted );
-	breq.send();
-
-	resultBuildCaches( [ record ] );
-	resultDrawSubjects();
-	resultDrawSeries();
-
-	// grab added content 
-	acCollectData(cleanISBN(record.isbn()), rdetailhandleAC);
+ record = r.getResultObject();
+
+ runEvt('rdetail', 'recordRetrieved', record.doc_id());
+
+ G.ui.rdetail.title.appendChild(text(record.title()));
+ buildSearchLink(STYPE_AUTHOR, record.author(), G.ui.rdetail.author);
+ G.ui.rdetail.isbn.appendChild(text(cleanISBN(record.isbn())));
+ G.ui.rdetail.edition.appendChild(text(record.edition()));
+ G.ui.rdetail.pubdate.appendChild(text(record.pubdate()));
+ G.ui.rdetail.publisher.appendChild(text(record.publisher()));
+ $('rdetail_physical_desc').appendChild(text(record.physical_description()));
+ r = record.types_of_resource();
+ if(r) {
+  G.ui.rdetail.tor.appendChild(text(r[0]));
+  setResourcePic( G.ui.rdetail.tor_pic, r[0]);
+ }
+ G.ui.rdetail.abstr.appendChild(text(record.synopsis()));
+
+ try{
+  if(record.isbn()) {
+   if(ENABLE_ADDED_CONTENT_ATTRIB_LINKS) {
+    unHideMe($('rdetail.jacket_attrib_div'));
+    var href = $('rdetail.jacket_attrib_link').getAttribute('href') +cleanISBN(record.isbn());
+    $('rdetail.jacket_attrib_link').setAttribute('href', href);
+   }
+   rdetailCheckForGBPreview();
+
+  } else {
+   hideMe($("rdetail.jacket_attrib_div"));
+   hideMe($("rdetail_img_link"));
+  }
+ } catch(E) {}
+
+
+ // see if the record has any external links 
+ var links = record.online_loc();
+ for( var i = 0; links && links.length > 0 && i < links.length; i = i + 3 ) {
+  var href = links[i];
+  // avoid matching "HTTP: The Complete Reference"
+  if( href.match(/https?:\/|ftps?:\/|mailto:/i) ) {
+   unHideMe($('rdetail_online_row'));
+   // MODS can contain a display label (used for the text of the link)
+   // as well as a note about the URL; many legacy systems conflate the
+   // two and generate MARC records that expect the note to be used as
+   // the text of the link, with no display label; here's the canonical
+   // format:
+   //
+   // 856 40 $uhttp://localhost$yDisplay label$zPublic note
+   //
+   // Note that the MARC21slim2MODS XSL concatenates $3 and $y together
+   // (as $y was defined later in MARC21's life as the display label)
+   var displayLabel = '' + links[i+1];
+   var note = '' + links[i+2];
+   if(!displayLabel || displayLabel.match(/https?:\/|ftps?:\/|mailto:/i)) {
+    if(!note || note.match(/https?:\/|ftps?:\/|mailto:/i)) {
+     displayLabel = href;
+    } else {
+     displayLabel = note;
+    }
+   }
+   $('rdetail_online').appendChild(elem('a', {href:href,'class':'classic_link'}, displayLabel));
+   if (note && note != displayLabel) {
+    $('rdetail_online').appendChild(elem('span', {'class':'url_note'}, ' - ' + note));
+   }
+   $('rdetail_online').appendChild(elem('br'));
+  }
+ }
+
+ // Fill in our unAPI ID, if anyone cares
+ var abbrs = document.getElementsByTagName('abbr');
+ var span;
+ for (var i = 0; i < abbrs.length; i = i + 1) {
+  if (abbrs[i].getAttribute('name') == 'unapi') {
+   span = abbrs[i];
+   break;
+  }
+ }
+ buildunAPISpan( span, 'biblio-record_entry', record.doc_id() );
+
+ $('rdetail_place_hold').setAttribute(
+   'href','javascript:holdsDrawEditor({record:"'+record.doc_id()+'",type:"T"});');
+
+ var RW = $('rdetail_exp_refworks');
+ if (RW && rdetailEnableRefWorks) {
+
+  var here = (findOrgUnit(getLocation())).name();
+  var org_name = here.replace(" ", "+");
+  var cgi = new CGI();
+
+  RW.setAttribute(
+   'href',
+   rdetailRefWorksHost + '/express/expressimport.asp?vendor='
+   + org_name
+   + '&filter=MARC+Format&database=All+MARC+Formats&encoding=65001&url=http%3A%2F%2F'
+   + cgi.server_name + '/opac/extras/supercat/marctxt/record/'
+   + record.doc_id()
+        );
+
+  RW.setAttribute('target', 'RefWorksMain');
+
+  unHideMe($('rdetail_exp_refworks_span'));
+ }
+
+ $('rdetail_img_link').setAttribute('href', buildISBNSrc(cleanISBN(record.isbn()), 'large'));
+ G.ui.rdetail.image.setAttribute("src", buildISBNSrc(cleanISBN(record.isbn())));
+ runEvt("rdetail", "recordDrawn");
+ recordsCache.push(record);
+
+ rdetailSetExtrasSelector();
+
+ var breq = new Request(FETCH_BRE, [getRid()]);
+ breq.callback( rdetailCheckDeleted );
+ breq.send();
+
+ resultBuildCaches( [ record ] );
+ resultDrawSubjects();
+ resultDrawSeries();
+
+ // grab added content 
+ acCollectData(cleanISBN(record.isbn()), rdetailhandleAC);
 }
 
 
 
 function rdetailCheckDeleted(r) {
-	var br = r.getResultObject()[0];
-	if( isTrue(br.deleted()) ) {
-		hideMe($('rdetail_place_hold'));
-		$('rdetail_more_actions_selector').disabled = true;
-		unHideMe($('rdetail_deleted_exp'));
-	}
+ var br = r.getResultObject()[0];
+ if( isTrue(br.deleted()) ) {
+  hideMe($('rdetail_place_hold'));
+  $('rdetail_more_actions_selector').disabled = true;
+  unHideMe($('rdetail_deleted_exp'));
+ }
 }
 
 function rdetailSetExtrasSelector() {
-	if(!grabUser()) return;
-	unHideMe($('rdetail_more_actions'));
+ if(!grabUser()) return;
+ unHideMe($('rdetail_more_actions'));
 
-	var req = new Request( 
-			FETCH_CONTAINERS, G.user.session, G.user.id(), 'biblio', 'bookbag' );
-	req.callback(rdetailAddBookbags);
-	req.send();
+ var req = new Request( 
+   FETCH_CONTAINERS, G.user.session, G.user.id(), 'biblio', 'bookbag' );
+ req.callback(rdetailAddBookbags);
+ req.send();
 }
 
 function rdetailAddBookbags(r) {
 
-	var containers = r.getResultObject();
-	var selector = $('rdetail_more_actions_selector');
-	var found = false;
-	var index = 3;
-	doSelectorActions(selector);
+ var containers = r.getResultObject();
+ var selector = $('rdetail_more_actions_selector');
+ var found = false;
+ var index = 3;
+ doSelectorActions(selector);
 
-	for( var i = 0; i != containers.length; i++ ) {
-		found = true;
-		var container = containers[i];
-		insertSelectorVal( selector, index++, container.name(), 
-				"container_" + container.id(), rdetailAddToBookbag,  1 );
-	}
+ for( var i = 0; i != containers.length; i++ ) {
+  found = true;
+  var container = containers[i];
+  insertSelectorVal( selector, index++, container.name(), 
+    "container_" + container.id(), rdetailAddToBookbag,  1 );
+ }
 
-	nextContainerIndex = index;
+ nextContainerIndex = index;
 }
 
 var _actions = {};
 function rdetailNewBookbag() {
-	var name = prompt($('rdetail_bb_new').innerHTML,"");
-	if(!name) return;
-
-	var id;
-	if( id = containerCreate( name ) ) {
-		alert($('rdetail_bb_success').innerHTML);
-		var selector = $('rdetail_more_actions_selector');
-		insertSelectorVal( selector, nextContainerIndex++, name, 
-				"container_" + id, rdetailAddToBookbag, 1 );
-		setSelector( selector, 'start' );
-	}
+ var name = prompt($('rdetail_bb_new').innerHTML,"");
+ if(!name) return;
+
+ var id;
+ if( id = containerCreate( name ) ) {
+  alert($('rdetail_bb_success').innerHTML);
+  var selector = $('rdetail_more_actions_selector');
+  insertSelectorVal( selector, nextContainerIndex++, name, 
+    "container_" + id, rdetailAddToBookbag, 1 );
+  setSelector( selector, 'start' );
+ }
 }
 
 
 function rdetailAddToBookbag() {
-	var selector = $('rdetail_more_actions_selector');
-	var id = selector.options[selector.selectedIndex].value;
-	setSelector( selector, 'start' );
+ var selector = $('rdetail_more_actions_selector');
+ var id = selector.options[selector.selectedIndex].value;
+ setSelector( selector, 'start' );
 
-	if( containerCreateItem( id.substring(10), record.doc_id() )) {
-		alert($('rdetail_bb_item_success').innerHTML);
-	}
+ if( containerCreateItem( id.substring(10), record.doc_id() )) {
+  alert($('rdetail_bb_item_success').innerHTML);
+ }
 }
 
 
 var rdetailMarcFetched = false;
 function rdetailShowExtra(type, args) {
 
-	hideMe($('rdetail_copy_info_div'));
-	hideMe($('rdetail_reviews_div'));
-	hideMe($('rdetail_toc_div'));
-	hideMe($('rdetail_anotes_div'));
-	hideMe($('rdetail_excerpt_div'));
-	hideMe($('rdetail_preview_div'));
-	hideMe($('rdetail_marc_div'));
-	hideMe($('cn_browse'));
-	hideMe($('rdetail_cn_browse_div'));
-	hideMe($('rdetail_notes_div'));
-
-	removeCSSClass($('rdetail_copy_info_link'), 'rdetail_extras_selected');
-	removeCSSClass($('rdetail_viewcn_link'), 'rdetail_extras_selected');
-	removeCSSClass($('rdetail_reviews_link'), 'rdetail_extras_selected');
-	removeCSSClass($('rdetail_toc_link'), 'rdetail_extras_selected');
-	removeCSSClass($('rdetail_excerpt_link'), 'rdetail_extras_selected');
-	removeCSSClass($('rdetail_preview_link'), 'rdetail_extras_selected');
-	removeCSSClass($('rdetail_anotes_link'), 'rdetail_extras_selected');
-	removeCSSClass($('rdetail_annotation_link'), 'rdetail_extras_selected');
-	removeCSSClass($('rdetail_viewmarc_link'), 'rdetail_extras_selected');
-
-	switch(type) {
-
-		case "copyinfo": 
-			unHideMe($('rdetail_copy_info_div')); 
-			addCSSClass($('rdetail_copy_info_link'), 'rdetail_extras_selected');
-			break;
-
-		case "reviews": 
-			addCSSClass($('rdetail_reviews_link'), 'rdetail_extras_selected');
-			unHideMe($('rdetail_reviews_div')); 
-			break;
-
-		case "excerpt": 
-			addCSSClass($('rdetail_excerpt_link'), 'rdetail_extras_selected');
-			unHideMe($('rdetail_excerpt_div'));
-			break;
-
-		case "preview": 
-			addCSSClass($('rdetail_preview_link'), 'rdetail_extras_selected');
-			unHideMe($('rdetail_preview_div'));
-			rdetailDisplayGBPreview();
-			break;
-
-		case "anotes": 
-			addCSSClass($('rdetail_anotes_link'), 'rdetail_extras_selected');
-			unHideMe($('rdetail_anotes_div'));
-			break;
-
-		case "toc": 
-			addCSSClass($('rdetail_toc_link'), 'rdetail_extras_selected');
-			unHideMe($('rdetail_toc_div'));
-			break;
-
-		case "marc": 
-			addCSSClass($('rdetail_viewmarc_link'), 'rdetail_extras_selected');
-			unHideMe($('rdetail_marc_div')); 
-			if(rdetailMarcFetched) return;
-			unHideMe($('rdetail_extras_loading'));
-			rdetailMarcFetched = true;
-			var req = new Request( FETCH_MARC_HTML, record.doc_id() );
-			req.callback(rdetailViewMarc); 
-			req.send();
-			break;
-
-		case 'cn':
-			addCSSClass($('rdetail_viewcn_link'), 'rdetail_extras_selected');
-			unHideMe($('rdetail_cn_browse_div'));
-			rdetailShowCNBrowse(defaultCN, getLocation(), null, true);
-			break;
-
-	}
+ hideMe($('rdetail_copy_info_div'));
+ hideMe($('rdetail_reviews_div'));
+ hideMe($('rdetail_toc_div'));
+ hideMe($('rdetail_anotes_div'));
+ hideMe($('rdetail_excerpt_div'));
+ hideMe($('rdetail_preview_div'));
+ hideMe($('rdetail_marc_div'));
+ hideMe($('cn_browse'));
+ hideMe($('rdetail_cn_browse_div'));
+ hideMe($('rdetail_notes_div'));
+
+ removeCSSClass($('rdetail_copy_info_link'), 'rdetail_extras_selected');
+ removeCSSClass($('rdetail_viewcn_link'), 'rdetail_extras_selected');
+ removeCSSClass($('rdetail_reviews_link'), 'rdetail_extras_selected');
+ removeCSSClass($('rdetail_toc_link'), 'rdetail_extras_selected');
+ removeCSSClass($('rdetail_excerpt_link'), 'rdetail_extras_selected');
+ removeCSSClass($('rdetail_preview_link'), 'rdetail_extras_selected');
+ removeCSSClass($('rdetail_anotes_link'), 'rdetail_extras_selected');
+ removeCSSClass($('rdetail_annotation_link'), 'rdetail_extras_selected');
+ removeCSSClass($('rdetail_viewmarc_link'), 'rdetail_extras_selected');
+
+ switch(type) {
+
+  case "copyinfo": 
+   unHideMe($('rdetail_copy_info_div')); 
+   addCSSClass($('rdetail_copy_info_link'), 'rdetail_extras_selected');
+   break;
+
+  case "reviews": 
+   addCSSClass($('rdetail_reviews_link'), 'rdetail_extras_selected');
+   unHideMe($('rdetail_reviews_div')); 
+   break;
+
+  case "excerpt": 
+   addCSSClass($('rdetail_excerpt_link'), 'rdetail_extras_selected');
+   unHideMe($('rdetail_excerpt_div'));
+   break;
+
+  case "preview": 
+   addCSSClass($('rdetail_preview_link'), 'rdetail_extras_selected');
+   unHideMe($('rdetail_preview_div'));
+   rdetailDisplayGBPreview();
+   break;
+
+  case "anotes": 
+   addCSSClass($('rdetail_anotes_link'), 'rdetail_extras_selected');
+   unHideMe($('rdetail_anotes_div'));
+   break;
+
+  case "toc": 
+   addCSSClass($('rdetail_toc_link'), 'rdetail_extras_selected');
+   unHideMe($('rdetail_toc_div'));
+   break;
+
+  case "marc": 
+   addCSSClass($('rdetail_viewmarc_link'), 'rdetail_extras_selected');
+   unHideMe($('rdetail_marc_div')); 
+   if(rdetailMarcFetched) return;
+   unHideMe($('rdetail_extras_loading'));
+   rdetailMarcFetched = true;
+   var req = new Request( FETCH_MARC_HTML, record.doc_id() );
+   req.callback(rdetailViewMarc); 
+   req.send();
+   break;
+
+  case 'cn':
+   addCSSClass($('rdetail_viewcn_link'), 'rdetail_extras_selected');
+   unHideMe($('rdetail_cn_browse_div'));
+   rdetailShowCNBrowse(defaultCN, getLocation(), null, true);
+   break;
+
+ }
 }
 
 function rdetailVolumeDetails(args) {
-	var row = $(args.rowid);
-	var tbody = row.parentNode;
-	cpdBuild( tbody, row, record, args.cn, args.org, args.depth, args.copy_location );
-	return;
+ var row = $(args.rowid);
+ var tbody = row.parentNode;
+ cpdBuild( tbody, row, record, args.cn, args.org, args.depth, args.copy_location );
+ return;
 }
 
 function rdetailBuildCNList() {
 
-	var select = $('cn_browse_selector');
-	var index = 0;
-	var arr = [];
-	for( var cn in callnumberCache ) arr.push( cn );
-	arr.sort();
-
-	if( arr.length == 0 ) {
-		hideMe($('rdetail_cn_browse_select_div'));
-		return;
-	}
-
-	for( var i in arr ) {
-		var cn = arr[i];
-		var opt = new Option(cn);
-		select.options[index++] = opt;
-	}
-	select.onchange = rdetailGatherCN;
+ var select = $('cn_browse_selector');
+ var index = 0;
+ var arr = [];
+ for( var cn in callnumberCache ) arr.push( cn );
+ arr.sort();
+
+ if( arr.length == 0 ) {
+  hideMe($('rdetail_cn_browse_select_div'));
+  return;
+ }
+
+ for( var i in arr ) {
+  var cn = arr[i];
+  var opt = new Option(cn);
+  select.options[index++] = opt;
+ }
+ select.onchange = rdetailGatherCN;
 }
 
 function rdetailGatherCN() {
-	var cn = getSelectorVal($('cn_browse_selector'));
-	rdetailShowCNBrowse( cn, getLocation(), getDepth(), true );
-	setSelector( $('cn_browse_selector'), cn );
+ var cn = getSelectorVal($('cn_browse_selector'));
+ rdetailShowCNBrowse( cn, getLocation(), getDepth(), true );
+ setSelector( $('cn_browse_selector'), cn );
 }
 
 
 function rdetailShowCNBrowse( cn, loc, depth, fromOnclick ) {
 
-	if(!cn) {
-		unHideMe($('cn_browse_none'));
-		hideMe($('rdetail_cn_browse_select_div'));
-		return;
-	}
-
-	unHideMe($('rdetail_cn_browse_select_div'));
-	rdetailBuildCNList();
-	setSelector( $('cn_browse_selector'), cn );
-	hideMe($('rdetail_copy_info_div'));
-	hideMe($('rdetail_reviews_div'));
-	hideMe($('rdetail_toc_div'));
-	hideMe($('rdetail_marc_div'));
-	unHideMe($('rdetail_cn_browse_div'));
-	unHideMe($('cn_browse'));
-	if( !rdetailLocalOnly && ! fromOnclick ) depth = findOrgDepth(globalOrgTree);
-	cnBrowseGo(cn, loc, depth);
+ if(!cn) {
+  unHideMe($('cn_browse_none'));
+  hideMe($('rdetail_cn_browse_select_div'));
+  return;
+ }
+
+ unHideMe($('rdetail_cn_browse_select_div'));
+ rdetailBuildCNList();
+ setSelector( $('cn_browse_selector'), cn );
+ hideMe($('rdetail_copy_info_div'));
+ hideMe($('rdetail_reviews_div'));
+ hideMe($('rdetail_toc_div'));
+ hideMe($('rdetail_marc_div'));
+ unHideMe($('rdetail_cn_browse_div'));
+ unHideMe($('cn_browse'));
+ if( !rdetailLocalOnly && ! fromOnclick ) depth = findOrgDepth(globalOrgTree);
+ cnBrowseGo(cn, loc, depth);
 }
 
 function rdetailhandleAC(data) {
 
-	if( data.reviews.html ) {
-		$('rdetail_review_container').innerHTML = data.reviews.html;
-		unHideMe($('rdetail_reviews_link'));
-	}
-
-	if( data.toc.html ) {
-		$('rdetail_toc_div').innerHTML = data.toc.html;
-		unHideMe($('rdetail_toc_link'));
-	}
-
-	if( data.excerpt.html ) {
-		$('rdetail_excerpt_div').innerHTML = data.excerpt.html;
-		unHideMe($('rdetail_excerpt_link'));
-	}
-
-	if( data.anotes.html ) {
-		$('rdetail_anotes_div').innerHTML = data.anotes.html;
-		unHideMe($('rdetail_anotes_link'));
-	}
+ if( data.reviews.html ) {
+  $('rdetail_review_container').innerHTML = data.reviews.html;
+  unHideMe($('rdetail_reviews_link'));
+ }
+
+ if( data.toc.html ) {
+  $('rdetail_toc_div').innerHTML = data.toc.html;
+  unHideMe($('rdetail_toc_link'));
+ }
+
+ if( data.excerpt.html ) {
+  $('rdetail_excerpt_div').innerHTML = data.excerpt.html;
+  unHideMe($('rdetail_excerpt_link'));
+ }
+
+ if( data.anotes.html ) {
+  $('rdetail_anotes_div').innerHTML = data.anotes.html;
+  unHideMe($('rdetail_anotes_link'));
+ }
 }
 
 function rdetailShowReviews(r) {
-	hideMe($('rdetail_extras_loading'));
-	var res = r.getResultObject();
-	var par = $('rdetail_reviews_div');
-	var template = par.removeChild($('rdetail_review_template'));
-	if( res && res.length > 0 ) {
-		unHideMe($('rdetail_reviews_link'));
-		for( var i = 0; i != res.length; i++ ) {
-			var rev = res[i];	
-			if( rev.text && rev.info ) {
-				var node = template.cloneNode(true);
-				$n(node, 'review_header').appendChild(text(rev.info));
-				$n(node, 'review_text').appendChild(text(rev.text));
-				par.appendChild(node);
-			}
-		}
-	}
+ hideMe($('rdetail_extras_loading'));
+ var res = r.getResultObject();
+ var par = $('rdetail_reviews_div');
+ var template = par.removeChild($('rdetail_review_template'));
+ if( res && res.length > 0 ) {
+  unHideMe($('rdetail_reviews_link'));
+  for( var i = 0; i != res.length; i++ ) {
+   var rev = res[i]; 
+   if( rev.text && rev.info ) {
+    var node = template.cloneNode(true);
+    $n(node, 'review_header').appendChild(text(rev.info));
+    $n(node, 'review_text').appendChild(text(rev.text));
+    par.appendChild(node);
+   }
+  }
+ }
 }
 
 
 function rdetailShowTOC(r) {
-	hideMe($('rdetail_extras_loading'));
-	var resp = r.getResultObject();
-	if(resp) {
-		unHideMe($('rdetail_toc_link'));
-		$('rdetail_toc_div').innerHTML = resp;
-	}
+ hideMe($('rdetail_extras_loading'));
+ var resp = r.getResultObject();
+ if(resp) {
+  unHideMe($('rdetail_toc_link'));
+  $('rdetail_toc_div').innerHTML = resp;
+ }
 }
 
 function rdetailBuildInfoRows() {
-	var req;
-	var method = FETCH_COPY_COUNTS_SUMMARY;
-	if (rdetailShowCopyLocation)
-		method = FETCH_COPY_LOCATION_COUNTS_SUMMARY;
-
-	if( rdetailShowLocal ) 
-		req = new Request(method, record.doc_id(), getLocation(), getDepth())
-	else
-		req = new Request(method, record.doc_id());
-	req.callback(_rdetailBuildInfoRows);
-	req.send();
+ var req;
+ var method = FETCH_COPY_COUNTS_SUMMARY;
+ if (rdetailShowCopyLocation)
+  method = FETCH_COPY_LOCATION_COUNTS_SUMMARY;
+
+ if( rdetailShowLocal ) 
+  req = new Request(method, record.doc_id(), getLocation(), getDepth())
+ else
+  req = new Request(method, record.doc_id());
+ req.callback(_rdetailBuildInfoRows);
+ req.send();
 }
 
 function _rdetailRows(node) {
 
-	if( rdetailShowLocal && getLocation() != globalOrgTree.id() ) {
-		var loc = findOrgUnit(getLocation());
-		if( node ) {
-			if( !orgIsMine(node, loc) && !orgIsMine(loc,node) ) return;
-		} else {
-			for( var i = 0; i < globalOrgTree.children().length; i++ ) {
-				var org = findOrgUnit(globalOrgTree.children()[i]);
-				if( orgIsMine(org, loc) ) {
-					node = org;
-					break;
-				}
-			}
-		} 
-	}
+ if( rdetailShowLocal && getLocation() != globalOrgTree.id() ) {
+  var loc = findOrgUnit(getLocation());
+  if( node ) {
+   if( !orgIsMine(node, loc) && !orgIsMine(loc,node) ) return;
+  } else {
+   for( var i = 0; i < globalOrgTree.children().length; i++ ) {
+    var org = findOrgUnit(globalOrgTree.children()[i]);
+    if( orgIsMine(org, loc) ) {
+     node = org;
+     break;
+    }
+   }
+  } 
+ }
 
-	if(!node && findOrgType(globalOrgTree.ou_type()).can_have_vols())
-		node = globalOrgTree;
+ if(!node && findOrgType(globalOrgTree.ou_type()).can_have_vols())
+  node = globalOrgTree;
 
 
-	/* don't show hidden orgs */
+ /* don't show hidden orgs */
 
-	if(node) {
+ if(node) {
 
-		if(!isXUL() && !isTrue(node.opac_visible())) return;
+  if(!isXUL() && !isTrue(node.opac_visible())) return;
 
-		var row = copyRow.cloneNode(true);
-		row.id = "cp_info_" + node.id();
+  var row = copyRow.cloneNode(true);
+  row.id = "cp_info_" + node.id();
 
-		var libtd = findNodeByName( row, config.names.rdetail.lib_cell );
-		var cntd  = findNodeByName( row, config.names.rdetail.cn_cell );
-		var cpctd = findNodeByName( row, config.names.rdetail.cp_count_cell );
-		var actions = $n(row, 'rdetail_actions_cell');
+  var libtd = findNodeByName( row, config.names.rdetail.lib_cell );
+  var cntd  = findNodeByName( row, config.names.rdetail.cn_cell );
+  var cpctd = findNodeByName( row, config.names.rdetail.cp_count_cell );
+  var actions = $n(row, 'rdetail_actions_cell');
 
-		var p = libtd.getElementsByTagName('a')[0];
-		libtd.insertBefore(text(node.name()), p);
-		libtd.setAttribute("style", "padding-left: " + ((findOrgDepth(node) - 1)  * 9) + "px;");
+  var p = libtd.getElementsByTagName('a')[0];
+  libtd.insertBefore(text(node.name()), p);
+  libtd.setAttribute("style", "padding-left: " + ((findOrgDepth(node) - 1)  * 9) + "px;");
 
-		if(!findOrgType(node.ou_type()).can_have_vols()) {
+  if(!findOrgType(node.ou_type()).can_have_vols()) {
 
-			row.removeChild(cntd);
-			row.removeChild(cpctd);
-			row.removeChild(actions);
-			row.setAttribute('novols', '1');
+   row.removeChild(cntd);
+   row.removeChild(cpctd);
+   row.removeChild(actions);
+   row.setAttribute('novols', '1');
 
-			libtd.setAttribute("colspan", numStatuses + 3 );
-			libtd.colSpan = numStatuses + 3;
-			addCSSClass(row, 'copy_info_region_row');
-		} 
+   libtd.setAttribute("colspan", numStatuses + 3 );
+   libtd.colSpan = numStatuses + 3;
+   addCSSClass(row, 'copy_info_region_row');
+  } 
 
-		copyRowParent.appendChild(row);
+  copyRowParent.appendChild(row);
 
-	} else { node = globalOrgTree; }
+ } else { node = globalOrgTree; }
 
-	for( var c in node.children() ) 
-		_rdetailRows(node.children()[c]);
+ for( var c in node.children() ) 
+  _rdetailRows(node.children()[c]);
 }
 
 function rdetailCNPrint(orgid, cn) {
-	var div = cpdBuildPrintWindow( record, orgid);
-	var template = div.removeChild($n(div, 'cnrow'));
-	var rowNode = $("cp_info_" + orgid);
-	cpdStylePopupWindow(div);
-	openWindow(div.innerHTML);
+ var div = cpdBuildPrintWindow( record, orgid);
+ var template = div.removeChild($n(div, 'cnrow'));
+ var rowNode = $("cp_info_" + orgid);
+ cpdStylePopupWindow(div);
+ openWindow(div.innerHTML);
 }
 
 var localCNFound = false;
 var ctr = 0;
 function _rdetailBuildInfoRows(r) {
 
-	if (rdetailShowCopyLocation)
-		unHideMe( $n( $('rdetail_copy_info_table'), 'rdetail_copylocation_header' ) );
+ if (rdetailShowCopyLocation)
+  unHideMe( $n( $('rdetail_copy_info_table'), 'rdetail_copylocation_header' ) );
 
-	removeChildren(copyRowParent);
+ removeChildren(copyRowParent);
 
-	_rdetailRows();
+ _rdetailRows();
 
-	var summary = r.getResultObject();
-	if(!summary) return;
+ var summary = r.getResultObject();
+ if(!summary) return;
 
-	var found = false;
-	for( var i = 0; i < summary.length; i++ ) {
+ var found = false;
+ for( var i = 0; i < summary.length; i++ ) {
 
-		var arr = summary[i];
-		globalCNCache[arr[1]] = 1;
-		var thisOrg = findOrgUnit(arr[0]);
-		var rowNode = $("cp_info_" + thisOrg.id());
-		if(!rowNode) continue;
+  var arr = summary[i];
+  globalCNCache[arr[1]] = 1;
+  var thisOrg = findOrgUnit(arr[0]);
+  var rowNode = $("cp_info_" + thisOrg.id());
+  if(!rowNode) continue;
 
-		if(rowNode.getAttribute("used")) {
+  if(rowNode.getAttribute("used")) {
 
-			if( rowNode.nextSibling ) {
-				sib = rowNode.nextSibling;
-				o ='cp_info_'+thisOrg.id()+'_';
-				/* push the new row on as the last row for this org unit */
-				while( sib && sib.id.match(o) ) {
-					sib = sib.nextSibling;
-				}
-				if(sib)
-					rowNode = copyRowParent.insertBefore(copyRow.cloneNode(true), sib);
-				else
-					rowNode = copyRowParent.appendChild(copyRow.cloneNode(true));
-			} else {
-				rowNode = copyRowParent.appendChild(copyRow.cloneNode(true));
-			}
+   if( rowNode.nextSibling ) {
+    sib = rowNode.nextSibling;
+    o ='cp_info_'+thisOrg.id()+'_';
+    /* push the new row on as the last row for this org unit */
+    while( sib && sib.id.match(o) ) {
+     sib = sib.nextSibling;
+    }
+    if(sib)
+     rowNode = copyRowParent.insertBefore(copyRow.cloneNode(true), sib);
+    else
+     rowNode = copyRowParent.appendChild(copyRow.cloneNode(true));
+   } else {
+    rowNode = copyRowParent.appendChild(copyRow.cloneNode(true));
+   }
 
-			var n = findNodeByName( rowNode, config.names.rdetail.lib_cell );
-			n.appendChild(text(thisOrg.name()));
-			n.setAttribute("style", "padding-left: " + ((findOrgDepth(thisOrg) - 1)  * 9) + "px;");
-			rowNode.id = "cp_info_" + thisOrg.id() + '_' + (++ctr); 
+   var n = findNodeByName( rowNode, config.names.rdetail.lib_cell );
+   n.appendChild(text(thisOrg.name()));
+   n.setAttribute("style", "padding-left: " + ((findOrgDepth(thisOrg) - 1)  * 9) + "px;");
+   rowNode.id = "cp_info_" + thisOrg.id() + '_' + (++ctr); 
 
-		} else {
-			rowNode.setAttribute("used", "1");
-		}
+  } else {
+   rowNode.setAttribute("used", "1");
+  }
 
-		var cpc_temp = rowNode.removeChild(
-				findNodeByName(rowNode, config.names.rdetail.cp_count_cell));
+  var cpc_temp = rowNode.removeChild(
+    findNodeByName(rowNode, config.names.rdetail.cp_count_cell));
 
-		var statuses = arr[2];
-		var cl = '';
-		if (rdetailShowCopyLocation) {
-			cl = arr[2];
-			statuses = arr[3];
-		}
+  var statuses = arr[2];
+  var cl = '';
+  if (rdetailShowCopyLocation) {
+   cl = arr[2];
+   statuses = arr[3];
+  }
 
 
-		rdetailApplyStatuses(rowNode, cpc_temp, statuses);
+  rdetailApplyStatuses(rowNode, cpc_temp, statuses);
 
-		var isLocal = false;
-		if( orgIsMine( findOrgUnit(getLocation()), thisOrg ) ) { 
-			found = true; 
-			isLocal = true; 
-			if(!localCNFound) {
-				localCNFound = true;
-				defaultCN = arr[1];
-			}
-		}
+  var isLocal = false;
+  if( orgIsMine( findOrgUnit(getLocation()), thisOrg ) ) { 
+   found = true; 
+   isLocal = true; 
+   if(!localCNFound) {
+    localCNFound = true;
+    defaultCN = arr[1];
+   }
+  }
 
-		//if(isLocal) unHideMe(rowNode);
-		unHideMe(rowNode);
+  //if(isLocal) unHideMe(rowNode);
+  unHideMe(rowNode);
 
-		rdetailSetPath( thisOrg, isLocal );
-		rdetailBuildBrowseInfo( rowNode, arr[1], isLocal, thisOrg, cl );
+  rdetailSetPath( thisOrg, isLocal );
+  rdetailBuildBrowseInfo( rowNode, arr[1], isLocal, thisOrg, cl );
 
-		if( i == summary.length - 1 && !defaultCN) defaultCN = arr[1];
-	}
+  if( i == summary.length - 1 && !defaultCN) defaultCN = arr[1];
+ }
 
-	if(!found) unHideMe(G.ui.rdetail.cp_info_none);
+ if(!found) unHideMe(G.ui.rdetail.cp_info_none);
 }
 
 function rdetailBuildBrowseInfo(row, cn, local, orgNode, cl) {
 
-	if(local) {
-		var cache = callnumberCache[cn];
-		if( cache ) cache.count++;
-		else callnumberCache[cn] = { count : 1 };
-	}
-
-	var depth = getDepth();
-	if( !local ) depth = findOrgDepth(globalOrgTree);
-
-	$n(row, 'rdetail_callnumber_cell').appendChild(text(cn));
-
-	if (rdetailShowCopyLocation) {
-		var cl_cell = $n(row, 'rdetail_copylocation_cell');
-		cl_cell.appendChild(text(cl));
-		unHideMe(cl_cell);
-	}
-
-	_debug('setting action clicks for cn ' + cn);
-
-	var dHref = 'javascript:rdetailVolumeDetails('+
-			'{copy_location : "'+cl+'", rowid : "'+row.id+'", cn :"'+cn+'", depth:"'+depth+'", org:"'+orgNode.id()+'", local: '+local+'});';
-
-	var bHref = 'javascript:rdetailShowCNBrowse("' + cn + '", '+orgNode.id()+', "'+depth+'");'; 
-
-	unHideMe( $n(row, 'details') )
-		$n(row, 'details').setAttribute('href', dHref);
-	unHideMe( $n(row, 'browse') )
-		$n(row, 'browse').setAttribute('href', bHref);
-
-	if(isXUL()) {
-		unHideMe($n(row, 'hold_div'));
-		$n(row, 'hold').onclick = function() {
-			var req = new Request(FETCH_VOLUME_BY_INFO, cn, record.doc_id(), orgNode.id());
-			req.callback(
-					function(r) {
-					var vol = r.getResultObject();
-					holdsDrawEditor({type: 'V', volumeObject : vol});
-					}
-				    );
-			req.send();
-		};
-	}
+ if(local) {
+  var cache = callnumberCache[cn];
+  if( cache ) cache.count++;
+  else callnumberCache[cn] = { count : 1 };
+ }
+
+ var depth = getDepth();
+ if( !local ) depth = findOrgDepth(globalOrgTree);
+
+ $n(row, 'rdetail_callnumber_cell').appendChild(text(cn));
+
+ if (rdetailShowCopyLocation) {
+  var cl_cell = $n(row, 'rdetail_copylocation_cell');
+  cl_cell.appendChild(text(cl));
+  unHideMe(cl_cell);
+ }
+
+ _debug('setting action clicks for cn ' + cn);
+
+ var dHref = 'javascript:rdetailVolumeDetails('+
+   '{copy_location : "'+cl+'", rowid : "'+row.id+'", cn :"'+cn+'", depth:"'+depth+'", org:"'+orgNode.id()+'", local: '+local+'});';
+
+ var bHref = 'javascript:rdetailShowCNBrowse("' + cn + '", '+orgNode.id()+', "'+depth+'");'; 
+
+ unHideMe( $n(row, 'details') )
+  $n(row, 'details').setAttribute('href', dHref);
+ unHideMe( $n(row, 'browse') )
+  $n(row, 'browse').setAttribute('href', bHref);
+
+ if(isXUL()) {
+  unHideMe($n(row, 'hold_div'));
+  $n(row, 'hold').onclick = function() {
+   var req = new Request(FETCH_VOLUME_BY_INFO, cn, record.doc_id(), orgNode.id());
+   req.callback(
+     function(r) {
+     var vol = r.getResultObject();
+     holdsDrawEditor({type: 'V', volumeObject : vol});
+     }
+        );
+   req.send();
+  };
+ }
 }
 
 // sets the path to org as 'active' and displays the path if it's local 
 function rdetailSetPath(org, local) {
-	if( findOrgDepth(org) == 0 ) return;
-	var row = $("cp_info_" + org.id());
-	row.setAttribute("hasinfo", "1");
-	unHideMe(row);
-	rdetailSetPath(findOrgUnit(org.parent_ou()), local);
+ if( findOrgDepth(org) == 0 ) return;
+ var row = $("cp_info_" + org.id());
+ row.setAttribute("hasinfo", "1");
+ unHideMe(row);
+ rdetailSetPath(findOrgUnit(org.parent_ou()), local);
 }
 
 //Append all the statuses for a given summary to the 
 //copy summary table 
 function rdetailApplyStatuses( row, template, statuses ) {
-	for( var j in _statusPositions ) {
-		var stat = _statusPositions[j];
-		var val = statuses[stat.id()];
-		var nn = template.cloneNode(true);
-		if(val) nn.appendChild(text(val));
-		else nn.appendChild(text(0));
-		row.appendChild(nn);
-	}
+ for( var j in _statusPositions ) {
+  var stat = _statusPositions[j];
+  var val = statuses[stat.id()];
+  var nn = template.cloneNode(true);
+  if(val) nn.appendChild(text(val));
+  else nn.appendChild(text(0));
+  row.appendChild(nn);
+ }
 }
 
 //Add one td (creating a new column) to the copy summary
 //table for each opac_visible copy status
 function rdetailBuildStatusColumns() {
 
-	rdetailGrabCopyStatuses();
-	var parent = statusRow;
-	var template = parent.removeChild(G.ui.rdetail.cp_status);
+ rdetailGrabCopyStatuses();
+ var parent = statusRow;
+ var template = parent.removeChild(G.ui.rdetail.cp_status);
 
-	var i = 0;
-	for( i = 0; i < cp_statuses.length; i++ ) {
+ var i = 0;
+ for( i = 0; i < cp_statuses.length; i++ ) {
 
-		var c = cp_statuses[i];
-		if( c && isTrue(c.opac_visible()) ) {
-			var name = c.name();
-			_statusPositions[i] = c;
-			var node = template.cloneNode(true);
-			var data = findNodeByName( node, config.names.rdetail.cp_status);
+  var c = cp_statuses[i];
+  if( c && isTrue(c.opac_visible()) ) {
+   var name = c.name();
+   _statusPositions[i] = c;
+   var node = template.cloneNode(true);
+   var data = findNodeByName( node, config.names.rdetail.cp_status);
 
-			data.appendChild(text(name));
-			parent.appendChild(node);
-		}
-	}	
+   data.appendChild(text(name));
+   parent.appendChild(node);
+  }
+ } 
 
-	numStatuses = 0;
-	for(x in _statusPositions) numStatuses++; 
+ numStatuses = 0;
+ for(x in _statusPositions) numStatuses++; 
 }
 
 function rdetailGrabCopyStatuses() {
-	if(cp_statuses) return cp_statuses;
-	var req = new Request(FETCH_COPY_STATUSES);
-	req.send(true);
-	cp_statuses = req.result();
-	cp_statuses = cp_statuses.sort(_rdetailSortStatuses);
+ if(cp_statuses) return cp_statuses;
+ var req = new Request(FETCH_COPY_STATUSES);
+ req.send(true);
+ cp_statuses = req.result();
+ cp_statuses = cp_statuses.sort(_rdetailSortStatuses);
 }
 
 function _rdetailSortStatuses(a, b) {
-	return parseInt(a.id()) - parseInt(b.id());
+ return parseInt(a.id()) - parseInt(b.id());
 }
 
 /**
  * Check for a Google Book preview 
  */
 function rdetailCheckForGBPreview() {
-	if (!rdetailGoogleBookPreview) return;
-	searchForGBPreview( cleanISBN(record.isbn()) );
+ if (!rdetailGoogleBookPreview) return;
+ searchForGBPreview( cleanISBN(record.isbn()) );
 }
 
 /**
@@ -982,25 +982,25 @@ function rdetailCheckForGBPreview() {
  */
 function searchForGBPreview( isbn ) {
 
-	// Delete any previous Google Booksearch JSON queries.
-	var GBPJsonScript = document.getElementById("GBPJsonScript");
-	if (GBPJsonScript) {
-		GBPJsonScript.parentNode.removeChild(GBPJsonScript);
-	}
-
-	// Add a script element with the src as the user's Google Booksearch query. 
-	// JSON output is specified by including the alt=json-in-script argument
-	// and the callback function is also specified as a URI argument.
-	var GBPScriptElement = document.createElement("script");
-
-	GBPScriptElement.setAttribute("id", "GBPJsonScript");
-	GBPScriptElement.setAttribute("src",
-			"http://books.google.com/books?bibkeys=" + 
-			isbn + "&jscmd=viewapi&callback=GBPreviewCallback");
-	GBPScriptElement.setAttribute("type", "text/javascript");
-
-	// make the request to Google booksearch
-	document.documentElement.firstChild.appendChild(GBPScriptElement);
+ // Delete any previous Google Booksearch JSON queries.
+ var GBPJsonScript = document.getElementById("GBPJsonScript");
+ if (GBPJsonScript) {
+  GBPJsonScript.parentNode.removeChild(GBPJsonScript);
+ }
+
+ // Add a script element with the src as the user's Google Booksearch query. 
+ // JSON output is specified by including the alt=json-in-script argument
+ // and the callback function is also specified as a URI argument.
+ var GBPScriptElement = document.createElement("script");
+
+ GBPScriptElement.setAttribute("id", "GBPJsonScript");
+ GBPScriptElement.setAttribute("src",
+   "http://books.google.com/books?bibkeys=" + 
+   isbn + "&jscmd=viewapi&callback=GBPreviewCallback");
+ GBPScriptElement.setAttribute("type", "text/javascript");
+
+ // make the request to Google booksearch
+ document.documentElement.firstChild.appendChild(GBPScriptElement);
 }
 
 /**
@@ -1012,37 +1012,37 @@ function searchForGBPreview( isbn ) {
  * @param {JSON} booksInfo is the JSON object pulled from the Google books service.
  */
 function GBPreviewCallback(GBPBookInfo) {
-	var GBPreviewDiv = document.getElementById("rdetail_preview_div");
-	var GBPBook;
-
-	for ( i in GBPBookInfo ) {
-		GBPBook = GBPBookInfo[i];
-	}
-
-	if ( !GBPBook ) {
-		return;
-	}
-
-	if ( GBPBook.preview != "noview" ) {
-		if ( GBPBook.preview == 'full' ) {
-			setText( $('rdetail_preview_link'), $('rdetail_preview_full_text').innerHTML );
-			$('rdetail_preview_link_a').title = $('rdetail_preview_title').innerHTML;      
-		}
-
-		// Add a button below the book cover image to load the preview.
-		GBPBadge = document.createElement( 'img' );
-		GBPBadge.src = 'http://books.google.com/intl/en/googlebooks/images/gbs_preview_button1.gif';
-		GBPBadge.title = $('rdetail_preview_badge').innerHTML;
-		GBPBadge.style.border = 0;
-		GBPBadgelink = document.createElement( 'a' );
-		GBPBadgelink.href = 'javascript:rdetailShowExtra("preview");';
-		GBPBadgelink.appendChild( GBPBadge );
-		$('rdetail_image_cell').appendChild( GBPBadgelink );
-		$('rdetail_preview_div').style.height = 600;
-
-		/* Display the "Preview" tab in the Extras section */
-		unHideMe( $('rdetail_preview_link' ) );
-	}
+ var GBPreviewDiv = document.getElementById("rdetail_preview_div");
+ var GBPBook;
+
+ for ( i in GBPBookInfo ) {
+  GBPBook = GBPBookInfo[i];
+ }
+
+ if ( !GBPBook ) {
+  return;
+ }
+
+ if ( GBPBook.preview != "noview" ) {
+  if ( GBPBook.preview == 'full' ) {
+   setText( $('rdetail_preview_link'), $('rdetail_preview_full_text').innerHTML );
+   $('rdetail_preview_link_a').title = $('rdetail_preview_title').innerHTML;      
+  }
+
+  // Add a button below the book cover image to load the preview.
+  GBPBadge = document.createElement( 'img' );
+  GBPBadge.src = 'http://books.google.com/intl/en/googlebooks/images/gbs_preview_button1.gif';
+  GBPBadge.title = $('rdetail_preview_badge').innerHTML;
+  GBPBadge.style.border = 0;
+  GBPBadgelink = document.createElement( 'a' );
+  GBPBadgelink.href = 'javascript:rdetailShowExtra("preview");';
+  GBPBadgelink.appendChild( GBPBadge );
+  $('rdetail_image_cell').appendChild( GBPBadgelink );
+  $('rdetail_preview_div').style.height = 600;
+
+  /* Display the "Preview" tab in the Extras section */
+  unHideMe( $('rdetail_preview_link' ) );
+ }
 }
 
 /**
@@ -1052,18 +1052,18 @@ function GBPreviewCallback(GBPBookInfo) {
  * XXX I18N of Google Book Preview language attribute needed
  */
 function rdetailDisplayGBPreview() {
-	unHideMe($('rdetail_extras_loading'));
-	GBPreviewPane = $('rdetail_preview_div');
-	if ( GBPreviewPane.getAttribute('loaded') == null ||
-		GBPreviewPane.getAttribute('loaded') == "false" ) {
-		google.load("books", "0", {"callback" : rdetailGBPViewerLoadCallback, "language": "en"} );
-		GBPreviewPane.setAttribute('loaded', 'true');
-	}
+ unHideMe($('rdetail_extras_loading'));
+ GBPreviewPane = $('rdetail_preview_div');
+ if ( GBPreviewPane.getAttribute('loaded') == null ||
+  GBPreviewPane.getAttribute('loaded') == "false" ) {
+  google.load("books", "0", {"callback" : rdetailGBPViewerLoadCallback, "language": "en"} );
+  GBPreviewPane.setAttribute('loaded', 'true');
+ }
 }
 
 function rdetailGBPViewerLoadCallback() {
-	hideMe($('rdetail_extras_loading'));
-	var GBPViewer = new google.books.DefaultViewer(document.getElementById('rdetail_preview_div'));
-	GBPViewer.load('ISBN:' + cleanISBN(record.isbn()) );
+ hideMe($('rdetail_extras_loading'));
+ var GBPViewer = new google.books.DefaultViewer(document.getElementById('rdetail_preview_div'));
+ GBPViewer.load('ISBN:' + cleanISBN(record.isbn()) );
 
 }
diff --git a/Open-ILS/web/opac/skin/default/js/result_common.js b/Open-ILS/web/opac/skin/default/js/result_common.js
index 300b5712ae..7fa3084dc2 100644
--- a/Open-ILS/web/opac/skin/default/js/result_common.js
+++ b/Open-ILS/web/opac/skin/default/js/result_common.js
@@ -10,27 +10,27 @@ var resultCompiledSearch = null;
 
 /* set up the event handlers */
 if( findCurrentPage() == MRESULT || findCurrentPage() == RRESULT ) {
-	G.evt.result.hitCountReceived.push(resultSetHitInfo);
-	G.evt.result.recordReceived.push(resultDisplayRecord, resultAddCopyCounts);
-	G.evt.result.copyCountsReceived.push(resultDisplayCopyCounts);
-	G.evt.result.allRecordsReceived.push(resultBuildCaches, resultDrawSubjects, 
+ G.evt.result.hitCountReceived.push(resultSetHitInfo);
+ G.evt.result.recordReceived.push(resultDisplayRecord, resultAddCopyCounts);
+ G.evt.result.copyCountsReceived.push(resultDisplayCopyCounts);
+ G.evt.result.allRecordsReceived.push(resultBuildCaches, resultDrawSubjects, 
       resultDrawAuthors, resultDrawSeries, function(){unHideMe($('result_info_2'))},
-	  fetchGoogleBooksLink);
+   fetchGoogleBooksLink);
 
-	attachEvt('result','lowHits',resultLowHits);
-	attachEvt('result','zeroHits',resultZeroHits);
-	attachEvt( "common", "locationUpdated", resultSBSubmit );
-	/* do this after we have ID's so the rank for mr pages will be correct */
-	attachEvt("result", "preCollectRecords", resultPaginate);
+ attachEvt('result','lowHits',resultLowHits);
+ attachEvt('result','zeroHits',resultZeroHits);
+ attachEvt( "common", "locationUpdated", resultSBSubmit );
+ /* do this after we have ID's so the rank for mr pages will be correct */
+ attachEvt("result", "preCollectRecords", resultPaginate);
 }
 
 function resultSBSubmit(){searchBarSubmit();}
 
 /* returns the last 'index' postion ocurring in this page */
 function resultFinalPageIndex() {
-	if(getHitCount() < (getOffset() + getDisplayCount())) 
-		return getHitCount() - 1;
-	return getOffset() + getDisplayCount() - 1;
+ if(getHitCount() < (getOffset() + getDisplayCount())) 
+  return getHitCount() - 1;
+ return getOffset() + getDisplayCount() - 1;
 }
 
 
@@ -39,63 +39,63 @@ function resultFinalPageIndex() {
 /* generic search method */
 function resultCollectSearchIds( type, method, handler ) {
 
-	var sort		= (getSort() == SORT_TYPE_REL) ? null : getSort(); 
-	var sortdir = (sort) ? ((getSortDir()) ? getSortDir() : SORT_DIR_ASC) : null;
+ var sort  = (getSort() == SORT_TYPE_REL) ? null : getSort(); 
+ var sortdir = (sort) ? ((getSortDir()) ? getSortDir() : SORT_DIR_ASC) : null;
 
-	var item_type;
-	var item_form;
-	var args = {};
+ var item_type;
+ var item_form;
+ var args = {};
 
-	if( type ) {
-		var form = parseForm(getForm());
-		item_type = form.item_type;
-		item_form = form.item_form;
+ if( type ) {
+  var form = parseForm(getForm());
+  item_type = form.item_type;
+  item_form = form.item_form;
 
-	} else {
-		item_type = (getItemType()) ? getItemType().split(/,/) : null;
-		item_form = (getItemForm()) ? getItemForm().split(/,/) : null;
-	}
+ } else {
+  item_type = (getItemType()) ? getItemType().split(/,/) : null;
+  item_form = (getItemForm()) ? getItemForm().split(/,/) : null;
+ }
 
-	var limit = (resultFetchAllRecords) ? 1000 : getDisplayCount();
+ var limit = (resultFetchAllRecords) ? 1000 : getDisplayCount();
 
-	if( getOffset() > 0 ) {
-		if( getHitCount() > 0 && (getOffset() + getDisplayCount()) > getHitCount() ) 
-			limit = getHitCount() - getOffset();
-	}
+ if( getOffset() > 0 ) {
+  if( getHitCount() > 0 && (getOffset() + getDisplayCount()) > getHitCount() ) 
+   limit = getHitCount() - getOffset();
+ }
 
-	var lasso = getLasso();
+ var lasso = getLasso();
 
-	if (lasso) args.org_unit = -lasso;
-	else args.org_unit = getLocation();
+ if (lasso) args.org_unit = -lasso;
+ else args.org_unit = getLocation();
 
-	args.depth    = getDepth();
-	args.limit    = limit;
-	args.offset   = getOffset();
-	args.visibility_limit = 3000;
+ args.depth    = getDepth();
+ args.limit    = limit;
+ args.offset   = getOffset();
+ args.visibility_limit = 3000;
     args.default_class = getStype();
 
-	if(sort) args.sort = sort;
-	if(sortdir) args.sort_dir = sortdir;
-	if(item_type) args.item_type	= item_type;
-	if(item_form) args.item_form	= item_form;
+ if(sort) args.sort = sort;
+ if(sortdir) args.sort_dir = sortdir;
+ if(item_type) args.item_type = item_type;
+ if(item_form) args.item_form = item_form;
     if(getAvail()) args.available = 1;
 
 
-	if(getAudience()) args.audience  = getAudience().split(/,/);
-	if(getLitForm()) args.lit_form	= getLitForm().split(/,/);
-	if(getLanguage()) args.language	= getLanguage().split(/,/);
-	if(getBibLevel()) args.bib_level	= getBibLevel().split(/,/);
-	if(getCopyLocs()) args.locations	= getCopyLocs().split(/,/);
+ if(getAudience()) args.audience  = getAudience().split(/,/);
+ if(getLitForm()) args.lit_form = getLitForm().split(/,/);
+ if(getLanguage()) args.language = getLanguage().split(/,/);
+ if(getBibLevel()) args.bib_level = getBibLevel().split(/,/);
+ if(getCopyLocs()) args.locations = getCopyLocs().split(/,/);
     if(getPubdBefore()) args.before = getPubdBefore();
     else if(getPubdAfter()) args.after = getPubdAfter();
     else if(getPubdBetween()) args.between = getPubdBetween().split(/,/);
 
-	_debug('Search args: ' + js2JSON(args));
-	_debug('Raw query: ' + getTerm());
+ _debug('Search args: ' + js2JSON(args));
+ _debug('Raw query: ' + getTerm());
 
-	var req = new Request(method, args, getTerm(), 1);
-	req.callback(handler);
-	req.send();
+ var req = new Request(method, args, getTerm(), 1);
+ req.callback(handler);
+ req.send();
 }
 
 
@@ -103,315 +103,315 @@ function resultCollectSearchIds( type, method, handler ) {
 
 
 /* set the search result info, number of hits, which results we're 
-	displaying, links to the next/prev pages, etc. */
+ displaying, links to the next/prev pages, etc. */
 function resultSetHitInfo() { 
 
-	var lasso = getLasso();
-	if (!lasso) {
-		/* tell the user where the results are coming from */
-		var baseorg = findOrgUnit(getLocation());
-		var depth = getDepth();
-		var mydepth = findOrgDepth(baseorg);
-		if( findOrgDepth(baseorg) != depth ) {
-			var tmporg = baseorg;
-			while( mydepth > depth ) {
-				mydepth--;
-				tmporg = findOrgUnit(tmporg.parent_ou());
-			}
-			unHideMe($('including_results_for'));
-			$('including_results_location').appendChild(text(tmporg.name()));
-		}
-	}
+ var lasso = getLasso();
+ if (!lasso) {
+  /* tell the user where the results are coming from */
+  var baseorg = findOrgUnit(getLocation());
+  var depth = getDepth();
+  var mydepth = findOrgDepth(baseorg);
+  if( findOrgDepth(baseorg) != depth ) {
+   var tmporg = baseorg;
+   while( mydepth > depth ) {
+    mydepth--;
+    tmporg = findOrgUnit(tmporg.parent_ou());
+   }
+   unHideMe($('including_results_for'));
+   $('including_results_location').appendChild(text(tmporg.name()));
+  }
+ }
 
 
-	try{searchTimer.stop()}catch(e){}
+ try{searchTimer.stop()}catch(e){}
 
-	//if( findCurrentPage() == MRESULT ) {
-	if( findCurrentPage() == MRESULT || 
+ //if( findCurrentPage() == MRESULT ) {
+ if( findCurrentPage() == MRESULT || 
 
-		(findCurrentPage() == RRESULT &&
-			(
-				getRtype() == RTYPE_TITLE ||
-				getRtype() == RTYPE_AUTHOR ||
-				getRtype() == RTYPE_SUBJECT ||
-				getRtype() == RTYPE_SERIES ||
-				getRtype() == RTYPE_KEYWORD 
-			)
+  (findCurrentPage() == RRESULT &&
+   (
+    getRtype() == RTYPE_TITLE ||
+    getRtype() == RTYPE_AUTHOR ||
+    getRtype() == RTYPE_SUBJECT ||
+    getRtype() == RTYPE_SERIES ||
+    getRtype() == RTYPE_KEYWORD 
+   )
 
-		) ) {
+  ) ) {
 
-		if(getHitCount() <= lowHitCount && getTerm())
-			runEvt('result', 'lowHits');
-	}
+  if(getHitCount() <= lowHitCount && getTerm())
+   runEvt('result', 'lowHits');
+ }
 
-	if(getHitCount() == 0) {
-		runEvt('result', 'zeroHits');
-		return;
-	}
+ if(getHitCount() == 0) {
+  runEvt('result', 'zeroHits');
+  return;
+ }
 
 
-	var pages = getHitCount() / getDisplayCount();
-	if(pages % 1) pages = parseInt(pages) + 1;
+ var pages = getHitCount() / getDisplayCount();
+ if(pages % 1) pages = parseInt(pages) + 1;
 
-	
+ 
 
-	var cpage = (getOffset()/getDisplayCount()) + 1;
+ var cpage = (getOffset()/getDisplayCount()) + 1;
 
-	G.ui.result.current_page.appendChild(text(cpage));
-	G.ui.result.num_pages.appendChild(text(pages + ")")); /* the ) is dumb */
+ G.ui.result.current_page.appendChild(text(cpage));
+ G.ui.result.num_pages.appendChild(text(pages + ")")); /* the ) is dumb */
 
-	$('current_page2').appendChild(text(cpage));
-	$('num_pages2').appendChild(text(pages + ")")); /* the ) is dumb */
+ $('current_page2').appendChild(text(cpage));
+ $('num_pages2').appendChild(text(pages + ")")); /* the ) is dumb */
 
-	/* set the offsets */
-	var offsetEnd = getDisplayCount() + getOffset();  
-	if( getDisplayCount() > (getHitCount() - getOffset()))  
-		offsetEnd = getHitCount();
+ /* set the offsets */
+ var offsetEnd = getDisplayCount() + getOffset();  
+ if( getDisplayCount() > (getHitCount() - getOffset()))  
+  offsetEnd = getHitCount();
 
-	G.ui.result.offset_end.appendChild(text(offsetEnd));
-	G.ui.result.offset_start.appendChild(text(getOffset() + 1));
+ G.ui.result.offset_end.appendChild(text(offsetEnd));
+ G.ui.result.offset_start.appendChild(text(getOffset() + 1));
 
-	$('offset_end2').appendChild(text(offsetEnd));
-	$('offset_start2').appendChild(text(getOffset() + 1));
+ $('offset_end2').appendChild(text(offsetEnd));
+ $('offset_start2').appendChild(text(getOffset() + 1));
 
-	G.ui.result.result_count.appendChild(text(getHitCount()));
-	unHideMe(G.ui.result.info);
+ G.ui.result.result_count.appendChild(text(getHitCount()));
+ unHideMe(G.ui.result.info);
 
-	$('result_count2').appendChild(text(getHitCount()));
-	unHideMe($('result_info_div2'));
+ $('result_count2').appendChild(text(getHitCount()));
+ unHideMe($('result_info_div2'));
 }
 
 function resultLowHits() {
-	showCanvas();
-	unHideMe($('result_low_hits'));
-	if(getHitCount() > 0)
-		unHideMe($('result_low_hits_msg'));
+ showCanvas();
+ unHideMe($('result_low_hits'));
+ if(getHitCount() > 0)
+  unHideMe($('result_low_hits_msg'));
 
     var words = [];
     for(var key in resultCompiledSearch.searches) 
         words.push(resultCompiledSearch.searches[key].term);
 
-	var sreq = new Request(CHECK_SPELL, words.join(' '));
-	sreq.callback(resultSuggestSpelling);
-	sreq.send();
+ var sreq = new Request(CHECK_SPELL, words.join(' '));
+ sreq.callback(resultSuggestSpelling);
+ sreq.send();
 
     for(var key in resultCompiledSearch.searches) {
-		var areq = new Request(FETCH_CROSSREF, key, resultCompiledSearch.searches[key].term);
-		areq.callback(resultLowHitXRef);
-		areq.send();
-	}
+  var areq = new Request(FETCH_CROSSREF, key, resultCompiledSearch.searches[key].term);
+  areq.callback(resultLowHitXRef);
+  areq.send();
+ }
 
-	if( !(getForm() == null || getForm() == 'all' || getForm() == "") ) {
-		var a = {};
-		a[PARAM_FORM] = "all";
-		$('low_hits_remove_format_link').setAttribute('href',buildOPACLink(a));
-		unHideMe($('low_hits_remove_format'));
-	}
+ if( !(getForm() == null || getForm() == 'all' || getForm() == "") ) {
+  var a = {};
+  a[PARAM_FORM] = "all";
+  $('low_hits_remove_format_link').setAttribute('href',buildOPACLink(a));
+  unHideMe($('low_hits_remove_format'));
+ }
 
-	resultSuggestSearchClass();
+ resultSuggestSearchClass();
 
-	if(getTerm()) resultExpandSearch(); /* advanced search */
+ if(getTerm()) resultExpandSearch(); /* advanced search */
 }
 
 var lowHitsXRefSet = {};
 var lowHitsXRefLink;
 var lowHitsXRefLinkParent;
 function resultLowHitXRef(r) {
-	if(!lowHitsXRefLink){
-		lowHitsXRefLinkParent = $('low_hits_xref_link').parentNode;
-		lowHitsXRefLink = lowHitsXRefLinkParent.removeChild($('low_hits_xref_link'));
-	}
-	var res = r.getResultObject();
-	var arr = res.from;
-	arr.concat(res.also);
-	if(arr && arr.length > 0) {
-		unHideMe($('low_hits_cross_ref'));
-		var word;
-		var c = 0;
-		while( word = arr.shift() ) {
+ if(!lowHitsXRefLink){
+  lowHitsXRefLinkParent = $('low_hits_xref_link').parentNode;
+  lowHitsXRefLink = lowHitsXRefLinkParent.removeChild($('low_hits_xref_link'));
+ }
+ var res = r.getResultObject();
+ var arr = res.from;
+ arr.concat(res.also);
+ if(arr && arr.length > 0) {
+  unHideMe($('low_hits_cross_ref'));
+  var word;
+  var c = 0;
+  while( word = arr.shift() ) {
 
             if (lowHitsXRefSet[word] == 1) continue;
             lowHitsXRefSet[word] = 1;
 
-			if(c++ > 20) break;
-			var a = {};
-			a[PARAM_TERM] = word;
-			var template = lowHitsXRefLink.cloneNode(true);
-			template.setAttribute('href',buildOPACLink(a));
-			template.appendChild(text(word));
-			lowHitsXRefLinkParent.appendChild(template);
-			lowHitsXRefLinkParent.appendChild(text(' '));
-		}
-	}
+   if(c++ > 20) break;
+   var a = {};
+   a[PARAM_TERM] = word;
+   var template = lowHitsXRefLink.cloneNode(true);
+   template.setAttribute('href',buildOPACLink(a));
+   template.appendChild(text(word));
+   lowHitsXRefLinkParent.appendChild(template);
+   lowHitsXRefLinkParent.appendChild(text(' '));
+  }
+ }
 }
 
 function resultZeroHits() {
-	showCanvas();
-	unHideMe($('result_low_hits'));
-	unHideMe($('result_zero_hits_msg'));
-	//if(getTerm()) resultExpandSearch(); /* advanced search */
+ showCanvas();
+ unHideMe($('result_low_hits'));
+ unHideMe($('result_zero_hits_msg'));
+ //if(getTerm()) resultExpandSearch(); /* advanced search */
 }
 
 function resultExpandSearch() {
-	var top = findOrgDepth(globalOrgTree);
-	if(getDepth() == top) return;
-	unHideMe($('low_hits_expand_range'));
-	var par = $('low_hits_expand_link').parentNode;
-	var template = par.removeChild($('low_hits_expand_link'));
-
-	var bottom = getDepth();
-	while( top < bottom ) {
-		var a = {};
-		a[PARAM_DEPTH] = top;
-		var temp = template.cloneNode(true);
-		temp.appendChild(text(findOrgTypeFromDepth(top).opac_label()))
-		temp.setAttribute('href',buildOPACLink(a));
-		par.appendChild(temp);
-		top++;
-	}
+ var top = findOrgDepth(globalOrgTree);
+ if(getDepth() == top) return;
+ unHideMe($('low_hits_expand_range'));
+ var par = $('low_hits_expand_link').parentNode;
+ var template = par.removeChild($('low_hits_expand_link'));
+
+ var bottom = getDepth();
+ while( top < bottom ) {
+  var a = {};
+  a[PARAM_DEPTH] = top;
+  var temp = template.cloneNode(true);
+  temp.appendChild(text(findOrgTypeFromDepth(top).opac_label()))
+  temp.setAttribute('href',buildOPACLink(a));
+  par.appendChild(temp);
+  top++;
+ }
 }
 
 function resultSuggestSearchClass() {
-	var stype = getStype();
-	if(stype == STYPE_KEYWORD) return;
-	var a = {}; var ref;
-	unHideMe($('low_hits_search_type'));
-	if(stype != STYPE_TITLE) {
-		ref = $('low_hits_title_search');
-		unHideMe(ref);
-		a[PARAM_STYPE] = STYPE_TITLE;
-		ref.setAttribute('href',buildOPACLink(a));
-	}
-	if(stype != STYPE_AUTHOR) {
-		ref = $('low_hits_author_search');
-		unHideMe(ref);
-		a[PARAM_STYPE] = STYPE_AUTHOR;
-		ref.setAttribute('href',buildOPACLink(a));
-	}
-	if(stype != STYPE_SUBJECT) {
-		ref = $('low_hits_subject_search');
-		unHideMe(ref);
-		a[PARAM_STYPE] = STYPE_SUBJECT;
-		ref.setAttribute('href',buildOPACLink(a));
-	}
-	if(stype != STYPE_KEYWORD) {
-		ref = $('low_hits_keyword_search');
-		unHideMe(ref);
-		a[PARAM_STYPE] = STYPE_KEYWORD;
-		ref.setAttribute('href',buildOPACLink(a));
-	}
-	if(stype != STYPE_SERIES) {
-		ref = $('low_hits_series_search');
-		unHideMe(ref);
-		a[PARAM_STYPE] = STYPE_SERIES;
-		ref.setAttribute('href',buildOPACLink(a));
-	}
+ var stype = getStype();
+ if(stype == STYPE_KEYWORD) return;
+ var a = {}; var ref;
+ unHideMe($('low_hits_search_type'));
+ if(stype != STYPE_TITLE) {
+  ref = $('low_hits_title_search');
+  unHideMe(ref);
+  a[PARAM_STYPE] = STYPE_TITLE;
+  ref.setAttribute('href',buildOPACLink(a));
+ }
+ if(stype != STYPE_AUTHOR) {
+  ref = $('low_hits_author_search');
+  unHideMe(ref);
+  a[PARAM_STYPE] = STYPE_AUTHOR;
+  ref.setAttribute('href',buildOPACLink(a));
+ }
+ if(stype != STYPE_SUBJECT) {
+  ref = $('low_hits_subject_search');
+  unHideMe(ref);
+  a[PARAM_STYPE] = STYPE_SUBJECT;
+  ref.setAttribute('href',buildOPACLink(a));
+ }
+ if(stype != STYPE_KEYWORD) {
+  ref = $('low_hits_keyword_search');
+  unHideMe(ref);
+  a[PARAM_STYPE] = STYPE_KEYWORD;
+  ref.setAttribute('href',buildOPACLink(a));
+ }
+ if(stype != STYPE_SERIES) {
+  ref = $('low_hits_series_search');
+  unHideMe(ref);
+  a[PARAM_STYPE] = STYPE_SERIES;
+  ref.setAttribute('href',buildOPACLink(a));
+ }
 }
 
 function resultSuggestSpelling(r) {
-	var res = r.getResultObject();
-	var phrase = getTerm();
-	var words = phrase.split(/ /);
-
-	var newterm = "";
-
-	for( var w = 0; w < words.length; w++ ) {
-		var word = words[w];
-		var blob = grep(res, function(i){return (i.word == word);});
-		if( blob ) blob = blob[0];
-		else continue;
-		if( blob.word == word ) {
-			if( blob.suggestions && blob.suggestions[0] ) {
-				newterm += " " + blob.suggestions[0];
-				unHideMe($('did_you_mean'));
-			} else {
-				newterm += " " + word;
-			}
-		}
-	}
-
-	var arg = {};
-	arg[PARAM_TERM] = newterm;
-	$('spell_check_link').setAttribute('href', buildOPACLink(arg));
-	$('spell_check_link').appendChild(text(newterm));
+ var res = r.getResultObject();
+ var phrase = getTerm();
+ var words = phrase.split(/ /);
+
+ var newterm = "";
+
+ for( var w = 0; w < words.length; w++ ) {
+  var word = words[w];
+  var blob = grep(res, function(i){return (i.word == word);});
+  if( blob ) blob = blob[0];
+  else continue;
+  if( blob.word == word ) {
+   if( blob.suggestions && blob.suggestions[0] ) {
+    newterm += " " + blob.suggestions[0];
+    unHideMe($('did_you_mean'));
+   } else {
+    newterm += " " + word;
+   }
+  }
+ }
+
+ var arg = {};
+ arg[PARAM_TERM] = newterm;
+ $('spell_check_link').setAttribute('href', buildOPACLink(arg));
+ $('spell_check_link').appendChild(text(newterm));
 }
 
 
 function resultPaginate() {
-	var o = getOffset();
+ var o = getOffset();
 
-	if( !(  ((o) + getDisplayCount()) >= getHitCount()) ) {
+ if( !(  ((o) + getDisplayCount()) >= getHitCount()) ) {
 
-		var args = {};
-		args[PARAM_OFFSET]	= o + getDisplayCount();
-		args[PARAM_SORT]		= SORT;
-		args[PARAM_SORT_DIR] = SORT_DIR;
-		args[PARAM_RLIST]		= new CGI().param(PARAM_RLIST);
+  var args = {};
+  args[PARAM_OFFSET] = o + getDisplayCount();
+  args[PARAM_SORT]  = SORT;
+  args[PARAM_SORT_DIR] = SORT_DIR;
+  args[PARAM_RLIST]  = new CGI().param(PARAM_RLIST);
 
-		G.ui.result.next_link.setAttribute("href", buildOPACLink(args)); 
-		addCSSClass(G.ui.result.next_link, config.css.result.nav_active);
+  G.ui.result.next_link.setAttribute("href", buildOPACLink(args)); 
+  addCSSClass(G.ui.result.next_link, config.css.result.nav_active);
 
-		$('next_link2').setAttribute("href", buildOPACLink(args)); 
-		addCSSClass($('next_link2'), config.css.result.nav_active);
+  $('next_link2').setAttribute("href", buildOPACLink(args)); 
+  addCSSClass($('next_link2'), config.css.result.nav_active);
 
-		args[PARAM_OFFSET] = getHitCount() - (getHitCount() % getDisplayCount());
+  args[PARAM_OFFSET] = getHitCount() - (getHitCount() % getDisplayCount());
 
-		/* when hit count is divisible by display count, we have to adjust */
-		if( getHitCount() % getDisplayCount() == 0 ) 
-			args[PARAM_OFFSET] -= getDisplayCount();
+  /* when hit count is divisible by display count, we have to adjust */
+  if( getHitCount() % getDisplayCount() == 0 ) 
+   args[PARAM_OFFSET] -= getDisplayCount();
 
         /*
-		G.ui.result.end_link.setAttribute("href", buildOPACLink(args)); 
-		addCSSClass(G.ui.result.end_link, config.css.result.nav_active);
+  G.ui.result.end_link.setAttribute("href", buildOPACLink(args)); 
+  addCSSClass(G.ui.result.end_link, config.css.result.nav_active);
 
-		$('end_link2').setAttribute("href", buildOPACLink(args)); 
-		addCSSClass($('end_link2'), config.css.result.nav_active);
+  $('end_link2').setAttribute("href", buildOPACLink(args)); 
+  addCSSClass($('end_link2'), config.css.result.nav_active);
         */
-	}
+ }
 
-	if( o > 0 ) {
+ if( o > 0 ) {
 
-		var args = {};
-		args[PARAM_SORT]		= SORT;
-		args[PARAM_SORT_DIR] = SORT_DIR;
-		args[PARAM_RLIST]		= new CGI().param(PARAM_RLIST);
+  var args = {};
+  args[PARAM_SORT]  = SORT;
+  args[PARAM_SORT_DIR] = SORT_DIR;
+  args[PARAM_RLIST]  = new CGI().param(PARAM_RLIST);
 
-		args[PARAM_OFFSET] = o - getDisplayCount();
-		G.ui.result.prev_link.setAttribute( "href", buildOPACLink(args)); 
-		addCSSClass(G.ui.result.prev_link, config.css.result.nav_active);
+  args[PARAM_OFFSET] = o - getDisplayCount();
+  G.ui.result.prev_link.setAttribute( "href", buildOPACLink(args)); 
+  addCSSClass(G.ui.result.prev_link, config.css.result.nav_active);
 
-		$('prev_link2').setAttribute( "href", buildOPACLink(args)); 
-		addCSSClass($('prev_link2'), config.css.result.nav_active);
+  $('prev_link2').setAttribute( "href", buildOPACLink(args)); 
+  addCSSClass($('prev_link2'), config.css.result.nav_active);
 
-		args[PARAM_OFFSET] = 0;
-		G.ui.result.home_link.setAttribute( "href", buildOPACLink(args)); 
-		addCSSClass(G.ui.result.home_link, config.css.result.nav_active);
+  args[PARAM_OFFSET] = 0;
+  G.ui.result.home_link.setAttribute( "href", buildOPACLink(args)); 
+  addCSSClass(G.ui.result.home_link, config.css.result.nav_active);
 
-		$('search_home_link2').setAttribute( "href", buildOPACLink(args)); 
-		addCSSClass($('search_home_link2'), config.css.result.nav_active);
-	}
+  $('search_home_link2').setAttribute( "href", buildOPACLink(args)); 
+  addCSSClass($('search_home_link2'), config.css.result.nav_active);
+ }
 
-	if(getDisplayCount() < getHitCount()) {
-		unHideMe($('start_end_links_span'));
-		unHideMe($('start_end_links_span2'));
+ if(getDisplayCount() < getHitCount()) {
+  unHideMe($('start_end_links_span'));
+  unHideMe($('start_end_links_span2'));
    }
 
-	showCanvas();
-	try{searchTimer.stop()}catch(e){}
+ showCanvas();
+ try{searchTimer.stop()}catch(e){}
 }
 
 function buildunAPISpan (span, type, id) {
-	var cgi = new CGI();
-	var d = new Date();
+ var cgi = new CGI();
+ var d = new Date();
 
-	addCSSClass(span,'unapi-id');
+ addCSSClass(span,'unapi-id');
 
-	span.setAttribute(
-		'title',
-		'tag:' + cgi.server_name + ',' +
-			d.getFullYear() +
-			':' + type + '/' + id
-	);
+ span.setAttribute(
+  'title',
+  'tag:' + cgi.server_name + ',' +
+   d.getFullYear() +
+   ':' + type + '/' + id
+ );
 }
 
 function unhideGoogleBooksLink (data) {
@@ -430,18 +430,18 @@ function unhideGoogleBooksLink (data) {
 }
 
 /* display the record info in the record display table 'pos' is the 
-		zero based position the record should have in the display table */
+  zero based position the record should have in the display table */
 function resultDisplayRecord(rec, pos, is_mr) {
 
-	if(rec == null) rec = new mvr(); /* so the page won't die if there was an error */
-	recordsHandled++;
-	recordsCache.push(rec);
+ if(rec == null) rec = new mvr(); /* so the page won't die if there was an error */
+ recordsHandled++;
+ recordsCache.push(rec);
 
-	var r = table.rows[pos + 1];
+ var r = table.rows[pos + 1];
     var currentISBN = cleanISBN(rec.isbn());
 
     if (googleBooksLink) {
-	    var gbspan = $n(r, "googleBooksLink");
+     var gbspan = $n(r, "googleBooksLink");
         if (currentISBN) {
             gbspan.setAttribute(
                 'name',
@@ -454,148 +454,148 @@ function resultDisplayRecord(rec, pos, is_mr) {
     }
 
 /*
-	try {
-		var rank = parseFloat(ranks[pos + getOffset()]);
-		rank		= parseInt( rank * 100 );
-		var relspan = $n(r, "relevancy_span");
-		relspan.appendChild(text(rank));
-		unHideMe(relspan.parentNode);
-	} catch(e){ }
+ try {
+  var rank = parseFloat(ranks[pos + getOffset()]);
+  rank  = parseInt( rank * 100 );
+  var relspan = $n(r, "relevancy_span");
+  relspan.appendChild(text(rank));
+  unHideMe(relspan.parentNode);
+ } catch(e){ }
 */
 
-	var pic = $n(r, config.names.result.item_jacket);
-	pic.setAttribute("src", buildISBNSrc(currentISBN));
-
-	var title_link = $n(r, config.names.result.item_title);
-	var author_link = $n(r, config.names.result.item_author);
-
-	if( is_mr )  {
-		var onlyrec = onlyrecord[ getOffset() + pos ];
-		if(onlyrec) {
-			buildunAPISpan($n(r,'unapi'), 'biblio-record_entry', onlyrec);
-
-			var args = {};
-			args.page = RDETAIL;
-			args[PARAM_OFFSET] = 0;
-			args[PARAM_RID] = onlyrec;
-			args[PARAM_MRID] = rec.doc_id();
-			pic.parentNode.setAttribute("href", buildOPACLink(args));
-			title_link.setAttribute("href", buildOPACLink(args));
-			title_link.appendChild(text(normalize(truncate(rec.title(), 65))));
-			
-		} else {
-			buildunAPISpan($n(r,'unapi'), 'metabib-metarecord', rec.doc_id());
-
-			buildTitleLink(rec, title_link); 
-			var args = {};
-			args.page = RRESULT;
-			args[PARAM_OFFSET] = 0;
-			args[PARAM_MRID] = rec.doc_id();
-			pic.parentNode.setAttribute("href", buildOPACLink(args));
-		}
-
-	} else {
-		buildunAPISpan($n(r,'unapi'), 'biblio-record_entry', rec.doc_id());
-
-		buildTitleDetailLink(rec, title_link); 
-		var args = {};
-		args.page = RDETAIL;
-		args[PARAM_OFFSET] = 0;
-		args[PARAM_RID] = rec.doc_id();
-		pic.parentNode.setAttribute("href", buildOPACLink(args));
-
-		unHideMe($n(r,'place_hold_span'));
-		$n(r,'place_hold_link').setAttribute(
-			'href','javascript:holdsDrawEditor({record:"'+rec.doc_id()+'",type:"T"});');
-	}
-
-	buildSearchLink(STYPE_AUTHOR, rec.author(), author_link);
-
-	if(! is_mr ) {
-	
-		if(!isNull(rec.edition()))	{
-			unHideMe( $n(r, "result_table_extra_span"));
-			$n(r, "result_table_edition_span").appendChild( text( rec.edition()) );
-		}
-		if(!isNull(rec.pubdate())) {
-			unHideMe( $n(r, "result_table_extra_span"));
-			unHideMe($n(r, "result_table_pub_span"));
-			$n(r, "result_table_pub_span").appendChild( text( rec.pubdate() ));
-		}
-		if(!isNull(rec.publisher()) ) {
-			unHideMe( $n(r, "result_table_extra_span"));
-			unHideMe($n(r, "result_table_pub_span"));
-			$n(r, "result_table_pub_span").appendChild( text( " " + rec.publisher() ));
-		}
-
-		if(!isNull(rec.physical_description()) ) {
-			unHideMe( $n(r, "result_table_extra_span"));
-			var t = " " + rec.physical_description();
-			//$n(r, "result_table_phys_span").appendChild( text(t.replace(/:.*/g,'')));
-			$n(r, "result_table_phys_span").appendChild( text(t));
-		}
-
-	}
-
-	resultBuildFormatIcons( r, rec, is_mr );
-
-	unHideMe(r);
-	
-	runEvt("result", "recordDrawn", rec.doc_id(), title_link);
-
-	/*
-	if(resultPageIsDone())  {
-		runEvt('result', 'allRecordsReceived', recordsCache);
-	}
-	*/
+ var pic = $n(r, config.names.result.item_jacket);
+ pic.setAttribute("src", buildISBNSrc(currentISBN));
+
+ var title_link = $n(r, config.names.result.item_title);
+ var author_link = $n(r, config.names.result.item_author);
+
+ if( is_mr )  {
+  var onlyrec = onlyrecord[ getOffset() + pos ];
+  if(onlyrec) {
+   buildunAPISpan($n(r,'unapi'), 'biblio-record_entry', onlyrec);
+
+   var args = {};
+   args.page = RDETAIL;
+   args[PARAM_OFFSET] = 0;
+   args[PARAM_RID] = onlyrec;
+   args[PARAM_MRID] = rec.doc_id();
+   pic.parentNode.setAttribute("href", buildOPACLink(args));
+   title_link.setAttribute("href", buildOPACLink(args));
+   title_link.appendChild(text(normalize(truncate(rec.title(), 65))));
+   
+  } else {
+   buildunAPISpan($n(r,'unapi'), 'metabib-metarecord', rec.doc_id());
+
+   buildTitleLink(rec, title_link); 
+   var args = {};
+   args.page = RRESULT;
+   args[PARAM_OFFSET] = 0;
+   args[PARAM_MRID] = rec.doc_id();
+   pic.parentNode.setAttribute("href", buildOPACLink(args));
+  }
+
+ } else {
+  buildunAPISpan($n(r,'unapi'), 'biblio-record_entry', rec.doc_id());
+
+  buildTitleDetailLink(rec, title_link); 
+  var args = {};
+  args.page = RDETAIL;
+  args[PARAM_OFFSET] = 0;
+  args[PARAM_RID] = rec.doc_id();
+  pic.parentNode.setAttribute("href", buildOPACLink(args));
+
+  unHideMe($n(r,'place_hold_span'));
+  $n(r,'place_hold_link').setAttribute(
+   'href','javascript:holdsDrawEditor({record:"'+rec.doc_id()+'",type:"T"});');
+ }
+
+ buildSearchLink(STYPE_AUTHOR, rec.author(), author_link);
+
+ if(! is_mr ) {
+ 
+  if(!isNull(rec.edition())) {
+   unHideMe( $n(r, "result_table_extra_span"));
+   $n(r, "result_table_edition_span").appendChild( text( rec.edition()) );
+  }
+  if(!isNull(rec.pubdate())) {
+   unHideMe( $n(r, "result_table_extra_span"));
+   unHideMe($n(r, "result_table_pub_span"));
+   $n(r, "result_table_pub_span").appendChild( text( rec.pubdate() ));
+  }
+  if(!isNull(rec.publisher()) ) {
+   unHideMe( $n(r, "result_table_extra_span"));
+   unHideMe($n(r, "result_table_pub_span"));
+   $n(r, "result_table_pub_span").appendChild( text( " " + rec.publisher() ));
+  }
+
+  if(!isNull(rec.physical_description()) ) {
+   unHideMe( $n(r, "result_table_extra_span"));
+   var t = " " + rec.physical_description();
+   //$n(r, "result_table_phys_span").appendChild( text(t.replace(/:.*/g,'')));
+   $n(r, "result_table_phys_span").appendChild( text(t));
+  }
+
+ }
+
+ resultBuildFormatIcons( r, rec, is_mr );
+
+ unHideMe(r);
+ 
+ runEvt("result", "recordDrawn", rec.doc_id(), title_link);
+
+ /*
+ if(resultPageIsDone())  {
+  runEvt('result', 'allRecordsReceived', recordsCache);
+ }
+ */
 }
 
 function _resultFindRec(id) {
-	for( var i = 0; i != recordsCache.length; i++ ) {
-		var rec = recordsCache[i];
-		if( rec && rec.doc_id() == id )
-			return rec;
-	}
-	return null;
+ for( var i = 0; i != recordsCache.length; i++ ) {
+  var rec = recordsCache[i];
+  if( rec && rec.doc_id() == id )
+   return rec;
+ }
+ return null;
 }
 
 
 function resultBuildFormatIcons( row, rec, is_mr ) {
 
-	var ress = rec.types_of_resource();
+ var ress = rec.types_of_resource();
 
-	for( var i in ress ) {
+ for( var i in ress ) {
 
-		var res = ress[i];
-		if(!res) continue;
+  var res = ress[i];
+  if(!res) continue;
 
-		var link = $n(row, res + "_link");
-		link.title = res;
-		var img = link.getElementsByTagName("img")[0];
-		removeCSSClass( img, config.css.dim );
+  var link = $n(row, res + "_link");
+  link.title = res;
+  var img = link.getElementsByTagName("img")[0];
+  removeCSSClass( img, config.css.dim );
 
-		var f = getForm();
-		if( f != "all" ) {
-			if( f == modsFormatToMARC(res) ) 
-				addCSSClass( img, "dim2_border");
-		}
+  var f = getForm();
+  if( f != "all" ) {
+   if( f == modsFormatToMARC(res) ) 
+    addCSSClass( img, "dim2_border");
+  }
 
-		var args = {};
-		args[PARAM_OFFSET] = 0;
+  var args = {};
+  args[PARAM_OFFSET] = 0;
 
-		if(is_mr) {
-			args.page = RRESULT;
-			args[PARAM_TFORM] = modsFormatToMARC(res);
-			args[PARAM_MRID] = rec.doc_id();
+  if(is_mr) {
+   args.page = RRESULT;
+   args[PARAM_TFORM] = modsFormatToMARC(res);
+   args[PARAM_MRID] = rec.doc_id();
 
-		} else {
-			args.page = RDETAIL
-			args[PARAM_RID] = rec.doc_id();
-		}
+  } else {
+   args.page = RDETAIL
+   args[PARAM_RID] = rec.doc_id();
+  }
 
-		link.setAttribute("href", buildOPACLink(args));
+  link.setAttribute("href", buildOPACLink(args));
 
-	}
+ }
 }
 
 function fetchGoogleBooksLink () {
@@ -613,144 +613,144 @@ function fetchGoogleBooksLink () {
 
 function resultPageIsDone(pos) {
 
-	return (recordsHandled == getDisplayCount() 
-		|| recordsHandled + getOffset() == getHitCount());
+ return (recordsHandled == getDisplayCount() 
+  || recordsHandled + getOffset() == getHitCount());
 }
 
 var resultCCHeaderApplied = false;
 
 /* -------------------------------------------------------------------- */
 /* dynamically add the copy count rows based on the org type 'countsrow' 
-	is the row into which we will add TD's to hold the copy counts 
-	This code generates copy count cells with an id of
-	'copy_count_cell_<depth>_<pagePosition>'  */
+ is the row into which we will add TD's to hold the copy counts 
+ This code generates copy count cells with an id of
+ 'copy_count_cell_<depth>_<pagePosition>'  */
 function resultAddCopyCounts(rec, pagePosition) {
 
-	var r = table.rows[pagePosition + 1];
-	var countsrow = $n(r, config.names.result.counts_row );
-	var ccell = $n(countsrow, config.names.result.count_cell);
-
-	var nodes = orgNodeTrail(findOrgUnit(getLocation()));
-	var node = nodes[0];
-	var type = findOrgType(node.ou_type());
-	ccell.id = "copy_count_cell_" + type.depth() + "_" + pagePosition;
-	ccell.title = type.opac_label();
-	//addCSSClass(ccell, config.css.result.cc_cell_even);
-
-	var lastcell = ccell;
-	var lastheadcell = null;
-
-	var cchead = null;
-	var ccheadcell = null;
-	if(!resultCCHeaderApplied && !getLasso()) {
-		ccrow = $('result_thead_row');
-		ccheadcell =  ccrow.removeChild($n(ccrow, "result_thead_ccell"));
-		var t = ccheadcell.cloneNode(true);
-		lastheadcell = t;
-		t.appendChild(text(type.opac_label()));
-		ccrow.appendChild(t);
-		resultCCHeaderApplied = true;
-	}
-
-	if(nodes[1]) {
-
-		var x = 1;
-		var d = findOrgDepth(nodes[1]);
-		var d2 = findOrgDepth(nodes[nodes.length -1]);
-
-		for( var i = d; i <= d2 ; i++ ) {
-	
-			ccell = ccell.cloneNode(true);
-
-			//if((i % 2)) removeCSSClass(ccell, "copy_count_cell_even");
-			//else addCSSClass(ccell, "copy_count_cell_even");
-
-			var node = nodes[x++];
-			var type = findOrgType(node.ou_type());
-	
-			ccell.id = "copy_count_cell_" + type.depth() + "_" + pagePosition;
-			ccell.title = type.opac_label();
-			countsrow.insertBefore(ccell, lastcell);
-			lastcell = ccell;
-
-			if(ccheadcell) {
-				var t = ccheadcell.cloneNode(true);
-				t.appendChild(text(type.opac_label()));
-				ccrow.insertBefore(t, lastheadcell);
-				lastheadcell = t;
-			}
-		}
-	}
-
-	unHideMe($("search_info_table"));
+ var r = table.rows[pagePosition + 1];
+ var countsrow = $n(r, config.names.result.counts_row );
+ var ccell = $n(countsrow, config.names.result.count_cell);
+
+ var nodes = orgNodeTrail(findOrgUnit(getLocation()));
+ var node = nodes[0];
+ var type = findOrgType(node.ou_type());
+ ccell.id = "copy_count_cell_" + type.depth() + "_" + pagePosition;
+ ccell.title = type.opac_label();
+ //addCSSClass(ccell, config.css.result.cc_cell_even);
+
+ var lastcell = ccell;
+ var lastheadcell = null;
+
+ var cchead = null;
+ var ccheadcell = null;
+ if(!resultCCHeaderApplied && !getLasso()) {
+  ccrow = $('result_thead_row');
+  ccheadcell =  ccrow.removeChild($n(ccrow, "result_thead_ccell"));
+  var t = ccheadcell.cloneNode(true);
+  lastheadcell = t;
+  t.appendChild(text(type.opac_label()));
+  ccrow.appendChild(t);
+  resultCCHeaderApplied = true;
+ }
+
+ if(nodes[1]) {
+
+  var x = 1;
+  var d = findOrgDepth(nodes[1]);
+  var d2 = findOrgDepth(nodes[nodes.length -1]);
+
+  for( var i = d; i <= d2 ; i++ ) {
+ 
+   ccell = ccell.cloneNode(true);
+
+   //if((i % 2)) removeCSSClass(ccell, "copy_count_cell_even");
+   //else addCSSClass(ccell, "copy_count_cell_even");
+
+   var node = nodes[x++];
+   var type = findOrgType(node.ou_type());
+ 
+   ccell.id = "copy_count_cell_" + type.depth() + "_" + pagePosition;
+   ccell.title = type.opac_label();
+   countsrow.insertBefore(ccell, lastcell);
+   lastcell = ccell;
+
+   if(ccheadcell) {
+    var t = ccheadcell.cloneNode(true);
+    t.appendChild(text(type.opac_label()));
+    ccrow.insertBefore(t, lastheadcell);
+    lastheadcell = t;
+   }
+  }
+ }
+
+ unHideMe($("search_info_table"));
 }
 
 /* collect copy counts for a record using method 'methodName' */
 function resultCollectCopyCounts(rec, pagePosition, methodName) {
-	if(rec == null || rec.doc_id() == null) return;
+ if(rec == null || rec.doc_id() == null) return;
 
-	var loc = getLasso();
-	if (loc) loc = -loc;
-	else loc= getLocation();
+ var loc = getLasso();
+ if (loc) loc = -loc;
+ else loc= getLocation();
 
-	var req = new Request(methodName, loc, rec.doc_id(), getForm() );
-	req.request.userdata = [ rec, pagePosition ];
-	req.callback(resultHandleCopyCounts);
-	req.send();
+ var req = new Request(methodName, loc, rec.doc_id(), getForm() );
+ req.request.userdata = [ rec, pagePosition ];
+ req.callback(resultHandleCopyCounts);
+ req.send();
 }
 
 function resultHandleCopyCounts(r) {
-	runEvt('result', 'copyCountsReceived', r.userdata[0], r.userdata[1], r.getResultObject()); 
+ runEvt('result', 'copyCountsReceived', r.userdata[0], r.userdata[1], r.getResultObject()); 
 }
 
 
 /* XXX Needs to understand Lasso copy counts... */
 /* display the collected copy counts */
 function resultDisplayCopyCounts(rec, pagePosition, copy_counts) {
-	if(copy_counts == null || rec == null) return;
-
-	if (getLasso()) {
-		var copy_counts_lasso = {
-			transcendant : null,
-			count : 0,
-			unshadow : 0,
-			available : 0,
-			depth : -1,
-			org_unit : getLasso()
-		};
-
-		for (var i in copy_counts) {
-			copy_counts_lasso.transcendant = copy_counts[i].transcendant;
-			copy_counts_lasso.count += parseInt(copy_counts[i].count);
-			copy_counts_lasso.unshadow += parseInt(copy_counts[i].unshadow);
-			copy_counts_lasso.available += parseInt(copy_counts[i].available);
-		}
-
-		copy_counts = [ copy_counts_lasso ];
-	}
-
-	var i = 0;
-	while(copy_counts[i] != null) {
-		var cell = $("copy_count_cell_" + i +"_" + pagePosition);
-		var cts = copy_counts[i];
-		cell.appendChild(text(cts.available + " / " + cts.count));
-
-		if(isXUL()) {
-			/* here we style opac-invisible records for xul */
-
-			if( cts.depth == 0 ) {
-				if(!cts.transcendant && !cts.unshadow) {
-					_debug("found an opac-shadowed record: " + rec.doc_id());
-					var row = cell.parentNode.parentNode.parentNode.parentNode.parentNode; 
-					if( cts.count == 0 ) 
-						addCSSClass( row, 'no_copies' );
-					else 
-						addCSSClass( row, 'shadowed' );
-				}
-			}
-		}
-		i++;
-	}
+ if(copy_counts == null || rec == null) return;
+
+ if (getLasso()) {
+  var copy_counts_lasso = {
+   transcendant : null,
+   count : 0,
+   unshadow : 0,
+   available : 0,
+   depth : -1,
+   org_unit : getLasso()
+  };
+
+  for (var i in copy_counts) {
+   copy_counts_lasso.transcendant = copy_counts[i].transcendant;
+   copy_counts_lasso.count += parseInt(copy_counts[i].count);
+   copy_counts_lasso.unshadow += parseInt(copy_counts[i].unshadow);
+   copy_counts_lasso.available += parseInt(copy_counts[i].available);
+  }
+
+  copy_counts = [ copy_counts_lasso ];
+ }
+
+ var i = 0;
+ while(copy_counts[i] != null) {
+  var cell = $("copy_count_cell_" + i +"_" + pagePosition);
+  var cts = copy_counts[i];
+  cell.appendChild(text(cts.available + " / " + cts.count));
+
+  if(isXUL()) {
+   /* here we style opac-invisible records for xul */
+
+   if( cts.depth == 0 ) {
+    if(!cts.transcendant && !cts.unshadow) {
+     _debug("found an opac-shadowed record: " + rec.doc_id());
+     var row = cell.parentNode.parentNode.parentNode.parentNode.parentNode; 
+     if( cts.count == 0 ) 
+      addCSSClass( row, 'no_copies' );
+     else 
+      addCSSClass( row, 'shadowed' );
+    }
+   }
+  }
+  i++;
+ }
 }
 
 
diff --git a/Open-ILS/web/opac/skin/default/js/rresult.js b/Open-ILS/web/opac/skin/default/js/rresult.js
index d93aa45471..e666cd96a2 100644
--- a/Open-ILS/web/opac/skin/default/js/rresult.js
+++ b/Open-ILS/web/opac/skin/default/js/rresult.js
@@ -16,190 +16,190 @@ hideMe($('copyright_block'));
 
 function rresultDoSearch() {
 
-	swapCanvas($('loading_alt'));
-
-	table = G.ui.result.main_table;
-	hideMe(G.ui.result.row_template);
-	if( table && table.parentNode ) {
-		while( table.parentNode.rows.length <= (getDisplayCount() +1) ) 
-			hideMe(table.appendChild(G.ui.result.row_template.cloneNode(true)));
-	}
-	rresultCollectIds();
+ swapCanvas($('loading_alt'));
+
+ table = G.ui.result.main_table;
+ hideMe(G.ui.result.row_template);
+ if( table && table.parentNode ) {
+  while( table.parentNode.rows.length <= (getDisplayCount() +1) ) 
+   hideMe(table.appendChild(G.ui.result.row_template.cloneNode(true)));
+ }
+ rresultCollectIds();
 }
 
 function rresultCollectIds() {
-	var ids;
-
-	switch(getRtype()) {
-
-		case RTYPE_COOKIE:
-			ids = JSON2js(cookieManager.read(COOKIE_RIDS));
-			_rresultHandleIds( ids, ids.length );
-			break;
-
-		case RTYPE_TITLE:
-		case RTYPE_AUTHOR:
-		case RTYPE_SUBJECT:
-		case RTYPE_SERIES:
-		case RTYPE_KEYWORD:
-			rresultDoRecordSearch();
-			break;
-
-		case RTYPE_MULTI:
-			rresultDoRecordMultiSearch();
-			break;
-			
-		case RTYPE_LIST :
-			rresultHandleList();
-			break;
-
-		case RTYPE_MARC :
-			rresultCollectMARCIds();
-			break;
-
-		case RTYPE_ISBN :
-			rresultCollectISBNIds();
-			break;
-
-		case RTYPE_TCN :
-			rresultCollectTCNIds();
-			break;
-
-		case RTYPE_ISSN :
-			rresultCollectISSNIds();
-			break;
-
-
-		case RTYPE_MRID :
-		case null :
-		case "" :
-		default:
-			var form = rresultGetForm();
-			var args = { format : form, org : getLocation(), depth : rresultGetDepth() };
-
-			var lasso = getLasso();
-			if (lasso) args.org = -lasso;
-
-			var req = new Request(FETCH_RIDS, getMrid(), args);
-			req.callback( rresultHandleRIds );
-			req.send();
-
-			if( rresultGetDepth() != findOrgDepth(globalOrgTree) ) {
-				var link = $('rresult_show_all_link');
-				if(link) {
-					unHideMe($('rresult_show_all'));
-					link.appendChild( text(
-						findOrgType(globalOrgTree.ou_type()).opac_label()));
-				}
-
-			} else {
-				if( rresultGetDepth() != getDepth() ) { /* inside a limited display */
-					var link = $('rresult_show_here_link');
-					if(link) {
-						link.appendChild( text(
-							findOrgType(findOrgUnit(getLocation()).ou_type()).opac_label()));
-						unHideMe($('rresult_show_here'));
-					}
-				}
-			}
-	}
+ var ids;
+
+ switch(getRtype()) {
+
+  case RTYPE_COOKIE:
+   ids = JSON2js(cookieManager.read(COOKIE_RIDS));
+   _rresultHandleIds( ids, ids.length );
+   break;
+
+  case RTYPE_TITLE:
+  case RTYPE_AUTHOR:
+  case RTYPE_SUBJECT:
+  case RTYPE_SERIES:
+  case RTYPE_KEYWORD:
+   rresultDoRecordSearch();
+   break;
+
+  case RTYPE_MULTI:
+   rresultDoRecordMultiSearch();
+   break;
+   
+  case RTYPE_LIST :
+   rresultHandleList();
+   break;
+
+  case RTYPE_MARC :
+   rresultCollectMARCIds();
+   break;
+
+  case RTYPE_ISBN :
+   rresultCollectISBNIds();
+   break;
+
+  case RTYPE_TCN :
+   rresultCollectTCNIds();
+   break;
+
+  case RTYPE_ISSN :
+   rresultCollectISSNIds();
+   break;
+
+
+  case RTYPE_MRID :
+  case null :
+  case "" :
+  default:
+   var form = rresultGetForm();
+   var args = { format : form, org : getLocation(), depth : rresultGetDepth() };
+
+   var lasso = getLasso();
+   if (lasso) args.org = -lasso;
+
+   var req = new Request(FETCH_RIDS, getMrid(), args);
+   req.callback( rresultHandleRIds );
+   req.send();
+
+   if( rresultGetDepth() != findOrgDepth(globalOrgTree) ) {
+    var link = $('rresult_show_all_link');
+    if(link) {
+     unHideMe($('rresult_show_all'));
+     link.appendChild( text(
+      findOrgType(globalOrgTree.ou_type()).opac_label()));
+    }
+
+   } else {
+    if( rresultGetDepth() != getDepth() ) { /* inside a limited display */
+     var link = $('rresult_show_here_link');
+     if(link) {
+      link.appendChild( text(
+       findOrgType(findOrgUnit(getLocation()).ou_type()).opac_label()));
+      unHideMe($('rresult_show_here'));
+     }
+    }
+   }
+ }
 }
 
 function rresultExpandSearch() {
-	var args = {};
-	args[PARAM_RDEPTH] = findOrgDepth(globalOrgTree);
-	goTo(buildOPACLink(args));
+ var args = {};
+ args[PARAM_RDEPTH] = findOrgDepth(globalOrgTree);
+ goTo(buildOPACLink(args));
 }
 
 function rresultContractSearch() {
-	var args = {};
-	RDEPTH = null;
-	args[PARAM_OFFSET] = 0;
-	goTo(buildOPACLink(args));
+ var args = {};
+ RDEPTH = null;
+ args[PARAM_OFFSET] = 0;
+ goTo(buildOPACLink(args));
 }
 
 
 function rresultGetDepth() {
-	if( getRdepth() != null) return getRdepth();
-	return getDepth();
+ if( getRdepth() != null) return getRdepth();
+ return getDepth();
 }
 
 
 function rresultGetForm() {
-	var form;
-
-	if(getTform())  /* did the user select a format from the icon list (temporary) */
-		form = (getTform() == 'all') ? null : getTform();
-	else  /* did the use select a format from simple search dropdown */
-		form = (getForm() == 'all') ? null : getForm();
-
-	if(!form) { /* did the user select a format from the advanced search */
-		form = getItemType();
-		var f = getItemForm();
-
-		if(form) {
-			form = form.replace(/,/,'');
-			if(f) form += '-' + f;
-		} else {
-			if(f) form = '-' + f;
-		}
-	}
-
-	return form;
+ var form;
+
+ if(getTform())  /* did the user select a format from the icon list (temporary) */
+  form = (getTform() == 'all') ? null : getTform();
+ else  /* did the use select a format from simple search dropdown */
+  form = (getForm() == 'all') ? null : getForm();
+
+ if(!form) { /* did the user select a format from the advanced search */
+  form = getItemType();
+  var f = getItemForm();
+
+  if(form) {
+   form = form.replace(/,/,'');
+   if(f) form += '-' + f;
+  } else {
+   if(f) form = '-' + f;
+  }
+ }
+
+ return form;
 }
 
 
 function rresultCollectMARCIds() {
 
-	var args			= {};
-	args.searches	= JSON2js(getSearches());
-	args.limit		= 200;
-	args.org_unit	= globalOrgTree.id();
-	args.depth		= 0;
-
-	rresultIsPaged = true;
-	var req = new Request(FETCH_ADV_MARC_MRIDS, args, getDisplayCount(), getOffset());
-	req.callback(rresultHandleRIds);
-	req.request.noretry = true;
-	req.send();
+ var args   = {};
+ args.searches = JSON2js(getSearches());
+ args.limit  = 200;
+ args.org_unit = globalOrgTree.id();
+ args.depth  = 0;
+
+ rresultIsPaged = true;
+ var req = new Request(FETCH_ADV_MARC_MRIDS, args, getDisplayCount(), getOffset());
+ req.callback(rresultHandleRIds);
+ req.request.noretry = true;
+ req.send();
 }
 
 
 function rresultCollectISBNIds() {
-	var req = new Request(FETCH_ADV_ISBN_RIDS, getAdvTerm() );
-	req.callback(
-		function(r) {
-			var blob = r.getResultObject();
-			_rresultHandleIds(blob.ids, blob.count);
-		}
-	);
-	req.send();
+ var req = new Request(FETCH_ADV_ISBN_RIDS, getAdvTerm() );
+ req.callback(
+  function(r) {
+   var blob = r.getResultObject();
+   _rresultHandleIds(blob.ids, blob.count);
+  }
+ );
+ req.send();
 }
 
 function rresultCollectTCNIds() {
-	var req = new Request(FETCH_ADV_TCN_RIDS, getAdvTerm() );
-	req.callback(
-		function(r) {
-			var blob = r.getResultObject();
-			_rresultHandleIds(blob.ids, blob.count);
-		}
-	);
-	req.send();
+ var req = new Request(FETCH_ADV_TCN_RIDS, getAdvTerm() );
+ req.callback(
+  function(r) {
+   var blob = r.getResultObject();
+   _rresultHandleIds(blob.ids, blob.count);
+  }
+ );
+ req.send();
 }
 
 function rresultCollectISSNIds() {
-	var req = new Request(FETCH_ADV_ISSN_RIDS, getAdvTerm() );
-	req.callback(
-		function(r) {
-			var blob = r.getResultObject();
-			_rresultHandleIds(blob.ids, blob.count);
-		}
-	);
-	req.send();
+ var req = new Request(FETCH_ADV_ISSN_RIDS, getAdvTerm() );
+ req.callback(
+  function(r) {
+   var blob = r.getResultObject();
+   _rresultHandleIds(blob.ids, blob.count);
+  }
+ );
+ req.send();
 }
 
 function rresultHandleList() {
-	var ids = new CGI().param(PARAM_RLIST);
+ var ids = new CGI().param(PARAM_RLIST);
     var count;
     if(!dojo.isArray(ids)) {
         count = 1;
@@ -207,116 +207,116 @@ function rresultHandleList() {
     } else {
         count = ids.length;
     }
-	if(ids) _rresultHandleIds(ids, count);
+ if(ids) _rresultHandleIds(ids, count);
 }
 
 var rresultTries = 0;
 function rresultHandleRIds(r) {
-	var res = r.getResultObject();
+ var res = r.getResultObject();
 
-	if(!res) res = {count:0,ids:[]};
+ if(!res) res = {count:0,ids:[]};
 
-	if( res.count == 0 && rresultTries == 0 && ! r.noretry) {
+ if( res.count == 0 && rresultTries == 0 && ! r.noretry) {
 
-		rresultTries++;
-		var form = rresultGetForm();
-		var args = { format : form, org : getLocation(), depth : findOrgDepth(globalOrgTree) };
+  rresultTries++;
+  var form = rresultGetForm();
+  var args = { format : form, org : getLocation(), depth : findOrgDepth(globalOrgTree) };
 
-		var lasso = getLasso();
-		if (lasso) args.org = -lasso;
+  var lasso = getLasso();
+  if (lasso) args.org = -lasso;
 
-		var req = new Request(FETCH_RIDS, getMrid(), args );
-		req.callback( rresultHandleRIds );
-		req.send();
-		unHideMe($('no_formats'));
-		hideMe($('rresult_show_all'));
+  var req = new Request(FETCH_RIDS, getMrid(), args );
+  req.callback( rresultHandleRIds );
+  req.send();
+  unHideMe($('no_formats'));
+  hideMe($('rresult_show_all'));
 
-	} else {
+ } else {
 
-		_rresultHandleIds(res.ids, res.count);
-	}
+  _rresultHandleIds(res.ids, res.count);
+ }
 }
 
 function _rresultHandleIds(ids, count) {
-	//var json = js2JSON({ids:ids,count:count});
-	/*
-	cookieManager.write(COOKIE_SRIDS, json, '+1d');
-	*/
-
-	HITCOUNT = parseInt(count);
-	runEvt('result', 'hitCountReceived');
-	runEvt('result', 'idsReceived', ids, getOffset());
+ //var json = js2JSON({ids:ids,count:count});
+ /*
+ cookieManager.write(COOKIE_SRIDS, json, '+1d');
+ */
+
+ HITCOUNT = parseInt(count);
+ runEvt('result', 'hitCountReceived');
+ runEvt('result', 'idsReceived', ids, getOffset());
 }
 
 /*
 function rresultCollectRecords(ids) {
-	runEvt("result", "preCollectRecords");
-	var x = 0;
-	for( var i = getOffset(); i!= getDisplayCount() + getOffset(); i++ ) {
-		if(ids[i] == null) break;
-		var req = new Request(FETCH_RMODS, parseInt(ids[i]));
-		req.callback(rresultHandleMods);
-		req.request.userdata = x++;
-		req.send();
-	}
+ runEvt("result", "preCollectRecords");
+ var x = 0;
+ for( var i = getOffset(); i!= getDisplayCount() + getOffset(); i++ ) {
+  if(ids[i] == null) break;
+  var req = new Request(FETCH_RMODS, parseInt(ids[i]));
+  req.callback(rresultHandleMods);
+  req.request.userdata = x++;
+  req.send();
+ }
 }
 */
 
 
 function rresultCollectRecords(ids, base) {
-	runEvt("result", "preCollectRecords");
-	var x = 0;
-
-	if (!base) base = 0;
-	if( rresultIsPaged )  base = 0;
-
-	for( var i = base; i!= getDisplayCount() + base; i++ ) {
-		if(ids[i] == null) break;
-		var req = new Request(FETCH_RMODS, parseInt(ids[i]));
-		req.callback(rresultHandleMods);
-		req.request.userdata = x++;
-		req.send();
-	}
+ runEvt("result", "preCollectRecords");
+ var x = 0;
+
+ if (!base) base = 0;
+ if( rresultIsPaged )  base = 0;
+
+ for( var i = base; i!= getDisplayCount() + base; i++ ) {
+  if(ids[i] == null) break;
+  var req = new Request(FETCH_RMODS, parseInt(ids[i]));
+  req.callback(rresultHandleMods);
+  req.request.userdata = x++;
+  req.send();
+ }
 }
 
 
 function rresultHandleMods(r) {
-	var rec = r.getResultObject();
-	runEvt('result', 'recordReceived', rec, r.userdata, false);
-	resultCollectCopyCounts(rec, r.userdata, FETCH_R_COPY_COUNTS);
-	if(resultPageIsDone()) {
-		runEvt('result', 'allRecordsReceived', recordsCache);
-		unHideMe($('copyright_block')); 
-	}
+ var rec = r.getResultObject();
+ runEvt('result', 'recordReceived', rec, r.userdata, false);
+ resultCollectCopyCounts(rec, r.userdata, FETCH_R_COPY_COUNTS);
+ if(resultPageIsDone()) {
+  runEvt('result', 'allRecordsReceived', recordsCache);
+  unHideMe($('copyright_block')); 
+ }
 }
 
 function rresultLaunchDrawn(id, node) {
-	runEvt("rresult", "recordDrawn", id, node);
+ runEvt("rresult", "recordDrawn", id, node);
 }
 
 
 function rresultDoRecordSearch() { 
-	rresultIsPaged = true;
-	resultCollectSearchIds(true, SEARCH_RS_QUERY, rresultFilterSearchResults ); 
+ rresultIsPaged = true;
+ resultCollectSearchIds(true, SEARCH_RS_QUERY, rresultFilterSearchResults ); 
 }
 
 function rresultDoRecordMultiSearch() { 
-	rresultIsPaged = true;
-	resultCollectSearchIds(false, SEARCH_RS_QUERY, rresultFilterSearchResults ); 
+ rresultIsPaged = true;
+ resultCollectSearchIds(false, SEARCH_RS_QUERY, rresultFilterSearchResults ); 
 }
 
 
 function rresultFilterSearchResults(r) {
-	var result = r.getResultObject();
-	var ids = [];
-	if( result.count > 0 ) {
-		for( var i = 0; i != result.ids.length; i++ ) 
-			ids.push(result.ids[i][0]);
-	}
+ var result = r.getResultObject();
+ var ids = [];
+ if( result.count > 0 ) {
+  for( var i = 0; i != result.ids.length; i++ ) 
+   ids.push(result.ids[i][0]);
+ }
 
     resultCompiledSearch = result.compiled_search;
     cookieManager.write(COOKIE_SEARCH, js2JSON(result.compiled_search), -1);
-	_rresultHandleIds( ids, result.count );
+ _rresultHandleIds( ids, result.count );
 }
 
 
diff --git a/Open-ILS/web/opac/skin/default/js/search_bar.js b/Open-ILS/web/opac/skin/default/js/search_bar.js
index 37dc49eaf6..0b83d0cb60 100644
--- a/Open-ILS/web/opac/skin/default/js/search_bar.js
+++ b/Open-ILS/web/opac/skin/default/js/search_bar.js
@@ -9,37 +9,37 @@ var isFrontPage = false;
 G.evt.common.init.push(searchBarInit);
 
 /* if set by the org selector, this will be the location used the
-	next time the search is submitted */
+ next time the search is submitted */
 var newSearchLocation; 
 var newSearchDepth = null;
 
 
 function searchBarInit() {
 
-	_ts = G.ui.searchbar.type_selector;
-	_fs = G.ui.searchbar.form_selector;
+ _ts = G.ui.searchbar.type_selector;
+ _fs = G.ui.searchbar.form_selector;
 
-	try{G.ui.searchbar.text.focus();}catch(e){}
-	G.ui.searchbar.text.onkeydown = 
-		function(evt) {if(userPressedEnter(evt)) { searchBarSubmit(); } };
-	_ts.onkeydown = 
-		function(evt) {if(userPressedEnter(evt)) { searchBarSubmit(); } };
-	_fs.onkeydown = 
-		function(evt) {if(userPressedEnter(evt)) { searchBarSubmit(); } };
+ try{G.ui.searchbar.text.focus();}catch(e){}
+ G.ui.searchbar.text.onkeydown = 
+  function(evt) {if(userPressedEnter(evt)) { searchBarSubmit(); } };
+ _ts.onkeydown = 
+  function(evt) {if(userPressedEnter(evt)) { searchBarSubmit(); } };
+ _fs.onkeydown = 
+  function(evt) {if(userPressedEnter(evt)) { searchBarSubmit(); } };
 
-	G.ui.searchbar.submit.onclick = searchBarSubmit;
+ G.ui.searchbar.submit.onclick = searchBarSubmit;
 
-	/* set up the selector objects, etc */
-	G.ui.searchbar.text.value = (getTerm() != null) ? getTerm() : "";
-	setSelector(_ts,	getStype());
-	setSelector(_fs,	getForm());
+ /* set up the selector objects, etc */
+ G.ui.searchbar.text.value = (getTerm() != null) ? getTerm() : "";
+ setSelector(_ts, getStype());
+ setSelector(_fs, getForm());
 
-	depthSelInit();
+ depthSelInit();
 
 
-	if(!isFrontPage && (findCurrentPage() != MYOPAC)) {
-		attachEvt('common','depthChanged', searchBarSubmit);
-	}
+ if(!isFrontPage && (findCurrentPage() != MYOPAC)) {
+  attachEvt('common','depthChanged', searchBarSubmit);
+ }
 
     if( (limit = $('opac.result.limit2avail')) ) {
         if(getAvail()) limit.checked = true;
@@ -50,29 +50,29 @@ function searchBarInit() {
 
 function searchBarSubmit(isFilterSort) {
 
-	var text = G.ui.searchbar.text.value;
+ var text = G.ui.searchbar.text.value;
 
-	clearSearchParams();
+ clearSearchParams();
 
-	if(!text || text == "") return;
+ if(!text || text == "") return;
 
-	var d	= (newSearchDepth != null) ?  newSearchDepth : depthSelGetDepth();
-	if(isNaN(d)) d = 0;
+ var d = (newSearchDepth != null) ?  newSearchDepth : depthSelGetDepth();
+ if(isNaN(d)) d = 0;
 
-	var args = {};
+ var args = {};
 
-	if(SHOW_MR_DEFAULT || (isFilterSort && findCurrentPage() == MRESULT)) {
-		args.page				= MRESULT;
-	} else {
-		args.page				= RRESULT;
-		args[PARAM_RTYPE]		= _ts.options[_ts.selectedIndex].value;
-	}
+ if(SHOW_MR_DEFAULT || (isFilterSort && findCurrentPage() == MRESULT)) {
+  args.page    = MRESULT;
+ } else {
+  args.page    = RRESULT;
+  args[PARAM_RTYPE]  = _ts.options[_ts.selectedIndex].value;
+ }
 
-	args[PARAM_STYPE]		= _ts.options[_ts.selectedIndex].value;
-	args[PARAM_TERM]		= text;
-	args[PARAM_LOCATION] = depthSelGetNewLoc();
-	args[PARAM_DEPTH]		= d;
-	args[PARAM_FORM]		= _fs.options[_fs.selectedIndex].value;
+ args[PARAM_STYPE]  = _ts.options[_ts.selectedIndex].value;
+ args[PARAM_TERM]  = text;
+ args[PARAM_LOCATION] = depthSelGetNewLoc();
+ args[PARAM_DEPTH]  = d;
+ args[PARAM_FORM]  = _fs.options[_fs.selectedIndex].value;
 
     if($('opac.result.limit2avail')) {
         args[PARAM_AVAIL] = ($('opac.result.limit2avail').checked) ? 1 : '';
@@ -82,7 +82,7 @@ function searchBarSubmit(isFilterSort) {
         }
     }
 
-	goTo(buildOPACLink(args));
+ goTo(buildOPACLink(args));
 }
 
 
diff --git a/Open-ILS/web/opac/skin/default/js/sidebar.js b/Open-ILS/web/opac/skin/default/js/sidebar.js
index 45296e41be..bd8cf348b1 100644
--- a/Open-ILS/web/opac/skin/default/js/sidebar.js
+++ b/Open-ILS/web/opac/skin/default/js/sidebar.js
@@ -1,5 +1,5 @@
 /* set up the colors in the sidebar 
-	Disables/Enables certain components based on various state data */
+ Disables/Enables certain components based on various state data */
 
 attachEvt("common", "init", initSideBar);
 attachEvt("common", "init", setSidebarLinks);
@@ -7,56 +7,56 @@ attachEvt("common", "init", setSidebarLinks);
 attachEvt("common", "unload", sidebarTreesFree );
 
 function prevRResults() {
-	return buildOPACLink({ page : RRESULT });
+ return buildOPACLink({ page : RRESULT });
 }
 
 function prevMResults() {
-	return buildOPACLink({ page : MRESULT });
+ return buildOPACLink({ page : MRESULT });
 }
 
 function initSideBar() {
-	var page = findCurrentPage();
+ var page = findCurrentPage();
 
-	if( page == MRESULT ) 
-		unHideMe($("sidebar_results_wrapper"));
+ if( page == MRESULT ) 
+  unHideMe($("sidebar_results_wrapper"));
 
-	if( page == RRESULT ) {
-		unHideMe($("sidebar_results_wrapper"));
-		unHideMe(G.ui.sidebar[MRESULT]);
-		if( getRtype() == RTYPE_MRID )
-			$("sidebar_title_group_results").setAttribute("href", prevMResults());
-		else hideMe($("sidebar_title_group_results").parentNode);
-	}
+ if( page == RRESULT ) {
+  unHideMe($("sidebar_results_wrapper"));
+  unHideMe(G.ui.sidebar[MRESULT]);
+  if( getRtype() == RTYPE_MRID )
+   $("sidebar_title_group_results").setAttribute("href", prevMResults());
+  else hideMe($("sidebar_title_group_results").parentNode);
+ }
 
-	if( page == RDETAIL ) {
-		unHideMe($("sidebar_results_wrapper"));
+ if( page == RDETAIL ) {
+  unHideMe($("sidebar_results_wrapper"));
 
 
-		unHideMe(G.ui.sidebar[MRESULT]);
-		if(getRtype())
-			$("sidebar_title_results").setAttribute("href", prevRResults());
-		unHideMe(G.ui.sidebar[RRESULT]);
+  unHideMe(G.ui.sidebar[MRESULT]);
+  if(getRtype())
+   $("sidebar_title_results").setAttribute("href", prevRResults());
+  unHideMe(G.ui.sidebar[RRESULT]);
 
-		if( getRtype() == RTYPE_MRID )
-			$("sidebar_title_group_results").setAttribute("href", prevMResults());
-		else hideMe($("sidebar_title_group_results").parentNode);
-	}
+  if( getRtype() == RTYPE_MRID )
+   $("sidebar_title_group_results").setAttribute("href", prevMResults());
+  else hideMe($("sidebar_title_group_results").parentNode);
+ }
 
-	unHideMe(G.ui.sidebar[page]);
-	addCSSClass(G.ui.sidebar[page], "sidebar_item_active");
+ unHideMe(G.ui.sidebar[page]);
+ addCSSClass(G.ui.sidebar[page], "sidebar_item_active");
 
-	/* if we're logged in, show it and replace the Login link with the Logout link */
-	if(grabUser()) {
-		G.ui.sidebar.username_dest.appendChild(text(G.user.usrname()));
-		unHideMe(G.ui.sidebar.logoutbox);
-		unHideMe(G.ui.sidebar.logged_in_as);
-		hideMe(G.ui.sidebar.loginbox);
-	}
+ /* if we're logged in, show it and replace the Login link with the Logout link */
+ if(grabUser()) {
+  G.ui.sidebar.username_dest.appendChild(text(G.user.usrname()));
+  unHideMe(G.ui.sidebar.logoutbox);
+  unHideMe(G.ui.sidebar.logged_in_as);
+  hideMe(G.ui.sidebar.loginbox);
+ }
 
-	if(G.ui.sidebar.login) G.ui.sidebar.login.onclick = initLogin;
-	if(G.ui.sidebar.logout) G.ui.sidebar.logout.onclick = doLogout; 
+ if(G.ui.sidebar.login) G.ui.sidebar.login.onclick = initLogin;
+ if(G.ui.sidebar.logout) G.ui.sidebar.logout.onclick = doLogout; 
 
-	if(isXUL()) hideMe( G.ui.sidebar.logoutbox );
+ if(isXUL()) hideMe( G.ui.sidebar.logoutbox );
 }
 
 /* sets up the login ui components */
@@ -64,61 +64,61 @@ var loginBoxVisible = false;
 
 function loginDance() {
 
-	if(doLogin(true)) {
+ if(doLogin(true)) {
 
-		if(!strongPassword( G.ui.login.password.value ) ) {
+  if(!strongPassword( G.ui.login.password.value ) ) {
 
-			cookieManager.write(COOKIE_SES, "");
-			hideMe($('login_table'));
-			unHideMe($('change_pw_table'));
-			$('change_pw_current').focus();
-			$('change_pw_button').onclick = changePassword;
-			setEnterFunc($('change_pw_2'), changePassword);
+   cookieManager.write(COOKIE_SES, "");
+   hideMe($('login_table'));
+   unHideMe($('change_pw_table'));
+   $('change_pw_current').focus();
+   $('change_pw_button').onclick = changePassword;
+   setEnterFunc($('change_pw_2'), changePassword);
 
-		} else {
-			loggedInOK();
-		}
-	}
+  } else {
+   loggedInOK();
+  }
+ }
 }
 
 function loggedInOK() {
-	showCanvas();
-	G.ui.sidebar.username_dest.appendChild(text(G.user.usrname()));
-	unHideMe(G.ui.sidebar.logoutbox);
-	unHideMe(G.ui.sidebar.logged_in_as);
-	hideMe(G.ui.sidebar.loginbox);
-	runEvt( 'common', 'loggedIn');
-	
-	var org = G.user.prefs[PREF_DEF_LOCATION];
-	if(!org) org = G.user.home_ou();
-
-	var depth = G.user.prefs[PREF_DEF_DEPTH];
-	if(! ( depth && depth <= findOrgDepth(org)) ) 
-		depth = findOrgDepth(org);
-
-	runEvt( "common", "locationChanged", org, depth);
+ showCanvas();
+ G.ui.sidebar.username_dest.appendChild(text(G.user.usrname()));
+ unHideMe(G.ui.sidebar.logoutbox);
+ unHideMe(G.ui.sidebar.logged_in_as);
+ hideMe(G.ui.sidebar.loginbox);
+ runEvt( 'common', 'loggedIn');
+ 
+ var org = G.user.prefs[PREF_DEF_LOCATION];
+ if(!org) org = G.user.home_ou();
+
+ var depth = G.user.prefs[PREF_DEF_DEPTH];
+ if(! ( depth && depth <= findOrgDepth(org)) ) 
+  depth = findOrgDepth(org);
+
+ runEvt( "common", "locationChanged", org, depth);
 }
 
 
 function changePassword() {
 
-	var pc = $('change_pw_current').value;
-	var p1 = $('change_pw_1').value;
-	var p2 = $('change_pw_2').value;
+ var pc = $('change_pw_current').value;
+ var p1 = $('change_pw_1').value;
+ var p2 = $('change_pw_2').value;
 
-	if( p1 != p2 ) {
-		alert($('pw_no_match').innerHTML);
-		return;
-	}
+ if( p1 != p2 ) {
+  alert($('pw_no_match').innerHTML);
+  return;
+ }
 
-	if(!strongPassword(p2, true) ) return;
+ if(!strongPassword(p2, true) ) return;
 
-	var req = new Request(UPDATE_PASSWORD, G.user.session, p2, pc );
-	req.send(true);
-	if(req.result()) {
-		alert($('pw_update_successful').innerHTML);
-		loggedInOK();
-	}
+ var req = new Request(UPDATE_PASSWORD, G.user.session, p2, pc );
+ req.send(true);
+ if(req.result()) {
+  alert($('pw_update_successful').innerHTML);
+  loggedInOK();
+ }
 }
 
 var pwRegexSetting;
@@ -132,7 +132,7 @@ function strongPassword(pass, alrt) {
                 return true;
             } else {
                 if(alrt)
-	               alert($('pw_not_strong').innerHTML);
+                alert($('pw_not_strong').innerHTML);
                 return false;
             }
         }
@@ -140,55 +140,55 @@ function strongPassword(pass, alrt) {
 
     /* no regex configured, use the default */
 
-	var good = false;
+ var good = false;
 
-	do {
+ do {
 
-		if(pass.length < 7) break;
-		if(!pass.match(/.*\d+.*/)) break;
-		if(!pass.match(/.*[A-Za-z]+.*/)) break;
-		good = true;
+  if(pass.length < 7) break;
+  if(!pass.match(/.*\d+.*/)) break;
+  if(!pass.match(/.*[A-Za-z]+.*/)) break;
+  good = true;
 
-	} while(0);
+ } while(0);
 
-	if(!good && alrt) alert($('pw_not_strong').innerHTML);
-	return good;
+ if(!good && alrt) alert($('pw_not_strong').innerHTML);
+ return good;
 }
 
 function initLogin() {
 
-	G.ui.login.button.onclick = loginDance;
-	G.ui.login.username.onkeydown = 
-		function(evt) {if(userPressedEnter(evt)) loginDance();};
-	G.ui.login.password.onkeydown = 
-		function(evt) {if(userPressedEnter(evt)) loginDance();};
-
-//	if(loginBoxVisible) {
-//		showCanvas();
-//	} else {
-		swapCanvas(G.ui.login.box);
-		try{G.ui.login.username.focus();}catch(e){}
-//	}
-
-//	loginBoxVisible = !loginBoxVisible;
-	G.ui.login.cancel.onclick = showCanvas;
-	if(findCurrentPage() == MYOPAC) 
-		G.ui.login.cancel.onclick = goHome;
+ G.ui.login.button.onclick = loginDance;
+ G.ui.login.username.onkeydown = 
+  function(evt) {if(userPressedEnter(evt)) loginDance();};
+ G.ui.login.password.onkeydown = 
+  function(evt) {if(userPressedEnter(evt)) loginDance();};
+
+// if(loginBoxVisible) {
+//  showCanvas();
+// } else {
+  swapCanvas(G.ui.login.box);
+  try{G.ui.login.username.focus();}catch(e){}
+// }
+
+// loginBoxVisible = !loginBoxVisible;
+ G.ui.login.cancel.onclick = showCanvas;
+ if(findCurrentPage() == MYOPAC) 
+  G.ui.login.cancel.onclick = goHome;
 }
 
 function setSidebarLinks() {
-	G.ui.sidebar.home_link.setAttribute("href", buildOPACLink({page:HOME}));
-	G.ui.sidebar.advanced_link.setAttribute("href", buildOPACLink({page:ADVANCED}));
-	G.ui.sidebar.myopac_link.setAttribute("href", buildOPACLink({page:MYOPAC}, false, true));
+ G.ui.sidebar.home_link.setAttribute("href", buildOPACLink({page:HOME}));
+ G.ui.sidebar.advanced_link.setAttribute("href", buildOPACLink({page:ADVANCED}));
+ G.ui.sidebar.myopac_link.setAttribute("href", buildOPACLink({page:MYOPAC}, false, true));
 }
 
 function sidebarTreesFree() {
-	removeChildren($(subjectSidebarTree.rootid));
-	removeChildren($(authorSidebarTree.rootid));
-	removeChildren($(seriesSidebarTree.rootid));
-	subjectSidebarTree = null;
-	authorSidebarTree = null;
-	seriesSidebarTree = null;
+ removeChildren($(subjectSidebarTree.rootid));
+ removeChildren($(authorSidebarTree.rootid));
+ removeChildren($(seriesSidebarTree.rootid));
+ subjectSidebarTree = null;
+ authorSidebarTree = null;
+ seriesSidebarTree = null;
 }
 
 
@@ -200,26 +200,26 @@ function sidebarTreesFree() {
 attachEvt('common', 'init', buildEGGalLink);
 function buildEGGalLink() {
 
-	/* we're in a lib, nothing to do here */
-	if( getOrigLocation() ) return;
-	if(!$('eg_gal_link')) return;
-
-	//var link = 'http://demo.galib.uga.edu/express?pinesid=';
-	var link = 'http://www.galileo.usg.edu/express?pinesid=';
-	if(grabUser()) {
-		$('eg_gal_link').setAttribute('href', link + G.user.session);
-		return;
-	}
-
-	$('eg_gal_link').setAttribute('href', 'javascript:void(0);');
-	$('eg_gal_link').setAttribute('target', '');
-	$('eg_gal_link').onclick = function() {
-		/* we're not logged in.  go ahead and login */
-		detachAllEvt('common','locationChanged');
-		detachAllEvt('common','loggedIn');
-		attachEvt('common','loggedIn', function() { goTo(link + G.user.session); })
-		initLogin();
-	};
+ /* we're in a lib, nothing to do here */
+ if( getOrigLocation() ) return;
+ if(!$('eg_gal_link')) return;
+
+ //var link = 'http://demo.galib.uga.edu/express?pinesid=';
+ var link = 'http://www.galileo.usg.edu/express?pinesid=';
+ if(grabUser()) {
+  $('eg_gal_link').setAttribute('href', link + G.user.session);
+  return;
+ }
+
+ $('eg_gal_link').setAttribute('href', 'javascript:void(0);');
+ $('eg_gal_link').setAttribute('target', '');
+ $('eg_gal_link').onclick = function() {
+  /* we're not logged in.  go ahead and login */
+  detachAllEvt('common','locationChanged');
+  detachAllEvt('common','loggedIn');
+  attachEvt('common','loggedIn', function() { goTo(link + G.user.session); })
+  initLogin();
+ };
 }
 /* --------------------------------------------------------------------------------- */
 
diff --git a/Open-ILS/web/opac/skin/default/js/sidebar_extras.js b/Open-ILS/web/opac/skin/default/js/sidebar_extras.js
index cb35d886d3..f93dbb960c 100644
--- a/Open-ILS/web/opac/skin/default/js/sidebar_extras.js
+++ b/Open-ILS/web/opac/skin/default/js/sidebar_extras.js
@@ -6,110 +6,110 @@ var authorCache = {};
 var seriesCache = {};
 
 function resultBuildCaches(records) {
-	for( var r in records ) {
-		var rec = records[r];
-		for( var s in rec.subject() ) 
-			subjectCache[s] == null ? subjectCache[s] = 1 : subjectCache[s]++;
-		authorCache[rec.author()] = 1;
-		for( var s in rec.series() ) seriesCache[rec.series()[s]] = 1;
-	}
+ for( var r in records ) {
+  var rec = records[r];
+  for( var s in rec.subject() ) 
+   subjectCache[s] == null ? subjectCache[s] = 1 : subjectCache[s]++;
+  authorCache[rec.author()] = 1;
+  for( var s in rec.series() ) seriesCache[rec.series()[s]] = 1;
+ }
 }
 
 function resultSortSubjects(a, b) { return -(a.count - b.count); } /* sort in reverse */
 function resultDrawSubjects() {
 
-	var subjs = [];
-	for( var s in subjectCache )
-		subjs.push( { sub : s, count : subjectCache[s] } );
-	subjs.sort(resultSortSubjects);
+ var subjs = [];
+ for( var s in subjectCache )
+  subjs.push( { sub : s, count : subjectCache[s] } );
+ subjs.sort(resultSortSubjects);
 
-	var ss = [];
-	for( var s in subjs ) ss.push(subjs[s].sub);
+ var ss = [];
+ for( var s in subjs ) ss.push(subjs[s].sub);
 
-	resultDrawSidebarTrees( 
-		STYPE_SUBJECT, 
-		"subjectSidebarTree", ss, 
-		$("subject_tree_sidebar"), 
-		$("subject_sidebar_tree_div") );
+ resultDrawSidebarTrees( 
+  STYPE_SUBJECT, 
+  "subjectSidebarTree", ss, 
+  $("subject_tree_sidebar"), 
+  $("subject_sidebar_tree_div") );
 }
 
 function resultDrawAuthors() {
-	var auths = new Array();
-	for( var s in authorCache ) auths.push(s);
-
-	resultDrawSidebarTrees( 
-		STYPE_AUTHOR, 
-		"authorSidebarTree", auths.sort(), 
-		$("author_tree_sidebar"), 
-		$("author_sidebar_tree_div") );
+ var auths = new Array();
+ for( var s in authorCache ) auths.push(s);
+
+ resultDrawSidebarTrees( 
+  STYPE_AUTHOR, 
+  "authorSidebarTree", auths.sort(), 
+  $("author_tree_sidebar"), 
+  $("author_sidebar_tree_div") );
 }
 
 function resultDrawSeries() {
-	var sers = new Array();
-	for( var s in seriesCache ) sers.push(s);
-	resultDrawSidebarTrees( 
-		STYPE_SERIES, 
-		"seriesSidebarTree", sers.sort(), 
-		$("series_tree_sidebar"), 
-		$("series_sidebar_tree_div") );
+ var sers = new Array();
+ for( var s in seriesCache ) sers.push(s);
+ resultDrawSidebarTrees( 
+  STYPE_SERIES, 
+  "seriesSidebarTree", sers.sort(), 
+  $("series_tree_sidebar"), 
+  $("series_sidebar_tree_div") );
 }
 
 var IESux = true;
 
 function resultDrawSidebarTrees( stype, treeName, items, wrapperNode, destNode ) {
-	eval("tree = " + treeName);
+ eval("tree = " + treeName);
 
-	var xrefCache = [];
-	var found = false;
-	var x = 0;
-	for( var i in items ) {
+ var xrefCache = [];
+ var found = false;
+ var x = 0;
+ for( var i in items ) {
 
-		if(isNull(items[i])) continue;
+  if(isNull(items[i])) continue;
 
-		/* again, IE is a turd */
-		if(IE) { if(x++ > 5) break; }
-		else { if(x++ > 7) break; }
+  /* again, IE is a turd */
+  if(IE) { if(x++ > 5) break; }
+  else { if(x++ > 7) break; }
 
-		found = true;
+  found = true;
 
-		var item = normalize(truncate(items[i], 65));
-		var args = {};
-		var href = resultQuickLink( items[i], stype );
-		tree.addNode( stype + "_" + items[i], treeName + 'Root', item, href );
+  var item = normalize(truncate(items[i], 65));
+  var args = {};
+  var href = resultQuickLink( items[i], stype );
+  tree.addNode( stype + "_" + items[i], treeName + 'Root', item, href );
 
-//		if( !IE ) resultFireXRefReq(treeName, stype, items[i]);
+//  if( !IE ) resultFireXRefReq(treeName, stype, items[i]);
 
-		var a = {};
-		a.type = stype;
-		a.term = item;
-		xrefCache.push(a);
-	}
+  var a = {};
+  a.type = stype;
+  a.term = item;
+  xrefCache.push(a);
+ }
 
-	if(found) {
-		unHideMe(wrapperNode);
-//		if(IE) resultFireXRefSingle(treeName, xrefCache, stype);
-		/* XXX */ // disabled auth lookups for now
+ if(found) {
+  unHideMe(wrapperNode);
+//  if(IE) resultFireXRefSingle(treeName, xrefCache, stype);
+  /* XXX */ // disabled auth lookups for now
 
-		if( DO_AUTHORITY_LOOKUPS ) {
-			resultFireXRefBatch(treeName, xrefCache, stype);
-		}
-	}
+  if( DO_AUTHORITY_LOOKUPS ) {
+   resultFireXRefBatch(treeName, xrefCache, stype);
+  }
+ }
 }
 
 /* XXX */
 function resultFireXRefBatch(treeName, xrefCache, stype) {
-	var query = [];
-	for( var i = 0; i != xrefCache.length; i++ ) {
-		var topic = xrefCache[i];
-		query.push( [ topic.type, topic.term ] );
-	}
-	var req = new Request(FETCH_CROSSREF_BATCH, query);
-	var tree;
-	eval('tree=' + treeName);
-	req.request._tree = tree;
-	req.request._stype = stype;
-	req.callback(resultRenderXRefTree);
-	req.send();
+ var query = [];
+ for( var i = 0; i != xrefCache.length; i++ ) {
+  var topic = xrefCache[i];
+  query.push( [ topic.type, topic.term ] );
+ }
+ var req = new Request(FETCH_CROSSREF_BATCH, query);
+ var tree;
+ eval('tree=' + treeName);
+ req.request._tree = tree;
+ req.request._stype = stype;
+ req.callback(resultRenderXRefTree);
+ req.send();
 }
 
 var xrefCacheIndex = {};
@@ -118,101 +118,101 @@ xrefCacheIndex['author'] = 0;
 xrefCacheIndex['series'] = 0;
 
 function resultHandleXRefResponse(r) {
-	resultFireXRefSingle( r._treename, r._cache, r._stype );
-	resultAppendCrossRef(r);
+ resultFireXRefSingle( r._treename, r._cache, r._stype );
+ resultAppendCrossRef(r);
 }
 
 
 function resultFireXRefSingle( treeName, xrefCache, stype ) {
-	var i = xrefCacheIndex[stype]++;
-	if(xrefCache[i] == null) return;
-	var item = xrefCache[i].term;
-	var tree;
-	eval('tree=' + treeName);
-	var req = new Request(FETCH_CROSSREF, stype, item);
-	req.request._tree = tree;
-	req.request._item = item;
-	req.request._stype = stype;
-	req.request._cache = xrefCache;
-	req.request._treename = treeName;
-	req.callback(resultHandleXRefResponse);
-	req.send();
+ var i = xrefCacheIndex[stype]++;
+ if(xrefCache[i] == null) return;
+ var item = xrefCache[i].term;
+ var tree;
+ eval('tree=' + treeName);
+ var req = new Request(FETCH_CROSSREF, stype, item);
+ req.request._tree = tree;
+ req.request._item = item;
+ req.request._stype = stype;
+ req.request._cache = xrefCache;
+ req.request._treename = treeName;
+ req.callback(resultHandleXRefResponse);
+ req.send();
 }
 
 function resultFireXRefReq( treeName, stype, item ) {
-	var tree;
-	eval('tree=' + treeName);
-	var req = new Request(FETCH_CROSSREF, stype, item);
-	req.request._tree = tree;
-	req.request._item = item;
-	req.request._stype = stype;
-	req.callback(resultAppendCrossRef);
-	req.send();
+ var tree;
+ eval('tree=' + treeName);
+ var req = new Request(FETCH_CROSSREF, stype, item);
+ req.request._tree = tree;
+ req.request._item = item;
+ req.request._stype = stype;
+ req.callback(resultAppendCrossRef);
+ req.send();
 }
 
 
 function resultQuickLink( term, type ) {
-	var args = {};
-	if(SHOW_MR_DEFAULT) {
-		args.page = MRESULT;
-	} else {
-		args.page = RRESULT;
-		args[PARAM_RTYPE] = type;
-	}
-	args[PARAM_OFFSET] = 0;
-	args[PARAM_TERM] = term;
-	args[PARAM_STYPE] = type;
-	return buildOPACLink(args);
+ var args = {};
+ if(SHOW_MR_DEFAULT) {
+  args.page = MRESULT;
+ } else {
+  args.page = RRESULT;
+  args[PARAM_RTYPE] = type;
+ }
+ args[PARAM_OFFSET] = 0;
+ args[PARAM_TERM] = term;
+ args[PARAM_STYPE] = type;
+ return buildOPACLink(args);
 }
 
 /* XXX */
 function resultRenderXRefTree(r) {
-	var tree = r._tree;
-	var res = r.getResultObject();
-	var stype = r._stype;
-
-	for( var c in res ) {
-		var cls = res[c];
-		for( var t in cls ) {
-			var term = res[c][t];
-			var froms = term['from'];
-			var alsos = term['also'];
-			var total = 0;
-
-			for( var i = 0; (total++ < 5 && i < froms.length); i++ ) {
-				var string = normalize(truncate(froms[i], 45));
-				if($(stype + '_' + froms[i])) continue;
-				tree.addNode(stype + '_' + froms[i], 
-					stype + '_' + t, string, resultQuickLink(froms[i],stype));
-			}
-			for( var i = 0; (total++ < 10 && i < alsos.length); i++ ) {
-				var string = normalize(truncate(alsos[i], 45));
-				if($(stype + '_' + alsos[i])) continue;
-				tree.addNode(stype + '_' + alsos[i], 
-					stype + '_' + t, string, resultQuickLink(alsos[i],stype));
-			}
-		}
-	}
+ var tree = r._tree;
+ var res = r.getResultObject();
+ var stype = r._stype;
+
+ for( var c in res ) {
+  var cls = res[c];
+  for( var t in cls ) {
+   var term = res[c][t];
+   var froms = term['from'];
+   var alsos = term['also'];
+   var total = 0;
+
+   for( var i = 0; (total++ < 5 && i < froms.length); i++ ) {
+    var string = normalize(truncate(froms[i], 45));
+    if($(stype + '_' + froms[i])) continue;
+    tree.addNode(stype + '_' + froms[i], 
+     stype + '_' + t, string, resultQuickLink(froms[i],stype));
+   }
+   for( var i = 0; (total++ < 10 && i < alsos.length); i++ ) {
+    var string = normalize(truncate(alsos[i], 45));
+    if($(stype + '_' + alsos[i])) continue;
+    tree.addNode(stype + '_' + alsos[i], 
+     stype + '_' + t, string, resultQuickLink(alsos[i],stype));
+   }
+  }
+ }
 }
 
 
 /* Addes the see-from/see-also entries for this subject item */
 function resultAppendCrossRef(r) {
-	var tree		= r._tree
-	var item		= r._item
-	var stype	= r._stype;
-	var result	= r.getResultObject();
-	if(!result) return;
-	var froms	= result['from'];
-	var alsos	= result['also'];
+ var tree  = r._tree
+ var item  = r._item
+ var stype = r._stype;
+ var result = r.getResultObject();
+ if(!result) return;
+ var froms = result['from'];
+ var alsos = result['also'];
 
-	var total = 0;
+ var total = 0;
 
-	for( var i = 0; (total++ < 5 && i < froms.length); i++ ) 
-		resultAddXRefItem( tree, item, stype, froms, i );
+ for( var i = 0; (total++ < 5 && i < froms.length); i++ ) 
+  resultAddXRefItem( tree, item, stype, froms, i );
 
-	for( var i = 0; (total++ < 10 && i < alsos.length); i++ ) 
-		resultAddXRefItem( tree, item, stype, alsos, i );
+ for( var i = 0; (total++ < 10 && i < alsos.length); i++ ) 
+  resultAddXRefItem( tree, item, stype, alsos, i );
 }
 
 /**
@@ -221,19 +221,19 @@ function resultAppendCrossRef(r) {
 var collectedStrings = [];
 function resultAddXRefItem(tree, rootItem, stype, arr, idx) {
 
-	var string = normalize(truncate(arr[idx], 45));
+ var string = normalize(truncate(arr[idx], 45));
 
-	if( string == rootItem ) return;
+ if( string == rootItem ) return;
 
-	if( grep( collectedStrings, 
-		function(a) { return (a == string); }) ) return;
+ if( grep( collectedStrings, 
+  function(a) { return (a == string); }) ) return;
 
-	if($(stype + '_' + arr[idx])) return;
+ if($(stype + '_' + arr[idx])) return;
 
-	tree.addNode(stype + '_' + arr[idx], 
-		stype + '_' + rootItem, string, resultQuickLink(arr[idx],stype));
+ tree.addNode(stype + '_' + arr[idx], 
+  stype + '_' + rootItem, string, resultQuickLink(arr[idx],stype));
 
-	collectedStrings.push(string);
+ collectedStrings.push(string);
 }
 
 
diff --git a/Open-ILS/web/opac/skin/default/js/tips.js b/Open-ILS/web/opac/skin/default/js/tips.js
index b24985b326..a4573b88b8 100644
--- a/Open-ILS/web/opac/skin/default/js/tips.js
+++ b/Open-ILS/web/opac/skin/default/js/tips.js
@@ -2,18 +2,18 @@ attachEvt('result', 'allRecordsReceived', insertTip);
 
 /*
 var user_tips = [
-	'Click on a folder icon in the sidebar to access related quick searches',
-	"If you don't find what you want try expanding your search using the range selector at the right of the search bar"
+ 'Click on a folder icon in the sidebar to access related quick searches',
+ "If you don't find what you want try expanding your search using the range selector at the right of the search bar"
 ];
 */
 
 function insertTip () {
-	var tip_div = document.getElementById('tips');
-	if (tip_div) {
-		var tips = tip_div.getElementsByTagName('div')[0].getElementsByTagName('span');
-		var index = Math.floor(Math.random() * tips.length);
-		tip_div.appendChild( tips[index] );
-		removeCSSClass(tip_div, 'hide_me');
-	}
+ var tip_div = document.getElementById('tips');
+ if (tip_div) {
+  var tips = tip_div.getElementsByTagName('div')[0].getElementsByTagName('span');
+  var index = Math.floor(Math.random() * tips.length);
+  tip_div.appendChild( tips[index] );
+  removeCSSClass(tip_div, 'hide_me');
+ }
 }
 
diff --git a/Open-ILS/web/opac/theme/craftsman/css/colors.css b/Open-ILS/web/opac/theme/craftsman/css/colors.css
index 7209c9458c..aa5f1c08e9 100644
--- a/Open-ILS/web/opac/theme/craftsman/css/colors.css
+++ b/Open-ILS/web/opac/theme/craftsman/css/colors.css
@@ -1,6 +1,6 @@
-body a			{ color: black; text-decoration: none;}
+body a   { color: black; text-decoration: none;}
 body a:visited { color: black; text-decoration: none;}
-body a:hover	{ color: red; text-decoration: underline;}
+body a:hover { color: red; text-decoration: underline;}
 
 
 /* the idea is to have 4 complimentary colors that 
@@ -43,10 +43,10 @@ a:focus { background: #E0F0E0; color: #000000;}
 
 .canvas { /* main content div for each page */
     /*
-	border-left: 3px solid #A7EA9D;
+ border-left: 3px solid #A7EA9D;
     border-bottom: 3px solid #A7EA9D;
-	border-top: 3px solid #A7EA9D;
-	*/
+ border-top: 3px solid #A7EA9D;
+ */
 }
 
 /* border around home search box */
@@ -86,7 +86,7 @@ a:focus { background: #E0F0E0; color: #000000;}
 .result_table_subtable { border-top: 1px solid #E0E0E0; }
 
 .copy_count_cell { border-right: 1px solid #E0E0E0; } 
-.copy_count_div {	border-left: 2px solid #E0F6E0; border-right: 2px solid #E0F6E0; }
+.copy_count_div { border-left: 2px solid #E0F6E0; border-right: 2px solid #E0F6E0; }
 
 #rdetail_image_cell { }
 
diff --git a/Open-ILS/web/opac/theme/default/css/colors.css b/Open-ILS/web/opac/theme/default/css/colors.css
index fe250477bd..ba0b7c5adb 100644
--- a/Open-ILS/web/opac/theme/default/css/colors.css
+++ b/Open-ILS/web/opac/theme/default/css/colors.css
@@ -1,6 +1,6 @@
-body a			{ color: black; text-decoration: none;}
+body a   { color: black; text-decoration: none;}
 body a:visited { color: black; text-decoration: none;}
-body a:hover	{ color: red; text-decoration: underline;}
+body a:hover { color: red; text-decoration: underline;}
 
 
 /* the idea is to have 4 complimentary colors that 
@@ -44,7 +44,7 @@ a:focus { background: #E0F0E0; color: #000000;}
 .canvas { /* main content div for each page */
     border-left: 3px solid #A7EA9D;
     border-bottom: 3px solid #A7EA9D;
-	border-top: 3px solid #A7EA9D;
+ border-top: 3px solid #A7EA9D;
 }
 
 /* border around home search box */
@@ -84,7 +84,7 @@ a:focus { background: #E0F0E0; color: #000000;}
 .result_table_subtable { border-top: 1px solid #E0E0E0; }
 
 .copy_count_cell { border-right: 1px solid #E0E0E0; } 
-.copy_count_div {	border-left: 2px solid #E0F6E0; border-right: 2px solid #E0F6E0; }
+.copy_count_div { border-left: 2px solid #E0F6E0; border-right: 2px solid #E0F6E0; }
 
 #rdetail_image_cell { border: 1px solid white; border-right: 1px solid #A7EA9D;}
 
diff --git a/Open-ILS/web/opac/theme/reddish/css/colors.css b/Open-ILS/web/opac/theme/reddish/css/colors.css
index 7c49125116..76a2f038ff 100644
--- a/Open-ILS/web/opac/theme/reddish/css/colors.css
+++ b/Open-ILS/web/opac/theme/reddish/css/colors.css
@@ -1,6 +1,6 @@
-body a			{ color: black; text-decoration: none;}
+body a   { color: black; text-decoration: none;}
 body a:visited { color: black; text-decoration: none;}
-body a:hover	{ color: red; text-decoration: underline;}
+body a:hover { color: red; text-decoration: underline;}
 
 
 /*
@@ -46,7 +46,7 @@ a:focus { background: #FFDFBF; color: #000000;}
 .canvas { /* main content div for each page */
     border-left: 3px solid #FF8000;
     border-bottom: 3px solid #FF8000;
-	border-top: 3px solid #FF8000;
+ border-top: 3px solid #FF8000;
 }
 
 /* border around home search box */
@@ -86,7 +86,7 @@ a:focus { background: #FFDFBF; color: #000000;}
 .result_table_subtable { border-top: 1px solid #E0E0E0; }
 
 .copy_count_cell { border-right: 1px solid #E0E0E0; } 
-.copy_count_div {	border-left: 2px solid #E0F6E0; border-right: 2px solid #E0F6E0; }
+.copy_count_div { border-left: 2px solid #E0F6E0; border-right: 2px solid #E0F6E0; }
 
 #rdetail_image_cell { border: 1px solid white; border-right: 1px solid #A7EA9D;}
 
diff --git a/Open-ILS/web/reports/oils_rpt.css b/Open-ILS/web/reports/oils_rpt.css
index d4db1f2b16..a96210b62e 100644
--- a/Open-ILS/web/reports/oils_rpt.css
+++ b/Open-ILS/web/reports/oils_rpt.css
@@ -9,286 +9,286 @@ table { border-collapse: collapse; }
 .fm_table thead tr { background: #F0F0F0; }
 
 .oils_rpt_main_link {
-	padding: 5px;
-	font-size: 10pt;
+ padding: 5px;
+ font-size: 10pt;
 }
 
 #oils_rpt_name_table {
-	vertical-align: middle;
-	background: #E0F0F0; 
-	margin-bottom: 20px;
-	width: 100%;
+ vertical-align: middle;
+ background: #E0F0F0; 
+ margin-bottom: 20px;
+ width: 100%;
 }
 #oils_rpt_name_table td {
-	padding: 5px;
+ padding: 5px;
 }
 
 #oils_rpt_table {
-	width: 100%;
-	border-top: 2px solid #E0E0E0;
-	border-left: 2px solid #E0E0E0;
-	margin-top: 25px;
-	margin-left: 10px;
-	padding: 5px;
+ width: 100%;
+ border-top: 2px solid #E0E0E0;
+ border-left: 2px solid #E0E0E0;
+ margin-top: 25px;
+ margin-left: 10px;
+ padding: 5px;
 }
 
 #oils_rpt_table tr {
-	-moz-border-radius: 5px 5px 5px 5px;	
+ -moz-border-radius: 5px 5px 5px 5px; 
 }
 
 #oils_rpt_table td {
-	vertical-align: top;
-	padding: 3px;
+ vertical-align: top;
+ padding: 3px;
 }
 
 #oils_rpt_tree_loading { 
-	width: 100%; 
-	text-align: center; 
-	background: #E0E0E0; 
-	margin-top: 40px;
-	padding: 5px;
+ width: 100%; 
+ text-align: center; 
+ background: #E0E0E0; 
+ margin-top: 40px;
+ padding: 5px;
 }
 
 .oils_rpt_info_item {
-	width: 310px;
+ width: 310px;
 }
 
 .oils_rpt_info_title {
-	text-align: center;
-	font-weight: 600;
-	padding-bottom: 10px;
+ text-align: center;
+ font-weight: 600;
+ padding-bottom: 10px;
 }
 
 .oils_rpt_info_selector {
-	border: 1px solid blue; 
-	background: #E0F0F0; 
-	min-height: 150px;
-	max-height: 290px;
-	overflow: auto;
+ border: 1px solid blue; 
+ background: #E0F0F0; 
+ min-height: 150px;
+ max-height: 290px;
+ overflow: auto;
 }
 
 .oils_rpt_small_info_selector {
-	border: 1px solid blue; 
-	background: #E0F0F0; 
-	height: 80px;
-	width: 12em;
-	overflow: auto;
+ border: 1px solid blue; 
+ background: #E0F0F0; 
+ height: 80px;
+ width: 12em;
+ overflow: auto;
 }
 
 
 .oils_rpt_info_div { 
-	text-align: center; 
-	width: 320px; 
-	padding-left: 10px; 
-	padding: 10px;
-	border-left: 2px solid #E0E0E0; 
-	border-bottom: 1px solid #E0E0E0; 
-	margin-right: 20px;
+ text-align: center; 
+ width: 320px; 
+ padding-left: 10px; 
+ padding: 10px;
+ border-left: 2px solid #E0E0E0; 
+ border-bottom: 1px solid #E0E0E0; 
+ margin-right: 20px;
 }
 
 #oils_rpt_table_right_td { 
-	padding-right: 20px; 
-	padding-left: 20px; 
+ padding-right: 20px; 
+ padding-left: 20px; 
 }
 
 button {
-	color:#050;
-	font-family:'trebuchet ms',helvetica,sans-serif;
-	font-size:84%;
-	font-weight:bold;
-	background-color:#fed;
-	border:2px solid;
-	border-top-color:#696;
-	border-left-color:#696;
-	border-right-color:#363;
-	border-bottom-color:#363;
-	margin: 4px;
-	border-style: outset;
+ color:#050;
+ font-family:'trebuchet ms',helvetica,sans-serif;
+ font-size:84%;
+ font-weight:bold;
+ background-color:#fed;
+ border:2px solid;
+ border-top-color:#696;
+ border-left-color:#696;
+ border-right-color:#363;
+ border-bottom-color:#363;
+ margin: 4px;
+ border-style: outset;
 }
 
 button:active {
-	border-style: inset;
+ border-style: inset;
 }
 
 button:disabled {
-	color: #000;
-	background-color: #EEE;
-	border: 2px solid #888;
+ color: #000;
+ background-color: #EEE;
+ border: 2px solid #888;
 }
 
 .floaty {
-	position: absolute;	
-	text-align: center;
-	z-index: 1;
-	/*background: #E0F0F0; */
-	background: #FFCC7F;   /* see FF9900 as the primary color in the color picker for complimentaries */
-	border: 3px groove #0033EE;
-	padding: 10px;
+ position: absolute; 
+ text-align: center;
+ z-index: 1;
+ /*background: #E0F0F0; */
+ background: #FFCC7F;   /* see FF9900 as the primary color in the color picker for complimentaries */
+ border: 3px groove #0033EE;
+ padding: 10px;
 
-	/* testing static location */
-	width: 600px;
-	top: 60px;
-	left: 20px;
+ /* testing static location */
+ width: 600px;
+ top: 60px;
+ left: 20px;
 }
 
 .oils_rpt_tab_picker_selected {
-	background: #96A1C6;
+ background: #96A1C6;
 }
 
 .oils_rpt_tab_table {
-	width: 100%;
-	background: #F0F0F0;
-	margin: 4px;
-	margin-bottom: 10px;
-	border: 1px solid #808080;
-	border-collapse: collapse;
-	text-align: center;
-	font-weight: bold;
+ width: 100%;
+ background: #F0F0F0;
+ margin: 4px;
+ margin-bottom: 10px;
+ border: 1px solid #808080;
+ border-collapse: collapse;
+ text-align: center;
+ font-weight: bold;
 }
 
 .oils_rpt_tab_table td {
-	border-left: 1px solid #808080;
-	border-right: 1px solid #808080;
-	padding: 2px;
+ border-left: 1px solid #808080;
+ border-right: 1px solid #808080;
+ padding: 2px;
 }
 
 
 
 #oils_rpt_column_editor_close_div {
-	margin-top: 5px;
-	padding-top: 5px;
-	border-top: 2px solid #E0E0E0;
+ margin-top: 5px;
+ padding-top: 5px;
+ border-top: 2px solid #E0E0E0;
 }
 
 .oils_rpt_field_editor_window {
-	margin: 5px;	
-	text-align: left;
-	padding: 5px;
-	padding-left: 20px;
+ margin: 5px; 
+ text-align: left;
+ padding: 5px;
+ padding-left: 20px;
 }
 
 .oils_rpt_tree_link_ref {
-	color: #A52A2A;
+ color: #A52A2A;
 }
 
 
 .oils_rpt_invalid_input {
-	background: red;
+ background: red;
 }
 
 .oils_rpt_editor_window_tbody td {
-	border-bottom: 1px solid #A0A0A0;
-	padding: 4px;
+ border-bottom: 1px solid #A0A0A0;
+ padding: 4px;
 }
 
 .oils_rpt_cal_image {
-	cursor: pointer; 
-	border: 1px solid red; 
-	padding: 0px; margin: -3px;
+ cursor: pointer; 
+ border: 1px solid red; 
+ padding: 0px; margin: -3px;
 }
 
 #oils_rpt_folder_table {
-	margin-top: 15px;
-	width: 100%;
+ margin-top: 15px;
+ width: 100%;
 }
 
 #oils_rpt_folder_table_left_td {
-	vertical-align: top;
-	width: 25%;
+ vertical-align: top;
+ width: 25%;
 }
 
 #oils_rpt_folder_table_right_td {
-	border-left: 2px solid #E0E0E0; 
-	text-align: center;
-	vertical-align: top;
-	padding: 10px;
+ border-left: 2px solid #E0E0E0; 
+ text-align: center;
+ vertical-align: top;
+ padding: 10px;
 }
 
 .oils_rpt_folder_window {
-	border: 1px solid blue; 
-	background: #E6F0F0; 
-	text-align: left;
+ border: 1px solid blue; 
+ background: #E6F0F0; 
+ text-align: left;
 }
 
 .oils_rpt_folder_window td {
-	padding: 5px;
+ padding: 5px;
 }
 
 
 #oils_rpt_folder_window_contents_div {
-	width: 100%;
-	margin-top: 5px;
+ width: 100%;
+ margin-top: 5px;
 }
 
 .oils_rpt_param_table thead td {
-	font-weight: bold;
+ font-weight: bold;
 }
 
 .oils_rpt_param_table td {
-	border: 1px solid #808080;
-	padding: 5px;
+ border: 1px solid #808080;
+ padding: 5px;
 }
 
 #oils_rpt_folder_details_table {
-	width: 100%;
-	margin-bottom: 10px;
+ width: 100%;
+ margin-bottom: 10px;
 }
 #oils_rpt_folder_details_table tr {
-	border: 1px solid #808080;
+ border: 1px solid #808080;
 }
 
 #oils_rpt_folder_details_table td {
-	text-align: center;
-	padding: 5px;
+ text-align: center;
+ padding: 5px;
 }
 
 #oils_rpt_template_folder_go_row {
-	border-bottom: 1px solid #808080;
-	margin-bottom: 10px;
+ border-bottom: 1px solid #808080;
+ margin-bottom: 10px;
 }
 
 #oils_rpt_param_editor_table {
-	width: 100%;
+ width: 100%;
 }
 
 #oils_rpt_param_editor_table td {
-	border: 1px solid #808080;
-	padding: 2px;
+ border: 1px solid #808080;
+ padding: 2px;
 }
 
 #oils_rpt_param_editor_table thead td {
-	font-weight: bold;
-	text-align: center;
+ font-weight: bold;
+ text-align: center;
 }
 
 .oils_rpt_folder_tree {
-	margin: 5px;
+ margin: 5px;
 }
 
 .oils_rpt_folder_tree_div {
-	border: 1px solid #808080;
-	margin: 10px;
-	min-width: 170px;
+ border: 1px solid #808080;
+ margin: 10px;
+ min-width: 170px;
 }
 
 .oils_rpt_folder_contents {
-	min-width:  200px;
+ min-width:  200px;
 }
 
 .oils_rpt_folder_window_contents_row {
-	border-bottom: 1px solid #808080;
-	margin: 10px;
+ border-bottom: 1px solid #808080;
+ margin: 10px;
 }
 
 #oils_rpt_folder_window_contents_table {
-	width: 100%;
+ width: 100%;
 }
 #oils_rpt_folder_window_contents_table td {
-	text-align: center;
+ text-align: center;
 }
 
 #oils_rpt_editor_div {
-	width: 100%;
+ width: 100%;
 }
 
 #oils_rpt_name_table tr { border: 1px solid #808080; }
@@ -304,18 +304,18 @@ button:disabled {
 .oils_rpt_generic_table td { border: 1px solid #808080; padding: 5px; }
 
 #oils_rpt_content_count_row_2 {
-	border-top: 2px solid #808080;
-	border-bottom: 1px solid #808080;
-	padding-top: 10px;
-	margin-top: 10px;
+ border-top: 2px solid #808080;
+ border-bottom: 1px solid #808080;
+ padding-top: 10px;
+ margin-top: 10px;
 }
 
 
 #oils_rpt_editor_table tr {
-	border-bottom: 1px solid #D0D0D0;
+ border-bottom: 1px solid #D0D0D0;
 }
 
 #oils_rpt_editor_table tr td {
-	border-left: 1px solid #808080;
+ border-left: 1px solid #808080;
 }
 
diff --git a/Open-ILS/web/reports/oils_rpt.js b/Open-ILS/web/reports/oils_rpt.js
index ba542ffb03..8aa0f349f7 100644
--- a/Open-ILS/web/reports/oils_rpt.js
+++ b/Open-ILS/web/reports/oils_rpt.js
@@ -1,143 +1,143 @@
 var perms = [ 'RUN_REPORTS', 'SHARE_REPORT_FOLDER' ];
 
 function oilsInitReports() {
-	oilsRptIdObjects();
-
-	/* tell FF to capture mouse movements */
-	document.captureEvents(Event.MOUSEMOVE);
-	document.onmousemove = setMousePos;
-
-	DEBUGSLIM = true;
-
-	var cgi = new CGI();
-	fetchUser(cgi.param('ses'));
-	DOM.oils_rpt_user.appendChild(text(USER.usrname()));
-
-	if( cgi.param('dbg') ) oilsRptDebugEnabled = true;
-
-	fetchHighestPermOrgs(SESSION, USER.id(), perms);
-	if( PERMS.RUN_REPORTS == -1 ) {
-		unHideMe(DOM.oils_rpt_permission_denied);
-		hideMe(DOM.oils_rpt_tree_loading);
-		return false;
-	}
-
-
-	oilsRptCookie = new HTTP.Cookies();
-	oilsRptCurrentOrg = USER.ws_ou();
-	cookieManager.write(COOKIE_SES, SESSION, -1, '/');
-	cookieManager.write('ws_ou', USER.ws_ou(), -1, '/');
-
-	oilsRptFetchOrgTree(
-		function() {
-			oilsLoadRptTree(
-				function() {
-					hideMe(DOM.oils_rpt_tree_loading); 
-					unHideMe(DOM.oils_rpt_folder_table);
-				}
-			)
-		}
-	);
-	return true;
+ oilsRptIdObjects();
+
+ /* tell FF to capture mouse movements */
+ document.captureEvents(Event.MOUSEMOVE);
+ document.onmousemove = setMousePos;
+
+ DEBUGSLIM = true;
+
+ var cgi = new CGI();
+ fetchUser(cgi.param('ses'));
+ DOM.oils_rpt_user.appendChild(text(USER.usrname()));
+
+ if( cgi.param('dbg') ) oilsRptDebugEnabled = true;
+
+ fetchHighestPermOrgs(SESSION, USER.id(), perms);
+ if( PERMS.RUN_REPORTS == -1 ) {
+  unHideMe(DOM.oils_rpt_permission_denied);
+  hideMe(DOM.oils_rpt_tree_loading);
+  return false;
+ }
+
+
+ oilsRptCookie = new HTTP.Cookies();
+ oilsRptCurrentOrg = USER.ws_ou();
+ cookieManager.write(COOKIE_SES, SESSION, -1, '/');
+ cookieManager.write('ws_ou', USER.ws_ou(), -1, '/');
+
+ oilsRptFetchOrgTree(
+  function() {
+   oilsLoadRptTree(
+    function() {
+     hideMe(DOM.oils_rpt_tree_loading); 
+     unHideMe(DOM.oils_rpt_folder_table);
+    }
+   )
+  }
+ );
+ return true;
 }
 
 function oilsRtpInitFolders() {
-	oilsRptCurrentFolderManager = 
-		new oilsRptFolderManager(DOM.oils_rpt_folder_tree_div);
-	oilsRptCurrentFolderManager.draw(SESSION);
+ oilsRptCurrentFolderManager = 
+  new oilsRptFolderManager(DOM.oils_rpt_folder_tree_div);
+ oilsRptCurrentFolderManager.draw(SESSION);
 }
 
 function oilsCleanupReports() {
-	try {oilsRptDebugWindow.close();} catch(e) {}
-	DOM = null;
-	oilsRptObjectCache = null;
-	oilsRptObject.objectCache =  null;
+ try {oilsRptDebugWindow.close();} catch(e) {}
+ DOM = null;
+ oilsRptObjectCache = null;
+ oilsRptObject.objectCache =  null;
 }
 
 
 
 
 /* ---------------------------------------------------------------------
-	Define the report object
-	--------------------------------------------------------------------- */
+ Define the report object
+ --------------------------------------------------------------------- */
 function oilsReport(templateObj, reportObj) {
-	this.def = {
-		select	: [],
-		from		: {},
-		where		: [],
-		having	: [],
-		order_by : []
-	};
-
-	this.params	= {};
-	this.name	= "";
-	this.reportObject = reportObj;
-
-	if(templateObj) this.setTemplate(templateObj);
-
-	if( reportObj ) 
-		this.params = JSON2js(reportObj.data());
-	if(!this.params) this.params = {};
+ this.def = {
+  select : [],
+  from  : {},
+  where  : [],
+  having : [],
+  order_by : []
+ };
+
+ this.params = {};
+ this.name = "";
+ this.reportObject = reportObj;
+
+ if(templateObj) this.setTemplate(templateObj);
+
+ if( reportObj ) 
+  this.params = JSON2js(reportObj.data());
+ if(!this.params) this.params = {};
 }
 
 
 oilsReport.prototype.setTemplate = function(template) {
-	this.def		= JSON2js(template.data());
-	this.name	= template.name();
-	this.templateObject = template;
+ this.def  = JSON2js(template.data());
+ this.name = template.name();
+ this.templateObject = template;
 }
 
 oilsReport.prototype.toString = function() {
-	return formatJSON(js2JSON(this));
+ return formatJSON(js2JSON(this));
 }
 
 oilsReport.prototype.toHTMLString = function() {
-	return formatJSONHTML(js2JSON(this));
+ return formatJSONHTML(js2JSON(this));
 }
 
 oilsReport.prototype.gatherParams = function() {
-	//if(oilsRptObjectKeys(this.params).length == 0) return;
-	_debug("we have params: " + js2JSON(this.params));
+ //if(oilsRptObjectKeys(this.params).length == 0) return;
+ _debug("we have params: " + js2JSON(this.params));
 
-	var params	= [];
-	this._gatherParams(params, this.def.where, 'where', 'condition');
-	this._gatherParams(params, this.def.having, 'having', 'condition');
-	return params;
+ var params = [];
+ this._gatherParams(params, this.def.where, 'where', 'condition');
+ this._gatherParams(params, this.def.having, 'having', 'condition');
+ return params;
 }
 
 oilsReport.prototype._gatherParams = function(params, arr, type, field) {
-	if(!arr) return;
-	for( var i = 0; i < arr.length; i++ ) {
-
-		var obj = arr[i];
-		node = obj[field];
-		var key; 
-		var op;
-
-		/* add select transform support */
-
-		if( typeof node == 'string' ) {
-			key = node.match(/::.*/);
-		} else {
-			op = oilsRptObjectKeys(node)[0];
-			key = (node[op] +'').match(/::.*/);
-		}
-
-		if(!key) continue;
-		key = key[0].replace(/::/,'');
-		_debug("key = "+key+", param = " + this.params[key]);
-
-		params.push( { 
-			key		: key,
-			op			: op,
-			value		: this.params[key],
-			column	: obj.column,
-			path		: obj.path,
-			type		: type, 
-			relation : obj.relation,
-			field		: field
-		});
-	}
+ if(!arr) return;
+ for( var i = 0; i < arr.length; i++ ) {
+
+  var obj = arr[i];
+  node = obj[field];
+  var key; 
+  var op;
+
+  /* add select transform support */
+
+  if( typeof node == 'string' ) {
+   key = node.match(/::.*/);
+  } else {
+   op = oilsRptObjectKeys(node)[0];
+   key = (node[op] +'').match(/::.*/);
+  }
+
+  if(!key) continue;
+  key = key[0].replace(/::/,'');
+  _debug("key = "+key+", param = " + this.params[key]);
+
+  params.push( { 
+   key  : key,
+   op   : op,
+   value  : this.params[key],
+   column : obj.column,
+   path  : obj.path,
+   type  : type, 
+   relation : obj.relation,
+   field  : field
+  });
+ }
 }
 
 
@@ -154,29 +154,29 @@ oilsReport.prototype.__gatherTemplateParams = function(arr, type) {
     if(!arr) return [];
     var params = [];
 
-	for( var i = 0; i < arr.length; i++ ) {
+ for( var i = 0; i < arr.length; i++ ) {
 
-		var obj = arr[i];
-		var node = obj.condition;
-	    var op = oilsRptObjectKeys(node)[0];
-		var key = node[op];
+  var obj = arr[i];
+  var node = obj.condition;
+     var op = oilsRptObjectKeys(node)[0];
+  var key = node[op];
 
         /** if this is a dynamic param, skip it */
         if( key && (key+'').match(/::.*/) ) continue;
 
-		_debug("template params: op = " + op + ", value = " + js2JSON(key));
+  _debug("template params: op = " + op + ", value = " + js2JSON(key));
 
-		params.push( { 
-			key		: key, /* key == value, since this is not a dynamic param */
-			op		: op,
+  params.push( { 
+   key  : key, /* key == value, since this is not a dynamic param */
+   op  : op,
             value   : key,
-			column	: obj.column,
-			path	: obj.path,
-			type	: type, 
-			relation : obj.relation,
-			field	: field
-		});
-	}
+   column : obj.column,
+   path : obj.path,
+   type : type, 
+   relation : obj.relation,
+   field : field
+  });
+ }
 
     return params;
 }
diff --git a/Open-ILS/web/reports/oils_rpt.xhtml b/Open-ILS/web/reports/oils_rpt.xhtml
index 967060e99f..47430f9838 100644
--- a/Open-ILS/web/reports/oils_rpt.xhtml
+++ b/Open-ILS/web/reports/oils_rpt.xhtml
@@ -1,140 +1,140 @@
 <?xml version='1.0'?>
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!ENTITY nbsp " ">
-	<!--#include virtual="/opac/locale/${locale}/reports.dtd"-->
+ "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+ <!ENTITY nbsp " ">
+ <!--#include virtual="/opac/locale/${locale}/reports.dtd"-->
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
 
-	<head>
-		<title>&reports.oils_rpt.title;</title>
-		<!--#include virtual="oils_rpt_common.xhtml"-->
-		<script type="text/javascript">
-		<![CDATA[
-			var rptInit = function() {
-				if (oilsInitReports()) {
-					oilsRtpInitFolders();
-				}
-			}
-			dojo.addOnLoad(rptInit);
-			dojo.addOnUnload(oilsCleanupReports);
-		]]>
-		</script>
-	</head>
-
-	<body>
-		<div class='welcome_box'>
-			<span>&reports.common.logged_in_as;</span><b><span id='oils_rpt_user'/></b>
-		</div>
-
-		<div id='oils_rpt_permission_denied' class='hide_me'>
-			&reports.oils_rpt.insufficient_permissions;
-		</div>
-
-		<!--
-		<div>
-			<a class='oils_rpt_main_link' href='javascript:_l("oils_rpt_builder.xhtml");'>Build a New Report Template</a>
-		</div>
-		-->
-
-		<div id='oils_rpt_tree_loading'>
-			&reports.common.loading;
-		</div>
-
-		<table id='oils_rpt_folder_table' class='hide_me'>
-			<tbody>
-				<tr>
-					<td id='oils_rpt_folder_table_left_td'>
-						<div class='oils_rpt_folder_tree_div'>
-							<div><b>&reports.oils_rpt.my_folders;</b></div>
-							<div id='oils_rpt_template_folder_tree' class='oils_rpt_folder_tree'/>
-							<div id='oils_rpt_report_folder_tree' class='oils_rpt_folder_tree'/>
-							<div id='oils_rpt_output_folder_tree' class='oils_rpt_folder_tree'/>
-						</div>
-						<div class='oils_rpt_folder_tree_div'>
-							<div><b>&reports.oils_rpt.shared_folders;</b></div>
-							<div id='oils_rpt_template_shared_folder_tree' class='oils_rpt_folder_tree'/>
-							<div id='oils_rpt_report_shared_folder_tree' class='oils_rpt_folder_tree'/>
-							<div id='oils_rpt_output_shared_folder_tree' class='oils_rpt_folder_tree'/>
-						</div>
-					</td>
-					<td/>
-					<td id='oils_rpt_folder_table_right_td' class='hide_me'>
-						<div class='oils_rpt_folder_window'>
-
-							<table class='oils_rpt_tab_table' id='oils_rpt_folder_manager_tab_table'><tbody>
-								<tr>
-									<td width='50%'>
-										<a id='oils_rpt_folder_window_manage_tab' href='javascript:void(0);'>&reports.oils_rpt.manage_folder_contents;</a></td>
-									<td width='50%'>
-										<a id='oils_rpt_folder_window_edit_tab' href='javascript:void(0);'>&reports.oils_rpt.manage_folder;</a></td>
-								</tr>
-							</tbody></table>
-
-							<table id='oils_rpt_folder_details_table'>
-								<tbody>
-									<tr>
-										<td>
-											<span><b id='oils_rpt_folder_name_label'/>: 
-											&reports.oils_rpt.created_by;</span> <b id='oils_rpt_folder_creator_label'/>
-										</td>
-									</tr>
-								</tbody>
-							</table>
-
-							<div>
-								<!--#include virtual="oils_rpt_folder_window.xhtml"-->
-							</div>
-							<div>
-								<!--#include virtual="oils_rpt_folder_manager.xhtml"-->
-							</div>
-						</div>
-					</td>
-
-					<td id='oils_rpt_folder_table_alt_td' class='hide_me' valign='top'>
-						<div class='oils_rpt_folder_window'>
-							<!--#include virtual="oils_rpt_editor.xhtml"-->
-						</div>
-
-						<div id='oils_rpt_top_folder' class='hide_me oils_rpt_folder_window'>
-							<div>
-								<span><b>&reports.oils_rpt.create_new_sub_folder;</b>. &reports.oils_rpt.folder_type;</span> <b id='oils_rpt_top_folder_type'/>
-							</div>
-							<table class='oils_rpt_generic_table'>
-								<tbody>
-									<tr>
-										<td>&reports.oils_rpt.folder_name;</td>
-										<td><input id='oils_rpt_top_folder_name' type='text'/></td>
-									</tr>
-									<tr>
-										<td>&reports.oils_rpt.share_folder;</td>
-										<td>
-											<select id='oils_rpt_top_folder_shared'>
-												<option value='f' selected='selected'>&reports.oils_rpt.do_not_share;</option>
-												<option value='t'>&reports.oils_rpt.share;</option>
-											</select>
-										</td>
-									</tr>
-									<tr>
-										<td>&reports.oils_rpt.share_with;</td>
-										<td><select id='oils_rpt_top_folder_lib_picker'/></td>
-									</tr>
-									<tr><td colspan='2' align='center'>
-										<input type='submit' value='&reports.oils_rpt.create_sub_folder;' id='oils_rpt_top_folder_create'/>
-									</td></tr>
-								</tbody>
-							</table>
-						</div>
-					</td>
-
-				</tr>
-			</tbody>
-		</table>
-		
-	</body>
+ <head>
+  <title>&reports.oils_rpt.title;</title>
+  <!--#include virtual="oils_rpt_common.xhtml"-->
+  <script type="text/javascript">
+  <![CDATA[
+   var rptInit = function() {
+    if (oilsInitReports()) {
+     oilsRtpInitFolders();
+    }
+   }
+   dojo.addOnLoad(rptInit);
+   dojo.addOnUnload(oilsCleanupReports);
+  ]]>
+  </script>
+ </head>
+
+ <body>
+  <div class='welcome_box'>
+   <span>&reports.common.logged_in_as;</span><b><span id='oils_rpt_user'/></b>
+  </div>
+
+  <div id='oils_rpt_permission_denied' class='hide_me'>
+   &reports.oils_rpt.insufficient_permissions;
+  </div>
+
+  <!--
+  <div>
+   <a class='oils_rpt_main_link' href='javascript:_l("oils_rpt_builder.xhtml");'>Build a New Report Template</a>
+  </div>
+  -->
+
+  <div id='oils_rpt_tree_loading'>
+   &reports.common.loading;
+  </div>
+
+  <table id='oils_rpt_folder_table' class='hide_me'>
+   <tbody>
+    <tr>
+     <td id='oils_rpt_folder_table_left_td'>
+      <div class='oils_rpt_folder_tree_div'>
+       <div><b>&reports.oils_rpt.my_folders;</b></div>
+       <div id='oils_rpt_template_folder_tree' class='oils_rpt_folder_tree'/>
+       <div id='oils_rpt_report_folder_tree' class='oils_rpt_folder_tree'/>
+       <div id='oils_rpt_output_folder_tree' class='oils_rpt_folder_tree'/>
+      </div>
+      <div class='oils_rpt_folder_tree_div'>
+       <div><b>&reports.oils_rpt.shared_folders;</b></div>
+       <div id='oils_rpt_template_shared_folder_tree' class='oils_rpt_folder_tree'/>
+       <div id='oils_rpt_report_shared_folder_tree' class='oils_rpt_folder_tree'/>
+       <div id='oils_rpt_output_shared_folder_tree' class='oils_rpt_folder_tree'/>
+      </div>
+     </td>
+     <td/>
+     <td id='oils_rpt_folder_table_right_td' class='hide_me'>
+      <div class='oils_rpt_folder_window'>
+
+       <table class='oils_rpt_tab_table' id='oils_rpt_folder_manager_tab_table'><tbody>
+        <tr>
+         <td width='50%'>
+          <a id='oils_rpt_folder_window_manage_tab' href='javascript:void(0);'>&reports.oils_rpt.manage_folder_contents;</a></td>
+         <td width='50%'>
+          <a id='oils_rpt_folder_window_edit_tab' href='javascript:void(0);'>&reports.oils_rpt.manage_folder;</a></td>
+        </tr>
+       </tbody></table>
+
+       <table id='oils_rpt_folder_details_table'>
+        <tbody>
+         <tr>
+          <td>
+           <span><b id='oils_rpt_folder_name_label'/>: 
+           &reports.oils_rpt.created_by;</span> <b id='oils_rpt_folder_creator_label'/>
+          </td>
+         </tr>
+        </tbody>
+       </table>
+
+       <div>
+        <!--#include virtual="oils_rpt_folder_window.xhtml"-->
+       </div>
+       <div>
+        <!--#include virtual="oils_rpt_folder_manager.xhtml"-->
+       </div>
+      </div>
+     </td>
+
+     <td id='oils_rpt_folder_table_alt_td' class='hide_me' valign='top'>
+      <div class='oils_rpt_folder_window'>
+       <!--#include virtual="oils_rpt_editor.xhtml"-->
+      </div>
+
+      <div id='oils_rpt_top_folder' class='hide_me oils_rpt_folder_window'>
+       <div>
+        <span><b>&reports.oils_rpt.create_new_sub_folder;</b>. &reports.oils_rpt.folder_type;</span> <b id='oils_rpt_top_folder_type'/>
+       </div>
+       <table class='oils_rpt_generic_table'>
+        <tbody>
+         <tr>
+          <td>&reports.oils_rpt.folder_name;</td>
+          <td><input id='oils_rpt_top_folder_name' type='text'/></td>
+         </tr>
+         <tr>
+          <td>&reports.oils_rpt.share_folder;</td>
+          <td>
+           <select id='oils_rpt_top_folder_shared'>
+            <option value='f' selected='selected'>&reports.oils_rpt.do_not_share;</option>
+            <option value='t'>&reports.oils_rpt.share;</option>
+           </select>
+          </td>
+         </tr>
+         <tr>
+          <td>&reports.oils_rpt.share_with;</td>
+          <td><select id='oils_rpt_top_folder_lib_picker'/></td>
+         </tr>
+         <tr><td colspan='2' align='center'>
+          <input type='submit' value='&reports.oils_rpt.create_sub_folder;' id='oils_rpt_top_folder_create'/>
+         </td></tr>
+        </tbody>
+       </table>
+      </div>
+     </td>
+
+    </tr>
+   </tbody>
+  </table>
+  
+ </body>
 </html>
 
 
diff --git a/Open-ILS/web/reports/oils_rpt_builder.js b/Open-ILS/web/reports/oils_rpt_builder.js
index 0b82c21dc7..36d69a90a5 100644
--- a/Open-ILS/web/reports/oils_rpt_builder.js
+++ b/Open-ILS/web/reports/oils_rpt_builder.js
@@ -7,40 +7,40 @@ var rpt_strings = dojo.i18n.getLocalization("openils.reports", "reports");
 var __dblclicks = {}; /* retain a cache of the selector value doubleclick event handlers */
 
 function oilsInitReportBuilder() {
-	if(!oilsInitReports()) return false;
-	oilsReportBuilderReset();
-	DOM.oils_rpt_table.onclick = 
-		function(){hideMe(DOM.oils_rpt_column_editor)};
-	oilsDrawRptTree(
-		function() { 
-			hideMe(DOM.oils_rpt_tree_loading); 
-			unHideMe(DOM.oils_rpt_table); 
-			oilsRptBuilderDrawClone(new CGI().param('ct'));
-		}
-	);
+ if(!oilsInitReports()) return false;
+ oilsReportBuilderReset();
+ DOM.oils_rpt_table.onclick = 
+  function(){hideMe(DOM.oils_rpt_column_editor)};
+ oilsDrawRptTree(
+  function() { 
+   hideMe(DOM.oils_rpt_tree_loading); 
+   unHideMe(DOM.oils_rpt_table); 
+   oilsRptBuilderDrawClone(new CGI().param('ct'));
+  }
+ );
 
-	DOM.oils_rpt_builder_save_template.onclick = oilsReportBuilderSave;
+ DOM.oils_rpt_builder_save_template.onclick = oilsReportBuilderSave;
 }
 
 function oilsRptBuilderDrawClone(templateId) {
-	if(!templateId) return;
-	unHideMe(DOM.oils_rpt_builder_cloning);
+ if(!templateId) return;
+ unHideMe(DOM.oils_rpt_builder_cloning);
 
-	oilsRptFetchTemplate(templateId,
-		function(template) { oilsRptBuilderDrawClone2(template);}
-	);
+ oilsRptFetchTemplate(templateId,
+  function(template) { oilsRptBuilderDrawClone2(template);}
+ );
 }
 
 
 function oilsRptBuilderDrawClone2(template) {
-	appendClear( DOM.oils_rpt_build_cloning_name, template.name() );
-	DOM.oils_rpt_builder_new_name.value = template.name();
-	DOM.oils_rpt_builder_new_desc.value = template.description();
+ appendClear( DOM.oils_rpt_build_cloning_name, template.name() );
+ DOM.oils_rpt_builder_new_name.value = template.name();
+ DOM.oils_rpt_builder_new_desc.value = template.description();
 
-	_debug(formatJSON(template.data()));
+ _debug(formatJSON(template.data()));
 
-	/* manually shove data into the display selectors */
-	var def = JSON2js(template.data());
+ /* manually shove data into the display selectors */
+ var def = JSON2js(template.data());
 
    /* --------------------------------------------------------------- */
    /* hack to determine the higest existing param in the template */
@@ -57,79 +57,79 @@ function oilsRptBuilderDrawClone2(template) {
    //x.blah();
    /* --------------------------------------------------------------- */
 
-	var table = def.from.table;
-	var node;
-	for( var i in oilsIDL ) {
-		node = oilsIDL[i];
-		if( node.table == table ) {
-			setSelector(DOM.oils_rpt_builder_type_selector, node.name);
-			DOM.oils_rpt_builder_type_selector.onchange();
-			break;
-		}
-	}
+ var table = def.from.table;
+ var node;
+ for( var i in oilsIDL ) {
+  node = oilsIDL[i];
+  if( node.table == table ) {
+   setSelector(DOM.oils_rpt_builder_type_selector, node.name);
+   DOM.oils_rpt_builder_type_selector.onchange();
+   break;
+  }
+ }
 
-	iterate(def.select,
-		function(item) {
-			oilsAddRptDisplayItem(item.path, item.alias, item.column.transform)});
+ iterate(def.select,
+  function(item) {
+   oilsAddRptDisplayItem(item.path, item.alias, item.column.transform)});
 
-	iterate(def.where,
-		function(item) {
-			oilsAddRptFilterItem(item.path, item.column.transform, oilsRptObjectKeys(item.condition)[0])});
+ iterate(def.where,
+  function(item) {
+   oilsAddRptFilterItem(item.path, item.column.transform, oilsRptObjectKeys(item.condition)[0])});
 
-	iterate(def.having,
-		function(item) {
-			oilsAddRptHavingItem(item.path, item.column.transform, oilsRptObjectKeys(item.condition)[0])});
+ iterate(def.having,
+  function(item) {
+   oilsAddRptHavingItem(item.path, item.column.transform, oilsRptObjectKeys(item.condition)[0])});
 
-	//oilsRpt.setTemplate(template); /* commented out with clone fix, *shouldn't* break anything */
-	oilsRpt.templateObject = null; /* simplify debugging */
+ //oilsRpt.setTemplate(template); /* commented out with clone fix, *shouldn't* break anything */
+ oilsRpt.templateObject = null; /* simplify debugging */
 }
 
 function oilsReportBuilderReset() {
-	var n = (oilsRpt) ? oilsRpt.name : "";
-	oilsRpt = new oilsReport();
-	oilsRpt.name = n;
-	oilsRptDisplaySelector	= DOM.oils_rpt_display_selector;
-	oilsRptFilterSelector	= DOM.oils_rpt_filter_selector;
-	oilsRptHavingSelector	= DOM.oils_rpt_agg_filter_selector;
-	removeChildren(oilsRptDisplaySelector);
-	removeChildren(oilsRptFilterSelector);
-	removeChildren(oilsRptHavingSelector);
-	//removeChildren(oilsRptOrderBySelector);
-	//oilsRptResetParams();
+ var n = (oilsRpt) ? oilsRpt.name : "";
+ oilsRpt = new oilsReport();
+ oilsRpt.name = n;
+ oilsRptDisplaySelector = DOM.oils_rpt_display_selector;
+ oilsRptFilterSelector = DOM.oils_rpt_filter_selector;
+ oilsRptHavingSelector = DOM.oils_rpt_agg_filter_selector;
+ removeChildren(oilsRptDisplaySelector);
+ removeChildren(oilsRptFilterSelector);
+ removeChildren(oilsRptHavingSelector);
+ //removeChildren(oilsRptOrderBySelector);
+ //oilsRptResetParams();
 }
 
 function oilsReportBuilderSave() {
 
-	var tmpl = new rt();
-	tmpl.name(DOM.oils_rpt_builder_new_name.value);
-	tmpl.description(DOM.oils_rpt_builder_new_desc.value);
-	tmpl.owner(USER.id());
-	tmpl.folder(new CGI().param('folder'));
-	tmpl.data(js2JSON(oilsRpt.def));
-
-	if(!confirm(dojo.string.substitute( rpt_strings.RPT_BUILDER_CONFIRM_SAVE, [tmpl.name(), tmpl.description()] )) )
-		return;
-
-	debugFMObject(tmpl);
-	//return; /* XXX */
-
-	var req = new Request(OILS_RPT_CREATE_TEMPLATE, SESSION, tmpl);
-	req.request.alertEvent = false;
-	req.callback(
-		function(r) {
-			var res = r.getResultObject();
-			if(checkILSEvent(res)) {
-				alertILSEvent(res);
-			} else {
-				if( res && res != '0' ) {
-					oilsRptAlertSuccess();
-					_l('oils_rpt.xhtml');
-				} 
-			}
-		}
-	);
-	
-	req.send();
+ var tmpl = new rt();
+ tmpl.name(DOM.oils_rpt_builder_new_name.value);
+ tmpl.description(DOM.oils_rpt_builder_new_desc.value);
+ tmpl.owner(USER.id());
+ tmpl.folder(new CGI().param('folder'));
+ tmpl.data(js2JSON(oilsRpt.def));
+
+ if(!confirm(dojo.string.substitute( rpt_strings.RPT_BUILDER_CONFIRM_SAVE, [tmpl.name(), tmpl.description()] )) )
+  return;
+
+ debugFMObject(tmpl);
+ //return; /* XXX */
+
+ var req = new Request(OILS_RPT_CREATE_TEMPLATE, SESSION, tmpl);
+ req.request.alertEvent = false;
+ req.callback(
+  function(r) {
+   var res = r.getResultObject();
+   if(checkILSEvent(res)) {
+    alertILSEvent(res);
+   } else {
+    if( res && res != '0' ) {
+     oilsRptAlertSuccess();
+     _l('oils_rpt.xhtml');
+    } 
+   }
+  }
+ );
+ 
+ req.send();
 }
 
 
@@ -137,519 +137,519 @@ function oilsReportBuilderSave() {
 /* adds an item to the display window */
 function oilsAddRptDisplayItem(path, name, tform, params) {
 
-	if( ! oilsAddSelectorItem( 
-		{  selector : oilsRptDisplaySelector, 
-			val : path, 
-			label : name, 
-			path : path, 
-			type : 'display',
-			transform : tform }) ) {
-		return;
-	}
+ if( ! oilsAddSelectorItem( 
+  {  selector : oilsRptDisplaySelector, 
+   val : path, 
+   label : name, 
+   path : path, 
+   type : 'display',
+   transform : tform }) ) {
+  return;
+ }
 
-	/* add the selected columns to the report output */
-	name = (name) ? name : oilsRptPathCol(path);
-	if( !tform ) tform = 'Bare';
+ /* add the selected columns to the report output */
+ name = (name) ? name : oilsRptPathCol(path);
+ if( !tform ) tform = 'Bare';
 
-	var aggregate = oilsRptGetIsAgg(tform);
+ var aggregate = oilsRptGetIsAgg(tform);
 
-	/* add this item to the select blob */
-	var sel = {
-		relation: hex_md5(oilsRptPathRel(path)), 
-		path : path,
-		alias: name,
-		column: { transform: tform, colname: oilsRptPathCol(path) }
-	};
+ /* add this item to the select blob */
+ var sel = {
+  relation: hex_md5(oilsRptPathRel(path)), 
+  path : path,
+  alias: name,
+  column: { transform: tform, colname: oilsRptPathCol(path) }
+ };
 
-	if( params ) sel.column.params = params;
-	oilsRptAddSelectList(sel, tform);
-	mergeObjects( oilsRpt.def.from, oilsRptBuildFromClause(path));
-	oilsRptDebug();
+ if( params ) sel.column.params = params;
+ oilsRptAddSelectList(sel, tform);
+ mergeObjects( oilsRpt.def.from, oilsRptBuildFromClause(path));
+ oilsRptDebug();
 }
 
 function oilsRptAddSelectList(obj, tform) {
-	if(!oilsRptGetIsAgg(tform)) {
-		var select = [];
-		var added = false;
-		for( var i = 0; i < oilsRpt.def.select.length; i++ ) {
-			var item = oilsRpt.def.select[i];
-
-			/* shove the item in question in front of the first agg tform */
-			if( !added && oilsRptGetIsAgg( item.column.transform ) ) {
-				select.push(obj);
-				added = true;
-			}
-			select.push(item);
-		}
-
-		/* if there is no existing agg tfrom to 
-			insert in front of, add me on the end */
-		if(!added) select.push(obj);
-
-		oilsRpt.def.select = select;
-
-		if( added ) {
-			/* re-draw the select display to get the order correct */
-			var sel = oilsRptDisplaySelector;
-			while( sel.options.length > 0 ) sel.options[0] = null;
-			iterate(oilsRpt.def.select,
-				function(item) {
-					_debug('re-inserting display item ' + item.path);
-					oilsAddSelectorItem(
-						{  selector: oilsRptDisplaySelector, 
-							val:item.path, 
-							label:item.alias, 
-							path:item.path,
-							transform : item.column.transform,
-							type : 'display'
-						}
-					) });
-		}
-
-	} else {
-		/* shove agg transforms onto the end */
-		oilsRpt.def.select.push(obj);
-	}
+ if(!oilsRptGetIsAgg(tform)) {
+  var select = [];
+  var added = false;
+  for( var i = 0; i < oilsRpt.def.select.length; i++ ) {
+   var item = oilsRpt.def.select[i];
+
+   /* shove the item in question in front of the first agg tform */
+   if( !added && oilsRptGetIsAgg( item.column.transform ) ) {
+    select.push(obj);
+    added = true;
+   }
+   select.push(item);
+  }
+
+  /* if there is no existing agg tfrom to 
+   insert in front of, add me on the end */
+  if(!added) select.push(obj);
+
+  oilsRpt.def.select = select;
+
+  if( added ) {
+   /* re-draw the select display to get the order correct */
+   var sel = oilsRptDisplaySelector;
+   while( sel.options.length > 0 ) sel.options[0] = null;
+   iterate(oilsRpt.def.select,
+    function(item) {
+     _debug('re-inserting display item ' + item.path);
+     oilsAddSelectorItem(
+      {  selector: oilsRptDisplaySelector, 
+       val:item.path, 
+       label:item.alias, 
+       path:item.path,
+       transform : item.column.transform,
+       type : 'display'
+      }
+     ) });
+  }
+
+ } else {
+  /* shove agg transforms onto the end */
+  oilsRpt.def.select.push(obj);
+ }
 }
 
 
 
 function oilsRptGetIsAgg(tform) {
-	return OILS_RPT_TRANSFORMS[tform].aggregate;
+ return OILS_RPT_TRANSFORMS[tform].aggregate;
 }
 
 /* takes a column path and builds a from-clause object for the path */
 function oilsRptBuildFromClause(path) {
 
-	/* the path is the full path (relation) from the source 
-		object to the column in question (e.g. au-home_ou-aou-name)*/
-	var parts = path.split(/-/);
+ /* the path is the full path (relation) from the source 
+  object to the column in question (e.g. au-home_ou-aou-name)*/
+ var parts = path.split(/-/);
 
-	/* the final from clause */
-	var obj = {}; 
+ /* the final from clause */
+ var obj = {}; 
 
-	/* reference to the current position in the from clause */
-	var tobj = obj; 
+ /* reference to the current position in the from clause */
+ var tobj = obj; 
 
-	var newpath = "";
+ var newpath = "";
 
    var last_is_left = false; /* true if our parent join is a 'left' join */
 
-	/* walk the path, fleshing the from clause as we go */
-	for( var i = 0; i < parts.length; i += 2 ) {
+ /* walk the path, fleshing the from clause as we go */
+ for( var i = 0; i < parts.length; i += 2 ) {
 
-		var cls = parts[i]; /* class name (id) */
-		var col = parts[i+1]; /* column name */
+  var cls = parts[i]; /* class name (id) */
+  var col = parts[i+1]; /* column name */
 
-		/* a "node" is a class description from the IDL, it 
-			contains relevant info, plus a list of "fields",
-			or column objects */
-		var node = oilsIDL[cls];
-		var pkey = oilsRptFindField(node, node.pkey);
+  /* a "node" is a class description from the IDL, it 
+   contains relevant info, plus a list of "fields",
+   or column objects */
+  var node = oilsIDL[cls];
+  var pkey = oilsRptFindField(node, node.pkey);
 
-		/* a "field" is a parsed version of a column from the IDL,
-			contains datatype, column name, etc. */
-		var field = oilsRptFindField(node, col);
+  /* a "field" is a parsed version of a column from the IDL,
+   contains datatype, column name, etc. */
+  var field = oilsRptFindField(node, col);
 
-		/* re-construct the path as we go so 
-			we know what all we've seen thus far */
-		newpath = (newpath) ? newpath + '-'+ cls : cls;
+  /* re-construct the path as we go so 
+   we know what all we've seen thus far */
+  newpath = (newpath) ? newpath + '-'+ cls : cls;
 
-		/* extract relevant info */
-		tobj.table = node.table;
-		tobj.path = newpath;
-		tobj.alias = hex_md5(newpath);
+  /* extract relevant info */
+  tobj.table = node.table;
+  tobj.path = newpath;
+  tobj.alias = hex_md5(newpath);
 
-		_debug('field type is ' + field.type);
-		if( i == (parts.length - 2) ) break;
+  _debug('field type is ' + field.type);
+  if( i == (parts.length - 2) ) break;
 
-		/* we still have columns left in the path, keep adding join's */
-		var path_col = col;
-		if(field.reltype != 'has_a')
-			col = pkey.name + '-' + col;
+  /* we still have columns left in the path, keep adding join's */
+  var path_col = col;
+  if(field.reltype != 'has_a')
+   col = pkey.name + '-' + col;
 
-		tobj.join = {};
-		tobj = tobj.join;
+  tobj.join = {};
+  tobj = tobj.join;
 
-		tobj[col] = {};
-		tobj = tobj[col];
-		if( field.type == 'link' ) {
-			tobj.key = field.key;
-			if( field.reltype == 'has_many' || field.reltype == 'might_have' || last_is_left ) {
-				tobj.type = 'left';
+  tobj[col] = {};
+  tobj = tobj[col];
+  if( field.type == 'link' ) {
+   tobj.key = field.key;
+   if( field.reltype == 'has_many' || field.reltype == 'might_have' || last_is_left ) {
+    tobj.type = 'left';
             last_is_left = true;
          } else {
             last_is_left = false;
          }
-		}
+  }
 
-		newpath = newpath + '-'+ path_col;
-	}
+  newpath = newpath + '-'+ path_col;
+ }
 
-	_debug("built 'from' clause: path="+path+"\n"+formatJSON(js2JSON(obj)));
-	return obj;
+ _debug("built 'from' clause: path="+path+"\n"+formatJSON(js2JSON(obj)));
+ return obj;
 }
 
 function oilsMoveUpDisplayItems() {
-	var sel = oilsRptDisplaySelector;
-	var idx = sel.selectedIndex;
-	if( idx == 0 ) return;
-	var opt = sel.options[idx];
-	sel.options[idx] = null;
-	idx--;
-
-	var val = opt.getAttribute('value');
+ var sel = oilsRptDisplaySelector;
+ var idx = sel.selectedIndex;
+ if( idx == 0 ) return;
+ var opt = sel.options[idx];
+ sel.options[idx] = null;
+ idx--;
+
+ var val = opt.getAttribute('value');
    var label = opt.getAttribute('label');
    var path = opt.getAttribute('path');
    var evt_id = opt.getAttribute('listener');
 
-	opt = insertSelectorVal(sel, idx, label, val);
+ opt = insertSelectorVal(sel, idx, label, val);
 
-	opt.setAttribute('path', path);
-	opt.setAttribute('title', label);
+ opt.setAttribute('path', path);
+ opt.setAttribute('title', label);
    opt.setAttribute('label', label);
    opt.setAttribute('value', val);
    opt.setAttribute('listener', evt_id);
 
    /* re-attach the double-click event */
-	opt.addEventListener('dblclick', __dblclicks[evt_id], true );
+ opt.addEventListener('dblclick', __dblclicks[evt_id], true );
 
-	sel.options[idx].selected = true;
+ sel.options[idx].selected = true;
 
-	var arr = oilsRpt.def.select;
-	for( var i = 0; i < arr.length; i++ ) {
-		if( arr[i].path == val ) {
-			var other = arr[i-1];
-			arr[i-1] = arr[i];
-			arr[i] = other;
-			break;
-		}
-	}
-	oilsRptDebug();
+ var arr = oilsRpt.def.select;
+ for( var i = 0; i < arr.length; i++ ) {
+  if( arr[i].path == val ) {
+   var other = arr[i-1];
+   arr[i-1] = arr[i];
+   arr[i] = other;
+   break;
+  }
+ }
+ oilsRptDebug();
 }
 
 function oilsMoveDownDisplayItems() {
-	var sel = oilsRptDisplaySelector;
-	var idx = sel.selectedIndex;
-	if( idx == sel.options.length - 1 ) return;
-	var opt = sel.options[idx];
-	sel.options[idx] = null;
-	idx++;
-
-	//var val = opt.getAttribute('value');
-	//insertSelectorVal(sel, idx, opt.innerHTML, val);
-	//insertSelectorVal(sel, idx, opt.getAttribute('label'), val);
-
-	var val = opt.getAttribute('value');
+ var sel = oilsRptDisplaySelector;
+ var idx = sel.selectedIndex;
+ if( idx == sel.options.length - 1 ) return;
+ var opt = sel.options[idx];
+ sel.options[idx] = null;
+ idx++;
+
+ //var val = opt.getAttribute('value');
+ //insertSelectorVal(sel, idx, opt.innerHTML, val);
+ //insertSelectorVal(sel, idx, opt.getAttribute('label'), val);
+
+ var val = opt.getAttribute('value');
    var label = opt.getAttribute('label');
    var path = opt.getAttribute('path');
    var evt_id = opt.getAttribute('listener');
 
-	opt = insertSelectorVal(sel, idx, label, val);
+ opt = insertSelectorVal(sel, idx, label, val);
 
    opt.setAttribute('value', val);
-	opt.setAttribute('path', path);
-	opt.setAttribute('title', label);
+ opt.setAttribute('path', path);
+ opt.setAttribute('title', label);
    opt.setAttribute('label', label);
    opt.setAttribute('listener', evt_id);
 
    /* re-attach the double-click event */
-	opt.addEventListener('dblclick', __dblclicks[evt_id], true );
+ opt.addEventListener('dblclick', __dblclicks[evt_id], true );
 
-	sel.options[idx].selected = true;
+ sel.options[idx].selected = true;
 
-	var arr = oilsRpt.def.select;
-	for( var i = 0; i < arr.length; i++ ) {
-		if( arr[i].path == val ) {
-			var other = arr[i+1];
-			arr[i+1] = arr[i];
-			arr[i] = other;
-			break;
-		}
-	}
-	oilsRptDebug();
+ var arr = oilsRpt.def.select;
+ for( var i = 0; i < arr.length; i++ ) {
+  if( arr[i].path == val ) {
+   var other = arr[i+1];
+   arr[i+1] = arr[i];
+   arr[i] = other;
+   break;
+  }
+ }
+ oilsRptDebug();
 }
 
 
 /* removes a specific item from the display window */
 /*
 function oilsDelDisplayItem(val) {
-	oilsDelSelectorItem(oilsRptDisplaySelector, val);
+ oilsDelSelectorItem(oilsRptDisplaySelector, val);
 }
 */
 
 /* removes selected items from the display window */
 function oilsDelSelectedDisplayItems() {
-	var list = oilsDelSelectedItems(oilsRptDisplaySelector);
+ var list = oilsDelSelectedItems(oilsRptDisplaySelector);
 
-	_debug('deleting list: ' + list);
+ _debug('deleting list: ' + list);
 
-	/* remove the de-selected columns from the report output */
-	oilsRpt.def.select = grep( oilsRpt.def.select, 
-		function(i) {
-			for( var j = 0; j < list.length; j++ ) {
-				var d = list[j]; /* path */
-				var col = i.column;
+ /* remove the de-selected columns from the report output */
+ oilsRpt.def.select = grep( oilsRpt.def.select, 
+  function(i) {
+   for( var j = 0; j < list.length; j++ ) {
+    var d = list[j]; /* path */
+    var col = i.column;
 
-				_debug('in delete, looking at list = '+d+' : col = ' + 
-					col.colname + ' : relation = ' + i.relation + ' : encoded = ' + hex_md5(oilsRptPathRel(d)) );
+    _debug('in delete, looking at list = '+d+' : col = ' + 
+     col.colname + ' : relation = ' + i.relation + ' : encoded = ' + hex_md5(oilsRptPathRel(d)) );
 
-				if( hex_md5(oilsRptPathRel(d)) == i.relation && oilsRptPathCol(d) == col.colname ) {
-					return false;
-				}
-			}
-			return true;
-		}
-	);
+    if( hex_md5(oilsRptPathRel(d)) == i.relation && oilsRptPathCol(d) == col.colname ) {
+     return false;
+    }
+   }
+   return true;
+  }
+ );
 
-	if(!oilsRpt.def.select) oilsRpt.def.select = [];
-	oilsRptPruneFromList(list);
-	oilsRptDebug();
+ if(!oilsRpt.def.select) oilsRpt.def.select = [];
+ oilsRptPruneFromList(list);
+ oilsRptDebug();
 }
 
 function oilsRptPruneFromList(pathlist) {
 
-	for( var j = 0; j < pathlist.length; j++ ) {
-		/* if there are no items left in the "select", "where", or "having" clauses 
-			for the given relation, trim this relation from the "from" clause */
-		var path = pathlist[j];
-		var encrel = hex_md5(oilsRptPathRel(path));
+ for( var j = 0; j < pathlist.length; j++ ) {
+  /* if there are no items left in the "select", "where", or "having" clauses 
+   for the given relation, trim this relation from the "from" clause */
+  var path = pathlist[j];
+  var encrel = hex_md5(oilsRptPathRel(path));
 
-		debug('seeing if we can prune from clause with relation = ' + encrel +' : path = ' + path);
+  debug('seeing if we can prune from clause with relation = ' + encrel +' : path = ' + path);
 
-		var func = function(i){ return (i.relation == hex_md5(oilsRptPathRel(path))); };
+  var func = function(i){ return (i.relation == hex_md5(oilsRptPathRel(path))); };
 
-		if(	!grep(oilsRpt.def.select, func) && 
-				!grep(oilsRpt.def.where, func) && 
-				!grep(oilsRpt.def.having, func) ) {
+  if( !grep(oilsRpt.def.select, func) && 
+    !grep(oilsRpt.def.where, func) && 
+    !grep(oilsRpt.def.having, func) ) {
 
-			debug('looks like we can prune ' + path);
+   debug('looks like we can prune ' + path);
 
-			oilsRptPruneFromClause(oilsRptPathRel(pathlist[j]));
-		}
-	}
+   oilsRptPruneFromClause(oilsRptPathRel(pathlist[j]));
+  }
+ }
 }
 
 
 /* for each item in the path list, remove the associated data
-	from the "from" clause */
+ from the "from" clause */
 
 function oilsRptPruneFromClause(relation, node) {
 
-	var keys = oilsRptObjectKeys(node);
-	_debug("trying to remove relation: " + relation+'\n\tthis object has keys: '+keys);
+ var keys = oilsRptObjectKeys(node);
+ _debug("trying to remove relation: " + relation+'\n\tthis object has keys: '+keys);
 
-	if(!node) node = oilsRpt.def.from.join;
-	if(!node) return false;
+ if(!node) node = oilsRpt.def.from.join;
+ if(!node) return false;
 
-	for( var i in node ) {
-		var child_node = node[i];
-		_debug("\tanalyzing child node: "+child_node.path);
+ for( var i in node ) {
+  var child_node = node[i];
+  _debug("\tanalyzing child node: "+child_node.path);
 
-		// first, descend into the tree, and prune leaves 
-		if( child_node.join ) {
+  // first, descend into the tree, and prune leaves 
+  if( child_node.join ) {
 
-			oilsRptPruneFromClause(relation, child_node.join); 
-			var join_keys = oilsRptObjectKeys(child_node.join);
-			_debug("\tchild has a sub-join for items : ["+ join_keys+"]");
+   oilsRptPruneFromClause(relation, child_node.join); 
+   var join_keys = oilsRptObjectKeys(child_node.join);
+   _debug("\tchild has a sub-join for items : ["+ join_keys+"]");
 
-			if(join_keys.length == 0) {
-				_debug("\tdeleting join for object "+i);
-				delete child_node.join;
-			}
-		}
-
-		if( !child_node.join ) {
-
-			_debug("\tchild node has no sub-join, seeing if we should delete it");
-
-			var from_alias = child_node.alias;
-			var func = function(n){ return (n.relation == from_alias)};
-	
-			if(	!grep(oilsRpt.def.select, func) &&
-					!grep(oilsRpt.def.where, func) &&
-					!grep(oilsRpt.def.having, func) ) {
-	
-				/* we are not used by any other clauses */
-				_debug("\tdeleting node with relation: "+ from_alias);
-				delete node[i];
-				return true;
-			}
-		}
-	}
+   if(join_keys.length == 0) {
+    _debug("\tdeleting join for object "+i);
+    delete child_node.join;
+   }
+  }
+
+  if( !child_node.join ) {
+
+   _debug("\tchild node has no sub-join, seeing if we should delete it");
+
+   var from_alias = child_node.alias;
+   var func = function(n){ return (n.relation == from_alias)};
+ 
+   if( !grep(oilsRpt.def.select, func) &&
+     !grep(oilsRpt.def.where, func) &&
+     !grep(oilsRpt.def.having, func) ) {
+ 
+    /* we are not used by any other clauses */
+    _debug("\tdeleting node with relation: "+ from_alias);
+    delete node[i];
+    return true;
+   }
+  }
+ }
 
-	return false;
+ return false;
 }
 
 function oilsRptMkFilterTags(path, tform, filter) {
-	var name = oilsRptMakeLabel(path);
-	if(tform) name += ' ('+tform+')';
-	name += ' "' + filter + '"';
-	var epath = path + ':'+filter+':';
-	if(tform) epath += tform;
+ var name = oilsRptMakeLabel(path);
+ if(tform) name += ' ('+tform+')';
+ name += ' "' + filter + '"';
+ var epath = path + ':'+filter+':';
+ if(tform) epath += tform;
 
-	return [ name, epath ];
+ return [ name, epath ];
 }
 
 
 function oilsAddRptFilterItem(path, tform, filter) {
-	_debug("Adding filter item for "+path+" tform="+tform+" filter="+filter);
-
-	var name = oilsRptMkFilterTags(path, tform, filter);
-	var epath = name[1];
-	name = name[0];
-
-	if( ! oilsAddSelectorItem(
-		{  selector : oilsRptFilterSelector, 
-			val : epath, 
-			label : name, 
-			path : path,
-			transform : tform,
-			operation : filter,
-			type : 'filter'
-		}) )
-		return;
-
-	var where = {
-		relation: hex_md5(oilsRptPathRel(path)), 
-		path : path,
-		column:   { transform: tform, colname: oilsRptPathCol(path) },
-		condition : {}
-	};
+ _debug("Adding filter item for "+path+" tform="+tform+" filter="+filter);
+
+ var name = oilsRptMkFilterTags(path, tform, filter);
+ var epath = name[1];
+ name = name[0];
+
+ if( ! oilsAddSelectorItem(
+  {  selector : oilsRptFilterSelector, 
+   val : epath, 
+   label : name, 
+   path : path,
+   transform : tform,
+   operation : filter,
+   type : 'filter'
+  }) )
+  return;
+
+ var where = {
+  relation: hex_md5(oilsRptPathRel(path)), 
+  path : path,
+  column:   { transform: tform, colname: oilsRptPathCol(path) },
+  condition : {}
+ };
 
    //_debug('NEXT PARAM = ' + oilsRptID2);
    //_debug('NEXT PARAM = ' + oilsRptNextParam());
 
-	if( filter == 'is' || filter == 'is not' || filter == 'is blank' || filter == 'is not blank' )
-		where.condition[filter] = null;
-	else where.condition[filter] = oilsRptNextParam();
+ if( filter == 'is' || filter == 'is not' || filter == 'is blank' || filter == 'is not blank' )
+  where.condition[filter] = null;
+ else where.condition[filter] = oilsRptNextParam();
 
-	switch(tform) {
-		case 'substring' : where.column.params = oilsRptNextParam();
-	}
+ switch(tform) {
+  case 'substring' : where.column.params = oilsRptNextParam();
+ }
 
-	oilsRpt.def.where.push(where);
-	mergeObjects( oilsRpt.def.from, oilsRptBuildFromClause(path));
-	oilsRptDebug();
+ oilsRpt.def.where.push(where);
+ mergeObjects( oilsRpt.def.from, oilsRptBuildFromClause(path));
+ oilsRptDebug();
 }
 
 
 function oilsAddRptHavingItem(path, tform, filter) {
-	_debug("Adding filter item for "+path+" tform="+tform+" filter="+filter);
+ _debug("Adding filter item for "+path+" tform="+tform+" filter="+filter);
 
-	var name = oilsRptMkFilterTags(path, tform, filter);
-	var epath = name[1];
-	name = name[0];
+ var name = oilsRptMkFilterTags(path, tform, filter);
+ var epath = name[1];
+ name = name[0];
 
-	if( ! oilsAddSelectorItem(
-		{  selector: oilsRptHavingSelector, 
-			val:epath, 
-			label:name, 
-			path:path,
-			transform : tform,
-			operation : filter,
-			type : 'agg_filter' /* XXX */
-		}) )
+ if( ! oilsAddSelectorItem(
+  {  selector: oilsRptHavingSelector, 
+   val:epath, 
+   label:name, 
+   path:path,
+   transform : tform,
+   operation : filter,
+   type : 'agg_filter' /* XXX */
+  }) )
 
-		return;
+  return;
 
-	var having = {
-		relation: hex_md5(oilsRptPathRel(path)), 
-		path : path,
-		column:   { transform: tform, colname: oilsRptPathCol(path) },
-		condition : {}
-	};
-	if( filter == 'is' || filter == 'is not' || filter == 'is blank' || filter == 'is not blank' )
-		having.condition[filter] = null;
-	else having.condition[filter] = oilsRptNextParam();
+ var having = {
+  relation: hex_md5(oilsRptPathRel(path)), 
+  path : path,
+  column:   { transform: tform, colname: oilsRptPathCol(path) },
+  condition : {}
+ };
+ if( filter == 'is' || filter == 'is not' || filter == 'is blank' || filter == 'is not blank' )
+  having.condition[filter] = null;
+ else having.condition[filter] = oilsRptNextParam();
 
-	switch(tform) {
-		case 'substring' : having.column.params = oilsRptNextParam();
-	}
+ switch(tform) {
+  case 'substring' : having.column.params = oilsRptNextParam();
+ }
 
-	oilsRpt.def.having.push(having);
-	mergeObjects( oilsRpt.def.from, oilsRptBuildFromClause(path));
-	oilsRptDebug();
+ oilsRpt.def.having.push(having);
+ mergeObjects( oilsRpt.def.from, oilsRptBuildFromClause(path));
+ oilsRptDebug();
 }
 
 
 
 function oilsDelSelectedFilterItems() {
-	_oilsDelSelectedFilterItems('where');
+ _oilsDelSelectedFilterItems('where');
 }
 function oilsDelSelectedAggFilterItems() {
-	_oilsDelSelectedFilterItems('having');
+ _oilsDelSelectedFilterItems('having');
 }
 
 function _oilsDelSelectedFilterItems(type) {
 
-	/* the values in this list are formed:  <path>:<operation>:<transform> */
-	var list;
+ /* the values in this list are formed:  <path>:<operation>:<transform> */
+ var list;
     if( type == 'where' )
-	    list = oilsDelSelectedItems(oilsRptFilterSelector);
+     list = oilsDelSelectedItems(oilsRptFilterSelector);
     else if( type == 'having' )
-	    list = oilsDelSelectedItems(oilsRptHavingSelector);
-
-	_debug("deleting filter items " + list);
-
-	for( var i = 0; i < list.length; i++ ) {
-		var enc_path = list[i];
-		var data = oilsRptParseFilterEncPath(enc_path);
-
-		_debug("trimming filter items with enc_path = " + enc_path);
-		_debug(data.path);
-		_debug(data.operation);
-		_debug(data.tform);
-		_debug(data.tform);
-		_debug(type);
-		_debug('---------------------');
-
-		oilsRpt.def[type] = grep( 
-			oilsRpt.def[type],
-			function(f) { 
-				return ! oilsRptFilterDataMatches( 
-					f, data.path, data.operation, data.tform );
-			}
-		);
-	}
+     list = oilsDelSelectedItems(oilsRptHavingSelector);
+
+ _debug("deleting filter items " + list);
+
+ for( var i = 0; i < list.length; i++ ) {
+  var enc_path = list[i];
+  var data = oilsRptParseFilterEncPath(enc_path);
+
+  _debug("trimming filter items with enc_path = " + enc_path);
+  _debug(data.path);
+  _debug(data.operation);
+  _debug(data.tform);
+  _debug(data.tform);
+  _debug(type);
+  _debug('---------------------');
+
+  oilsRpt.def[type] = grep( 
+   oilsRpt.def[type],
+   function(f) { 
+    return ! oilsRptFilterDataMatches( 
+     f, data.path, data.operation, data.tform );
+   }
+  );
+ }
 
-	if(!oilsRpt.def[type]) oilsRpt.def[type] = [];
-	oilsRptPruneFromList(list);
-	oilsRptDebug();
+ if(!oilsRpt.def[type]) oilsRpt.def[type] = [];
+ oilsRptPruneFromList(list);
+ oilsRptDebug();
 }
 
 function oilsRptParseFilterEncPath(item) {
-	return {
-		path:		item.replace(/:.*/,''),
-		operation:	item.replace(/.*:(.*):.*/,'$1'),
-		tform:	item.replace(/.*?:.*?:(.*)/,'$1')
-	};
+ return {
+  path:  item.replace(/:.*/,''),
+  operation: item.replace(/.*:(.*):.*/,'$1'),
+  tform: item.replace(/.*?:.*?:(.*)/,'$1')
+ };
 }
 
 
 function oilsRptFilterDataMatches(filter, path, operation, tform) {
-	var rel = hex_md5(oilsRptPathRel(path));
-	var col = oilsRptPathCol(path);
+ var rel = hex_md5(oilsRptPathRel(path));
+ var col = oilsRptPathCol(path);
 
-	if(	col == filter.column.colname &&
-			rel == filter.relation &&	
-			tform == filter.column.transform &&
-			operation == oilsRptObjectKeys(filter.condition)[0] ) return true;
+ if( col == filter.column.colname &&
+   rel == filter.relation && 
+   tform == filter.column.transform &&
+   operation == oilsRptObjectKeys(filter.condition)[0] ) return true;
 
-	return false;
+ return false;
 }
 
 /* adds an item to the display window */
 /*
 function oilsAddRptAggFilterItem(val) {
-	oilsAddSelectorItem({selector:oilsRptHavingFilterSelector, val:val, label:val, path:val});
+ oilsAddSelectorItem({selector:oilsRptHavingFilterSelector, val:val, label:val, path:val});
 }
 */
 
 /* removes a specific item from the display window */
 /*
 function oilsDelAggFilterItem(val) {
-	oilsDelSelectorItem(oilsRptHavingFilterSelector, val);
+ oilsDelSelectorItem(oilsRptHavingFilterSelector, val);
 }
 */
 
@@ -658,71 +658,71 @@ function oilsDelAggFilterItem(val) {
 //function oilsAddSelectorItem(sel, val, name, path) {
 function oilsAddSelectorItem(args) {
 
-	var sel = args.selector;
-	var label = args.label;
-	var path = args.path;
-	var val = args.val;
+ var sel = args.selector;
+ var label = args.label;
+ var path = args.path;
+ var val = args.val;
 
-	label = (label) ? label : oilsRptMakeLabel(val);
+ label = (label) ? label : oilsRptMakeLabel(val);
 
-	var i;
-	for( i = 0; i < sel.options.length; i++ ) {
-		var opt = sel.options[i];
-		if( opt.value == val ) return false;
-	}
+ var i;
+ for( i = 0; i < sel.options.length; i++ ) {
+  var opt = sel.options[i];
+  if( opt.value == val ) return false;
+ }
 
-	var opt = insertSelectorVal( sel, -1, label, val );
-	opt.setAttribute('title', label);
-	opt.setAttribute('path', path);
+ var opt = insertSelectorVal( sel, -1, label, val );
+ opt.setAttribute('title', label);
+ opt.setAttribute('path', path);
    opt.setAttribute('label', label);
 
    var evt_id = oilsNextNumericId();
    opt.setAttribute('listener', evt_id);
 
-	args.index = i;
-	delete args.selector;
+ args.index = i;
+ delete args.selector;
    var listener = function(){ oilsRptDrawDataWindow(path, args);};
-	opt.addEventListener('dblclick', listener, true );
+ opt.addEventListener('dblclick', listener, true );
    __dblclicks[evt_id] = listener;
-		//function(){ oilsRptDrawDataWindow(path, args);} , true);
+  //function(){ oilsRptDrawDataWindow(path, args);} , true);
 
-	return true;
+ return true;
 }
 
 
 /* removes a specific item from the display window */
 function oilsDelSelectorItem(sel, val) {
-	var opts = sel.options;
-	for( var i = 0; i < opts.length; i++ ) {
-		var opt = opts[i];
-		if( opt.value == val )  {
-			if( i == opts.length - 1 ) 
-				opts[i] = null;
-			else opts[i] = opts[i+1];
-			return;
-		}
-	}
+ var opts = sel.options;
+ for( var i = 0; i < opts.length; i++ ) {
+  var opt = opts[i];
+  if( opt.value == val )  {
+   if( i == opts.length - 1 ) 
+    opts[i] = null;
+   else opts[i] = opts[i+1];
+   return;
+  }
+ }
 }
 
 /* removes selected items from the display window */
 function oilsDelSelectedItems(sel) {
-	var list = getSelectedList(sel);
-	for( var i = 0; i < list.length; i++ ) 
-		oilsDelSelectorItem(sel, list[i]);
-	return list;
+ var list = getSelectedList(sel);
+ for( var i = 0; i < list.length; i++ ) 
+  oilsDelSelectorItem(sel, list[i]);
+ return list;
 }
 
 
 /* hides the different field editor tabs */
 function oilsRptHideEditorDivs() {
-	hideMe(DOM.oils_rpt_tform_div);
-	hideMe(DOM.oils_rpt_filter_div);
-	hideMe(DOM.oils_rpt_agg_filter_div);
-	hideMe(DOM.oils_rpt_order_by_div);
+ hideMe(DOM.oils_rpt_tform_div);
+ hideMe(DOM.oils_rpt_filter_div);
+ hideMe(DOM.oils_rpt_agg_filter_div);
+ hideMe(DOM.oils_rpt_order_by_div);
 
-	removeCSSClass(DOM.oils_rpt_tform_tab.parentNode, 'oils_rpt_tab_picker_selected');
-	removeCSSClass(DOM.oils_rpt_filter_tab.parentNode, 'oils_rpt_tab_picker_selected');
-	removeCSSClass(DOM.oils_rpt_agg_filter_tab.parentNode, 'oils_rpt_tab_picker_selected');
+ removeCSSClass(DOM.oils_rpt_tform_tab.parentNode, 'oils_rpt_tab_picker_selected');
+ removeCSSClass(DOM.oils_rpt_filter_tab.parentNode, 'oils_rpt_tab_picker_selected');
+ removeCSSClass(DOM.oils_rpt_agg_filter_tab.parentNode, 'oils_rpt_tab_picker_selected');
 }
 
 
@@ -732,226 +732,226 @@ function oilsRptHideEditorDivs() {
   */
 function oilsRptDrawDataWindow(path, args) {
 
-	args = (args) ? args : {};
+ args = (args) ? args : {};
 
-	for( var x in args ) 
-		_debug("oilsRptDrawDataWindow(): args -> " + x + " = " + args[x]);
+ for( var x in args ) 
+  _debug("oilsRptDrawDataWindow(): args -> " + x + " = " + args[x]);
 
-	var col	= oilsRptPathCol(path);
-	var cls	= oilsRptPathClass(path);
-	var field = oilsRptFindField(oilsIDL[cls], col);
+ var col = oilsRptPathCol(path);
+ var cls = oilsRptPathClass(path);
+ var field = oilsRptFindField(oilsIDL[cls], col);
 
-	appendClear(DOM.oils_rpt_editor_window_label, text(oilsRptMakeLabel(path)));
-	appendClear(DOM.oils_rpt_editor_window_datatype, text(field.datatype));
+ appendClear(DOM.oils_rpt_editor_window_label, text(oilsRptMakeLabel(path)));
+ appendClear(DOM.oils_rpt_editor_window_datatype, text(field.datatype));
 
-	_debug("setting update data window for column "+col+' on class '+cls);
+ _debug("setting update data window for column "+col+' on class '+cls);
 
-	var div = DOM.oils_rpt_column_editor;
-	/* set a preliminary top position so the page won't bounce around */
+ var div = DOM.oils_rpt_column_editor;
+ /* set a preliminary top position so the page won't bounce around */
 
 
-	/* XXX */
-	//div.setAttribute('style','top:'+oilsMouseX+'px');
+ /* XXX */
+ //div.setAttribute('style','top:'+oilsMouseX+'px');
 
-	/* unhide the div so we can determine the dimensions */
-	unHideMe(div);
+ /* unhide the div so we can determine the dimensions */
+ unHideMe(div);
 
-	/* don't let them see the floating div until the position is fully determined */
-	div.style.visibility='hidden'; 
+ /* don't let them see the floating div until the position is fully determined */
+ div.style.visibility='hidden'; 
 
-	oilsRptDrawTransformWindow(path, col, cls, field, args);
-	oilsRptDrawFilterWindow(path, col, cls, field, args);
-	oilsRptDrawHavingWindow(path, col, cls, field, args);
-	//oilsRptDrawOrderByWindow(path, col, cls, field);
+ oilsRptDrawTransformWindow(path, col, cls, field, args);
+ oilsRptDrawFilterWindow(path, col, cls, field, args);
+ oilsRptDrawHavingWindow(path, col, cls, field, args);
+ //oilsRptDrawOrderByWindow(path, col, cls, field);
 
-	//buildFloatingDiv(div, 600);
+ //buildFloatingDiv(div, 600);
 
-	//window.scrollTo(0,0);
-	window.scrollTo(0, 60);
+ //window.scrollTo(0,0);
+ window.scrollTo(0, 60);
 
-	/* now let them see it */
-	div.style.visibility='visible';
-	//args.type = (args.type) ? args.type : 'display';
-	oilsRptSetDataWindowActions(div, args);
+ /* now let them see it */
+ div.style.visibility='visible';
+ //args.type = (args.type) ? args.type : 'display';
+ oilsRptSetDataWindowActions(div, args);
 }
 
 
 function oilsRptSetDataWindowActions(div, args) {
-	/* give the tab links behavior */
-
-	DOM.oils_rpt_tform_tab.onclick = 
-		function(){
-			oilsRptHideEditorDivs();
-			unHideMe(DOM.oils_rpt_tform_div)
-			addCSSClass(DOM.oils_rpt_tform_tab.parentNode, 'oils_rpt_tab_picker_selected');
-		};
-
-	DOM.oils_rpt_filter_tab.onclick = 
-		function(){
-			oilsRptHideEditorDivs();
-			unHideMe(DOM.oils_rpt_filter_div)
-			addCSSClass(DOM.oils_rpt_filter_tab.parentNode, 'oils_rpt_tab_picker_selected');
-		};
-
-	DOM.oils_rpt_agg_filter_tab.onclick = 
-		function(){
-			oilsRptHideEditorDivs();
-			unHideMe(DOM.oils_rpt_agg_filter_div)
-			addCSSClass(DOM.oils_rpt_agg_filter_tab.parentNode, 'oils_rpt_tab_picker_selected');
-		};
-
-	/*
-	DOM.oils_rpt_order_by_tab.onclick = 
-		function(){
-			oilsRptHideEditorDivs();
-			oilsRptDrawOrderByWindow();
-			unHideMe(DOM.oils_rpt_order_by_div);
-			};
-			*/
-
-	DOM.oils_rpt_tform_submit.disabled = false;
-	DOM.oils_rpt_filter_submit.disabled = false;
-	DOM.oils_rpt_agg_filter_submit.disabled = false;
-
-	if( !args.type ) {
-		DOM.oils_rpt_tform_tab.onclick();
-	} else {
-		/* disable editing on existing items for now */
-		if( args.type == 'display' ) {
-			DOM.oils_rpt_tform_tab.onclick();
-			DOM.oils_rpt_tform_submit.disabled = true;
-		}
-		if( args.type == 'filter' ) {
-			DOM.oils_rpt_filter_tab.onclick();
-			DOM.oils_rpt_filter_submit.disabled = true;
-		}
-		if( args.type == 'agg_filter' ) {
-			DOM.oils_rpt_agg_filter_tab.onclick();
-			DOM.oils_rpt_agg_filter_submit.disabled = true;
-		}
-	}
-
-	DOM.oils_rpt_column_editor_close_button.onclick = function(){hideMe(div);};
+ /* give the tab links behavior */
+
+ DOM.oils_rpt_tform_tab.onclick = 
+  function(){
+   oilsRptHideEditorDivs();
+   unHideMe(DOM.oils_rpt_tform_div)
+   addCSSClass(DOM.oils_rpt_tform_tab.parentNode, 'oils_rpt_tab_picker_selected');
+  };
+
+ DOM.oils_rpt_filter_tab.onclick = 
+  function(){
+   oilsRptHideEditorDivs();
+   unHideMe(DOM.oils_rpt_filter_div)
+   addCSSClass(DOM.oils_rpt_filter_tab.parentNode, 'oils_rpt_tab_picker_selected');
+  };
+
+ DOM.oils_rpt_agg_filter_tab.onclick = 
+  function(){
+   oilsRptHideEditorDivs();
+   unHideMe(DOM.oils_rpt_agg_filter_div)
+   addCSSClass(DOM.oils_rpt_agg_filter_tab.parentNode, 'oils_rpt_tab_picker_selected');
+  };
+
+ /*
+ DOM.oils_rpt_order_by_tab.onclick = 
+  function(){
+   oilsRptHideEditorDivs();
+   oilsRptDrawOrderByWindow();
+   unHideMe(DOM.oils_rpt_order_by_div);
+   };
+   */
+
+ DOM.oils_rpt_tform_submit.disabled = false;
+ DOM.oils_rpt_filter_submit.disabled = false;
+ DOM.oils_rpt_agg_filter_submit.disabled = false;
+
+ if( !args.type ) {
+  DOM.oils_rpt_tform_tab.onclick();
+ } else {
+  /* disable editing on existing items for now */
+  if( args.type == 'display' ) {
+   DOM.oils_rpt_tform_tab.onclick();
+   DOM.oils_rpt_tform_submit.disabled = true;
+  }
+  if( args.type == 'filter' ) {
+   DOM.oils_rpt_filter_tab.onclick();
+   DOM.oils_rpt_filter_submit.disabled = true;
+  }
+  if( args.type == 'agg_filter' ) {
+   DOM.oils_rpt_agg_filter_tab.onclick();
+   DOM.oils_rpt_agg_filter_submit.disabled = true;
+  }
+ }
+
+ DOM.oils_rpt_column_editor_close_button.onclick = function(){hideMe(div);};
 }
 
 
 function oilsRptDrawFilterWindow(path, col, cls, field, args) {
 
-	var tformPicker = new oilsRptTformPicker( {	
-			node : DOM.oils_rpt_filter_tform_table,
-			datatype : field.datatype,
-			non_aggregate : true,
-			select : args.transform
-		}
-	);
+ var tformPicker = new oilsRptTformPicker( { 
+   node : DOM.oils_rpt_filter_tform_table,
+   datatype : field.datatype,
+   non_aggregate : true,
+   select : args.transform
+  }
+ );
 
-	var filterPicker = new oilsRptFilterPicker({
-			node : DOM.oils_rpt_filter_op_table,
-			datatype : field.datatype,
-			select : args.operation
-		}
-	);
+ var filterPicker = new oilsRptFilterPicker({
+   node : DOM.oils_rpt_filter_op_table,
+   datatype : field.datatype,
+   select : args.operation
+  }
+ );
 
-	DOM.oils_rpt_filter_submit.onclick = function() {
-		oilsAddRptFilterItem(
-			path, tformPicker.getSelected(), filterPicker.getSelected());
-	}
+ DOM.oils_rpt_filter_submit.onclick = function() {
+  oilsAddRptFilterItem(
+   path, tformPicker.getSelected(), filterPicker.getSelected());
+ }
 }
 
 
 function oilsRptDrawHavingWindow(path, col, cls, field, args) {
-	var tformPicker = new oilsRptTformPicker( {	
-			node : DOM.oils_rpt_agg_filter_tform_table,
-			datatype : field.datatype,
-			aggregate : true,
-			select : args.transform
-		}
-	);
-
-	var filterPicker = new oilsRptFilterPicker({
-			node : DOM.oils_rpt_agg_filter_op_table,
-			datatype : field.datatype,
-			select : args.operation
-		}
-	);
-
-	DOM.oils_rpt_agg_filter_submit.onclick = function() {
-		oilsAddRptHavingItem(
-			path, tformPicker.getSelected(), filterPicker.getSelected());
-	}
+ var tformPicker = new oilsRptTformPicker( { 
+   node : DOM.oils_rpt_agg_filter_tform_table,
+   datatype : field.datatype,
+   aggregate : true,
+   select : args.transform
+  }
+ );
+
+ var filterPicker = new oilsRptFilterPicker({
+   node : DOM.oils_rpt_agg_filter_op_table,
+   datatype : field.datatype,
+   select : args.operation
+  }
+ );
+
+ DOM.oils_rpt_agg_filter_submit.onclick = function() {
+  oilsAddRptHavingItem(
+   path, tformPicker.getSelected(), filterPicker.getSelected());
+ }
 }
 
 /* draws the transform window */
 function oilsRptDrawTransformWindow(path, col, cls, field, args) {
-	args = (args) ? args : {};
+ args = (args) ? args : {};
 
-	DOM.oils_rpt_tform_label_input.value = 
-		(args.label) ? args.label : oilsRptMakeLabel(path);
+ DOM.oils_rpt_tform_label_input.value = 
+  (args.label) ? args.label : oilsRptMakeLabel(path);
 
-	var dtype = field.datatype;
+ var dtype = field.datatype;
 
-	var tformPicker = new oilsRptTformPicker( {	
-			node : DOM.oils_rpt_tform_table,
-			datatype : field.datatype,
-			non_aggregate : true,
-			aggregate : true,
-			select : args.transform
-		}
-	);
+ var tformPicker = new oilsRptTformPicker( { 
+   node : DOM.oils_rpt_tform_table,
+   datatype : field.datatype,
+   non_aggregate : true,
+   aggregate : true,
+   select : args.transform
+  }
+ );
 
-	DOM.oils_rpt_tform_submit.onclick = 
-		function(){ 
-			oilsAddRptDisplayItem(path, 
-				DOM.oils_rpt_tform_label_input.value, tformPicker.getSelected() );
-		};
+ DOM.oils_rpt_tform_submit.onclick = 
+  function(){ 
+   oilsAddRptDisplayItem(path, 
+    DOM.oils_rpt_tform_label_input.value, tformPicker.getSelected() );
+  };
 
-	DOM.oils_rpt_tform_label_input.focus();
-	DOM.oils_rpt_tform_label_input.select();
+ DOM.oils_rpt_tform_label_input.focus();
+ DOM.oils_rpt_tform_label_input.select();
 
-	_debug("Building transform window for datatype "+dtype);
+ _debug("Building transform window for datatype "+dtype);
 }
 
 
 //function oilsRptDrawOrderByWindow(path, col, cls, field) {
 function oilsRptDrawOrderByWindow() {
-	var sel = DOM.oils_rpt_order_by_selector;
-	removeChildren(sel);
-	DOM.oils_rpt_order_by_submit.onclick = function() {
-		oilsRptAddOrderBy(getSelectorVal(sel));
-	}
+ var sel = DOM.oils_rpt_order_by_selector;
+ removeChildren(sel);
+ DOM.oils_rpt_order_by_submit.onclick = function() {
+  oilsRptAddOrderBy(getSelectorVal(sel));
+ }
 
-	var cols = oilsRpt.def.select;
-	for( var i = 0; i < cols.length; i++ ) {
-		var obj = cols[i];
-		insertSelectorVal(sel, -1, obj.alias, obj.path);
-	}
+ var cols = oilsRpt.def.select;
+ for( var i = 0; i < cols.length; i++ ) {
+  var obj = cols[i];
+  insertSelectorVal(sel, -1, obj.alias, obj.path);
+ }
 }
 
 function oilsRptAddOrderBy(path) {
-	var rel = hex_md5(oilsRptPathRel(path));
-	var order_by = oilsRpt.def.order_by;
-
-	/* if this item is already in the order by remove it and overwrite it */
-	order_by = grep(oilsRpt.def.order_by, 
-		function(i) {return (i.path != path)});
-	
-	if(!order_by) order_by = [];
-
-	/* find the column definition in the select blob */
-	var obj = grep(oilsRpt.def.select,
-		function(i) {return (i.path == path)});
-	
-	if(!obj) return;
-	obj = obj[0];
-	
-	order_by.push({ 
-		relation : obj.relation, 
-		column : obj.column,
-		direction : getSelectorVal(DOM.oils_rpt_order_by_dir)
-	});
-
-	oilsRpt.def.order_by = order_by;
-	oilsRptDebug();
+ var rel = hex_md5(oilsRptPathRel(path));
+ var order_by = oilsRpt.def.order_by;
+
+ /* if this item is already in the order by remove it and overwrite it */
+ order_by = grep(oilsRpt.def.order_by, 
+  function(i) {return (i.path != path)});
+ 
+ if(!order_by) order_by = [];
+
+ /* find the column definition in the select blob */
+ var obj = grep(oilsRpt.def.select,
+  function(i) {return (i.path == path)});
+ 
+ if(!obj) return;
+ obj = obj[0];
+ 
+ order_by.push({ 
+  relation : obj.relation, 
+  column : obj.column,
+  direction : getSelectorVal(DOM.oils_rpt_order_by_dir)
+ });
+
+ oilsRpt.def.order_by = order_by;
+ oilsRptDebug();
 }
 
 
diff --git a/Open-ILS/web/reports/oils_rpt_builder.xhtml b/Open-ILS/web/reports/oils_rpt_builder.xhtml
index b65246f92e..6a75e36c1c 100644
--- a/Open-ILS/web/reports/oils_rpt_builder.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_builder.xhtml
@@ -1,219 +1,219 @@
 <?xml version='1.0'?>
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!ENTITY nbsp " ">
-	<!--#include virtual="/opac/locale/${locale}/reports.dtd"-->
+ "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+ <!ENTITY nbsp " ">
+ <!--#include virtual="/opac/locale/${locale}/reports.dtd"-->
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
 
-	<head>
-		<title>&reports.oils_rpt_builder.title;</title>
-		<!--#include virtual="oils_rpt_common.xhtml"-->
-		<script type="text/javascript">
-		<![CDATA[
-			dojo.addOnLoad(oilsInitReportBuilder);
-			dojo.addOnUnload(oilsCleanupReports);
-		]]>
-		</script>
-
-	</head>
-
-	<body>
-
-		<div class='welcome_box'>
-			<span>&reports.common.logged_in_as;</span><b><span id='oils_rpt_user'/></b>
-		</div>
-
-		<div>
-			<a class='oils_rpt_main_link' href='javascript:_l("oils_rpt.xhtml");'>&reports.oils_rpt_builder.reports_home;</a>
-			<span id='oils_rpt_builder_cloning' class='hide_me' style='padding-left: 10px;'>
-				(<b>&reports.oils_rpt_builder.cloning_template; "<span id='oils_rpt_build_cloning_name'/>"</b>)
-			</span>
-		</div>
-
-		<div id='oils_rpt_tree_loading'>
-			&reports.common.loading;
-		</div>
-
-		<table class='hide_me' id='oils_rpt_table'>
-			<tbody>
-				<tr>
-					<td id='oils_rpt_table_left_td' align='left'>
-
-						<table id='oils_rpt_name_table'><tbody>
-							<tr>
-								<td width='20%'>&reports.oils_rpt_builder.template_name;</td>
-								<td><input size='32' id='oils_rpt_builder_new_name'/></td>
-							</tr><tr>
-								<td>&reports.oils_rpt_builder.template_description;</td>
-								<td><textarea cols='50' rows='2' id='oils_rpt_builder_new_desc'/></td>
-							</tr><tr>
-								<td>&reports.oils_rpt_builder.template_type;</td>
-								<td><select id='oils_rpt_builder_type_selector'/></td>
-							</tr><tr>
-								<td>&reports.oils_rpt_builder.save_this_template;</td>
-								<td><input type='submit' value='Save Template' id='oils_rpt_builder_save_template'/></td>
-							</tr>
-						</tbody></table>
-
-
-						<div id='oils_rpt_tree_div'>
-						</div>
-
-						<br/>
-						<div>
-							<b>**</b>
-							<span style='padding-left: 6px;'>
-								&reports.oils_rpt_builder.filtering_note;
-							</span>
-						</div>
-
-					</td>
-					<td id='oils_rpt_table_right_td' align='right'>
-						<div class='oils_rpt_info_div'>
-							<div class='oils_rpt_info_item oils_rpt_info_title'>&reports.oils_rpt_builder.temp_disp_items;</div>
-							<select id='oils_rpt_display_selector' class='oils_rpt_info_item oils_rpt_info_selector' multiple='multiple'/>
-							<button onclick='oilsDelSelectedDisplayItems();'><u>X</u> &reports.oils_rpt_builder.remove_selected;</button>
-							<button onclick='oilsMoveUpDisplayItems();'>&reports.oils_rpt_builder.move_up;</button>
-							<button onclick='oilsMoveDownDisplayItems();'>&reports.oils_rpt_builder.move_down;</button>
-						</div>
-						<div class='oils_rpt_info_div'>
-							<div class='oils_rpt_info_item oils_rpt_info_title'>&reports.oils_rpt_builder.template_filters;</div>
-							<select id='oils_rpt_filter_selector' class='oils_rpt_info_item oils_rpt_info_selector' multiple='multiple'/>
-							<button onclick='oilsDelSelectedFilterItems();'><u>X</u> &reports.oils_rpt_builder.remove_selected;</button>
-						</div>
-						<div class='oils_rpt_info_div'>
-							<div class='oils_rpt_info_item oils_rpt_info_title'>&reports.oils_rpt_builder.report_aggregate_filters;</div>
-							<select id='oils_rpt_agg_filter_selector' class='oils_rpt_info_item oils_rpt_info_selector' multiple='multiple'/>
-							<button onclick='oilsDelSelectedAggFilterItems();'><u>X</u> &reports.oils_rpt_builder.remove_selected;</button>
-						</div>
-						<div class='oils_rpt_info_div'>
-							<span style='color:red;font-weight:bold;'>&reports.oils_rpt_builder.hint;</span> &reports.oils_rpt_builder.hint_item_details;
-						</div>
-					</td>	
-				</tr>
-			</tbody>
-		</table>
-		<span class='hide_me' id='oils_rpt_tree_label'>&reports.oils_rpt_builder.template_types;</span>
-
-
-		<div id='oils_rpt_column_editor' class='floaty hide_me'>
-
-			<table id='oils_rpt_editor_tab_table' class='oils_rpt_tab_table'><tbody>
-				<tr>
-					<td width='25%' class='oils_rpt_tab_picker_selected'><a id='oils_rpt_tform_tab' href='javascript:void(0);'>&reports.oils_rpt_builder.display_items;</a></td>
-					<td width='25%'><a id='oils_rpt_filter_tab' href='javascript:void(0);'>&reports.oils_rpt_builder.filters;</a></td>
-					<td width='25%'><a id='oils_rpt_agg_filter_tab' href='javascript:void(0);'>&reports.oils_rpt_builder.aggregate_filters;</a></td>
-					<!--
-					<td width='25%'><a id='oils_rpt_order_by_tab' href='javascript:void(0);'>Column Sorting</a></td>
-					-->
-				</tr>
-			</tbody></table>
-
-			<div style='margin-bottom: 10px;'>
-				<b style='padding-right: 8px;' id='oils_rpt_editor_window_label'/>
-				(<span id='oils_rpt_editor_window_datatype'/>)
-			</div>
-			<div id='oils_rpt_tform_div'>
-				<input size='42' id='oils_rpt_tform_label_input'/>
-				<div class='oils_rpt_field_editor_window'>
-					<div style='margin-bottom: 10px;'>&reports.oils_rpt_builder.field_editor_window.label;</div>
-					<div id='oils_rpt_tform_table'/>
-				</div>
-				<br/><br/>
-				<button id='oils_rpt_tform_submit'>&reports.oils_rpt_builder.add_item;</button>
-			</div>
-
-			<div id='oils_rpt_filter_div' class='hide_me'>
-				<div class='oils_rpt_field_editor_window'>
-					<div style='margin-bottom: 10px;'>&reports.oils_rpt_builder.select_filter_to_apply;</div>
-					<div>
-						<table><tbody><tr>
-							<td>&reports.oils_rpt_builder.choose_a_transform;</td>
-							<td>
-								<div id='oils_rpt_filter_tform_table'/>
-							</td>
-						</tr>
-						<tr>	
-							<td>&reports.oils_rpt_builder.choose_a_filter;</td>
-							<td>
-								<div id='oils_rpt_filter_op_table'/>
-							</td>
-						</tr></tbody></table>
-					</div>
-
-				</div>
-				<button id='oils_rpt_filter_submit'>&reports.oils_rpt_builder.create_filter;</button>
-			</div>
-
-			<div id='oils_rpt_agg_filter_div' class='hide_me'>
-				<div class='oils_rpt_field_editor_window'>
-					<div style='margin-bottom: 10px;'>
-						&reports.oils_rpt_builder.aggregate_filter_to_apply;
-					</div>
-					<div>
-						<table><tbody><tr>
-							<td>&reports.oils_rpt_builder.choose_a_transform;</td>
-							<td>
-								<div id='oils_rpt_agg_filter_tform_table'/>
-							</td>
-						</tr>
-						<tr>	
-							<td>&reports.oils_rpt_builder.choose_a_filter;</td>
-							<td>
-								<div id='oils_rpt_agg_filter_op_table'/>
-							</td>
-						</tr></tbody></table>
-					</div>
-				</div>
-				<button id='oils_rpt_agg_filter_submit'>&reports.oils_rpt_builder.create_aggregate_filter;</button>
-			</div>
-
-
-
-			<div id='oils_rpt_order_by_div' class='hide_me'>
-				<div class='oils_rpt_field_editor_window'>
-					<div style='margin-bottom: 10px;'>
-						&reports.oils_rpt_builder.selected_to_sort_columns;
-					</div>
-					<div>
-						<table><tbody>
-							<tr>
-							<td>&reports.oils_rpt_builder.choose_column;</td>
-							<td>
-								<select id='oils_rpt_order_by_selector'/>
-							</td>
-						</tr>
-						<tr>	
-							<td>&reports.oils_rpt_builder.choose_sorting_direction;</td>
-							<td>
-								<select id='oils_rpt_order_by_dir'>
-									<option value='ascending' selected='selected'>&reports.oils_rpt_builder.ascending;</option>
-									<option value='descending'>&reports.oils_rpt_builder.descending;</option>
-								</select>
-							</td>
-						</tr></tbody></table>
-					</div>
-				</div>
-				<button id='oils_rpt_order_by_submit'>&reports.oils_rpt_builder.add_sort;</button>
-			</div>
-
-
-
-			<div id='oils_rpt_column_editor_close_div'>
-				<button id='oils_rpt_column_editor_close_button'>&reports.oils_rpt_builder.close_window;</button>
-			</div>
-		</div>
-
-
-		<span class='hide_me' id='oils_rpt_confirm_new_report'>
-			&reports.oils_rpt_builder.confirm_new_report;
-		</span>
-
-	</body>
+ <head>
+  <title>&reports.oils_rpt_builder.title;</title>
+  <!--#include virtual="oils_rpt_common.xhtml"-->
+  <script type="text/javascript">
+  <![CDATA[
+   dojo.addOnLoad(oilsInitReportBuilder);
+   dojo.addOnUnload(oilsCleanupReports);
+  ]]>
+  </script>
+
+ </head>
+
+ <body>
+
+  <div class='welcome_box'>
+   <span>&reports.common.logged_in_as;</span><b><span id='oils_rpt_user'/></b>
+  </div>
+
+  <div>
+   <a class='oils_rpt_main_link' href='javascript:_l("oils_rpt.xhtml");'>&reports.oils_rpt_builder.reports_home;</a>
+   <span id='oils_rpt_builder_cloning' class='hide_me' style='padding-left: 10px;'>
+    (<b>&reports.oils_rpt_builder.cloning_template; "<span id='oils_rpt_build_cloning_name'/>"</b>)
+   </span>
+  </div>
+
+  <div id='oils_rpt_tree_loading'>
+   &reports.common.loading;
+  </div>
+
+  <table class='hide_me' id='oils_rpt_table'>
+   <tbody>
+    <tr>
+     <td id='oils_rpt_table_left_td' align='left'>
+
+      <table id='oils_rpt_name_table'><tbody>
+       <tr>
+        <td width='20%'>&reports.oils_rpt_builder.template_name;</td>
+        <td><input size='32' id='oils_rpt_builder_new_name'/></td>
+       </tr><tr>
+        <td>&reports.oils_rpt_builder.template_description;</td>
+        <td><textarea cols='50' rows='2' id='oils_rpt_builder_new_desc'/></td>
+       </tr><tr>
+        <td>&reports.oils_rpt_builder.template_type;</td>
+        <td><select id='oils_rpt_builder_type_selector'/></td>
+       </tr><tr>
+        <td>&reports.oils_rpt_builder.save_this_template;</td>
+        <td><input type='submit' value='Save Template' id='oils_rpt_builder_save_template'/></td>
+       </tr>
+      </tbody></table>
+
+
+      <div id='oils_rpt_tree_div'>
+      </div>
+
+      <br/>
+      <div>
+       <b>**</b>
+       <span style='padding-left: 6px;'>
+        &reports.oils_rpt_builder.filtering_note;
+       </span>
+      </div>
+
+     </td>
+     <td id='oils_rpt_table_right_td' align='right'>
+      <div class='oils_rpt_info_div'>
+       <div class='oils_rpt_info_item oils_rpt_info_title'>&reports.oils_rpt_builder.temp_disp_items;</div>
+       <select id='oils_rpt_display_selector' class='oils_rpt_info_item oils_rpt_info_selector' multiple='multiple'/>
+       <button onclick='oilsDelSelectedDisplayItems();'><u>X</u> &reports.oils_rpt_builder.remove_selected;</button>
+       <button onclick='oilsMoveUpDisplayItems();'>&reports.oils_rpt_builder.move_up;</button>
+       <button onclick='oilsMoveDownDisplayItems();'>&reports.oils_rpt_builder.move_down;</button>
+      </div>
+      <div class='oils_rpt_info_div'>
+       <div class='oils_rpt_info_item oils_rpt_info_title'>&reports.oils_rpt_builder.template_filters;</div>
+       <select id='oils_rpt_filter_selector' class='oils_rpt_info_item oils_rpt_info_selector' multiple='multiple'/>
+       <button onclick='oilsDelSelectedFilterItems();'><u>X</u> &reports.oils_rpt_builder.remove_selected;</button>
+      </div>
+      <div class='oils_rpt_info_div'>
+       <div class='oils_rpt_info_item oils_rpt_info_title'>&reports.oils_rpt_builder.report_aggregate_filters;</div>
+       <select id='oils_rpt_agg_filter_selector' class='oils_rpt_info_item oils_rpt_info_selector' multiple='multiple'/>
+       <button onclick='oilsDelSelectedAggFilterItems();'><u>X</u> &reports.oils_rpt_builder.remove_selected;</button>
+      </div>
+      <div class='oils_rpt_info_div'>
+       <span style='color:red;font-weight:bold;'>&reports.oils_rpt_builder.hint;</span> &reports.oils_rpt_builder.hint_item_details;
+      </div>
+     </td> 
+    </tr>
+   </tbody>
+  </table>
+  <span class='hide_me' id='oils_rpt_tree_label'>&reports.oils_rpt_builder.template_types;</span>
+
+
+  <div id='oils_rpt_column_editor' class='floaty hide_me'>
+
+   <table id='oils_rpt_editor_tab_table' class='oils_rpt_tab_table'><tbody>
+    <tr>
+     <td width='25%' class='oils_rpt_tab_picker_selected'><a id='oils_rpt_tform_tab' href='javascript:void(0);'>&reports.oils_rpt_builder.display_items;</a></td>
+     <td width='25%'><a id='oils_rpt_filter_tab' href='javascript:void(0);'>&reports.oils_rpt_builder.filters;</a></td>
+     <td width='25%'><a id='oils_rpt_agg_filter_tab' href='javascript:void(0);'>&reports.oils_rpt_builder.aggregate_filters;</a></td>
+     <!--
+     <td width='25%'><a id='oils_rpt_order_by_tab' href='javascript:void(0);'>Column Sorting</a></td>
+     -->
+    </tr>
+   </tbody></table>
+
+   <div style='margin-bottom: 10px;'>
+    <b style='padding-right: 8px;' id='oils_rpt_editor_window_label'/>
+    (<span id='oils_rpt_editor_window_datatype'/>)
+   </div>
+   <div id='oils_rpt_tform_div'>
+    <input size='42' id='oils_rpt_tform_label_input'/>
+    <div class='oils_rpt_field_editor_window'>
+     <div style='margin-bottom: 10px;'>&reports.oils_rpt_builder.field_editor_window.label;</div>
+     <div id='oils_rpt_tform_table'/>
+    </div>
+    <br/><br/>
+    <button id='oils_rpt_tform_submit'>&reports.oils_rpt_builder.add_item;</button>
+   </div>
+
+   <div id='oils_rpt_filter_div' class='hide_me'>
+    <div class='oils_rpt_field_editor_window'>
+     <div style='margin-bottom: 10px;'>&reports.oils_rpt_builder.select_filter_to_apply;</div>
+     <div>
+      <table><tbody><tr>
+       <td>&reports.oils_rpt_builder.choose_a_transform;</td>
+       <td>
+        <div id='oils_rpt_filter_tform_table'/>
+       </td>
+      </tr>
+      <tr> 
+       <td>&reports.oils_rpt_builder.choose_a_filter;</td>
+       <td>
+        <div id='oils_rpt_filter_op_table'/>
+       </td>
+      </tr></tbody></table>
+     </div>
+
+    </div>
+    <button id='oils_rpt_filter_submit'>&reports.oils_rpt_builder.create_filter;</button>
+   </div>
+
+   <div id='oils_rpt_agg_filter_div' class='hide_me'>
+    <div class='oils_rpt_field_editor_window'>
+     <div style='margin-bottom: 10px;'>
+      &reports.oils_rpt_builder.aggregate_filter_to_apply;
+     </div>
+     <div>
+      <table><tbody><tr>
+       <td>&reports.oils_rpt_builder.choose_a_transform;</td>
+       <td>
+        <div id='oils_rpt_agg_filter_tform_table'/>
+       </td>
+      </tr>
+      <tr> 
+       <td>&reports.oils_rpt_builder.choose_a_filter;</td>
+       <td>
+        <div id='oils_rpt_agg_filter_op_table'/>
+       </td>
+      </tr></tbody></table>
+     </div>
+    </div>
+    <button id='oils_rpt_agg_filter_submit'>&reports.oils_rpt_builder.create_aggregate_filter;</button>
+   </div>
+
+
+
+   <div id='oils_rpt_order_by_div' class='hide_me'>
+    <div class='oils_rpt_field_editor_window'>
+     <div style='margin-bottom: 10px;'>
+      &reports.oils_rpt_builder.selected_to_sort_columns;
+     </div>
+     <div>
+      <table><tbody>
+       <tr>
+       <td>&reports.oils_rpt_builder.choose_column;</td>
+       <td>
+        <select id='oils_rpt_order_by_selector'/>
+       </td>
+      </tr>
+      <tr> 
+       <td>&reports.oils_rpt_builder.choose_sorting_direction;</td>
+       <td>
+        <select id='oils_rpt_order_by_dir'>
+         <option value='ascending' selected='selected'>&reports.oils_rpt_builder.ascending;</option>
+         <option value='descending'>&reports.oils_rpt_builder.descending;</option>
+        </select>
+       </td>
+      </tr></tbody></table>
+     </div>
+    </div>
+    <button id='oils_rpt_order_by_submit'>&reports.oils_rpt_builder.add_sort;</button>
+   </div>
+
+
+
+   <div id='oils_rpt_column_editor_close_div'>
+    <button id='oils_rpt_column_editor_close_button'>&reports.oils_rpt_builder.close_window;</button>
+   </div>
+  </div>
+
+
+  <span class='hide_me' id='oils_rpt_confirm_new_report'>
+   &reports.oils_rpt_builder.confirm_new_report;
+  </span>
+
+ </body>
 </html>
 
 
diff --git a/Open-ILS/web/reports/oils_rpt_builder_widgets.js b/Open-ILS/web/reports/oils_rpt_builder_widgets.js
index 130e6f60af..527ca1af5a 100644
--- a/Open-ILS/web/reports/oils_rpt_builder_widgets.js
+++ b/Open-ILS/web/reports/oils_rpt_builder_widgets.js
@@ -1,47 +1,47 @@
 function oilsRptBuilderWidget(node) {
-	this.init(node);
+ this.init(node);
 }
 
 oilsRptBuilderWidget.prototype.init = function(node) {
-	if(!node) return;
-	this.node = node;
-	_debug(this.node.id);
-
-	this.selector = $n(this.node, 'selector');
-//	this.widgetNode = $n(this.node, 'widget_td');
-	var obj = this;
-	this.selector.onchange = function() { 
-		obj.showWidgets(
-			obj.selector.options[obj.selector.selectedIndex]);
-	}
-	//this.hideWidgets();
+ if(!node) return;
+ this.node = node;
+ _debug(this.node.id);
+
+ this.selector = $n(this.node, 'selector');
+// this.widgetNode = $n(this.node, 'widget_td');
+ var obj = this;
+ this.selector.onchange = function() { 
+  obj.showWidgets(
+   obj.selector.options[obj.selector.selectedIndex]);
+ }
+ //this.hideWidgets();
 }
 
 
 /*
 oilsRptBuilderWidget.prototype.hideWidgets = function(node) {
-	if(!node) node = this.widgetNode;
-	if( node.nodeType != 1 ) return;
-	if( node.getAttribute('widget') ) {
-		hideMe(node);
-	} else {
-		var cs = node.childNodes;
-		for( var i = 0; cs && i < cs.length; i++ )
-			this.hideWidgets(cs[i]);
-	}
+ if(!node) node = this.widgetNode;
+ if( node.nodeType != 1 ) return;
+ if( node.getAttribute('widget') ) {
+  hideMe(node);
+ } else {
+  var cs = node.childNodes;
+  for( var i = 0; cs && i < cs.length; i++ )
+   this.hideWidgets(cs[i]);
+ }
 }
 
 
 oilsRptBuilderWidget.prototype.showWidgets = function(opt) {
-	_debug("showing widget with opt value: "+opt.value);
-	this.hideWidgets();
-	var widget = opt.getAttribute('widget');
-	if( widget ) unHideMe($n(this.node, widget));
+ _debug("showing widget with opt value: "+opt.value);
+ this.hideWidgets();
+ var widget = opt.getAttribute('widget');
+ if( widget ) unHideMe($n(this.node, widget));
 }
 */
 
 oilsRptBuilderWidget.prototype.getCurrentOpt = function() {
-	return this.selector.options[this.selector.selectedIndex];
+ return this.selector.options[this.selector.selectedIndex];
 }
 
 
@@ -55,49 +55,49 @@ function oilsRptTFormManager(node) { this.init(node); }
 
 /* displays the appropriate transforms for the given types and flags */
 oilsRptTFormManager.prototype.build = function( dtype, show_agg, show_noagg ) {
-	for( var i = 0; i < this.selector.options.length; i++ ) {
-		var opt = this.selector.options[i];
-		var t = opt.getAttribute('datatype');
-		if( t && t != dtype ){
-			hideMe(opt);
-		} else {
-			var ag = opt.getAttribute('aggregate');
-			if( ag && show_agg )
-				unHideMe(opt);
-			else if( ag && ! show_agg )
-				hideMe(opt)
-			else if( !ag && show_noagg )
-				unHideMe(opt);
-			else hideMe(opt);
-		}
-	}
+ for( var i = 0; i < this.selector.options.length; i++ ) {
+  var opt = this.selector.options[i];
+  var t = opt.getAttribute('datatype');
+  if( t && t != dtype ){
+   hideMe(opt);
+  } else {
+   var ag = opt.getAttribute('aggregate');
+   if( ag && show_agg )
+    unHideMe(opt);
+   else if( ag && ! show_agg )
+    hideMe(opt)
+   else if( !ag && show_noagg )
+    unHideMe(opt);
+   else hideMe(opt);
+  }
+ }
 }
 
 oilsRptTFormManager.prototype.getCurrentTForm = function() {
-	var opt = this.getCurrentOpt();
-	var data = {
-		value		 : opt.value,
-		datatype  : opt.getAttribute('datatype'),
-		aggregate : opt.getAttribute('aggregate'),
-	};
-	//data.params = this.getWidgetParams(data);
-	return data;
+ var opt = this.getCurrentOpt();
+ var data = {
+  value   : opt.value,
+  datatype  : opt.getAttribute('datatype'),
+  aggregate : opt.getAttribute('aggregate'),
+ };
+ //data.params = this.getWidgetParams(data);
+ return data;
 }
 
 
 /*
 oilsRptTFormManager.prototype.getWidgetParams = function(obj) {
-	switch(obj.datatype) {
-		case 'string' :
-			switch(obj.value) {
-				case 'substring':
-					return [ 
-						$n(this.widgetNode, 'string_substring_offset').value,
-						$n(this.widgetNode, 'string_substring_length').value
-					];
-			}
-	}
-	return null;
+ switch(obj.datatype) {
+  case 'string' :
+   switch(obj.value) {
+    case 'substring':
+     return [ 
+      $n(this.widgetNode, 'string_substring_offset').value,
+      $n(this.widgetNode, 'string_substring_length').value
+     ];
+   }
+ }
+ return null;
 }
 */
 
diff --git a/Open-ILS/web/reports/oils_rpt_common.xhtml b/Open-ILS/web/reports/oils_rpt_common.xhtml
index 9666f1f156..1fb52a4656 100644
--- a/Open-ILS/web/reports/oils_rpt_common.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_common.xhtml
@@ -1,23 +1,23 @@
 <!-- Load dojo -->
 <style type="text/css">
-	@import url('/js/dojo/dojo/resources/dojo.css');
-	@import url('/js/dojo/dijit/themes/tundra/tundra.css');
-	@import url('/js/dojo/dojox/widget/Toaster/Toaster.css');
+ @import url('/js/dojo/dojo/resources/dojo.css');
+ @import url('/js/dojo/dijit/themes/tundra/tundra.css');
+ @import url('/js/dojo/dojox/widget/Toaster/Toaster.css');
 </style>
 <script type="text/javascript">
-	var djConfig= {
-		isDebug: false,
-		parseOnLoad: true
-	}
+ var djConfig= {
+  isDebug: false,
+  parseOnLoad: true
+ }
 </script>
 <script type="text/javascript" src="/js/dojo/dojo/dojo.js"></script>
 <script type="text/javascript">
-	dojo.require('dojo.parser');
-	dojo.require('dojo.string');
+ dojo.require('dojo.parser');
+ dojo.require('dojo.string');
 
-	function status_update (markup) {
-		dojo.byId('status_text').innerHTML = markup;
-	}
+ function status_update (markup) {
+  dojo.byId('status_text').innerHTML = markup;
+ }
 </script>
 
 <script type='text/javascript' src='/opac/common/js/utils.js'> </script>
@@ -39,17 +39,17 @@
 <script type='text/javascript' src='/opac/common/js/fm_table_conf.js'> </script>
 <script type='text/javascript' src='/opac/common/js/md5.js'> </script>
 <script type="text/javascript">
-	stpicopen  = '../opac/images/slimtree/folder2.gif';
-	stpicclose = '../opac/images/slimtree/folderopen2.gif';
-	stpicblank = '../opac/images/slimtree/page.gif';
-	stpicline  = '../opac/images/slimtree/line.gif';
-	stpicjoin  = '../opac/images/slimtree/join.gif';
-	stpicjoinb = '../opac/images/slimtree/joinbottom.gif';
+ stpicopen  = '../opac/images/slimtree/folder2.gif';
+ stpicclose = '../opac/images/slimtree/folderopen2.gif';
+ stpicblank = '../opac/images/slimtree/page.gif';
+ stpicline  = '../opac/images/slimtree/line.gif';
+ stpicjoin  = '../opac/images/slimtree/join.gif';
+ stpicjoinb = '../opac/images/slimtree/joinbottom.gif';
 </script>
 
 
 <link rel="stylesheet" type="text/css" media="all" 
-	href="/opac/common/js/jscalendar/calendar-brown.css" title="win2k-cold-1" />
+ href="/opac/common/js/jscalendar/calendar-brown.css" title="win2k-cold-1" />
 <script type="text/javascript" src="/opac/common/js/jscalendar/calendar.js"></script>
 <script type="text/javascript" src="/opac/common/js/jscalendar/lang/calendar-en.js"></script>
 <script type="text/javascript" src="/opac/common/js/jscalendar/calendar-setup.js"></script>
@@ -77,19 +77,19 @@
 
 
 <span class='hide_me' id='oils_rpt_generic_success'>
-	&reports.oils_rpt_common.action_succeeded;
+ &reports.oils_rpt_common.action_succeeded;
 </span>
 
 <span class='hide_me' id='oils_rpt_generic_failure'>
-	&reports.oils_rpt_common.action_failed;
+ &reports.oils_rpt_common.action_failed;
 </span>
 
 
 <button style='padding: 0px;' id='generic_calendar_button' class='hide_me'>
-	<img src="/opac/common/js/jscalendar/img.gif"
-		style="cursor: pointer; border: 1px solid red; padding: 0px; margin: -3px;"
-		title="&reports.oils_rpt_common.generic_calendar_button;"
-		onmouseover="this.style.background='red';"
-		onmouseout="this.style.background=''" />
+ <img src="/opac/common/js/jscalendar/img.gif"
+  style="cursor: pointer; border: 1px solid red; padding: 0px; margin: -3px;"
+  title="&reports.oils_rpt_common.generic_calendar_button;"
+  onmouseover="this.style.background='red';"
+  onmouseout="this.style.background=''" />
 </button>
 
diff --git a/Open-ILS/web/reports/oils_rpt_editor.xhtml b/Open-ILS/web/reports/oils_rpt_editor.xhtml
index bc7bd5d1a2..102663db9a 100644
--- a/Open-ILS/web/reports/oils_rpt_editor.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_editor.xhtml
@@ -1,252 +1,252 @@
 <div id='oils_rpt_editor_div'>
-	<table width='100%' id='oils_rpt_editor_table'>
-		<tbody>
-			<tr>
-				<th>&reports.oils_rpt_editor.template_name;</th>
-				<td><span id='oils_rpt_report_editor_template_name'/></td>
-			</tr>
-			<tr>
-				<th>&reports.oils_rpt_editor.template_creator;</th>
-				<td><span id='oils_rpt_report_editor_template_creator'/></td>
-			</tr>
-			<tr>
-				<th>&reports.oils_rpt_editor.template_description;</th>
-				<td><span id='oils_rpt_report_editor_template_description'/></td>
-			</tr>
+ <table width='100%' id='oils_rpt_editor_table'>
+  <tbody>
+   <tr>
+    <th>&reports.oils_rpt_editor.template_name;</th>
+    <td><span id='oils_rpt_report_editor_template_name'/></td>
+   </tr>
+   <tr>
+    <th>&reports.oils_rpt_editor.template_creator;</th>
+    <td><span id='oils_rpt_report_editor_template_creator'/></td>
+   </tr>
+   <tr>
+    <th>&reports.oils_rpt_editor.template_description;</th>
+    <td><span id='oils_rpt_report_editor_template_description'/></td>
+   </tr>
 
-			<tr>
-				<th>&reports.oils_rpt_editor.report_name;</th>
-				<script>
-					var oils_rpt_report_editor_name_func = function(obj) {
-						if(obj.value) removeCSSClass(obj, OILS_RPT_INVALID_DATA);
-						else addCSSClass(obj, OILS_RPT_INVALID_DATA);
-					}
-				</script>
-				<td>
-					<input type='text' id='oils_rpt_report_editor_name' class='oils_rpt_invalid_input'
-						onkeyup='oils_rpt_report_editor_name_func(this);' 
-						onchange='oils_rpt_report_editor_name_func(this);'/>
-				</td>
-			</tr>
-			<tr>
-				<th>&reports.oils_rpt_editor.report_description;</th>
-				<td><textarea cols='45' rows='2' id='oils_rpt_report_editor_desc'/></td>
-			</tr>
-			<tr>
-				<th>&reports.oils_rpt_editor.report_columns;</th>
-				<td><b id='oils_rpt_report_editor_cols'/></td>
-			</tr>
-			<tr class='hide_me' id='oils_rpt_editor_pivot_label_row'>
-				<th>&reports.oils_rpt_editor.pivot_label_column;</th>
-				<td>
+   <tr>
+    <th>&reports.oils_rpt_editor.report_name;</th>
+    <script>
+     var oils_rpt_report_editor_name_func = function(obj) {
+      if(obj.value) removeCSSClass(obj, OILS_RPT_INVALID_DATA);
+      else addCSSClass(obj, OILS_RPT_INVALID_DATA);
+     }
+    </script>
+    <td>
+     <input type='text' id='oils_rpt_report_editor_name' class='oils_rpt_invalid_input'
+      onkeyup='oils_rpt_report_editor_name_func(this);' 
+      onchange='oils_rpt_report_editor_name_func(this);'/>
+    </td>
+   </tr>
+   <tr>
+    <th>&reports.oils_rpt_editor.report_description;</th>
+    <td><textarea cols='45' rows='2' id='oils_rpt_report_editor_desc'/></td>
+   </tr>
+   <tr>
+    <th>&reports.oils_rpt_editor.report_columns;</th>
+    <td><b id='oils_rpt_report_editor_cols'/></td>
+   </tr>
+   <tr class='hide_me' id='oils_rpt_editor_pivot_label_row'>
+    <th>&reports.oils_rpt_editor.pivot_label_column;</th>
+    <td>
                     <select id='oils_rpt_editor_pivot_label'>
                         <option selected='selected' value=''> -- &reports.oils_rpt_editor.select_option; -- </option>
                     </select>
                 </td>
-			</tr>
-			<tr class='hide_me' id='oils_rpt_editor_pivot_data_row'>
-				<th>&reports.oils_rpt_editor.pivot_data_column;</th>
-				<td>
+   </tr>
+   <tr class='hide_me' id='oils_rpt_editor_pivot_data_row'>
+    <th>&reports.oils_rpt_editor.pivot_data_column;</th>
+    <td>
                     <select id='oils_rpt_editor_pivot_data'>
                     </select>
                 </td>
-			</tr>
+   </tr>
 
-			<!--
-			<tr><td colspan='2'><hr/></td></tr>
-			-->
-			<tr>
-				<th>&reports.oils_rpt_editor.store_report_definition;</th>
-				<td>
-					<div style='margin-bottom: 7px;'>
-						<span>&reports.oils_rpt_editor.selected_folder;</span>
-						<b id='oils_rpt_report_editor_selected_folder'/>
-					</div>
-					<span id='oils_rpt_report_editor_dest_folder'/>
-				</td>
-			</tr>
-			<!--
-			<tr><td colspan='2'><hr/></td></tr>
-			-->
-			<tr>
-				<td colspan='2' style='padding: 10px;'>
-					<!--#include virtual="oils_rpt_param_editor.xhtml"-->
-				</td>
-			</tr>
-			<!--
-			<tr><td colspan='2'><hr/></td></tr>
-			-->
-			<!--
-			<tr>
-				<th colspan='2'>Output Options</th>
-			</tr>
-			-->
-			<tr>
-				<td colspan='2'>
-					<div><b>&reports.oils_rpt_editor.output_options;</b></div>
-					<ul>
-						<li><input type="checkbox" id="oils_rpt_format_excel" value="t" checked="checked"/><span>&reports.oils_rpt_editor.excel_output;</span></li>
-						<li><input type="checkbox" id="oils_rpt_format_csv" value="t"/><span>&reports.oils_rpt_editor.csv_output;</span></li>
-						<li>
-							<input type="checkbox" id="oils_rpt_format_html" value="t" checked="checked"/>&reports.oils_rpt_editor.html_output;
-							<ul>
-								<li><input type="checkbox" id="oils_rpt_format_chart_bar" value="t" checked="checked"/><span>&reports.oils_rpt_editor.bar_charts;</span></li>
-								<!--
-								<li><input type="checkbox" id="oils_rpt_format_chart_pie" value="t"/><span>Pie Charts</span></li>
-								-->
-								<li><input type="checkbox" id="oils_rpt_format_chart_line" value="t"/><span>&reports.oils_rpt_editor.line_charts;</span></li>
-							</ul>
-						</li>
-					</ul>
+   <!--
+   <tr><td colspan='2'><hr/></td></tr>
+   -->
+   <tr>
+    <th>&reports.oils_rpt_editor.store_report_definition;</th>
+    <td>
+     <div style='margin-bottom: 7px;'>
+      <span>&reports.oils_rpt_editor.selected_folder;</span>
+      <b id='oils_rpt_report_editor_selected_folder'/>
+     </div>
+     <span id='oils_rpt_report_editor_dest_folder'/>
+    </td>
+   </tr>
+   <!--
+   <tr><td colspan='2'><hr/></td></tr>
+   -->
+   <tr>
+    <td colspan='2' style='padding: 10px;'>
+     <!--#include virtual="oils_rpt_param_editor.xhtml"-->
+    </td>
+   </tr>
+   <!--
+   <tr><td colspan='2'><hr/></td></tr>
+   -->
+   <!--
+   <tr>
+    <th colspan='2'>Output Options</th>
+   </tr>
+   -->
+   <tr>
+    <td colspan='2'>
+     <div><b>&reports.oils_rpt_editor.output_options;</b></div>
+     <ul>
+      <li><input type="checkbox" id="oils_rpt_format_excel" value="t" checked="checked"/><span>&reports.oils_rpt_editor.excel_output;</span></li>
+      <li><input type="checkbox" id="oils_rpt_format_csv" value="t"/><span>&reports.oils_rpt_editor.csv_output;</span></li>
+      <li>
+       <input type="checkbox" id="oils_rpt_format_html" value="t" checked="checked"/>&reports.oils_rpt_editor.html_output;
+       <ul>
+        <li><input type="checkbox" id="oils_rpt_format_chart_bar" value="t" checked="checked"/><span>&reports.oils_rpt_editor.bar_charts;</span></li>
+        <!--
+        <li><input type="checkbox" id="oils_rpt_format_chart_pie" value="t"/><span>Pie Charts</span></li>
+        -->
+        <li><input type="checkbox" id="oils_rpt_format_chart_line" value="t"/><span>&reports.oils_rpt_editor.line_charts;</span></li>
+       </ul>
+      </li>
+     </ul>
 
-				</td>
-			</tr>
-			<!--
-			<tr><td colspan='2'><hr/></td></tr>
-			-->
-			<tr>
-				<th>&reports.oils_rpt_editor.recurring_report;</th>
-				<td>
-					<input type="checkbox" id="oils_rpt_recur" value="t"
-						onclick='
-							if(this.checked) {
-								DOM.oils_rpt_recur_count.disabled = false;
-								DOM.oils_rpt_recur_interval_type.disabled = false;
-							} else {
-								DOM.oils_rpt_recur_count.disabled = true;
-								DOM.oils_rpt_recur_interval_type.disabled = true;
-							}
-					'/>
-				</td>
-			</tr>
-			<tr>
-				<th>&reports.oils_rpt_editor.recurring_interval;</th>
-				<td>
-					<select id="oils_rpt_recur_count" disabled='disabled'>
-						<option value='1'>1</option>
-						<option value='2'>2</option>
-						<option value='3'>3</option>
-						<option value='4'>4</option>
-						<option value='5'>5</option>
-						<option value='6'>6</option>
-						<option value='7'>7</option>
-						<option value='8'>8</option>
-						<option value='9'>9</option>
-						<option value='10'>10</option>
-						<option value='11'>11</option>
-						<option value='12'>12</option>
-						<option value='13'>13</option>
-						<option value='14'>14</option>
-						<option value='15'>15</option>
-						<option value='16'>16</option>
-						<option value='17'>17</option>
-						<option value='18'>18</option>
-						<option value='19'>19</option>
-						<option value='20'>20</option>
-						<option value='21'>21</option>
-						<option value='22'>22</option>
-						<option value='23'>23</option>
-						<option value='24'>24</option>
-					</select>
-					<select id="oils_rpt_recur_interval_type" disabled='disabled'>
-						<option value="days">&reports.oils_rpt_editor.days;</option>
-						<option value="weeks">&reports.oils_rpt_editor.weeks;</option>
-						<option value="months">&reports.oils_rpt_editor.months;</option>
-					</select>
-				</td>
-			</tr>
-			<tr>
-				<!-- XXX: This needs to be replaced with a radio button widget -->
-				<th colspan="2">
-					<div>
-						<input type='checkbox' id='oils_rpt_report_editor_run_now' checked='checked'
-							onclick='
-								if(this.checked) {
-									DOM.oils_rpt_param_editor_sched_start_date.disabled = true;
-									DOM.oils_rpt_param_editor_sched_start_hour.disabled = true;
-									dojo.attr(dojo.byId("oils_rpt_report_editor_schedule"), "checked", false);
-								} else {
-									DOM.oils_rpt_param_editor_sched_start_date.disabled = false;
-									DOM.oils_rpt_param_editor_sched_start_hour.disabled = false;
-									dojo.attr(dojo.byId("oils_rpt_report_editor_schedule"), "checked", true);
-								}
-							'
-						/>
-						<span>&reports.oils_rpt_editor.run_asap;</span>
-					</div>
-					<div>
-						<input type='checkbox' id='oils_rpt_report_editor_schedule'
-							onclick='
-								if(this.checked) {
-									DOM.oils_rpt_param_editor_sched_start_date.disabled = false;
-									DOM.oils_rpt_param_editor_sched_start_hour.disabled = false;
-									dojo.attr(dojo.byId("oils_rpt_report_editor_run_now"), "checked", false);
-								} else {
-									DOM.oils_rpt_param_editor_sched_start_date.disabled = true;
-									DOM.oils_rpt_param_editor_sched_start_hour.disabled = true;
-									dojo.attr(dojo.byId("oils_rpt_report_editor_run_now"), "checked", true);
-								}
-							'
-						/>
+    </td>
+   </tr>
+   <!--
+   <tr><td colspan='2'><hr/></td></tr>
+   -->
+   <tr>
+    <th>&reports.oils_rpt_editor.recurring_report;</th>
+    <td>
+     <input type="checkbox" id="oils_rpt_recur" value="t"
+      onclick='
+       if(this.checked) {
+        DOM.oils_rpt_recur_count.disabled = false;
+        DOM.oils_rpt_recur_interval_type.disabled = false;
+       } else {
+        DOM.oils_rpt_recur_count.disabled = true;
+        DOM.oils_rpt_recur_interval_type.disabled = true;
+       }
+     '/>
+    </td>
+   </tr>
+   <tr>
+    <th>&reports.oils_rpt_editor.recurring_interval;</th>
+    <td>
+     <select id="oils_rpt_recur_count" disabled='disabled'>
+      <option value='1'>1</option>
+      <option value='2'>2</option>
+      <option value='3'>3</option>
+      <option value='4'>4</option>
+      <option value='5'>5</option>
+      <option value='6'>6</option>
+      <option value='7'>7</option>
+      <option value='8'>8</option>
+      <option value='9'>9</option>
+      <option value='10'>10</option>
+      <option value='11'>11</option>
+      <option value='12'>12</option>
+      <option value='13'>13</option>
+      <option value='14'>14</option>
+      <option value='15'>15</option>
+      <option value='16'>16</option>
+      <option value='17'>17</option>
+      <option value='18'>18</option>
+      <option value='19'>19</option>
+      <option value='20'>20</option>
+      <option value='21'>21</option>
+      <option value='22'>22</option>
+      <option value='23'>23</option>
+      <option value='24'>24</option>
+     </select>
+     <select id="oils_rpt_recur_interval_type" disabled='disabled'>
+      <option value="days">&reports.oils_rpt_editor.days;</option>
+      <option value="weeks">&reports.oils_rpt_editor.weeks;</option>
+      <option value="months">&reports.oils_rpt_editor.months;</option>
+     </select>
+    </td>
+   </tr>
+   <tr>
+    <!-- XXX: This needs to be replaced with a radio button widget -->
+    <th colspan="2">
+     <div>
+      <input type='checkbox' id='oils_rpt_report_editor_run_now' checked='checked'
+       onclick='
+        if(this.checked) {
+         DOM.oils_rpt_param_editor_sched_start_date.disabled = true;
+         DOM.oils_rpt_param_editor_sched_start_hour.disabled = true;
+         dojo.attr(dojo.byId("oils_rpt_report_editor_schedule"), "checked", false);
+        } else {
+         DOM.oils_rpt_param_editor_sched_start_date.disabled = false;
+         DOM.oils_rpt_param_editor_sched_start_hour.disabled = false;
+         dojo.attr(dojo.byId("oils_rpt_report_editor_schedule"), "checked", true);
+        }
+       '
+      />
+      <span>&reports.oils_rpt_editor.run_asap;</span>
+     </div>
+     <div>
+      <input type='checkbox' id='oils_rpt_report_editor_schedule'
+       onclick='
+        if(this.checked) {
+         DOM.oils_rpt_param_editor_sched_start_date.disabled = false;
+         DOM.oils_rpt_param_editor_sched_start_hour.disabled = false;
+         dojo.attr(dojo.byId("oils_rpt_report_editor_run_now"), "checked", false);
+        } else {
+         DOM.oils_rpt_param_editor_sched_start_date.disabled = true;
+         DOM.oils_rpt_param_editor_sched_start_hour.disabled = true;
+         dojo.attr(dojo.byId("oils_rpt_report_editor_run_now"), "checked", true);
+        }
+       '
+      />
 
-						<!-- XXX: This should be replaced with a standard date/time picker for i18n purposes -->
-						<input id="oils_rpt_param_editor_sched_start_date" type="text" size="10" disabled="disabled"/>
-						<select id='oils_rpt_param_editor_sched_start_hour' disabled="disabled">
-							<option value="00:00">&reports.oils_rpt_editor.midnight;</option>
-							<option value="01:00">1 AM</option>
-							<option value="02:00">2 AM</option>
-							<option value="03:00">3 AM</option>
-							<option value="04:00">4 AM</option>
-							<option value="05:00">5 AM</option>
-							<option value="06:00">6 AM</option>
-							<option value="07:00">7 AM</option>
-							<option value="09:00">8 AM</option>
-							<option value="09:00">9 AM</option>
-							<option value="10:00">10 AM</option>
-							<option value="11:00">11 AM</option>
-							<option value="12:00">&reports.oils_rpt_editor.noon;</option>
-							<option value="13:00">1 PM</option>
-							<option value="14:00">2 PM</option>
-							<option value="15:00">3 PM</option>
-							<option value="16:00">4 PM</option>
-							<option value="17:00">5 PM</option>
-							<option value="18:00">6 PM</option>
-							<option value="19:00">7 PM</option>
-							<option value="20:00">8 PM</option>
-							<option value="21:00">9 PM</option>
-							<option value="22:00">10 PM</option>
-							<option value="23:00">11 PM</option>
-						</select>
-					</div>
-				</th>
-			</tr>
-			<tr>
-				<th>&reports.oils_rpt_editor.sent_to_email;</th>
-				<td><input id="oils_rpt_param_editor_sched_email" type="text" size="25"/></td>
-			</tr>
-			<tr>
-				<th>&reports.oils_rpt_editor.storage_folder_for_output;</th>
-				<td>
-					<div style='margin-bottom: 7px;'>
-						<span>&reports.oils_rpt_editor.selected_folder;</span>
-						<b id='oils_rpt_output_selected_folder'/>
-					</div>
-					<span id='oils_rpt_output_dest_folder'/>
-				</td>
-			</tr>
+      <!-- XXX: This should be replaced with a standard date/time picker for i18n purposes -->
+      <input id="oils_rpt_param_editor_sched_start_date" type="text" size="10" disabled="disabled"/>
+      <select id='oils_rpt_param_editor_sched_start_hour' disabled="disabled">
+       <option value="00:00">&reports.oils_rpt_editor.midnight;</option>
+       <option value="01:00">1 AM</option>
+       <option value="02:00">2 AM</option>
+       <option value="03:00">3 AM</option>
+       <option value="04:00">4 AM</option>
+       <option value="05:00">5 AM</option>
+       <option value="06:00">6 AM</option>
+       <option value="07:00">7 AM</option>
+       <option value="09:00">8 AM</option>
+       <option value="09:00">9 AM</option>
+       <option value="10:00">10 AM</option>
+       <option value="11:00">11 AM</option>
+       <option value="12:00">&reports.oils_rpt_editor.noon;</option>
+       <option value="13:00">1 PM</option>
+       <option value="14:00">2 PM</option>
+       <option value="15:00">3 PM</option>
+       <option value="16:00">4 PM</option>
+       <option value="17:00">5 PM</option>
+       <option value="18:00">6 PM</option>
+       <option value="19:00">7 PM</option>
+       <option value="20:00">8 PM</option>
+       <option value="21:00">9 PM</option>
+       <option value="22:00">10 PM</option>
+       <option value="23:00">11 PM</option>
+      </select>
+     </div>
+    </th>
+   </tr>
+   <tr>
+    <th>&reports.oils_rpt_editor.sent_to_email;</th>
+    <td><input id="oils_rpt_param_editor_sched_email" type="text" size="25"/></td>
+   </tr>
+   <tr>
+    <th>&reports.oils_rpt_editor.storage_folder_for_output;</th>
+    <td>
+     <div style='margin-bottom: 7px;'>
+      <span>&reports.oils_rpt_editor.selected_folder;</span>
+      <b id='oils_rpt_output_selected_folder'/>
+     </div>
+     <span id='oils_rpt_output_dest_folder'/>
+    </td>
+   </tr>
 
-			<tr>
-				<td colspan='2'>
-					<input id='oils_rpt_report_editor_save' type='submit' value='&reports.oils_rpt_editor.save_report;'/>
-				</td>
-			</tr>
+   <tr>
+    <td colspan='2'>
+     <input id='oils_rpt_report_editor_save' type='submit' value='&reports.oils_rpt_editor.save_report;'/>
+    </td>
+   </tr>
 
-		</tbody>
-	</table>
+  </tbody>
+ </table>
 
-	<span id='oils_rpt_empty_param' class='hide_me'>
-		&reports.oils_rpt_editor.empty_parameter;
-	</span>
+ <span id='oils_rpt_empty_param' class='hide_me'>
+  &reports.oils_rpt_editor.empty_parameter;
+ </span>
 
     <span id='oils_rpt_report_exists' class='hide_me'>
         &reports.oils_rpt_editor.same_name;
diff --git a/Open-ILS/web/reports/oils_rpt_filters.js b/Open-ILS/web/reports/oils_rpt_filters.js
index 714cb7b545..a056acfc20 100644
--- a/Open-ILS/web/reports/oils_rpt_filters.js
+++ b/Open-ILS/web/reports/oils_rpt_filters.js
@@ -3,61 +3,61 @@ dojo.requireLocalization("openils.reports", "reports");
 var rpt_strings = dojo.i18n.getLocalization("openils.reports", "reports");
 
 var OILS_RPT_FILTERS = {
-	'=' : {
-		label : rpt_strings.FILTERS_LABEL_EQUALS
-	},
+ '=' : {
+  label : rpt_strings.FILTERS_LABEL_EQUALS
+ },
 
-	'like' : {
-		label : rpt_strings.FILTERS_LABEL_LIKE
-	}, 
+ 'like' : {
+  label : rpt_strings.FILTERS_LABEL_LIKE
+ }, 
 
-	ilike : {
-		label : rpt_strings.FILTERS_LABEL_ILIKE
-	},
+ ilike : {
+  label : rpt_strings.FILTERS_LABEL_ILIKE
+ },
 
-	'>' : {
-		label : rpt_strings.FILTERS_LABEL_GREATER_THAN,
-		labels : { timestamp : rpt_strings.FILTERS_LABEL_GT_TIME }
-	},
+ '>' : {
+  label : rpt_strings.FILTERS_LABEL_GREATER_THAN,
+  labels : { timestamp : rpt_strings.FILTERS_LABEL_GT_TIME }
+ },
 
-	'>=' : {
-		label : rpt_strings.FILTERS_LABEL_GT_EQUAL,
-		labels : { timestamp : rpt_strings.FILTERS_LABEL_GTE_TIME }
-	}, 
+ '>=' : {
+  label : rpt_strings.FILTERS_LABEL_GT_EQUAL,
+  labels : { timestamp : rpt_strings.FILTERS_LABEL_GTE_TIME }
+ }, 
 
 
-	'<' : {
-		label : rpt_strings.FILTERS_LABEL_LESS_THAN,
-		labels : { timestamp : rpt_strings.FILTERS_LABEL_LT_TIME }
-	}, 
+ '<' : {
+  label : rpt_strings.FILTERS_LABEL_LESS_THAN,
+  labels : { timestamp : rpt_strings.FILTERS_LABEL_LT_TIME }
+ }, 
 
-	'<=' : {
-		label : rpt_strings.FILTERS_LABEL_LT_EQUAL,
-		labels : { timestamp : rpt_strings.FILTERS_LABEL_LSE_TIME }
-	},
+ '<=' : {
+  label : rpt_strings.FILTERS_LABEL_LT_EQUAL,
+  labels : { timestamp : rpt_strings.FILTERS_LABEL_LSE_TIME }
+ },
 
-	'in' : {
-		label : rpt_strings.FILTERS_LABEL_IN
-	},
+ 'in' : {
+  label : rpt_strings.FILTERS_LABEL_IN
+ },
 
-	'not in' : {
-		label : rpt_strings.FILTERS_LABEL_NOT_IN
-	},
+ 'not in' : {
+  label : rpt_strings.FILTERS_LABEL_NOT_IN
+ },
 
-	'between' : {
-		label : rpt_strings.FILTERS_LABEL_BETWEEN
-	},
+ 'between' : {
+  label : rpt_strings.FILTERS_LABEL_BETWEEN
+ },
 
-	'not between' : {
-		label : rpt_strings.FILTERS_LABEL_NOT_BETWEEN
-	},
+ 'not between' : {
+  label : rpt_strings.FILTERS_LABEL_NOT_BETWEEN
+ },
 
-	'is' : {
-		label : rpt_strings.FILTERS_LABEL_NULL
-	},
+ 'is' : {
+  label : rpt_strings.FILTERS_LABEL_NULL
+ },
 
-	'is not' : {
-		label : rpt_strings.FILTERS_LABEL_NOT_NULL
+ 'is not' : {
+  label : rpt_strings.FILTERS_LABEL_NOT_NULL
     },
 
     'is blank' : {
@@ -66,31 +66,31 @@ var OILS_RPT_FILTERS = {
 
     'is not blank' : {
         label : rpt_strings.FILTERS_LABEL_NOT_NULL_BLANK
-	}
+ }
 }
 
 
 function oilsRptFilterPicker(args) {
-	this.node = args.node;
-	this.dtype = args.datatype;
-	this.selector = elem('select');
-	for( var key in OILS_RPT_FILTERS ) 
-		this.addOpt(key, key == args.select );
-	appendClear(this.node, this.selector);
+ this.node = args.node;
+ this.dtype = args.datatype;
+ this.selector = elem('select');
+ for( var key in OILS_RPT_FILTERS ) 
+  this.addOpt(key, key == args.select );
+ appendClear(this.node, this.selector);
 }
 
 
 oilsRptFilterPicker.prototype.addOpt = function(key, select) {
-	var filter = OILS_RPT_FILTERS[key];
-	var label = filter.label;
-	var opt = insertSelectorVal( this.selector, -1, label, key);
-	if( select ) opt.selected = true;
-	if( filter.labels && filter.labels[this.dtype] ) 
-		insertSelectorVal( this.selector, -1, filter.labels[this.dtype], key);
+ var filter = OILS_RPT_FILTERS[key];
+ var label = filter.label;
+ var opt = insertSelectorVal( this.selector, -1, label, key);
+ if( select ) opt.selected = true;
+ if( filter.labels && filter.labels[this.dtype] ) 
+  insertSelectorVal( this.selector, -1, filter.labels[this.dtype], key);
 }
 
 oilsRptFilterPicker.prototype.getSelected = function() {
-	return getSelectorVal(this.selector);
+ return getSelectorVal(this.selector);
 }
 
 
diff --git a/Open-ILS/web/reports/oils_rpt_folder_manager.xhtml b/Open-ILS/web/reports/oils_rpt_folder_manager.xhtml
index 6dd8446b5d..bc7de0c107 100644
--- a/Open-ILS/web/reports/oils_rpt_folder_manager.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_folder_manager.xhtml
@@ -1,91 +1,91 @@
 <div id='oils_rpt_folder_manager_div' class='hide_me' style='margin-top: 10px; text-align: center;'>
-	<select id='oils_rpt_folder_manager_actions'>
-		<option value='change_name'>&reports.oils_rpt_folder_manager.change_folder_name;</option>
-		<option value='delete' id='oils_rpt_folder_manager_delete_opt'>&reports.oils_rpt_folder_manager.delete_folder;</option>
-		<option value='create_sub_folder'>&reports.oils_rpt_folder_manager.create_new_sub_folder;</option>
-		<option id='oils_rpt_folder_manager_share_opt' value='share'>&reports.oils_rpt_folder_manager.share_this_folder;</option>
-		<option id='oils_rpt_folder_manager_unshare_opt' value='unshare'>&reports.oils_rpt_folder_manager.hide_folder;</option>
+ <select id='oils_rpt_folder_manager_actions'>
+  <option value='change_name'>&reports.oils_rpt_folder_manager.change_folder_name;</option>
+  <option value='delete' id='oils_rpt_folder_manager_delete_opt'>&reports.oils_rpt_folder_manager.delete_folder;</option>
+  <option value='create_sub_folder'>&reports.oils_rpt_folder_manager.create_new_sub_folder;</option>
+  <option id='oils_rpt_folder_manager_share_opt' value='share'>&reports.oils_rpt_folder_manager.share_this_folder;</option>
+  <option id='oils_rpt_folder_manager_unshare_opt' value='unshare'>&reports.oils_rpt_folder_manager.hide_folder;</option>
 
-		<option class='hide_me'>&reports.oils_rpt_folder_manager.disable_recurrence;</option><!-- XXX -->
+  <option class='hide_me'>&reports.oils_rpt_folder_manager.disable_recurrence;</option><!-- XXX -->
 
-	</select>
-	<input id='oils_rpt_folder_manager_actions_submit' type='submit' value='&reports.oils_rpt_folder_manager.fldr_mngr_actions_submit;'/>
+ </select>
+ <input id='oils_rpt_folder_manager_actions_submit' type='submit' value='&reports.oils_rpt_folder_manager.fldr_mngr_actions_submit;'/>
 
-	<div id='oils_rpt_folder_manager_action_div' style='margin: 15px;'>
+ <div id='oils_rpt_folder_manager_action_div' style='margin: 15px;'>
 
-		<div id='oils_rpt_folder_manager_change_name_div'>
-			&reports.oils_rpt_folder_manager.change_name; 
-			<input id='oils_rpt_folder_manager_name_input' type='text'/>
-			<input type='submit' value='&reports.oils_rpt_folder_manager.submit;' id='oils_rpt_folder_manager_change_name_submit'/>
-		</div>
+  <div id='oils_rpt_folder_manager_change_name_div'>
+   &reports.oils_rpt_folder_manager.change_name; 
+   <input id='oils_rpt_folder_manager_name_input' type='text'/>
+   <input type='submit' value='&reports.oils_rpt_folder_manager.submit;' id='oils_rpt_folder_manager_change_name_submit'/>
+  </div>
 
-		<div id='oils_rpt_folder_manager_create_sub'>
-			<table class='oils_rpt_generic_table'>
-				<tbody>
-					<tr>
-						<td>&reports.oils_rpt_folder_manager.folder_name;</td>
-						<td><input id='oils_rpt_folder_manager_sub_name' type='text'/></td>
-					</tr>
-					<tr>
-						<td>&reports.oils_rpt_folder_manager.share_this_folder;</td>
-						<td>
-							<select id='oils_rpt_folder_manager_sub_shared'>
-								<option value='no' selected='selected'>&reports.oils_rpt_folder_manager.do_not_share;</option>
-								<option value='yes'>&reports.oils_rpt_folder_manager.share;</option>
-							</select>
-						</td>
-					</tr>
-					<tr>
-						<td>&reports.oils_rpt_folder_manager.share_with;</td>
-						<td><select id='oils_rpt_folder_manager_sub_lib_picker'/></td>
-					</tr>
-					<tr><td colspan='2' align='center'>
-						<input type='submit' value='&reports.oils_rpt_folder_manager.create_sub_folder;' 
-							id='oils_rpt_folder_manager_sub_lib_create'/>
-					</td></tr>
-				</tbody>
-			</table>
-		</div>
+  <div id='oils_rpt_folder_manager_create_sub'>
+   <table class='oils_rpt_generic_table'>
+    <tbody>
+     <tr>
+      <td>&reports.oils_rpt_folder_manager.folder_name;</td>
+      <td><input id='oils_rpt_folder_manager_sub_name' type='text'/></td>
+     </tr>
+     <tr>
+      <td>&reports.oils_rpt_folder_manager.share_this_folder;</td>
+      <td>
+       <select id='oils_rpt_folder_manager_sub_shared'>
+        <option value='no' selected='selected'>&reports.oils_rpt_folder_manager.do_not_share;</option>
+        <option value='yes'>&reports.oils_rpt_folder_manager.share;</option>
+       </select>
+      </td>
+     </tr>
+     <tr>
+      <td>&reports.oils_rpt_folder_manager.share_with;</td>
+      <td><select id='oils_rpt_folder_manager_sub_lib_picker'/></td>
+     </tr>
+     <tr><td colspan='2' align='center'>
+      <input type='submit' value='&reports.oils_rpt_folder_manager.create_sub_folder;' 
+       id='oils_rpt_folder_manager_sub_lib_create'/>
+     </td></tr>
+    </tbody>
+   </table>
+  </div>
 
-		<div id='oils_rpt_folder_manager_share_div'>
-			<table class='oils_rpt_generic_table'>
-				<tbody>
-					<tr>
-						<td>&reports.oils_rpt_folder_manager.share_with;</td>
-						<td><select id='oils_rpt_folder_manager_share_lib_picker'/></td>
-					</tr>
-					<tr><td colspan='2' align='center'>
-						<input type='submit' value='&reports.oils_rpt_folder_manager.share_this_folder;' 
-							id='oils_rpt_folder_manager_share_submit'/>
-					</td></tr>
-				</tbody>
-			</table>
-		</div>
+  <div id='oils_rpt_folder_manager_share_div'>
+   <table class='oils_rpt_generic_table'>
+    <tbody>
+     <tr>
+      <td>&reports.oils_rpt_folder_manager.share_with;</td>
+      <td><select id='oils_rpt_folder_manager_share_lib_picker'/></td>
+     </tr>
+     <tr><td colspan='2' align='center'>
+      <input type='submit' value='&reports.oils_rpt_folder_manager.share_this_folder;' 
+       id='oils_rpt_folder_manager_share_submit'/>
+     </td></tr>
+    </tbody>
+   </table>
+  </div>
 
 
-	</div>
+ </div>
 
-	<span class='hide_me' id='oils_rpt_folder_manager_change_name_confirm'>
-		&reports.oils_rpt_folder_manager.change_name_confirm;
-	</span>
+ <span class='hide_me' id='oils_rpt_folder_manager_change_name_confirm'>
+  &reports.oils_rpt_folder_manager.change_name_confirm;
+ </span>
 
-	<span class='hide_me' id='oils_rpt_folder_manager_delete_confirm'>
-		&reports.oils_rpt_folder_manager.delete_name_confirm;
-	</span>
-		
-	<span class='hide_me' id='oils_rpt_folder_cannot_delete'>
-		&reports.oils_rpt_folder_manager.cannot_delete;
-	</span>
+ <span class='hide_me' id='oils_rpt_folder_manager_delete_confirm'>
+  &reports.oils_rpt_folder_manager.delete_name_confirm;
+ </span>
+  
+ <span class='hide_me' id='oils_rpt_folder_cannot_delete'>
+  &reports.oils_rpt_folder_manager.cannot_delete;
+ </span>
 
-	<span class='hide_me' id='oils_rpt_folder_already_shared'>
-		&reports.oils_rpt_folder_manager.already_shared;
-	</span>
-	<span class='hide_me' id='oils_rpt_folder_already_unshared'>
-		&reports.oils_rpt_folder_manager.folder_not_shared;
-	</span>
-	<span class='hide_me' id='oils_rpt_folder_unshare_confirm'>
-		&reports.oils_rpt_folder_manager.confirm_hide_folder;
-	</span>
+ <span class='hide_me' id='oils_rpt_folder_already_shared'>
+  &reports.oils_rpt_folder_manager.already_shared;
+ </span>
+ <span class='hide_me' id='oils_rpt_folder_already_unshared'>
+  &reports.oils_rpt_folder_manager.folder_not_shared;
+ </span>
+ <span class='hide_me' id='oils_rpt_folder_unshare_confirm'>
+  &reports.oils_rpt_folder_manager.confirm_hide_folder;
+ </span>
 
 
 </div>
diff --git a/Open-ILS/web/reports/oils_rpt_folder_window.js b/Open-ILS/web/reports/oils_rpt_folder_window.js
index d8532f5a72..1ebeb139f4 100644
--- a/Open-ILS/web/reports/oils_rpt_folder_window.js
+++ b/Open-ILS/web/reports/oils_rpt_folder_window.js
@@ -8,693 +8,693 @@ var OILS_LEGACY_TEMPLATE_INTERFACE = 'oils_rpt_builder.xhtml';
 /* generic folder window class */
 oilsRptSetSubClass('oilsRptFolderWindow', 'oilsRptObject');
 function oilsRptFolderWindow(type, folderId) { 
-	this.init();
-	var node = oilsRptCurrentFolderManager.findNode(type, folderId);
-	this.selector = DOM.oils_rpt_folder_contents_selector;
-	this.folderNode = node;
-	this.type = type;
+ this.init();
+ var node = oilsRptCurrentFolderManager.findNode(type, folderId);
+ this.selector = DOM.oils_rpt_folder_contents_selector;
+ this.folderNode = node;
+ this.type = type;
 }
 
 
 oilsRptFolderWindow.prototype.draw = function() {
 
-	_debug('drawing folder window for ' + this.folderNode.folder.name() );
+ _debug('drawing folder window for ' + this.folderNode.folder.name() );
 
-	var obj = this;
-	setSelector(DOM.oils_rpt_output_limit_selector, oilsRptOutputLimit);
-	setSelector(DOM.oils_rpt_output_limit_selector_2, oilsRptOutputLimit2);
+ var obj = this;
+ setSelector(DOM.oils_rpt_output_limit_selector, oilsRptOutputLimit);
+ setSelector(DOM.oils_rpt_output_limit_selector_2, oilsRptOutputLimit2);
 
-	DOM.oils_rpt_output_limit_selector.onchange = function() {
-		oilsRptOutputLimit = getSelectorVal(DOM.oils_rpt_output_limit_selector);
-		obj.draw();
-	}
+ DOM.oils_rpt_output_limit_selector.onchange = function() {
+  oilsRptOutputLimit = getSelectorVal(DOM.oils_rpt_output_limit_selector);
+  obj.draw();
+ }
 
-	DOM.oils_rpt_output_limit_selector_2.onchange = function() {
-		oilsRptOutputLimit2 = getSelectorVal(DOM.oils_rpt_output_limit_selector_2);
-		obj.draw();
-	}
+ DOM.oils_rpt_output_limit_selector_2.onchange = function() {
+  oilsRptOutputLimit2 = getSelectorVal(DOM.oils_rpt_output_limit_selector_2);
+  obj.draw();
+ }
 
-	var mine = ( this.folderNode.folder.owner().id() == USER.id() );
+ var mine = ( this.folderNode.folder.owner().id() == USER.id() );
 
-	_debug('drawing folder window with type '+this.type);
-	if(mine) _debug('folder is mine...');
+ _debug('drawing folder window with type '+this.type);
+ if(mine) _debug('folder is mine...');
 
-	if( mine && this.type == 'template') 
-		unHideMe(DOM.oils_rpt_folder_window_contents_new_template.parentNode);
-	else hideMe(DOM.oils_rpt_folder_window_contents_new_template.parentNode);
+ if( mine && this.type == 'template') 
+  unHideMe(DOM.oils_rpt_folder_window_contents_new_template.parentNode);
+ else hideMe(DOM.oils_rpt_folder_window_contents_new_template.parentNode);
 
-	unHideMe(DOM.oils_rpt_folder_window_contents_div);
-	hideMe(DOM.oils_rpt_folder_manager_div);
-	hideMe(DOM.oils_rpt_top_folder);
+ unHideMe(DOM.oils_rpt_folder_window_contents_div);
+ hideMe(DOM.oils_rpt_folder_manager_div);
+ hideMe(DOM.oils_rpt_top_folder);
 
-	DOM.oils_rpt_folder_window_manage_tab.onclick = function() {
-		unHideMe(DOM.oils_rpt_folder_window_contents_div);
-		hideMe(DOM.oils_rpt_folder_manager_div);
-	}
-	DOM.oils_rpt_folder_window_edit_tab.onclick = function() {
-		hideMe(DOM.oils_rpt_folder_window_contents_div);
-		unHideMe(DOM.oils_rpt_folder_manager_div);
-	}
+ DOM.oils_rpt_folder_window_manage_tab.onclick = function() {
+  unHideMe(DOM.oils_rpt_folder_window_contents_div);
+  hideMe(DOM.oils_rpt_folder_manager_div);
+ }
+ DOM.oils_rpt_folder_window_edit_tab.onclick = function() {
+  hideMe(DOM.oils_rpt_folder_window_contents_div);
+  unHideMe(DOM.oils_rpt_folder_manager_div);
+ }
 
-	this.setFolderEditActions();
+ this.setFolderEditActions();
 
-	hideMe(DOM.oils_rpt_template_folder_new_report);
-	unHideMe(DOM.oils_rpt_folder_table_right_td);
-	hideMe(DOM.oils_rpt_folder_table_alt_td);
-	this.drawFolderDetails();
+ hideMe(DOM.oils_rpt_template_folder_new_report);
+ unHideMe(DOM.oils_rpt_folder_table_right_td);
+ hideMe(DOM.oils_rpt_folder_table_alt_td);
+ this.drawFolderDetails();
 
-	DOM.oils_rpt_folder_content_action_go.onclick = 
-		function() {obj.doFolderAction()}
+ DOM.oils_rpt_folder_content_action_go.onclick = 
+  function() {obj.doFolderAction()}
 
-	this.fetchFolderData();
+ this.fetchFolderData();
 
-	var sel = DOM.oils_rpt_folder_contents_action_selector;
-	var x = true;
-	for( var i = 0; i < sel.options.length; i++ ) {
-		var opt = sel.options[i];
+ var sel = DOM.oils_rpt_folder_contents_action_selector;
+ var x = true;
+ for( var i = 0; i < sel.options.length; i++ ) {
+  var opt = sel.options[i];
 
-		if( !mine && opt.getAttribute('value').match(/move/) ) {
-			hideMe(opt);
-			continue;
-		}
+  if( !mine && opt.getAttribute('value').match(/move/) ) {
+   hideMe(opt);
+   continue;
+  }
 
-		if( opt.getAttribute('type') == this.type ) {
-			if(x && !opt.disabled) {
-				opt.selected = true;
-				x = false;
-			}
-			unHideMe(opt);
-		} else hideMe(opt);
-	}
+  if( opt.getAttribute('type') == this.type ) {
+   if(x && !opt.disabled) {
+    opt.selected = true;
+    x = false;
+   }
+   unHideMe(opt);
+  } else hideMe(opt);
+ }
 
-	this.drawEditActions();
+ this.drawEditActions();
 
-	var porg = PERMS.SHARE_REPORT_FOLDER;
-	if( porg < 1 ) 
-		DOM.oils_rpt_folder_manager_share_opt.disabled = true;
+ var porg = PERMS.SHARE_REPORT_FOLDER;
+ if( porg < 1 ) 
+  DOM.oils_rpt_folder_manager_share_opt.disabled = true;
 }
 
 oilsRptFolderWindow.prototype.drawEditActions = function() {
 
-	DOM.oils_rpt_folder_window_contents_new_template.onclick = function() {
-		var s = location.search+'';
-		s = s.replace(/\&folder=\d+/g,'');
-		s = s.replace(/\&ct=\d+/g,'');
-		goTo( OILS_TEMPLATE_INTERFACE+s+'&folder='+obj.folderNode.folder.id());
-	}
-
-
-	if( this.folderNode.folder.owner().id() != USER.id() )
-		hideMe(DOM.oils_rpt_folder_manager_tab_table);
-	else
-		unHideMe(DOM.oils_rpt_folder_manager_tab_table);
-
-	if( isTrue(this.folderNode.folder.shared())) {
-		DOM.oils_rpt_folder_manager_share_opt.disabled = true;
-		DOM.oils_rpt_folder_manager_unshare_opt.disabled = false;
-	} else {
-		DOM.oils_rpt_folder_manager_share_opt.disabled = false;
-		DOM.oils_rpt_folder_manager_unshare_opt.disabled = true;
-	}
-
-	this.hideFolderActions();
-	var obj = this;
-
-	DOM.oils_rpt_folder_manager_actions_submit.onclick = function() {
-		var act = getSelectorVal(DOM.oils_rpt_folder_manager_actions);
-		_debug("doing folder action: " + act);
-		obj.hideFolderActions();
-		switch(act) {
-			case 'change_name':
-				unHideMe(DOM.oils_rpt_folder_manager_change_name_div);
-				break;
-			case 'create_sub_folder':
-				var porg = PERMS.SHARE_REPORT_FOLDER;
-				if( porg < 1 ) 
-					DOM.oils_rpt_folder_manager_sub_shared.disabled = true;
-				removeChildren(DOM.oils_rpt_folder_manager_sub_lib_picker);
-				unHideMe(DOM.oils_rpt_folder_manager_create_sub);
-				obj.myOrgSelector = new oilsRptMyOrgsWidget(
-					DOM.oils_rpt_folder_manager_sub_lib_picker, USER.ws_ou(), porg)
-				obj.myOrgSelector.draw();
-				break;
-			case 'delete':
-				obj.doFolderDelete();
-				break;
-			case 'share':
-				obj.shareFolder();
-				break;
-			case 'unshare':
-				obj.unShareFolder();
-				break;
-		}
-	}
+ DOM.oils_rpt_folder_window_contents_new_template.onclick = function() {
+  var s = location.search+'';
+  s = s.replace(/\&folder=\d+/g,'');
+  s = s.replace(/\&ct=\d+/g,'');
+  goTo( OILS_TEMPLATE_INTERFACE+s+'&folder='+obj.folderNode.folder.id());
+ }
+
+
+ if( this.folderNode.folder.owner().id() != USER.id() )
+  hideMe(DOM.oils_rpt_folder_manager_tab_table);
+ else
+  unHideMe(DOM.oils_rpt_folder_manager_tab_table);
+
+ if( isTrue(this.folderNode.folder.shared())) {
+  DOM.oils_rpt_folder_manager_share_opt.disabled = true;
+  DOM.oils_rpt_folder_manager_unshare_opt.disabled = false;
+ } else {
+  DOM.oils_rpt_folder_manager_share_opt.disabled = false;
+  DOM.oils_rpt_folder_manager_unshare_opt.disabled = true;
+ }
+
+ this.hideFolderActions();
+ var obj = this;
+
+ DOM.oils_rpt_folder_manager_actions_submit.onclick = function() {
+  var act = getSelectorVal(DOM.oils_rpt_folder_manager_actions);
+  _debug("doing folder action: " + act);
+  obj.hideFolderActions();
+  switch(act) {
+   case 'change_name':
+    unHideMe(DOM.oils_rpt_folder_manager_change_name_div);
+    break;
+   case 'create_sub_folder':
+    var porg = PERMS.SHARE_REPORT_FOLDER;
+    if( porg < 1 ) 
+     DOM.oils_rpt_folder_manager_sub_shared.disabled = true;
+    removeChildren(DOM.oils_rpt_folder_manager_sub_lib_picker);
+    unHideMe(DOM.oils_rpt_folder_manager_create_sub);
+    obj.myOrgSelector = new oilsRptMyOrgsWidget(
+     DOM.oils_rpt_folder_manager_sub_lib_picker, USER.ws_ou(), porg)
+    obj.myOrgSelector.draw();
+    break;
+   case 'delete':
+    obj.doFolderDelete();
+    break;
+   case 'share':
+    obj.shareFolder();
+    break;
+   case 'unshare':
+    obj.unShareFolder();
+    break;
+  }
+ }
 
 }
 
 
 oilsRptFolderWindow.prototype.shareFolder = function() {
-	var folder = this.folderNode.folder;
-	if(isTrue(folder.shared()))
-		return alertId('oils_rpt_folder_already_shared');
-	unHideMe(DOM.oils_rpt_folder_manager_share_div);
-
-
-	var orgsel = new oilsRptMyOrgsWidget(
-		DOM.oils_rpt_folder_manager_share_lib_picker, 
-		USER.ws_ou(), PERMS.SHARE_REPORT_FOLDER);
-	orgsel.draw();
-
-	var type = this.type;
-	DOM.oils_rpt_folder_manager_share_submit.onclick = function() {
-		folder.shared('t');
-		folder.share_with(orgsel.getValue());
-		oilsRptUpdateFolder( folder, type, 
-			function(success) {
-				if(success) {
-					oilsRptAlertSuccess();
-					oilsRptCurrentFolderManager.draw();
-				}
-			}
-		);
-	}
+ var folder = this.folderNode.folder;
+ if(isTrue(folder.shared()))
+  return alertId('oils_rpt_folder_already_shared');
+ unHideMe(DOM.oils_rpt_folder_manager_share_div);
+
+
+ var orgsel = new oilsRptMyOrgsWidget(
+  DOM.oils_rpt_folder_manager_share_lib_picker, 
+  USER.ws_ou(), PERMS.SHARE_REPORT_FOLDER);
+ orgsel.draw();
+
+ var type = this.type;
+ DOM.oils_rpt_folder_manager_share_submit.onclick = function() {
+  folder.shared('t');
+  folder.share_with(orgsel.getValue());
+  oilsRptUpdateFolder( folder, type, 
+   function(success) {
+    if(success) {
+     oilsRptAlertSuccess();
+     oilsRptCurrentFolderManager.draw();
+    }
+   }
+  );
+ }
 }
 
 oilsRptFolderWindow.prototype.unShareFolder = function() {
-	var folder = this.folderNode.folder;
-	if(!isTrue(folder.shared()))
-		return alertId('oils_rpt_folder_already_unshared');
-	if(!confirmId('oils_rpt_folder_unshare_confirm')) return;
-	folder.shared('f');
-	var type = this.type;
-	oilsRptUpdateFolder( folder, type, 
-		function(success) {
-			if(success) {
-				oilsRptAlertSuccess();
-				oilsRptCurrentFolderManager.draw();
-			}
-		}
-	);
+ var folder = this.folderNode.folder;
+ if(!isTrue(folder.shared()))
+  return alertId('oils_rpt_folder_already_unshared');
+ if(!confirmId('oils_rpt_folder_unshare_confirm')) return;
+ folder.shared('f');
+ var type = this.type;
+ oilsRptUpdateFolder( folder, type, 
+  function(success) {
+   if(success) {
+    oilsRptAlertSuccess();
+    oilsRptCurrentFolderManager.draw();
+   }
+  }
+ );
 }
 
 
 oilsRptFolderWindow.prototype.hideFolderActions = function() {
-	hideMe(DOM.oils_rpt_folder_manager_change_name_div);
-	hideMe(DOM.oils_rpt_folder_manager_create_sub);
-	hideMe(DOM.oils_rpt_folder_manager_share_div);
+ hideMe(DOM.oils_rpt_folder_manager_change_name_div);
+ hideMe(DOM.oils_rpt_folder_manager_create_sub);
+ hideMe(DOM.oils_rpt_folder_manager_share_div);
 }
 
 
 oilsRptFolderWindow.prototype.doFolderAction = function() {
-	var objs = (this.fmTable) ? this.fmTable.getSelected() : [];
-
-	if( this.type == 'output' && this.fmTable2 ) 
-		objs = objs.concat( this.fmTable2.getSelected() );
-
-	if( objs.length == 0 ) 
-		return alert(rpt_strings.FOLDER_WINDOW_SELECT_ITEM);
-	var action = getSelectorVal(DOM.oils_rpt_folder_contents_action_selector);
-
-	var obj = this;
-	var successCallback = function(errid) {
-		if(errid) alertId(errid)
-		else oilsRptAlertSuccess();
-		obj.draw();
-	};
-
-	var obj = this;
-	switch(action) {
-
-		case 'create_report' :
-			hideMe(DOM.oils_rpt_folder_table_right_td);
-			unHideMe(DOM.oils_rpt_folder_table_alt_td);
-			unHideMe(DOM.oils_rpt_editor_div);
-			new oilsRptReportEditor(new oilsReport(objs[0]), this);
-			break;
-		case 'delete_report' :
-			if(!confirmId('oils_rpt_verify_report_delete')) return;
-			this.deleteReports(objs, 0, successCallback);
-			break;
-
-		case 'delete_template' :
+ var objs = (this.fmTable) ? this.fmTable.getSelected() : [];
+
+ if( this.type == 'output' && this.fmTable2 ) 
+  objs = objs.concat( this.fmTable2.getSelected() );
+
+ if( objs.length == 0 ) 
+  return alert(rpt_strings.FOLDER_WINDOW_SELECT_ITEM);
+ var action = getSelectorVal(DOM.oils_rpt_folder_contents_action_selector);
+
+ var obj = this;
+ var successCallback = function(errid) {
+  if(errid) alertId(errid)
+  else oilsRptAlertSuccess();
+  obj.draw();
+ };
+
+ var obj = this;
+ switch(action) {
+
+  case 'create_report' :
+   hideMe(DOM.oils_rpt_folder_table_right_td);
+   unHideMe(DOM.oils_rpt_folder_table_alt_td);
+   unHideMe(DOM.oils_rpt_editor_div);
+   new oilsRptReportEditor(new oilsReport(objs[0]), this);
+   break;
+  case 'delete_report' :
+   if(!confirmId('oils_rpt_verify_report_delete')) return;
+   this.deleteReports(objs, 0, successCallback);
+   break;
+
+  case 'delete_template' :
             if(!confirmId('oils_rpt_verify_template_delete')) return;
-			this.deleteTemplates(objs, 0, successCallback);
-			break;
+   this.deleteTemplates(objs, 0, successCallback);
+   break;
 
-		case 'show_output':
-			this.showOutput(objs[0]);
-			break;
+  case 'show_output':
+   this.showOutput(objs[0]);
+   break;
 
-		case 'delete_output':
-			if(!confirmId('oils_rpt_folder_contents_confirm_delete')) return;
-			this.deleteOutputs(objs,0, successCallback);
-			break;
+  case 'delete_output':
+   if(!confirmId('oils_rpt_folder_contents_confirm_delete')) return;
+   this.deleteOutputs(objs,0, successCallback);
+   break;
 
-		case 'move_template':
-			this.changeBatchFolder(objs, 'template', successCallback);
-			break;
+  case 'move_template':
+   this.changeBatchFolder(objs, 'template', successCallback);
+   break;
 
-		case 'move_report':
-			this.changeBatchFolder(objs, 'report', successCallback);
-			break;
+  case 'move_report':
+   this.changeBatchFolder(objs, 'report', successCallback);
+   break;
 
-		case 'move_output':
-			this.changeBatchFolder(objs, 'output', successCallback);
-			break;
+  case 'move_output':
+   this.changeBatchFolder(objs, 'output', successCallback);
+   break;
 
-		case 'clone_template':
-			this.cloneTemplate(objs[0]);
-	}
+  case 'clone_template':
+   this.cloneTemplate(objs[0]);
+ }
 }
 
 oilsRptFolderWindow.prototype.changeBatchFolder = function(objs, type, callback) {
-	hideMe(DOM.oils_rpt_folder_window_contents_table);
-	unHideMe(DOM.oils_rpt_move_folder_div)
-	var obj = this;
-	this.drawFolderOptions(type,	
-		function(folderid) {
-			obj.changeFolderList(objs, type, folderid, 0, callback);
-			hideMe(DOM.oils_rpt_move_folder_div)
-			unHideMe(DOM.oils_rpt_folder_window_contents_table);
-		}
-	);
+ hideMe(DOM.oils_rpt_folder_window_contents_table);
+ unHideMe(DOM.oils_rpt_move_folder_div)
+ var obj = this;
+ this.drawFolderOptions(type, 
+  function(folderid) {
+   obj.changeFolderList(objs, type, folderid, 0, callback);
+   hideMe(DOM.oils_rpt_move_folder_div)
+   unHideMe(DOM.oils_rpt_folder_window_contents_table);
+  }
+ );
 }
 
 oilsRptFolderWindow.prototype.cloneTemplate = function(template) {
-	hideMe(DOM.oils_rpt_folder_window_contents_table);
-	unHideMe(DOM.oils_rpt_move_folder_div)
-	var obj = this;
-	this.drawFolderOptions('template',
-		function(folderid) {
-			var s = location.search+'';
-			s = s.replace(/\&folder=\d+/g,'');
-			s = s.replace(/\&ct=\d+/g,'');
+ hideMe(DOM.oils_rpt_folder_window_contents_table);
+ unHideMe(DOM.oils_rpt_move_folder_div)
+ var obj = this;
+ this.drawFolderOptions('template',
+  function(folderid) {
+   var s = location.search+'';
+   s = s.replace(/\&folder=\d+/g,'');
+   s = s.replace(/\&ct=\d+/g,'');
             version = JSON2js(template.data()).version;
             if(version && version >= 2) {
                 _debug('entering new template building interface with template version ' + version);
-			    goTo(OILS_TEMPLATE_INTERFACE+s+'&folder='+folderid+'&ct='+template.id());
+       goTo(OILS_TEMPLATE_INTERFACE+s+'&folder='+folderid+'&ct='+template.id());
             } else {
-			    goTo(OILS_LEGACY_TEMPLATE_INTERFACE+s+'&folder='+folderid+'&ct='+template.id());
+       goTo(OILS_LEGACY_TEMPLATE_INTERFACE+s+'&folder='+folderid+'&ct='+template.id());
             }
-		}
-	);
+  }
+ );
 }
 
 
 oilsRptFolderWindow.prototype.changeFolderList = function(list, type, folderid, idx, callback, errid) {
-	if( idx >= list.length ) return callback(errid);
-	var item = list[idx];
-	var obj	= this;
-	var rcback = function(){obj.changeFolderList(list,type,folderid,++idx,callback,errid)};
-
-	item.folder(folderid);
-
-	switch(type) {
-		case 'template':
-			oilsRptUpdateTemplate(item,rcback);
-			break;
-		case 'report':
-			oilsRptUpdateReport(item,rcback);
-			break;
-		case 'output':
-			oilsRptUpdateSchedule(item,rcback);
-			break;
-	}
+ if( idx >= list.length ) return callback(errid);
+ var item = list[idx];
+ var obj = this;
+ var rcback = function(){obj.changeFolderList(list,type,folderid,++idx,callback,errid)};
+
+ item.folder(folderid);
+
+ switch(type) {
+  case 'template':
+   oilsRptUpdateTemplate(item,rcback);
+   break;
+  case 'report':
+   oilsRptUpdateReport(item,rcback);
+   break;
+  case 'output':
+   oilsRptUpdateSchedule(item,rcback);
+   break;
+ }
 }
 
 oilsRptFolderWindow.prototype.drawFolderOptions = function(type, callback) {
-	//var oilsRptChangeFolderTree;
-	var selectedFolder;
-	oilsRptBuildFolder(
-		type,
-		DOM.oils_rpt_move_folder_picker,
-		'tree9807897',
-		rpt_strings.FOLDER_WINDOW_CHANGE_FOLDERS,
-		function(node) { 
-			appendClear(DOM.oils_rpt_move_folder_selected, node.folder.name());
-			selectedFolder = node.folder.id();
-		} 
-	);
-
-	DOM.oils_rpt_change_folder_submit.onclick = function() {
-		if(selectedFolder) callback(selectedFolder);
-	}
-
-	DOM.oils_rpt_change_folder_cancel.onclick = function() {
-		hideMe(DOM.oils_rpt_move_folder_div)
-		unHideMe(DOM.oils_rpt_folder_window_contents_table);
-	}
+ //var oilsRptChangeFolderTree;
+ var selectedFolder;
+ oilsRptBuildFolder(
+  type,
+  DOM.oils_rpt_move_folder_picker,
+  'tree9807897',
+  rpt_strings.FOLDER_WINDOW_CHANGE_FOLDERS,
+  function(node) { 
+   appendClear(DOM.oils_rpt_move_folder_selected, node.folder.name());
+   selectedFolder = node.folder.id();
+  } 
+ );
+
+ DOM.oils_rpt_change_folder_submit.onclick = function() {
+  if(selectedFolder) callback(selectedFolder);
+ }
+
+ DOM.oils_rpt_change_folder_cancel.onclick = function() {
+  hideMe(DOM.oils_rpt_move_folder_div)
+  unHideMe(DOM.oils_rpt_folder_window_contents_table);
+ }
 }
 
 
 oilsRptFolderWindow.prototype.deleteOutputs = function(list, idx, callback, errid) {
-	if( idx >= list.length ) return callback(errid);
-	var output = list[idx];
-
-	if( output.runner().id()  != USER.id() ) {
-		this.deleteOutputs(list, ++idx, 
-			callback, 'oils_rpt_folder_contents_no_delete');
-
-	} else {
-		_debug('deleting output ' + output.id());
-		var req = new Request(OILS_RPT_DELETE_SCHEDULE,SESSION,output.id());
-		var obj = this;
-		req.callback(function(){obj.deleteOutputs(list, ++idx, callback, errid);});
-		req.send();
-	}
+ if( idx >= list.length ) return callback(errid);
+ var output = list[idx];
+
+ if( output.runner().id()  != USER.id() ) {
+  this.deleteOutputs(list, ++idx, 
+   callback, 'oils_rpt_folder_contents_no_delete');
+
+ } else {
+  _debug('deleting output ' + output.id());
+  var req = new Request(OILS_RPT_DELETE_SCHEDULE,SESSION,output.id());
+  var obj = this;
+  req.callback(function(){obj.deleteOutputs(list, ++idx, callback, errid);});
+  req.send();
+ }
 }
 
 oilsRptFolderWindow.prototype.showOutput = function(sched) {
-	oilsRptFetchReport(sched.report().id(), 
-		function(r) {
-			var url = oilsRptBuildOutputLink(r.template(), r.id(), sched.id());
-			_debug("launching report output view at URL: " + url);
-			if(isXUL()) 
-				xulG.new_tab('/xul/server/util/rbrowser.xul?url=' + url,  /* this comes from urls.XUL_REMOTE_BROWSER */
-					{tab_name: dojo.string.substitute( rpt_strings.FOLDER_WINDOW_REPORT_OUTPUT, [r.name()] ), browser:false},
-					{no_xulG:false, show_nav_buttons:true, show_print_button:true});
-			else {
-				//goTo(url);
-				var win = window.open(url,r.name(), 'resizable,width=800,height=600,scrollbars=1'); 
-			}
-		}
-	);
+ oilsRptFetchReport(sched.report().id(), 
+  function(r) {
+   var url = oilsRptBuildOutputLink(r.template(), r.id(), sched.id());
+   _debug("launching report output view at URL: " + url);
+   if(isXUL()) 
+    xulG.new_tab('/xul/server/util/rbrowser.xul?url=' + url,  /* this comes from urls.XUL_REMOTE_BROWSER */
+     {tab_name: dojo.string.substitute( rpt_strings.FOLDER_WINDOW_REPORT_OUTPUT, [r.name()] ), browser:false},
+     {no_xulG:false, show_nav_buttons:true, show_print_button:true});
+   else {
+    //goTo(url);
+    var win = window.open(url,r.name(), 'resizable,width=800,height=600,scrollbars=1'); 
+   }
+  }
+ );
 }
 
 
 oilsRptFolderWindow.prototype.deleteReports = function(list, idx, callback, errid) {
-	if( idx >= list.length ) return callback(errid);
-	var report = list[idx];
-
-	var obj = this;
-	if( report.owner().id() != USER.id() ) {
-		this.deleteReports(list, ++idx, 
-			callback, 'oils_rpt_folder_contents_no_delete');
-
-	} else {
-
-//		var req0 = new Request(OILS_RPT_REPORT_HAS_OUTS, SESSION, report.id());
-//		req0.callback(
-//			function(r0) {
-//				var r0es = r0.getResultObject();
-//				if( r0es != '0' ) {
-//					obj.deleteReports(list, ++idx, 
-//						callback, 'oils_rpt_folder_contents_report_no_delete');
-//				} else {
-					_debug('deleting report ' + report.id());
-					var req = new Request(OILS_RPT_DELETE_REPORT, SESSION, report.id());
-					req.callback(function(r) { 
-						var res = r.getResultObject();
-						if( res == 0 ) return oilsRptAlertFailure();
-						obj.deleteReports(list, ++idx, callback, errid)
-					});
-					req.send();
-//				}
-//			}
-//		);
+ if( idx >= list.length ) return callback(errid);
+ var report = list[idx];
+
+ var obj = this;
+ if( report.owner().id() != USER.id() ) {
+  this.deleteReports(list, ++idx, 
+   callback, 'oils_rpt_folder_contents_no_delete');
+
+ } else {
+
+//  var req0 = new Request(OILS_RPT_REPORT_HAS_OUTS, SESSION, report.id());
+//  req0.callback(
+//   function(r0) {
+//    var r0es = r0.getResultObject();
+//    if( r0es != '0' ) {
+//     obj.deleteReports(list, ++idx, 
+//      callback, 'oils_rpt_folder_contents_report_no_delete');
+//    } else {
+     _debug('deleting report ' + report.id());
+     var req = new Request(OILS_RPT_DELETE_REPORT, SESSION, report.id());
+     req.callback(function(r) { 
+      var res = r.getResultObject();
+      if( res == 0 ) return oilsRptAlertFailure();
+      obj.deleteReports(list, ++idx, callback, errid)
+     });
+     req.send();
+//    }
+//   }
+//  );
 //
-//		req0.send();
-	}
+//  req0.send();
+ }
 }
 
 oilsRptFolderWindow.prototype.deleteTemplates = function(list, idx, callback, errid) {
-	if( idx >= list.length ) return callback(errid);
-	var tmpl = list[idx];
+ if( idx >= list.length ) return callback(errid);
+ var tmpl = list[idx];
 
-	var obj = this;
-	if( tmpl.owner().id() != USER.id() ) {
-		this.deleteTemplates(list, ++idx, 
-			callback, 'oils_rpt_folder_contents_no_delete');
+ var obj = this;
+ if( tmpl.owner().id() != USER.id() ) {
+  this.deleteTemplates(list, ++idx, 
+   callback, 'oils_rpt_folder_contents_no_delete');
 
-	} else {
+ } else {
 
 
-//		var req0 = new Request(	OILS_RPT_TEMPLATE_HAS_RPTS, SESSION, tmpl.id() );
-//		req0.callback(
-//			function(r0) {
-//				var resp = r0.getResultObject();
+//  var req0 = new Request( OILS_RPT_TEMPLATE_HAS_RPTS, SESSION, tmpl.id() );
+//  req0.callback(
+//   function(r0) {
+//    var resp = r0.getResultObject();
 //
-//				if( resp != '0' ) {
-//					obj.deleteTemplates(list, ++idx, 
-//						callback, 'oils_rpt_folder_contents_template_no_delete');
+//    if( resp != '0' ) {
+//     obj.deleteTemplates(list, ++idx, 
+//      callback, 'oils_rpt_folder_contents_template_no_delete');
 //
-//				} else {
-					_debug('deleting template ' + tmpl.id());
-					var req = new Request(OILS_RPT_DELETE_TEMPLATE, SESSION, tmpl.id());
-					req.callback(function(r) {
-						var res = r.getResultObject();
-						if( res == 0 ) return oilsRptAlertFailure();
-						obj.deleteTemplates(list, ++idx, callback, errid)
-					});
-					req.send();
-//				}
-//			}
-//		);
-//		req0.send();
-	}
+//    } else {
+     _debug('deleting template ' + tmpl.id());
+     var req = new Request(OILS_RPT_DELETE_TEMPLATE, SESSION, tmpl.id());
+     req.callback(function(r) {
+      var res = r.getResultObject();
+      if( res == 0 ) return oilsRptAlertFailure();
+      obj.deleteTemplates(list, ++idx, callback, errid)
+     });
+     req.send();
+//    }
+//   }
+//  );
+//  req0.send();
+ }
 }
 
 
 
 oilsRptFolderWindow.prototype.drawFolderDetails = function() {
-	appendClear(DOM.oils_rpt_folder_creator_label, 
-		text(this.folderNode.folder.owner().usrname()));
-	appendClear(DOM.oils_rpt_folder_name_label, 
-		text(this.folderNode.folder.name()));
+ appendClear(DOM.oils_rpt_folder_creator_label, 
+  text(this.folderNode.folder.owner().usrname()));
+ appendClear(DOM.oils_rpt_folder_name_label, 
+  text(this.folderNode.folder.name()));
 }
 
 
 oilsRptFolderWindow.prototype.fetchFolderData = function(callback) {
 
-	hideMe(DOM.oils_rpt_content_count_row_2);
-	hideMe(DOM.oils_rpt_content_row_2);
-
-	removeChildren(this.selector);
-	var req = new Request(OILS_RPT_FETCH_FOLDER_DATA, 
-		SESSION, this.type, this.folderNode.folder.id(), oilsRptOutputLimit);
-
-	hideMe(DOM.oils_rpt_pending_output);
-
-	if(this.type == 'output') {
-		unHideMe(DOM.oils_rpt_pending_output);
-		/* first fetch the non-complete schedules */
-		req = new Request(OILS_RPT_FETCH_OUTPUT, 
-			SESSION, this.folderNode.folder.id(), oilsRptOutputLimit, 0);
-	}
-
-	var obj = this;
-	removeChildren(obj.selector);
-	req.callback(
-		function(r) {
-			var res = r.getResultObject();
-
-			if( res.length == 0 ) {
-				//hideMe(DOM.oils_rpt_content_count_row); /* this also hides the new-template link.. fix me */
-				hideMe(DOM.oils_rpt_content_row);
-				unHideMe(DOM.oils_rpt_content_row_empty);
-			} else {
-				unHideMe(DOM.oils_rpt_content_count_row);
-				unHideMe(DOM.oils_rpt_content_row);
-				hideMe(DOM.oils_rpt_content_row_empty);
-			}
-
-			if( obj.type == 'output' ) {
-				obj.fleshSchedules(res, 0, obj.selector);
-			} else {
-
-
-				obj.fmTable = drawFMObjectTable( 
-					{ 
-						dest : obj.selector, 
-						obj : res,
-						selectCol : true,
-						selectColName : rpt_strings.FOLDER_WINDOW_COLNAME_SELECT,
-						selectAllName : rpt_strings.FOLDER_WINDOW_COLNAME_ALL,
-						selectNoneName : rpt_strings.FOLDER_WINDOW_COLNAME_NONE
-					}
-				);
-			}
-		}
-	);
-	req.send();
-
-	if( this.type != 'output' ) return;
-
-	/*
-	unHideMe(DOM.oils_rpt_content_count_row_2);
-	unHideMe(DOM.oils_rpt_content_row_2);
-	*/
-
-	/* now fetch the completed schedules */
-	req = new Request(OILS_RPT_FETCH_OUTPUT, 
-		SESSION, this.folderNode.folder.id(), oilsRptOutputLimit2, 1);
-
-	_debug("TRYING: fleshing finished scheds with div: " + DOM.oils_rpt_folder_contents_selector_2);
-	removeChildren(DOM.oils_rpt_folder_contents_selector_2);
-	req.callback(
-		function(r) {
-			var res = r.getResultObject();
-
-			if( res.length == 0 ) {
-				hideMe(DOM.oils_rpt_content_count_row_2);
-				hideMe(DOM.oils_rpt_content_row_2);
-			} else {
-				unHideMe(DOM.oils_rpt_content_count_row_2);
-				unHideMe(DOM.oils_rpt_content_row_2);
-			}
-
-			_debug("fleshing finished scheds with div: " + DOM.oils_rpt_folder_contents_selector_2);
-			obj.fleshSchedules(res, 0, DOM.oils_rpt_folder_contents_selector_2, true);
-		}
-	);
-	req.send();
+ hideMe(DOM.oils_rpt_content_count_row_2);
+ hideMe(DOM.oils_rpt_content_row_2);
+
+ removeChildren(this.selector);
+ var req = new Request(OILS_RPT_FETCH_FOLDER_DATA, 
+  SESSION, this.type, this.folderNode.folder.id(), oilsRptOutputLimit);
+
+ hideMe(DOM.oils_rpt_pending_output);
+
+ if(this.type == 'output') {
+  unHideMe(DOM.oils_rpt_pending_output);
+  /* first fetch the non-complete schedules */
+  req = new Request(OILS_RPT_FETCH_OUTPUT, 
+   SESSION, this.folderNode.folder.id(), oilsRptOutputLimit, 0);
+ }
+
+ var obj = this;
+ removeChildren(obj.selector);
+ req.callback(
+  function(r) {
+   var res = r.getResultObject();
+
+   if( res.length == 0 ) {
+    //hideMe(DOM.oils_rpt_content_count_row); /* this also hides the new-template link.. fix me */
+    hideMe(DOM.oils_rpt_content_row);
+    unHideMe(DOM.oils_rpt_content_row_empty);
+   } else {
+    unHideMe(DOM.oils_rpt_content_count_row);
+    unHideMe(DOM.oils_rpt_content_row);
+    hideMe(DOM.oils_rpt_content_row_empty);
+   }
+
+   if( obj.type == 'output' ) {
+    obj.fleshSchedules(res, 0, obj.selector);
+   } else {
+
+
+    obj.fmTable = drawFMObjectTable( 
+     { 
+      dest : obj.selector, 
+      obj : res,
+      selectCol : true,
+      selectColName : rpt_strings.FOLDER_WINDOW_COLNAME_SELECT,
+      selectAllName : rpt_strings.FOLDER_WINDOW_COLNAME_ALL,
+      selectNoneName : rpt_strings.FOLDER_WINDOW_COLNAME_NONE
+     }
+    );
+   }
+  }
+ );
+ req.send();
+
+ if( this.type != 'output' ) return;
+
+ /*
+ unHideMe(DOM.oils_rpt_content_count_row_2);
+ unHideMe(DOM.oils_rpt_content_row_2);
+ */
+
+ /* now fetch the completed schedules */
+ req = new Request(OILS_RPT_FETCH_OUTPUT, 
+  SESSION, this.folderNode.folder.id(), oilsRptOutputLimit2, 1);
+
+ _debug("TRYING: fleshing finished scheds with div: " + DOM.oils_rpt_folder_contents_selector_2);
+ removeChildren(DOM.oils_rpt_folder_contents_selector_2);
+ req.callback(
+  function(r) {
+   var res = r.getResultObject();
+
+   if( res.length == 0 ) {
+    hideMe(DOM.oils_rpt_content_count_row_2);
+    hideMe(DOM.oils_rpt_content_row_2);
+   } else {
+    unHideMe(DOM.oils_rpt_content_count_row_2);
+    unHideMe(DOM.oils_rpt_content_row_2);
+   }
+
+   _debug("fleshing finished scheds with div: " + DOM.oils_rpt_folder_contents_selector_2);
+   obj.fleshSchedules(res, 0, DOM.oils_rpt_folder_contents_selector_2, true);
+  }
+ );
+ req.send();
 }
 
 
 oilsRptFolderWindow.prototype.fleshSchedules = function(list, idx, selector, isSecond) {
 
-	if( idx >= list.length ) return;
-
-	var sched = list[idx];
-	var obj = this;
-
-	oilsRptFetchUser(sched.runner(),
-
-		function(user) {
-			sched.runner(user);
-			oilsRptFetchTemplate(sched.report().template(),
-
-				function(template) {
-					sched.report().template(template);
-					if( idx == 0 ) {
-						_debug("drawing schedule with output: "+selector);
-						var t = drawFMObjectTable( 
-							{ 
-								dest : selector, 
-								obj : [sched],
-								selectCol : true,
-								selectColName : rpt_strings.FOLDER_WINDOW_COLNAME_SELECT,
-								selectAllName : rpt_strings.FOLDER_WINDOW_COLNAME_ALL,
-								selectNoneName : rpt_strings.FOLDER_WINDOW_COLNAME_NONE
-							}
-						);
-
-						if( isSecond ) obj.fmTable2 = t;
-						else obj.fmTable = t;
-
-					} else {
-						//obj.fmTable.add(sched);
-						if( isSecond ) obj.fmTable2.add(sched);
-						else obj.fmTable.add(sched);
-					}
-
-					obj.fleshSchedules(list, ++idx, selector, isSecond);
-				}
-			);
-		}
-	);
+ if( idx >= list.length ) return;
+
+ var sched = list[idx];
+ var obj = this;
+
+ oilsRptFetchUser(sched.runner(),
+
+  function(user) {
+   sched.runner(user);
+   oilsRptFetchTemplate(sched.report().template(),
+
+    function(template) {
+     sched.report().template(template);
+     if( idx == 0 ) {
+      _debug("drawing schedule with output: "+selector);
+      var t = drawFMObjectTable( 
+       { 
+        dest : selector, 
+        obj : [sched],
+        selectCol : true,
+        selectColName : rpt_strings.FOLDER_WINDOW_COLNAME_SELECT,
+        selectAllName : rpt_strings.FOLDER_WINDOW_COLNAME_ALL,
+        selectNoneName : rpt_strings.FOLDER_WINDOW_COLNAME_NONE
+       }
+      );
+
+      if( isSecond ) obj.fmTable2 = t;
+      else obj.fmTable = t;
+
+     } else {
+      //obj.fmTable.add(sched);
+      if( isSecond ) obj.fmTable2.add(sched);
+      else obj.fmTable.add(sched);
+     }
+
+     obj.fleshSchedules(list, ++idx, selector, isSecond);
+    }
+   );
+  }
+ );
 }
 
 
 oilsRptFolderWindow.prototype.setSelected = function(folderNode) {
-	this.selectedFolder = folderNode;
+ this.selectedFolder = folderNode;
 }
 
 oilsRptFolderWindow.prototype.setFolderEditActions = function() {
-	var folder = this.folderNode.folder;
-
-	var obj = this;
-	DOM.oils_rpt_folder_manager_name_input.value = folder.name();
-	DOM.oils_rpt_folder_manager_change_name_submit.onclick = function() {
-		var name = DOM.oils_rpt_folder_manager_name_input.value;
-		if(name != "") {
-			folder.name( name );
-			if(confirmId('oils_rpt_folder_manager_change_name_confirm')) {
-				oilsRptUpdateFolder(folder, obj.type,
-					function(success) {
-						if(success) {
-							oilsRptAlertSuccess();
-							oilsRptCurrentFolderManager.draw();
-						}
-					}
-				);
-			}
-		}
-	}
-
-	DOM.oils_rpt_folder_manager_sub_lib_create.onclick = function() {
-		var folder;
-
-		if( obj.type == 'report' ) folder = new rrf();
-		if( obj.type == 'template' ) folder = new rtf();
-		if( obj.type == 'output' ) folder = new rof();
-
-		folder.owner(USER.id());
-		folder.parent(obj.folderNode.folder.id());
-		folder.name(DOM.oils_rpt_folder_manager_sub_name.value);
-		var shared = getSelectorVal(DOM.oils_rpt_folder_manager_sub_shared);
-		folder.shared( (shared == 'yes') ? 't' : 'f');
-		if( folder.shared() == 't' )
-			folder.share_with( obj.myOrgSelector.getValue() );
-
-		oilsRptCreateFolder(folder, obj.type,
-			function(success) {
-				if(success) {
-					oilsRptAlertSuccess();
-					oilsRptCurrentFolderManager.draw();
-				}
-			}
-		);
-	}
+ var folder = this.folderNode.folder;
+
+ var obj = this;
+ DOM.oils_rpt_folder_manager_name_input.value = folder.name();
+ DOM.oils_rpt_folder_manager_change_name_submit.onclick = function() {
+  var name = DOM.oils_rpt_folder_manager_name_input.value;
+  if(name != "") {
+   folder.name( name );
+   if(confirmId('oils_rpt_folder_manager_change_name_confirm')) {
+    oilsRptUpdateFolder(folder, obj.type,
+     function(success) {
+      if(success) {
+       oilsRptAlertSuccess();
+       oilsRptCurrentFolderManager.draw();
+      }
+     }
+    );
+   }
+  }
+ }
+
+ DOM.oils_rpt_folder_manager_sub_lib_create.onclick = function() {
+  var folder;
+
+  if( obj.type == 'report' ) folder = new rrf();
+  if( obj.type == 'template' ) folder = new rtf();
+  if( obj.type == 'output' ) folder = new rof();
+
+  folder.owner(USER.id());
+  folder.parent(obj.folderNode.folder.id());
+  folder.name(DOM.oils_rpt_folder_manager_sub_name.value);
+  var shared = getSelectorVal(DOM.oils_rpt_folder_manager_sub_shared);
+  folder.shared( (shared == 'yes') ? 't' : 'f');
+  if( folder.shared() == 't' )
+   folder.share_with( obj.myOrgSelector.getValue() );
+
+  oilsRptCreateFolder(folder, obj.type,
+   function(success) {
+    if(success) {
+     oilsRptAlertSuccess();
+     oilsRptCurrentFolderManager.draw();
+    }
+   }
+  );
+ }
 }
 
 
 oilsRptFolderWindow.prototype.doFolderDelete = function() {
-	
-	var cache = oilsRptFolderNodeCache[this.type];
-	/* let's see if this folder has any children */
-	for( var c in cache ) 
-		if( cache[c].folder.parent() == this.folderNode.folder.id() )
-			return alertId('oils_rpt_folder_cannot_delete');
-
-	/* lets see if the folder has contents */
-	var req = new Request(OILS_RPT_FETCH_FOLDER_DATA, 
-		SESSION, this.type, this.folderNode.folder.id(), 1);
-
-	if(this.type == 'output') {
-		req = new Request(OILS_RPT_FETCH_OUTPUT, 
-			SESSION, this.folderNode.folder.id(), 1);
-	}
-
-	var obj = this;
-	req.send();
-
-	req.callback( 
-		function(r) {
-
-			var contents = r.getResultObject();
-			if( contents.length > 0 ) 
-				return alertId('oils_rpt_folder_cannot_delete');
-
-			if( confirmId('oils_rpt_folder_manager_delete_confirm') ) {
-				var req2 = new Request(OILS_RPT_DELETE_FOLDER, 
-					SESSION, obj.type, obj.folderNode.folder.id());
-	
-				req2.callback( 
-					function(r2) {
-						var res = r2.getResultObject();
-						if( res == 1 ) {
-							oilsRptAlertSuccess();
-							oilsRptCurrentFolderManager.draw();
-						}
-						else alert('error: '+js2JSON(res));
-					}
-				);
-
-				req2.send();
-			}
-		}
-	);
+ 
+ var cache = oilsRptFolderNodeCache[this.type];
+ /* let's see if this folder has any children */
+ for( var c in cache ) 
+  if( cache[c].folder.parent() == this.folderNode.folder.id() )
+   return alertId('oils_rpt_folder_cannot_delete');
+
+ /* lets see if the folder has contents */
+ var req = new Request(OILS_RPT_FETCH_FOLDER_DATA, 
+  SESSION, this.type, this.folderNode.folder.id(), 1);
+
+ if(this.type == 'output') {
+  req = new Request(OILS_RPT_FETCH_OUTPUT, 
+   SESSION, this.folderNode.folder.id(), 1);
+ }
+
+ var obj = this;
+ req.send();
+
+ req.callback( 
+  function(r) {
+
+   var contents = r.getResultObject();
+   if( contents.length > 0 ) 
+    return alertId('oils_rpt_folder_cannot_delete');
+
+   if( confirmId('oils_rpt_folder_manager_delete_confirm') ) {
+    var req2 = new Request(OILS_RPT_DELETE_FOLDER, 
+     SESSION, obj.type, obj.folderNode.folder.id());
+ 
+    req2.callback( 
+     function(r2) {
+      var res = r2.getResultObject();
+      if( res == 1 ) {
+       oilsRptAlertSuccess();
+       oilsRptCurrentFolderManager.draw();
+      }
+      else alert('error: '+js2JSON(res));
+     }
+    );
+
+    req2.send();
+   }
+  }
+ );
 }
 
 
diff --git a/Open-ILS/web/reports/oils_rpt_folder_window.xhtml b/Open-ILS/web/reports/oils_rpt_folder_window.xhtml
index df1ee86475..af8e4a39ac 100644
--- a/Open-ILS/web/reports/oils_rpt_folder_window.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_folder_window.xhtml
@@ -1,132 +1,132 @@
 <div id='oils_rpt_folder_window_contents_div'>
 
 
-	<!--
-	<div style='width:100%;text-align: right; margin: 10px; vertical-align: top'>
-		<a id='oils_rpt_folder_window_contents_new_template' href='javascript:void(0);'><b>Create a new Template for this folder</b></a>
-	</div>
-	-->
-	<table id='oils_rpt_folder_window_contents_table'>
-		<tbody>
-			<tr>
-				<td colspan='2'> 
-					<span>
-						<select id='oils_rpt_folder_contents_action_selector' style='width: auto;'>
-							<option type='template' value='create_report'>&reports.oils_rpt_folder_window.new_report_from_template;</option>
-							<option type='template' value='clone_template'>&reports.oils_rpt_folder_window.clone_template;</option>
-							<option type='template' value='delete_template'>&reports.oils_rpt_folder_window.delete_template;</option>
-							<option type='report' value='change_params' disabled='disabled'>&reports.oils_rpt_folder_window.clone_report;</option>
-							<option type='report' value='schedule_report' disabled='disabled'>&reports.oils_rpt_folder_window.schedule_report;</option>
-							<option type='report' value='delete_report'>&reports.oils_rpt_folder_window.delete_reports;</option>
-							<option type='output' value='show_output'>&reports.oils_rpt_folder_window.view_report_output;</option>
-							<option type='output' value='delete_output'>&reports.oils_rpt_folder_window.delete_output;</option>
-
-							<option type='template' value='move_template'>&reports.oils_rpt_folder_window.move_templates;</option>
-							<option type='report' value='move_report'>&reports.oils_rpt_folder_window.move_reports;</option>
-							<option type='output' value='move_output'>&reports.oils_rpt_folder_window.move_output;</option>
-						</select>
-					</span>
-					<input type='submit' value='&reports.oils_rpt_folder_window.submit;' id='oils_rpt_folder_content_action_go'/>
-				</td>
-			</tr>
-
-			<tr id='oils_rpt_content_count_row'>
-				<td style='text-align:left;'>
-					<div>
-						&reports.oils_rpt_folder_window.limit_output;
-						<select id='oils_rpt_output_limit_selector'>
-							<option value='5'>5</option>
-							<option value='10'>10</option>
-							<option value='25'>25</option>
-							<option value='50'>50</option>
-							<option value=''>&reports.oils_rpt_folder_window.all;</option>
-						</select>
-						<span><b id='oils_rpt_pending_output' class='hide_me'>&reports.oils_rpt_folder_window.pending_items;</b></span>
-					</div>
-				</td>
-				<td style='text-align:right;'>
-					<a id='oils_rpt_folder_window_contents_new_template' 
-						href='javascript:void(0);'><b>&reports.oils_rpt_folder_window.new_template;</b></a>
-				</td>
-			</tr>
-
-			<tr class='oils_rpt_folder_window_contents_row' id='oils_rpt_content_row'>
-				<td colspan='2'>
-					<div id='oils_rpt_folder_contents_selector'/>
-				</td>
-			</tr>
-
-			<tr class='hide_me' id='oils_rpt_content_row_empty'>
-				<td style='text-align:left;'><b>&reports.oils_rpt_folder_window.no_items_to_display;</b></td>
-			</tr>
-
-
-			<!-- =================================================================== -->
-			<!--  Second set of folder data for schedule objects that have completed-->
-			<!-- =================================================================== -->
-			<tr id='oils_rpt_content_count_row_2' class='hide_me'>
-				<td style='text-align:left;padding-top: 20px;'>
-					<div>
-						&reports.oils_rpt_folder_window.limit_output;
-						<select id='oils_rpt_output_limit_selector_2'>
-							<option value='5'>5</option>
-							<option value='10'>10</option>
-							<option value='25'>25</option>
-							<option value='50'>50</option>
-							<option value=''>&reports.oils_rpt_folder_window.all;</option>
-						</select>
-						<span><b>&reports.oils_rpt_folder_window.completed_items;</b></span>
-					</div>
-				</td>
-			</tr>
-
-			<tr class='oils_rpt_folder_window_contents_row hide_me' id='oils_rpt_content_row_2'>
-				<td colspan='2'>
-					<div id='oils_rpt_folder_contents_selector_2'/>
-				</td>
-			</tr>
-			<!-- =================================================================== -->
-
-		</tbody>
-	</table>
-
-	<div id='oils_rpt_move_folder_div' class='hide_me' style='width:100%; padding: 5px; margin-left: 10px;'>
-		<div>&reports.oils_rpt_folder_window.selected_folder;<b id='oils_rpt_move_folder_selected'/></div>
-		<hr/>
-		<div id='oils_rpt_move_folder_picker'/>
-		<hr/>
-		<input type='submit' value='&reports.oils_rpt_folder_window.select_folder;' id='oils_rpt_change_folder_submit'/>
-		<input type='submit' value='&reports.oils_rpt_folder_window.cancel;' id='oils_rpt_change_folder_cancel'/>
-	</div>
-
-	<span class='hide_me' id='oils_rpt_folder_contents_confirm_delete'>
-		&reports.oils_rpt_folder_window.confirm_delete;
-	</span>
-
-	<span class='hide_me' id='oils_rpt_folder_contents_template_no_delete'>
-		&reports.oils_rpt_folder_window.dependant_reports_no_delete;
-	</span>
-
-	<span class='hide_me' id='oils_rpt_folder_contents_report_no_delete'>
-		&reports.oils_rpt_folder_window.dependant_outputs_no_delete;
-	</span>
-
-
-	<span class='hide_me' id='oils_rpt_folder_contents_no_delete'>
-		&reports.oils_rpt_folder_window.cannot_delete_another_users_data;
-	</span>
-
-	<span class='hide_me' id='oils_rpt_change_folder_not_allowed'>
-		&reports.oils_rpt_folder_window.cannot_move_another_users_data;
-	</span>
-
-	<span class='hide_me' id='oils_rpt_verify_template_delete'>
-		&reports.oils_rpt_folder_window.delete_all_attached_reports;
-	</span>
-
-	<span class='hide_me' id='oils_rpt_verify_report_delete'>
-		&reports.oils_rpt_folder_window.delete_all_attached_outputs;
-	</span>
+ <!--
+ <div style='width:100%;text-align: right; margin: 10px; vertical-align: top'>
+  <a id='oils_rpt_folder_window_contents_new_template' href='javascript:void(0);'><b>Create a new Template for this folder</b></a>
+ </div>
+ -->
+ <table id='oils_rpt_folder_window_contents_table'>
+  <tbody>
+   <tr>
+    <td colspan='2'> 
+     <span>
+      <select id='oils_rpt_folder_contents_action_selector' style='width: auto;'>
+       <option type='template' value='create_report'>&reports.oils_rpt_folder_window.new_report_from_template;</option>
+       <option type='template' value='clone_template'>&reports.oils_rpt_folder_window.clone_template;</option>
+       <option type='template' value='delete_template'>&reports.oils_rpt_folder_window.delete_template;</option>
+       <option type='report' value='change_params' disabled='disabled'>&reports.oils_rpt_folder_window.clone_report;</option>
+       <option type='report' value='schedule_report' disabled='disabled'>&reports.oils_rpt_folder_window.schedule_report;</option>
+       <option type='report' value='delete_report'>&reports.oils_rpt_folder_window.delete_reports;</option>
+       <option type='output' value='show_output'>&reports.oils_rpt_folder_window.view_report_output;</option>
+       <option type='output' value='delete_output'>&reports.oils_rpt_folder_window.delete_output;</option>
+
+       <option type='template' value='move_template'>&reports.oils_rpt_folder_window.move_templates;</option>
+       <option type='report' value='move_report'>&reports.oils_rpt_folder_window.move_reports;</option>
+       <option type='output' value='move_output'>&reports.oils_rpt_folder_window.move_output;</option>
+      </select>
+     </span>
+     <input type='submit' value='&reports.oils_rpt_folder_window.submit;' id='oils_rpt_folder_content_action_go'/>
+    </td>
+   </tr>
+
+   <tr id='oils_rpt_content_count_row'>
+    <td style='text-align:left;'>
+     <div>
+      &reports.oils_rpt_folder_window.limit_output;
+      <select id='oils_rpt_output_limit_selector'>
+       <option value='5'>5</option>
+       <option value='10'>10</option>
+       <option value='25'>25</option>
+       <option value='50'>50</option>
+       <option value=''>&reports.oils_rpt_folder_window.all;</option>
+      </select>
+      <span><b id='oils_rpt_pending_output' class='hide_me'>&reports.oils_rpt_folder_window.pending_items;</b></span>
+     </div>
+    </td>
+    <td style='text-align:right;'>
+     <a id='oils_rpt_folder_window_contents_new_template' 
+      href='javascript:void(0);'><b>&reports.oils_rpt_folder_window.new_template;</b></a>
+    </td>
+   </tr>
+
+   <tr class='oils_rpt_folder_window_contents_row' id='oils_rpt_content_row'>
+    <td colspan='2'>
+     <div id='oils_rpt_folder_contents_selector'/>
+    </td>
+   </tr>
+
+   <tr class='hide_me' id='oils_rpt_content_row_empty'>
+    <td style='text-align:left;'><b>&reports.oils_rpt_folder_window.no_items_to_display;</b></td>
+   </tr>
+
+
+   <!-- =================================================================== -->
+   <!--  Second set of folder data for schedule objects that have completed-->
+   <!-- =================================================================== -->
+   <tr id='oils_rpt_content_count_row_2' class='hide_me'>
+    <td style='text-align:left;padding-top: 20px;'>
+     <div>
+      &reports.oils_rpt_folder_window.limit_output;
+      <select id='oils_rpt_output_limit_selector_2'>
+       <option value='5'>5</option>
+       <option value='10'>10</option>
+       <option value='25'>25</option>
+       <option value='50'>50</option>
+       <option value=''>&reports.oils_rpt_folder_window.all;</option>
+      </select>
+      <span><b>&reports.oils_rpt_folder_window.completed_items;</b></span>
+     </div>
+    </td>
+   </tr>
+
+   <tr class='oils_rpt_folder_window_contents_row hide_me' id='oils_rpt_content_row_2'>
+    <td colspan='2'>
+     <div id='oils_rpt_folder_contents_selector_2'/>
+    </td>
+   </tr>
+   <!-- =================================================================== -->
+
+  </tbody>
+ </table>
+
+ <div id='oils_rpt_move_folder_div' class='hide_me' style='width:100%; padding: 5px; margin-left: 10px;'>
+  <div>&reports.oils_rpt_folder_window.selected_folder;<b id='oils_rpt_move_folder_selected'/></div>
+  <hr/>
+  <div id='oils_rpt_move_folder_picker'/>
+  <hr/>
+  <input type='submit' value='&reports.oils_rpt_folder_window.select_folder;' id='oils_rpt_change_folder_submit'/>
+  <input type='submit' value='&reports.oils_rpt_folder_window.cancel;' id='oils_rpt_change_folder_cancel'/>
+ </div>
+
+ <span class='hide_me' id='oils_rpt_folder_contents_confirm_delete'>
+  &reports.oils_rpt_folder_window.confirm_delete;
+ </span>
+
+ <span class='hide_me' id='oils_rpt_folder_contents_template_no_delete'>
+  &reports.oils_rpt_folder_window.dependant_reports_no_delete;
+ </span>
+
+ <span class='hide_me' id='oils_rpt_folder_contents_report_no_delete'>
+  &reports.oils_rpt_folder_window.dependant_outputs_no_delete;
+ </span>
+
+
+ <span class='hide_me' id='oils_rpt_folder_contents_no_delete'>
+  &reports.oils_rpt_folder_window.cannot_delete_another_users_data;
+ </span>
+
+ <span class='hide_me' id='oils_rpt_change_folder_not_allowed'>
+  &reports.oils_rpt_folder_window.cannot_move_another_users_data;
+ </span>
+
+ <span class='hide_me' id='oils_rpt_verify_template_delete'>
+  &reports.oils_rpt_folder_window.delete_all_attached_reports;
+ </span>
+
+ <span class='hide_me' id='oils_rpt_verify_report_delete'>
+  &reports.oils_rpt_folder_window.delete_all_attached_outputs;
+ </span>
 
 
 </div>
diff --git a/Open-ILS/web/reports/oils_rpt_folders.js b/Open-ILS/web/reports/oils_rpt_folders.js
index 028e939041..00839c0cd0 100644
--- a/Open-ILS/web/reports/oils_rpt_folders.js
+++ b/Open-ILS/web/reports/oils_rpt_folders.js
@@ -13,297 +13,297 @@ function oilsRptFolderManager() { this.init(); }
 
 oilsRptFolderManager.prototype.draw = function(auth) {
 
-	if(!auth) auth = SESSION;
-
-	this.folderTree = {};
-	this.tId = oilsNextId();
-	this.rId = oilsNextId();
-	this.oId = oilsNextId();
-	this.stId = oilsNextId();
-	this.srId = oilsNextId();
-	this.soId = oilsNextId();
-
-	this.ownerFolders = {};
-	this.ownerFolders.template = {};
-	this.ownerFolders.report = {};
-	this.ownerFolders.output = {};
-
-	removeChildren(DOM.oils_rpt_template_folder_tree); 
-	removeChildren(DOM.oils_rpt_report_folder_tree); 
-	removeChildren(DOM.oils_rpt_output_folder_tree); 
-	removeChildren(DOM.oils_rpt_template_shared_folder_tree); 
-	removeChildren(DOM.oils_rpt_report_shared_folder_tree); 
-	removeChildren(DOM.oils_rpt_output_shared_folder_tree); 
-
-	var porg = PERMS.SHARE_REPORT_FOLDER;
-	if( porg < 1 ) 
-		DOM.oils_rpt_top_folder_shared.disabled = true;
-
-	var obj = this;
-	var orgsel = new oilsRptMyOrgsWidget(
-		DOM.oils_rpt_top_folder_lib_picker, USER.ws_ou(), porg)
-	orgsel.draw();
-
-	oilsRptTemplateFolderTree = 
-		new SlimTree(
-			DOM.oils_rpt_template_folder_tree, 
-			'oilsRptTemplateFolderTree');
-			//'images/template-page.gif');
-
-	oilsRptTemplateFolderTree.addNode(this.tId, -1, rpt_strings.FOLDERS_TEMPLATES,
-		function() {
-			unHideMe(DOM.oils_rpt_folder_table_alt_td);
-			unHideMe(DOM.oils_rpt_top_folder);
-			hideMe(DOM.oils_rpt_editor_div);
-			appendClear(DOM.oils_rpt_top_folder_type,text(rpt_strings.FOLDERS_TEMPLATE));
-			hideMe(DOM.oils_rpt_folder_table_right_td);
-			DOM.oils_rpt_top_folder_create.onclick = function() {
-				obj.createTopFolder('template', orgsel);
-			}
-		}
-	);
-
-	oilsRptReportFolderTree = 
-		new SlimTree(
-			DOM.oils_rpt_report_folder_tree, 
-			'oilsRptReportFolderTree');
-			//'images/report-page.gif');
-
-
-	oilsRptReportFolderTree.addNode(this.rId, -1, rpt_strings.FOLDERS_REPORTS,
-		function() {
-			unHideMe(DOM.oils_rpt_folder_table_alt_td);
-			unHideMe(DOM.oils_rpt_top_folder);
-			hideMe(DOM.oils_rpt_editor_div);
-			hideMe(DOM.oils_rpt_folder_table_right_td);
-			appendClear(DOM.oils_rpt_top_folder_type,text(rpt_strings.FOLDERS_REPORT));
-			DOM.oils_rpt_top_folder_create.onclick = function() {
-				obj.createTopFolder('report', orgsel);
-			}
-		}
-	);
-
-
-
-	oilsRptOutputFolderTree = 
-		new SlimTree(
-			DOM.oils_rpt_output_folder_tree, 
-			'oilsRptOutputFolderTree');
-			//'images/output-page.gif');
-
-	oilsRptOutputFolderTree.addNode(this.oId, -1, rpt_strings.FOLDERS_OUTPUT,
-		function() {
-			unHideMe(DOM.oils_rpt_folder_table_alt_td);
-			unHideMe(DOM.oils_rpt_top_folder);
-			hideMe(DOM.oils_rpt_editor_div);
-			hideMe(DOM.oils_rpt_folder_table_right_td);
-			appendClear(DOM.oils_rpt_top_folder_type,text(rpt_strings.FOLDERS_OUTPUT));
-			DOM.oils_rpt_top_folder_create.onclick = function() {
-				obj.createTopFolder('output', orgsel);
-			}
-		}
-	);
-
-
-	oilsRptSharedTemplateFolderTree = 
-		new SlimTree(
-			DOM.oils_rpt_template_shared_folder_tree, 
-			'oilsRptSharedTemplateFolderTree');
-			//'images/template-page.gif');
-
-	oilsRptSharedTemplateFolderTree.addNode(this.stId, -1, rpt_strings.FOLDERS_TEMPLATES)
-
-
-	oilsRptSharedReportFolderTree = 
-		new SlimTree(
-			DOM.oils_rpt_report_shared_folder_tree, 
-			'oilsRptSharedReportFolderTree');
-			//'images/report-page.gif');
-
-	oilsRptSharedReportFolderTree.addNode(this.srId, -1, rpt_strings.FOLDERS_REPORTS)
-
-	oilsRptSharedOutputFolderTree = 
-		new SlimTree(
-			DOM.oils_rpt_output_shared_folder_tree, 
-			'oilsRptSharedOutputFolderTree');
-			//'images/output-page.gif');
-
-	oilsRptSharedOutputFolderTree.addNode(this.soId, -1, rpt_strings.FOLDERS_OUTPUT)
-
-	this.fetchFolders(auth);
+ if(!auth) auth = SESSION;
+
+ this.folderTree = {};
+ this.tId = oilsNextId();
+ this.rId = oilsNextId();
+ this.oId = oilsNextId();
+ this.stId = oilsNextId();
+ this.srId = oilsNextId();
+ this.soId = oilsNextId();
+
+ this.ownerFolders = {};
+ this.ownerFolders.template = {};
+ this.ownerFolders.report = {};
+ this.ownerFolders.output = {};
+
+ removeChildren(DOM.oils_rpt_template_folder_tree); 
+ removeChildren(DOM.oils_rpt_report_folder_tree); 
+ removeChildren(DOM.oils_rpt_output_folder_tree); 
+ removeChildren(DOM.oils_rpt_template_shared_folder_tree); 
+ removeChildren(DOM.oils_rpt_report_shared_folder_tree); 
+ removeChildren(DOM.oils_rpt_output_shared_folder_tree); 
+
+ var porg = PERMS.SHARE_REPORT_FOLDER;
+ if( porg < 1 ) 
+  DOM.oils_rpt_top_folder_shared.disabled = true;
+
+ var obj = this;
+ var orgsel = new oilsRptMyOrgsWidget(
+  DOM.oils_rpt_top_folder_lib_picker, USER.ws_ou(), porg)
+ orgsel.draw();
+
+ oilsRptTemplateFolderTree = 
+  new SlimTree(
+   DOM.oils_rpt_template_folder_tree, 
+   'oilsRptTemplateFolderTree');
+   //'images/template-page.gif');
+
+ oilsRptTemplateFolderTree.addNode(this.tId, -1, rpt_strings.FOLDERS_TEMPLATES,
+  function() {
+   unHideMe(DOM.oils_rpt_folder_table_alt_td);
+   unHideMe(DOM.oils_rpt_top_folder);
+   hideMe(DOM.oils_rpt_editor_div);
+   appendClear(DOM.oils_rpt_top_folder_type,text(rpt_strings.FOLDERS_TEMPLATE));
+   hideMe(DOM.oils_rpt_folder_table_right_td);
+   DOM.oils_rpt_top_folder_create.onclick = function() {
+    obj.createTopFolder('template', orgsel);
+   }
+  }
+ );
+
+ oilsRptReportFolderTree = 
+  new SlimTree(
+   DOM.oils_rpt_report_folder_tree, 
+   'oilsRptReportFolderTree');
+   //'images/report-page.gif');
+
+
+ oilsRptReportFolderTree.addNode(this.rId, -1, rpt_strings.FOLDERS_REPORTS,
+  function() {
+   unHideMe(DOM.oils_rpt_folder_table_alt_td);
+   unHideMe(DOM.oils_rpt_top_folder);
+   hideMe(DOM.oils_rpt_editor_div);
+   hideMe(DOM.oils_rpt_folder_table_right_td);
+   appendClear(DOM.oils_rpt_top_folder_type,text(rpt_strings.FOLDERS_REPORT));
+   DOM.oils_rpt_top_folder_create.onclick = function() {
+    obj.createTopFolder('report', orgsel);
+   }
+  }
+ );
+
+
+
+ oilsRptOutputFolderTree = 
+  new SlimTree(
+   DOM.oils_rpt_output_folder_tree, 
+   'oilsRptOutputFolderTree');
+   //'images/output-page.gif');
+
+ oilsRptOutputFolderTree.addNode(this.oId, -1, rpt_strings.FOLDERS_OUTPUT,
+  function() {
+   unHideMe(DOM.oils_rpt_folder_table_alt_td);
+   unHideMe(DOM.oils_rpt_top_folder);
+   hideMe(DOM.oils_rpt_editor_div);
+   hideMe(DOM.oils_rpt_folder_table_right_td);
+   appendClear(DOM.oils_rpt_top_folder_type,text(rpt_strings.FOLDERS_OUTPUT));
+   DOM.oils_rpt_top_folder_create.onclick = function() {
+    obj.createTopFolder('output', orgsel);
+   }
+  }
+ );
+
+
+ oilsRptSharedTemplateFolderTree = 
+  new SlimTree(
+   DOM.oils_rpt_template_shared_folder_tree, 
+   'oilsRptSharedTemplateFolderTree');
+   //'images/template-page.gif');
+
+ oilsRptSharedTemplateFolderTree.addNode(this.stId, -1, rpt_strings.FOLDERS_TEMPLATES)
+
+
+ oilsRptSharedReportFolderTree = 
+  new SlimTree(
+   DOM.oils_rpt_report_shared_folder_tree, 
+   'oilsRptSharedReportFolderTree');
+   //'images/report-page.gif');
+
+ oilsRptSharedReportFolderTree.addNode(this.srId, -1, rpt_strings.FOLDERS_REPORTS)
+
+ oilsRptSharedOutputFolderTree = 
+  new SlimTree(
+   DOM.oils_rpt_output_shared_folder_tree, 
+   'oilsRptSharedOutputFolderTree');
+   //'images/output-page.gif');
+
+ oilsRptSharedOutputFolderTree.addNode(this.soId, -1, rpt_strings.FOLDERS_OUTPUT)
+
+ this.fetchFolders(auth);
 }
 
 oilsRptFolderManager.prototype.createTopFolder = function(type, orgsel) {
 
-	if( type == 'report' ) folder = new rrf();
-	if( type == 'template' ) folder = new rtf();
-	if( type == 'output' ) folder = new rof();
-
-	folder.owner(USER.id());
-	folder.parent(null);
-	folder.name(DOM.oils_rpt_top_folder_name.value);
-	folder.shared(getSelectorVal(DOM.oils_rpt_top_folder_shared));
-
-	if( folder.shared() == 't' )
-		folder.share_with( orgsel.getValue() );
-
-	oilsRptCreateFolder(folder, type,
-		function(success) {
-			if(success) {
-				oilsRptAlertSuccess();
-				oilsRptCurrentFolderManager.draw();
-				hideMe(DOM.oils_rpt_top_folder);
-				hideMe(DOM.oils_rpt_folder_table_alt_td);
-				unHideMe(DOM.oils_rpt_editor_div);
-			}
-		}
-	);
+ if( type == 'report' ) folder = new rrf();
+ if( type == 'template' ) folder = new rtf();
+ if( type == 'output' ) folder = new rof();
+
+ folder.owner(USER.id());
+ folder.parent(null);
+ folder.name(DOM.oils_rpt_top_folder_name.value);
+ folder.shared(getSelectorVal(DOM.oils_rpt_top_folder_shared));
+
+ if( folder.shared() == 't' )
+  folder.share_with( orgsel.getValue() );
+
+ oilsRptCreateFolder(folder, type,
+  function(success) {
+   if(success) {
+    oilsRptAlertSuccess();
+    oilsRptCurrentFolderManager.draw();
+    hideMe(DOM.oils_rpt_top_folder);
+    hideMe(DOM.oils_rpt_folder_table_alt_td);
+    unHideMe(DOM.oils_rpt_editor_div);
+   }
+  }
+ );
 }
 
 
 oilsRptFolderManager.prototype.fetchFolders = function(auth) {
-	var obj = this;
-	var req = new Request(OILS_RPT_FETCH_FOLDERS, auth, 'template');
-	req.callback( function(r) { obj.drawFolders('template', r.getResultObject()); } );
-	req.send();
-
-	var req = new Request(OILS_RPT_FETCH_FOLDERS, auth, 'report');
-	req.callback( function(r) { obj.drawFolders('report', r.getResultObject()); } );
-	req.send();
-
-	var req = new Request(OILS_RPT_FETCH_FOLDERS, auth, 'output');
-	req.callback( function(r) { obj.drawFolders('output', r.getResultObject()); } );
-	req.send();
+ var obj = this;
+ var req = new Request(OILS_RPT_FETCH_FOLDERS, auth, 'template');
+ req.callback( function(r) { obj.drawFolders('template', r.getResultObject()); } );
+ req.send();
+
+ var req = new Request(OILS_RPT_FETCH_FOLDERS, auth, 'report');
+ req.callback( function(r) { obj.drawFolders('report', r.getResultObject()); } );
+ req.send();
+
+ var req = new Request(OILS_RPT_FETCH_FOLDERS, auth, 'output');
+ req.callback( function(r) { obj.drawFolders('output', r.getResultObject()); } );
+ req.send();
 }
 
 
 oilsRptFolderManager.prototype.drawFolders = function(type, folders) {
 
-	var tree;
-	var owners = {};
-
-	for( var i = 0; i < folders.length; i++ ) {
-
-		var folder = folders[i];
-		var id = oilsNextId();
-		var node = { folder : folder, treeId : id };
-
-		oilsRptFolderNodeCache[type][folder.id()] = node;
-		node.folderWindow = new oilsRptFolderWindow(type, folder.id())
-
-		/*
-		_debug("creating folder node for "+folder.name()+" : id = "+
-			folder.id()+' treeId = '+id + ' window id = ' + node.folderWindow.id);
-			*/
-
-		/* shared folders get a folder for the usrname of the 
-			owner as the parent node for the folders in the tree */
-		if(!folder.parent() && folder.owner().id() != USER.id()) {
-			if(owners[folder.owner().id()]) {
-				node.ownerNode = owners[folder.owner().id()];
-				continue;
-			}
-
-			_debug("building usrname node "+type+" -> " +folder.owner().usrname());
-
-			var id = oilsNextId();
-			var pid = this.stId;
-			var tree = oilsRptSharedTemplateFolderTree;
-			var treename = 'oilsRptSharedTemplateFolderTree';
-
-			if(type=='report') {
-				tree = oilsRptSharedReportFolderTree;
-				treename = 'oilsRptSharedReportFolderTree';
-				pid = this.srId;
-			}
-
-			if(type=='output') {
-				tree = oilsRptSharedOutputFolderTree;
-				treename = 'oilsRptSharedOutputFolderTree';
-				pid = this.soId;
-			}
-
-			tree.addNode(id, pid, folder.owner().usrname());
-			tree.close(pid);
-			owners[folder.owner().id()] = id;
-			node.ownerNode = id;
-		}
-	}
-
-	for( var i = 0; i < folders.length; i++ ) {
-
-
-		var folder = folders[i];
-		var mine = (folder.owner().id() == USER.id());
-		var pid;
-		var treename;
-
-		switch(type) {
-			case 'template': 
-				if(mine) {
-					tree = oilsRptTemplateFolderTree;
-					treename = 'oilsRptTemplateFolderTree';
-					pid = this.tId;
-				} else {
-					tree = oilsRptSharedTemplateFolderTree;
-					treename = 'oilsRptSharedTemplateFolderTree';
-					pid = this.stId;
-				}
-				break;
-			case 'report': 
-				if(mine) {
-					tree = oilsRptTemplateFolderTree;
-					treename = 'oilsRptTemplateFolderTree';
-					pid = this.rId;
-				} else {
-					tree = oilsRptSharedTemplateFolderTree;
-					treename = 'oilsRptSharedTemplateFolderTree';
-					pid = this.srId;
-				}
-				break;
-			case 'output': 
-				if(mine) {
-					tree = oilsRptTemplateFolderTree;
-					treename = 'oilsRptTemplateFolderTree';
-					pid = this.oId;
-				} else {
-					tree = oilsRptSharedTemplateFolderTree;
-					treename = 'oilsRptSharedTemplateFolderTree';
-					pid = this.soId;
-				}
-		}
-
-		node = this.findNode(type, folder.id());
-		id = node.treeId;
-		if( folder.parent() ) 
-			pid = this.findNode(type, folder.parent()).treeId;
-
-		var fname = folder.name();
-
-		if(!mine) {
-			fname = folder.name() + ' ('+folder.share_with().shortname()+')';
-			if( node.ownerNode ) pid = node.ownerNode;
-
-		} else {
-			if(isTrue(folder.shared()))
-				fname = folder.name() + ' ('+folder.share_with().shortname()+')';
-		}
-
-		var action = 'javascript:oilsRptObject.find('+node.folderWindow.id+').draw();';
-
-		/*
-		_debug('adding node '+fname+' id = ' + id + ' pid = '
-			+pid + ' parent = ' + folder.parent() + ' folder-window = ' + node.folderWindow.id );
-			*/
-
-		tree.addNode(id, pid, fname, action);
-		tree.close(pid);
-	}
+ var tree;
+ var owners = {};
+
+ for( var i = 0; i < folders.length; i++ ) {
+
+  var folder = folders[i];
+  var id = oilsNextId();
+  var node = { folder : folder, treeId : id };
+
+  oilsRptFolderNodeCache[type][folder.id()] = node;
+  node.folderWindow = new oilsRptFolderWindow(type, folder.id())
+
+  /*
+  _debug("creating folder node for "+folder.name()+" : id = "+
+   folder.id()+' treeId = '+id + ' window id = ' + node.folderWindow.id);
+   */
+
+  /* shared folders get a folder for the usrname of the 
+   owner as the parent node for the folders in the tree */
+  if(!folder.parent() && folder.owner().id() != USER.id()) {
+   if(owners[folder.owner().id()]) {
+    node.ownerNode = owners[folder.owner().id()];
+    continue;
+   }
+
+   _debug("building usrname node "+type+" -> " +folder.owner().usrname());
+
+   var id = oilsNextId();
+   var pid = this.stId;
+   var tree = oilsRptSharedTemplateFolderTree;
+   var treename = 'oilsRptSharedTemplateFolderTree';
+
+   if(type=='report') {
+    tree = oilsRptSharedReportFolderTree;
+    treename = 'oilsRptSharedReportFolderTree';
+    pid = this.srId;
+   }
+
+   if(type=='output') {
+    tree = oilsRptSharedOutputFolderTree;
+    treename = 'oilsRptSharedOutputFolderTree';
+    pid = this.soId;
+   }
+
+   tree.addNode(id, pid, folder.owner().usrname());
+   tree.close(pid);
+   owners[folder.owner().id()] = id;
+   node.ownerNode = id;
+  }
+ }
+
+ for( var i = 0; i < folders.length; i++ ) {
+
+
+  var folder = folders[i];
+  var mine = (folder.owner().id() == USER.id());
+  var pid;
+  var treename;
+
+  switch(type) {
+   case 'template': 
+    if(mine) {
+     tree = oilsRptTemplateFolderTree;
+     treename = 'oilsRptTemplateFolderTree';
+     pid = this.tId;
+    } else {
+     tree = oilsRptSharedTemplateFolderTree;
+     treename = 'oilsRptSharedTemplateFolderTree';
+     pid = this.stId;
+    }
+    break;
+   case 'report': 
+    if(mine) {
+     tree = oilsRptTemplateFolderTree;
+     treename = 'oilsRptTemplateFolderTree';
+     pid = this.rId;
+    } else {
+     tree = oilsRptSharedTemplateFolderTree;
+     treename = 'oilsRptSharedTemplateFolderTree';
+     pid = this.srId;
+    }
+    break;
+   case 'output': 
+    if(mine) {
+     tree = oilsRptTemplateFolderTree;
+     treename = 'oilsRptTemplateFolderTree';
+     pid = this.oId;
+    } else {
+     tree = oilsRptSharedTemplateFolderTree;
+     treename = 'oilsRptSharedTemplateFolderTree';
+     pid = this.soId;
+    }
+  }
+
+  node = this.findNode(type, folder.id());
+  id = node.treeId;
+  if( folder.parent() ) 
+   pid = this.findNode(type, folder.parent()).treeId;
+
+  var fname = folder.name();
+
+  if(!mine) {
+   fname = folder.name() + ' ('+folder.share_with().shortname()+')';
+   if( node.ownerNode ) pid = node.ownerNode;
+
+  } else {
+   if(isTrue(folder.shared()))
+    fname = folder.name() + ' ('+folder.share_with().shortname()+')';
+  }
+
+  var action = 'javascript:oilsRptObject.find('+node.folderWindow.id+').draw();';
+
+  /*
+  _debug('adding node '+fname+' id = ' + id + ' pid = '
+   +pid + ' parent = ' + folder.parent() + ' folder-window = ' + node.folderWindow.id );
+   */
+
+  tree.addNode(id, pid, fname, action);
+  tree.close(pid);
+ }
 }
 
 
 oilsRptFolderManager.prototype.findNode = function(type, id) {
-	return oilsRptFolderNodeCache[type][id];
+ return oilsRptFolderNodeCache[type][id];
 }
 
 
@@ -312,41 +312,41 @@ oilsRptFolderManager.prototype.findNode = function(type, id) {
 
 
 /* this only works if the initial folder tree has been drawn 
-	if defined, "action" must be a function pointer that takes the
-	folder node as the param */
+ if defined, "action" must be a function pointer that takes the
+ folder node as the param */
 var __someid;
 function oilsRptBuildFolder(type, node, treeVar, rootName, action, shared) {
-	removeChildren(node);
-	var tree = new SlimTree(node, treeVar);
-	this.treeId = oilsNextId();
-	tree.addNode(this.treeId, -1, rootName);
+ removeChildren(node);
+ var tree = new SlimTree(node, treeVar);
+ this.treeId = oilsNextId();
+ tree.addNode(this.treeId, -1, rootName);
 
-	__someid = oilsNextId();
+ __someid = oilsNextId();
 
-	var cache = oilsRptFolderNodeCache[type];
+ var cache = oilsRptFolderNodeCache[type];
 
-	for( var c in cache ) {
-		var tid = cache[c].treeId + __someid;
-		var pid = this.treeId;
-		var f = cache[c].folder;
+ for( var c in cache ) {
+  var tid = cache[c].treeId + __someid;
+  var pid = this.treeId;
+  var f = cache[c].folder;
 
-		if( !shared && (f.owner().id() != USER.id()) ) continue;
+  if( !shared && (f.owner().id() != USER.id()) ) continue;
 
-		if(f.parent()) {
-			/* find the parent's tree id so we can latch on to it */
-			var pnode = cache[f.parent()];
-			var pid = pnode.treeId + __someid;
-		}
+  if(f.parent()) {
+   /* find the parent's tree id so we can latch on to it */
+   var pnode = cache[f.parent()];
+   var pid = pnode.treeId + __someid;
+  }
 
-		tree.addNode(tid, pid, f.name(), __setFolderCB(tree, tid, action, cache[c]));
-	}
-	eval(treeVar +' = tree;');
+  tree.addNode(tid, pid, f.name(), __setFolderCB(tree, tid, action, cache[c]));
+ }
+ eval(treeVar +' = tree;');
 }
 
 function __setFolderCB(tree, id, action, node) {
-	var act;
-	if( action ) 
-		act = function() { action( node ); };
-	return act;
+ var act;
+ if( action ) 
+  act = function() { action( node ); };
+ return act;
 }
 
diff --git a/Open-ILS/web/reports/oils_rpt_param_editor.js b/Open-ILS/web/reports/oils_rpt_param_editor.js
index d99c7b0775..a8a4609b84 100644
--- a/Open-ILS/web/reports/oils_rpt_param_editor.js
+++ b/Open-ILS/web/reports/oils_rpt_param_editor.js
@@ -1,210 +1,210 @@
 oilsRptSetSubClass('oilsRptParamEditor','oilsRptObject');
 function oilsRptParamEditor(report, tbody) {
-	this.tbody = tbody;
-	this.report = report;
+ this.tbody = tbody;
+ this.report = report;
 }
 
 
 oilsRptParamEditor.prototype.recur = function() {
-	//var cb = $n(DOM.oils_rpt_recur_editor_table,'oils_rpt_recur');
-	var cb = DOM.oils_rpt_recur;
-	return (cb.checked) ? 't' : 'f';
+ //var cb = $n(DOM.oils_rpt_recur_editor_table,'oils_rpt_recur');
+ var cb = DOM.oils_rpt_recur;
+ return (cb.checked) ? 't' : 'f';
 }
 
 oilsRptParamEditor.prototype.recurInterval = function() {
-	/*
-	var count = getSelectorVal($n(DOM.oils_rpt_recur_editor_table,'oils_rpt_recur_count'));
-	var intvl = getSelectorVal($n(DOM.oils_rpt_recur_editor_table,'oils_rpt_recur_interval_type'));
-	*/
-	var count = getSelectorVal(DOM.oils_rpt_recur_count);
-	var intvl = getSelectorVal(DOM.oils_rpt_recur_interval_type);
-	return count+''+intvl;
+ /*
+ var count = getSelectorVal($n(DOM.oils_rpt_recur_editor_table,'oils_rpt_recur_count'));
+ var intvl = getSelectorVal($n(DOM.oils_rpt_recur_editor_table,'oils_rpt_recur_interval_type'));
+ */
+ var count = getSelectorVal(DOM.oils_rpt_recur_count);
+ var intvl = getSelectorVal(DOM.oils_rpt_recur_interval_type);
+ return count+''+intvl;
 }
 
 oilsRptParamEditor.prototype.draw = function() {
-	var params = this.report.gatherParams();
-	this.params = params;
-
-	if(!oilsRptParamEditor.row)
-		oilsRptParamEditor.row = 
-			DOM.oils_rpt_param_editor_tbody.removeChild(
-			$n(DOM.oils_rpt_param_editor_tbody, 'tr'));
-
-	removeChildren(this.tbody);
-	_debug(formatJSON(js2JSON(params)));
-			
-	for( var p = 0; p < params.length; p++ ) {
-		var par = params[p];
-		var row = oilsRptParamEditor.row.cloneNode(true);
-		this.tbody.appendChild(row);
-		$n(row, 'column').appendChild(text(oilsRptMakeLabel(par.path)));
-		$n(row, 'transform').appendChild(text(OILS_RPT_TRANSFORMS[par.column.transform].label));
-		$n(row, 'action').appendChild(text(OILS_RPT_FILTERS[par.op].label));
-		par.widget = this.buildWidget(par, $n(row, 'widget'));
-		par.widget.draw();
-	}
+ var params = this.report.gatherParams();
+ this.params = params;
+
+ if(!oilsRptParamEditor.row)
+  oilsRptParamEditor.row = 
+   DOM.oils_rpt_param_editor_tbody.removeChild(
+   $n(DOM.oils_rpt_param_editor_tbody, 'tr'));
+
+ removeChildren(this.tbody);
+ _debug(formatJSON(js2JSON(params)));
+   
+ for( var p = 0; p < params.length; p++ ) {
+  var par = params[p];
+  var row = oilsRptParamEditor.row.cloneNode(true);
+  this.tbody.appendChild(row);
+  $n(row, 'column').appendChild(text(oilsRptMakeLabel(par.path)));
+  $n(row, 'transform').appendChild(text(OILS_RPT_TRANSFORMS[par.column.transform].label));
+  $n(row, 'action').appendChild(text(OILS_RPT_FILTERS[par.op].label));
+  par.widget = this.buildWidget(par, $n(row, 'widget'));
+  par.widget.draw();
+ }
 
     /** draw the pre-defined template params so the user will know
         what params are already set */
     var tparams = this.report.gatherTemplateParams();
 
-	for( var p = 0; p < tparams.length; p++ ) {
-		var par = tparams[p];
-		var row = oilsRptParamEditor.row.cloneNode(true);
-		this.tbody.appendChild(row);
-		$n(row, 'column').appendChild(text(oilsRptMakeLabel(par.path)));
-		$n(row, 'transform').appendChild(text(OILS_RPT_TRANSFORMS[par.column.transform].label));
-		$n(row, 'action').appendChild(text(OILS_RPT_FILTERS[par.op].label));
-		par.widget = this.buildWidget(par, $n(row, 'widget'));
-		par.widget.draw();
-	}
+ for( var p = 0; p < tparams.length; p++ ) {
+  var par = tparams[p];
+  var row = oilsRptParamEditor.row.cloneNode(true);
+  this.tbody.appendChild(row);
+  $n(row, 'column').appendChild(text(oilsRptMakeLabel(par.path)));
+  $n(row, 'transform').appendChild(text(OILS_RPT_TRANSFORMS[par.column.transform].label));
+  $n(row, 'action').appendChild(text(OILS_RPT_FILTERS[par.op].label));
+  par.widget = this.buildWidget(par, $n(row, 'widget'));
+  par.widget.draw();
+ }
 }
 
 oilsRptParamEditor.prototype.buildWidget = function(param, node) {
-	var transform = param.column.transform;
-	var cls = oilsRptPathClass(param.path);
-	var field = oilsRptFindField(oilsIDL[cls], oilsRptPathCol(param.path));
-	var dtype = field.datatype;
-
-	_debug("building widget with param class:" + cls + ' col: '+param.column.colname + ' op: '+ param.op);
-
-	/* get the atomic widget from the datatype */
-	var atomicWidget = oilsRptTextWidget;
-	var widgetArgs	= {node:node};
-	widgetArgs.calFormat = OILS_RPT_TRANSFORMS[transform].cal_format;
-	widgetArgs.inputSize = OILS_RPT_TRANSFORMS[transform].input_size;
-	widgetArgs.regex = OILS_RPT_TRANSFORMS[transform].regex;
+ var transform = param.column.transform;
+ var cls = oilsRptPathClass(param.path);
+ var field = oilsRptFindField(oilsIDL[cls], oilsRptPathCol(param.path));
+ var dtype = field.datatype;
+
+ _debug("building widget with param class:" + cls + ' col: '+param.column.colname + ' op: '+ param.op);
+
+ /* get the atomic widget from the datatype */
+ var atomicWidget = oilsRptTextWidget;
+ var widgetArgs = {node:node};
+ widgetArgs.calFormat = OILS_RPT_TRANSFORMS[transform].cal_format;
+ widgetArgs.inputSize = OILS_RPT_TRANSFORMS[transform].input_size;
+ widgetArgs.regex = OILS_RPT_TRANSFORMS[transform].regex;
     widgetArgs.value = param.value;
 
-	switch(transform) {
-		case 'date':
-			widgetArgs.type = 'date';
-			atomicWidget = oilsRptTruncPicker;
-			break;
-		case 'hour_trunc':
-			widgetArgs.type = 'hour';
-			atomicWidget = oilsRptTruncPicker;
-			break;
-		case 'month_trunc':
-			widgetArgs.type = 'month';
-			atomicWidget = oilsRptTruncPicker;
-			break;
-		case 'year_trunc':
-			widgetArgs.type = 'year';
-			atomicWidget = oilsRptTruncPicker;
-			break;
-		case 'date':
-			atomicWidget = oilsRptCalWidget;
-			break;
-		case 'age':
-			atomicWidget = oilsRptAgeWidget;
-			break;
-		case 'days_ago':	
-			widgetArgs.size = 7;
-			widgetArgs.start = 1;
-			atomicWidget = oilsRptNumberWidget
-			break;
-		case 'months_ago':	
-			widgetArgs.size = 12;
-			widgetArgs.start = 1;
-			atomicWidget = oilsRptNumberWidget
-			break;
-		case 'quarters_ago':	
-			widgetArgs.size = 4;
-			widgetArgs.start = 1;
-			atomicWidget = oilsRptNumberWidget
-			break;
-		case 'years_ago':	
-			widgetArgs.size = 20;
-			widgetArgs.start = 1;
-			atomicWidget = oilsRptNumberWidget
-			break;
-		case 'dow':
-			widgetArgs.size = 7;
-			widgetArgs.start = 0;
-			atomicWidget = oilsRptNumberWidget
-			break;
-		case 'dom':
-			widgetArgs.size = 31;
-			widgetArgs.start = 1;
-			atomicWidget = oilsRptNumberWidget
-			break;
-		case 'doy':
-			widgetArgs.size = 365;
-			widgetArgs.start = 1;
-			atomicWidget = oilsRptNumberWidget
-			break;
-		case 'woy':
-			widgetArgs.size = 52;
-			widgetArgs.start = 1;
-			atomicWidget = oilsRptNumberWidget
-			break;
-		case 'moy':
-			widgetArgs.size = 12;
-			widgetArgs.start = 1;
-			atomicWidget = oilsRptNumberWidget
-			break;
-		case 'qoy':
-			widgetArgs.size = 4;
-			widgetArgs.start = 1;
-			atomicWidget = oilsRptNumberWidget
-			break;
-		case 'hod':
-			widgetArgs.size = 24;
-			widgetArgs.start = 0;
-			atomicWidget = oilsRptNumberWidget
-			break;
-
-		case 'substring':
-			atomicWidget = oilsRptSubstrWidget
-			break;
-	}
-
-	if( field.selector ) {
-		atomicWidget = oilsRptRemoteWidget;
-		widgetArgs.class = cls;
-		widgetArgs.field = field;
-		widgetArgs.column = param.column.colname;
-	}
-
-	switch(cls) {
-		case 'aou':
-			atomicWidget = oilsRptOrgSelector;
-			break;
-	}
-
-	switch(dtype) {
-		case 'bool':
-			atomicWidget = oilsRptBoolWidget;
-			break;
+ switch(transform) {
+  case 'date':
+   widgetArgs.type = 'date';
+   atomicWidget = oilsRptTruncPicker;
+   break;
+  case 'hour_trunc':
+   widgetArgs.type = 'hour';
+   atomicWidget = oilsRptTruncPicker;
+   break;
+  case 'month_trunc':
+   widgetArgs.type = 'month';
+   atomicWidget = oilsRptTruncPicker;
+   break;
+  case 'year_trunc':
+   widgetArgs.type = 'year';
+   atomicWidget = oilsRptTruncPicker;
+   break;
+  case 'date':
+   atomicWidget = oilsRptCalWidget;
+   break;
+  case 'age':
+   atomicWidget = oilsRptAgeWidget;
+   break;
+  case 'days_ago': 
+   widgetArgs.size = 7;
+   widgetArgs.start = 1;
+   atomicWidget = oilsRptNumberWidget
+   break;
+  case 'months_ago': 
+   widgetArgs.size = 12;
+   widgetArgs.start = 1;
+   atomicWidget = oilsRptNumberWidget
+   break;
+  case 'quarters_ago': 
+   widgetArgs.size = 4;
+   widgetArgs.start = 1;
+   atomicWidget = oilsRptNumberWidget
+   break;
+  case 'years_ago': 
+   widgetArgs.size = 20;
+   widgetArgs.start = 1;
+   atomicWidget = oilsRptNumberWidget
+   break;
+  case 'dow':
+   widgetArgs.size = 7;
+   widgetArgs.start = 0;
+   atomicWidget = oilsRptNumberWidget
+   break;
+  case 'dom':
+   widgetArgs.size = 31;
+   widgetArgs.start = 1;
+   atomicWidget = oilsRptNumberWidget
+   break;
+  case 'doy':
+   widgetArgs.size = 365;
+   widgetArgs.start = 1;
+   atomicWidget = oilsRptNumberWidget
+   break;
+  case 'woy':
+   widgetArgs.size = 52;
+   widgetArgs.start = 1;
+   atomicWidget = oilsRptNumberWidget
+   break;
+  case 'moy':
+   widgetArgs.size = 12;
+   widgetArgs.start = 1;
+   atomicWidget = oilsRptNumberWidget
+   break;
+  case 'qoy':
+   widgetArgs.size = 4;
+   widgetArgs.start = 1;
+   atomicWidget = oilsRptNumberWidget
+   break;
+  case 'hod':
+   widgetArgs.size = 24;
+   widgetArgs.start = 0;
+   atomicWidget = oilsRptNumberWidget
+   break;
+
+  case 'substring':
+   atomicWidget = oilsRptSubstrWidget
+   break;
+ }
+
+ if( field.selector ) {
+  atomicWidget = oilsRptRemoteWidget;
+  widgetArgs.class = cls;
+  widgetArgs.field = field;
+  widgetArgs.column = param.column.colname;
+ }
+
+ switch(cls) {
+  case 'aou':
+   atomicWidget = oilsRptOrgSelector;
+   break;
+ }
+
+ switch(dtype) {
+  case 'bool':
+   atomicWidget = oilsRptBoolWidget;
+   break;
 
         case "org_unit":
             atomicWidget = oilsRptOrgSelector;
             break;
-	}
+ }
 
     if(widgetArgs.value != undefined) 
         return new oilsRptTemplateWidget(widgetArgs);
 
 
-	switch(param.op) {
-		case 'in':
-		case 'not in':
-			widgetArgs.inputWidget = atomicWidget;
-			return new oilsRptSetWidget(widgetArgs);
+ switch(param.op) {
+  case 'in':
+  case 'not in':
+   widgetArgs.inputWidget = atomicWidget;
+   return new oilsRptSetWidget(widgetArgs);
         case 'is':
         case 'is not':
         case 'is blank':
         case 'is not blank':
             return new oilsRptNullWidget(widgetArgs);
-		case 'between':
-		case 'not between':
-			widgetArgs.startWidget = atomicWidget;
-			widgetArgs.endWidget = atomicWidget;
-			return new oilsRptBetweenWidget(widgetArgs);
-		default:
-			return new atomicWidget(widgetArgs);
-	}
+  case 'between':
+  case 'not between':
+   widgetArgs.startWidget = atomicWidget;
+   widgetArgs.endWidget = atomicWidget;
+   return new oilsRptBetweenWidget(widgetArgs);
+  default:
+   return new atomicWidget(widgetArgs);
+ }
 
 }
 
diff --git a/Open-ILS/web/reports/oils_rpt_param_editor.xhtml b/Open-ILS/web/reports/oils_rpt_param_editor.xhtml
index 9cbeb5be36..1fdc36fb3f 100644
--- a/Open-ILS/web/reports/oils_rpt_param_editor.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_param_editor.xhtml
@@ -1,132 +1,132 @@
 <div id='oils_rpt_param_editor_div'>
-	<div>
-		<b id='oils_rpt_param_editor_report_name'> </b>
-	</div>
+ <div>
+  <b id='oils_rpt_param_editor_report_name'> </b>
+ </div>
 
-	<!--
-	<table id='oils_rpt_recur_editor_table'>
-		<tbody>
-			<tr>
-				<th>Recurring Report</th>
-				<td><input type="checkbox" name="oils_rpt_recur" value="t"/></td>
-			</tr>
-			<tr>
-				<th>Recurrence Interval</th>
-				<td>
-					<select name="oils_rpt_recur_count">
-						<option value='1'>1</option>
-						<option value='2'>2</option>
-						<option value='3'>3</option>
-						<option value='4'>4</option>
-						<option value='5'>5</option>
-						<option value='6'>6</option>
-						<option value='7'>7</option>
-						<option value='8'>8</option>
-						<option value='9'>9</option>
-						<option value='10'>10</option>
-						<option value='11'>11</option>
-						<option value='12'>12</option>
-						<option value='13'>13</option>
-						<option value='14'>14</option>
-						<option value='15'>15</option>
-						<option value='16'>16</option>
-						<option value='17'>17</option>
-						<option value='18'>18</option>
-						<option value='19'>19</option>
-						<option value='20'>20</option>
-						<option value='21'>21</option>
-						<option value='22'>22</option>
-						<option value='23'>23</option>
-						<option value='24'>24</option>
-					</select>
-					<select name="oils_rpt_recur_interval_type">
-						<option value="days">Day(s)</option>
-						<option value="weeks">Week(s)</option>
-						<option value="months">Month(s)</option>
-					</select>
-				</td>
-			</tr>
-		</tbody>
-	</table>
-	-->
+ <!--
+ <table id='oils_rpt_recur_editor_table'>
+  <tbody>
+   <tr>
+    <th>Recurring Report</th>
+    <td><input type="checkbox" name="oils_rpt_recur" value="t"/></td>
+   </tr>
+   <tr>
+    <th>Recurrence Interval</th>
+    <td>
+     <select name="oils_rpt_recur_count">
+      <option value='1'>1</option>
+      <option value='2'>2</option>
+      <option value='3'>3</option>
+      <option value='4'>4</option>
+      <option value='5'>5</option>
+      <option value='6'>6</option>
+      <option value='7'>7</option>
+      <option value='8'>8</option>
+      <option value='9'>9</option>
+      <option value='10'>10</option>
+      <option value='11'>11</option>
+      <option value='12'>12</option>
+      <option value='13'>13</option>
+      <option value='14'>14</option>
+      <option value='15'>15</option>
+      <option value='16'>16</option>
+      <option value='17'>17</option>
+      <option value='18'>18</option>
+      <option value='19'>19</option>
+      <option value='20'>20</option>
+      <option value='21'>21</option>
+      <option value='22'>22</option>
+      <option value='23'>23</option>
+      <option value='24'>24</option>
+     </select>
+     <select name="oils_rpt_recur_interval_type">
+      <option value="days">Day(s)</option>
+      <option value="weeks">Week(s)</option>
+      <option value="months">Month(s)</option>
+     </select>
+    </td>
+   </tr>
+  </tbody>
+ </table>
+ -->
 
-	<table id='oils_rpt_param_editor_table'>
-		<thead>
-			<tr>
-				<!--
-				<td>Object</td>
-				-->
-				<td>&reports.oils_rpt_param_editor.column;</td>
-				<td>&reports.oils_rpt_param_editor.transform;</td>
-				<td>&reports.oils_rpt_param_editor.action;</td>
-				<td>&reports.oils_rpt_param_editor.user_params;</td>
-			</tr>
-		</thead>
-		<tbody id='oils_rpt_param_editor_tbody'>
-			<tr name='tr'>
-				<!--
-				<td name='object'/>
-				-->
-				<td name='column'/>
-				<td name='transform'/>
-				<td name='action'/>
-				<td>
-					<div>
-						<span name='hint'/>
-						<span name='widget'/>
-					</div>
-					<div name='reldate_div'  style='margin-top: 5px;' class='hide_me'>
-						<div><b> - &reports.oils_rpt_param_editor.or; - </b></div>
-						<input type='checkbox' name='choose_rel'/> &reports.oils_rpt_param_editor.use_relative_date;
-						<div name='reldate'/>
-					</div>
-				</td>
-			</tr>
-		</tbody>
-	</table>
+ <table id='oils_rpt_param_editor_table'>
+  <thead>
+   <tr>
+    <!--
+    <td>Object</td>
+    -->
+    <td>&reports.oils_rpt_param_editor.column;</td>
+    <td>&reports.oils_rpt_param_editor.transform;</td>
+    <td>&reports.oils_rpt_param_editor.action;</td>
+    <td>&reports.oils_rpt_param_editor.user_params;</td>
+   </tr>
+  </thead>
+  <tbody id='oils_rpt_param_editor_tbody'>
+   <tr name='tr'>
+    <!--
+    <td name='object'/>
+    -->
+    <td name='column'/>
+    <td name='transform'/>
+    <td name='action'/>
+    <td>
+     <div>
+      <span name='hint'/>
+      <span name='widget'/>
+     </div>
+     <div name='reldate_div'  style='margin-top: 5px;' class='hide_me'>
+      <div><b> - &reports.oils_rpt_param_editor.or; - </b></div>
+      <input type='checkbox' name='choose_rel'/> &reports.oils_rpt_param_editor.use_relative_date;
+      <div name='reldate'/>
+     </div>
+    </td>
+   </tr>
+  </tbody>
+ </table>
 
-	<div class='hide_me' id='oils_rpt_relative_date_picker'>
-		<table>
-			<tbody>
-				<tr>
-					<td>
-						<select name="count">
-							<option value='1'>1</option>
-							<option value='2'>2</option>
-							<option value='3'>3</option>
-							<option value='4'>4</option>
-							<option value='5'>5</option>
-							<option value='6'>6</option>
-							<option value='7'>7</option>
-							<option value='8'>8</option>
-							<option value='9'>9</option>
-							<option value='10'>10</option>
-							<option value='11'>11</option>
-							<option value='12'>12</option>
-							<option value='13'>13</option>
-							<option value='14'>14</option>
-							<option value='15'>15</option>
-							<option value='16'>16</option>
-							<option value='17'>17</option>
-							<option value='18'>18</option>
-							<option value='19'>19</option>
-							<option value='20'>20</option>
-							<option value='21'>21</option>
-							<option value='22'>22</option>
-							<option value='23'>23</option>
-							<option value='24'>24</option>
-						</select>
-						<select name="type">
-							<option value="days">&reports.oils_rpt_param_editor.days;</option>
-							<option value="weeks">&reports.oils_rpt_param_editor.weeks;</option>
-							<option value="months">&reports.oils_rpt_param_editor.months;</option>
-						</select>
-						<span>&reports.oils_rpt_param_editor.ago;</span>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-	</div>
+ <div class='hide_me' id='oils_rpt_relative_date_picker'>
+  <table>
+   <tbody>
+    <tr>
+     <td>
+      <select name="count">
+       <option value='1'>1</option>
+       <option value='2'>2</option>
+       <option value='3'>3</option>
+       <option value='4'>4</option>
+       <option value='5'>5</option>
+       <option value='6'>6</option>
+       <option value='7'>7</option>
+       <option value='8'>8</option>
+       <option value='9'>9</option>
+       <option value='10'>10</option>
+       <option value='11'>11</option>
+       <option value='12'>12</option>
+       <option value='13'>13</option>
+       <option value='14'>14</option>
+       <option value='15'>15</option>
+       <option value='16'>16</option>
+       <option value='17'>17</option>
+       <option value='18'>18</option>
+       <option value='19'>19</option>
+       <option value='20'>20</option>
+       <option value='21'>21</option>
+       <option value='22'>22</option>
+       <option value='23'>23</option>
+       <option value='24'>24</option>
+      </select>
+      <select name="type">
+       <option value="days">&reports.oils_rpt_param_editor.days;</option>
+       <option value="weeks">&reports.oils_rpt_param_editor.weeks;</option>
+       <option value="months">&reports.oils_rpt_param_editor.months;</option>
+      </select>
+      <span>&reports.oils_rpt_param_editor.ago;</span>
+     </td>
+    </tr>
+   </tbody>
+  </table>
+ </div>
 
 </div>
 
diff --git a/Open-ILS/web/reports/oils_rpt_report_editor.js b/Open-ILS/web/reports/oils_rpt_report_editor.js
index b613e29a85..44b78298d5 100644
--- a/Open-ILS/web/reports/oils_rpt_report_editor.js
+++ b/Open-ILS/web/reports/oils_rpt_report_editor.js
@@ -6,25 +6,25 @@ oilsRptSetSubClass('oilsRptReportEditor', 'oilsRptObject');
 var oilsRptReportEditorFolderTree;
 
 function oilsRptReportEditor(rptObject, folderWindow) {
-	var tmpl = rptObject.templateObject;
-	var rpt = rptObject.reportObject;
-	this.folderWindow = folderWindow;
+ var tmpl = rptObject.templateObject;
+ var rpt = rptObject.reportObject;
+ this.folderWindow = folderWindow;
 
-	this.template = tmpl;
-	this.report = rpt;
+ this.template = tmpl;
+ this.report = rpt;
 
-	appendClear(DOM.oils_rpt_report_editor_template_name, tmpl.name());
-	appendClear(DOM.oils_rpt_report_editor_template_creator, tmpl.owner().usrname());
-	appendClear(DOM.oils_rpt_report_editor_template_description, tmpl.description());
+ appendClear(DOM.oils_rpt_report_editor_template_name, tmpl.name());
+ appendClear(DOM.oils_rpt_report_editor_template_creator, tmpl.owner().usrname());
+ appendClear(DOM.oils_rpt_report_editor_template_description, tmpl.description());
     
     appendClear(DOM.oils_rpt_report_editor_cols,'');
-	iterate(rptObject.def.select, 
-		function(i) {
-			if(i)
-				DOM.oils_rpt_report_editor_cols.appendChild(text(i.alias));
-				DOM.oils_rpt_report_editor_cols.appendChild(document.createElement('br'));
-		}
-	);
+ iterate(rptObject.def.select, 
+  function(i) {
+   if(i)
+    DOM.oils_rpt_report_editor_cols.appendChild(text(i.alias));
+    DOM.oils_rpt_report_editor_cols.appendChild(document.createElement('br'));
+  }
+ );
 
 /*
 oils_rpt_editor_pivot_label
@@ -63,86 +63,86 @@ oils_rpt_editor_pivot_data
     }
  
 
-	if( rpt ) {
-		DOM.oils_rpt_report_editor_name.value = rpt.name();
-		DOM.oils_rpt_report_editor_description.value = rpt.description();
-	}
-
-	this.paramEditor = new oilsRptParamEditor(
-		rptObject, DOM.oils_rpt_param_editor_tbody);
-	this.paramEditor.draw();
-
-	removeChildren(DOM.oils_rpt_report_editor_selected_folder);
-	removeChildren(DOM.oils_rpt_output_selected_folder);
-
-	var obj = this;
-	oilsRptBuildFolder(
-		'report',
-		DOM.oils_rpt_report_editor_dest_folder,
-		'oilsRptReportEditorFolderTree',
-		rpt_strings.REPORT_EDITOR_REPORT_FOLDERS,
-		function(node) { 
-			appendClear(DOM.oils_rpt_report_editor_selected_folder, node.folder.name());
-			obj.selectedFolder = node; });
-
-
-	oilsRptBuildFolder(
-		'output',
-		DOM.oils_rpt_output_dest_folder,
-		'oilsRptReportEditorOutputTree',
-		rpt_strings.REPORT_EDITOR_OUTPUT_FOLDERS,
-		function(node) { 
-			appendClear(DOM.oils_rpt_output_selected_folder, node.folder.name());
-			obj.selectedOutputFolder = node; });
-
-
-	var obj = this;
-	DOM.oils_rpt_report_editor_save.onclick = function(){obj.save();}
-	DOM.oils_rpt_param_editor_sched_email.value = USER.email();
-	DOM.oils_rpt_param_editor_sched_start_date.value = mkYearMonDay();
-
-	_debug("fleshing template:\n" + tmpl.name() + '\n' + formatJSON(tmpl.data()));
+ if( rpt ) {
+  DOM.oils_rpt_report_editor_name.value = rpt.name();
+  DOM.oils_rpt_report_editor_description.value = rpt.description();
+ }
+
+ this.paramEditor = new oilsRptParamEditor(
+  rptObject, DOM.oils_rpt_param_editor_tbody);
+ this.paramEditor.draw();
+
+ removeChildren(DOM.oils_rpt_report_editor_selected_folder);
+ removeChildren(DOM.oils_rpt_output_selected_folder);
+
+ var obj = this;
+ oilsRptBuildFolder(
+  'report',
+  DOM.oils_rpt_report_editor_dest_folder,
+  'oilsRptReportEditorFolderTree',
+  rpt_strings.REPORT_EDITOR_REPORT_FOLDERS,
+  function(node) { 
+   appendClear(DOM.oils_rpt_report_editor_selected_folder, node.folder.name());
+   obj.selectedFolder = node; });
+
+
+ oilsRptBuildFolder(
+  'output',
+  DOM.oils_rpt_output_dest_folder,
+  'oilsRptReportEditorOutputTree',
+  rpt_strings.REPORT_EDITOR_OUTPUT_FOLDERS,
+  function(node) { 
+   appendClear(DOM.oils_rpt_output_selected_folder, node.folder.name());
+   obj.selectedOutputFolder = node; });
+
+
+ var obj = this;
+ DOM.oils_rpt_report_editor_save.onclick = function(){obj.save();}
+ DOM.oils_rpt_param_editor_sched_email.value = USER.email();
+ DOM.oils_rpt_param_editor_sched_start_date.value = mkYearMonDay();
+
+ _debug("fleshing template:\n" + tmpl.name() + '\n' + formatJSON(tmpl.data()));
 }
 
 
 oilsRptReportEditor.prototype.save = function() {
-	var report = new rr();
+ var report = new rr();
 
-	if(!this.selectedFolder) 
-		return alert(rpt_strings.REPORT_EDITOR_PROVIDE_FOLDER_ALERT);
+ if(!this.selectedFolder) 
+  return alert(rpt_strings.REPORT_EDITOR_PROVIDE_FOLDER_ALERT);
 
-	if(!DOM.oils_rpt_report_editor_name.value)
-		return alert(rpt_strings.REPORT_EDITOR_ENTER_NAME_ALERT);
+ if(!DOM.oils_rpt_report_editor_name.value)
+  return alert(rpt_strings.REPORT_EDITOR_ENTER_NAME_ALERT);
 
-	report.owner( USER.id() );
-	report.template( this.template.id() );
-	report.folder( this.selectedFolder.folder.id() );
-	report.name( DOM.oils_rpt_report_editor_name.value );
-	report.description( DOM.oils_rpt_report_editor_desc.value );
-	report.recur(this.paramEditor.recur());
-	report.recurance(this.paramEditor.recurInterval());
+ report.owner( USER.id() );
+ report.template( this.template.id() );
+ report.folder( this.selectedFolder.folder.id() );
+ report.name( DOM.oils_rpt_report_editor_name.value );
+ report.description( DOM.oils_rpt_report_editor_desc.value );
+ report.recur(this.paramEditor.recur());
+ report.recurance(this.paramEditor.recurInterval());
 
 
-	/* collect the param data */
-	var data = {};
-	for( var p in this.paramEditor.params ) {
-		var par = this.paramEditor.params[p];
-		_debug("adding report param "+par.key+" to report data");
-		var val = par.widget.getValue();
+ /* collect the param data */
+ var data = {};
+ for( var p in this.paramEditor.params ) {
+  var par = this.paramEditor.params[p];
+  _debug("adding report param "+par.key+" to report data");
+  var val = par.widget.getValue();
 
-		if(!val || val.length == 0 )
-			return alertId('oils_rpt_empty_param');
+  if(!val || val.length == 0 )
+   return alertId('oils_rpt_empty_param');
 
-		if( typeof val == 'object') {
-			for( var i = i; i < val.length; i++ ) {
-				_debug("looking at widget value" + val[i]);
-				if( val[i] == '' || val[i] == null ) 
-					return alertId('oils_rpt_empty_param');
-			}
-		}
+  if( typeof val == 'object') {
+   for( var i = i; i < val.length; i++ ) {
+    _debug("looking at widget value" + val[i]);
+    if( val[i] == '' || val[i] == null ) 
+     return alertId('oils_rpt_empty_param');
+   }
+  }
 
-		data[par.key] = val;
-	}
+  data[par.key] = val;
+ }
 
     if(getSelectorVal(DOM.oils_rpt_editor_pivot_data)) {
         data.__pivot_label = getSelectorVal(DOM.oils_rpt_editor_pivot_label);
@@ -150,54 +150,54 @@ oilsRptReportEditor.prototype.save = function() {
     }
 
 
-	data = js2JSON(data);
-	_debug("complete report data = "+data);
-	report.data(data);
+ data = js2JSON(data);
+ _debug("complete report data = "+data);
+ report.data(data);
 
-	_debug("Built report:\n"+js2JSON(report));
+ _debug("Built report:\n"+js2JSON(report));
 
 
-	var time;
-	if( DOM.oils_rpt_report_editor_run_now.checked ) {
-		DOM.oils_rpt_report_editor_run_now.checked = false;
-		time = 'now';
+ var time;
+ if( DOM.oils_rpt_report_editor_run_now.checked ) {
+  DOM.oils_rpt_report_editor_run_now.checked = false;
+  time = 'now';
 
-	} else {
+ } else {
 
-		var dt = DOM.oils_rpt_param_editor_sched_start_date.value;
-		if(!dt || !dt.match(/^\d{4}-\d{2}-\d{2}$/) ) {
-			/* for now.. make this better in the future */
-			alert(rpt_strings.REPORT_EDITOR_INVALID_DATE_ALERT);
-			return;
-		}
-		var hour = getSelectorVal(DOM.oils_rpt_param_editor_sched_start_hour);
-		time = dt +'T'+hour+':00';
-		_debug("built run_time "+time);
-	}
+  var dt = DOM.oils_rpt_param_editor_sched_start_date.value;
+  if(!dt || !dt.match(/^\d{4}-\d{2}-\d{2}$/) ) {
+   /* for now.. make this better in the future */
+   alert(rpt_strings.REPORT_EDITOR_INVALID_DATE_ALERT);
+   return;
+  }
+  var hour = getSelectorVal(DOM.oils_rpt_param_editor_sched_start_hour);
+  time = dt +'T'+hour+':00';
+  _debug("built run_time "+time);
+ }
 
-	if(!this.selectedOutputFolder) 
-		return alert(rpt_strings.REPORT_EDITOR_PROVIDE_OUTPUT_ALERT);
+ if(!this.selectedOutputFolder) 
+  return alert(rpt_strings.REPORT_EDITOR_PROVIDE_OUTPUT_ALERT);
 
-	var schedule = new rs();
-	schedule.folder(this.selectedOutputFolder.folder.id());
-	schedule.email(DOM.oils_rpt_param_editor_sched_email.value);
-	schedule.run_time(time);
-	schedule.runner(USER.id());
+ var schedule = new rs();
+ schedule.folder(this.selectedOutputFolder.folder.id());
+ schedule.email(DOM.oils_rpt_param_editor_sched_email.value);
+ schedule.run_time(time);
+ schedule.runner(USER.id());
 
-	schedule.excel_format((DOM.oils_rpt_format_excel.checked) ? 't' : 'f');
-	schedule.html_format((DOM.oils_rpt_format_html.checked) ? 't' : 'f');
-	schedule.csv_format((DOM.oils_rpt_format_csv.checked) ? 't' : 'f');
-	//schedule.chart_pie((DOM.oils_rpt_format_chart_pie.checked) ? 't' : 'f');
-	schedule.chart_bar((DOM.oils_rpt_format_chart_bar.checked) ? 't' : 'f');
-	schedule.chart_line((DOM.oils_rpt_format_chart_line.checked) ? 't' : 'f');
+ schedule.excel_format((DOM.oils_rpt_format_excel.checked) ? 't' : 'f');
+ schedule.html_format((DOM.oils_rpt_format_html.checked) ? 't' : 'f');
+ schedule.csv_format((DOM.oils_rpt_format_csv.checked) ? 't' : 'f');
+ //schedule.chart_pie((DOM.oils_rpt_format_chart_pie.checked) ? 't' : 'f');
+ schedule.chart_bar((DOM.oils_rpt_format_chart_bar.checked) ? 't' : 'f');
+ schedule.chart_line((DOM.oils_rpt_format_chart_line.checked) ? 't' : 'f');
 
 
-	debugFMObject(report);
-	debugFMObject(schedule);
+ debugFMObject(report);
+ debugFMObject(schedule);
 
-	//return;
+ //return;
 
-	var obj = this;
+ var obj = this;
     var folderReq = new Request(OILS_RPT_REPORT_EXISTS, SESSION, report);
     folderReq.callback(
         function(r1) {
diff --git a/Open-ILS/web/reports/oils_rpt_tforms.js b/Open-ILS/web/reports/oils_rpt_tforms.js
index ff9da5577c..8efb607be0 100644
--- a/Open-ILS/web/reports/oils_rpt_tforms.js
+++ b/Open-ILS/web/reports/oils_rpt_tforms.js
@@ -4,223 +4,223 @@ var rpt_strings = dojo.i18n.getLocalization("openils.reports", "reports");
 
 
 var OILS_RPT_TRANSFORMS = {
-	Bare : {
-		label : rpt_strings.TFORMS_LABEL_RAW_DATA
-	},
+ Bare : {
+  label : rpt_strings.TFORMS_LABEL_RAW_DATA
+ },
 
-	first : {
-		label : rpt_strings.TFORMS_LABEL_FIRST
-	},
+ first : {
+  label : rpt_strings.TFORMS_LABEL_FIRST
+ },
 
-	last : {
-		label : rpt_strings.TFORMS_LABEL_LAST
-	},
+ last : {
+  label : rpt_strings.TFORMS_LABEL_LAST
+ },
 
-	count : {
-		aggregate : true,
-		label :  rpt_strings.TFORMS_LABEL_COUNT
-	},
+ count : {
+  aggregate : true,
+  label :  rpt_strings.TFORMS_LABEL_COUNT
+ },
 
-	count_distinct : {
-		aggregate : true,
-		label : rpt_strings.TFORMS_LABEL_COUNT_DISTINCT
-	},
+ count_distinct : {
+  aggregate : true,
+  label : rpt_strings.TFORMS_LABEL_COUNT_DISTINCT
+ },
 
-	min : {
-		aggregate : true,
-		label : rpt_strings.TFORMS_LABEL_MIN
-	},
+ min : {
+  aggregate : true,
+  label : rpt_strings.TFORMS_LABEL_MIN
+ },
 
-	max : {
-		aggregate : true,
-		label : rpt_strings.TFORMS_LABEL_MAX
-	},
+ max : {
+  aggregate : true,
+  label : rpt_strings.TFORMS_LABEL_MAX
+ },
 
-	/* string transforms ------------------------- */
+ /* string transforms ------------------------- */
 
    /* XXX not supported yet
-	substring : {
-		datatype : OILS_RPT_DTYPE_STRING,
-		label : 'Substring'
-	},
+ substring : {
+  datatype : OILS_RPT_DTYPE_STRING,
+  label : 'Substring'
+ },
    */
 
-	lower : {
-		datatype : [OILS_RPT_DTYPE_STRING, 'text'],
-		label : rpt_strings.TFORMS_LABEL_LOWER
-	},
-
-	upper : {
-		datatype : [OILS_RPT_DTYPE_STRING, 'text'],
-		label : rpt_strings.TFORMS_LABEL_UPPER
-	},
-
-	first5 : {
-		datatype : [OILS_RPT_DTYPE_STRING, 'text'],
-		label : rpt_strings.TFORMS_LABEL_FIRST5
-	},
-
-	first_word : {
-		datatype : [OILS_RPT_DTYPE_STRING, 'text'],
-		label : rpt_strings.TFORMS_LABEL_FIRST_WORD
-	},
-
-	/* timestamp transforms ----------------------- */
-	dow : {
-		datatype : OILS_RPT_DTYPE_TIMESTAMP,
-		label : rpt_strings.TFORMS_LABEL_DOW,
-		regex : /^[0-6]$/
-	},
-	dom : {
-		datatype : OILS_RPT_DTYPE_TIMESTAMP,
-		label : rpt_strings.TFORMS_LABEL_DOM,
-		regex : /^[0-9]{1,2}$/
-	},
-
-	doy : {
-		datatype : OILS_RPT_DTYPE_TIMESTAMP,
-		label : rpt_strings.TFORMS_LABEL_DOY,
-		regex : /^[0-9]{1,3}$/
-	},
-
-	woy : {
-		datatype : OILS_RPT_DTYPE_TIMESTAMP,
-		label : rpt_strings.TFORMS_LABEL_WOY,
-		regex : /^[0-9]{1,2}$/
-	},
-
-	moy : {
-		datatype : OILS_RPT_DTYPE_TIMESTAMP,
-		label : rpt_strings.TFORMS_LABEL_MOY,
-		regex : /^\d{1,2}$/
-	},
-
-	qoy : {
-		datatype : OILS_RPT_DTYPE_TIMESTAMP,
-		label : rpt_strings.TFORMS_LABEL_QOY,
-		regex : /^[1234]$/
-	}, 
-
-	hod : {
-		datatype : OILS_RPT_DTYPE_TIMESTAMP,
-		label : rpt_strings.TFORMS_LABEL_HOD,
-		regex : /^\d{1,2}$/
-	}, 
-
-	date : {
-		datatype : OILS_RPT_DTYPE_TIMESTAMP,
-		label : rpt_strings.TFORMS_LABEL_DATE,
-		regex : /^\d{4}-\d{2}-\d{2}$/,
-		hint  : 'YYYY-MM-DD',
-		cal_format : '%Y-%m-%d',
-		input_size : 10
-	},
-
-	month_trunc : {
-		datatype : OILS_RPT_DTYPE_TIMESTAMP,
-		label : rpt_strings.TFORMS_LABEL_MONTH_TRUNC,
-		regex : /^\d{4}-\d{2}$/,
-		hint  : 'YYYY-MM',
-		cal_format : '%Y-%m',
-		input_size : 7
-	},
-
-	year_trunc : {
-		datatype : OILS_RPT_DTYPE_TIMESTAMP,
-		label : rpt_strings.TFORMS_LABEL_YEAR_TRUNC,
-		regex : /^\d{4}$/,
-		hint  : 'YYYY',
-		cal_format : '%Y',
-		input_size : 4
-	},
-
-	hour_trunc : {
-		datatype : OILS_RPT_DTYPE_TIMESTAMP,
-		label : rpt_strings.TFORMS_LABEL_HOUR_TRUNC,
-		regex : /^\d{2}$/,
-		hint  : 'HH',
-		cal_format : '%H',
-		input_size : 2
-	},
-
-	day_name : {
-		datatype : OILS_RPT_DTYPE_TIMESTAMP,
-		label : rpt_strings.TFORMS_LABEL_DAY_NAME
-	}, 
-
-	month_name : {
-		datatype : OILS_RPT_DTYPE_TIMESTAMP,
-		label : rpt_strings.TFORMS_LABEL_MONTH_NAME
-	},
-	age : {
-		datatype : OILS_RPT_DTYPE_TIMESTAMP,
-		label : rpt_strings.TFORMS_LABEL_AGE
-	},
-
-	months_ago : {
-		datatype : OILS_RPT_DTYPE_TIMESTAMP,
-		label : rpt_strings.TFORMS_LABEL_MONTHS_AGO
-	},
-
-	quarters_ago : {
-		datatype : OILS_RPT_DTYPE_TIMESTAMP,
-		label : rpt_strings.TFORMS_LABEL_QUARTERS_AGO
-	},
-
-	/* int  / float transforms ----------------------------------- */
-	sum : {
-		datatype : [ OILS_RPT_DTYPE_INT, OILS_RPT_DTYPE_FLOAT ],
-		label : rpt_strings.TFORMS_LABEL_SUM,
-		aggregate : true
-	}, 
-
-	average : {
-		datatype : [ OILS_RPT_DTYPE_INT, OILS_RPT_DTYPE_FLOAT ],
-		label : rpt_strings.TFORMS_LABEL_AVERAGE,
-		aggregate : true
-	},
-
-	round : {
-		datatype : [ OILS_RPT_DTYPE_INT, OILS_RPT_DTYPE_FLOAT ],
-		label : rpt_strings.TFORMS_LABEL_ROUND,
-	},
-
-	'int' : {
-		datatype : OILS_RPT_DTYPE_FLOAT,
-		label : rpt_strings.TFORMS_LABEL_INT
-	}
+ lower : {
+  datatype : [OILS_RPT_DTYPE_STRING, 'text'],
+  label : rpt_strings.TFORMS_LABEL_LOWER
+ },
+
+ upper : {
+  datatype : [OILS_RPT_DTYPE_STRING, 'text'],
+  label : rpt_strings.TFORMS_LABEL_UPPER
+ },
+
+ first5 : {
+  datatype : [OILS_RPT_DTYPE_STRING, 'text'],
+  label : rpt_strings.TFORMS_LABEL_FIRST5
+ },
+
+ first_word : {
+  datatype : [OILS_RPT_DTYPE_STRING, 'text'],
+  label : rpt_strings.TFORMS_LABEL_FIRST_WORD
+ },
+
+ /* timestamp transforms ----------------------- */
+ dow : {
+  datatype : OILS_RPT_DTYPE_TIMESTAMP,
+  label : rpt_strings.TFORMS_LABEL_DOW,
+  regex : /^[0-6]$/
+ },
+ dom : {
+  datatype : OILS_RPT_DTYPE_TIMESTAMP,
+  label : rpt_strings.TFORMS_LABEL_DOM,
+  regex : /^[0-9]{1,2}$/
+ },
+
+ doy : {
+  datatype : OILS_RPT_DTYPE_TIMESTAMP,
+  label : rpt_strings.TFORMS_LABEL_DOY,
+  regex : /^[0-9]{1,3}$/
+ },
+
+ woy : {
+  datatype : OILS_RPT_DTYPE_TIMESTAMP,
+  label : rpt_strings.TFORMS_LABEL_WOY,
+  regex : /^[0-9]{1,2}$/
+ },
+
+ moy : {
+  datatype : OILS_RPT_DTYPE_TIMESTAMP,
+  label : rpt_strings.TFORMS_LABEL_MOY,
+  regex : /^\d{1,2}$/
+ },
+
+ qoy : {
+  datatype : OILS_RPT_DTYPE_TIMESTAMP,
+  label : rpt_strings.TFORMS_LABEL_QOY,
+  regex : /^[1234]$/
+ }, 
+
+ hod : {
+  datatype : OILS_RPT_DTYPE_TIMESTAMP,
+  label : rpt_strings.TFORMS_LABEL_HOD,
+  regex : /^\d{1,2}$/
+ }, 
+
+ date : {
+  datatype : OILS_RPT_DTYPE_TIMESTAMP,
+  label : rpt_strings.TFORMS_LABEL_DATE,
+  regex : /^\d{4}-\d{2}-\d{2}$/,
+  hint  : 'YYYY-MM-DD',
+  cal_format : '%Y-%m-%d',
+  input_size : 10
+ },
+
+ month_trunc : {
+  datatype : OILS_RPT_DTYPE_TIMESTAMP,
+  label : rpt_strings.TFORMS_LABEL_MONTH_TRUNC,
+  regex : /^\d{4}-\d{2}$/,
+  hint  : 'YYYY-MM',
+  cal_format : '%Y-%m',
+  input_size : 7
+ },
+
+ year_trunc : {
+  datatype : OILS_RPT_DTYPE_TIMESTAMP,
+  label : rpt_strings.TFORMS_LABEL_YEAR_TRUNC,
+  regex : /^\d{4}$/,
+  hint  : 'YYYY',
+  cal_format : '%Y',
+  input_size : 4
+ },
+
+ hour_trunc : {
+  datatype : OILS_RPT_DTYPE_TIMESTAMP,
+  label : rpt_strings.TFORMS_LABEL_HOUR_TRUNC,
+  regex : /^\d{2}$/,
+  hint  : 'HH',
+  cal_format : '%H',
+  input_size : 2
+ },
+
+ day_name : {
+  datatype : OILS_RPT_DTYPE_TIMESTAMP,
+  label : rpt_strings.TFORMS_LABEL_DAY_NAME
+ }, 
+
+ month_name : {
+  datatype : OILS_RPT_DTYPE_TIMESTAMP,
+  label : rpt_strings.TFORMS_LABEL_MONTH_NAME
+ },
+ age : {
+  datatype : OILS_RPT_DTYPE_TIMESTAMP,
+  label : rpt_strings.TFORMS_LABEL_AGE
+ },
+
+ months_ago : {
+  datatype : OILS_RPT_DTYPE_TIMESTAMP,
+  label : rpt_strings.TFORMS_LABEL_MONTHS_AGO
+ },
+
+ quarters_ago : {
+  datatype : OILS_RPT_DTYPE_TIMESTAMP,
+  label : rpt_strings.TFORMS_LABEL_QUARTERS_AGO
+ },
+
+ /* int  / float transforms ----------------------------------- */
+ sum : {
+  datatype : [ OILS_RPT_DTYPE_INT, OILS_RPT_DTYPE_FLOAT ],
+  label : rpt_strings.TFORMS_LABEL_SUM,
+  aggregate : true
+ }, 
+
+ average : {
+  datatype : [ OILS_RPT_DTYPE_INT, OILS_RPT_DTYPE_FLOAT ],
+  label : rpt_strings.TFORMS_LABEL_AVERAGE,
+  aggregate : true
+ },
+
+ round : {
+  datatype : [ OILS_RPT_DTYPE_INT, OILS_RPT_DTYPE_FLOAT ],
+  label : rpt_strings.TFORMS_LABEL_ROUND,
+ },
+
+ 'int' : {
+  datatype : OILS_RPT_DTYPE_FLOAT,
+  label : rpt_strings.TFORMS_LABEL_INT
+ }
 }
 
 
 function oilsRptGetTforms(args) {
-	var dtype = args.datatype;
-	var agg = args.aggregate;
-	var tforms = OILS_RPT_TRANSFORMS;
-	var nonagg = args.non_aggregate;
-
-	var keys = oilsRptObjectKeys(OILS_RPT_TRANSFORMS);
-	var tforms = [];
-
-	_debug('getting tform '+dtype+' : ' + agg + ' : ' + nonagg);
-
-	for( var i = 0; i < keys.length; i++ ) {
-		var key = keys[i];
-		var obj = OILS_RPT_TRANSFORMS[key];
-		if( dtype && !oilsRptTformIsDtype(key,dtype) ) continue;
-		if( agg && !nonagg && !obj.aggregate ) continue;
-		if( !agg && nonagg && obj.aggregate ) continue;
-		tforms.push(key);
-	}
-
-	return tforms;
+ var dtype = args.datatype;
+ var agg = args.aggregate;
+ var tforms = OILS_RPT_TRANSFORMS;
+ var nonagg = args.non_aggregate;
+
+ var keys = oilsRptObjectKeys(OILS_RPT_TRANSFORMS);
+ var tforms = [];
+
+ _debug('getting tform '+dtype+' : ' + agg + ' : ' + nonagg);
+
+ for( var i = 0; i < keys.length; i++ ) {
+  var key = keys[i];
+  var obj = OILS_RPT_TRANSFORMS[key];
+  if( dtype && !oilsRptTformIsDtype(key,dtype) ) continue;
+  if( agg && !nonagg && !obj.aggregate ) continue;
+  if( !agg && nonagg && obj.aggregate ) continue;
+  tforms.push(key);
+ }
+
+ return tforms;
 }
 
 
 function oilsRptTformIsDtype(tform, dtype) {
-	var obj = OILS_RPT_TRANSFORMS[tform];
-	if( typeof obj.datatype == 'string' )
-		return (obj.datatype == dtype);
-	return !obj.datatype || grep(obj.datatype, function(d) { return (d == dtype) });
+ var obj = OILS_RPT_TRANSFORMS[tform];
+ if( typeof obj.datatype == 'string' )
+  return (obj.datatype == dtype);
+ return !obj.datatype || grep(obj.datatype, function(d) { return (d == dtype) });
 }
 
 
@@ -228,23 +228,23 @@ function oilsRptTformIsDtype(tform, dtype) {
 
 /* builds a new transform picker */
 function oilsRptTformPicker(args) {
-	this.node = args.node;
-	this.selector = elem('select');
-	this.tforms = oilsRptGetTforms(args);
-	for( var i = 0; i < this.tforms.length; i++ ) 
-		this.addOpt(this.tforms[i], this.tforms[i] == args.select );
-	appendClear(this.node, this.selector);
+ this.node = args.node;
+ this.selector = elem('select');
+ this.tforms = oilsRptGetTforms(args);
+ for( var i = 0; i < this.tforms.length; i++ ) 
+  this.addOpt(this.tforms[i], this.tforms[i] == args.select );
+ appendClear(this.node, this.selector);
 }
 
 oilsRptTformPicker.prototype.addOpt = function(key, select) {
-	var tform = OILS_RPT_TRANSFORMS[key];		
-	var obj = this;
-	var opt = insertSelectorVal(this.selector, -1, tform.label, key);
-	if( select ) opt.selected = true;
+ var tform = OILS_RPT_TRANSFORMS[key];  
+ var obj = this;
+ var opt = insertSelectorVal(this.selector, -1, tform.label, key);
+ if( select ) opt.selected = true;
 }
 
 oilsRptTformPicker.prototype.getSelected = function(key) {
-	return getSelectorVal(this.selector);
+ return getSelectorVal(this.selector);
 }
 
 
diff --git a/Open-ILS/web/reports/oils_rpt_tree.js b/Open-ILS/web/reports/oils_rpt_tree.js
index 35dec1fcd6..e867f7a38a 100644
--- a/Open-ILS/web/reports/oils_rpt_tree.js
+++ b/Open-ILS/web/reports/oils_rpt_tree.js
@@ -2,200 +2,200 @@ var oilsIDLCache = {};
 
 /* fetchs and draws the report tree */
 function oilsDrawRptTree(callback) {
-	oilsLoadRptTree(function(){oilsRenderRptTree(callback)});
+ oilsLoadRptTree(function(){oilsRenderRptTree(callback)});
 }
 
 /* fetches the IDL XML */
 function oilsLoadRptTree(callback) {
-	var r = new XMLHttpRequest();
-	r.open('GET', OILS_IDL_URL, true);
-	r.onreadystatechange = function() {
-		if( r.readyState == 4 ) {
-			oilsParseRptTree(r.responseXML, callback);
-		}
-	}
-	r.send(null);
+ var r = new XMLHttpRequest();
+ r.open('GET', OILS_IDL_URL, true);
+ r.onreadystatechange = function() {
+  if( r.readyState == 4 ) {
+   oilsParseRptTree(r.responseXML, callback);
+  }
+ }
+ r.send(null);
 }
 
 function oilsRptFindField(node, field) {
-	return grep( node.fields, 
-		function(f) {
-			return (f.name == field);
-		}
-	)[0];
+ return grep( node.fields, 
+  function(f) {
+   return (f.name == field);
+  }
+ )[0];
 }
 
 
 /* turns the IDL into a js object */
 function oilsParseRptTree(IDL, callback) {
-	var classes = IDL.getElementsByTagName('class');
-	oilsIDL = {};
-
-	for( var i = 0; i < classes.length; i++ ) {
-		var node = classes[i];
-		var id = node.getAttribute('id');
-		var fields = node.getElementsByTagName('fields')[0];
-
-		var obj = { 
-			fields	: oilsRptParseFields(node),
-			name		: node.getAttribute('id'),
-			table		: node.getAttributeNS(oilsIDLPersistNS, 'tablename'),
-			core		: node.getAttributeNS(oilsIDLReportsNS, 'core'),
-			label		: node.getAttributeNS(oilsIDLReportsNS, 'label'),
-			pkey		: fields.getAttributeNS(oilsIDLPersistNS, 'primary')
-		};
-
-		if( obj.core == 'true' ) obj.core = true;
-		else obj.core = false;
-		obj.label = (obj.label) ? obj.label : obj.name;
-
-		oilsIDL[id] = obj;
-	}
-
-	if( callback ) callback();
-	//oilsRenderRptTree(callback);
+ var classes = IDL.getElementsByTagName('class');
+ oilsIDL = {};
+
+ for( var i = 0; i < classes.length; i++ ) {
+  var node = classes[i];
+  var id = node.getAttribute('id');
+  var fields = node.getElementsByTagName('fields')[0];
+
+  var obj = { 
+   fields : oilsRptParseFields(node),
+   name  : node.getAttribute('id'),
+   table  : node.getAttributeNS(oilsIDLPersistNS, 'tablename'),
+   core  : node.getAttributeNS(oilsIDLReportsNS, 'core'),
+   label  : node.getAttributeNS(oilsIDLReportsNS, 'label'),
+   pkey  : fields.getAttributeNS(oilsIDLPersistNS, 'primary')
+  };
+
+  if( obj.core == 'true' ) obj.core = true;
+  else obj.core = false;
+  obj.label = (obj.label) ? obj.label : obj.name;
+
+  oilsIDL[id] = obj;
+ }
+
+ if( callback ) callback();
+ //oilsRenderRptTree(callback);
 }
 
 /* parses the links and fields portion of the IDL */
 function oilsRptParseFields( node ) {
-	var data = [];
-
-	var fields = node.getElementsByTagName('fields')[0];
-	fields = fields.getElementsByTagName('field');
-
-	var links = node.getElementsByTagName('links')[0];
-	if( links )
-		links = links.getElementsByTagName('link');
-	else links = [];
-
-	for( var i = 0; i < fields.length; i++ ) {
-
-		var field = fields[i];
-		var name = field.getAttribute('name');
-
-		var obj = {
-			field : fields[i],
-			name	: name,
-			label : field.getAttributeNS(oilsIDLReportsNS,'label'),
-			datatype : field.getAttributeNS(oilsIDLReportsNS,'datatype'),
-			selector : field.getAttributeNS(oilsIDLReportsNS,'selector'),
-			type	: 'field'
-		}
-
-		var link = null;
-		for( var l = 0; l < links.length; l++ ) {
-			if( links[l].getAttribute('field') == name ) {
-				link = links[l];
-				break;
-			}
-		}
-
-		if( link ) {
-			obj.type = 'link';
-			obj.key = link.getAttribute('key');
-			obj['class'] = link.getAttribute('class');
-			obj.reltype = link.getAttribute('reltype');
-		} else {
-			if( fields[i].getAttributeNS(oilsIDLPersistNS, 'virtual') == 'true' ) 
-				continue;
-		}
-
-		obj.label = (obj.label) ? obj.label : obj.name;
-		obj.datatype = (obj.datatype) ? obj.datatype : 'string';
-		data.push(obj);
-	}
-
-	/* sort by field name */
-	data = data.sort(
-		function(a,b) {
-			if( a.label > b.label ) return 1;
-			if( a.label < b.name ) return -1;
-			return 0;
-		}
-	);
-
-	return data;
+ var data = [];
+
+ var fields = node.getElementsByTagName('fields')[0];
+ fields = fields.getElementsByTagName('field');
+
+ var links = node.getElementsByTagName('links')[0];
+ if( links )
+  links = links.getElementsByTagName('link');
+ else links = [];
+
+ for( var i = 0; i < fields.length; i++ ) {
+
+  var field = fields[i];
+  var name = field.getAttribute('name');
+
+  var obj = {
+   field : fields[i],
+   name : name,
+   label : field.getAttributeNS(oilsIDLReportsNS,'label'),
+   datatype : field.getAttributeNS(oilsIDLReportsNS,'datatype'),
+   selector : field.getAttributeNS(oilsIDLReportsNS,'selector'),
+   type : 'field'
+  }
+
+  var link = null;
+  for( var l = 0; l < links.length; l++ ) {
+   if( links[l].getAttribute('field') == name ) {
+    link = links[l];
+    break;
+   }
+  }
+
+  if( link ) {
+   obj.type = 'link';
+   obj.key = link.getAttribute('key');
+   obj['class'] = link.getAttribute('class');
+   obj.reltype = link.getAttribute('reltype');
+  } else {
+   if( fields[i].getAttributeNS(oilsIDLPersistNS, 'virtual') == 'true' ) 
+    continue;
+  }
+
+  obj.label = (obj.label) ? obj.label : obj.name;
+  obj.datatype = (obj.datatype) ? obj.datatype : 'string';
+  data.push(obj);
+ }
+
+ /* sort by field name */
+ data = data.sort(
+  function(a,b) {
+   if( a.label > b.label ) return 1;
+   if( a.label < b.name ) return -1;
+   return 0;
+  }
+ );
+
+ return data;
 }
 
 
 /* shoves the IDL into a UI tree */
 function oilsRenderRptTree(callback) {
-	var sel = DOM.oils_rpt_builder_type_selector;
-
-	for( var i in oilsIDL ) {
-		var data = oilsIDL[i];
-		if( !data.core ) continue;
-		insertSelectorVal( sel, -1, data.label, data.name );
-	}
-
-	sel.onchange = function() { 
-		if(oilsRpt.def.select.length > 0)
-			if(!confirm(DOM.oils_rpt_confirm_new_report.innerHTML)) 
-				return;
-		oilsRptRenderClassTree(getSelectorVal(sel)) 
-		oilsReportBuilderReset();
-	};
-
-	sel.onchange();
-	if( callback ) callback();
+ var sel = DOM.oils_rpt_builder_type_selector;
+
+ for( var i in oilsIDL ) {
+  var data = oilsIDL[i];
+  if( !data.core ) continue;
+  insertSelectorVal( sel, -1, data.label, data.name );
+ }
+
+ sel.onchange = function() { 
+  if(oilsRpt.def.select.length > 0)
+   if(!confirm(DOM.oils_rpt_confirm_new_report.innerHTML)) 
+    return;
+  oilsRptRenderClassTree(getSelectorVal(sel)) 
+  oilsReportBuilderReset();
+ };
+
+ sel.onchange();
+ if( callback ) callback();
 }
 
 function oilsRptRenderClassTree(cls) {
-	var data = oilsIDL[cls];
-	removeChildren(DOM.oils_rpt_tree_div);
-	oilsRptTree = new SlimTree( DOM.oils_rpt_tree_div, 'oilsRptTree' );
-	var treeId = oilsNextId();
-	oilsRptTree.addNode( treeId, -1, data.label );
-	oilsRenderSubTree( data, treeId, '' );
+ var data = oilsIDL[cls];
+ removeChildren(DOM.oils_rpt_tree_div);
+ oilsRptTree = new SlimTree( DOM.oils_rpt_tree_div, 'oilsRptTree' );
+ var treeId = oilsNextId();
+ oilsRptTree.addNode( treeId, -1, data.label );
+ oilsRenderSubTree( data, treeId, '' );
 }
 
 
 function oilsRenderSubTree( data, subTreeId, path ) {
 
-	for( var f = 0; f < data.fields.length; f++ ) {
+ for( var f = 0; f < data.fields.length; f++ ) {
 
-		var field = data.fields[f];
-		var  dataId = oilsNextId();
+  var field = data.fields[f];
+  var  dataId = oilsNextId();
 
-		var fval = data.name+'-'+field.name;
-		var fullpath = (path) ? path + '-' + fval : fval;
+  var fval = data.name+'-'+field.name;
+  var fullpath = (path) ? path + '-' + fval : fval;
 
-		/* for now */
-		//var action = 'javascript:oilsAddRptDisplayItem("'+fullpath+'")';
-		var action = 'javascript:oilsRptDrawDataWindow("'+fullpath+'")';
+  /* for now */
+  //var action = 'javascript:oilsAddRptDisplayItem("'+fullpath+'")';
+  var action = 'javascript:oilsRptDrawDataWindow("'+fullpath+'")';
 
-		if( field.type == 'link' )
-			action = 'javascript:oilsAddLinkTree("' +
-				dataId+'","'+field['class']+'","'+fullpath+'");';
+  if( field.type == 'link' )
+   action = 'javascript:oilsAddLinkTree("' +
+    dataId+'","'+field['class']+'","'+fullpath+'");';
 
-		label = field.label;
+  label = field.label;
 
-		/* indicate that this will build a friendly list at report time */
-		if( field.selector ) label += ' **'; 
+  /* indicate that this will build a friendly list at report time */
+  if( field.selector ) label += ' **'; 
 
-		oilsRptTree.addNode( dataId, subTreeId, label, action, field.label,
-			(field.type == 'link') ? 'oils_rpt_tree_link_ref' : null );
-	}
+  oilsRptTree.addNode( dataId, subTreeId, label, action, field.label,
+   (field.type == 'link') ? 'oils_rpt_tree_link_ref' : null );
+ }
 }
 
 
 
 var oilsLinkTreeCache = {};
 function oilsAddLinkTree( parentId, classname, fullpath ) {
-	_debug("adding link with class="+classname+' : full path '+fullpath);
-	if( ! oilsLinkTreeCache[parentId] ) 
-		oilsLinkTreeCache[parentId] = [];
-
-	if( grep ( oilsLinkTreeCache[parentId], 
-		function(i) { return (i == classname); } ) ) {
-			oilsRptTree.toggle(parentId);
-			return;
-	}
-
-	oilsLinkTreeCache[parentId].push(classname);
-	var data = grep( oilsIDL, function(i) { return ( i.name == classname ); })[0];
-	var sid = oilsRenderSubTree( data, parentId, fullpath );
-	oilsRptTree.open(parentId);
+ _debug("adding link with class="+classname+' : full path '+fullpath);
+ if( ! oilsLinkTreeCache[parentId] ) 
+  oilsLinkTreeCache[parentId] = [];
+
+ if( grep ( oilsLinkTreeCache[parentId], 
+  function(i) { return (i == classname); } ) ) {
+   oilsRptTree.toggle(parentId);
+   return;
+ }
+
+ oilsLinkTreeCache[parentId].push(classname);
+ var data = grep( oilsIDL, function(i) { return ( i.name == classname ); })[0];
+ var sid = oilsRenderSubTree( data, parentId, fullpath );
+ oilsRptTree.open(parentId);
 }
 
 
diff --git a/Open-ILS/web/reports/oils_rpt_utils.js b/Open-ILS/web/reports/oils_rpt_utils.js
index 8648b73a91..b6e030a3f9 100644
--- a/Open-ILS/web/reports/oils_rpt_utils.js
+++ b/Open-ILS/web/reports/oils_rpt_utils.js
@@ -2,326 +2,326 @@ var oilsRptID = 0;
 var oilsRptID2 = 0;
 var oilsRptID3 = 0;
 function oilsNextId() {
-	return 'oils_'+ (oilsRptID++);
+ return 'oils_'+ (oilsRptID++);
 }
 
 function oilsNextNumericId() {
-	return oilsRptID3++;
+ return oilsRptID3++;
 }
 
 function oilsRptNextParam() {
-	return '::P'+ (oilsRptID2++);
+ return '::P'+ (oilsRptID2++);
 }
 
 function oilsRptFetchOrgTree(callback) {
-	var req = new Request(OILS_RPT_FETCH_ORG_TREE);
-	req.callback(
-		function(r) {
-			globalOrgTree = r.getResultObject();
-			if( callback ) callback();
-		}
-	);
-	req.send();
+ var req = new Request(OILS_RPT_FETCH_ORG_TREE);
+ req.callback(
+  function(r) {
+   globalOrgTree = r.getResultObject();
+   if( callback ) callback();
+  }
+ );
+ req.send();
 }
 
 
 /*
 function oilsRptCacheObject(obj) {
-	var id = oilsNextId();
-	oilsRptObjectCache[id] = obj;
-	return id;
+ var id = oilsNextId();
+ oilsRptObjectCache[id] = obj;
+ return id;
 }
 
 function oilsRptFindObject(id) {
-	return oilsRptObjectCache[id];
+ return oilsRptObjectCache[id];
 }
 */
 
 function oilsRptCacheObject(type, obj, id) {
-	if( !oilsRptObjectCache[type] )
-		oilsRptObjectCache[type] = {};
-	oilsRptObjectCache[type][id] = obj;
+ if( !oilsRptObjectCache[type] )
+  oilsRptObjectCache[type] = {};
+ oilsRptObjectCache[type][id] = obj;
 }
 
 function oilsRptGetCache(type, id) {
-	if( !oilsRptObjectCache[type] )
-		return null;
-	return oilsRptObjectCache[type][id];
+ if( !oilsRptObjectCache[type] )
+  return null;
+ return oilsRptObjectCache[type][id];
 }
 
 
 /* -------------------------------------------- */
 function oilsRptObject() {}
 oilsRptObject.prototype.init = function(obj) {
-	if(!obj) obj = this;
-	oilsRptObject.cache(obj);
+ if(!obj) obj = this;
+ oilsRptObject.cache(obj);
 }
 oilsRptObject.objectCache = {};
 oilsRptObject.find = function(id) {
-	return oilsRptObject.objectCache[id];
+ return oilsRptObject.objectCache[id];
 }
 oilsRptObject.cache = function(obj) {
-	obj.id = oilsNextNumericId();
-	oilsRptObject.objectCache[obj.id] = obj;
-	return obj.id;
+ obj.id = oilsNextNumericId();
+ oilsRptObject.objectCache[obj.id] = obj;
+ return obj.id;
 }
 /* -------------------------------------------- */
 
 
 /* returns just the column name */
 function oilsRptPathCol(path) {
-	var parts = path.split(/-/);
-	return parts.pop();
+ var parts = path.split(/-/);
+ return parts.pop();
 }
 
 /* returns the IDL class of the selected column */
 function oilsRptPathClass(path) {
-	var parts = path.split(/-/);
-	parts.pop();
-	return parts.pop();
+ var parts = path.split(/-/);
+ parts.pop();
+ return parts.pop();
 }
 
 /* returns everything prior to the column name */
 function oilsRptPathRel(path) {
-	var parts = path.split(/-/);
-	parts.pop();
-	return parts.join('-');
+ var parts = path.split(/-/);
+ parts.pop();
+ return parts.join('-');
 }
 
 /* creates a label "path" based on the column path */
 function oilsRptMakeLabel(path) {
-	var parts = path.split(/-/);
-	var str = '';
-	for( var i = 0; i < parts.length; i++ ) {
-		if(i%2 == 0) {
-			if( i == 0 )
-				str += oilsIDL[parts[i]].label;
-		} else {
-			var f = oilsRptFindField(oilsIDL[parts[i-1]], parts[i]);
-			str += " -> "+f.label;
-		}
-	}
-	return str;
+ var parts = path.split(/-/);
+ var str = '';
+ for( var i = 0; i < parts.length; i++ ) {
+  if(i%2 == 0) {
+   if( i == 0 )
+    str += oilsIDL[parts[i]].label;
+  } else {
+   var f = oilsRptFindField(oilsIDL[parts[i-1]], parts[i]);
+   str += " -> "+f.label;
+  }
+ }
+ return str;
 }
 
 
 
 
 function oilsRptResetParams() {
-	oilsRptID2 = 0;
+ oilsRptID2 = 0;
 }
 
 function nodeText(id) {
-	if($(id))
-		return $(id).innerHTML;
-	return "";
+ if($(id))
+  return $(id).innerHTML;
+ return "";
 }
 
 
 function oilsRptDebug() {
-	if(!oilsRptDebugEnabled) return;
+ if(!oilsRptDebugEnabled) return;
 
-	_debug("\n-------------------------------------\n");
-	_debug(oilsRpt.toString());
-	_debug("\n-------------------------------------\n");
+ _debug("\n-------------------------------------\n");
+ _debug(oilsRpt.toString());
+ _debug("\n-------------------------------------\n");
 
-	/*
-	if(!oilsRptDebugWindow)
-		oilsRptDebugWindow = window.open('','Debug','resizable,width=700,height=500,scrollbars=1'); 
-	oilsRptDebugWindow.document.body.innerHTML = oilsRpt.toHTMLString();
-	*/
+ /*
+ if(!oilsRptDebugWindow)
+  oilsRptDebugWindow = window.open('','Debug','resizable,width=700,height=500,scrollbars=1'); 
+ oilsRptDebugWindow.document.body.innerHTML = oilsRpt.toHTMLString();
+ */
 }
 
 
 function print_tabs_html(t) {
-	var r = '';
-	for (var j = 0; j < t; j++ ) { r = r + "&nbsp;&nbsp;"; }
-	return r;
+ var r = '';
+ for (var j = 0; j < t; j++ ) { r = r + "&nbsp;&nbsp;"; }
+ return r;
 }
 
 function formatJSONHTML(s) {
-	var r = ''; var t = 0;
-	for (var i in s) {
-		if (s[i] == '{' || s[i] == '[') {
-			r = r + s[i] + "<br/>" + print_tabs_html(++t);
-		} else if (s[i] == '}' || s[i] == ']') {
-			t--; r = r + "<br/>" + print_tabs_html(t) + s[i];
-		} else if (s[i] == ',') {
-			r = r + s[i];
-			r = r + "<br/>" + print_tabs_html(t);
-		} else {
-			r = r + s[i];
-		}
-	}
-	return r;
+ var r = ''; var t = 0;
+ for (var i in s) {
+  if (s[i] == '{' || s[i] == '[') {
+   r = r + s[i] + "<br/>" + print_tabs_html(++t);
+  } else if (s[i] == '}' || s[i] == ']') {
+   t--; r = r + "<br/>" + print_tabs_html(t) + s[i];
+  } else if (s[i] == ',') {
+   r = r + s[i];
+   r = r + "<br/>" + print_tabs_html(t);
+  } else {
+   r = r + s[i];
+  }
+ }
+ return r;
 }
 
 function setMousePos(e) {
-	oilsMouseX = e.pageX
-	oilsMouseY = e.pageY
-	oilsPageXMid = parseInt(window.innerHeight / 2);
-	oilsPageYMid = parseInt(window.innerWidth / 2);
+ oilsMouseX = e.pageX
+ oilsMouseY = e.pageY
+ oilsPageXMid = parseInt(window.innerHeight / 2);
+ oilsPageYMid = parseInt(window.innerWidth / 2);
 }  
 
 function buildFloatingDiv(div, width) {
-	var left = parseInt((window.innerWidth / 2) - (width/2));
-	var halfh = parseInt(div.clientHeight / 2);
-	var top = oilsMouseY - halfh + 50;
-	var dbot = top + halfh;
-	if( dbot > window.innerHeight ) {
-		top = oilsMouseY - div.clientHeight - 10;
-	}
-	div.setAttribute('style', 'left:'+left+'px; top:'+top+'px; width:'+width+'px');
-	//div.setAttribute('style', 'top:'+top+'px;');
-	//alert(DOM.oils_rpt_filter_selector.style.top);
+ var left = parseInt((window.innerWidth / 2) - (width/2));
+ var halfh = parseInt(div.clientHeight / 2);
+ var top = oilsMouseY - halfh + 50;
+ var dbot = top + halfh;
+ if( dbot > window.innerHeight ) {
+  top = oilsMouseY - div.clientHeight - 10;
+ }
+ div.setAttribute('style', 'left:'+left+'px; top:'+top+'px; width:'+width+'px');
+ //div.setAttribute('style', 'top:'+top+'px;');
+ //alert(DOM.oils_rpt_filter_selector.style.top);
 }
 
 
 function mergeObjects( src, obj ) {
-	for( var i in obj ) {
-		if( typeof obj[i] == 'string' ) {
-			src[i] = obj[i];
-		} else {
-			if(src[i]) mergeObjects(src[i], obj[i]);
-			else src[i] = obj[i];
-		}
-	}
+ for( var i in obj ) {
+  if( typeof obj[i] == 'string' ) {
+   src[i] = obj[i];
+  } else {
+   if(src[i]) mergeObjects(src[i], obj[i]);
+   else src[i] = obj[i];
+  }
+ }
 }
 
 
 /* scours the doc for elements with IDs.  When it finds one,
-	it grabs the dom node and sets a reference to the node at DOM[id]; */
+ it grabs the dom node and sets a reference to the node at DOM[id]; */
 function oilsRptIdObjects(node) {
-	if(!node) node = document.documentElement;
-	if( node.nodeType != 1 ) return;
-	var id = node.getAttribute('id');
-	if( id ) eval("DOM."+id+"=$('"+id+"');");
-	var children = node.childNodes;
-	for( var c = 0; c < children.length; c++ ) 
-		oilsRptIdObjects(children[c]);
+ if(!node) node = document.documentElement;
+ if( node.nodeType != 1 ) return;
+ var id = node.getAttribute('id');
+ if( id ) eval("DOM."+id+"=$('"+id+"');");
+ var children = node.childNodes;
+ for( var c = 0; c < children.length; c++ ) 
+  oilsRptIdObjects(children[c]);
 }
 
 
 function oilsRptObjectKeys(obj) {
-	var k = [];
-	for( var i in obj ) k.push(i);
-	return k;
+ var k = [];
+ for( var i in obj ) k.push(i);
+ return k;
 }
 
 
 /* makes cls a subclass of parent */
 function oilsRptSetSubClass(cls, parent) {
-	var str = cls+'.prototype = new '+parent+'();\n';
-	str += cls+'.prototype.constructor = '+cls+';\n';
-	str += cls+'.baseClass = '+parent+'.prototype.constructor;\n';
-	str += cls+'.prototype.super = '+parent+'.prototype;\n';
-	eval(str);
+ var str = cls+'.prototype = new '+parent+'();\n';
+ str += cls+'.prototype.constructor = '+cls+';\n';
+ str += cls+'.baseClass = '+parent+'.prototype.constructor;\n';
+ str += cls+'.prototype.super = '+parent+'.prototype;\n';
+ eval(str);
 }
 
 
 function oilsRptUpdateFolder(folder, type, callback) {
 
-	_debug("updating folder " + js2JSON(folder));
+ _debug("updating folder " + js2JSON(folder));
 
-	var req = new Request(OILS_RPT_UPDATE_FOLDER, SESSION, type, folder);
-	if( callback ) {
-		req.callback( 
-			function(r) {
-				if( r.getResultObject() == 1 )
-					callback(true);
-				else callback(false);
-			}
-		);
-		req.send();
-	} else {
-		req.send(true);
-		return req.result();
-	}
+ var req = new Request(OILS_RPT_UPDATE_FOLDER, SESSION, type, folder);
+ if( callback ) {
+  req.callback( 
+   function(r) {
+    if( r.getResultObject() == 1 )
+     callback(true);
+    else callback(false);
+   }
+  );
+  req.send();
+ } else {
+  req.send(true);
+  return req.result();
+ }
 }
 
 function oilsRptCreateFolder(folder, type, callback) {
-	_debug("creating folder "+ js2JSON(folder));
-	var req = new Request(OILS_RPT_CREATE_FOLDER, SESSION, type, folder);
-	if( callback ) {
-		req.callback( 
-			function(r) {
-				if( r.getResultObject() > 0 )
-					callback(true);
-				else callback(false);
-			}
-		);
-		req.send();
-	} else {
-		req.send(true);
-		return req.result();
-	}
+ _debug("creating folder "+ js2JSON(folder));
+ var req = new Request(OILS_RPT_CREATE_FOLDER, SESSION, type, folder);
+ if( callback ) {
+  req.callback( 
+   function(r) {
+    if( r.getResultObject() > 0 )
+     callback(true);
+    else callback(false);
+   }
+  );
+  req.send();
+ } else {
+  req.send(true);
+  return req.result();
+ }
 }
 
 function oilsRptUpdateTemplate(template, callback) {
-	oilsRptDoGenericUpdate(OILS_RPT_UPDATE_TEMPLATE, template, callback);
+ oilsRptDoGenericUpdate(OILS_RPT_UPDATE_TEMPLATE, template, callback);
 }
 
 function oilsRptUpdateReport(report, callback) {
-	oilsRptDoGenericUpdate(OILS_RPT_UPDATE_REPORT, report, callback);
+ oilsRptDoGenericUpdate(OILS_RPT_UPDATE_REPORT, report, callback);
 }
 
 function oilsRptUpdateSchedule(schedule, callback) {
-	oilsRptDoGenericUpdate(OILS_RPT_UPDATE_SCHEDULE, schedule, callback);
+ oilsRptDoGenericUpdate(OILS_RPT_UPDATE_SCHEDULE, schedule, callback);
 }
 
 function oilsRptDoGenericUpdate( method, arg, callback ) {
-	_debug("generic update running: "+method);
-	var req = new Request(method, SESSION, arg);
-	req.callback(
-		function(r) {
-			if( r.getResultObject() > 0 )
-				callback(true);
-			else callback(false);
-		}
-	);
-	req.send();
+ _debug("generic update running: "+method);
+ var req = new Request(method, SESSION, arg);
+ req.callback(
+  function(r) {
+   if( r.getResultObject() > 0 )
+    callback(true);
+   else callback(false);
+  }
+ );
+ req.send();
 }
 
 function oilsRptFetchReport(id, callback) {
-	var r = oilsRptGetCache('rr', id);
-	if(r) return callback(r);
-	var req = new Request(OILS_RPT_FETCH_REPORT, SESSION, id);
-	req.callback( 
-		function(res) { 
-			var rpt = res.getResultObject();
-			oilsRptCacheObject('rr', rpt, id);
-			callback(rpt);
-		}
-	);
-	req.send();
+ var r = oilsRptGetCache('rr', id);
+ if(r) return callback(r);
+ var req = new Request(OILS_RPT_FETCH_REPORT, SESSION, id);
+ req.callback( 
+  function(res) { 
+   var rpt = res.getResultObject();
+   oilsRptCacheObject('rr', rpt, id);
+   callback(rpt);
+  }
+ );
+ req.send();
 }
 
 function oilsRptFetchUser(id, callback) {
-	var r = oilsRptGetCache('au', id);
-	if(r) return callback(r);
-	var req = new Request(FETCH_FLESHED_USER, SESSION, id, []);
-	req.callback( 
-		function(res) { 
-			var user = res.getResultObject();
-			oilsRptCacheObject('au', user, id);
-			callback(user);
-		}
-	);
-	req.send();
+ var r = oilsRptGetCache('au', id);
+ if(r) return callback(r);
+ var req = new Request(FETCH_FLESHED_USER, SESSION, id, []);
+ req.callback( 
+  function(res) { 
+   var user = res.getResultObject();
+   oilsRptCacheObject('au', user, id);
+   callback(user);
+  }
+ );
+ req.send();
 }
 
 function oilsRptFetchTemplate(id, callback) {
-	var t = oilsRptGetCache('rt', id);
-	if(t) return callback(t);
-	var r = new Request(OILS_RPT_FETCH_TEMPLATE, SESSION, id);
-	r.callback( 
-		function(res) { 
-			var tmpl = res.getResultObject();
-		oilsRptCacheObject('rt', tmpl, id);
-			callback(tmpl);
-		}
-	);
-	r.send();
+ var t = oilsRptGetCache('rt', id);
+ if(t) return callback(t);
+ var r = new Request(OILS_RPT_FETCH_TEMPLATE, SESSION, id);
+ r.callback( 
+  function(res) { 
+   var tmpl = res.getResultObject();
+  oilsRptCacheObject('rt', tmpl, id);
+   callback(tmpl);
+  }
+ );
+ r.send();
 }
 
 
@@ -330,7 +330,7 @@ function oilsRptAlertFailure() { alertId('oils_rpt_generic_failure'); }
 
 
 function oilsRptBuildOutputLink(tid, rid, sid) {
-	return OILS_IDL_OUTPUT_URL + tid+'/'+rid+'/'+sid+'/'+ OILS_IDL_OUTPUT_FILE;
+ return OILS_IDL_OUTPUT_URL + tid+'/'+rid+'/'+sid+'/'+ OILS_IDL_OUTPUT_FILE;
 }
 
 
diff --git a/Open-ILS/web/reports/oils_rpt_vars.js b/Open-ILS/web/reports/oils_rpt_vars.js
index bf3594ed9d..de6167e303 100644
--- a/Open-ILS/web/reports/oils_rpt_vars.js
+++ b/Open-ILS/web/reports/oils_rpt_vars.js
@@ -34,7 +34,7 @@ var OILS_IDL_OUTPUT_URL = '/reporter/'
 var OILS_IDL_OUTPUT_FILE = 'report-data.html';
 
 /* multi-select which shows the user 
-	what data they want to see in the report */
+ what data they want to see in the report */
 var oilsRptDisplaySelector;
 
 var oilsRptFilterSelector;
@@ -68,29 +68,29 @@ var oilsRptCurrentAggFilterTform;
 var oilsRptCurrentFilterOpManager;
 var oilsRptCurrentAggFilterOpManager;
 
-var OILS_RPT_FETCH_FOLDERS			= 'open-ils.reporter:open-ils.reporter.folder.visible.retrieve';
-var OILS_RPT_FETCH_FOLDER_DATA	= 'open-ils.reporter:open-ils.reporter.folder_data.retrieve';
-var OILS_RPT_FETCH_TEMPLATE		= 'open-ils.reporter:open-ils.reporter.template.retrieve';
-var OILS_RPT_UPDATE_FOLDER			= 'open-ils.reporter:open-ils.reporter.folder.update';
-var OILS_RPT_DELETE_FOLDER			= 'open-ils.reporter:open-ils.reporter.folder.delete';
-var OILS_RPT_CREATE_FOLDER			= 'open-ils.reporter:open-ils.reporter.folder.create';
+var OILS_RPT_FETCH_FOLDERS   = 'open-ils.reporter:open-ils.reporter.folder.visible.retrieve';
+var OILS_RPT_FETCH_FOLDER_DATA = 'open-ils.reporter:open-ils.reporter.folder_data.retrieve';
+var OILS_RPT_FETCH_TEMPLATE  = 'open-ils.reporter:open-ils.reporter.template.retrieve';
+var OILS_RPT_UPDATE_FOLDER   = 'open-ils.reporter:open-ils.reporter.folder.update';
+var OILS_RPT_DELETE_FOLDER   = 'open-ils.reporter:open-ils.reporter.folder.delete';
+var OILS_RPT_CREATE_FOLDER   = 'open-ils.reporter:open-ils.reporter.folder.create';
 var OILS_RPT_FETCH_ORG_FULL_PATH = 'open-ils.reporter:open-ils.reporter.org_unit.full_path';
-var OILS_RPT_FETCH_ORG_TREE		= 'open-ils.actor:open-ils.actor.org_tree.retrieve';
-var OILS_RPT_DELETE_TEMPLATE		= 'open-ils.reporter:open-ils.reporter.template.delete.cascade';
-var OILS_RPT_DELETE_REPORT			= 'open-ils.reporter:open-ils.reporter.report.delete.cascade';
-var OILS_RPT_DELETE_SCHEDULE		= 'open-ils.reporter:open-ils.reporter.schedule.delete';
-var OILS_RPT_TEMPLATE_HAS_RPTS	= 'open-ils.reporter:open-ils.reporter.template_has_reports';
-var OILS_RPT_REPORT_HAS_OUTS		= 'open-ils.reporter:open-ils.reporter.report_has_output';
-var OILS_RPT_CREATE_REPORT			= 'open-ils.reporter:open-ils.reporter.report.create';
-var OILS_RPT_CREATE_TEMPLATE		= 'open-ils.reporter:open-ils.reporter.template.create';
-var OILS_RPT_CREATE_SCHEDULE		= 'open-ils.reporter:open-ils.reporter.schedule.create';
-var OILS_RPT_UPDATE_REPORT			= 'open-ils.reporter:open-ils.reporter.report.update';
-var OILS_RPT_UPDATE_TEMPLATE		= 'open-ils.reporter:open-ils.reporter.template.update';
-var OILS_RPT_UPDATE_SCHEDULE		= 'open-ils.reporter:open-ils.reporter.schedule.update';
-var OILS_RPT_FETCH_OUTPUT			= 'open-ils.reporter:open-ils.reporter.schedule.retrieve_by_folder';
-var OILS_RPT_FETCH_REPORT			= 'open-ils.reporter:open-ils.reporter.report.retrieve';
-var OILS_RPT_FETCH_TEMPLATE		= 'open-ils.reporter:open-ils.reporter.template.retrieve';
-var OILS_RPT_MAGIC_FETCH			= 'open-ils.reporter:open-ils.reporter.magic_fetch';
+var OILS_RPT_FETCH_ORG_TREE  = 'open-ils.actor:open-ils.actor.org_tree.retrieve';
+var OILS_RPT_DELETE_TEMPLATE  = 'open-ils.reporter:open-ils.reporter.template.delete.cascade';
+var OILS_RPT_DELETE_REPORT   = 'open-ils.reporter:open-ils.reporter.report.delete.cascade';
+var OILS_RPT_DELETE_SCHEDULE  = 'open-ils.reporter:open-ils.reporter.schedule.delete';
+var OILS_RPT_TEMPLATE_HAS_RPTS = 'open-ils.reporter:open-ils.reporter.template_has_reports';
+var OILS_RPT_REPORT_HAS_OUTS  = 'open-ils.reporter:open-ils.reporter.report_has_output';
+var OILS_RPT_CREATE_REPORT   = 'open-ils.reporter:open-ils.reporter.report.create';
+var OILS_RPT_CREATE_TEMPLATE  = 'open-ils.reporter:open-ils.reporter.template.create';
+var OILS_RPT_CREATE_SCHEDULE  = 'open-ils.reporter:open-ils.reporter.schedule.create';
+var OILS_RPT_UPDATE_REPORT   = 'open-ils.reporter:open-ils.reporter.report.update';
+var OILS_RPT_UPDATE_TEMPLATE  = 'open-ils.reporter:open-ils.reporter.template.update';
+var OILS_RPT_UPDATE_SCHEDULE  = 'open-ils.reporter:open-ils.reporter.schedule.update';
+var OILS_RPT_FETCH_OUTPUT   = 'open-ils.reporter:open-ils.reporter.schedule.retrieve_by_folder';
+var OILS_RPT_FETCH_REPORT   = 'open-ils.reporter:open-ils.reporter.report.retrieve';
+var OILS_RPT_FETCH_TEMPLATE  = 'open-ils.reporter:open-ils.reporter.template.retrieve';
+var OILS_RPT_MAGIC_FETCH   = 'open-ils.reporter:open-ils.reporter.magic_fetch';
 var OILS_RPT_REPORT_EXISTS      = 'open-ils.reporter:open-ils.reporter.report.exists';
 var OILS_RPT_TEMPLATE_EXISTS      = 'open-ils.reporter:open-ils.reporter.template.exists';
 
diff --git a/Open-ILS/web/reports/oils_rpt_widget.js b/Open-ILS/web/reports/oils_rpt_widget.js
index 7e644ec7c5..6b7237590a 100644
--- a/Open-ILS/web/reports/oils_rpt_widget.js
+++ b/Open-ILS/web/reports/oils_rpt_widget.js
@@ -1,406 +1,406 @@
 /* --------------------------------------------------------------------- 
-	Represents a set of values, an inputWidget collects data and a 
-	multi-select displays the data and allows the user to remove items
-	--------------------------------------------------------------------- */
+ Represents a set of values, an inputWidget collects data and a 
+ multi-select displays the data and allows the user to remove items
+ --------------------------------------------------------------------- */
 function oilsRptSetWidget(args) {
-	this.node = args.node;
-	this.inputWidget = new args.inputWidget(args);
-	this.dest = elem('select',
-		{multiple:'multiple','class':'oils_rpt_small_info_selector'});
+ this.node = args.node;
+ this.inputWidget = new args.inputWidget(args);
+ this.dest = elem('select',
+  {multiple:'multiple','class':'oils_rpt_small_info_selector'});
 }
 
 oilsRptSetWidget.prototype.draw = function() {
 
-	this.addButton = elem('input',{type:'submit',value:"Add"})
-	this.delButton = elem('input',{type:'submit',value:"Del"})
+ this.addButton = elem('input',{type:'submit',value:"Add"})
+ this.delButton = elem('input',{type:'submit',value:"Del"})
 
-	var obj = this;
-	this.addButton.onclick = function() {
-		obj.addDisplayItems(obj.inputWidget.getDisplayValue());
-	}
+ var obj = this;
+ this.addButton.onclick = function() {
+  obj.addDisplayItems(obj.inputWidget.getDisplayValue());
+ }
 
-	this.delButton.onclick = function(){obj.removeSelected()};
+ this.delButton.onclick = function(){obj.removeSelected()};
 
-	removeChildren(this.node);
-	this.inputWidget.draw();
-	this.node.appendChild(elem('br'))
-	this.node.appendChild(this.addButton);
-	this.node.appendChild(this.delButton);
-	this.node.appendChild(elem('br'))
-	this.node.appendChild(this.dest);
+ removeChildren(this.node);
+ this.inputWidget.draw();
+ this.node.appendChild(elem('br'))
+ this.node.appendChild(this.addButton);
+ this.node.appendChild(this.delButton);
+ this.node.appendChild(elem('br'))
+ this.node.appendChild(this.dest);
 }
 
 oilsRptSetWidget.prototype.addDisplayItems = function(list) {
-	if( list.constructor != Array ) list = [list];
-	for(var i = 0; i < list.length; i++) {
-		var item = list[i];
+ if( list.constructor != Array ) list = [list];
+ for(var i = 0; i < list.length; i++) {
+  var item = list[i];
 
-		/* no dupes */
-		var exists = false;
-		iterate(this.dest.options, 
-			function(o){if(o.getAttribute('value') == item.value) {exists = true; return;}});
-		if(exists) continue;
+  /* no dupes */
+  var exists = false;
+  iterate(this.dest.options, 
+   function(o){if(o.getAttribute('value') == item.value) {exists = true; return;}});
+  if(exists) continue;
 
-		_debug('Inserting SetWidget values ' + js2JSON(item));
-		insertSelectorVal(this.dest, -1, item.label, this.objToStr(item.value));
-	}
+  _debug('Inserting SetWidget values ' + js2JSON(item));
+  insertSelectorVal(this.dest, -1, item.label, this.objToStr(item.value));
+ }
 }
 
 oilsRptSetWidget.prototype.removeSelected = function() {
-	oilsDelSelectedItems(this.dest);
+ oilsDelSelectedItems(this.dest);
 }
 
 oilsRptSetWidget.prototype.getValue = function() {
-	var vals = [];
-	var obj = this;
-	iterate(this.dest, function(i){vals.push(obj.strToObj(i.getAttribute('value')))});
-	return vals;
+ var vals = [];
+ var obj = this;
+ iterate(this.dest, function(i){vals.push(obj.strToObj(i.getAttribute('value')))});
+ return vals;
 }
 
 oilsRptSetWidget.prototype.objToStr = function(obj) {
-	if( typeof obj == 'string' ) return obj;
-	//return ':'+obj.transform+':'+obj.params[0];
-	var str = ':'+obj.transform;
-	for( var i = 0; i < obj.params.length; i++ ) 
-		str += ':' + obj.params[i];
-	_debug("objToStr(): built string " + str);
-	return str;
+ if( typeof obj == 'string' ) return obj;
+ //return ':'+obj.transform+':'+obj.params[0];
+ var str = ':'+obj.transform;
+ for( var i = 0; i < obj.params.length; i++ ) 
+  str += ':' + obj.params[i];
+ _debug("objToStr(): built string " + str);
+ return str;
 
 }
 
 oilsRptSetWidget.prototype.strToObj = function(str) {
-	if( str.match(/^:.*/) ) {
-		var parts = str.split(/:/);
-		_debug("strToObj(): " + str + ' : ' + parts);
-		parts.shift();
-		var tform = parts.shift();
-		//var tform = str.replace(/^:(.*):.*/,'$1');
-		//var param = str.replace(/^:.*:(.*)/,'$1');
-		return { transform : tform, params : parts };
-	}
-	return str;
+ if( str.match(/^:.*/) ) {
+  var parts = str.split(/:/);
+  _debug("strToObj(): " + str + ' : ' + parts);
+  parts.shift();
+  var tform = parts.shift();
+  //var tform = str.replace(/^:(.*):.*/,'$1');
+  //var param = str.replace(/^:.*:(.*)/,'$1');
+  return { transform : tform, params : parts };
+ }
+ return str;
 }
 
 
 /* --------------------------------------------------------------------- 
-	represents a widget that has start and end values.  start and end
-	are gathered from start/end widgets
-	--------------------------------------------------------------------- */
+ represents a widget that has start and end values.  start and end
+ are gathered from start/end widgets
+ --------------------------------------------------------------------- */
 function oilsRptBetweenWidget(args) {
-	this.node = args.node;
-	this.startWidget = new args.startWidget(args);
-	this.endWidget = new args.endWidget(args);
+ this.node = args.node;
+ this.startWidget = new args.startWidget(args);
+ this.endWidget = new args.endWidget(args);
 }
 oilsRptBetweenWidget.prototype.draw = function() {
-	removeChildren(this.node);
-	this.startWidget.draw();
-	this.node.appendChild(elem('hr'));
-	this.node.appendChild(elem('div',
-		{style:'text-align:center;width:100%;font-weight:bold'},' - And - '));
-	this.node.appendChild(elem('hr'));
-	this.endWidget.draw();
+ removeChildren(this.node);
+ this.startWidget.draw();
+ this.node.appendChild(elem('hr'));
+ this.node.appendChild(elem('div',
+  {style:'text-align:center;width:100%;font-weight:bold'},' - And - '));
+ this.node.appendChild(elem('hr'));
+ this.endWidget.draw();
 }
 oilsRptBetweenWidget.prototype.getValue = function() {
-	return [
-		this.startWidget.getValue(),
-		this.endWidget.getValue()
-	];
+ return [
+  this.startWidget.getValue(),
+  this.endWidget.getValue()
+ ];
 }
 
 
 
 
 /* --------------------------------------------------------------------- 
-	ATOMIC WIDGETS
-	--------------------------------------------------------------------- */
+ ATOMIC WIDGETS
+ --------------------------------------------------------------------- */
 
 
 /* --------------------------------------------------------------------- 
-	Atomic text input widget
-	--------------------------------------------------------------------- */
+ Atomic text input widget
+ --------------------------------------------------------------------- */
 function oilsRptTextWidget(args) {
-	this.node = args.node;
-	this.dest = elem('input',{type:'text',size:12});
-	oilsRptMonitorWidget(this.dest);
+ this.node = args.node;
+ this.dest = elem('input',{type:'text',size:12});
+ oilsRptMonitorWidget(this.dest);
 }
 oilsRptTextWidget.prototype.draw = function() {
-	this.node.appendChild(this.dest);
+ this.node.appendChild(this.dest);
 }
 
 /* returns the "real" value for the widget */
 oilsRptTextWidget.prototype.getValue = function() {
-	return this.dest.value;
+ return this.dest.value;
 }
 
 /* returns the label and "real" value for the widget */
 oilsRptTextWidget.prototype.getDisplayValue = function() {
-	return { label : this.getValue(), value : this.getValue() };
+ return { label : this.getValue(), value : this.getValue() };
 }
 
 
 
 /* --------------------------------------------------------------------- 
-	Atomic bool input widget
-	--------------------------------------------------------------------- */
+ Atomic bool input widget
+ --------------------------------------------------------------------- */
 function oilsRptBoolWidget(args) {
-	this.node = args.node;
-	this.selector = elem('select');
-	insertSelectorVal(this.selector, -1,'True','t');
-	insertSelectorVal(this.selector, -1,'False','f');
+ this.node = args.node;
+ this.selector = elem('select');
+ insertSelectorVal(this.selector, -1,'True','t');
+ insertSelectorVal(this.selector, -1,'False','f');
 }
 
 oilsRptBoolWidget.prototype.draw = function() {
-	this.node.appendChild(this.selector);
+ this.node.appendChild(this.selector);
 }
 
 /* returns the "real" value for the widget */
 oilsRptBoolWidget.prototype.getValue = function() {
-	return getSelectorVal(this.selector);
+ return getSelectorVal(this.selector);
 }
 
 /* returns the label and "real" value for the widget */
 oilsRptBoolWidget.prototype.getDisplayValue = function() {
-	var val = getSelectorVal(this.selector);
-	var label = 'True';
-	if (val == 'f') labal = 'False';
-	return { label : label, value : val };
+ var val = getSelectorVal(this.selector);
+ var label = 'True';
+ if (val == 'f') labal = 'False';
+ return { label : label, value : val };
 }
 
 
 /* If you monitor a text widget with this function, it 
-	will style the input differently to indicate the
-	field needs data.  If a regex is provided, it will
-	style the field differently until the data matches 
-	the regex.  The style comes from OILS_RPT_INVALID_DATA. */
+ will style the input differently to indicate the
+ field needs data.  If a regex is provided, it will
+ style the field differently until the data matches 
+ the regex.  The style comes from OILS_RPT_INVALID_DATA. */
 function oilsRptMonitorWidget(input, regex) {
-	addCSSClass(input, OILS_RPT_INVALID_DATA);
-	var func = function() {
-		var val = input.value;
-		if(!val) {
-			addCSSClass(input, OILS_RPT_INVALID_DATA);
-		} else {
-			if( regex ) {
-				if( val && val.match(regex) ) 
-					removeCSSClass(input, OILS_RPT_INVALID_DATA);
-				else
-					addCSSClass(input, OILS_RPT_INVALID_DATA);
-			} else {
-				removeCSSClass(input, OILS_RPT_INVALID_DATA);
-			}
-		}
-	}
+ addCSSClass(input, OILS_RPT_INVALID_DATA);
+ var func = function() {
+  var val = input.value;
+  if(!val) {
+   addCSSClass(input, OILS_RPT_INVALID_DATA);
+  } else {
+   if( regex ) {
+    if( val && val.match(regex) ) 
+     removeCSSClass(input, OILS_RPT_INVALID_DATA);
+    else
+     addCSSClass(input, OILS_RPT_INVALID_DATA);
+   } else {
+    removeCSSClass(input, OILS_RPT_INVALID_DATA);
+   }
+  }
+ }
 
-	input.onkeyup = func;
-	input.onchange = func;
+ input.onkeyup = func;
+ input.onchange = func;
 }
 
 
 
 
 /* --------------------------------------------------------------------- 
-	Atomic calendar widget
-	--------------------------------------------------------------------- */
+ Atomic calendar widget
+ --------------------------------------------------------------------- */
 function oilsRptCalWidget(args) {
-	this.node = args.node;
-	this.calFormat = args.calFormat;
-	this.input = elem('input',{type:'text',size:12});
+ this.node = args.node;
+ this.calFormat = args.calFormat;
+ this.input = elem('input',{type:'text',size:12});
 
-	oilsRptMonitorWidget(this.input, args.regex);
+ oilsRptMonitorWidget(this.input, args.regex);
 
-	if( args.inputSize ) {
-		this.input.setAttribute('size',args.inputSize);
-		this.input.setAttribute('maxlength',args.inputSize);
-	}
+ if( args.inputSize ) {
+  this.input.setAttribute('size',args.inputSize);
+  this.input.setAttribute('maxlength',args.inputSize);
+ }
 }
 
 oilsRptCalWidget.prototype.draw = function() {
-	this.button = DOM.generic_calendar_button.cloneNode(true);
-	this.button.id = oilsNextId();
-	this.input.id = oilsNextId();
+ this.button = DOM.generic_calendar_button.cloneNode(true);
+ this.button.id = oilsNextId();
+ this.input.id = oilsNextId();
 
-	this.node.appendChild(this.button);
-	this.node.appendChild(this.input);
-	unHideMe(this.button);
+ this.node.appendChild(this.button);
+ this.node.appendChild(this.input);
+ unHideMe(this.button);
 
-	_debug('making calendar widget with format ' + this.calFormat);
+ _debug('making calendar widget with format ' + this.calFormat);
 
-	Calendar.setup({
-		inputField	: this.input.id,
-		ifFormat		: this.calFormat,
-		button		: this.button.id,
-		align			: "Tl",	
-		singleClick	: true
-	});
+ Calendar.setup({
+  inputField : this.input.id,
+  ifFormat  : this.calFormat,
+  button  : this.button.id,
+  align   : "Tl", 
+  singleClick : true
+ });
 }
 
 oilsRptCalWidget.prototype.getValue = function() {
-	return this.input.value;
+ return this.input.value;
 }
 
 oilsRptCalWidget.prototype.getDisplayValue = function() {
-	return { label : this.getValue(), value : this.getValue() };
+ return { label : this.getValue(), value : this.getValue() };
 }
 
 
 /* --------------------------------------------------------------------- 
-	Atomic org widget
-	--------------------------------------------------------------------- */
+ Atomic org widget
+ --------------------------------------------------------------------- */
 function oilsRptOrgSelector(args) {
-	this.node = args.node;
-	this.selector = elem('select',
-		{multiple:'multiple','class':'oils_rpt_small_info_selector'});
+ this.node = args.node;
+ this.selector = elem('select',
+  {multiple:'multiple','class':'oils_rpt_small_info_selector'});
 }
 
 oilsRptOrgSelector.prototype.draw = function(org) {
-	if(!org) org = globalOrgTree;
-	var opt = insertSelectorVal( this.selector, -1, 
-		org.shortname(), org.id(), null, findOrgDepth(org) );
-	if( org.id() == oilsRptCurrentOrg )
-		opt.selected = true;
-	
-	/* sometimes we need these choices 
-	if( !isTrue(findOrgType(org.ou_type()).can_have_vols()) )
-		opt.disabled = true;
-		*/
-
-	if( org.children() ) {
-		for( var c = 0; c < org.children().length; c++ )
-			this.draw(org.children()[c]);
-	}
-	this.node.appendChild(this.selector);
+ if(!org) org = globalOrgTree;
+ var opt = insertSelectorVal( this.selector, -1, 
+  org.shortname(), org.id(), null, findOrgDepth(org) );
+ if( org.id() == oilsRptCurrentOrg )
+  opt.selected = true;
+ 
+ /* sometimes we need these choices 
+ if( !isTrue(findOrgType(org.ou_type()).can_have_vols()) )
+  opt.disabled = true;
+  */
+
+ if( org.children() ) {
+  for( var c = 0; c < org.children().length; c++ )
+   this.draw(org.children()[c]);
+ }
+ this.node.appendChild(this.selector);
 }
 
 oilsRptOrgSelector.prototype.getValue = function() {
-	var vals = [];
-	iterate(this.selector, /* XXX this.selector.options?? */
-		function(o){
-			if( o.selected )
-				vals.push(o.getAttribute('value'))
-		}
-	);
-	return vals;
+ var vals = [];
+ iterate(this.selector, /* XXX this.selector.options?? */
+  function(o){
+   if( o.selected )
+    vals.push(o.getAttribute('value'))
+  }
+ );
+ return vals;
 }
 
 oilsRptOrgSelector.prototype.getDisplayValue = function() {
-	var vals = [];
-	iterate(this.selector,
-		function(o){
-			if( o.selected )
-				vals.push({ label : o.innerHTML, value : o.getAttribute('value')});
-		}
-	);
-	return vals;
+ var vals = [];
+ iterate(this.selector,
+  function(o){
+   if( o.selected )
+    vals.push({ label : o.innerHTML, value : o.getAttribute('value')});
+  }
+ );
+ return vals;
 }
 
 
 /* --------------------------------------------------------------------- 
-	Atomic age widget
-	--------------------------------------------------------------------- */
+ Atomic age widget
+ --------------------------------------------------------------------- */
 function oilsRptAgeWidget(args) {
-	this.node = args.node;
-	this.count = elem('select');
-	this.type = elem('select');
+ this.node = args.node;
+ this.count = elem('select');
+ this.type = elem('select');
 }
 
 oilsRptAgeWidget.prototype.draw = function() {
 
-	//insertSelectorVal(this.count, -1, ' -- Select One -- ', '');
-	for( var i = 1; i < 25; i++ )
-		insertSelectorVal(this.count, -1, i, i);
+ //insertSelectorVal(this.count, -1, ' -- Select One -- ', '');
+ for( var i = 1; i < 25; i++ )
+  insertSelectorVal(this.count, -1, i, i);
 
-	//insertSelectorVal(this.type, -1, ' -- Select One -- ', '');
-	insertSelectorVal(this.type, -1, rpt_strings.WIDGET_DAYS, 'days');
-	insertSelectorVal(this.type, -1, rpt_strings.WIDGET_MONTHS, 'months');
-	insertSelectorVal(this.type, -1, rpt_strings.WIDGET_YEARS, 'years');
-	this.node.appendChild(this.count);
-	this.node.appendChild(this.type);
+ //insertSelectorVal(this.type, -1, ' -- Select One -- ', '');
+ insertSelectorVal(this.type, -1, rpt_strings.WIDGET_DAYS, 'days');
+ insertSelectorVal(this.type, -1, rpt_strings.WIDGET_MONTHS, 'months');
+ insertSelectorVal(this.type, -1, rpt_strings.WIDGET_YEARS, 'years');
+ this.node.appendChild(this.count);
+ this.node.appendChild(this.type);
 }
 
 oilsRptAgeWidget.prototype.getValue = function() {
-	var count = getSelectorVal(this.count);
-	var type = getSelectorVal(this.type);
-	return count+''+type;
+ var count = getSelectorVal(this.count);
+ var type = getSelectorVal(this.type);
+ return count+''+type;
 }
 
 oilsRptAgeWidget.prototype.getDisplayValue = function() {
-	var val = { value : this.getValue() };
-	var label = getSelectorVal(this.count) + ' ';
-	for( var i = 0; i < this.type.options.length; i++ ) {
-		var opt = this.type.options[i];
-		if( opt.selected )
-			label += opt.innerHTML;
-	}
-	val.label = label;
-	return val;
+ var val = { value : this.getValue() };
+ var label = getSelectorVal(this.count) + ' ';
+ for( var i = 0; i < this.type.options.length; i++ ) {
+  var opt = this.type.options[i];
+  if( opt.selected )
+   label += opt.innerHTML;
+ }
+ val.label = label;
+ return val;
 }
 
 
 
 /* --------------------------------------------------------------------- 
-	Atomic substring picker
-	--------------------------------------------------------------------- */
+ Atomic substring picker
+ --------------------------------------------------------------------- */
 function oilsRptSubstrWidget(args) {
-	this.node = args.node
-	this.data = elem('input',{type:'text',size:12})
-	this.offset = elem('input',{type:'text',size:5})
-	this.length = elem('input',{type:'text',size:5})
+ this.node = args.node
+ this.data = elem('input',{type:'text',size:12})
+ this.offset = elem('input',{type:'text',size:5})
+ this.length = elem('input',{type:'text',size:5})
 }
 
 oilsRptSubstrWidget.prototype.draw = function() {
-	this.node.appendChild(text('string: '))
-	this.node.appendChild(this.data);
-	this.node.appendChild(elem('br'));
-	this.node.appendChild(text('offset: '))
-	this.node.appendChild(this.offset);
-	this.node.appendChild(elem('br'));
-	this.node.appendChild(text('length: '))
-	this.node.appendChild(this.length);
+ this.node.appendChild(text('string: '))
+ this.node.appendChild(this.data);
+ this.node.appendChild(elem('br'));
+ this.node.appendChild(text('offset: '))
+ this.node.appendChild(this.offset);
+ this.node.appendChild(elem('br'));
+ this.node.appendChild(text('length: '))
+ this.node.appendChild(this.length);
 }
 
 oilsRptSubstrWidget.prototype.getValue = function() {
-	return {
-		transform : 'substring',
-		params : [ this.data.value, this.offset.value, this.length.value ]
-	};
+ return {
+  transform : 'substring',
+  params : [ this.data.value, this.offset.value, this.length.value ]
+ };
 }
 
 oilsRptSubstrWidget.prototype.getDisplayValue = function() {
-	return {
-		label : this.data.value + ' : ' + this.offset.value + ' : ' + this.length.value,
-		value : this.getValue()
-	};
+ return {
+  label : this.data.value + ' : ' + this.offset.value + ' : ' + this.length.value,
+  value : this.getValue()
+ };
 }
 
 
 /* --------------------------------------------------------------------- 
-	Atomic number picker
-	--------------------------------------------------------------------- */
+ Atomic number picker
+ --------------------------------------------------------------------- */
 function oilsRptNumberWidget(args) {
-	this.node = args.node;
-	this.size = args.size || 32;
-	this.start = args.start;
-	this.selector = elem('select');
+ this.node = args.node;
+ this.size = args.size || 32;
+ this.start = args.start;
+ this.selector = elem('select');
 }
 oilsRptNumberWidget.prototype.draw = function() {
-	//insertSelectorVal(this.selector, -1, ' -- Select One -- ', '');
-	for( var i = this.start; i < (this.size + this.start); i++ )
-		insertSelectorVal(this.selector, -1, i, i);
-	this.node.appendChild(this.selector);
-	var obj = this;
+ //insertSelectorVal(this.selector, -1, ' -- Select One -- ', '');
+ for( var i = this.start; i < (this.size + this.start); i++ )
+  insertSelectorVal(this.selector, -1, i, i);
+ this.node.appendChild(this.selector);
+ var obj = this;
 }
 
 oilsRptNumberWidget.prototype.getValue = function() {
-	return getSelectorVal(this.selector);
+ return getSelectorVal(this.selector);
 }
 
 oilsRptNumberWidget.prototype.getDisplayValue = function() {
-	return { label : this.getValue(), value : this.getValue() };
+ return { label : this.getValue(), value : this.getValue() };
 }
 
 
 /* --------------------------------------------------------------------- 
-	Relative dates widget
-	-------------------------------------------------------------------- */
+ Relative dates widget
+ -------------------------------------------------------------------- */
 
 function oilsRptNullWidget(args) {
     this.node = args.node;
@@ -420,195 +420,195 @@ oilsRptTemplateWidget.prototype.draw = function() {
 }
 
 /* --------------------------------------------------------------------- 
-	Relative dates widget
-	-------------------------------------------------------------------- */
+ Relative dates widget
+ -------------------------------------------------------------------- */
 function oilsRptTruncPicker(args) {
-	this.node = args.node;
-	this.type = args.type;
-	this.realSpan = elem('span');
-	this.relSpan = elem('span');
-	hideMe(this.relSpan);
-	args.node = this.realSpan;
-	this.calWidget = new oilsRptCalWidget(args);
-	args.node = this.node;
+ this.node = args.node;
+ this.type = args.type;
+ this.realSpan = elem('span');
+ this.relSpan = elem('span');
+ hideMe(this.relSpan);
+ args.node = this.realSpan;
+ this.calWidget = new oilsRptCalWidget(args);
+ args.node = this.node;
 
-	this.selector = elem('select');
-	insertSelectorVal(this.selector,-1,rpt_strings.WIDGET_REAL_DATE,1);
-	insertSelectorVal(this.selector,-1,rpt_strings.WIDGET_RELATIVE_DATE,2);
+ this.selector = elem('select');
+ insertSelectorVal(this.selector,-1,rpt_strings.WIDGET_REAL_DATE,1);
+ insertSelectorVal(this.selector,-1,rpt_strings.WIDGET_RELATIVE_DATE,2);
 
-	this.numberPicker = 
-		new oilsRptNumberWidget({node:this.relSpan,size:90,start:1});
+ this.numberPicker = 
+  new oilsRptNumberWidget({node:this.relSpan,size:90,start:1});
 
-	this.label = 'Day(s)';
-	if(this.type == 'month') this.label = rpt_strings.WIDGET_MONTHS;
-	if(this.type == 'quarter') this.label = rpt_strings.WIDGET_QUARTERS;
-	if(this.type == 'year') this.label = rpt_strings.WIDGET_YEARS;
-	if(this.type == 'date') this.label = rpt_strings.WIDGET_DAYS;
+ this.label = 'Day(s)';
+ if(this.type == 'month') this.label = rpt_strings.WIDGET_MONTHS;
+ if(this.type == 'quarter') this.label = rpt_strings.WIDGET_QUARTERS;
+ if(this.type == 'year') this.label = rpt_strings.WIDGET_YEARS;
+ if(this.type == 'date') this.label = rpt_strings.WIDGET_DAYS;
 }
 
 oilsRptTruncPicker.prototype.draw = function() {
-	this.node.appendChild(this.selector);
-	this.node.appendChild(this.realSpan);
-	this.node.appendChild(this.relSpan);
-	this.calWidget.draw();
-	this.numberPicker.draw();
-	this.relSpan.appendChild(text(this.label+' ago'));
-
-	var obj = this;
-	this.selector.onchange = function() {
-		if( getSelectorVal(obj.selector) == 1 ) {
-			unHideMe(obj.realSpan);
-			hideMe(obj.relSpan);
-		} else {
-			unHideMe(obj.relSpan);
-			hideMe(obj.realSpan);
-		}
-	}
+ this.node.appendChild(this.selector);
+ this.node.appendChild(this.realSpan);
+ this.node.appendChild(this.relSpan);
+ this.calWidget.draw();
+ this.numberPicker.draw();
+ this.relSpan.appendChild(text(this.label+' ago'));
+
+ var obj = this;
+ this.selector.onchange = function() {
+  if( getSelectorVal(obj.selector) == 1 ) {
+   unHideMe(obj.realSpan);
+   hideMe(obj.relSpan);
+  } else {
+   unHideMe(obj.relSpan);
+   hideMe(obj.realSpan);
+  }
+ }
 }
 
 oilsRptTruncPicker.prototype.getValue = function() {
-	if( getSelectorVal(this.selector) == 2) {
-		var val = this.numberPicker.getValue();
-		var tform = 'relative_' + this.type;
-		return { transform : tform, params : ['-'+val] };
-	}
-	return this.calWidget.getValue();
+ if( getSelectorVal(this.selector) == 2) {
+  var val = this.numberPicker.getValue();
+  var tform = 'relative_' + this.type;
+  return { transform : tform, params : ['-'+val] };
+ }
+ return this.calWidget.getValue();
 }
 
 oilsRptTruncPicker.prototype.getDisplayValue = function() {
-	if( getSelectorVal(this.selector) == 2) {
-		var num = this.numberPicker.getValue();
-		return { label : num +' '+this.label+' ago', value : this.getValue() };
-	}
-	return this.calWidget.getDisplayValue();
+ if( getSelectorVal(this.selector) == 2) {
+  var num = this.numberPicker.getValue();
+  return { label : num +' '+this.label+' ago', value : this.getValue() };
+ }
+ return this.calWidget.getDisplayValue();
 }
 
 
 /* --------------------------------------------------------------------- 
-	Atomic remote object picker
-	--------------------------------------------------------------------- */
+ Atomic remote object picker
+ --------------------------------------------------------------------- */
 
 function oilsRptRemoteWidget(args) {
-	this.node	= args.node;
-	this.class	= args.class;
-	this.field	= args.field;
-	this.column = args.column;
-	this.source = elem('select',
-		{multiple:'multiple','class':'oils_rpt_small_info_selector'});
+ this.node = args.node;
+ this.class = args.class;
+ this.field = args.field;
+ this.column = args.column;
+ this.source = elem('select',
+  {multiple:'multiple','class':'oils_rpt_small_info_selector'});
 }
 
 oilsRptRemoteWidget.prototype.draw = function() {
-	var orgcol;
-	iterate(oilsIDL[this.class].fields,
-		function(i) {
-			if(i.type == 'link' && i.class == 'aou') 
-				orgcol = i.name;
-		}
-	);
-
-	if(orgcol) _debug("found org column for remote widget: " + orgcol);
-
-	var orgs = [];
-	iterate(oilsRptMyOrgs,function(i){orgs.push(i.id());});
-	var req = new Request(OILS_RPT_MAGIC_FETCH, SESSION, {
-		hint:this.class,
-		org_column : orgcol,
-		org : orgs
-	}); 
-
-	var obj = this;
-	this.node.appendChild(this.source);
-	req.callback(function(r){obj.render(r.getResultObject())});
-	req.send();
+ var orgcol;
+ iterate(oilsIDL[this.class].fields,
+  function(i) {
+   if(i.type == 'link' && i.class == 'aou') 
+    orgcol = i.name;
+  }
+ );
+
+ if(orgcol) _debug("found org column for remote widget: " + orgcol);
+
+ var orgs = [];
+ iterate(oilsRptMyOrgs,function(i){orgs.push(i.id());});
+ var req = new Request(OILS_RPT_MAGIC_FETCH, SESSION, {
+  hint:this.class,
+  org_column : orgcol,
+  org : orgs
+ }); 
+
+ var obj = this;
+ this.node.appendChild(this.source);
+ req.callback(function(r){obj.render(r.getResultObject())});
+ req.send();
 }
 
 oilsRptRemoteWidget.prototype.render = function(objs) {
-	for( var i = 0; i < objs.length; i++ ) {
-		var obj = objs[i];
-		var label = obj[this.field.selector]();
-		var value = obj[this.column]();
-		_debug("inserted remote object "+label + ' : ' + value);
-		insertSelectorVal(this.source, -1, label, value);
-	}
+ for( var i = 0; i < objs.length; i++ ) {
+  var obj = objs[i];
+  var label = obj[this.field.selector]();
+  var value = obj[this.column]();
+  _debug("inserted remote object "+label + ' : ' + value);
+  insertSelectorVal(this.source, -1, label, value);
+ }
 }
 
 oilsRptRemoteWidget.prototype.getDisplayValue = function() {
-	var vals = [];
-	iterate(this.source,
-		function(o){
-			if( o.selected )
-				vals.push({ label : o.innerHTML, value : o.getAttribute('value')});
-		}
-	);
-	return vals;
+ var vals = [];
+ iterate(this.source,
+  function(o){
+   if( o.selected )
+    vals.push({ label : o.innerHTML, value : o.getAttribute('value')});
+  }
+ );
+ return vals;
 }
 
 oilsRptRemoteWidget.prototype.getValue = function() {
-	var vals = [];
-	iterate(this.source,
-		function(o){
-			if( o.selected )
-				vals.push(o.getAttribute('value'))
-		}
-	);
-	return vals;
+ var vals = [];
+ iterate(this.source,
+  function(o){
+   if( o.selected )
+    vals.push(o.getAttribute('value'))
+  }
+ );
+ return vals;
 }
 
 
 
 
 /* --------------------------------------------------------------------- 
-	CUSTOM WIDGETS
-	--------------------------------------------------------------------- */
+ CUSTOM WIDGETS
+ --------------------------------------------------------------------- */
 
 /* --------------------------------------------------------------------- 
-	custom my-orgs picker 
-	--------------------------------------------------------------------- */
+ custom my-orgs picker 
+ --------------------------------------------------------------------- */
 function oilsRptMyOrgsWidget(node, orgid, maxorg) {
-	_debug('fetching my orgs with max org of ' + maxorg);
-	this.node = node;
-	this.orgid = orgid;
-	this.maxorg = maxorg || 1;
-	this.active = true;
-	if( maxorg < 1 ) {
-		this.node.disabled = true;
-		this.active = false;
-	}
+ _debug('fetching my orgs with max org of ' + maxorg);
+ this.node = node;
+ this.orgid = orgid;
+ this.maxorg = maxorg || 1;
+ this.active = true;
+ if( maxorg < 1 ) {
+  this.node.disabled = true;
+  this.active = false;
+ }
 }
 
 oilsRptMyOrgsWidget.prototype.draw = function() {
-	if(!oilsRptMyOrgs) {
-		var req = new Request(OILS_RPT_FETCH_ORG_FULL_PATH, this.orgid);
-		var obj = this;
-		req.callback(
-			function(r) { obj.drawWidget(r.getResultObject()); }
-		);
-		req.send();
-	} else {
-		this.drawWidget(oilsRptMyOrgs);
-	}
+ if(!oilsRptMyOrgs) {
+  var req = new Request(OILS_RPT_FETCH_ORG_FULL_PATH, this.orgid);
+  var obj = this;
+  req.callback(
+   function(r) { obj.drawWidget(r.getResultObject()); }
+  );
+  req.send();
+ } else {
+  this.drawWidget(oilsRptMyOrgs);
+ }
 }
 
 oilsRptMyOrgsWidget.prototype.drawWidget = function(orglist) {
-	var sel = this.node;
-	var started = false;
-	oilsRptMyOrgs = orglist;
-	for( var i = 0; i < orglist.length; i++ ) {
-		var org = orglist[i];
-		var opt = insertSelectorVal( this.node, -1, 
-			org.name(), org.id(), null, findOrgDepth(org) );
-		if( org.id() == this.orgid )
-			opt.selected = true;
-		if(!started) {
-			if( org.id() == this.maxorg ) 
-				started = true;
-			else opt.disabled = true;
-		}
-	}
+ var sel = this.node;
+ var started = false;
+ oilsRptMyOrgs = orglist;
+ for( var i = 0; i < orglist.length; i++ ) {
+  var org = orglist[i];
+  var opt = insertSelectorVal( this.node, -1, 
+   org.name(), org.id(), null, findOrgDepth(org) );
+  if( org.id() == this.orgid )
+   opt.selected = true;
+  if(!started) {
+   if( org.id() == this.maxorg ) 
+    started = true;
+   else opt.disabled = true;
+  }
+ }
 }
 
 oilsRptMyOrgsWidget.prototype.getValue = function() {
-	return getSelectorVal(this.node);
+ return getSelectorVal(this.node);
 }
 
 
diff --git a/Open-ILS/web/reports/xul/operators.js b/Open-ILS/web/reports/xul/operators.js
index d717c300f5..2aada114ab 100644
--- a/Open-ILS/web/reports/xul/operators.js
+++ b/Open-ILS/web/reports/xul/operators.js
@@ -3,69 +3,69 @@ dojo.requireLocalization("openils.reports", "reports");
 var rpt_strings = dojo.i18n.getLocalization("openils.reports", "reports");
 
 var OILS_RPT_FILTERS = {
-	'=' : {
-		label : rpt_strings.OPERATORS_EQUALS
-	},
-
-	'like' : {
-		label : rpt_strings.OPERATORS_LIKE
-	}, 
-
-	ilike : {
-		label : rpt_strings.OPERATORS_ILIKE
-	},
-
-	'>' : {
-		label : rpt_strings.OPERATORS_GREATER_THAN,
-		labels : { timestamp : rpt_strings.OPERATORS_GT_TIME }
-	},
-
-	'>=' : {
-		label : rpt_strings.OPERATORS_GT_EQUAL,
-		labels : { timestamp : rpt_strings.OPERATORS_GTE_TIME }
-	}, 
-
-
-	'<' : {
-		label : rpt_strings.OPERATORS_LESS_THAN,
-		labels : { timestamp : rpt_strings.OPERATORS_LT_TIME }
-	}, 
-
-	'<=' : {
-		label : rpt_strings.OPERATORS_LT_EQUAL, 
-		labels : { timestamp : rpt_strings.OPERATORS_LTE_TIME }
-	},
-
-	'in' : {
-		label : rpt_strings.OPERATORS_IN_LIST
-	},
-
-	'not in' : {
-		label : rpt_strings.OPERATORS_NOT_IN_LIST
-	},
-
-	'between' : {
-		label : rpt_strings.OPERATORS_BETWEEN
-	},
-
-	'not between' : {
-		label : rpt_strings.OPERATORS_NOT_BETWEEN
-	},
-
-	'is' : {
-		label : rpt_strings.OPERATORS_IS_NULL
-	},
-
-	'is not' : {
-		label : rpt_strings.OPERATORS_IS_NOT_NULL
-	},
-
-	'is blank' : {
-		label : rpt_strings.OPERATORS_NULL_BLANK
-	},
-
-	'is not blank' : {
-		label : rpt_strings.OPERATORS_NOT_NULL_BLANK
-	}
+ '=' : {
+  label : rpt_strings.OPERATORS_EQUALS
+ },
+
+ 'like' : {
+  label : rpt_strings.OPERATORS_LIKE
+ }, 
+
+ ilike : {
+  label : rpt_strings.OPERATORS_ILIKE
+ },
+
+ '>' : {
+  label : rpt_strings.OPERATORS_GREATER_THAN,
+  labels : { timestamp : rpt_strings.OPERATORS_GT_TIME }
+ },
+
+ '>=' : {
+  label : rpt_strings.OPERATORS_GT_EQUAL,
+  labels : { timestamp : rpt_strings.OPERATORS_GTE_TIME }
+ }, 
+
+
+ '<' : {
+  label : rpt_strings.OPERATORS_LESS_THAN,
+  labels : { timestamp : rpt_strings.OPERATORS_LT_TIME }
+ }, 
+
+ '<=' : {
+  label : rpt_strings.OPERATORS_LT_EQUAL, 
+  labels : { timestamp : rpt_strings.OPERATORS_LTE_TIME }
+ },
+
+ 'in' : {
+  label : rpt_strings.OPERATORS_IN_LIST
+ },
+
+ 'not in' : {
+  label : rpt_strings.OPERATORS_NOT_IN_LIST
+ },
+
+ 'between' : {
+  label : rpt_strings.OPERATORS_BETWEEN
+ },
+
+ 'not between' : {
+  label : rpt_strings.OPERATORS_NOT_BETWEEN
+ },
+
+ 'is' : {
+  label : rpt_strings.OPERATORS_IS_NULL
+ },
+
+ 'is not' : {
+  label : rpt_strings.OPERATORS_IS_NOT_NULL
+ },
+
+ 'is blank' : {
+  label : rpt_strings.OPERATORS_NULL_BLANK
+ },
+
+ 'is not blank' : {
+  label : rpt_strings.OPERATORS_NOT_NULL_BLANK
+ }
 }
 
diff --git a/Open-ILS/web/reports/xul/source-browse.js b/Open-ILS/web/reports/xul/source-browse.js
index 4075dd1f71..8e45d76a89 100644
--- a/Open-ILS/web/reports/xul/source-browse.js
+++ b/Open-ILS/web/reports/xul/source-browse.js
@@ -6,253 +6,253 @@ function sourceTreeHandlerDblClick (ev) { return sourceTreeHandler(ev,true) }
 
 function sourceTreeHandler (ev, dbl) {
 
-	var row = {}, col = {}, part = {}, item;
-	var tree = $('idl-browse-tree');
+ var row = {}, col = {}, part = {}, item;
+ var tree = $('idl-browse-tree');
 
 
-	try {
-		tree.treeBoxObject.getCellAt(ev.clientX, ev.clientY, row, col, part);
-		item = tree.contentView.getItemAtIndex(row.value);
-	} catch (e) {
-		// ... meh
-	}
+ try {
+  tree.treeBoxObject.getCellAt(ev.clientX, ev.clientY, row, col, part);
+  item = tree.contentView.getItemAtIndex(row.value);
+ } catch (e) {
+  // ... meh
+ }
 
-	if (part.value == 'twisty' || dbl) { // opening or closing
-		if (item.getAttribute('open') == 'true' && item.lastChild.childNodes.length == 0) {
-			//var subtree = item.lastChild;
-			//while (subtree.childNodes.length)
-			//	subtree.removeChild(subtree.lastChild);
+ if (part.value == 'twisty' || dbl) { // opening or closing
+  if (item.getAttribute('open') == 'true' && item.lastChild.childNodes.length == 0) {
+   //var subtree = item.lastChild;
+   //while (subtree.childNodes.length)
+   // subtree.removeChild(subtree.lastChild);
 
-			var p = getIDLClass( item.getAttribute('idlclass') );
+   var p = getIDLClass( item.getAttribute('idlclass') );
 
-			var subtreeList = [];
-			var link_fields = p.getElementsByTagName('link');
+   var subtreeList = [];
+   var link_fields = p.getElementsByTagName('link');
 
-			for ( var i = 0; i < link_fields.length; i++ ) {
-				var field = getIDLField( p, link_fields[i].getAttribute('field') );
+   for ( var i = 0; i < link_fields.length; i++ ) {
+    var field = getIDLField( p, link_fields[i].getAttribute('field') );
 
-				if (!field) continue;
+    if (!field) continue;
 
-				var name = field.getAttributeNS(rptNS,'label');
-				if (!name) name = field.getAttribute('name');
+    var name = field.getAttributeNS(rptNS,'label');
+    if (!name) name = field.getAttribute('name');
 
-				var idlclass = link_fields[i].getAttribute('class');
-				var map = link_fields[i].getAttribute('map');
-				var link = link_fields[i].getAttribute('field');
-				var key = link_fields[i].getAttribute('key');
-				var reltype = link_fields[i].getAttribute('reltype');
+    var idlclass = link_fields[i].getAttribute('class');
+    var map = link_fields[i].getAttribute('map');
+    var link = link_fields[i].getAttribute('field');
+    var key = link_fields[i].getAttribute('key');
+    var reltype = link_fields[i].getAttribute('reltype');
 
-				if (map) continue;
+    if (map) continue;
 
-				var pathList = [];
-				findAncestorStack( item, 'treeitem', pathList );
+    var pathList = [];
+    findAncestorStack( item, 'treeitem', pathList );
 
-				var fullpath = '';
+    var fullpath = '';
 
-				for (var j in pathList.reverse()) {
-					var n = pathList[j].getAttribute('idlclass');
-					var f = pathList[j].getAttribute('field');
-					var j = pathList[j].getAttribute('join');
+    for (var j in pathList.reverse()) {
+     var n = pathList[j].getAttribute('idlclass');
+     var f = pathList[j].getAttribute('field');
+     var j = pathList[j].getAttribute('join');
 
-					if (f) fullpath += "-" + f;
-					if (f && j != 'undefined') fullpath += '>' + j;
+     if (f) fullpath += "-" + f;
+     if (f && j != 'undefined') fullpath += '>' + j;
 
-					if (fullpath) fullpath += ".";
-					fullpath += n;
+     if (fullpath) fullpath += ".";
+     fullpath += n;
 
-				}
+    }
 
-				fullpath += "-" + link;
+    fullpath += "-" + link;
 
-				subtreeList.push(
-					{ name : name,
-					  nullable : rpt_strings.LINK_NULLABLE_DEFAULT,
-					  idlclass : idlclass,
-					  map : map,
-					  key : key,
-					  field : field.getAttribute('name'),
-					  reltype : reltype,
-					  link : link,
-					  fullpath : fullpath
-					}
-				);
+    subtreeList.push(
+     { name : name,
+       nullable : rpt_strings.LINK_NULLABLE_DEFAULT,
+       idlclass : idlclass,
+       map : map,
+       key : key,
+       field : field.getAttribute('name'),
+       reltype : reltype,
+       link : link,
+       fullpath : fullpath
+     }
+    );
 
                 if ($('nullable-source-control').checked) {
-	                if (reltype == 'has_a') {
-	    				subtreeList.push(
-		    				{ name : name,
-	                          nullable : rpt_strings.LINK_NULLABLE_RIGHT,
-			    			  idlclass : idlclass,
-				    		  map : map,
-					    	  key : key,
-						      join : 'right',
-	    					  field : field.getAttribute('name'),
-		    				  reltype : reltype,
-			    			  link : link,
-				    		  fullpath : fullpath + '>right'
-					    	}
-	    				);
-	
-	    				subtreeList.push(
-		    				{ name : name,
-	                          nullable : rpt_strings.LINK_NULLABLE_NONE,
-				    		  idlclass : idlclass,
-					    	  map : map,
-						      key : key,
-						      join : 'inner',
-	    					  field : field.getAttribute('name'),
-		    				  reltype : reltype,
-			    			  link : link,
-				    		  fullpath : fullpath + '>inner'
-					    	}
-	    				);
-	
-	                } else{
-	    				subtreeList.push(
-		    				{ name : name,
-	                          nullable : rpt_strings.LINK_NULLABLE_LEFT,
-			    			  idlclass : idlclass,
-				    		  map : map,
-					    	  key : key,
-						      join : 'left',
-	    					  field : field.getAttribute('name'),
-		    				  reltype : reltype,
-			    			  link : link,
-				    		  fullpath : fullpath + '>left'
-					    	}
-	    				);
-	
-	    				subtreeList.push(
-		    				{ name : name,
-	                          nullable : rpt_strings.LINK_NULLABLE_NONE,
-				    		  idlclass : idlclass,
-					    	  map : map,
-						      key : key,
-						      join : 'inner',
-	    					  field : field.getAttribute('name'),
-		    				  reltype : reltype,
-			    			  link : link,
-				    		  fullpath : fullpath + '>inner'
-					    	}
-	    				);
-	
-	                }
+                 if (reltype == 'has_a') {
+         subtreeList.push(
+          { name : name,
+                           nullable : rpt_strings.LINK_NULLABLE_RIGHT,
+            idlclass : idlclass,
+            map : map,
+            key : key,
+            join : 'right',
+            field : field.getAttribute('name'),
+            reltype : reltype,
+            link : link,
+            fullpath : fullpath + '>right'
+          }
+         );
+ 
+         subtreeList.push(
+          { name : name,
+                           nullable : rpt_strings.LINK_NULLABLE_NONE,
+            idlclass : idlclass,
+            map : map,
+            key : key,
+            join : 'inner',
+            field : field.getAttribute('name'),
+            reltype : reltype,
+            link : link,
+            fullpath : fullpath + '>inner'
+          }
+         );
+ 
+                 } else{
+         subtreeList.push(
+          { name : name,
+                           nullable : rpt_strings.LINK_NULLABLE_LEFT,
+            idlclass : idlclass,
+            map : map,
+            key : key,
+            join : 'left',
+            field : field.getAttribute('name'),
+            reltype : reltype,
+            link : link,
+            fullpath : fullpath + '>left'
+          }
+         );
+ 
+         subtreeList.push(
+          { name : name,
+                           nullable : rpt_strings.LINK_NULLABLE_NONE,
+            idlclass : idlclass,
+            map : map,
+            key : key,
+            join : 'inner',
+            field : field.getAttribute('name'),
+            reltype : reltype,
+            link : link,
+            fullpath : fullpath + '>inner'
+          }
+         );
+ 
+                 }
                 }
-			}
+   }
 
-			populateSourcesSubtree( item.lastChild, subtreeList );
-		}
-	} else if (item) {
-		var classtree = $('class-treetop');
+   populateSourcesSubtree( item.lastChild, subtreeList );
+  }
+ } else if (item) {
+  var classtree = $('class-treetop');
 
-		while (classtree.childNodes.length)
-			classtree.removeChild(classtree.lastChild);
+  while (classtree.childNodes.length)
+   classtree.removeChild(classtree.lastChild);
 
-		var c = getIDLClass( item.getAttribute('idlclass') );
+  var c = getIDLClass( item.getAttribute('idlclass') );
 
-		populateDetailTree(
-			classtree,
-			c,
-			item
-		);
-	}
+  populateDetailTree(
+   classtree,
+   c,
+   item
+  );
+ }
 
-	return true;
+ return true;
 }
 
 function transformSelectHandler (noswap) {
-	var transform_tree = $('trans-view');
-	var transform = getSelectedItems(transform_tree)[0];
-
-	if (transform) {
-		if (transform.getAttribute('aggregate') == 'true') {
-			$( 'filter_tab' ).setAttribute('disabled','true');
-			$( 'aggfilter_tab' ).setAttribute('disabled','false');
-
-			if (!noswap && $( 'filter_tab' ).selected)
-				$( 'filter_tab' ).parentNode.selectedItem = $( 'aggfilter_tab' );
-		} else {
-			$( 'filter_tab' ).setAttribute('disabled','false');
-			$( 'aggfilter_tab' ).setAttribute('disabled','true');
-
-			if (!noswap && $( 'aggfilter_tab' ).selected)
-				$( 'aggfilter_tab' ).parentNode.selectedItem = $( 'filter_tab' );
-		}
-	}
-
-	if ($( 'filter_tab' ).selected) {
-		if ($( 'filter_tab' ).getAttribute('disabled') == 'true')
-			$( 'source-add' ).setAttribute('disabled','true');
-		else
-			$( 'source-add' ).setAttribute('disabled','false');
-
-	} else if ($( 'aggfilter_tab' ).selected) {
-		if ($( 'aggfilter_tab' ).getAttribute('disabled') == 'true')
-			$( 'source-add' ).setAttribute('disabled','true');
-		else
-			$( 'source-add' ).setAttribute('disabled','false');
-
-	} else if ($( 'dis_tab' ).selected) {
-		$( 'source-add' ).setAttribute('disabled','false');
-	}
+ var transform_tree = $('trans-view');
+ var transform = getSelectedItems(transform_tree)[0];
+
+ if (transform) {
+  if (transform.getAttribute('aggregate') == 'true') {
+   $( 'filter_tab' ).setAttribute('disabled','true');
+   $( 'aggfilter_tab' ).setAttribute('disabled','false');
+
+   if (!noswap && $( 'filter_tab' ).selected)
+    $( 'filter_tab' ).parentNode.selectedItem = $( 'aggfilter_tab' );
+  } else {
+   $( 'filter_tab' ).setAttribute('disabled','false');
+   $( 'aggfilter_tab' ).setAttribute('disabled','true');
+
+   if (!noswap && $( 'aggfilter_tab' ).selected)
+    $( 'aggfilter_tab' ).parentNode.selectedItem = $( 'filter_tab' );
+  }
+ }
+
+ if ($( 'filter_tab' ).selected) {
+  if ($( 'filter_tab' ).getAttribute('disabled') == 'true')
+   $( 'source-add' ).setAttribute('disabled','true');
+  else
+   $( 'source-add' ).setAttribute('disabled','false');
+
+ } else if ($( 'aggfilter_tab' ).selected) {
+  if ($( 'aggfilter_tab' ).getAttribute('disabled') == 'true')
+   $( 'source-add' ).setAttribute('disabled','true');
+  else
+   $( 'source-add' ).setAttribute('disabled','false');
+
+ } else if ($( 'dis_tab' ).selected) {
+  $( 'source-add' ).setAttribute('disabled','false');
+ }
 }
 
 function detailTreeHandler (args) {
-	var class_tree = $('class-view');
-	var transform_tree = $('trans-treetop');
-
-	while (transform_tree.childNodes.length)
-		transform_tree.removeChild(transform_tree.lastChild);
-
-	var class_items = getSelectedItems(class_tree);;
-
-	var transforms = new Object(); 
-	for (var i in class_items) {
-		var item = class_items[i];
-		var dtype = item.lastChild.lastChild.getAttribute('label');
-
-		var item_transforms = getTransforms({ datatype : dtype });
-
-		for (var j in item_transforms) {
-			transforms[item_transforms[j]] = OILS_RPT_TRANSFORMS[item_transforms[j]];
-			transforms[item_transforms[j]].name = item_transforms[j];
-		}
-	}
-
-	var transformList = [];
-	for (var i in transforms) {
-		transformList.push( transforms[i] );
-	}
-
-	transformList.sort( sortHashLabels );
-
-	$( 'aggfilter_tab' ).setAttribute('disabled','true');
-
-	for (var i in transformList) {
-		var t = transformList[i];
-		transform_tree.appendChild(
-			createTreeItem(
-				{ aggregate : t.aggregate,
-				  name : t.name,
-				  alias : t.label,
-				  params : t.params
-				},
-				createTreeRow(
-				  	{},
-					createTreeCell( { label : t.label } ),
-					createTreeCell( { label : t.params ? t.params : '0' } ),
-					createTreeCell( { label : t.datatype.length > 0 ?  t.datatype.join(', ') : 'all' } ),
-					createTreeCell( { label : t.aggregate ?  rpt_strings.SOURCE_BROWSE_AGGREGATE : rpt_strings.SOURCE_BROWSE_NON_AGGREGATE } )
-				)
-			)
-		);
-
-		if (t.aggregate) $( 'aggfilter_tab' ).setAttribute('disabled','false');
-	}
-
-	transformSelectHandler(true);
-
-	return true;
+ var class_tree = $('class-view');
+ var transform_tree = $('trans-treetop');
+
+ while (transform_tree.childNodes.length)
+  transform_tree.removeChild(transform_tree.lastChild);
+
+ var class_items = getSelectedItems(class_tree);;
+
+ var transforms = new Object(); 
+ for (var i in class_items) {
+  var item = class_items[i];
+  var dtype = item.lastChild.lastChild.getAttribute('label');
+
+  var item_transforms = getTransforms({ datatype : dtype });
+
+  for (var j in item_transforms) {
+   transforms[item_transforms[j]] = OILS_RPT_TRANSFORMS[item_transforms[j]];
+   transforms[item_transforms[j]].name = item_transforms[j];
+  }
+ }
+
+ var transformList = [];
+ for (var i in transforms) {
+  transformList.push( transforms[i] );
+ }
+
+ transformList.sort( sortHashLabels );
+
+ $( 'aggfilter_tab' ).setAttribute('disabled','true');
+
+ for (var i in transformList) {
+  var t = transformList[i];
+  transform_tree.appendChild(
+   createTreeItem(
+    { aggregate : t.aggregate,
+      name : t.name,
+      alias : t.label,
+      params : t.params
+    },
+    createTreeRow(
+       {},
+     createTreeCell( { label : t.label } ),
+     createTreeCell( { label : t.params ? t.params : '0' } ),
+     createTreeCell( { label : t.datatype.length > 0 ?  t.datatype.join(', ') : 'all' } ),
+     createTreeCell( { label : t.aggregate ?  rpt_strings.SOURCE_BROWSE_AGGREGATE : rpt_strings.SOURCE_BROWSE_NON_AGGREGATE } )
+    )
+   )
+  );
+
+  if (t.aggregate) $( 'aggfilter_tab' ).setAttribute('disabled','false');
+ }
+
+ transformSelectHandler(true);
+
+ return true;
 }
 
 
diff --git a/Open-ILS/web/reports/xul/source-setup.js b/Open-ILS/web/reports/xul/source-setup.js
index 7a9ca848e2..c86e7e1b61 100644
--- a/Open-ILS/web/reports/xul/source-setup.js
+++ b/Open-ILS/web/reports/xul/source-setup.js
@@ -1,12 +1,12 @@
 dojo.requireLocalization("openils.reports", "reports");
 
 var rpt_strings = dojo.i18n.getLocalization("openils.reports", "reports");
-var idlNS	= "http://opensrf.org/spec/IDL/base/v1";
-var persistNS	= "http://open-ils.org/spec/opensrf/IDL/persistence/v1";
-var objNS	= "http://open-ils.org/spec/opensrf/IDL/objects/v1";
-var rptNS	= "http://open-ils.org/spec/opensrf/IDL/reporter/v1";
-var gwNS	= "http://opensrf.org/-/namespaces/gateway/v1";
-var xulNS	= "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+var idlNS = "http://opensrf.org/spec/IDL/base/v1";
+var persistNS = "http://open-ils.org/spec/opensrf/IDL/persistence/v1";
+var objNS = "http://open-ils.org/spec/opensrf/IDL/objects/v1";
+var rptNS = "http://open-ils.org/spec/opensrf/IDL/reporter/v1";
+var gwNS = "http://opensrf.org/-/namespaces/gateway/v1";
+var xulNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
 var oilsIDL;
 var rpt_rel_cache = {};
@@ -14,50 +14,50 @@ var rpt_rel_cache = {};
 function sortHashLabels (a,b) { return a.label.toLowerCase() < b.label.toLowerCase() ? -1 : 1; }
 
 function sortNames (a,b) {
-	var aname =  a.name.toLowerCase();
-	if (!aname) aname = a.idlclass.toLowerCase();
+ var aname =  a.name.toLowerCase();
+ if (!aname) aname = a.idlclass.toLowerCase();
 
-	var bname =  b.name.toLowerCase();
-	if (!bname) bname = b.idlclass.toLowerCase();
+ var bname =  b.name.toLowerCase();
+ if (!bname) bname = b.idlclass.toLowerCase();
 
-	return aname < bname ? -1 : 1;
+ return aname < bname ? -1 : 1;
 }
 
 function sortLabels (a,b) {
-	var aname =  a.getAttributeNS(rptNS, 'label').toLowerCase();
-	if (!aname) aname = a.getAttribute('name');
-	if (!aname) aname = a.getAttribute('id');
+ var aname =  a.getAttributeNS(rptNS, 'label').toLowerCase();
+ if (!aname) aname = a.getAttribute('name');
+ if (!aname) aname = a.getAttribute('id');
 
-	var bname =  b.getAttributeNS(rptNS, 'label').toLowerCase();
-	if (!bname) bname = b.getAttribute('name');
-	if (!bname) bname = b.getAttribute('id');
+ var bname =  b.getAttributeNS(rptNS, 'label').toLowerCase();
+ if (!bname) bname = b.getAttribute('name');
+ if (!bname) bname = b.getAttribute('id');
 
-	return aname < bname ? -1 : 1;
+ return aname < bname ? -1 : 1;
 }
 
 
 function loadTemplate(id) {
-	var cgi = new CGI();
-	var session = cgi.param('ses');
+ var cgi = new CGI();
+ var session = cgi.param('ses');
 
-	var r = new Request('open-ils.reporter:open-ils.reporter.template.retrieve', session, id);
+ var r = new Request('open-ils.reporter:open-ils.reporter.template.retrieve', session, id);
 
-	r.callback(
-		function(res) {
-			var tmpl = res.getResultObject();
-			var template = JSON2js( tmpl.data() );
+ r.callback(
+  function(res) {
+   var tmpl = res.getResultObject();
+   var template = JSON2js( tmpl.data() );
 
-			resetUI( template.core_class );
+   resetUI( template.core_class );
 
-			$('template-name').value = tmpl.name() + ' (clone)';
-			$('template-description').value = tmpl.description();
+   $('template-name').value = tmpl.name() + ' (clone)';
+   $('template-description').value = tmpl.description();
 
-			rpt_rel_cache = template.rel_cache;
-			renderSources();
-		}
-	);
+   rpt_rel_cache = template.rel_cache;
+   renderSources();
+  }
+ );
 
-	r.send();
+ r.send();
 }
 
 
@@ -67,16 +67,16 @@ function loadIDL() {
         req.onreadystatechange = function() {
                 if( req.readyState == 4 ) {
                         oilsIDL = req.responseXML;
-			populateSourcesMenu(
-				filterByAttributeNS( oilsIDL.getElementsByTagName('class'), rptNS, 'core', 'true' )
-			);
+   populateSourcesMenu(
+    filterByAttributeNS( oilsIDL.getElementsByTagName('class'), rptNS, 'core', 'true' )
+   );
 
-			var cgi = new CGI();
-			var template_id = cgi.param('ct');
-			if (template_id) loadTemplate(template_id);
+   var cgi = new CGI();
+   var template_id = cgi.param('ct');
+   if (template_id) loadTemplate(template_id);
                 }
         }
-	req.send(null);
+ req.send(null);
 
 }
 
@@ -85,240 +85,240 @@ function getIDLField (classNode,field) { return filterByAttribute( classNode.get
 function getIDLLink (classNode,field) { return filterByAttribute( classNode.getElementsByTagName('link'), 'field', field )[0] }
 
 function resetUI (idlclass) {
-	if (getKeys(rpt_rel_cache).length > 0) {
-		if (!confirm( rpt_strings.SOURCE_SETUP_CONFIRM_EXIT)) return false;
-	}
+ if (getKeys(rpt_rel_cache).length > 0) {
+  if (!confirm( rpt_strings.SOURCE_SETUP_CONFIRM_EXIT)) return false;
+ }
 
-	rpt_rel_cache = {};
-	try { renderSources(); } catch (e) {}
+ rpt_rel_cache = {};
+ try { renderSources(); } catch (e) {}
 
-	populateSourcesTree( idlclass );
+ populateSourcesTree( idlclass );
 
-	var tree = $('sources-treetop').parentNode;
-	tree.focus();
-	tree.view.selection.select(0);
-	tree.click();
+ var tree = $('sources-treetop').parentNode;
+ tree.focus();
+ tree.view.selection.select(0);
+ tree.click();
 }
 
 function populateSourcesMenu (classList) {
-	classList.sort( sortLabels );
+ classList.sort( sortLabels );
 
-	var menu = $('source-menu');
+ var menu = $('source-menu');
 
-	menu.appendChild(
-		createMenuItem(
-			{ label : rpt_strings.SOURCE_SETUP_CORE_SOURCES,
-			  disabled : 'true',
-			  style : 'color: black; text-decoration: underline;'
-			}
-		)
-	);
+ menu.appendChild(
+  createMenuItem(
+   { label : rpt_strings.SOURCE_SETUP_CORE_SOURCES,
+     disabled : 'true',
+     style : 'color: black; text-decoration: underline;'
+   }
+  )
+ );
 
 
-	for (var i in classList) {
+ for (var i in classList) {
 
-		var name = classList[i].getAttributeNS(rptNS,'label');
-		var id = classList[i].getAttribute('id');
-		if (!name) name = id;
+  var name = classList[i].getAttributeNS(rptNS,'label');
+  var id = classList[i].getAttribute('id');
+  if (!name) name = id;
 
-		menu.appendChild(
-			createMenuItem(
-				{ container : 'true',
-				  idlclass : id,
-				  label : name,
-				  onmouseup : 'resetUI( "' + id + '");'
-				}
-			)
-		);
+  menu.appendChild(
+   createMenuItem(
+    { container : 'true',
+      idlclass : id,
+      label : name,
+      onmouseup : 'resetUI( "' + id + '");'
+    }
+   )
+  );
 
-	}
+ }
 
-	menu.appendChild( createMenuSeparator() );
+ menu.appendChild( createMenuSeparator() );
 
-	var _m = createMenu(
-		{ label : rpt_strings.SOURCE_SETUP_ALL_AVAIL_SOURCES },
-		createMenuPopup(
-			{},
-			createMenuItem(
-				{ label : rpt_strings.SOURCE_SETUP_ALL_AVAIL_SOURCES,
-				  disabled : 'true',
-				  style : 'color: black; '
-				}
-			),
-			createMenuSeparator()
-		)
-	);
+ var _m = createMenu(
+  { label : rpt_strings.SOURCE_SETUP_ALL_AVAIL_SOURCES },
+  createMenuPopup(
+   {},
+   createMenuItem(
+    { label : rpt_strings.SOURCE_SETUP_ALL_AVAIL_SOURCES,
+      disabled : 'true',
+      style : 'color: black; '
+    }
+   ),
+   createMenuSeparator()
+  )
+ );
 
-	menu.appendChild( _m );
-	menu = _m.firstChild;
+ menu.appendChild( _m );
+ menu = _m.firstChild;
 
-	var all = map(function(x){return x;}, oilsIDL.getElementsByTagNameNS(idlNS,'class'));
-	all.sort( sortLabels );
+ var all = map(function(x){return x;}, oilsIDL.getElementsByTagNameNS(idlNS,'class'));
+ all.sort( sortLabels );
 
-	for (var i = 0; i < all.length; i++) {
+ for (var i = 0; i < all.length; i++) {
 
-		if (all[i].getAttributeNS(persistNS,'virtual') == 'true') continue;
+  if (all[i].getAttributeNS(persistNS,'virtual') == 'true') continue;
 
-		var name = all[i].getAttributeNS(rptNS,'label');
-		var id = all[i].getAttribute('id');
-		if (!name) name = id;
+  var name = all[i].getAttributeNS(rptNS,'label');
+  var id = all[i].getAttribute('id');
+  if (!name) name = id;
 
-		menu.appendChild(
-			createMenuItem(
-				{ container : 'true',
-				  idlclass : id,
-				  label : name,
-				  onmouseup : 'resetUI( "' + id + '");'
-				}
-			)
-		);
+  menu.appendChild(
+   createMenuItem(
+    { container : 'true',
+      idlclass : id,
+      label : name,
+      onmouseup : 'resetUI( "' + id + '");'
+    }
+   )
+  );
 
-	}
+ }
 
 
 }
 
 function populateSourcesTree (idlclass) {
 
-	var tcNode = $('sources-treetop');
-	while (tcNode.childNodes.length) tcNode.removeChild(tcNode.lastChild);
-
-	var c = getIDLClass( idlclass );
-	var name = c.getAttributeNS(rptNS,'label');
-	if (!name) name = idlclass;
-
-	tcNode.appendChild(
-		createTreeItem(
-			{ container : 'true',
-			  idlclass : idlclass,
-			  fullpath : idlclass
-			},
-			createTreeRow(
-				{ },
-				createTreeCell( { label : '' } ),
-				createTreeCell( { label : name } )
-			),
-			createTreeChildren( { alternatingbackground : true } )
-		)
-	);
+ var tcNode = $('sources-treetop');
+ while (tcNode.childNodes.length) tcNode.removeChild(tcNode.lastChild);
+
+ var c = getIDLClass( idlclass );
+ var name = c.getAttributeNS(rptNS,'label');
+ if (!name) name = idlclass;
+
+ tcNode.appendChild(
+  createTreeItem(
+   { container : 'true',
+     idlclass : idlclass,
+     fullpath : idlclass
+   },
+   createTreeRow(
+    { },
+    createTreeCell( { label : '' } ),
+    createTreeCell( { label : name } )
+   ),
+   createTreeChildren( { alternatingbackground : true } )
+  )
+ );
 }
 
 function populateSourcesSubtree (tcNode, classList) {
-	classList.sort(sortNames);
-	for (var i in classList) {
-		var obj = classList[i];
-
-		var p = getIDLClass( obj.idlclass );
-		var cont = p.getElementsByTagName('link').length ? 'true' : 'false';
-
-		tcNode.appendChild(
-			createTreeItem(
-				{ container : cont,
-				  idlclass : obj.idlclass,
-				  map : obj.map,
-				  key : obj.key,
-				  field : obj.field,
-				  link : obj.link,
-				  join : obj['join'],
-				  reltype : obj.reltype,
-				  fullpath : obj.fullpath
-				},
-				createTreeRow(
-					{ },
-					createTreeCell( { label : obj.nullable } ),
-					createTreeCell( { label : obj.name } )
-				),
-				createTreeChildren( { alternatingbackground : true } )
-			)
-		);
-
-
-	}
+ classList.sort(sortNames);
+ for (var i in classList) {
+  var obj = classList[i];
+
+  var p = getIDLClass( obj.idlclass );
+  var cont = p.getElementsByTagName('link').length ? 'true' : 'false';
+
+  tcNode.appendChild(
+   createTreeItem(
+    { container : cont,
+      idlclass : obj.idlclass,
+      map : obj.map,
+      key : obj.key,
+      field : obj.field,
+      link : obj.link,
+      join : obj['join'],
+      reltype : obj.reltype,
+      fullpath : obj.fullpath
+    },
+    createTreeRow(
+     { },
+     createTreeCell( { label : obj.nullable } ),
+     createTreeCell( { label : obj.name } )
+    ),
+    createTreeChildren( { alternatingbackground : true } )
+   )
+  );
+
+
+ }
 }
 
 function populateDetailTree (tcNode, c, item) {
-	var fullpath = item.getAttribute('fullpath');
-	var reltype = item.getAttribute('reltype');
-
-	var fields = nodelistToArray(c.getElementsByTagName('field'));
-	fields.sort( sortLabels );
-
-	var id = c.getAttribute('id');
-	var path_label = [];
-
-	var steps = fullpath.split('.');
-	for (var k in steps) {
-
-		if (!steps[k]) continue;
-
-		var atom = steps[k].split('-');
-		var classNode = getIDLClass(atom[0]);
-
-		var _cname = classNode.getAttributeNS(rptNS, 'label');
-		if (!_cname) _cname = classNode.getAttribute('id');
-
-		var _label = _cname; 
-
-		if (atom.length > 1 && k == steps.length - 1) {
-			var field_name = atom[1];
-			var join_type = field_name;
-
-			field_name = field_name.split(/>/)[0];
-			join_type = join_type.split(/>/)[1];
-
-			var _f = getIDLField(classNode, field_name);
-			var _fname = _f.getAttributeNS(rptNS, 'label');
-			if (!_fname) _fname = _f.getAttribute('name');
-			if (_fname) _label += ' :: ' + _fname; 
-			if (join_type) _label += ' (' + join_type + ')'; 
-
-		} else if (atom[1]) {
-			var field_name = atom[1];
-			var join_type = field_name;
-
-			switch (join_type) {
-				case 'right':
-					_label += ' (' + rpt_strings.LINK_NULLABLE_RIGHT + ')'; 
-					break;
-				case 'left':
-					_label += ' (' + rpt_strings.LINK_NULLABLE_LEFT + ')'; 
-					break;
-				case 'inner':
-					_label += ' (' + rpt_strings.LINK_NULLABLE_NONE + ')'; 
-					break;
-			}
-		}
-
-		path_label.push(_label); 
-	}
-
-	$('path-label').value = path_label.join(' -> ');
-	$('path-label').setAttribute('reltype',reltype);
-
-	for (var i in fields) {
-
-		var type = fields[i].getAttributeNS(rptNS, 'datatype');
-		//if (!type) type = 'text';
-
-		var label = fields[i].getAttributeNS(rptNS, 'label');
-		var name = fields[i].getAttribute('name');
-		if (!label) label = name;
-
-		tcNode.appendChild(
-			createTreeItem(
-				{ idlclass : id,
-				  idlfield : name,
-				  datatype : type,
-				  fullpath : fullpath
-				},
-				createTreeRow(
-					{ },
-					createTreeCell( { label : label } ),
-					createTreeCell( { label : type } )
-				)
-			)
-		);
-	}
+ var fullpath = item.getAttribute('fullpath');
+ var reltype = item.getAttribute('reltype');
+
+ var fields = nodelistToArray(c.getElementsByTagName('field'));
+ fields.sort( sortLabels );
+
+ var id = c.getAttribute('id');
+ var path_label = [];
+
+ var steps = fullpath.split('.');
+ for (var k in steps) {
+
+  if (!steps[k]) continue;
+
+  var atom = steps[k].split('-');
+  var classNode = getIDLClass(atom[0]);
+
+  var _cname = classNode.getAttributeNS(rptNS, 'label');
+  if (!_cname) _cname = classNode.getAttribute('id');
+
+  var _label = _cname; 
+
+  if (atom.length > 1 && k == steps.length - 1) {
+   var field_name = atom[1];
+   var join_type = field_name;
+
+   field_name = field_name.split(/>/)[0];
+   join_type = join_type.split(/>/)[1];
+
+   var _f = getIDLField(classNode, field_name);
+   var _fname = _f.getAttributeNS(rptNS, 'label');
+   if (!_fname) _fname = _f.getAttribute('name');
+   if (_fname) _label += ' :: ' + _fname; 
+   if (join_type) _label += ' (' + join_type + ')'; 
+
+  } else if (atom[1]) {
+   var field_name = atom[1];
+   var join_type = field_name;
+
+   switch (join_type) {
+    case 'right':
+     _label += ' (' + rpt_strings.LINK_NULLABLE_RIGHT + ')'; 
+     break;
+    case 'left':
+     _label += ' (' + rpt_strings.LINK_NULLABLE_LEFT + ')'; 
+     break;
+    case 'inner':
+     _label += ' (' + rpt_strings.LINK_NULLABLE_NONE + ')'; 
+     break;
+   }
+  }
+
+  path_label.push(_label); 
+ }
+
+ $('path-label').value = path_label.join(' -> ');
+ $('path-label').setAttribute('reltype',reltype);
+
+ for (var i in fields) {
+
+  var type = fields[i].getAttributeNS(rptNS, 'datatype');
+  //if (!type) type = 'text';
+
+  var label = fields[i].getAttributeNS(rptNS, 'label');
+  var name = fields[i].getAttribute('name');
+  if (!label) label = name;
+
+  tcNode.appendChild(
+   createTreeItem(
+    { idlclass : id,
+      idlfield : name,
+      datatype : type,
+      fullpath : fullpath
+    },
+    createTreeRow(
+     { },
+     createTreeCell( { label : label } ),
+     createTreeCell( { label : type } )
+    )
+   )
+  );
+ }
 }
 
 
diff --git a/Open-ILS/web/reports/xul/template-config.js b/Open-ILS/web/reports/xul/template-config.js
index 387c7c8646..42f9369016 100644
--- a/Open-ILS/web/reports/xul/template-config.js
+++ b/Open-ILS/web/reports/xul/template-config.js
@@ -3,961 +3,961 @@ dojo.requireLocalization("openils.reports", "reports");
 var rpt_strings = dojo.i18n.getLocalization("openils.reports", "reports");
 
 function removeReportAtom (args) {
-	if (!args) args = {};
-
-	var active_tab = filterByAttribute(
-		$('used-source-fields-tabbox').getElementsByTagName('tab'),
-		'selected',
-		'true'
-	)[0];
-	var tabname = active_tab.getAttribute('id');
-
-	var tabpanel = $( tabname + 'panel' );
-	var tree = tabpanel.getElementsByTagName('tree')[0];
-	var fields = getSelectedItems(tree);
-
-
-	for (var i in fields) {
-		var field = fields[i];
-		var colname = field.firstChild.firstChild.nextSibling.getAttribute('label');
-		var relation_alias = field.getAttribute('relation');
-
-		delete rpt_rel_cache[relation_alias].fields[tabname][colname];
-		if (tabname == 'dis_tab') {
-			var _o_tmp = [];
-			for each (var _o_col in rpt_rel_cache.order_by) {
-				if (_o_col.relation == relation_alias && _o_col.field == colname) continue;
-				_o_tmp.push( _o_col );
-			}
-			rpt_rel_cache.order_by = _o_tmp
-		}
-
-		with (rpt_rel_cache[relation_alias].fields) {
-			if ( getKeys(dis_tab).length == 0 && getKeys(filter_tab).length == 0 && getKeys(aggfilter_tab).length == 0 )
-				delete rpt_rel_cache[relation_alias];
-		}
-	}
-
-	renderSources();
-
-	return true;
+ if (!args) args = {};
+
+ var active_tab = filterByAttribute(
+  $('used-source-fields-tabbox').getElementsByTagName('tab'),
+  'selected',
+  'true'
+ )[0];
+ var tabname = active_tab.getAttribute('id');
+
+ var tabpanel = $( tabname + 'panel' );
+ var tree = tabpanel.getElementsByTagName('tree')[0];
+ var fields = getSelectedItems(tree);
+
+
+ for (var i in fields) {
+  var field = fields[i];
+  var colname = field.firstChild.firstChild.nextSibling.getAttribute('label');
+  var relation_alias = field.getAttribute('relation');
+
+  delete rpt_rel_cache[relation_alias].fields[tabname][colname];
+  if (tabname == 'dis_tab') {
+   var _o_tmp = [];
+   for each (var _o_col in rpt_rel_cache.order_by) {
+    if (_o_col.relation == relation_alias && _o_col.field == colname) continue;
+    _o_tmp.push( _o_col );
+   }
+   rpt_rel_cache.order_by = _o_tmp
+  }
+
+  with (rpt_rel_cache[relation_alias].fields) {
+   if ( getKeys(dis_tab).length == 0 && getKeys(filter_tab).length == 0 && getKeys(aggfilter_tab).length == 0 )
+    delete rpt_rel_cache[relation_alias];
+  }
+ }
+
+ renderSources();
+
+ return true;
 }
 
 function getSourceDefinition(class) {
-	var class_obj = getIDLClass(class);
-	return class_obj.getAttributeNS(persistNS,'tablename') || '(' + class_obj.getElementsByTagNameNS(persistNS,'source_definition')[0].nodeValue + ')';
+ var class_obj = getIDLClass(class);
+ return class_obj.getAttributeNS(persistNS,'tablename') || '(' + class_obj.getElementsByTagNameNS(persistNS,'source_definition')[0].nodeValue + ')';
 }
 
 function addReportAtoms () {
-	var nope = $( 'source-add' ).getAttribute('disabled');
-	if (nope == 'true') return false;
-
-	var class_tree = $('class-view');
-	var transform_tree = $('trans-view');
-
-	var active_tab = filterByAttribute(
-		$('used-source-fields-tabbox').getElementsByTagName('tab'),
-		'selected',
-		'true'
-	)[0];
-
-	var tabname = active_tab.getAttribute('id')
-
-	var items = getSelectedItems(class_tree);
-	var transform = getSelectedItems(transform_tree)[0];
-
-	var reltype = $('path-label').getAttribute('reltype');
-	var class_label = $('path-label').value;
-	var relation_alias = hex_md5(class_label);
-
-	for (var i in items) {
-		var item = items[i];
-
-		var class_path = item.getAttribute('fullpath');
-		var field_class = item.getAttribute('idlclass');
-		var datatype = item.getAttribute('datatype');
-		var colname = item.getAttribute('idlfield');
-		var jointype = item.getAttribute('join');
-		var field_label = item.firstChild.firstChild.getAttribute('label');
-
-		var table_name = getSourceDefinition(field_class);
-
-		if ( !rpt_rel_cache[relation_alias] ) {
-			rpt_rel_cache[relation_alias] =
-				{ label     : class_label,
-				  alias     : relation_alias,
-				  path      : class_path,
-				  join      : jointype,
-				  reltype   : reltype,
-				  idlclass  : field_class,
-				  table     : table_name,
-				  fields    : { dis_tab : {}, filter_tab : {}, aggfilter_tab : {} }
-				};
-		}
-
-		if ( !rpt_rel_cache[relation_alias].fields[tabname][colname] ) {
-			rpt_rel_cache[relation_alias].fields[tabname][colname] =
-				{ colname   : colname,
-				  transform : (transform && transform.getAttribute('name')) || rpt_strings.TEMPLATE_CONF_BARE,
-				  aggregate : transform && transform.getAttribute('aggregate'),
-				  params    : transform && transform.getAttribute('params'),
-				  transform_label: (transform && transform.getAttribute('alias')) || rpt_strings.TEMPLATE_CONF_RAW_DATA,
-				  alias     : field_label,
-				  join      : jointype,
-				  datatype  : datatype,
-				  op        : '=',
-				  op_label  : rpt_strings.TEMPLATE_CONF_EQUALS,
-				  op_value  : {}
-				};
-
-			if (!rpt_rel_cache.order_by)
-				rpt_rel_cache.order_by = [];
-
-			if (tabname == 'dis_tab')
-				rpt_rel_cache.order_by.push( { relation : relation_alias, field : colname } );
-
-		} else if (confirm(dojo.string.substitute( rpt_strings.TEMPLATE_CONF_CONFIRM_RESET, [field_label, class_label] )) ) {
-			rpt_rel_cache[relation_alias].fields[tabname][colname] =
-				{ colname   : colname,
-				  transform : (transform && transform.getAttribute('name')) || rpt_strings.TEMPLATE_CONF_BARE,
-				  aggregate : transform && transform.getAttribute('aggregate'),
-				  params    : transform && transform.getAttribute('params'),
-				  transform_label: (transform && transform.getAttribute('alias')) || rpt_strings.TEMPLATE_CONF_RAW_DATA,
-				  alias     : field_label,
-				  join      : jointype,
-				  datatype  : datatype,
-				  op        : '=',
-				  op_label  : rpt_strings.TEMPLATE_CONF_EQUALS,
-				  op_value  : {}
-				};
-		}
-	}
-
-	renderSources();
-
-	return true;
+ var nope = $( 'source-add' ).getAttribute('disabled');
+ if (nope == 'true') return false;
+
+ var class_tree = $('class-view');
+ var transform_tree = $('trans-view');
+
+ var active_tab = filterByAttribute(
+  $('used-source-fields-tabbox').getElementsByTagName('tab'),
+  'selected',
+  'true'
+ )[0];
+
+ var tabname = active_tab.getAttribute('id')
+
+ var items = getSelectedItems(class_tree);
+ var transform = getSelectedItems(transform_tree)[0];
+
+ var reltype = $('path-label').getAttribute('reltype');
+ var class_label = $('path-label').value;
+ var relation_alias = hex_md5(class_label);
+
+ for (var i in items) {
+  var item = items[i];
+
+  var class_path = item.getAttribute('fullpath');
+  var field_class = item.getAttribute('idlclass');
+  var datatype = item.getAttribute('datatype');
+  var colname = item.getAttribute('idlfield');
+  var jointype = item.getAttribute('join');
+  var field_label = item.firstChild.firstChild.getAttribute('label');
+
+  var table_name = getSourceDefinition(field_class);
+
+  if ( !rpt_rel_cache[relation_alias] ) {
+   rpt_rel_cache[relation_alias] =
+    { label     : class_label,
+      alias     : relation_alias,
+      path      : class_path,
+      join      : jointype,
+      reltype   : reltype,
+      idlclass  : field_class,
+      table     : table_name,
+      fields    : { dis_tab : {}, filter_tab : {}, aggfilter_tab : {} }
+    };
+  }
+
+  if ( !rpt_rel_cache[relation_alias].fields[tabname][colname] ) {
+   rpt_rel_cache[relation_alias].fields[tabname][colname] =
+    { colname   : colname,
+      transform : (transform && transform.getAttribute('name')) || rpt_strings.TEMPLATE_CONF_BARE,
+      aggregate : transform && transform.getAttribute('aggregate'),
+      params    : transform && transform.getAttribute('params'),
+      transform_label: (transform && transform.getAttribute('alias')) || rpt_strings.TEMPLATE_CONF_RAW_DATA,
+      alias     : field_label,
+      join      : jointype,
+      datatype  : datatype,
+      op        : '=',
+      op_label  : rpt_strings.TEMPLATE_CONF_EQUALS,
+      op_value  : {}
+    };
+
+   if (!rpt_rel_cache.order_by)
+    rpt_rel_cache.order_by = [];
+
+   if (tabname == 'dis_tab')
+    rpt_rel_cache.order_by.push( { relation : relation_alias, field : colname } );
+
+  } else if (confirm(dojo.string.substitute( rpt_strings.TEMPLATE_CONF_CONFIRM_RESET, [field_label, class_label] )) ) {
+   rpt_rel_cache[relation_alias].fields[tabname][colname] =
+    { colname   : colname,
+      transform : (transform && transform.getAttribute('name')) || rpt_strings.TEMPLATE_CONF_BARE,
+      aggregate : transform && transform.getAttribute('aggregate'),
+      params    : transform && transform.getAttribute('params'),
+      transform_label: (transform && transform.getAttribute('alias')) || rpt_strings.TEMPLATE_CONF_RAW_DATA,
+      alias     : field_label,
+      join      : jointype,
+      datatype  : datatype,
+      op        : '=',
+      op_label  : rpt_strings.TEMPLATE_CONF_EQUALS,
+      op_value  : {}
+    };
+  }
+ }
+
+ renderSources();
+
+ return true;
 }
 
 function changeDisplayOrder (dir) {
-	var active_tab = filterByAttribute(
-		$('used-source-fields-tabbox').getElementsByTagName('tab'),
-		'selected',
-		'true'
-	)[0];
-
-	var tabname = active_tab.getAttribute('id');
-
-	var tabpanel = $( tabname + 'panel' );
-	var tree = tabpanel.getElementsByTagName('tree')[0];
-	var item = getSelectedItems(tree)[0];
-
-	var item_pos = tree.view.selection.currentIndex;
-
-	if (dir == 'u') {
-		if ( item.previousSibling ) {
-			item.parentNode.insertBefore( item, item.previousSibling );
-			item_pos--;
-		}
-	} else if (dir == 'd') {
-		if ( item.nextSibling ) {
-			if (item.nextSibling.nextSibling ) item.parentNode.insertBefore( item, item.nextSibling.nextSibling );
-			else item.parentNode.appendChild( item );
-			item_pos++;
-		}
-	}
-	
-	rpt_rel_cache.order_by = [];
-	var ordered_list = tree.getElementsByTagName('treeitem');
-	for (var i = 0; i < ordered_list.length; i++) {
-		rpt_rel_cache.order_by.push(
-			{ relation : ordered_list[i].getAttribute('relation'),
-			  field    : ordered_list[i].firstChild.firstChild.nextSibling.getAttribute('label')
-			}
-		);
-	}
-
-	tree.view.selection.select( item_pos );
-	return true;
+ var active_tab = filterByAttribute(
+  $('used-source-fields-tabbox').getElementsByTagName('tab'),
+  'selected',
+  'true'
+ )[0];
+
+ var tabname = active_tab.getAttribute('id');
+
+ var tabpanel = $( tabname + 'panel' );
+ var tree = tabpanel.getElementsByTagName('tree')[0];
+ var item = getSelectedItems(tree)[0];
+
+ var item_pos = tree.view.selection.currentIndex;
+
+ if (dir == 'u') {
+  if ( item.previousSibling ) {
+   item.parentNode.insertBefore( item, item.previousSibling );
+   item_pos--;
+  }
+ } else if (dir == 'd') {
+  if ( item.nextSibling ) {
+   if (item.nextSibling.nextSibling ) item.parentNode.insertBefore( item, item.nextSibling.nextSibling );
+   else item.parentNode.appendChild( item );
+   item_pos++;
+  }
+ }
+ 
+ rpt_rel_cache.order_by = [];
+ var ordered_list = tree.getElementsByTagName('treeitem');
+ for (var i = 0; i < ordered_list.length; i++) {
+  rpt_rel_cache.order_by.push(
+   { relation : ordered_list[i].getAttribute('relation'),
+     field    : ordered_list[i].firstChild.firstChild.nextSibling.getAttribute('label')
+   }
+  );
+ }
+
+ tree.view.selection.select( item_pos );
+ return true;
 }
 
 function alterColumnLabel () {
-	var active_tab = filterByAttribute(
-		$('used-source-fields-tabbox').getElementsByTagName('tab'),
-		'selected',
-		'true'
-	)[0];
+ var active_tab = filterByAttribute(
+  $('used-source-fields-tabbox').getElementsByTagName('tab'),
+  'selected',
+  'true'
+ )[0];
 
-	var tabname = active_tab.getAttribute('id');
+ var tabname = active_tab.getAttribute('id');
 
-	var tabpanel = $( tabname + 'panel' );
-	var tree = tabpanel.getElementsByTagName('tree')[0];
-	var item_pos = tree.view.selection.currentIndex;
+ var tabpanel = $( tabname + 'panel' );
+ var tree = tabpanel.getElementsByTagName('tree')[0];
+ var item_pos = tree.view.selection.currentIndex;
 
-	var item = getSelectedItems(tree)[0];
-	var relation_alias = item.getAttribute('relation');
+ var item = getSelectedItems(tree)[0];
+ var relation_alias = item.getAttribute('relation');
 
-	var field = item.firstChild.firstChild;
-	var colname = field.nextSibling.getAttribute('label');
+ var field = item.firstChild.firstChild;
+ var colname = field.nextSibling.getAttribute('label');
 
-	var new_label =	prompt( dojo.string.substitute(rpt_strings.TEMPLATE_CONF_PROMPT_CHANGE, [field.getAttribute("label")]) );
+ var new_label = prompt( dojo.string.substitute(rpt_strings.TEMPLATE_CONF_PROMPT_CHANGE, [field.getAttribute("label")]) );
 
-	if (new_label) {
-		rpt_rel_cache[relation_alias].fields[tabname][colname].alias = new_label;
-		renderSources(true);
-		tree.view.selection.select( item_pos );
-		tree.focus();
-		tree.click();
-	}
+ if (new_label) {
+  rpt_rel_cache[relation_alias].fields[tabname][colname].alias = new_label;
+  renderSources(true);
+  tree.view.selection.select( item_pos );
+  tree.focus();
+  tree.click();
+ }
 
-	return true;
+ return true;
 }
 
 function alterColumnTransform (trans) {
 
-	var transform = OILS_RPT_TRANSFORMS[trans];
+ var transform = OILS_RPT_TRANSFORMS[trans];
 
-	var active_tab = filterByAttribute(
-		$('used-source-fields-tabbox').getElementsByTagName('tab'),
-		'selected',
-		'true'
-	)[0];
+ var active_tab = filterByAttribute(
+  $('used-source-fields-tabbox').getElementsByTagName('tab'),
+  'selected',
+  'true'
+ )[0];
 
-	var tabname = active_tab.getAttribute('id');
+ var tabname = active_tab.getAttribute('id');
 
-	var tabpanel = $( tabname + 'panel' );
-	var tree = tabpanel.getElementsByTagName('tree')[0];
-	var item_pos = tree.view.selection.currentIndex;
-	var item =  getSelectedItems(tree)[0];
-	var relation_alias = item.getAttribute('relation');
+ var tabpanel = $( tabname + 'panel' );
+ var tree = tabpanel.getElementsByTagName('tree')[0];
+ var item_pos = tree.view.selection.currentIndex;
+ var item =  getSelectedItems(tree)[0];
+ var relation_alias = item.getAttribute('relation');
 
-	var field = item.firstChild.firstChild;
-	var colname = field.nextSibling.getAttribute('label');
+ var field = item.firstChild.firstChild;
+ var colname = field.nextSibling.getAttribute('label');
 
-	rpt_rel_cache[relation_alias].fields[tabname][colname].transform = trans;
-	rpt_rel_cache[relation_alias].fields[tabname][colname].aggregate = transform.aggregate;
-	rpt_rel_cache[relation_alias].fields[tabname][colname].params = transform.params;
-	rpt_rel_cache[relation_alias].fields[tabname][colname].transform_label = transform.label;
+ rpt_rel_cache[relation_alias].fields[tabname][colname].transform = trans;
+ rpt_rel_cache[relation_alias].fields[tabname][colname].aggregate = transform.aggregate;
+ rpt_rel_cache[relation_alias].fields[tabname][colname].params = transform.params;
+ rpt_rel_cache[relation_alias].fields[tabname][colname].transform_label = transform.label;
 
-	renderSources(true);
-	tree.view.selection.select( item_pos );
-	tree.focus();
-	tree.click();
+ renderSources(true);
+ tree.view.selection.select( item_pos );
+ tree.focus();
+ tree.click();
 
-	$(tabname + '_trans_menu').hidePopup();
-	return true;
+ $(tabname + '_trans_menu').hidePopup();
+ return true;
 }
 
 function changeOperator (args) {
 
-	var active_tab = filterByAttribute(
-		$('used-source-fields-tabbox').getElementsByTagName('tab'),
-		'selected',
-		'true'
-	)[0];
+ var active_tab = filterByAttribute(
+  $('used-source-fields-tabbox').getElementsByTagName('tab'),
+  'selected',
+  'true'
+ )[0];
 
-	var tabname = active_tab.getAttribute('id');
+ var tabname = active_tab.getAttribute('id');
 
-	var tabpanel = $( tabname + 'panel' );
-	var tree = tabpanel.getElementsByTagName('tree')[0];
-	var item_pos = tree.view.selection.currentIndex;
-	var item = getSelectedItems(tree)[0];
+ var tabpanel = $( tabname + 'panel' );
+ var tree = tabpanel.getElementsByTagName('tree')[0];
+ var item_pos = tree.view.selection.currentIndex;
+ var item = getSelectedItems(tree)[0];
 
-	var relation_alias = item.getAttribute('relation');
+ var relation_alias = item.getAttribute('relation');
 
-	var field = item.firstChild.firstChild;
-	var colname = field.nextSibling.getAttribute('label');
+ var field = item.firstChild.firstChild;
+ var colname = field.nextSibling.getAttribute('label');
 
-	rpt_rel_cache[relation_alias].fields[tabname][colname].op = args.op;
-	rpt_rel_cache[relation_alias].fields[tabname][colname].op_label = args.label;
+ rpt_rel_cache[relation_alias].fields[tabname][colname].op = args.op;
+ rpt_rel_cache[relation_alias].fields[tabname][colname].op_label = args.label;
 
-	renderSources(true);
-	tree.view.selection.select( item_pos );
-	tree.focus();
-	tree.click();
+ renderSources(true);
+ tree.view.selection.select( item_pos );
+ tree.focus();
+ tree.click();
 
-	$(tabname + '_op_menu').hidePopup();
-	return true;
+ $(tabname + '_op_menu').hidePopup();
+ return true;
 }
 
 function removeTemplateFilterValue () {
 
-	var active_tab = filterByAttribute(
-		$('used-source-fields-tabbox').getElementsByTagName('tab'),
-		'selected',
-		'true'
-	)[0];
+ var active_tab = filterByAttribute(
+  $('used-source-fields-tabbox').getElementsByTagName('tab'),
+  'selected',
+  'true'
+ )[0];
 
-	var tabname = active_tab.getAttribute('id');
+ var tabname = active_tab.getAttribute('id');
 
-	var tabpanel = $( tabname + 'panel' );
-	var tree = tabpanel.getElementsByTagName('tree')[0];
-	var item_pos = tree.view.selection.currentIndex;
-	var items = getSelectedItems(tree);
+ var tabpanel = $( tabname + 'panel' );
+ var tree = tabpanel.getElementsByTagName('tree')[0];
+ var item_pos = tree.view.selection.currentIndex;
+ var items = getSelectedItems(tree);
 
-	for (var i in items) {
-		var item = items[i];
-		var relation_alias = item.getAttribute('relation');
+ for (var i in items) {
+  var item = items[i];
+  var relation_alias = item.getAttribute('relation');
 
-		var field = item.firstChild.firstChild;
-		var colname = field.nextSibling.getAttribute('label');
+  var field = item.firstChild.firstChild;
+  var colname = field.nextSibling.getAttribute('label');
 
-		rpt_rel_cache[relation_alias].fields[tabname][colname].op_value = {};
-	}
+  rpt_rel_cache[relation_alias].fields[tabname][colname].op_value = {};
+ }
 
-	renderSources(true);
-	tree.view.selection.select( item_pos );
-	return true;
+ renderSources(true);
+ tree.view.selection.select( item_pos );
+ return true;
 }
 
 function timestampSetDate (obj, cal, date) {
-	obj.op_value.value = date;
-	obj.op_value.object = cal.date;
-	obj.op_value.label = '"' + date + '"';
+ obj.op_value.value = date;
+ obj.op_value.object = cal.date;
+ obj.op_value.label = '"' + date + '"';
 
-	renderSources(true);
-	return true;
+ renderSources(true);
+ return true;
 }
 
 var __handler_cache;
 
 function changeTemplateFilterValue () {
 
-	var active_tab = filterByAttribute(
-		$('used-source-fields-tabbox').getElementsByTagName('tab'),
-		'selected',
-		'true'
-	)[0];
-
-	var tabname = active_tab.getAttribute('id');
-
-	var tabpanel = $( tabname + 'panel' );
-	var tree = tabpanel.getElementsByTagName('tree')[0];
-	var items = getSelectedItems(tree);
-
-	var targetCmd = $( tabname + '_value_action' );
+ var active_tab = filterByAttribute(
+  $('used-source-fields-tabbox').getElementsByTagName('tab'),
+  'selected',
+  'true'
+ )[0];
+
+ var tabname = active_tab.getAttribute('id');
+
+ var tabpanel = $( tabname + 'panel' );
+ var tree = tabpanel.getElementsByTagName('tree')[0];
+ var items = getSelectedItems(tree);
+
+ var targetCmd = $( tabname + '_value_action' );
 
-	targetCmd.menu = null;
-	targetCmd.command = null;
-	targetCmd.oncommand = null;
-	targetCmd.removeEventListener( 'command', __handler_cache, true );
-
-	for (var i in items) {
-		var item = items[i];
-		var relation_alias = item.getAttribute('relation');
-
-		var field = item.firstChild.firstChild;
-		var colname = field.nextSibling.getAttribute('label');
+ targetCmd.menu = null;
+ targetCmd.command = null;
+ targetCmd.oncommand = null;
+ targetCmd.removeEventListener( 'command', __handler_cache, true );
+
+ for (var i in items) {
+  var item = items[i];
+  var relation_alias = item.getAttribute('relation');
+
+  var field = item.firstChild.firstChild;
+  var colname = field.nextSibling.getAttribute('label');
 
-		var obj = rpt_rel_cache[relation_alias].fields[tabname][colname]
-		var operation = OILS_RPT_FILTERS[obj.op];
-
-		switch (obj.datatype) {
-			case 'timestamp':
-				var cal_popup = $('calendar-widget');
-
-				while (cal_popup.firstChild) cal_popup.removeChild(cal_popup.lastChild);
-				var calendar = new Calendar(
-					0,
-					obj.op_value.object,
-					function (cal,date) { return timestampSetDate(obj,cal,date) },
-					function (cal) { cal_popup.hidePopup(); cal.destroy(); return true; }
-				);
-
-				var format = OILS_RPT_TRANSFORMS[obj.transform].cal_format || '%Y-%m-%d';
-
-				calendar.setDateFormat(format);
-				calendar.create(cal_popup);
-
-				targetCmd.menu = 'calendar-widget';
-
-				break;
-
-			case 'bool':
-
-				function __bool_value_event_handler () {
-					var state, answer;
-
-					try {
-						// get a reference to the prompt service component.
-						var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
-						                    .getService(Components.interfaces.nsIPromptService);
-
-						// set the buttons that will appear on the dialog. It should be
-						// a set of constants multiplied by button position constants. In this case,
-						// three buttons appear, Save, Cancel and a custom button.
-						var flags=promptService.BUTTON_TITLE_IS_STRING * promptService.BUTTON_POS_0 +
-							promptService.BUTTON_TITLE_IS_STRING * promptService.BUTTON_POS_1 +
-						        promptService.BUTTON_TITLE_CANCEL * promptService.BUTTON_POS_2;
-
-						// display the dialog box. The flags set above are passed
-						// as the fourth argument. The next three arguments are custom labels used for
-						// the buttons, which are used if BUTTON_TITLE_IS_STRING is assigned to a
-						// particular button. The last two arguments are for an optional check box.
-						answer = promptService.select(
-							window,
-							rpt_strings.TEMPLATE_CONF_BOOLEAN_VALUE,
-							rpt_strings.TEMPLATE_CONF_SELECT_CANCEL,
-							2, [rpt_strings.TEMPLATE_CONF_TRUE, rpt_strings.TEMPLATE_CONF_FALSE], state
-						);
-					} catch (e) {
-						answer = true;
-						state = confirm(rpt_strings.TEMPLATE_CONF_CONFIRM_STATE);
-						state ? state = 0 : state = 1;
-					}
-
-					if (answer) {
-						if (state) {
-							obj.op_value.value = 'f';
-							obj.op_value.label = rpt_strings.TEMPLATE_CONF_FALSE;
-						} else {
-							obj.op_value.value = 't';
-							obj.op_value.label = rpt_strings.TEMPLATE_CONF_TRUE;
-						}
-					}
-
-					targetCmd.removeEventListener( 'command', __bool_value_event_handler, true );
-					renderSources(true);
-					tree.view.selection.select( item_pos );
-					return true;
-				}
-
-				__handler_cache = __bool_value_event_handler;
-				targetCmd.addEventListener( 'command', __bool_value_event_handler, true );
-
-				break;
-
-			default:
-
-
-				var promptstring = rpt_strings.TEMPLATE_CONF_NO_MATCH;
-
-				switch (obj.op) {
-					case 'not between':
-						promptstring = rpt_strings.TEMPLATE_CONF_NOT_BETWEEN;
-						break;
-
-					case 'between':
-						promptstring = rpt_strings.TEMPLATE_CONF_BETWEEN;
-						break;
-
-					case 'not in':
-						promptstring = rpt_strings.TEMPLATE_CONF_NOT_IN;
-						break;
-
-					case 'in':
-						promptstring = rpt_strings.TEMPLATE_CONF_IN;
-						break;
-
-					default:
-						promptstring = 	dojo.string.substitute( rpt_strings.TEMPLATE_CONF_DEFAULT, [obj.op_label]);
-						break;
-				}
-
-				function __default_value_event_handler () {
-					var _v;
-					if (_v  = prompt( promptstring, obj.op_value.value || '' )) {
-						switch (obj.op) {
-							case 'between':
-							case 'not between':
-							case 'not in':
-							case 'in':
-								obj.op_value.value = _v.split(/\s*,\s*/);
-								break;
-
-							default:
-								obj.op_value.value = _v;
-								break;
-						}
-
-						obj.op_value.label = '"' + obj.op_value.value + '"';
-					}
-
-					targetCmd.removeEventListener( 'command', __default_value_event_handler, true );
-					renderSources(true);
-					tree.view.selection.select( item_pos );
-					return true;
-				}
-
-				__handler_cache = __default_value_event_handler;
-				targetCmd.addEventListener( 'command', __default_value_event_handler, true );
-
-				break;
-		}
-	}
-
-	return true;
+  var obj = rpt_rel_cache[relation_alias].fields[tabname][colname]
+  var operation = OILS_RPT_FILTERS[obj.op];
+
+  switch (obj.datatype) {
+   case 'timestamp':
+    var cal_popup = $('calendar-widget');
+
+    while (cal_popup.firstChild) cal_popup.removeChild(cal_popup.lastChild);
+    var calendar = new Calendar(
+     0,
+     obj.op_value.object,
+     function (cal,date) { return timestampSetDate(obj,cal,date) },
+     function (cal) { cal_popup.hidePopup(); cal.destroy(); return true; }
+    );
+
+    var format = OILS_RPT_TRANSFORMS[obj.transform].cal_format || '%Y-%m-%d';
+
+    calendar.setDateFormat(format);
+    calendar.create(cal_popup);
+
+    targetCmd.menu = 'calendar-widget';
+
+    break;
+
+   case 'bool':
+
+    function __bool_value_event_handler () {
+     var state, answer;
+
+     try {
+      // get a reference to the prompt service component.
+      var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
+                          .getService(Components.interfaces.nsIPromptService);
+
+      // set the buttons that will appear on the dialog. It should be
+      // a set of constants multiplied by button position constants. In this case,
+      // three buttons appear, Save, Cancel and a custom button.
+      var flags=promptService.BUTTON_TITLE_IS_STRING * promptService.BUTTON_POS_0 +
+       promptService.BUTTON_TITLE_IS_STRING * promptService.BUTTON_POS_1 +
+              promptService.BUTTON_TITLE_CANCEL * promptService.BUTTON_POS_2;
+
+      // display the dialog box. The flags set above are passed
+      // as the fourth argument. The next three arguments are custom labels used for
+      // the buttons, which are used if BUTTON_TITLE_IS_STRING is assigned to a
+      // particular button. The last two arguments are for an optional check box.
+      answer = promptService.select(
+       window,
+       rpt_strings.TEMPLATE_CONF_BOOLEAN_VALUE,
+       rpt_strings.TEMPLATE_CONF_SELECT_CANCEL,
+       2, [rpt_strings.TEMPLATE_CONF_TRUE, rpt_strings.TEMPLATE_CONF_FALSE], state
+      );
+     } catch (e) {
+      answer = true;
+      state = confirm(rpt_strings.TEMPLATE_CONF_CONFIRM_STATE);
+      state ? state = 0 : state = 1;
+     }
+
+     if (answer) {
+      if (state) {
+       obj.op_value.value = 'f';
+       obj.op_value.label = rpt_strings.TEMPLATE_CONF_FALSE;
+      } else {
+       obj.op_value.value = 't';
+       obj.op_value.label = rpt_strings.TEMPLATE_CONF_TRUE;
+      }
+     }
+
+     targetCmd.removeEventListener( 'command', __bool_value_event_handler, true );
+     renderSources(true);
+     tree.view.selection.select( item_pos );
+     return true;
+    }
+
+    __handler_cache = __bool_value_event_handler;
+    targetCmd.addEventListener( 'command', __bool_value_event_handler, true );
+
+    break;
+
+   default:
+
+
+    var promptstring = rpt_strings.TEMPLATE_CONF_NO_MATCH;
+
+    switch (obj.op) {
+     case 'not between':
+      promptstring = rpt_strings.TEMPLATE_CONF_NOT_BETWEEN;
+      break;
+
+     case 'between':
+      promptstring = rpt_strings.TEMPLATE_CONF_BETWEEN;
+      break;
+
+     case 'not in':
+      promptstring = rpt_strings.TEMPLATE_CONF_NOT_IN;
+      break;
+
+     case 'in':
+      promptstring = rpt_strings.TEMPLATE_CONF_IN;
+      break;
+
+     default:
+      promptstring =  dojo.string.substitute( rpt_strings.TEMPLATE_CONF_DEFAULT, [obj.op_label]);
+      break;
+    }
+
+    function __default_value_event_handler () {
+     var _v;
+     if (_v  = prompt( promptstring, obj.op_value.value || '' )) {
+      switch (obj.op) {
+       case 'between':
+       case 'not between':
+       case 'not in':
+       case 'in':
+        obj.op_value.value = _v.split(/\s*,\s*/);
+        break;
+
+       default:
+        obj.op_value.value = _v;
+        break;
+      }
+
+      obj.op_value.label = '"' + obj.op_value.value + '"';
+     }
+
+     targetCmd.removeEventListener( 'command', __default_value_event_handler, true );
+     renderSources(true);
+     tree.view.selection.select( item_pos );
+     return true;
+    }
+
+    __handler_cache = __default_value_event_handler;
+    targetCmd.addEventListener( 'command', __default_value_event_handler, true );
+
+    break;
+  }
+ }
+
+ return true;
 }
 
 function populateOperatorContext () {
 
-	var active_tab = filterByAttribute(
-		$('used-source-fields-tabbox').getElementsByTagName('tab'),
-		'selected',
-		'true'
-	)[0];
-
-	var tabname = active_tab.getAttribute('id');
-
-	var tabpanel = $( tabname + 'panel' );
-	var tree = tabpanel.getElementsByTagName('tree')[0];
-	var items = getSelectedItems(tree);
-
-	var dtypes = [];
-	for (var i in items) {
-		var item = items[i];
-		dtypes.push( item.getAttribute('datatype') );
-	}
-
-	var menu = $(tabname + '_op_menu');
-	while (menu.firstChild) menu.removeChild(menu.lastChild);
-
-	for (var i in OILS_RPT_FILTERS) {
-		var o = OILS_RPT_FILTERS[i];
-		menu.appendChild(
-			createMenuItem(
-				{ label : o.label,
-				  onmouseup : "changeOperator({op:'"+i+"',label:'"+o.label+"'})"
-				}
-			)
-		);
-		if (o.labels) {
-			var keys = getKeys(o.labels);
-			for ( var k in keys ) {
-				var key = keys[k];
-				if ( grep(function(x){return key==x},dtypes).length ) {
-					menu.appendChild(
-						createMenuItem(
-							{ label : o.labels[key],
-							  onmouseup : "changeOperator({op:'"+i+"',label:'"+o.labels[key]+"'});"
-							}
-						)
-					);
-				}
-			}
-		}
-	}
+ var active_tab = filterByAttribute(
+  $('used-source-fields-tabbox').getElementsByTagName('tab'),
+  'selected',
+  'true'
+ )[0];
+
+ var tabname = active_tab.getAttribute('id');
+
+ var tabpanel = $( tabname + 'panel' );
+ var tree = tabpanel.getElementsByTagName('tree')[0];
+ var items = getSelectedItems(tree);
+
+ var dtypes = [];
+ for (var i in items) {
+  var item = items[i];
+  dtypes.push( item.getAttribute('datatype') );
+ }
+
+ var menu = $(tabname + '_op_menu');
+ while (menu.firstChild) menu.removeChild(menu.lastChild);
+
+ for (var i in OILS_RPT_FILTERS) {
+  var o = OILS_RPT_FILTERS[i];
+  menu.appendChild(
+   createMenuItem(
+    { label : o.label,
+      onmouseup : "changeOperator({op:'"+i+"',label:'"+o.label+"'})"
+    }
+   )
+  );
+  if (o.labels) {
+   var keys = getKeys(o.labels);
+   for ( var k in keys ) {
+    var key = keys[k];
+    if ( grep(function(x){return key==x},dtypes).length ) {
+     menu.appendChild(
+      createMenuItem(
+       { label : o.labels[key],
+         onmouseup : "changeOperator({op:'"+i+"',label:'"+o.labels[key]+"'});"
+       }
+      )
+     );
+    }
+   }
+  }
+ }
 }
 
 function populateTransformContext () {
 
-	var active_tab = filterByAttribute(
-		$('used-source-fields-tabbox').getElementsByTagName('tab'),
-		'selected',
-		'true'
-	)[0];
-
-	var tabname = active_tab.getAttribute('id');
-
-	var tabpanel = $( tabname + 'panel' );
-	var tree = tabpanel.getElementsByTagName('tree')[0];
-	var items = getSelectedItems(tree);
-
-	var transforms = {};
-	for (var i in items) {
-		var item = items[i];
-		var dtype = item.getAttribute('datatype');
-		var item_transforms = getTransforms({ datatype : dtype });
-
-		for (var j in item_transforms) {
-			transforms[item_transforms[j]] = OILS_RPT_TRANSFORMS[item_transforms[j]];
-			transforms[item_transforms[j]].name = item_transforms[j];
-		}
-	}
-
-	var transformList = [];
-	for (var i in transforms) {
-		transformList.push( transforms[i] );
-	}
-
-	transformList.sort( sortHashLabels );
-
-	var menu = $(tabname + '_trans_menu');
-	while (menu.firstChild) menu.removeChild(menu.lastChild);
-
-	for (var i in transformList) {
-		var t = transformList[i];
-
-		if (tabname.match(/filter/)) {
-			if (tabname.match(/^agg/)) {
-				if (!t.aggregate) continue;
-			} else {
-				if (t.aggregate) continue;
-			}
-		}
-
-		menu.appendChild(
-			createMenuItem(
-				{ aggregate : t.aggregate,
-				  name : t.name,
-				  alias : t.label,
-				  label : t.label,
-				  params : t.params,
-				  onmouseup : "alterColumnTransform('"+t.name+"')"
-				}
-			)
-		);
-	}
-
-	menu.parentNode.setAttribute('disabled','false');
-	if (menu.childNodes.length == 0) {
-		menu.parentNode.setAttribute('disabled','true');
-	}
+ var active_tab = filterByAttribute(
+  $('used-source-fields-tabbox').getElementsByTagName('tab'),
+  'selected',
+  'true'
+ )[0];
+
+ var tabname = active_tab.getAttribute('id');
+
+ var tabpanel = $( tabname + 'panel' );
+ var tree = tabpanel.getElementsByTagName('tree')[0];
+ var items = getSelectedItems(tree);
+
+ var transforms = {};
+ for (var i in items) {
+  var item = items[i];
+  var dtype = item.getAttribute('datatype');
+  var item_transforms = getTransforms({ datatype : dtype });
+
+  for (var j in item_transforms) {
+   transforms[item_transforms[j]] = OILS_RPT_TRANSFORMS[item_transforms[j]];
+   transforms[item_transforms[j]].name = item_transforms[j];
+  }
+ }
+
+ var transformList = [];
+ for (var i in transforms) {
+  transformList.push( transforms[i] );
+ }
+
+ transformList.sort( sortHashLabels );
+
+ var menu = $(tabname + '_trans_menu');
+ while (menu.firstChild) menu.removeChild(menu.lastChild);
+
+ for (var i in transformList) {
+  var t = transformList[i];
+
+  if (tabname.match(/filter/)) {
+   if (tabname.match(/^agg/)) {
+    if (!t.aggregate) continue;
+   } else {
+    if (t.aggregate) continue;
+   }
+  }
+
+  menu.appendChild(
+   createMenuItem(
+    { aggregate : t.aggregate,
+      name : t.name,
+      alias : t.label,
+      label : t.label,
+      params : t.params,
+      onmouseup : "alterColumnTransform('"+t.name+"')"
+    }
+   )
+  );
+ }
+
+ menu.parentNode.setAttribute('disabled','false');
+ if (menu.childNodes.length == 0) {
+  menu.parentNode.setAttribute('disabled','true');
+ }
 }
 
 
 function renderSources (selected) {
 
-	var tree = $('used-sources');
-	var sources = $('used-sources-treetop');
-	var tabs = $('used-source-fields-tabbox').getElementsByTagName('tab');
-
-	if (!selected) {
-		while (sources.firstChild) sources.removeChild(sources.lastChild);
-	} else {
-		selected = getSelectedItems(tree);
-		if (!selected.length) {
-			selected = undefined;
-			while (sources.firstChild) sources.removeChild(sources.lastChild);
-		}
-	}
-
-	for (var j = 0; j < tabs.length; j++) {
-		var tab = tabs[j];
-		var tabname = tab.getAttribute('id')
-		var tabpanel = $( tab.getAttribute('id') + 'panel' );
-		var fieldtree = tabpanel.getElementsByTagName('treechildren')[0];
-
-		while (fieldtree.firstChild) fieldtree.removeChild(fieldtree.lastChild);
-	}
-
-	for (var relation_alias in rpt_rel_cache) {
-		if (!rpt_rel_cache[relation_alias].fields) continue;
-
-		if (selected) {
-			if (
-				!grep(
-					function (x) {
-						return x.getAttribute('relation') == relation_alias;
-					},
-					selected
-				).length
-			) continue;
-		} else {
-
-			$('used-sources-treetop').appendChild(
-				createTreeItem(
-					{ relation : rpt_rel_cache[relation_alias].alias,
-					  idlclass : rpt_rel_cache[relation_alias].idlclass,
-					  reltype  : rpt_rel_cache[relation_alias].reltype,
-					  path     : rpt_rel_cache[relation_alias].path
-					},
-					createTreeRow(
-						{},
-						createTreeCell({ label : rpt_rel_cache[relation_alias].label }),
-						createTreeCell({ label : rpt_rel_cache[relation_alias].table }),
-						createTreeCell({ label : rpt_rel_cache[relation_alias].alias }),
-						createTreeCell({ label : rpt_rel_cache[relation_alias].reltype })
-					)
-				)
-			);
-		}
-
-		for each (var tabname in ['filter_tab','aggfilter_tab']) {
-			tabpanel = $( tabname + 'panel' );
-			fieldtree = tabpanel.getElementsByTagName('treechildren')[0];
-
-			for (var colname in rpt_rel_cache[relation_alias].fields[tabname]) {
-				with (rpt_rel_cache[relation_alias].fields[tabname][colname]) {
-					fieldtree.appendChild(
-						createTreeItem(
-							{ relation : relation_alias, datatype : datatype },
-							createTreeRow(
-								{},
-								createTreeCell({ label : alias }),
-								createTreeCell({ label : colname }),
-								createTreeCell({ label : datatype }),
-								createTreeCell({ label : transform_label }),
-								createTreeCell({ label : transform })
-							)
-						)
-					);
-
-					fieldtree.lastChild.firstChild.appendChild(
-						createTreeCell({ op : op, label : op_label })
-					);
-
-					if (op_value.value != undefined) {
-						fieldtree.lastChild.firstChild.appendChild(
-							createTreeCell({ label : op_value.label })
-						);
-					}
-				}
-			}
-		}
-	}
-
-	tabpanel = $( 'dis_tabpanel' );
-	fieldtree = tabpanel.getElementsByTagName('treechildren')[0];
-	for each (var order in rpt_rel_cache.order_by) {
-
-		if (selected) {
-			if (
-				!grep(
-					function (x) {
-						return x.getAttribute('relation') == order.relation;
-					},
-					selected
-				).length
-			) continue;
-		}
-
-		with (rpt_rel_cache[order.relation].fields.dis_tab[order.field]) {
-			fieldtree.appendChild(
-				createTreeItem(
-					{ relation : order.relation, datatype : datatype },
-					createTreeRow(
-						{},
-						createTreeCell({ label : alias }),
-						createTreeCell({ label : colname }),
-						createTreeCell({ label : datatype }),
-						createTreeCell({ label : transform_label }),
-						createTreeCell({ label : transform })
-					)
-				)
-			);
-
-			fieldtree.lastChild.firstChild.appendChild(
-				createTreeCell({ op : op, label : op_label })
-			);
-
-			if (op_value.value != undefined) {
-				fieldtree.lastChild.firstChild.appendChild(
-					createTreeCell({ label : op_value.label })
-				);
-			}
-		}
-	}
+ var tree = $('used-sources');
+ var sources = $('used-sources-treetop');
+ var tabs = $('used-source-fields-tabbox').getElementsByTagName('tab');
+
+ if (!selected) {
+  while (sources.firstChild) sources.removeChild(sources.lastChild);
+ } else {
+  selected = getSelectedItems(tree);
+  if (!selected.length) {
+   selected = undefined;
+   while (sources.firstChild) sources.removeChild(sources.lastChild);
+  }
+ }
+
+ for (var j = 0; j < tabs.length; j++) {
+  var tab = tabs[j];
+  var tabname = tab.getAttribute('id')
+  var tabpanel = $( tab.getAttribute('id') + 'panel' );
+  var fieldtree = tabpanel.getElementsByTagName('treechildren')[0];
+
+  while (fieldtree.firstChild) fieldtree.removeChild(fieldtree.lastChild);
+ }
+
+ for (var relation_alias in rpt_rel_cache) {
+  if (!rpt_rel_cache[relation_alias].fields) continue;
+
+  if (selected) {
+   if (
+    !grep(
+     function (x) {
+      return x.getAttribute('relation') == relation_alias;
+     },
+     selected
+    ).length
+   ) continue;
+  } else {
+
+   $('used-sources-treetop').appendChild(
+    createTreeItem(
+     { relation : rpt_rel_cache[relation_alias].alias,
+       idlclass : rpt_rel_cache[relation_alias].idlclass,
+       reltype  : rpt_rel_cache[relation_alias].reltype,
+       path     : rpt_rel_cache[relation_alias].path
+     },
+     createTreeRow(
+      {},
+      createTreeCell({ label : rpt_rel_cache[relation_alias].label }),
+      createTreeCell({ label : rpt_rel_cache[relation_alias].table }),
+      createTreeCell({ label : rpt_rel_cache[relation_alias].alias }),
+      createTreeCell({ label : rpt_rel_cache[relation_alias].reltype })
+     )
+    )
+   );
+  }
+
+  for each (var tabname in ['filter_tab','aggfilter_tab']) {
+   tabpanel = $( tabname + 'panel' );
+   fieldtree = tabpanel.getElementsByTagName('treechildren')[0];
+
+   for (var colname in rpt_rel_cache[relation_alias].fields[tabname]) {
+    with (rpt_rel_cache[relation_alias].fields[tabname][colname]) {
+     fieldtree.appendChild(
+      createTreeItem(
+       { relation : relation_alias, datatype : datatype },
+       createTreeRow(
+        {},
+        createTreeCell({ label : alias }),
+        createTreeCell({ label : colname }),
+        createTreeCell({ label : datatype }),
+        createTreeCell({ label : transform_label }),
+        createTreeCell({ label : transform })
+       )
+      )
+     );
+
+     fieldtree.lastChild.firstChild.appendChild(
+      createTreeCell({ op : op, label : op_label })
+     );
+
+     if (op_value.value != undefined) {
+      fieldtree.lastChild.firstChild.appendChild(
+       createTreeCell({ label : op_value.label })
+      );
+     }
+    }
+   }
+  }
+ }
+
+ tabpanel = $( 'dis_tabpanel' );
+ fieldtree = tabpanel.getElementsByTagName('treechildren')[0];
+ for each (var order in rpt_rel_cache.order_by) {
+
+  if (selected) {
+   if (
+    !grep(
+     function (x) {
+      return x.getAttribute('relation') == order.relation;
+     },
+     selected
+    ).length
+   ) continue;
+  }
+
+  with (rpt_rel_cache[order.relation].fields.dis_tab[order.field]) {
+   fieldtree.appendChild(
+    createTreeItem(
+     { relation : order.relation, datatype : datatype },
+     createTreeRow(
+      {},
+      createTreeCell({ label : alias }),
+      createTreeCell({ label : colname }),
+      createTreeCell({ label : datatype }),
+      createTreeCell({ label : transform_label }),
+      createTreeCell({ label : transform })
+     )
+    )
+   );
+
+   fieldtree.lastChild.firstChild.appendChild(
+    createTreeCell({ op : op, label : op_label })
+   );
+
+   if (op_value.value != undefined) {
+    fieldtree.lastChild.firstChild.appendChild(
+     createTreeCell({ label : op_value.label })
+    );
+   }
+  }
+ }
 }
 
 var param_count;
 var tab_use = {
-	dis_tab       : 'select',
-	filter_tab    : 'where',
-	aggfilter_tab : 'having',
+ dis_tab       : 'select',
+ filter_tab    : 'where',
+ aggfilter_tab : 'having',
 };
 
 
 function save_template () {
-	param_count = 0;
-
-	var template = {
-		version    : 3,
-		core_class : $('sources-treetop').getElementsByTagName('treeitem')[0].getAttribute('idlclass'),
-		select     : [],
-		from       : {},
-		where      : [],
-		having     : [],
-		order_by   : []
-	};
-
-	for (var relname in rpt_rel_cache) {
-		var relation = rpt_rel_cache[relname];
-		if (!relation.fields) continue;
-
-		// first, add the where and having clauses (easier)
-		for each (var tab_name in [ 'filter_tab', 'aggfilter_tab' ]) {
-			var tab = relation.fields[tab_name];
-			for (var field in tab) {
-				fleshTemplateField( template, relation, tab_name, field );
-			}
-		}
-
-		// now the from clause
-		fleshFromPath( template, relation );
-	}
-
-	// and now for select (based on order_by)
-	for each (var order in rpt_rel_cache.order_by)
-		fleshTemplateField( template, rpt_rel_cache[order.relation], 'dis_tab', order.field );
-
-	template.rel_cache = rpt_rel_cache;
-
-	//prompt( 'template', js2JSON( template ) );
-
-	// and the saving throw ...
-	var cgi = new CGI();
-	var session = cgi.param('ses');
-	fetchUser( session );
-
-	var tmpl = new rt();
-	tmpl.name( $('template-name').value );
-	tmpl.description( $('template-description').value );
-	tmpl.owner(USER.id());
-	tmpl.folder(cgi.param('folder'));
-	tmpl.data(js2JSON(template));
-
-	if(!confirm(dojo.string.substitute( rpt_strings.TEMPLATE_CONF_CONFIRM_SAVE, [tmpl.name(), tmpl.description()] )))
-		return;
-
-	var req = new Request('open-ils.reporter:open-ils.reporter.template.create', session, tmpl);
-	req.request.alertEvent = false;
-	req.callback(
-		function(r) {
-			var res = r.getResultObject();
-			if(checkILSEvent(res)) {
-				alertILSEvent(res);
-			} else {
-				if( res && res != '0' ) {
-					alert(dojo.string.substitute( rpt_strings.TEMPLATE_CONF_SUCCESS_SAVE, [tmpl.name()] ));
-					_l('../oils_rpt.xhtml');
-				}
-			}
-		}
-	);
-
-	req.send();
+ param_count = 0;
+
+ var template = {
+  version    : 3,
+  core_class : $('sources-treetop').getElementsByTagName('treeitem')[0].getAttribute('idlclass'),
+  select     : [],
+  from       : {},
+  where      : [],
+  having     : [],
+  order_by   : []
+ };
+
+ for (var relname in rpt_rel_cache) {
+  var relation = rpt_rel_cache[relname];
+  if (!relation.fields) continue;
+
+  // first, add the where and having clauses (easier)
+  for each (var tab_name in [ 'filter_tab', 'aggfilter_tab' ]) {
+   var tab = relation.fields[tab_name];
+   for (var field in tab) {
+    fleshTemplateField( template, relation, tab_name, field );
+   }
+  }
+
+  // now the from clause
+  fleshFromPath( template, relation );
+ }
+
+ // and now for select (based on order_by)
+ for each (var order in rpt_rel_cache.order_by)
+  fleshTemplateField( template, rpt_rel_cache[order.relation], 'dis_tab', order.field );
+
+ template.rel_cache = rpt_rel_cache;
+
+ //prompt( 'template', js2JSON( template ) );
+
+ // and the saving throw ...
+ var cgi = new CGI();
+ var session = cgi.param('ses');
+ fetchUser( session );
+
+ var tmpl = new rt();
+ tmpl.name( $('template-name').value );
+ tmpl.description( $('template-description').value );
+ tmpl.owner(USER.id());
+ tmpl.folder(cgi.param('folder'));
+ tmpl.data(js2JSON(template));
+
+ if(!confirm(dojo.string.substitute( rpt_strings.TEMPLATE_CONF_CONFIRM_SAVE, [tmpl.name(), tmpl.description()] )))
+  return;
+
+ var req = new Request('open-ils.reporter:open-ils.reporter.template.create', session, tmpl);
+ req.request.alertEvent = false;
+ req.callback(
+  function(r) {
+   var res = r.getResultObject();
+   if(checkILSEvent(res)) {
+    alertILSEvent(res);
+   } else {
+    if( res && res != '0' ) {
+     alert(dojo.string.substitute( rpt_strings.TEMPLATE_CONF_SUCCESS_SAVE, [tmpl.name()] ));
+     _l('../oils_rpt.xhtml');
+    }
+   }
+  }
+ );
+
+ req.send();
 }
 
 function fleshFromPath ( template, rel ) {
-	var table_path = rel.path.split( /\./ );
-	if (table_path.length > 1 || rel.path.indexOf('-') > -1) table_path.push( rel.idlclass );
+ var table_path = rel.path.split( /\./ );
+ if (table_path.length > 1 || rel.path.indexOf('-') > -1) table_path.push( rel.idlclass );
 
-	var prev_type = '';
-	var prev_link = '';
-	var current_path = '';
-	var current_obj = template.from;
-	var link;
-	while (link = table_path.shift()) {
+ var prev_type = '';
+ var prev_link = '';
+ var current_path = '';
+ var current_obj = template.from;
+ var link;
+ while (link = table_path.shift()) {
 
-		if (prev_link != '') {
-			var prev_class = getIDLClass( prev_link.split(/-/)[0] );
-			var prev_field = prev_link.split(/-/)[1];
+  if (prev_link != '') {
+   var prev_class = getIDLClass( prev_link.split(/-/)[0] );
+   var prev_field = prev_link.split(/-/)[1];
 
-			var prev_join = prev_field;
+   var prev_join = prev_field;
 
-			prev_field = prev_field.split(/>/)[0];
-			prev_join = prev_join.split(/>/)[1];
+   prev_field = prev_field.split(/>/)[0];
+   prev_join = prev_join.split(/>/)[1];
 
-			var current_link = getIDLLink( prev_class, prev_field );
-			current_obj.key = current_link.getAttribute('key');
+   var current_link = getIDLLink( prev_class, prev_field );
+   current_obj.key = current_link.getAttribute('key');
 
             //console.log("prev_link in fleshFromPath is: " + prev_link);
             //console.log("prev_join in fleshFromPath is: " + prev_join);
 
             if (prev_join) current_obj.type = prev_join
-			else if ( 
-				(
-					current_link.getAttribute('reltype') != 'has_a' ||
-					prev_type == 'left' ||
-					rel.reltype != 'has_a'
+   else if ( 
+    (
+     current_link.getAttribute('reltype') != 'has_a' ||
+     prev_type == 'left' ||
+     rel.reltype != 'has_a'
 
 // This disallows outer joins when the item is used in a filter
-//				) && (
-//					getKeys(rel.fields.filter_tab).length == 0 &&
-//					getKeys(rel.fields.aggfitler_tab).length == 0
+//    ) && (
+//     getKeys(rel.fields.filter_tab).length == 0 &&
+//     getKeys(rel.fields.aggfitler_tab).length == 0
 
-				)
-			) current_obj.type = 'left';
+    )
+   ) current_obj.type = 'left';
 
-			prev_type = current_obj.type; 
+   prev_type = current_obj.type; 
 
-		}
+  }
 
-		if (current_path) current_path += '-';
-		current_path += link.split(/>/)[0];
+  if (current_path) current_path += '-';
+  current_path += link.split(/>/)[0];
 
-		var leaf = table_path.length == 0 ? true : false;
+  var leaf = table_path.length == 0 ? true : false;
 
-		current_obj.path = current_path;
-		current_obj.table = getSourceDefinition( link.split(/-/)[0] );
+  current_obj.path = current_path;
+  current_obj.table = getSourceDefinition( link.split(/-/)[0] );
 
 
-		if (leaf) {
+  if (leaf) {
 
-    		var join_type = link.split(/-/)[1];
+      var join_type = link.split(/-/)[1];
             if (join_type) {
-	        	join_type = join_type.split(/>/)[1];
-			    if (join_type && join_type != 'undefined') current_obj.type = join_type;
+          join_type = join_type.split(/>/)[1];
+       if (join_type && join_type != 'undefined') current_obj.type = join_type;
             }
 
-			current_obj.label = rel.label;
-			current_obj.alias = rel.alias;
-			current_obj.idlclass = rel.idlclass;
-			current_obj.template_path = rel.path;
-		} else {
-			var current_class = getIDLClass( link.split(/-/)[0] );
-			var join_field = link.split(/-/)[1];
-			var join_type = join_field;
+   current_obj.label = rel.label;
+   current_obj.alias = rel.alias;
+   current_obj.idlclass = rel.idlclass;
+   current_obj.template_path = rel.path;
+  } else {
+   var current_class = getIDLClass( link.split(/-/)[0] );
+   var join_field = link.split(/-/)[1];
+   var join_type = join_field;
 
-			join_field = join_field.split(/>/)[0];
-			join_type = join_type.split(/>/)[1];
+   join_field = join_field.split(/>/)[0];
+   join_type = join_type.split(/>/)[1];
 
             //console.log("join_field in fleshFromPath is: " + join_field);
 
-			var join_link = getIDLLink(current_class, join_field);
+   var join_link = getIDLLink(current_class, join_field);
 
-			if (join_link.getAttribute('reltype') != 'has_a') {
-				var fields_el = current_class.getElementsByTagName('fields')[0];
-				join_field =
-					fields_el.getAttributeNS(persistNS, 'primary') +
-					'-' + join_link.getAttribute('class') +
-					'-' + join_link.getAttribute('key');
-			}
+   if (join_link.getAttribute('reltype') != 'has_a') {
+    var fields_el = current_class.getElementsByTagName('fields')[0];
+    join_field =
+     fields_el.getAttributeNS(persistNS, 'primary') +
+     '-' + join_link.getAttribute('class') +
+     '-' + join_link.getAttribute('key');
+   }
 
-			if (!current_obj.alias) current_obj.alias = hex_md5( current_path ) ;
-			join_field += '-' + current_obj.alias;
+   if (!current_obj.alias) current_obj.alias = hex_md5( current_path ) ;
+   join_field += '-' + current_obj.alias;
 
-			if (!current_obj.join) current_obj.join = {};
-			if (!current_obj.join[join_field]) current_obj.join[join_field] = {};
+   if (!current_obj.join) current_obj.join = {};
+   if (!current_obj.join[join_field]) current_obj.join[join_field] = {};
 
-			if (current_obj.type == 'left') current_obj.join[join_field].type = 'left';
+   if (current_obj.type == 'left') current_obj.join[join_field].type = 'left';
 
-			current_obj = current_obj.join[join_field];
-		}
+   current_obj = current_obj.join[join_field];
+  }
 
-		prev_link = link;
-	}
+  prev_link = link;
+ }
 
 
 }
 
 function fleshTemplateField ( template, rel, tab_name, field ) {
 
-	if (!rel.fields[tab_name] || !rel.fields[tab_name][field]) return;
-
-	var tab = rel.fields[tab_name];
-
-	var table_path = rel.path.split( /\./ );
-	if (table_path.length > 1 || rel.path.indexOf('-') > -1)
-		table_path.push( rel.idlclass );
-
-	table_path.push( field );
-
-	var field_path = table_path.join('-');
-
-	var element = {
-		alias : tab[field].alias,
-		column :
-		  	{ colname : field,
-			  transform : tab[field].transform,
-			  transform_label : tab[field].transform_label
-			},
-		path : field_path,
-		relation : rel.alias
-	};
-
-	if (tab_name.match(/filter/)) {
-		element.condition = {};
-		if (tab[field].op == 'is' || tab[field].op == 'is not' || tab[field].op == 'is blank' || tab[field].op == 'is not blank') {
-			element.condition[tab[field].op] = null;
-		} else {
-			element.condition[tab[field].op] =
-				tab[field].op_value.value ?
-					tab[field].op_value.value :
-					'::P' + param_count++;
-		}
-	}
-
-	template[tab_use[tab_name]].push(element);
+ if (!rel.fields[tab_name] || !rel.fields[tab_name][field]) return;
+
+ var tab = rel.fields[tab_name];
+
+ var table_path = rel.path.split( /\./ );
+ if (table_path.length > 1 || rel.path.indexOf('-') > -1)
+  table_path.push( rel.idlclass );
+
+ table_path.push( field );
+
+ var field_path = table_path.join('-');
+
+ var element = {
+  alias : tab[field].alias,
+  column :
+     { colname : field,
+     transform : tab[field].transform,
+     transform_label : tab[field].transform_label
+   },
+  path : field_path,
+  relation : rel.alias
+ };
+
+ if (tab_name.match(/filter/)) {
+  element.condition = {};
+  if (tab[field].op == 'is' || tab[field].op == 'is not' || tab[field].op == 'is blank' || tab[field].op == 'is not blank') {
+   element.condition[tab[field].op] = null;
+  } else {
+   element.condition[tab[field].op] =
+    tab[field].op_value.value ?
+     tab[field].op_value.value :
+     '::P' + param_count++;
+  }
+ }
+
+ template[tab_use[tab_name]].push(element);
 }
 
diff --git a/Open-ILS/web/reports/xul/template_builder.xul b/Open-ILS/web/reports/xul/template_builder.xul
index 5815c36503..ec06751438 100644
--- a/Open-ILS/web/reports/xul/template_builder.xul
+++ b/Open-ILS/web/reports/xul/template_builder.xul
@@ -5,10 +5,10 @@
 <?xml-stylesheet href='/js/dojo/dojo/resources/dojo.css' type='text/css'?>
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!ENTITY nbsp " ">
-	<!--#include virtual="/opac/locale/${locale}/reports.dtd"-->
+ "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+ <!ENTITY nbsp " ">
+ <!--#include virtual="/opac/locale/${locale}/reports.dtd"-->
 ]>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xhtml="http://www.w3.org/1999/xhtml">
@@ -16,17 +16,17 @@
 <!-- Load dojo -->
 <script type="text/javascript">
 <![CDATA[
-	var djConfig= {
-		isDebug: false,
-		parseOnLoad: true
-	}
+ var djConfig= {
+  isDebug: false,
+  parseOnLoad: true
+ }
 ]]>
 </script>
 <script type="text/javascript" src="/js/dojo/dojo/dojo.js"></script>
 <script type="text/javascript">
 <![CDATA[
-	dojo.require('dojo.parser');
-	dojo.require('dojo.string');
+ dojo.require('dojo.parser');
+ dojo.require('dojo.string');
 ]]>
 </script>
 
@@ -64,284 +64,284 @@
 <script type="application/x-javascript; e4x=1" src="/opac/common/js/jscalendar/calendar-setup.js"/>
 
 <groupbox flex="1">
-	<caption label="&reports.xul.template_builder.db_source_browser.label;"/>
-	<hbox flex="1">
-		<hbox flex="1">
-			<vbox flex="1">
-				<menulist label="&reports.xul.template_builder.sources_menulist.label;" popup="source-menu"/>
-				<tree
-					id="idl-browse-tree"
-					flex="2"
-					onclick="sourceTreeHandler(event)"
-					ondblclick="sourceTreeHandlerDblClick(event)"
-				>
-					<treecols>
-						<treecol label="&reports.xul.template_builder.source_nullable.label;" flex="0"/>
-						<treecol primary="true" label="&reports.xul.template_builder.source_name.label;" flex="1"/>
-					</treecols>
-					<treechildren id="sources-treetop" alternatingbackground="true" />
-				</tree>
+ <caption label="&reports.xul.template_builder.db_source_browser.label;"/>
+ <hbox flex="1">
+  <hbox flex="1">
+   <vbox flex="1">
+    <menulist label="&reports.xul.template_builder.sources_menulist.label;" popup="source-menu"/>
+    <tree
+     id="idl-browse-tree"
+     flex="2"
+     onclick="sourceTreeHandler(event)"
+     ondblclick="sourceTreeHandlerDblClick(event)"
+    >
+     <treecols>
+      <treecol label="&reports.xul.template_builder.source_nullable.label;" flex="0"/>
+      <treecol primary="true" label="&reports.xul.template_builder.source_name.label;" flex="1"/>
+     </treecols>
+     <treechildren id="sources-treetop" alternatingbackground="true" />
+    </tree>
                 <checkbox id="nullable-source-control" label="&reports.xul.template_builder.nullability_select.label;"/>
-			</vbox>
-		</hbox>
+   </vbox>
+  </hbox>
 
-		<splitter id="rtp-browse-splitter" collapse="before" persist="state hidden"><grippy/></splitter>
+  <splitter id="rtp-browse-splitter" collapse="before" persist="state hidden"><grippy/></splitter>
 
-		<hbox flex="2">
-			<vbox flex="1">
-				<hbox>
-					<label control="path-label" value="&reports.xul.template_builder.source_specifier.label;"/>
-					<textbox id="path-label" flex="1"/>
-				</hbox>
-				<hbox flex="1">
-					<hbox flex="3">
-						<vbox flex="1">
-							<tree
-								id="class-view"
-								flex="3"
-								onclick="detailTreeHandler()"
-								ondblclick="addReportAtoms()"
-								enableColumnDrag="true"
-							>
-								<treecols>
-									<treecol label="&reports.xul.template_builder.field_name.label;" flex="1"/>
-									<treecol label="&reports.xul.template_builder.data_type.label;" flex="0"/>
-								</treecols>
-								<treechildren id="class-treetop" alternatingbackground="true" />
-							</tree>
-						</vbox>
-					</hbox>
+  <hbox flex="2">
+   <vbox flex="1">
+    <hbox>
+     <label control="path-label" value="&reports.xul.template_builder.source_specifier.label;"/>
+     <textbox id="path-label" flex="1"/>
+    </hbox>
+    <hbox flex="1">
+     <hbox flex="3">
+      <vbox flex="1">
+       <tree
+        id="class-view"
+        flex="3"
+        onclick="detailTreeHandler()"
+        ondblclick="addReportAtoms()"
+        enableColumnDrag="true"
+       >
+        <treecols>
+         <treecol label="&reports.xul.template_builder.field_name.label;" flex="1"/>
+         <treecol label="&reports.xul.template_builder.data_type.label;" flex="0"/>
+        </treecols>
+        <treechildren id="class-treetop" alternatingbackground="true" />
+       </tree>
+      </vbox>
+     </hbox>
 
-					<splitter><grippy/></splitter>
+     <splitter><grippy/></splitter>
 
-					<hbox flex="2">
-						<vbox flex="1">
-							<tree
-								id="trans-view"
-								flex="1"
-								seltype="single"
-								onclick="transformSelectHandler()"
-								ondblclick="addReportAtoms()"
-								enableColumnDrag="true"
-							>
-								<treecols>
-									<treecol label="&reports.xul.template_builder.field_transform.label;" flex="1"/>
-									<treecol label="&reports.xul.template_builder.params.label;" flex="0" hidden="true"/>
-									<treecol label="&reports.xul.template_builder.applicable_datatypes.label;" flex="1" hidden="true"/>
-									<treecol label="&reports.xul.template_builder.output_type.label;" flex="1" />
-								</treecols>
-								<treechildren id="trans-treetop" alternatingbackground="true" />
-							</tree>
-						</vbox>
-					</hbox>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<button label="&reports.xul.template_builder.source_add.label;" id="source-add" oncommand="addReportAtoms()"/>
-				</hbox>
-			</vbox>
-		</hbox>
-	</hbox>
+     <hbox flex="2">
+      <vbox flex="1">
+       <tree
+        id="trans-view"
+        flex="1"
+        seltype="single"
+        onclick="transformSelectHandler()"
+        ondblclick="addReportAtoms()"
+        enableColumnDrag="true"
+       >
+        <treecols>
+         <treecol label="&reports.xul.template_builder.field_transform.label;" flex="1"/>
+         <treecol label="&reports.xul.template_builder.params.label;" flex="0" hidden="true"/>
+         <treecol label="&reports.xul.template_builder.applicable_datatypes.label;" flex="1" hidden="true"/>
+         <treecol label="&reports.xul.template_builder.output_type.label;" flex="1" />
+        </treecols>
+        <treechildren id="trans-treetop" alternatingbackground="true" />
+       </tree>
+      </vbox>
+     </hbox>
+    </hbox>
+    <hbox>
+     <spacer flex="1"/>
+     <button label="&reports.xul.template_builder.source_add.label;" id="source-add" oncommand="addReportAtoms()"/>
+    </hbox>
+   </vbox>
+  </hbox>
+ </hbox>
 </groupbox>
 
 <splitter style="margin:3px" id="rtp-browse-build-splitter" collapse="before" persist="state hidden"><grippy/></splitter>
 
 
 <groupbox flex="1" orient="horizontal">
-	<caption label="&reports.xul.template_builder.template_config_caption.label;"/>
+ <caption label="&reports.xul.template_builder.template_config_caption.label;"/>
 
-	<hbox flex="1">
-		<vbox flex="1">
-			<hbox>
-			<vbox>
-				<label control="template-name" value="&reports.xul.template_builder.name.label;" style="height:2em"/>
-				<label control="template-description" value="&reports.xul.template_builder.description.label;"/>
-			</vbox>
-			<vbox flex="1">
-				<textbox id="template-name" flex="1"/>
-				<textbox id="template-description" multiline="true" flex="1" style="max-height:3em"/>
-			</vbox>
-			<vbox pack="end">
-				<button onclick="save_template();" label="&reports.xul.template_builder.save.label;"/>
-			</vbox>
-			</hbox>
+ <hbox flex="1">
+  <vbox flex="1">
+   <hbox>
+   <vbox>
+    <label control="template-name" value="&reports.xul.template_builder.name.label;" style="height:2em"/>
+    <label control="template-description" value="&reports.xul.template_builder.description.label;"/>
+   </vbox>
+   <vbox flex="1">
+    <textbox id="template-name" flex="1"/>
+    <textbox id="template-description" multiline="true" flex="1" style="max-height:3em"/>
+   </vbox>
+   <vbox pack="end">
+    <button onclick="save_template();" label="&reports.xul.template_builder.save.label;"/>
+   </vbox>
+   </hbox>
 
-			<hbox flex="1">
-				<tabbox flex="2" id="used-source-fields-tabbox">
-					<tabs>
-						<tab
-							id="dis_tab"
-							label="&reports.xul.template_builder.displayed_fields.label;"
-							onclick="transformSelectHandler(true);"
-						/>
-						<tab
-							id="filter_tab"
-							label="&reports.xul.template_builder.base_filters.label;"
-							onclick="transformSelectHandler(true);"
-						/>
-						<tab
-							id="aggfilter_tab"
-							label="&reports.xul.template_builder.aggregate_filters.label;"
-							disabled="true"
-							onclick="transformSelectHandler(true);"
-						/>
-						<!--
-						<tab
-							id="order_tab"
-							label="Field Order"
-							onclick="transformSelectHandler(true);"
-						/>
-						-->
-					</tabs>
+   <hbox flex="1">
+    <tabbox flex="2" id="used-source-fields-tabbox">
+     <tabs>
+      <tab
+       id="dis_tab"
+       label="&reports.xul.template_builder.displayed_fields.label;"
+       onclick="transformSelectHandler(true);"
+      />
+      <tab
+       id="filter_tab"
+       label="&reports.xul.template_builder.base_filters.label;"
+       onclick="transformSelectHandler(true);"
+      />
+      <tab
+       id="aggfilter_tab"
+       label="&reports.xul.template_builder.aggregate_filters.label;"
+       disabled="true"
+       onclick="transformSelectHandler(true);"
+      />
+      <!--
+      <tab
+       id="order_tab"
+       label="Field Order"
+       onclick="transformSelectHandler(true);"
+      />
+      -->
+     </tabs>
 
-					<tabpanels flex="1">
-						<tabpanel id="dis_tabpanel" orient="vertical">
-							<vbox flex="1">
-								<hbox flex="1">
-									<tree
-										id="dis-col-view"
-										flex="1"
-										seltype="single"
-										ondblclick="alterColumnLabel()"
-										onselect="populateTransformContext()"
-										enableColumnDrag="true"
-									>
-										<treecols>
-											<treecol label="&reports.xul.template_builder.display_name.label;" flex="3"/>
-											<treecol label="&reports.xul.template_builder.field_name.label;" hidden="true" flex="1"/>
-											<treecol label="&reports.xul.template_builder.data_type.label;" flex="1"/>
-											<treecol label="&reports.xul.template_builder.field_transform.label;" flex="1"/>
-											<treecol label="&reports.xul.template_builder.field_transform_type.label;" hidden="true" flex="1"/>
-										</treecols>
-										<treechildren id="dis-col-treetop" alternatingbackground="true" />
-									</tree>
-								</hbox>
-								<hbox pack="center">
-									<button label="&reports.xul.template_builder.alter_display_header.label;" oncommand="alterColumnLabel()"/>
-									<button type="menu" label="&reports.xul.template_builder.change_transform.label;">
-										<menupopup id='dis_tab_trans_menu'/>
-									</button>
-									<spacer flex="1"/>
-									<button label="&reports.xul.template_builder.move_up.label;" oncommand="changeDisplayOrder('u')"/>
-									<button label="&reports.xul.template_builder.move_down.label;" oncommand="changeDisplayOrder('d')"/>
-									<spacer flex="1"/>
-									<button label="&reports.xul.template_builder.remove_selected_field.label;" oncommand="removeReportAtom()"/>
-								</hbox>
-							</vbox>
-						</tabpanel>
+     <tabpanels flex="1">
+      <tabpanel id="dis_tabpanel" orient="vertical">
+       <vbox flex="1">
+        <hbox flex="1">
+         <tree
+          id="dis-col-view"
+          flex="1"
+          seltype="single"
+          ondblclick="alterColumnLabel()"
+          onselect="populateTransformContext()"
+          enableColumnDrag="true"
+         >
+          <treecols>
+           <treecol label="&reports.xul.template_builder.display_name.label;" flex="3"/>
+           <treecol label="&reports.xul.template_builder.field_name.label;" hidden="true" flex="1"/>
+           <treecol label="&reports.xul.template_builder.data_type.label;" flex="1"/>
+           <treecol label="&reports.xul.template_builder.field_transform.label;" flex="1"/>
+           <treecol label="&reports.xul.template_builder.field_transform_type.label;" hidden="true" flex="1"/>
+          </treecols>
+          <treechildren id="dis-col-treetop" alternatingbackground="true" />
+         </tree>
+        </hbox>
+        <hbox pack="center">
+         <button label="&reports.xul.template_builder.alter_display_header.label;" oncommand="alterColumnLabel()"/>
+         <button type="menu" label="&reports.xul.template_builder.change_transform.label;">
+          <menupopup id='dis_tab_trans_menu'/>
+         </button>
+         <spacer flex="1"/>
+         <button label="&reports.xul.template_builder.move_up.label;" oncommand="changeDisplayOrder('u')"/>
+         <button label="&reports.xul.template_builder.move_down.label;" oncommand="changeDisplayOrder('d')"/>
+         <spacer flex="1"/>
+         <button label="&reports.xul.template_builder.remove_selected_field.label;" oncommand="removeReportAtom()"/>
+        </hbox>
+       </vbox>
+      </tabpanel>
 
-						<tabpanel id="filter_tabpanel" orient="vertical">
-							<vbox flex="1">
-								<hbox flex="1">
-									<tree
-										id="filter-col-view"
-										flex="1"
-										seltype="single"
-										onselect="populateTransformContext();populateOperatorContext();changeTemplateFilterValue();"
-										enableColumnDrag="true"
-									>
-										<treecols>
-											<treecol label="&reports.xul.template_builder.filter_field.label;" flex="2"/>
-											<treecol label="&reports.xul.template_builder.field_name.label;" hidden="true" flex="1"/>
-											<treecol label="&reports.xul.template_builder.data_type.label;" hidden="true" flex="1"/>
-											<treecol label="&reports.xul.template_builder.field_transform.label;" flex="1"/>
-											<treecol label="&reports.xul.template_builder.field_transform_type.label;" hidden="true" flex="1"/>
-											<treecol label="&reports.xul.template_builder.operator.label;" flex="1"/>
-											<treecol label="&reports.xul.template_builder.value.label;" flex="1"/>
-										</treecols>
-										<treechildren id="filter-col-treetop" alternatingbackground="true" />
-									</tree>
-								</hbox>
-								<hbox pack="center">
-									<button type="menu" label="&reports.xul.template_builder.change_transform.label;">
-										<menupopup id='filter_tab_trans_menu'/>
-									</button>
-									<button type="menu" label="&reports.xul.template_builder.change_operator.label;">
-										<menupopup id='filter_tab_op_menu'/>
-									</button>
-									<button label="&reports.xul.template_builder.change_value.label;" command="filter_tab_value_action"/>
-									<button label="&reports.xul.template_builder.remove_value.label;" oncommand="removeTemplateFilterValue()"/>
-									<spacer flex="1"/>
-									<button label="&reports.xul.template_builder.remove_selected_fields.label;" oncommand="removeReportAtom()"/>
-								</hbox>
-							</vbox>
-						</tabpanel>
+      <tabpanel id="filter_tabpanel" orient="vertical">
+       <vbox flex="1">
+        <hbox flex="1">
+         <tree
+          id="filter-col-view"
+          flex="1"
+          seltype="single"
+          onselect="populateTransformContext();populateOperatorContext();changeTemplateFilterValue();"
+          enableColumnDrag="true"
+         >
+          <treecols>
+           <treecol label="&reports.xul.template_builder.filter_field.label;" flex="2"/>
+           <treecol label="&reports.xul.template_builder.field_name.label;" hidden="true" flex="1"/>
+           <treecol label="&reports.xul.template_builder.data_type.label;" hidden="true" flex="1"/>
+           <treecol label="&reports.xul.template_builder.field_transform.label;" flex="1"/>
+           <treecol label="&reports.xul.template_builder.field_transform_type.label;" hidden="true" flex="1"/>
+           <treecol label="&reports.xul.template_builder.operator.label;" flex="1"/>
+           <treecol label="&reports.xul.template_builder.value.label;" flex="1"/>
+          </treecols>
+          <treechildren id="filter-col-treetop" alternatingbackground="true" />
+         </tree>
+        </hbox>
+        <hbox pack="center">
+         <button type="menu" label="&reports.xul.template_builder.change_transform.label;">
+          <menupopup id='filter_tab_trans_menu'/>
+         </button>
+         <button type="menu" label="&reports.xul.template_builder.change_operator.label;">
+          <menupopup id='filter_tab_op_menu'/>
+         </button>
+         <button label="&reports.xul.template_builder.change_value.label;" command="filter_tab_value_action"/>
+         <button label="&reports.xul.template_builder.remove_value.label;" oncommand="removeTemplateFilterValue()"/>
+         <spacer flex="1"/>
+         <button label="&reports.xul.template_builder.remove_selected_fields.label;" oncommand="removeReportAtom()"/>
+        </hbox>
+       </vbox>
+      </tabpanel>
 
-						<tabpanel id="aggfilter_tabpanel" orient="vertical">
-							<vbox flex="1">
-								<hbox flex="1">
-									<tree
-										id="aggfilter-col-view"
-										flex="1"
-										seltype="single"
-										onselect="populateTransformContext();populateOperatorContext();changeTemplateFilterValue();"
-										enableColumnDrag="true"
-									>
-										<treecols>
-											<treecol label="&reports.xul.template_builder.filter_field.label;" flex="2"/>
-											<treecol label="&reports.xul.template_builder.field_name.label;" hidden="true" flex="1"/>
-											<treecol label="&reports.xul.template_builder.data_type.label;" hidden="true" flex="1"/>
-											<treecol label="&reports.xul.template_builder.field_transform.label;" flex="1"/>
-											<treecol label="&reports.xul.template_builder.field_transform_type.label;" hidden="true" flex="1"/>
-											<treecol label="&reports.xul.template_builder.operator.label;" flex="1"/>
-											<treecol label="&reports.xul.template_builder.value.label;" flex="1"/>
-										</treecols>
-										<treechildren id="aggfilter-col-treetop" alternatingbackground="true" />
-									</tree>
-								</hbox>
-								<hbox pack="center">
-									<button type="menu" label="&reports.xul.template_builder.change_transform.label;">
-										<menupopup id='aggfilter_tab_trans_menu'/>
-									</button>
-									<button type="menu" label="&reports.xul.template_builder.change_operator.label;">
-										<menupopup id='aggfilter_tab_op_menu'/>
-									</button>
-									<button label="&reports.xul.template_builder.change_value.label;" command="aggfilter_tab_value_action"/>
-									<button label="&reports.xul.template_builder.remove_value.label;" oncommand="removeTemplateFilterValue()"/>
-									<spacer flex="1"/>
-									<button label="&reports.xul.template_builder.remove_selected_fields.label;" oncommand="removeReportAtom()"/>
-								</hbox>
-							</vbox>
-						</tabpanel>
-					</tabpanels>
-				</tabbox>
-			</hbox>
-		</vbox>
-	</hbox>
+      <tabpanel id="aggfilter_tabpanel" orient="vertical">
+       <vbox flex="1">
+        <hbox flex="1">
+         <tree
+          id="aggfilter-col-view"
+          flex="1"
+          seltype="single"
+          onselect="populateTransformContext();populateOperatorContext();changeTemplateFilterValue();"
+          enableColumnDrag="true"
+         >
+          <treecols>
+           <treecol label="&reports.xul.template_builder.filter_field.label;" flex="2"/>
+           <treecol label="&reports.xul.template_builder.field_name.label;" hidden="true" flex="1"/>
+           <treecol label="&reports.xul.template_builder.data_type.label;" hidden="true" flex="1"/>
+           <treecol label="&reports.xul.template_builder.field_transform.label;" flex="1"/>
+           <treecol label="&reports.xul.template_builder.field_transform_type.label;" hidden="true" flex="1"/>
+           <treecol label="&reports.xul.template_builder.operator.label;" flex="1"/>
+           <treecol label="&reports.xul.template_builder.value.label;" flex="1"/>
+          </treecols>
+          <treechildren id="aggfilter-col-treetop" alternatingbackground="true" />
+         </tree>
+        </hbox>
+        <hbox pack="center">
+         <button type="menu" label="&reports.xul.template_builder.change_transform.label;">
+          <menupopup id='aggfilter_tab_trans_menu'/>
+         </button>
+         <button type="menu" label="&reports.xul.template_builder.change_operator.label;">
+          <menupopup id='aggfilter_tab_op_menu'/>
+         </button>
+         <button label="&reports.xul.template_builder.change_value.label;" command="aggfilter_tab_value_action"/>
+         <button label="&reports.xul.template_builder.remove_value.label;" oncommand="removeTemplateFilterValue()"/>
+         <spacer flex="1"/>
+         <button label="&reports.xul.template_builder.remove_selected_fields.label;" oncommand="removeReportAtom()"/>
+        </hbox>
+       </vbox>
+      </tabpanel>
+     </tabpanels>
+    </tabbox>
+   </hbox>
+  </vbox>
+ </hbox>
 
-	<splitter id="rtp-build-splitter" collapse="after" persist="state hidden"><grippy/></splitter>
+ <splitter id="rtp-build-splitter" collapse="after" persist="state hidden"><grippy/></splitter>
 
-	<hbox flex="3">
-		<tree
-			id="used-sources"
-			flex="1"
-			onclick="renderSources(true)"
-			ondblclick="changeTemplateFilterValue()"
-			enableColumnDrag="true"
-		>
-			<treecols>
-				<treecol label="&reports.xul.template_builder.source_specifier.label;" flex="2"/>
-				<treecol label="&reports.xul.template_builder.table_name.label;" flex="1" hidden="true"/>
-				<treecol label="&reports.xul.template_builder.sql_alias.label;" flex="1" hidden="true"/>
-				<treecol label="&reports.xul.template_builder.relationship.label;" flex="1" hidden="true"/>
-			</treecols>
-			<treechildren id="used-sources-treetop" alternatingbackground="true" />
-		</tree>
-	</hbox>
+ <hbox flex="3">
+  <tree
+   id="used-sources"
+   flex="1"
+   onclick="renderSources(true)"
+   ondblclick="changeTemplateFilterValue()"
+   enableColumnDrag="true"
+  >
+   <treecols>
+    <treecol label="&reports.xul.template_builder.source_specifier.label;" flex="2"/>
+    <treecol label="&reports.xul.template_builder.table_name.label;" flex="1" hidden="true"/>
+    <treecol label="&reports.xul.template_builder.sql_alias.label;" flex="1" hidden="true"/>
+    <treecol label="&reports.xul.template_builder.relationship.label;" flex="1" hidden="true"/>
+   </treecols>
+   <treechildren id="used-sources-treetop" alternatingbackground="true" />
+  </tree>
+ </hbox>
 
 </groupbox>
 
 <commandset>
-	<command id='filter_tab_value_action'/>
-	<command id='aggfilter_tab_value_action'/>
+ <command id='filter_tab_value_action'/>
+ <command id='aggfilter_tab_value_action'/>
 </commandset>
 
 <popupset>
-	<popup id="source-menu" position="after_start"/>
-	<popup
-		id="calendar-widget"
-		position="before_start"
-	/>
+ <popup id="source-menu" position="after_start"/>
+ <popup
+  id="calendar-widget"
+  position="before_start"
+ />
 </popupset>
 
 </window>
diff --git a/Open-ILS/web/reports/xul/transforms.js b/Open-ILS/web/reports/xul/transforms.js
index 86abb53761..afe52529a2 100644
--- a/Open-ILS/web/reports/xul/transforms.js
+++ b/Open-ILS/web/reports/xul/transforms.js
@@ -16,251 +16,251 @@ var OILS_RPT_DTYPE_NULL = null;
 var OILS_RPT_DTYPE_UNDEF;
 
 var OILS_RPT_DTYPE_ALL = [
-	OILS_RPT_DTYPE_STRING,
-	OILS_RPT_DTYPE_MONEY,
-	OILS_RPT_DTYPE_INT,
-	OILS_RPT_DTYPE_ID,
-	OILS_RPT_DTYPE_FLOAT,
-	OILS_RPT_DTYPE_TIMESTAMP,
-	OILS_RPT_DTYPE_BOOL,
-	OILS_RPT_DTYPE_OU,
-	OILS_RPT_DTYPE_NONE,
-	OILS_RPT_DTYPE_NULL,
-	OILS_RPT_DTYPE_UNDEF,
-	OILS_RPT_DTYPE_INTERVAL,
-	OILS_RPT_DTYPE_LINK
+ OILS_RPT_DTYPE_STRING,
+ OILS_RPT_DTYPE_MONEY,
+ OILS_RPT_DTYPE_INT,
+ OILS_RPT_DTYPE_ID,
+ OILS_RPT_DTYPE_FLOAT,
+ OILS_RPT_DTYPE_TIMESTAMP,
+ OILS_RPT_DTYPE_BOOL,
+ OILS_RPT_DTYPE_OU,
+ OILS_RPT_DTYPE_NONE,
+ OILS_RPT_DTYPE_NULL,
+ OILS_RPT_DTYPE_UNDEF,
+ OILS_RPT_DTYPE_INTERVAL,
+ OILS_RPT_DTYPE_LINK
 ];
 var OILS_RPT_DTYPE_NOT_ID = [OILS_RPT_DTYPE_STRING,OILS_RPT_DTYPE_MONEY,OILS_RPT_DTYPE_INT,OILS_RPT_DTYPE_FLOAT,OILS_RPT_DTYPE_TIMESTAMP];
 var OILS_RPT_DTYPE_NOT_BOOL = [OILS_RPT_DTYPE_STRING,OILS_RPT_DTYPE_MONEY,OILS_RPT_DTYPE_INT,OILS_RPT_DTYPE_FLOAT,OILS_RPT_DTYPE_TIMESTAMP,OILS_RPT_DTYPE_ID];
 
 var OILS_RPT_TRANSFORMS = {
-	Bare : {
-		datatype : OILS_RPT_DTYPE_ALL,
-		label : rpt_strings.TRANSFORMS_BARE
-	},
-
-	first : {
-		datatype : OILS_RPT_DTYPE_NOT_ID,
-		label : rpt_strings.TRANSFORMS_FIRST
-	},
-
-	last : {
-		datatype : OILS_RPT_DTYPE_NOT_ID,
-		label : rpt_strings.TRANSFORMS_LAST
-	},
-
-	count : {
-		datatype : OILS_RPT_DTYPE_NOT_BOOL,
-		aggregate : true,
-		label :  rpt_strings.TRANSFORMS_COUNT
-	},
-
-	count_distinct : {
-		datatype : OILS_RPT_DTYPE_NOT_BOOL,
-		aggregate : true,
-		label : rpt_strings.TRANSFORMS_COUNT_DISTINCT
-	},
-
-	min : {
-		datatype : OILS_RPT_DTYPE_NOT_ID,
-		aggregate : true,
-		label : rpt_strings.TRANSFORMS_MIN
-	},
-
-	max : {
-		datatype : OILS_RPT_DTYPE_NOT_ID,
-		aggregate : true,
-		label : rpt_strings.TRANSFORMS_MAX
-	},
-
-	/* string transforms ------------------------- */
-
-	substring : {
-		datatype : [ OILS_RPT_DTYPE_STRING ],
-		params : 2,
-		label : rpt_strings.TRANSFORMS_SUBSTRING
-	},
-
-	lower : {
-		datatype : [ OILS_RPT_DTYPE_STRING ],
-		label : rpt_strings.TRANSFORMS_LOWER
-	},
-
-	upper : {
-		datatype : [ OILS_RPT_DTYPE_STRING ],
-		label : rpt_strings.TRANSFORMS_UPPER
-	},
-
-	first5 : {
-		datatype : [ OILS_RPT_DTYPE_STRING ],
-		label : rpt_strings.TRANSFORMS_FIRST5
-	},
+ Bare : {
+  datatype : OILS_RPT_DTYPE_ALL,
+  label : rpt_strings.TRANSFORMS_BARE
+ },
+
+ first : {
+  datatype : OILS_RPT_DTYPE_NOT_ID,
+  label : rpt_strings.TRANSFORMS_FIRST
+ },
+
+ last : {
+  datatype : OILS_RPT_DTYPE_NOT_ID,
+  label : rpt_strings.TRANSFORMS_LAST
+ },
+
+ count : {
+  datatype : OILS_RPT_DTYPE_NOT_BOOL,
+  aggregate : true,
+  label :  rpt_strings.TRANSFORMS_COUNT
+ },
+
+ count_distinct : {
+  datatype : OILS_RPT_DTYPE_NOT_BOOL,
+  aggregate : true,
+  label : rpt_strings.TRANSFORMS_COUNT_DISTINCT
+ },
+
+ min : {
+  datatype : OILS_RPT_DTYPE_NOT_ID,
+  aggregate : true,
+  label : rpt_strings.TRANSFORMS_MIN
+ },
+
+ max : {
+  datatype : OILS_RPT_DTYPE_NOT_ID,
+  aggregate : true,
+  label : rpt_strings.TRANSFORMS_MAX
+ },
+
+ /* string transforms ------------------------- */
+
+ substring : {
+  datatype : [ OILS_RPT_DTYPE_STRING ],
+  params : 2,
+  label : rpt_strings.TRANSFORMS_SUBSTRING
+ },
+
+ lower : {
+  datatype : [ OILS_RPT_DTYPE_STRING ],
+  label : rpt_strings.TRANSFORMS_LOWER
+ },
+
+ upper : {
+  datatype : [ OILS_RPT_DTYPE_STRING ],
+  label : rpt_strings.TRANSFORMS_UPPER
+ },
+
+ first5 : {
+  datatype : [ OILS_RPT_DTYPE_STRING ],
+  label : rpt_strings.TRANSFORMS_FIRST5
+ },
 
         first_word : {
                 datatype : [OILS_RPT_DTYPE_STRING, 'text'],
                 label : rpt_strings.TRANSFORMS_FIRST_WORD
         },
 
-	/* timestamp transforms ----------------------- */
-	dow : {
-		datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
-		label : rpt_strings.TRANSFORMS_DOW,
-		cal_format : '%w',
-		regex : /^[0-6]$/
-	},
-	dom : {
-		datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
-		label : rpt_strings.TRANSFORMS_DOM,
-		cal_format : '%e',
-		regex : /^[0-9]{1,2}$/
-	},
-
-	doy : {
-		datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
-		label : rpt_strings.TRANSFORMS_DOY,
-		cal_format : '%j',
-		regex : /^[0-9]{1,3}$/
-	},
-
-	woy : {
-		datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
-		label : rpt_strings.TRANSFORMS_WOY,
-		cal_format : '%U',
-		regex : /^[0-9]{1,2}$/
-	},
-
-	moy : {
-		datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
-		label : rpt_strings.TRANSFORMS_MOY,
-		cal_format : '%m',
-		regex : /^\d{1,2}$/
-	},
-
-	qoy : {
-		datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
-		label : rpt_strings.TRANSFORMS_QOY,
-		regex : /^[1234]$/
-	}, 
-
-	hod : {
-		datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
-		label : rpt_strings.TRANSFORMS_HOD,
-		cal_format : '%H',
-		regex : /^\d{1,2}$/
-	}, 
-
-	date : {
-		datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
-		label : rpt_strings.TRANSFORMS_DATE,
-		regex : /^\d{4}-\d{2}-\d{2}$/,
-		hint  : 'YYYY-MM-DD',
-		cal_format : '%Y-%m-%d',
-		input_size : 10
-	},
-
-	month_trunc : {
-		datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
-		label : rpt_strings.TRANSFORMS_MONTH_TRUNC,
-		regex : /^\d{4}-\d{2}$/,
-		hint  : 'YYYY-MM',
-		cal_format : '%Y-%m',
-		input_size : 7
-	},
-
-	year_trunc : {
-		datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
-		label : rpt_strings.TRANSFORMS_YEAR_TRUNC,
-		regex : /^\d{4}$/,
-		hint  : 'YYYY',
-		cal_format : '%Y',
-		input_size : 4
-	},
-
-	hour_trunc : {
-		datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
-		label : rpt_strings.TRANSFORMS_HOUR_TRUNC,
-		regex : /^\d{2}$/,
-		hint  : 'HH',
-		cal_format : '%Y-%m-$d %H',
-		input_size : 2
-	},
-
-	day_name : {
-		datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
-		cal_format : '%A',
-		label : rpt_strings.TRANSFORMS_DAY_NAME
-	}, 
-
-	month_name : {
-		datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
-		cal_format : '%B',
-		label : rpt_strings.TRANSFORMS_MONTH_NAME
-	},
-	age : {
-		datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
-		label : rpt_strings.TRANSFORMS_AGE
-	},
-
-	months_ago : {
-		datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
-		label : rpt_strings.TRANSFORMS_MONTHS_AGO
-	},
-
-	quarters_ago : {
-		datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
-		label : rpt_strings.TRANSFORMS_QUARTERS_AGO
-	},
-
-	/* int  / float transforms ----------------------------------- */
-	sum : {
-		datatype : [ OILS_RPT_DTYPE_INT, OILS_RPT_DTYPE_FLOAT, OILS_RPT_DTYPE_MONEY ],
-		label : rpt_strings.TRANSFORMS_SUM,
-		aggregate : true
-	}, 
-
-	average : {
-		datatype : [ OILS_RPT_DTYPE_INT, OILS_RPT_DTYPE_FLOAT, OILS_RPT_DTYPE_MONEY ],
-		label : rpt_strings.TRANSFORMS_AVERAGE,
-		aggregate : true
-	},
-
-	round : {
-		datatype : [ OILS_RPT_DTYPE_INT, OILS_RPT_DTYPE_FLOAT ],
-		label : rpt_strings.TRANSFORMS_ROUND,
-	},
-
-	'int' : {
-		datatype : [ OILS_RPT_DTYPE_FLOAT ],
-		label : rpt_strings.TRANSFORMS_INT
-	}
+ /* timestamp transforms ----------------------- */
+ dow : {
+  datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
+  label : rpt_strings.TRANSFORMS_DOW,
+  cal_format : '%w',
+  regex : /^[0-6]$/
+ },
+ dom : {
+  datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
+  label : rpt_strings.TRANSFORMS_DOM,
+  cal_format : '%e',
+  regex : /^[0-9]{1,2}$/
+ },
+
+ doy : {
+  datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
+  label : rpt_strings.TRANSFORMS_DOY,
+  cal_format : '%j',
+  regex : /^[0-9]{1,3}$/
+ },
+
+ woy : {
+  datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
+  label : rpt_strings.TRANSFORMS_WOY,
+  cal_format : '%U',
+  regex : /^[0-9]{1,2}$/
+ },
+
+ moy : {
+  datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
+  label : rpt_strings.TRANSFORMS_MOY,
+  cal_format : '%m',
+  regex : /^\d{1,2}$/
+ },
+
+ qoy : {
+  datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
+  label : rpt_strings.TRANSFORMS_QOY,
+  regex : /^[1234]$/
+ }, 
+
+ hod : {
+  datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
+  label : rpt_strings.TRANSFORMS_HOD,
+  cal_format : '%H',
+  regex : /^\d{1,2}$/
+ }, 
+
+ date : {
+  datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
+  label : rpt_strings.TRANSFORMS_DATE,
+  regex : /^\d{4}-\d{2}-\d{2}$/,
+  hint  : 'YYYY-MM-DD',
+  cal_format : '%Y-%m-%d',
+  input_size : 10
+ },
+
+ month_trunc : {
+  datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
+  label : rpt_strings.TRANSFORMS_MONTH_TRUNC,
+  regex : /^\d{4}-\d{2}$/,
+  hint  : 'YYYY-MM',
+  cal_format : '%Y-%m',
+  input_size : 7
+ },
+
+ year_trunc : {
+  datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
+  label : rpt_strings.TRANSFORMS_YEAR_TRUNC,
+  regex : /^\d{4}$/,
+  hint  : 'YYYY',
+  cal_format : '%Y',
+  input_size : 4
+ },
+
+ hour_trunc : {
+  datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
+  label : rpt_strings.TRANSFORMS_HOUR_TRUNC,
+  regex : /^\d{2}$/,
+  hint  : 'HH',
+  cal_format : '%Y-%m-$d %H',
+  input_size : 2
+ },
+
+ day_name : {
+  datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
+  cal_format : '%A',
+  label : rpt_strings.TRANSFORMS_DAY_NAME
+ }, 
+
+ month_name : {
+  datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
+  cal_format : '%B',
+  label : rpt_strings.TRANSFORMS_MONTH_NAME
+ },
+ age : {
+  datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
+  label : rpt_strings.TRANSFORMS_AGE
+ },
+
+ months_ago : {
+  datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
+  label : rpt_strings.TRANSFORMS_MONTHS_AGO
+ },
+
+ quarters_ago : {
+  datatype : [ OILS_RPT_DTYPE_TIMESTAMP ],
+  label : rpt_strings.TRANSFORMS_QUARTERS_AGO
+ },
+
+ /* int  / float transforms ----------------------------------- */
+ sum : {
+  datatype : [ OILS_RPT_DTYPE_INT, OILS_RPT_DTYPE_FLOAT, OILS_RPT_DTYPE_MONEY ],
+  label : rpt_strings.TRANSFORMS_SUM,
+  aggregate : true
+ }, 
+
+ average : {
+  datatype : [ OILS_RPT_DTYPE_INT, OILS_RPT_DTYPE_FLOAT, OILS_RPT_DTYPE_MONEY ],
+  label : rpt_strings.TRANSFORMS_AVERAGE,
+  aggregate : true
+ },
+
+ round : {
+  datatype : [ OILS_RPT_DTYPE_INT, OILS_RPT_DTYPE_FLOAT ],
+  label : rpt_strings.TRANSFORMS_ROUND,
+ },
+
+ 'int' : {
+  datatype : [ OILS_RPT_DTYPE_FLOAT ],
+  label : rpt_strings.TRANSFORMS_INT
+ }
 }
 
 function getTransforms(args) {
-	var dtype = args.datatype;
-	var agg = args.aggregate;
-	var tforms = OILS_RPT_TRANSFORMS;
-	var nonagg = args.non_aggregate;
-
-	var keys = getKeys(OILS_RPT_TRANSFORMS)
-	var tforms = [];
-
-	for( var i = 0; i < keys.length; i++ ) {
-		var key = keys[i];
-		var obj = OILS_RPT_TRANSFORMS[key];
-		if( agg && !nonagg && !obj.aggregate ) continue;
-		if( !agg && nonagg && obj.aggregate ) continue;
-		if( !dtype && obj.datatype.length > 0 ) continue;
-		if( dtype && obj.datatype.length > 0 && transformIsForDatatype(key,dtype).length == 0 ) continue;
-		tforms.push(key);
-	}
-
-	return tforms;
+ var dtype = args.datatype;
+ var agg = args.aggregate;
+ var tforms = OILS_RPT_TRANSFORMS;
+ var nonagg = args.non_aggregate;
+
+ var keys = getKeys(OILS_RPT_TRANSFORMS)
+ var tforms = [];
+
+ for( var i = 0; i < keys.length; i++ ) {
+  var key = keys[i];
+  var obj = OILS_RPT_TRANSFORMS[key];
+  if( agg && !nonagg && !obj.aggregate ) continue;
+  if( !agg && nonagg && obj.aggregate ) continue;
+  if( !dtype && obj.datatype.length > 0 ) continue;
+  if( dtype && obj.datatype.length > 0 && transformIsForDatatype(key,dtype).length == 0 ) continue;
+  tforms.push(key);
+ }
+
+ return tforms;
 }
 
 
 function transformIsForDatatype(tform, dtype) {
-	var obj = OILS_RPT_TRANSFORMS[tform];
-	return grep(function(d) { return (d == dtype) }, obj.datatype);
+ var obj = OILS_RPT_TRANSFORMS[tform];
+ return grep(function(d) { return (d == dtype) }, obj.datatype);
 }
 
 
diff --git a/Open-ILS/web/reports/xul/utilities.js b/Open-ILS/web/reports/xul/utilities.js
index c8fc7941a6..7c1b2248ab 100644
--- a/Open-ILS/web/reports/xul/utilities.js
+++ b/Open-ILS/web/reports/xul/utilities.js
@@ -1,19 +1,19 @@
 function $ () {
-	var elements = new Array();
+ var elements = new Array();
 
-	for (var i = 0; i < arguments.length; i++) {
-		var element = arguments[i];
+ for (var i = 0; i < arguments.length; i++) {
+  var element = arguments[i];
 
-		if (typeof element == 'string')
-			element = document.getElementById(element) || undefined;
+  if (typeof element == 'string')
+   element = document.getElementById(element) || undefined;
 
-		if (arguments.length == 1)
-			return element;
+  if (arguments.length == 1)
+   return element;
 
-		elements.push( element );
-	}
+  elements.push( element );
+ }
 
-	return elements;
+ return elements;
 }
 
 function _l(l) { location.href = l + location.search; }
@@ -25,9 +25,9 @@ function map (func, list) {
 }
 
 function grep (func, list) {
-	var ret = [];
-	for (var i = 0; i < list.length; i++) if(func(list[i])) ret.push(list[i]);
-	return ret;
+ var ret = [];
+ for (var i = 0; i < list.length; i++) if(func(list[i])) ret.push(list[i]);
+ return ret;
 }
 
 function getSelectedItems(tree) {
diff --git a/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js b/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js
index 8a23cf40ab..d25ecf115a 100644
--- a/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js
+++ b/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js
@@ -3,811 +3,811 @@ dump('entering OpenILS/data.js\n');
 if (typeof OpenILS == 'undefined') OpenILS = {};
 OpenILS.data = function () {
 
-	JSAN.use('util.error'); this.error = new util.error();
-	JSAN.use('util.network'); this.network = new util.network();
+ JSAN.use('util.error'); this.error = new util.error();
+ JSAN.use('util.network'); this.network = new util.network();
 
-	return this;
+ return this;
 }
 
 OpenILS.data.prototype = {
 
-	'list' : {},
-	'hash' : {},
-	'tree' : {},
-
-	'temp' : '',
-
-	'data_progress' : function(msg) {
-		try {
-			var x = document.getElementById('data_progress');
-			if (x) {
-				x.appendChild( document.createTextNode( msg ) );
-			}
-		} catch(E) {
-			this.error.sdump('D_ERROR',msg + '\n' + E);
-		}
-	},
-
-	'init' : function (params) {
-
-		try {
-			if (params && params.via == 'stash') {	
-				this.stash_retrieve();
-			} else {
-				this.network_retrieve();
-			}
-		
-		} catch(E) {
-			this.error.sdump('D_ERROR','Error in OpenILS.data.init('
-				+js2JSON(params)+'): ' + js2JSON(E) );
-		}
-
-
-	},
-
-	// This should be invoked only once per application, in a persistant window
-	'init_observer_functions' : function() {
-		try {
-			var obj = this;				// OpenILS.data
-			obj.observers = {};			//
-			obj.observers.id = 1;		// Unique id for each observer function added
-			obj.observers.id2path = {}; // Lookup for full_path via observer id
-			obj.observers.cache = {};	// Observer funcs go in here
-
-			// For a given path, this executes all the registered observer funcs
-			obj.observers.dispatch = function(full_path, old_value, new_value) {
-				obj.error.sdump('D_OBSERVERS', 'entering observers.dispatch\nfull_path = ' + full_path + '\nold_value = ' + js2JSON(old_value) + '\nnew_value = ' + js2JSON(new_value) + '\n');
-				try {
-					var path = full_path.split(/\./).pop();
-					for (var i in obj.observers.cache[full_path]) {
-						try {
-							var o = obj.observers.cache[full_path][i];
-							if (typeof o.func == 'function') o.func(path, old_value, new_value);
-						} catch(E) {
-							obj.error.sdump('D_ERROR','Error in OpenILS.data.observers.dispatch(): ' + js2JSON(E) );
-						}
-					}
-				} catch(E) {
-					obj.error.sdump('D_ERROR','Error in OpenILS.data.observers.dispatch(): ' + js2JSON(E) );
-				}
-			}
-
-			// This registers an observer function for a given path
-			obj.observers.add = function(full_path, func) {
-				try {
-					obj.error.sdump('D_OBSERVERS', 'entering observers.add\nfull_path = ' + full_path + '\nfunc = ' + func + '\n');
-					netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-					const OpenILS=new Components.Constructor("@mozilla.org/openils_data_cache;1", "nsIOpenILS");
-					var data_cache=new OpenILS( );
-					var stash = data_cache.wrappedJSObject.OpenILS.prototype.data;
-
-					var id = obj.observers.id++;
-					if (typeof obj.observers.cache[ full_path ] == 'undefined') obj.observers.cache[ full_path ] = {};
-					obj.observers.cache[ full_path ][ id ] = { 'func' : func, 'time_added' : new Date() };
-					obj.observers.id2path[ id ] = [ full_path ];
-
-					var path_list = full_path.split(/\./);
-					var observed_prop = path_list.pop();
-
-					// Convert soft path to object reference.  Error if any but the last node is undefined
-					for (var i in path_list) stash = stash[ path_list[i] ];
-
-					/*
-
-					// experiment with storing only json in cache to avoid the [ ] -> { '0' : .., '1' : .. } bug
-
-					if (stash[observed_prop] && getKeys( obj.observers.cache[ full_path ] ).length == 0) {
-						stash['_' + observed_prop] = js2JSON(stash[observed_prop]);
-					}
-
-					stash.__defineSetter__(observed_prop, function(x) { this['_'+observed_prop] = js2JSON(x); });
-					stash.__defineGetter__(observed_prop, function() { return JSON2js(this['_'+observed_prop]); });
-					*/
-
-					stash.watch(
-						observed_prop,
-						function(p,old_value,new_value) {
-							obj.observers.dispatch(full_path,old_value,new_value);
-							return new_value;
-						}
-					);
-
-					return id;
-				} catch(E) {
-					obj.error.sdump('D_ERROR','Error in OpenILS.data.observers.add(): ' + js2JSON(E) );
-				}
-			}
-
-			// This unregisters an observer function for a given observer id
-			obj.observers.remove = function(id) {
-				try {
-					obj.error.sdump('D_OBSERVERS', 'entering observers.remove\nid = ' + id + '\n');
-					var path = obj.observers.id2path[ id ];
-					delete obj.observers.cache[ path ][ id ];
-					delete obj.observers.id2path[ id ];
-				} catch(E) {
-					obj.error.sdump('D_ERROR','Error in OpenILS.data.observers.remove(): ' + js2JSON(E) );
-				}
-			}
-
-			// This purges observer functions for a given path
-			obj.observers.purge = function(full_path) {
-				obj.error.sdump('D_OBSERVERS', 'entering observers.purge\nfull_path = ' + full_path + '\n');
-				try {
-					var remove_these = [];
-					for (var id in obj.observers.cache[ full_path ]) remove_these.push( id );
-					for (var id in remove_these) delete obj.observers.id2path[ id ];
-					delete obj.observers.cache[ full_path ];
-				} catch(E) {
-					obj.error.sdump('D_ERROR','Error in OpenILS.data.observers.purge(): ' + js2JSON(E) );
-				}
-			}
-
-			obj.stash('observers'); // make this accessible globally
-
-		} catch(E) {
-			this.error.sdump('D_ERROR','Error in OpenILS.data.init_observer_functions(): ' + js2JSON(E) );
-		}
-	},
-
-	'stash' : function () {
-		try {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			const OpenILS=new Components.Constructor("@mozilla.org/openils_data_cache;1", "nsIOpenILS");
-			var data_cache=new OpenILS( );
-			for (var i = 0; i < arguments.length; i++) {
-				try {
-					if (arguments[i] != 'hash' && arguments[i] != 'list') this.error.sdump('D_DATA_STASH','stashing ' + arguments[i] + ' : ' + this[arguments[i]] + (typeof this[arguments[i]] == 'object' ? ' = ' + (this[arguments[i]]) : '') + '\n');
-				} catch(F) { alert(F); }
-				data_cache.wrappedJSObject.OpenILS.prototype.data[arguments[i]] = this[arguments[i]];
-			}
-		} catch(E) {
-			this.error.sdump('D_ERROR','Error in OpenILS.data.stash(): ' + js2JSON(E) );
-		}
-	},
-
-	'lookup' : function(key,value) {
-		try {
-			var obj = this; var found;
-			if (obj.hash[key] && obj.hash[key][value]) return obj.hash[key][value];
-			switch(key) {
-				case 'acpl': 
-					found = obj.network.simple_request('FM_ACPL_RETRIEVE_VIA_ID.authoritative',[ value ]);
-				break;
-				default: return undefined; break;
-			}
-			if (typeof found.ilsevent != 'undefined') throw(found);
-			if (!obj.hash[key]) obj.hash[key] = {};
-			obj.hash[key][value] = found; obj.list[key].push( found ); obj.stash('hash','list');
-			return found;
-		} catch(E) {
-			this.error.sdump('D_ERROR','Error in OpenILS.data.lookup('+key+','+value+'): ' + js2JSON(E) );
-			return undefined;
-		}
-	},
-
-	'_debug_stash' : function() {
-		try {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			const OpenILS=new Components.Constructor("@mozilla.org/openils_data_cache;1", "nsIOpenILS");
-			var data_cache=new OpenILS( );
-			for (var i in data_cache.wrappedJSObject.OpenILS.prototype.data) {
-				dump('_debug_stash ' + i + '\n');
-			}
-		} catch(E) {
-			this.error.sdump('D_ERROR','Error in OpenILS.data._debug_stash(): ' + js2JSON(E) );
-		}
-	},
-
-	'_fm_objects' : {
-
-		'pgt' : [ api.FM_PGT_RETRIEVE.app, api.FM_PGT_RETRIEVE.method, [], true ],
-		'cit' : [ api.FM_CIT_RETRIEVE.app, api.FM_CIT_RETRIEVE.method, [], true ],
-		'citm' : [ api.FM_CITM_RETRIEVE.app, api.FM_CITM_RETRIEVE.method, [], true ],
-		/*
-		'cst' : [ api.FM_CST_RETRIEVE.app, api.FM_CST_RETRIEVE.method, [], true ],
-		*/
-		/*
-		'acpl' : [ api.FM_ACPL_RETRIEVE.app, api.FM_ACPL_RETRIEVE.method, [], true ],
-		*/
-		'ccs' : [ api.FM_CCS_RETRIEVE.app, api.FM_CCS_RETRIEVE.method, [], true ],
-		'aou' : [ api.FM_AOU_RETRIEVE.app, api.FM_AOU_RETRIEVE.method, [], true ],
-		'aout' : [ api.FM_AOUT_RETRIEVE.app, api.FM_AOUT_RETRIEVE.method, [], true ],
-		'crahp' : [ api.FM_CRAHP_RETRIEVE.app, api.FM_CRAHP_RETRIEVE.method, [], true ]
-	},
-
-	'stash_retrieve' : function() {
-		try {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			const OpenILS=new Components.Constructor("@mozilla.org/openils_data_cache;1", "nsIOpenILS");
-			var data_cache=new OpenILS( );
-			var dc = data_cache.wrappedJSObject.OpenILS.prototype.data;
-			for (var i in dc) {
-				this.error.sdump('D_DATA_RETRIEVE','Retrieving ' + i + ' : ' + dc[i] + '\n');
-				this[i] = dc[i];
-			}
-			if (typeof this.on_complete == 'function') {
-
-				this.on_complete();
-			}
-		} catch(E) {
-			this.error.sdump('D_ERROR','Error in OpenILS.data._debug_stash(): ' + js2JSON(E) );
-		}
-	},
-
-	'print_list_defaults' : function() {
-		var obj = this;
-		//if (typeof obj.print_list_templates == 'undefined') {
-		{
-			obj.print_list_types = [ 
-				'offline_checkout', 
-				'offline_checkin', 
-				'offline_renew', 
-				'offline_inhouse_use', 
-				'items', 
-				'bills', 
-				'payment', 
-				'holds', 
-				/* 'patrons' */
-			];
-			obj.print_list_templates = { 
-				'item_status' : {
-					'type' : 'items',
-					'header' : 'The following items have been examined:<hr/><ol>',
-					'line_item' : '<li>%title%<br/>\r\nBarcode: %barcode%\r\n',
-					'footer' : '</ol><hr />%SHORTNAME% %TODAY_TRIM%<br/>\r\n<br/>\r\n'
-				}, 
-				'transit_list' : {
-					'type' : 'transits',
-					'header' : 'Transits:<hr/><ol>',
-					'line_item' : '<li>From: %transit_source% To: %transit_dest_lib%<br/>\r\nWhen: %transit_source_send_time%<br />\r\nBarcode: %transit_item_barcode% Title: %transit_item_title%<br/>\r\n',
-					'footer' : '</ol><hr />%SHORTNAME% %TODAY_TRIM%<br/>\r\n<br/>\r\n'
-				}, 
-				'items_out' : {
-					'type' : 'items',
-					'header' : 'Welcome to %LIBRARY%!<br/>\r\nYou have the following items:<hr/><ol>',
-					'line_item' : '<li>%title%<br/>\r\nBarcode: %barcode% Due: %due_date%\r\n',
-					'footer' : '</ol><hr />%SHORTNAME% %TODAY_TRIM%<br/>\r\nYou were helped by %STAFF_FIRSTNAME%<br/>\r\n<br/>\r\n'
-				}, 
-				'checkout' : {
-					'type' : 'items',
-					'header' : 'Welcome to %LIBRARY%!<br/>\r\nYou checked out the following items:<hr/><ol>',
-					'line_item' : '<li>%title%<br/>\r\nBarcode: %barcode% Due: %due_date%\r\n',
-					'footer' : '</ol><hr />%SHORTNAME% %TODAY_TRIM%<br/>\r\nYou were helped by %STAFF_FIRSTNAME%<br/>\r\n<br/>\r\n'
-				}, 
-				'offline_checkout' : {
-					'type' : 'offline_checkout',
-					'header' : 'Patron %patron_barcode%<br/>\r\nYou checked out the following items:<hr/><ol>',
-					'line_item' : '<li>Barcode: %barcode%<br/>\r\nDue: %due_date%\r\n',
-					'footer' : '</ol><hr />%TODAY_TRIM%<br/>\r\n<br/>\r\n'
-				},
-				'checkin' : {
-					'type' : 'items',
-					'header' : 'You checked in the following items:<hr/><ol>',
-					'line_item' : '<li>%title%<br/>\r\nBarcode: %barcode%  Call Number: %call_number%\r\n',
-					'footer' : '</ol><hr />%SHORTNAME% %TODAY_TRIM%<br/>\r\n<br/>\r\n'
-				}, 
-				'bill_payment' : {
-					'type' : 'payment',
-					'header' : 'Welcome to %LIBRARY%!<br/>A receipt of your  transaction:<hr/> <table width="100%"> <tr> <td>Original Balance:</td> <td align="right">$%original_balance%</td> </tr> <tr> <td>Payment Method:</td> <td align="right">%payment_type%</td> </tr> <tr> <td>Payment Received:</td> <td align="right">$%payment_received%</td> </tr> <tr> <td>Payment Applied:</td> <td align="right">$%payment_applied%</td> </tr> <tr> <td>Billings Voided:</td> <td align="right">%voided_balance%</td> </tr> <tr> <td>Change Given:</td> <td align="right">$%change_given%</td> </tr> <tr> <td>New Balance:</td> <td align="right">$%new_balance%</td> </tr> </table> <p> Note: %note% </p> <p> Specific bills: <blockquote>',
-					'line_item' : 'Bill #%bill_id%  %last_billing_type% Received: $%payment%<br />%barcode% %title%<br /><br />',
-					'footer' : '</blockquote> </p> <hr />%SHORTNAME% %TODAY_TRIM%<br/> <br/> '
-				},
-				'bills_historical' : {
-					'type' : 'bills',
-					'header' : 'Welcome to %LIBRARY%!<br/>You had the following bills:<hr/><ol>',
-					'line_item' : '<dt><b>Bill #%id%</b></dt> <dd> <table> <tr valign="top"><td>Date:</td><td>%xact_start%</td></tr> <tr valign="top"><td>Type:</td><td>%xact_type%</td></tr> <tr valign="top"><td>Last Billing:</td><td>%last_billing_type%<br/>%last_billing_note%</td></tr> <tr valign="top"><td>Total Billed:</td><td>$%total_owed%</td></tr> <tr valign="top"><td>Last Payment:</td><td>%last_payment_type%<br/>%last_payment_note%</td></tr> <tr valign="top"><td>Total Paid:</td><td>$%total_paid%</td></tr> <tr valign="top"><td><b>Balance:</b></td><td><b>$%balance_owed%</b></td></tr> </table><br/>',
-					'footer' : '</ol><hr />%SHORTNAME% %TODAY_TRIM%<br/>\r\n<br/>\r\n'
-				}, 
-				'bills_current' : {
-					'type' : 'bills',
-					'header' : 'Welcome to %LIBRARY%!<br/>You have the following bills:<hr/><ol>',
-					'line_item' : '<dt><b>Bill #%id%</b></dt> <dd> <table> <tr valign="top"><td>Date:</td><td>%xact_start%</td></tr> <tr valign="top"><td>Type:</td><td>%xact_type%</td></tr> <tr valign="top"><td>Last Billing:</td><td>%last_billing_type%<br/>%last_billing_note%</td></tr> <tr valign="top"><td>Total Billed:</td><td>$%total_owed%</td></tr> <tr valign="top"><td>Last Payment:</td><td>%last_payment_type%<br/>%last_payment_note%</td></tr> <tr valign="top"><td>Total Paid:</td><td>$%total_paid%</td></tr> <tr valign="top"><td><b>Balance:</b></td><td><b>$%balance_owed%</b></td></tr> </table><br/>',
-					'footer' : '</ol><hr />%SHORTNAME% %TODAY_TRIM%<br/>\r\n<br/>\r\n'
-				},
-				'bills_main_view' : {
-					'type' : 'bills',
-					'header' : 'Welcome to %LIBRARY%!<br/>You have the following bills:<hr/><ol>',
-					'line_item' : '<dt><b>Bill #%id%</b> %title%</dt> <dd> <table width="100%"> <tr valign="top"><td>Date:</td><td>%xact_start%</td></tr> <tr valign="top"><td>Type:</td><td>%xact_type%</td></tr> <tr valign="top"><td>Last Billing:</td><td>%last_billing_type%<br/>%last_billing_note%</td></tr> <tr valign="top"><td>Total Billed:</td><td>$%total_owed%</td></tr> <tr valign="top"><td>Last Payment:</td><td>%last_payment_type%<br/>%last_payment_note%</td></tr> <tr valign="top"><td>Total Paid:</td><td>$%total_paid%</td></tr> <tr valign="top"><td><b>Balance:</b></td><td><b>$%balance_owed%</b></td></tr> </table><br/>',
-					'footer' : '</ol><hr />%SHORTNAME% %TODAY_TRIM%<br/>\r\n<br/>\r\n'
-				},
-				'offline_checkin' : {
-					'type' : 'offline_checkin',
-					'header' : 'You checked in the following items:<hr/><ol>',
-					'line_item' : '<li>Barcode: %barcode%\r\n',
-					'footer' : '</ol><hr />%TODAY_TRIM%<br/>\r\n<br/>\r\n'
-				},
-				'offline_renew' : {
-					'type' : 'offline_renew',
-					'header' : 'You renewed the following items:<hr/><ol>',
-					'line_item' : '<li>Barcode: %barcode%\r\n',
-					'footer' : '</ol><hr />%TODAY_TRIM%<br/>\r\n<br/>\r\n'
-				},
-				'offline_inhouse_use' : {
-					'type' : 'offline_inhouse_use',
-					'header' : 'You marked the following in-house items used:<hr/><ol>',
-					'line_item' : '<li>Barcode: %barcode%\r\nUses: %count%',
-					'footer' : '</ol><hr />%TODAY_TRIM%<br/>\r\n<br/>\r\n'
-				},
-				'in_house_use' : {
-					'type' : 'items',
-					'header' : 'You marked the following in-house items used:<hr/><ol>',
-					'line_item' : '<li>Barcode: %barcode%\r\nUses: %uses%\r\n<br />%alert_message%',
-					'footer' : '</ol><hr />%TODAY_TRIM%<br/>\r\n<br/>\r\n'
-				},
-				'holds' : {
-					'type' : 'holds',
-					'header' : 'Welcome to %LIBRARY%!<br/>\r\nYou have the following titles on hold:<hr/><ol>',
-					'line_item' : '<li>%title%\r\n',
-					'footer' : '</ol><hr />%SHORTNAME% %TODAY_TRIM%<br/>\r\nYou were helped by %STAFF_FIRSTNAME%<br/>\r\n<br/>\r\n'
-				}
-			}; 
-
-			obj.stash( 'print_list_templates', 'print_list_types' );
-		}
-	},
-
-	'network_retrieve' : function() {
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		var obj = this;
-
-
-		JSAN.use('util.file'); var file = new util.file('print_list_templates');
-		obj.print_list_defaults();
-		obj.data_progress('Default print templates set. ');
-		if (file._file.exists()) {
-			try {
-				var x = file.get_object();
-				if (x) {
-					for (var i in x) {
-						obj.print_list_templates[i] = x[i];
-					}
-					obj.stash('print_list_templates');
-					obj.data_progress('Saved print templates retrieved from file. ');
-				}
-			} catch(E) {
-				alert(E);
-			}
-		}
-		file.close();
-
-		JSAN.use('util.file'); var file = new util.file('global_font_adjust');
-		if (file._file.exists()) {
-			try {
-				var x = file.get_object();
-				if (x) {
-					obj.global_font_adjust = x;
-					obj.stash('global_font_adjust');
-					obj.data_progress('Saved font settings retrieved from file. ');
-				}
-			} catch(E) {
-				alert(E);
-			}
-		}
-		file.close();
-
-		JSAN.use('util.file'); var file = new util.file('no_sound');
-		if (file._file.exists()) {
-			try {
-				var x = file.get_content();
-				if (x) {
-					obj.no_sound = x;
-					obj.stash('no_sound');
-					obj.data_progress('Saved sound settings retrieved from file. ');
-				}
-			} catch(E) {
-				alert(E);
-			}
-		}
-		file.close();
-
-		JSAN.use('util.file'); var file = new util.file('print_strategy');
-		if (file._file.exists()) {
-			try {
-				var x = file.get_content();
-				if (x) {
-					obj.print_strategy = x;
-					obj.stash('print_strategy');
-					obj.data_progress('Print strategy retrieved from file. ');
-				}
-			} catch(E) {
-				alert(E);
-			}
-		}
-		file.close();
-
-		JSAN.use('util.print'); (new util.print()).GetPrintSettings();
-		obj.data_progress('Printer settings retrieved. ');
-
-		JSAN.use('util.functional');
-		JSAN.use('util.fm_utils');
-
-		function gen_fm_retrieval_func(classname,data) {
-			var app = data[0]; var method = data[1]; var params = data[2]; var cacheable = data[3];
-			return function () {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-				function convert() {
-					netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-					try {
-						if (obj.list[classname].constructor.name == 'Array') {
-							obj.hash[classname] = 
-								util.functional.convert_object_list_to_hash(
-									obj.list[classname]
-								);
-						}
-					} catch(E) {
-
-						obj.error.sdump('D_ERROR',E + '\n');
-					}
-
-				}
-
-				try {
-					var level = obj.error.sdump_levels.D_SES_RESULT;
-					if (classname == 'aou' || classname == 'my_aou')
-						obj.error.sdump_levels.D_SES_RESULT = false;
-					var robj = obj.network.request( app, method, params);
-					if (robj != null && typeof robj.ilsevent != 'undefined') {
-						obj.error.standard_unexpected_error_alert('The staff client failed to retrieve expected data from this call, "' + method + '"',robj);
-						throw(robj);
-					}
-					obj.list[classname] = robj == null ? [] : robj;
-					obj.error.sdump_levels.D_SES_RESULT = level;
-					convert();
-					obj.data_progress('Retrieved list for ' + classname + ' objects. ');
-
-				} catch(E) {
-					// if cacheable, try offline
-					if (cacheable) {
-						/* FIXME -- we're going to revisit caching and do it differently
-						try {
-							var file = new util.file( classname );
-							obj.list[classname] = file.get_object(); file.close();
-							convert();
-						} catch(E) {
-							throw(E);
-						}
-						*/
-						throw(E); // for now
-					} else {
-						throw(E); // for now
-					}
-				}
-			}
-		}
-
-		this.chain = [];
-
-		this.chain.push(
-			function() {
-				try {
-					var robj = obj.network.simple_request('CIRC_MODIFIER_LIST',[]);
-					if (typeof robj.ilsevent != 'undefined') throw(robj);
-					obj.list.circ_modifier = robj;
-					obj.data_progress('Retrieved circ modifier list. ');
-				} catch(E) {
-					var error = 'Error: ' + js2JSON(E);
-					obj.error.sdump('D_ERROR',error);
-					throw(E);
-				}
-			}
-		);
-
-		this.chain.push(
-			function() {
-				var f = gen_fm_retrieval_func(
-					'cnal',
-					[
-						api.FM_CNAL_RETRIEVE.app,
-						api.FM_CNAL_RETRIEVE.method,
-						[ obj.session.key ],
-						false
-					]
-				);
-				try {
-					f();
-				} catch(E) {
-					var error = 'Error: ' + js2JSON(E);
-					obj.error.sdump('D_ERROR',error);
-					throw(E);
-				}
-			}
-		);
-
-		this.chain.push(
-			function() {
-				var f = gen_fm_retrieval_func(
-					'csp',
-					[
-						api.FM_CSP_PCRUD_SEARCH.app,
-						api.FM_CSP_PCRUD_SEARCH.method,
-						[ obj.session.key, {"id":{"!=":null}}, {"order_by":{"csp":"id"}} ],
-						false
-					]
-				);
-				try {
-					f();
-				} catch(E) {
-					var error = 'Error: ' + js2JSON(E);
-					obj.error.sdump('D_ERROR',error);
-					throw(E);
-				}
-			}
-		);
-
-		this.chain.push(
-			function() {
-				var f = gen_fm_retrieval_func(
-					'au',
-					[
-						api.FM_AU_RETRIEVE_VIA_SESSION.app,
-						api.FM_AU_RETRIEVE_VIA_SESSION.method,
-						[ obj.session.key ],
-						false
-					]
-				);
-				try {
-					f();
-				} catch(E) {
-					var error = 'Error: ' + js2JSON(E);
-					obj.error.sdump('D_ERROR',error);
-					throw(E);
-				}
-				obj.list.au = [ obj.list.au ];
-			}
-		);
-
-		this.chain.push(
-			function() {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				var f = gen_fm_retrieval_func(
-					'my_asv',
-					[
-						api.FM_ASV_RETRIEVE_REQUIRED.app,
-						api.FM_ASV_RETRIEVE_REQUIRED.method,
-						[ obj.session.key ],
-						true
-					]
-				);
-				try {
-					netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-					f();
-				} catch(E) {
-					var error = 'Error: ' + js2JSON(E);
-					obj.error.sdump('D_ERROR',error);
-					throw(E);
-				}
-			}
-		);
-
-		this.chain.push(
-			function() {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				var f = gen_fm_retrieval_func(
-					'asv',
-					[
-						api.FM_ASV_RETRIEVE.app,
-						api.FM_ASV_RETRIEVE.method,
-						[ obj.session.key ],
-						true
-					]
-				);
-				try {
-					netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-					f();
-				} catch(E) {
-					var error = 'Error: ' + js2JSON(E);
-					obj.error.sdump('D_ERROR',error);
-					throw(E);
-				}
-			}
-		);
-
-		obj.error.sdump('D_DEBUG','_fm_objects = ' + js2JSON(this._fm_objects) + '\n');
-
-		for (var i in this._fm_objects) {
-			this.chain.push( gen_fm_retrieval_func(i,this._fm_objects[i]) );
-		}
-
-		// The previous org_tree call returned a tree, not a list or hash.
-		this.chain.push(
-			function () {
-				obj.tree.aou = obj.list.aou;
-				obj.list.aou = util.fm_utils.flatten_ou_branch( obj.tree.aou );
-				for (var i = 0; i < obj.list.aou.length; i++) {
-					var c = obj.list.aou[i].children();
-					if (!c) c = [];
-					c = c.sort(
-						function( a, b ) {
-							if (a.shortname() < b.shortname()) return -1;
-							if (a.shortname() > b.shortname()) return 1;
-							return 0;
-						}
-					);
-					obj.list.aou[i].children( c );
-				}
-				obj.list.aou = util.fm_utils.flatten_ou_branch( obj.tree.aou );
-				obj.hash.aou = util.functional.convert_object_list_to_hash( obj.list.aou );
-			}
-		);
-
-		// The previous pgt call returned a tree, not a list or hash.
-		this.chain.push(
-			function () {
-				obj.tree.pgt = obj.list.pgt;
-				obj.list.pgt = util.fm_utils.flatten_ou_branch( obj.tree.pgt );
-				obj.hash.pgt = util.functional.convert_object_list_to_hash( obj.list.pgt );
-			}
-		);
-
-		// Do these after we get the user object
-
-		this.chain.push(
-			function() {
-				try {
-					var robj = obj.network.simple_request('FM_AOUS_RETRIEVE',[ obj.session.key, obj.list.au[0].ws_ou() ]);
-					if (typeof robj.ilsevent != 'undefined') throw(robj);
-					obj.hash.aous = robj;
-					obj.data_progress('Retrieved org unit settings. ');
-				} catch(E) {
-					var error = 'Error: ' + js2JSON(E);
-					obj.error.sdump('D_ERROR',error);
-					throw(E);
-				}
-			}
-		);
-
-		this.chain.push(
-
-			function() {
-
-				gen_fm_retrieval_func('my_aou', 
-					[ 
-						api.FM_AOU_RETRIEVE_RELATED_VIA_SESSION.app,
-						api.FM_AOU_RETRIEVE_RELATED_VIA_SESSION.method,
-						[ obj.session.key, obj.list.au[0].ws_ou() ], /* use ws_ou and not home_ou */
-						true
-					]
-				)();
-			}
-		);
-
-		this.chain.push(
-
-			function () {
-
-				gen_fm_retrieval_func( 'my_actsc', 
-					[ 
-						api.FM_ACTSC_RETRIEVE_VIA_AOU.app,
-						api.FM_ACTSC_RETRIEVE_VIA_AOU.method,
-						[ obj.session.key, obj.list.au[0].ws_ou() ],
-						true
-					]
-				)();
-			}
-		);
-
-		this.chain.push(
-
-			function () {
-
-				gen_fm_retrieval_func( 'my_asc', 
-					[ 
-						api.FM_ASC_RETRIEVE_VIA_AOU.app,
-						api.FM_ASC_RETRIEVE_VIA_AOU.method,
-						[ obj.session.key, obj.list.au[0].ws_ou() ],
-						true
-					]
-				)();
-			}
-		);
-
-
-		this.chain.push(
-			function() {
-				var f = gen_fm_retrieval_func(
-					'cnct',
-					[
-						api.FM_CNCT_RETRIEVE.app,
-						api.FM_CNCT_RETRIEVE.method,
-						[ obj.list.au[0].ws_ou() ], 
-						false
-					]
-				);
-				try {
-					f();
-				} catch(E) {
-					var error = 'Error: ' + js2JSON(E);
-					obj.error.sdump('D_ERROR',error);
-					throw(E);
-				}
-			}
-		);
-
-		this.chain.push(
-			function() {
-				var f = gen_fm_retrieval_func(
-					'my_cnct',
-					[
-						api.FM_CNCT_RETRIEVE.app,
-						api.FM_CNCT_RETRIEVE.method,
-						[ obj.list.au[0].ws_ou() ], 
-						false
-					]
-				);
-				try {
-					f();
-				} catch(E) {
-					var error = 'Error: ' + js2JSON(E);
-					obj.error.sdump('D_ERROR',error);
-					throw(E);
-				}
-			}
-		);
-
-
-		this.chain.push(
-			function() {
-				var f = gen_fm_retrieval_func(
-					'acpl',
-					[
-						api.FM_ACPL_RETRIEVE.app,
-						api.FM_ACPL_RETRIEVE.method,
-						[ obj.list.au[0].ws_ou() ],
-						false
-					]
-				);
-				try {
-					f();
-				} catch(E) {
-					var error = 'Error: ' + js2JSON(E);
-					obj.error.sdump('D_ERROR',error);
-					throw(E);
-				}
-			}
-		);
-
-		this.chain.push(
-			function() {
-				var f = gen_fm_retrieval_func(
-					'cbt',
-					[
-						api.FM_CBT_RETRIEVE.app,
-						api.FM_CBT_RETRIEVE.method,
-						[ obj.session.key, obj.list.au[0].ws_ou() ],
-						false
-					]
-				);
-				try {
-					f();
-				} catch(E) {
-					var error = 'Error: ' + js2JSON(E);
-					obj.error.sdump('D_ERROR',error);
-					throw(E);
-				}
-			}
-		);
-
-		if (typeof this.on_complete == 'function') {
-
-			this.chain.push( this.on_complete );
-		}
-		JSAN.use('util.exec'); this.exec = new util.exec();
-		this.exec.on_error = function(E) { 
-		
-			if (typeof obj.on_error == 'function') {
-				return obj.on_error(E); /* false breaks chain */
-			} else {
-				alert('oops: ' + E ); 
-			    return false; /* break chain */
-			}
-
-		}
-
-		this.exec.chain( this.chain );
-
-	}
+ 'list' : {},
+ 'hash' : {},
+ 'tree' : {},
+
+ 'temp' : '',
+
+ 'data_progress' : function(msg) {
+  try {
+   var x = document.getElementById('data_progress');
+   if (x) {
+    x.appendChild( document.createTextNode( msg ) );
+   }
+  } catch(E) {
+   this.error.sdump('D_ERROR',msg + '\n' + E);
+  }
+ },
+
+ 'init' : function (params) {
+
+  try {
+   if (params && params.via == 'stash') { 
+    this.stash_retrieve();
+   } else {
+    this.network_retrieve();
+   }
+  
+  } catch(E) {
+   this.error.sdump('D_ERROR','Error in OpenILS.data.init('
+    +js2JSON(params)+'): ' + js2JSON(E) );
+  }
+
+
+ },
+
+ // This should be invoked only once per application, in a persistant window
+ 'init_observer_functions' : function() {
+  try {
+   var obj = this;    // OpenILS.data
+   obj.observers = {};   //
+   obj.observers.id = 1;  // Unique id for each observer function added
+   obj.observers.id2path = {}; // Lookup for full_path via observer id
+   obj.observers.cache = {}; // Observer funcs go in here
+
+   // For a given path, this executes all the registered observer funcs
+   obj.observers.dispatch = function(full_path, old_value, new_value) {
+    obj.error.sdump('D_OBSERVERS', 'entering observers.dispatch\nfull_path = ' + full_path + '\nold_value = ' + js2JSON(old_value) + '\nnew_value = ' + js2JSON(new_value) + '\n');
+    try {
+     var path = full_path.split(/\./).pop();
+     for (var i in obj.observers.cache[full_path]) {
+      try {
+       var o = obj.observers.cache[full_path][i];
+       if (typeof o.func == 'function') o.func(path, old_value, new_value);
+      } catch(E) {
+       obj.error.sdump('D_ERROR','Error in OpenILS.data.observers.dispatch(): ' + js2JSON(E) );
+      }
+     }
+    } catch(E) {
+     obj.error.sdump('D_ERROR','Error in OpenILS.data.observers.dispatch(): ' + js2JSON(E) );
+    }
+   }
+
+   // This registers an observer function for a given path
+   obj.observers.add = function(full_path, func) {
+    try {
+     obj.error.sdump('D_OBSERVERS', 'entering observers.add\nfull_path = ' + full_path + '\nfunc = ' + func + '\n');
+     netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+     const OpenILS=new Components.Constructor("@mozilla.org/openils_data_cache;1", "nsIOpenILS");
+     var data_cache=new OpenILS( );
+     var stash = data_cache.wrappedJSObject.OpenILS.prototype.data;
+
+     var id = obj.observers.id++;
+     if (typeof obj.observers.cache[ full_path ] == 'undefined') obj.observers.cache[ full_path ] = {};
+     obj.observers.cache[ full_path ][ id ] = { 'func' : func, 'time_added' : new Date() };
+     obj.observers.id2path[ id ] = [ full_path ];
+
+     var path_list = full_path.split(/\./);
+     var observed_prop = path_list.pop();
+
+     // Convert soft path to object reference.  Error if any but the last node is undefined
+     for (var i in path_list) stash = stash[ path_list[i] ];
+
+     /*
+
+     // experiment with storing only json in cache to avoid the [ ] -> { '0' : .., '1' : .. } bug
+
+     if (stash[observed_prop] && getKeys( obj.observers.cache[ full_path ] ).length == 0) {
+      stash['_' + observed_prop] = js2JSON(stash[observed_prop]);
+     }
+
+     stash.__defineSetter__(observed_prop, function(x) { this['_'+observed_prop] = js2JSON(x); });
+     stash.__defineGetter__(observed_prop, function() { return JSON2js(this['_'+observed_prop]); });
+     */
+
+     stash.watch(
+      observed_prop,
+      function(p,old_value,new_value) {
+       obj.observers.dispatch(full_path,old_value,new_value);
+       return new_value;
+      }
+     );
+
+     return id;
+    } catch(E) {
+     obj.error.sdump('D_ERROR','Error in OpenILS.data.observers.add(): ' + js2JSON(E) );
+    }
+   }
+
+   // This unregisters an observer function for a given observer id
+   obj.observers.remove = function(id) {
+    try {
+     obj.error.sdump('D_OBSERVERS', 'entering observers.remove\nid = ' + id + '\n');
+     var path = obj.observers.id2path[ id ];
+     delete obj.observers.cache[ path ][ id ];
+     delete obj.observers.id2path[ id ];
+    } catch(E) {
+     obj.error.sdump('D_ERROR','Error in OpenILS.data.observers.remove(): ' + js2JSON(E) );
+    }
+   }
+
+   // This purges observer functions for a given path
+   obj.observers.purge = function(full_path) {
+    obj.error.sdump('D_OBSERVERS', 'entering observers.purge\nfull_path = ' + full_path + '\n');
+    try {
+     var remove_these = [];
+     for (var id in obj.observers.cache[ full_path ]) remove_these.push( id );
+     for (var id in remove_these) delete obj.observers.id2path[ id ];
+     delete obj.observers.cache[ full_path ];
+    } catch(E) {
+     obj.error.sdump('D_ERROR','Error in OpenILS.data.observers.purge(): ' + js2JSON(E) );
+    }
+   }
+
+   obj.stash('observers'); // make this accessible globally
+
+  } catch(E) {
+   this.error.sdump('D_ERROR','Error in OpenILS.data.init_observer_functions(): ' + js2JSON(E) );
+  }
+ },
+
+ 'stash' : function () {
+  try {
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   const OpenILS=new Components.Constructor("@mozilla.org/openils_data_cache;1", "nsIOpenILS");
+   var data_cache=new OpenILS( );
+   for (var i = 0; i < arguments.length; i++) {
+    try {
+     if (arguments[i] != 'hash' && arguments[i] != 'list') this.error.sdump('D_DATA_STASH','stashing ' + arguments[i] + ' : ' + this[arguments[i]] + (typeof this[arguments[i]] == 'object' ? ' = ' + (this[arguments[i]]) : '') + '\n');
+    } catch(F) { alert(F); }
+    data_cache.wrappedJSObject.OpenILS.prototype.data[arguments[i]] = this[arguments[i]];
+   }
+  } catch(E) {
+   this.error.sdump('D_ERROR','Error in OpenILS.data.stash(): ' + js2JSON(E) );
+  }
+ },
+
+ 'lookup' : function(key,value) {
+  try {
+   var obj = this; var found;
+   if (obj.hash[key] && obj.hash[key][value]) return obj.hash[key][value];
+   switch(key) {
+    case 'acpl': 
+     found = obj.network.simple_request('FM_ACPL_RETRIEVE_VIA_ID.authoritative',[ value ]);
+    break;
+    default: return undefined; break;
+   }
+   if (typeof found.ilsevent != 'undefined') throw(found);
+   if (!obj.hash[key]) obj.hash[key] = {};
+   obj.hash[key][value] = found; obj.list[key].push( found ); obj.stash('hash','list');
+   return found;
+  } catch(E) {
+   this.error.sdump('D_ERROR','Error in OpenILS.data.lookup('+key+','+value+'): ' + js2JSON(E) );
+   return undefined;
+  }
+ },
+
+ '_debug_stash' : function() {
+  try {
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   const OpenILS=new Components.Constructor("@mozilla.org/openils_data_cache;1", "nsIOpenILS");
+   var data_cache=new OpenILS( );
+   for (var i in data_cache.wrappedJSObject.OpenILS.prototype.data) {
+    dump('_debug_stash ' + i + '\n');
+   }
+  } catch(E) {
+   this.error.sdump('D_ERROR','Error in OpenILS.data._debug_stash(): ' + js2JSON(E) );
+  }
+ },
+
+ '_fm_objects' : {
+
+  'pgt' : [ api.FM_PGT_RETRIEVE.app, api.FM_PGT_RETRIEVE.method, [], true ],
+  'cit' : [ api.FM_CIT_RETRIEVE.app, api.FM_CIT_RETRIEVE.method, [], true ],
+  'citm' : [ api.FM_CITM_RETRIEVE.app, api.FM_CITM_RETRIEVE.method, [], true ],
+  /*
+  'cst' : [ api.FM_CST_RETRIEVE.app, api.FM_CST_RETRIEVE.method, [], true ],
+  */
+  /*
+  'acpl' : [ api.FM_ACPL_RETRIEVE.app, api.FM_ACPL_RETRIEVE.method, [], true ],
+  */
+  'ccs' : [ api.FM_CCS_RETRIEVE.app, api.FM_CCS_RETRIEVE.method, [], true ],
+  'aou' : [ api.FM_AOU_RETRIEVE.app, api.FM_AOU_RETRIEVE.method, [], true ],
+  'aout' : [ api.FM_AOUT_RETRIEVE.app, api.FM_AOUT_RETRIEVE.method, [], true ],
+  'crahp' : [ api.FM_CRAHP_RETRIEVE.app, api.FM_CRAHP_RETRIEVE.method, [], true ]
+ },
+
+ 'stash_retrieve' : function() {
+  try {
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   const OpenILS=new Components.Constructor("@mozilla.org/openils_data_cache;1", "nsIOpenILS");
+   var data_cache=new OpenILS( );
+   var dc = data_cache.wrappedJSObject.OpenILS.prototype.data;
+   for (var i in dc) {
+    this.error.sdump('D_DATA_RETRIEVE','Retrieving ' + i + ' : ' + dc[i] + '\n');
+    this[i] = dc[i];
+   }
+   if (typeof this.on_complete == 'function') {
+
+    this.on_complete();
+   }
+  } catch(E) {
+   this.error.sdump('D_ERROR','Error in OpenILS.data._debug_stash(): ' + js2JSON(E) );
+  }
+ },
+
+ 'print_list_defaults' : function() {
+  var obj = this;
+  //if (typeof obj.print_list_templates == 'undefined') {
+  {
+   obj.print_list_types = [ 
+    'offline_checkout', 
+    'offline_checkin', 
+    'offline_renew', 
+    'offline_inhouse_use', 
+    'items', 
+    'bills', 
+    'payment', 
+    'holds', 
+    /* 'patrons' */
+   ];
+   obj.print_list_templates = { 
+    'item_status' : {
+     'type' : 'items',
+     'header' : 'The following items have been examined:<hr/><ol>',
+     'line_item' : '<li>%title%<br/>\r\nBarcode: %barcode%\r\n',
+     'footer' : '</ol><hr />%SHORTNAME% %TODAY_TRIM%<br/>\r\n<br/>\r\n'
+    }, 
+    'transit_list' : {
+     'type' : 'transits',
+     'header' : 'Transits:<hr/><ol>',
+     'line_item' : '<li>From: %transit_source% To: %transit_dest_lib%<br/>\r\nWhen: %transit_source_send_time%<br />\r\nBarcode: %transit_item_barcode% Title: %transit_item_title%<br/>\r\n',
+     'footer' : '</ol><hr />%SHORTNAME% %TODAY_TRIM%<br/>\r\n<br/>\r\n'
+    }, 
+    'items_out' : {
+     'type' : 'items',
+     'header' : 'Welcome to %LIBRARY%!<br/>\r\nYou have the following items:<hr/><ol>',
+     'line_item' : '<li>%title%<br/>\r\nBarcode: %barcode% Due: %due_date%\r\n',
+     'footer' : '</ol><hr />%SHORTNAME% %TODAY_TRIM%<br/>\r\nYou were helped by %STAFF_FIRSTNAME%<br/>\r\n<br/>\r\n'
+    }, 
+    'checkout' : {
+     'type' : 'items',
+     'header' : 'Welcome to %LIBRARY%!<br/>\r\nYou checked out the following items:<hr/><ol>',
+     'line_item' : '<li>%title%<br/>\r\nBarcode: %barcode% Due: %due_date%\r\n',
+     'footer' : '</ol><hr />%SHORTNAME% %TODAY_TRIM%<br/>\r\nYou were helped by %STAFF_FIRSTNAME%<br/>\r\n<br/>\r\n'
+    }, 
+    'offline_checkout' : {
+     'type' : 'offline_checkout',
+     'header' : 'Patron %patron_barcode%<br/>\r\nYou checked out the following items:<hr/><ol>',
+     'line_item' : '<li>Barcode: %barcode%<br/>\r\nDue: %due_date%\r\n',
+     'footer' : '</ol><hr />%TODAY_TRIM%<br/>\r\n<br/>\r\n'
+    },
+    'checkin' : {
+     'type' : 'items',
+     'header' : 'You checked in the following items:<hr/><ol>',
+     'line_item' : '<li>%title%<br/>\r\nBarcode: %barcode%  Call Number: %call_number%\r\n',
+     'footer' : '</ol><hr />%SHORTNAME% %TODAY_TRIM%<br/>\r\n<br/>\r\n'
+    }, 
+    'bill_payment' : {
+     'type' : 'payment',
+     'header' : 'Welcome to %LIBRARY%!<br/>A receipt of your  transaction:<hr/> <table width="100%"> <tr> <td>Original Balance:</td> <td align="right">$%original_balance%</td> </tr> <tr> <td>Payment Method:</td> <td align="right">%payment_type%</td> </tr> <tr> <td>Payment Received:</td> <td align="right">$%payment_received%</td> </tr> <tr> <td>Payment Applied:</td> <td align="right">$%payment_applied%</td> </tr> <tr> <td>Billings Voided:</td> <td align="right">%voided_balance%</td> </tr> <tr> <td>Change Given:</td> <td align="right">$%change_given%</td> </tr> <tr> <td>New Balance:</td> <td align="right">$%new_balance%</td> </tr> </table> <p> Note: %note% </p> <p> Specific bills: <blockquote>',
+     'line_item' : 'Bill #%bill_id%  %last_billing_type% Received: $%payment%<br />%barcode% %title%<br /><br />',
+     'footer' : '</blockquote> </p> <hr />%SHORTNAME% %TODAY_TRIM%<br/> <br/> '
+    },
+    'bills_historical' : {
+     'type' : 'bills',
+     'header' : 'Welcome to %LIBRARY%!<br/>You had the following bills:<hr/><ol>',
+     'line_item' : '<dt><b>Bill #%id%</b></dt> <dd> <table> <tr valign="top"><td>Date:</td><td>%xact_start%</td></tr> <tr valign="top"><td>Type:</td><td>%xact_type%</td></tr> <tr valign="top"><td>Last Billing:</td><td>%last_billing_type%<br/>%last_billing_note%</td></tr> <tr valign="top"><td>Total Billed:</td><td>$%total_owed%</td></tr> <tr valign="top"><td>Last Payment:</td><td>%last_payment_type%<br/>%last_payment_note%</td></tr> <tr valign="top"><td>Total Paid:</td><td>$%total_paid%</td></tr> <tr valign="top"><td><b>Balance:</b></td><td><b>$%balance_owed%</b></td></tr> </table><br/>',
+     'footer' : '</ol><hr />%SHORTNAME% %TODAY_TRIM%<br/>\r\n<br/>\r\n'
+    }, 
+    'bills_current' : {
+     'type' : 'bills',
+     'header' : 'Welcome to %LIBRARY%!<br/>You have the following bills:<hr/><ol>',
+     'line_item' : '<dt><b>Bill #%id%</b></dt> <dd> <table> <tr valign="top"><td>Date:</td><td>%xact_start%</td></tr> <tr valign="top"><td>Type:</td><td>%xact_type%</td></tr> <tr valign="top"><td>Last Billing:</td><td>%last_billing_type%<br/>%last_billing_note%</td></tr> <tr valign="top"><td>Total Billed:</td><td>$%total_owed%</td></tr> <tr valign="top"><td>Last Payment:</td><td>%last_payment_type%<br/>%last_payment_note%</td></tr> <tr valign="top"><td>Total Paid:</td><td>$%total_paid%</td></tr> <tr valign="top"><td><b>Balance:</b></td><td><b>$%balance_owed%</b></td></tr> </table><br/>',
+     'footer' : '</ol><hr />%SHORTNAME% %TODAY_TRIM%<br/>\r\n<br/>\r\n'
+    },
+    'bills_main_view' : {
+     'type' : 'bills',
+     'header' : 'Welcome to %LIBRARY%!<br/>You have the following bills:<hr/><ol>',
+     'line_item' : '<dt><b>Bill #%id%</b> %title%</dt> <dd> <table width="100%"> <tr valign="top"><td>Date:</td><td>%xact_start%</td></tr> <tr valign="top"><td>Type:</td><td>%xact_type%</td></tr> <tr valign="top"><td>Last Billing:</td><td>%last_billing_type%<br/>%last_billing_note%</td></tr> <tr valign="top"><td>Total Billed:</td><td>$%total_owed%</td></tr> <tr valign="top"><td>Last Payment:</td><td>%last_payment_type%<br/>%last_payment_note%</td></tr> <tr valign="top"><td>Total Paid:</td><td>$%total_paid%</td></tr> <tr valign="top"><td><b>Balance:</b></td><td><b>$%balance_owed%</b></td></tr> </table><br/>',
+     'footer' : '</ol><hr />%SHORTNAME% %TODAY_TRIM%<br/>\r\n<br/>\r\n'
+    },
+    'offline_checkin' : {
+     'type' : 'offline_checkin',
+     'header' : 'You checked in the following items:<hr/><ol>',
+     'line_item' : '<li>Barcode: %barcode%\r\n',
+     'footer' : '</ol><hr />%TODAY_TRIM%<br/>\r\n<br/>\r\n'
+    },
+    'offline_renew' : {
+     'type' : 'offline_renew',
+     'header' : 'You renewed the following items:<hr/><ol>',
+     'line_item' : '<li>Barcode: %barcode%\r\n',
+     'footer' : '</ol><hr />%TODAY_TRIM%<br/>\r\n<br/>\r\n'
+    },
+    'offline_inhouse_use' : {
+     'type' : 'offline_inhouse_use',
+     'header' : 'You marked the following in-house items used:<hr/><ol>',
+     'line_item' : '<li>Barcode: %barcode%\r\nUses: %count%',
+     'footer' : '</ol><hr />%TODAY_TRIM%<br/>\r\n<br/>\r\n'
+    },
+    'in_house_use' : {
+     'type' : 'items',
+     'header' : 'You marked the following in-house items used:<hr/><ol>',
+     'line_item' : '<li>Barcode: %barcode%\r\nUses: %uses%\r\n<br />%alert_message%',
+     'footer' : '</ol><hr />%TODAY_TRIM%<br/>\r\n<br/>\r\n'
+    },
+    'holds' : {
+     'type' : 'holds',
+     'header' : 'Welcome to %LIBRARY%!<br/>\r\nYou have the following titles on hold:<hr/><ol>',
+     'line_item' : '<li>%title%\r\n',
+     'footer' : '</ol><hr />%SHORTNAME% %TODAY_TRIM%<br/>\r\nYou were helped by %STAFF_FIRSTNAME%<br/>\r\n<br/>\r\n'
+    }
+   }; 
+
+   obj.stash( 'print_list_templates', 'print_list_types' );
+  }
+ },
+
+ 'network_retrieve' : function() {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  var obj = this;
+
+
+  JSAN.use('util.file'); var file = new util.file('print_list_templates');
+  obj.print_list_defaults();
+  obj.data_progress('Default print templates set. ');
+  if (file._file.exists()) {
+   try {
+    var x = file.get_object();
+    if (x) {
+     for (var i in x) {
+      obj.print_list_templates[i] = x[i];
+     }
+     obj.stash('print_list_templates');
+     obj.data_progress('Saved print templates retrieved from file. ');
+    }
+   } catch(E) {
+    alert(E);
+   }
+  }
+  file.close();
+
+  JSAN.use('util.file'); var file = new util.file('global_font_adjust');
+  if (file._file.exists()) {
+   try {
+    var x = file.get_object();
+    if (x) {
+     obj.global_font_adjust = x;
+     obj.stash('global_font_adjust');
+     obj.data_progress('Saved font settings retrieved from file. ');
+    }
+   } catch(E) {
+    alert(E);
+   }
+  }
+  file.close();
+
+  JSAN.use('util.file'); var file = new util.file('no_sound');
+  if (file._file.exists()) {
+   try {
+    var x = file.get_content();
+    if (x) {
+     obj.no_sound = x;
+     obj.stash('no_sound');
+     obj.data_progress('Saved sound settings retrieved from file. ');
+    }
+   } catch(E) {
+    alert(E);
+   }
+  }
+  file.close();
+
+  JSAN.use('util.file'); var file = new util.file('print_strategy');
+  if (file._file.exists()) {
+   try {
+    var x = file.get_content();
+    if (x) {
+     obj.print_strategy = x;
+     obj.stash('print_strategy');
+     obj.data_progress('Print strategy retrieved from file. ');
+    }
+   } catch(E) {
+    alert(E);
+   }
+  }
+  file.close();
+
+  JSAN.use('util.print'); (new util.print()).GetPrintSettings();
+  obj.data_progress('Printer settings retrieved. ');
+
+  JSAN.use('util.functional');
+  JSAN.use('util.fm_utils');
+
+  function gen_fm_retrieval_func(classname,data) {
+   var app = data[0]; var method = data[1]; var params = data[2]; var cacheable = data[3];
+   return function () {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
+    function convert() {
+     netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+     try {
+      if (obj.list[classname].constructor.name == 'Array') {
+       obj.hash[classname] = 
+        util.functional.convert_object_list_to_hash(
+         obj.list[classname]
+        );
+      }
+     } catch(E) {
+
+      obj.error.sdump('D_ERROR',E + '\n');
+     }
+
+    }
+
+    try {
+     var level = obj.error.sdump_levels.D_SES_RESULT;
+     if (classname == 'aou' || classname == 'my_aou')
+      obj.error.sdump_levels.D_SES_RESULT = false;
+     var robj = obj.network.request( app, method, params);
+     if (robj != null && typeof robj.ilsevent != 'undefined') {
+      obj.error.standard_unexpected_error_alert('The staff client failed to retrieve expected data from this call, "' + method + '"',robj);
+      throw(robj);
+     }
+     obj.list[classname] = robj == null ? [] : robj;
+     obj.error.sdump_levels.D_SES_RESULT = level;
+     convert();
+     obj.data_progress('Retrieved list for ' + classname + ' objects. ');
+
+    } catch(E) {
+     // if cacheable, try offline
+     if (cacheable) {
+      /* FIXME -- we're going to revisit caching and do it differently
+      try {
+       var file = new util.file( classname );
+       obj.list[classname] = file.get_object(); file.close();
+       convert();
+      } catch(E) {
+       throw(E);
+      }
+      */
+      throw(E); // for now
+     } else {
+      throw(E); // for now
+     }
+    }
+   }
+  }
+
+  this.chain = [];
+
+  this.chain.push(
+   function() {
+    try {
+     var robj = obj.network.simple_request('CIRC_MODIFIER_LIST',[]);
+     if (typeof robj.ilsevent != 'undefined') throw(robj);
+     obj.list.circ_modifier = robj;
+     obj.data_progress('Retrieved circ modifier list. ');
+    } catch(E) {
+     var error = 'Error: ' + js2JSON(E);
+     obj.error.sdump('D_ERROR',error);
+     throw(E);
+    }
+   }
+  );
+
+  this.chain.push(
+   function() {
+    var f = gen_fm_retrieval_func(
+     'cnal',
+     [
+      api.FM_CNAL_RETRIEVE.app,
+      api.FM_CNAL_RETRIEVE.method,
+      [ obj.session.key ],
+      false
+     ]
+    );
+    try {
+     f();
+    } catch(E) {
+     var error = 'Error: ' + js2JSON(E);
+     obj.error.sdump('D_ERROR',error);
+     throw(E);
+    }
+   }
+  );
+
+  this.chain.push(
+   function() {
+    var f = gen_fm_retrieval_func(
+     'csp',
+     [
+      api.FM_CSP_PCRUD_SEARCH.app,
+      api.FM_CSP_PCRUD_SEARCH.method,
+      [ obj.session.key, {"id":{"!=":null}}, {"order_by":{"csp":"id"}} ],
+      false
+     ]
+    );
+    try {
+     f();
+    } catch(E) {
+     var error = 'Error: ' + js2JSON(E);
+     obj.error.sdump('D_ERROR',error);
+     throw(E);
+    }
+   }
+  );
+
+  this.chain.push(
+   function() {
+    var f = gen_fm_retrieval_func(
+     'au',
+     [
+      api.FM_AU_RETRIEVE_VIA_SESSION.app,
+      api.FM_AU_RETRIEVE_VIA_SESSION.method,
+      [ obj.session.key ],
+      false
+     ]
+    );
+    try {
+     f();
+    } catch(E) {
+     var error = 'Error: ' + js2JSON(E);
+     obj.error.sdump('D_ERROR',error);
+     throw(E);
+    }
+    obj.list.au = [ obj.list.au ];
+   }
+  );
+
+  this.chain.push(
+   function() {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    var f = gen_fm_retrieval_func(
+     'my_asv',
+     [
+      api.FM_ASV_RETRIEVE_REQUIRED.app,
+      api.FM_ASV_RETRIEVE_REQUIRED.method,
+      [ obj.session.key ],
+      true
+     ]
+    );
+    try {
+     netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+     f();
+    } catch(E) {
+     var error = 'Error: ' + js2JSON(E);
+     obj.error.sdump('D_ERROR',error);
+     throw(E);
+    }
+   }
+  );
+
+  this.chain.push(
+   function() {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    var f = gen_fm_retrieval_func(
+     'asv',
+     [
+      api.FM_ASV_RETRIEVE.app,
+      api.FM_ASV_RETRIEVE.method,
+      [ obj.session.key ],
+      true
+     ]
+    );
+    try {
+     netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+     f();
+    } catch(E) {
+     var error = 'Error: ' + js2JSON(E);
+     obj.error.sdump('D_ERROR',error);
+     throw(E);
+    }
+   }
+  );
+
+  obj.error.sdump('D_DEBUG','_fm_objects = ' + js2JSON(this._fm_objects) + '\n');
+
+  for (var i in this._fm_objects) {
+   this.chain.push( gen_fm_retrieval_func(i,this._fm_objects[i]) );
+  }
+
+  // The previous org_tree call returned a tree, not a list or hash.
+  this.chain.push(
+   function () {
+    obj.tree.aou = obj.list.aou;
+    obj.list.aou = util.fm_utils.flatten_ou_branch( obj.tree.aou );
+    for (var i = 0; i < obj.list.aou.length; i++) {
+     var c = obj.list.aou[i].children();
+     if (!c) c = [];
+     c = c.sort(
+      function( a, b ) {
+       if (a.shortname() < b.shortname()) return -1;
+       if (a.shortname() > b.shortname()) return 1;
+       return 0;
+      }
+     );
+     obj.list.aou[i].children( c );
+    }
+    obj.list.aou = util.fm_utils.flatten_ou_branch( obj.tree.aou );
+    obj.hash.aou = util.functional.convert_object_list_to_hash( obj.list.aou );
+   }
+  );
+
+  // The previous pgt call returned a tree, not a list or hash.
+  this.chain.push(
+   function () {
+    obj.tree.pgt = obj.list.pgt;
+    obj.list.pgt = util.fm_utils.flatten_ou_branch( obj.tree.pgt );
+    obj.hash.pgt = util.functional.convert_object_list_to_hash( obj.list.pgt );
+   }
+  );
+
+  // Do these after we get the user object
+
+  this.chain.push(
+   function() {
+    try {
+     var robj = obj.network.simple_request('FM_AOUS_RETRIEVE',[ obj.session.key, obj.list.au[0].ws_ou() ]);
+     if (typeof robj.ilsevent != 'undefined') throw(robj);
+     obj.hash.aous = robj;
+     obj.data_progress('Retrieved org unit settings. ');
+    } catch(E) {
+     var error = 'Error: ' + js2JSON(E);
+     obj.error.sdump('D_ERROR',error);
+     throw(E);
+    }
+   }
+  );
+
+  this.chain.push(
+
+   function() {
+
+    gen_fm_retrieval_func('my_aou', 
+     [ 
+      api.FM_AOU_RETRIEVE_RELATED_VIA_SESSION.app,
+      api.FM_AOU_RETRIEVE_RELATED_VIA_SESSION.method,
+      [ obj.session.key, obj.list.au[0].ws_ou() ], /* use ws_ou and not home_ou */
+      true
+     ]
+    )();
+   }
+  );
+
+  this.chain.push(
+
+   function () {
+
+    gen_fm_retrieval_func( 'my_actsc', 
+     [ 
+      api.FM_ACTSC_RETRIEVE_VIA_AOU.app,
+      api.FM_ACTSC_RETRIEVE_VIA_AOU.method,
+      [ obj.session.key, obj.list.au[0].ws_ou() ],
+      true
+     ]
+    )();
+   }
+  );
+
+  this.chain.push(
+
+   function () {
+
+    gen_fm_retrieval_func( 'my_asc', 
+     [ 
+      api.FM_ASC_RETRIEVE_VIA_AOU.app,
+      api.FM_ASC_RETRIEVE_VIA_AOU.method,
+      [ obj.session.key, obj.list.au[0].ws_ou() ],
+      true
+     ]
+    )();
+   }
+  );
+
+
+  this.chain.push(
+   function() {
+    var f = gen_fm_retrieval_func(
+     'cnct',
+     [
+      api.FM_CNCT_RETRIEVE.app,
+      api.FM_CNCT_RETRIEVE.method,
+      [ obj.list.au[0].ws_ou() ], 
+      false
+     ]
+    );
+    try {
+     f();
+    } catch(E) {
+     var error = 'Error: ' + js2JSON(E);
+     obj.error.sdump('D_ERROR',error);
+     throw(E);
+    }
+   }
+  );
+
+  this.chain.push(
+   function() {
+    var f = gen_fm_retrieval_func(
+     'my_cnct',
+     [
+      api.FM_CNCT_RETRIEVE.app,
+      api.FM_CNCT_RETRIEVE.method,
+      [ obj.list.au[0].ws_ou() ], 
+      false
+     ]
+    );
+    try {
+     f();
+    } catch(E) {
+     var error = 'Error: ' + js2JSON(E);
+     obj.error.sdump('D_ERROR',error);
+     throw(E);
+    }
+   }
+  );
+
+
+  this.chain.push(
+   function() {
+    var f = gen_fm_retrieval_func(
+     'acpl',
+     [
+      api.FM_ACPL_RETRIEVE.app,
+      api.FM_ACPL_RETRIEVE.method,
+      [ obj.list.au[0].ws_ou() ],
+      false
+     ]
+    );
+    try {
+     f();
+    } catch(E) {
+     var error = 'Error: ' + js2JSON(E);
+     obj.error.sdump('D_ERROR',error);
+     throw(E);
+    }
+   }
+  );
+
+  this.chain.push(
+   function() {
+    var f = gen_fm_retrieval_func(
+     'cbt',
+     [
+      api.FM_CBT_RETRIEVE.app,
+      api.FM_CBT_RETRIEVE.method,
+      [ obj.session.key, obj.list.au[0].ws_ou() ],
+      false
+     ]
+    );
+    try {
+     f();
+    } catch(E) {
+     var error = 'Error: ' + js2JSON(E);
+     obj.error.sdump('D_ERROR',error);
+     throw(E);
+    }
+   }
+  );
+
+  if (typeof this.on_complete == 'function') {
+
+   this.chain.push( this.on_complete );
+  }
+  JSAN.use('util.exec'); this.exec = new util.exec();
+  this.exec.on_error = function(E) { 
+  
+   if (typeof obj.on_error == 'function') {
+    return obj.on_error(E); /* false breaks chain */
+   } else {
+    alert('oops: ' + E ); 
+       return false; /* break chain */
+   }
+
+  }
+
+  this.exec.chain( this.chain );
+
+ }
 }
 
 dump('exiting OpenILS/data.js\n');
diff --git a/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js b/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js
index f915d244fe..7a8d493bb7 100644
--- a/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js
+++ b/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js
@@ -1,39 +1,39 @@
-	function $(id) { return document.getElementById(id); }
+ function $(id) { return document.getElementById(id); }
 
-	function ses(a) {
-		JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-		switch(a) {
+ function ses(a) {
+  JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+  switch(a) {
             case 'ws_ou' :
                 return data.list.au[0].ws_ou();
             break;
-			case 'authtime' :
-				return data.session.authtime;
-			break;
-			case 'key':
-			default:
-				return data.session.key;
-			break;
-		}
-	}
+   case 'authtime' :
+    return data.session.authtime;
+   break;
+   case 'key':
+   default:
+    return data.session.key;
+   break;
+  }
+ }
 
-	function font_helper() {
-		try {
-			JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-			removeCSSClass(document.documentElement,'ALL_FONTS_LARGER');
-			removeCSSClass(document.documentElement,'ALL_FONTS_SMALLER');
-			removeCSSClass(document.documentElement,'ALL_FONTS_XX_SMALL');
-			removeCSSClass(document.documentElement,'ALL_FONTS_X_SMALL');
-			removeCSSClass(document.documentElement,'ALL_FONTS_SMALL');
-			removeCSSClass(document.documentElement,'ALL_FONTS_MEDIUM');
-			removeCSSClass(document.documentElement,'ALL_FONTS_LARGE');
-			removeCSSClass(document.documentElement,'ALL_FONTS_X_LARGE');
-			removeCSSClass(document.documentElement,'ALL_FONTS_XX_LARGE');
-			addCSSClass(document.documentElement,data.global_font_adjust);
-		} catch(E) {
+ function font_helper() {
+  try {
+   JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+   removeCSSClass(document.documentElement,'ALL_FONTS_LARGER');
+   removeCSSClass(document.documentElement,'ALL_FONTS_SMALLER');
+   removeCSSClass(document.documentElement,'ALL_FONTS_XX_SMALL');
+   removeCSSClass(document.documentElement,'ALL_FONTS_X_SMALL');
+   removeCSSClass(document.documentElement,'ALL_FONTS_SMALL');
+   removeCSSClass(document.documentElement,'ALL_FONTS_MEDIUM');
+   removeCSSClass(document.documentElement,'ALL_FONTS_LARGE');
+   removeCSSClass(document.documentElement,'ALL_FONTS_X_LARGE');
+   removeCSSClass(document.documentElement,'ALL_FONTS_XX_LARGE');
+   addCSSClass(document.documentElement,data.global_font_adjust);
+  } catch(E) {
             var Strings = $('offlineStrings') || $('commonStrings');
-			alert(Strings.getFormattedString('openils.global_util.font_size.error', [E]));
-		}
-	}
+   alert(Strings.getFormattedString('openils.global_util.font_size.error', [E]));
+  }
+ }
 
     function persist_helper() {
         try {
@@ -87,20 +87,20 @@
         }
     }
 
-	function getKeys(o) {
-		var keys = [];
-		for (var k in o) keys.push(k);
-		return keys;
-	}
+ function getKeys(o) {
+  var keys = [];
+  for (var k in o) keys.push(k);
+  return keys;
+ }
 
-	function get_contentWindow(frame) {
+ function get_contentWindow(frame) {
         try {
             netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
             if (frame && frame.contentWindow) {
                 try {
                     if (typeof frame.contentWindow.wrappedJSObject != 'undefined') {
-									 return frame.contentWindow.wrappedJSObject;
-						  }
+          return frame.contentWindow.wrappedJSObject;
+        }
                 } catch(E) {
                     var Strings = $('offlineStrings') || $('commonStrings');
                     alert(Strings.getFormattedString('openils.global_util.content_window_jsobject.error', [frame, E]));
@@ -113,174 +113,174 @@
             var Strings = $('offlineStrings') || $('commonStrings');
             alert(Strings.getFormattedString('openils.global_util.content_window.error', [frame, E]));
         }
-	}
+ }
 
-	function update_modal_xulG(v) {
-		try {
-			JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-			var key = location.pathname + location.search + location.hash;
-			if (typeof data.modal_xulG_stack != 'undefined' && typeof data.modal_xulG_stack[key] != 'undefined') {
-				data.modal_xulG_stack[key][ data.modal_xulG_stack[key].length - 1 ] = v;
-				data.stash('modal_xulG_stack');
-			}
-		} catch(E) {
-			alert('FIXME: update_modal_xulG => ' + E);
-		}
-	}
+ function update_modal_xulG(v) {
+  try {
+   JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+   var key = location.pathname + location.search + location.hash;
+   if (typeof data.modal_xulG_stack != 'undefined' && typeof data.modal_xulG_stack[key] != 'undefined') {
+    data.modal_xulG_stack[key][ data.modal_xulG_stack[key].length - 1 ] = v;
+    data.stash('modal_xulG_stack');
+   }
+  } catch(E) {
+   alert('FIXME: update_modal_xulG => ' + E);
+  }
+ }
 
-	function xul_param(param_name,_params) {
-		/* By default, this function looks for a CGI-style query param identified by param_name.  If one isn't found, it then looks in xulG.  If one still isn't found, and _params.stash_name is true, it looks in the global xpcom stash for the field identified by stash_name.  If _params.concat is true, then it looks in all these places and concatenates the results.  There are also options for converting JSON to javascript objects, and clearing the xpcom stash_name field after retrieval.  Also added, ability to search a specific spot in the xpcom stash that implements a stack to hold xulG's for modal windows */
-		try {
-			//dump('xul_param('+param_name+','+js2JSON(_params)+')\n');
-			var value = undefined; if (!_params) _params = {};
-			if (typeof _params.no_cgi == 'undefined') {
-				var cgi = new CGI();
-				if (cgi.param(param_name)) {
-					var x = cgi.param(param_name);
-					//dump('\tfound via location.href = ' + x + '\n');
-					if (typeof _params.JSON2js_if_cgi != 'undefined') {
-						x = JSON2js( x );
-						//dump('\tJSON2js = ' + x + '\n');
-					}
-					if (typeof _params.concat == 'undefined') {
-						//alert(param_name + ' x = ' + x);
-						return x; // value
-					} else {
-						if (value) {
-							if (value.constructor != Array) value = [ value ];
-							value = value.concat(x);
-						} else {
-							value = x;
-						}
-					}
-				}
-			}
-			if (typeof _params.no_xulG == 'undefined') {
-				if (typeof _params.modal_xulG != 'undefined') {
-					JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-					var key = location.pathname + location.search + location.hash;
-					//dump('xul_param, considering modal key = ' + key + '\n');
-					if (typeof data.modal_xulG_stack != 'undefined' && typeof data.modal_xulG_stack[key] != 'undefined') {
-						xulG = data.modal_xulG_stack[key][ data.modal_xulG_stack[key].length - 1 ];
-					}
-				}
-				if (typeof xulG == 'object' && typeof xulG[ param_name ] != 'undefined') {
-					var x = xulG[ param_name ];
-					//dump('\tfound via xulG = ' + x + '\n');
-					if (typeof _params.JSON2js_if_xulG != 'undefined') {
-						x = JSON2js( x );
-						//dump('\tJSON2js = ' + x + '\n');
-					}
-					if (typeof _params.concat == 'undefined') {
-						//alert(param_name + ' x = ' + x);
-						return x; // value
-					} else {
-						if (value) {
-							if (value.constructor != Array) value = [ value ];
-							value = value.concat(x);
-						} else {
-							value = x;
-						}
-					}
-				}
-			}
-			if (typeof _params.no_xpcom == 'undefined') {
-				/* the field names used for temp variables in the global stash tend to be more unique than xuLG or CGI param names, to avoid collisions */
-				if (typeof _params.stash_name != 'undefined') { 
-					JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-					if (typeof data[ _params.stash_name ] != 'undefined') {
-						var x = data[ _params.stash_name ];
-						//dump('\tfound via xpcom = ' + x + '\n');
-						if (typeof _params.JSON2js_if_xpcom != 'undefined') {
-							x = JSON2js( x );
-							//dump('\tJSON2js = ' + x + '\n');
-						}
-						if (_params.clear_xpcom) { 
-							data[ _params.stash_name ] = undefined; data.stash( _params.stash_name ); 
-						}
-						if (typeof _params.concat == 'undefined') {
-							//alert(param_name + ' x = ' + x);
-							return x; // value
-						} else {
-							if (value) {
-								if (value.constructor != Array) value = [ value ];
-								value = value.concat(x);
-							} else {
-								value = x;
-							}
-						}
-					}
-				}
-			}
-			//alert(param_name + ' value = ' + value);
-			return value;
-		} catch(E) {
-			dump('xul_param error: ' + E + '\n');
-		}
-	}
+ function xul_param(param_name,_params) {
+  /* By default, this function looks for a CGI-style query param identified by param_name.  If one isn't found, it then looks in xulG.  If one still isn't found, and _params.stash_name is true, it looks in the global xpcom stash for the field identified by stash_name.  If _params.concat is true, then it looks in all these places and concatenates the results.  There are also options for converting JSON to javascript objects, and clearing the xpcom stash_name field after retrieval.  Also added, ability to search a specific spot in the xpcom stash that implements a stack to hold xulG's for modal windows */
+  try {
+   //dump('xul_param('+param_name+','+js2JSON(_params)+')\n');
+   var value = undefined; if (!_params) _params = {};
+   if (typeof _params.no_cgi == 'undefined') {
+    var cgi = new CGI();
+    if (cgi.param(param_name)) {
+     var x = cgi.param(param_name);
+     //dump('\tfound via location.href = ' + x + '\n');
+     if (typeof _params.JSON2js_if_cgi != 'undefined') {
+      x = JSON2js( x );
+      //dump('\tJSON2js = ' + x + '\n');
+     }
+     if (typeof _params.concat == 'undefined') {
+      //alert(param_name + ' x = ' + x);
+      return x; // value
+     } else {
+      if (value) {
+       if (value.constructor != Array) value = [ value ];
+       value = value.concat(x);
+      } else {
+       value = x;
+      }
+     }
+    }
+   }
+   if (typeof _params.no_xulG == 'undefined') {
+    if (typeof _params.modal_xulG != 'undefined') {
+     JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+     var key = location.pathname + location.search + location.hash;
+     //dump('xul_param, considering modal key = ' + key + '\n');
+     if (typeof data.modal_xulG_stack != 'undefined' && typeof data.modal_xulG_stack[key] != 'undefined') {
+      xulG = data.modal_xulG_stack[key][ data.modal_xulG_stack[key].length - 1 ];
+     }
+    }
+    if (typeof xulG == 'object' && typeof xulG[ param_name ] != 'undefined') {
+     var x = xulG[ param_name ];
+     //dump('\tfound via xulG = ' + x + '\n');
+     if (typeof _params.JSON2js_if_xulG != 'undefined') {
+      x = JSON2js( x );
+      //dump('\tJSON2js = ' + x + '\n');
+     }
+     if (typeof _params.concat == 'undefined') {
+      //alert(param_name + ' x = ' + x);
+      return x; // value
+     } else {
+      if (value) {
+       if (value.constructor != Array) value = [ value ];
+       value = value.concat(x);
+      } else {
+       value = x;
+      }
+     }
+    }
+   }
+   if (typeof _params.no_xpcom == 'undefined') {
+    /* the field names used for temp variables in the global stash tend to be more unique than xuLG or CGI param names, to avoid collisions */
+    if (typeof _params.stash_name != 'undefined') { 
+     JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+     if (typeof data[ _params.stash_name ] != 'undefined') {
+      var x = data[ _params.stash_name ];
+      //dump('\tfound via xpcom = ' + x + '\n');
+      if (typeof _params.JSON2js_if_xpcom != 'undefined') {
+       x = JSON2js( x );
+       //dump('\tJSON2js = ' + x + '\n');
+      }
+      if (_params.clear_xpcom) { 
+       data[ _params.stash_name ] = undefined; data.stash( _params.stash_name ); 
+      }
+      if (typeof _params.concat == 'undefined') {
+       //alert(param_name + ' x = ' + x);
+       return x; // value
+      } else {
+       if (value) {
+        if (value.constructor != Array) value = [ value ];
+        value = value.concat(x);
+       } else {
+        value = x;
+       }
+      }
+     }
+    }
+   }
+   //alert(param_name + ' value = ' + value);
+   return value;
+  } catch(E) {
+   dump('xul_param error: ' + E + '\n');
+  }
+ }
 
-	function get_bool(a) {
-		// Normal javascript interpretation except 'f' == false, per postgres, and 'F' == false, and '0' == false (newer JSON is returning '0' instead of 0 in cases)
-		// So false includes 'f', '', '0', 0, null, and undefined
-		if (a == 'f') return false;
-		if (a == 'F') return false;
-		if (a == '0') return false;
-		if (a) return true; else return false;
-	}
+ function get_bool(a) {
+  // Normal javascript interpretation except 'f' == false, per postgres, and 'F' == false, and '0' == false (newer JSON is returning '0' instead of 0 in cases)
+  // So false includes 'f', '', '0', 0, null, and undefined
+  if (a == 'f') return false;
+  if (a == 'F') return false;
+  if (a == '0') return false;
+  if (a) return true; else return false;
+ }
 
-	function get_db_true() {
-		return 't';
-	}
+ function get_db_true() {
+  return 't';
+ }
 
-	function get_db_false() {
-		return 'f';
-	}
+ function get_db_false() {
+  return 'f';
+ }
 
-	function copy_to_clipboard(ev) {
-		try {
-			netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-			var text;
-			if (typeof ev == 'object') {
-				if (typeof ev.target != 'undefined') {
-					if (typeof ev.target.textContent != 'undefined') if (ev.target.textContent) text = ev.target.textContent;
-					if (typeof ev.target.value != 'undefined') if (ev.target.value) text = ev.target.value;
-				}
-			} else if (typeof ev == 'string') {
-				text = ev;
-			}
-			const gClipboardHelper = Components.classes["@mozilla.org/widget/clipboardhelper;1"]
-				.getService(Components.interfaces.nsIClipboardHelper);
-			gClipboardHelper.copyString(text);
+ function copy_to_clipboard(ev) {
+  try {
+   netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+   var text;
+   if (typeof ev == 'object') {
+    if (typeof ev.target != 'undefined') {
+     if (typeof ev.target.textContent != 'undefined') if (ev.target.textContent) text = ev.target.textContent;
+     if (typeof ev.target.value != 'undefined') if (ev.target.value) text = ev.target.value;
+    }
+   } else if (typeof ev == 'string') {
+    text = ev;
+   }
+   const gClipboardHelper = Components.classes["@mozilla.org/widget/clipboardhelper;1"]
+    .getService(Components.interfaces.nsIClipboardHelper);
+   gClipboardHelper.copyString(text);
             var Strings = $('offlineStrings') || $('commonStrings');
-			alert(Strings.getFormattedString('openils.global_util.clipboard', [text]));
-		} catch(E) {
+   alert(Strings.getFormattedString('openils.global_util.clipboard', [text]));
+  } catch(E) {
             var Strings = $('offlineStrings') || $('commonStrings');
-			alert(Strings.getFormattedString('openils.global_util.clipboard.error', [E]));	
-		}
-	}
+   alert(Strings.getFormattedString('openils.global_util.clipboard.error', [E])); 
+  }
+ }
 
-	function clear_the_cache() {
-		try {
-			netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-			var cacheClass 		= Components.classes["@mozilla.org/network/cache-service;1"];
-			var cacheService	= cacheClass.getService(Components.interfaces.nsICacheService);
-			cacheService.evictEntries(Components.interfaces.nsICache.STORE_ON_DISK);
-			cacheService.evictEntries(Components.interfaces.nsICache.STORE_IN_MEMORY);
-		} catch(E) {
+ function clear_the_cache() {
+  try {
+   netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+   var cacheClass   = Components.classes["@mozilla.org/network/cache-service;1"];
+   var cacheService = cacheClass.getService(Components.interfaces.nsICacheService);
+   cacheService.evictEntries(Components.interfaces.nsICache.STORE_ON_DISK);
+   cacheService.evictEntries(Components.interfaces.nsICache.STORE_IN_MEMORY);
+  } catch(E) {
             var Strings = $('offlineStrings') || $('commonStrings');
-			alert(Strings.getFormattedString('openils.global_util.clear_cache.error', [E]));
-		}
-	}
+   alert(Strings.getFormattedString('openils.global_util.clear_cache.error', [E]));
+  }
+ }
 
-	function toOpenWindowByType(inType, uri) {
-		var winopts = "chrome,extrachrome,menubar,resizable,scrollbars,status,toolbar";
-		window.open(uri, "_blank", winopts);
-	}
+ function toOpenWindowByType(inType, uri) {
+  var winopts = "chrome,extrachrome,menubar,resizable,scrollbars,status,toolbar";
+  window.open(uri, "_blank", winopts);
+ }
 
-	function url_prefix(url) {
-		if (url.match(/^\//)) url = urls.remote + url;
-		if (! url.match(/^(http|chrome):\/\//) && ! url.match(/^data:/) ) url = 'http://' + url;
-		dump('url_prefix = ' + url + '\n');
-		return url;
-	}
+ function url_prefix(url) {
+  if (url.match(/^\//)) url = urls.remote + url;
+  if (! url.match(/^(http|chrome):\/\//) && ! url.match(/^data:/) ) url = 'http://' + url;
+  dump('url_prefix = ' + url + '\n');
+  return url;
+ }
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/OpenILS/util/fmall.js b/Open-ILS/xul/staff_client/chrome/content/OpenILS/util/fmall.js
index 2032b12336..7efb5765d9 100644
--- a/Open-ILS/xul/staff_client/chrome/content/OpenILS/util/fmall.js
+++ b/Open-ILS/xul/staff_client/chrome/content/OpenILS/util/fmall.js
@@ -1,15 +1,15 @@
 try {
-	if (typeof JSAN == 'undefined') { 
-		throw(document.getElementById('offlineStrings').getString('common.jsan.missing'));
-	}
-	JSAN.errorLevel = "die"; // none, warn, or die
-	JSAN.addRepository('..');
-	JSAN.use('OpenILS.data');
-	var data = new OpenILS.data(); data.init({'via':'stash'});
-	var url = data.server + urls.fieldmapper;
-	dump('url = ' + url + '\n');
-	var js = JSAN._loadJSFromUrl( url );
-	eval( js );
+ if (typeof JSAN == 'undefined') { 
+  throw(document.getElementById('offlineStrings').getString('common.jsan.missing'));
+ }
+ JSAN.errorLevel = "die"; // none, warn, or die
+ JSAN.addRepository('..');
+ JSAN.use('OpenILS.data');
+ var data = new OpenILS.data(); data.init({'via':'stash'});
+ var url = data.server + urls.fieldmapper;
+ dump('url = ' + url + '\n');
+ var js = JSAN._loadJSFromUrl( url );
+ eval( js );
 } catch(E) {
-	alert('fmall.js: ' + E);
+ alert('fmall.js: ' + E);
 }
diff --git a/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul b/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul
index cc4e031082..4de0edade7 100644
--- a/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul
@@ -2,22 +2,22 @@
 <overlay id="openils_util_overlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<scripts id="openils_util_scripts">
-		<script>dump('starting openils_util_overlay\n');</script>
-		<script type="text/javascript" src="../main/constants.js" />
-		<script type="text/javascript" src="util/utils.js" />
-		<script type="text/javascript" src="util/CGI.js" />
-		<script type="text/javascript" src="util/md5.js" />
-		<script type="text/javascript" src="util/JSON_v1.js" />
-		<script type="text/javascript" src="util/fmall.js" />
-		<script type="text/javascript" src="util/fmgen.js" />
-		<script type="text/javascript" src="util/RemoteRequest.js" />
-		<script type='text/javascript' src='util/en-US/OrgTree.js' />
-		<script type="text/javascript" src="util/org_utils.js" />   
-		<script type="text/javascript" src="global_util.js" />   
-		<messagecatalog id="offlineStrings" src='chrome://open_ils_staff_client/locale/offline.properties'/>
-		<script>dump('finished openils_util_overlay\n');</script>
-	</scripts>
+ <scripts id="openils_util_scripts">
+  <script>dump('starting openils_util_overlay\n');</script>
+  <script type="text/javascript" src="../main/constants.js" />
+  <script type="text/javascript" src="util/utils.js" />
+  <script type="text/javascript" src="util/CGI.js" />
+  <script type="text/javascript" src="util/md5.js" />
+  <script type="text/javascript" src="util/JSON_v1.js" />
+  <script type="text/javascript" src="util/fmall.js" />
+  <script type="text/javascript" src="util/fmgen.js" />
+  <script type="text/javascript" src="util/RemoteRequest.js" />
+  <script type='text/javascript' src='util/en-US/OrgTree.js' />
+  <script type="text/javascript" src="util/org_utils.js" />   
+  <script type="text/javascript" src="global_util.js" />   
+  <messagecatalog id="offlineStrings" src='chrome://open_ils_staff_client/locale/offline.properties'/>
+  <script>dump('finished openils_util_overlay\n');</script>
+ </scripts>
 
 </overlay>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul b/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul
index 17b7370a22..f1b4d761d8 100644
--- a/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul
@@ -4,16 +4,16 @@
 <overlay id="openils_util_overlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<script>dump('Loading OpenILS/util_overlay_offline.xul\n');</script>
-	<scripts id="openils_util_scripts">
-		<script type="text/javascript" src="../main/constants.js" />
-		<script type="text/javascript" src="util/utils.js" />
-		<script type="text/javascript" src="util/CGI.js" />
-		<script type="text/javascript" src="util/md5.js" />
-		<script type="text/javascript" src="util/JSON_v1.js" />
-		<script type="text/javascript" src="global_util.js" />
-	</scripts>
-	<script>dump('Loaded OpenILS/util_overlay_offline.xul\n');</script>
+ <script>dump('Loading OpenILS/util_overlay_offline.xul\n');</script>
+ <scripts id="openils_util_scripts">
+  <script type="text/javascript" src="../main/constants.js" />
+  <script type="text/javascript" src="util/utils.js" />
+  <script type="text/javascript" src="util/CGI.js" />
+  <script type="text/javascript" src="util/md5.js" />
+  <script type="text/javascript" src="util/JSON_v1.js" />
+  <script type="text/javascript" src="global_util.js" />
+ </scripts>
+ <script>dump('Loaded OpenILS/util_overlay_offline.xul\n');</script>
 
 </overlay>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/admin/survey.js b/Open-ILS/xul/staff_client/chrome/content/admin/survey.js
index 8bed642ac3..4b0a16d25c 100644
--- a/Open-ILS/xul/staff_client/chrome/content/admin/survey.js
+++ b/Open-ILS/xul/staff_client/chrome/content/admin/survey.js
@@ -60,225 +60,225 @@ function render_lib_menu() {
 
 
 function survey_init() {
-	dump('survey_init()\n');
-	render_lib_menu();
-	SURVEY['asv'] = new asv(); SURVEY['asv'].isnew('1');
-	SURVEY['num_of_questions'] = 0;
-	document.getElementById('survey_name').focus();
+ dump('survey_init()\n');
+ render_lib_menu();
+ SURVEY['asv'] = new asv(); SURVEY['asv'].isnew('1');
+ SURVEY['num_of_questions'] = 0;
+ document.getElementById('survey_name').focus();
 }
 
 function save_survey() {
-	SURVEY.asv.description(
-		document.getElementById('survey_description').value
-	);
-	SURVEY.asv.name(
-		document.getElementById('survey_name').value
-	);
-	SURVEY.asv.owner(
-		document.getElementById('lib_menulist').value
-	);
-	var survey_start = document.getElementById('survey_start').value;
-	if (survey_start) {
-		SURVEY.asv.start_date(
-			survey_start
-		);
-	} else {
-		SURVEY.asv.start_date(
-			null
-		);
-	}
-	var survey_end = document.getElementById('survey_end').value;
-	if (survey_end) {
-		SURVEY.asv.end_date(
-			survey_end
-		);
-	} else {
-		SURVEY.asv.end_date(
-			null
-		);
-	}
-	if ( document.getElementById('required_checkbox').checked ) {
-		SURVEY.asv.required('1');
-	} else {
-		SURVEY.asv.required('0');
-	}
-	if ( document.getElementById('opac_checkbox').checked ) {
-		SURVEY.asv.opac('1');
-	} else {
-		SURVEY.asv.opac('0');
-	}
-	if ( document.getElementById('poll_checkbox').checked ) {
-		SURVEY.asv.poll('1');
-	} else {
-		SURVEY.asv.poll('0');
-	}
-
-	if ( document.getElementById('patron_summary_checkbox').checked ) {
-		SURVEY.asv.usr_summary('1');
-	} else {
-		SURVEY.asv.usr_summary('0');
-	}
-	g.error.sdump('D_SURVEY', 'before survey = ' + js2JSON( SURVEY.asv ) + '\n');
-	try {
-		var result = g.network.request(
-			api.FM_ASV_CREATE.app,
-			api.FM_ASV_CREATE.method,
-			[ ses(), SURVEY.asv ]
-		);
-		if (! (result instanceof asv) ) {
-			throw('save_survey: result not an asv');
-		} else {
-			var surveys_list = g.OpenILS.data.list.asv;
-			var surveys_hash = g.OpenILS.data.hash.asv;
-			surveys_list.push( result );
-			surveys_hash[ result.id() ] = result;
-			g.OpenILS.data.stash('list','hash');
-		}
-	} catch(E) {
-		var err = ('Survey failed: ' + js2JSON(E) + '\n');
-		g.error.sdump('D_ERROR',err);
-		alert(err);
-		throw(err);
-	}
-	g.error.sdump('D_SURVEY', 'after  survey = ' + js2JSON( SURVEY.asv ) + '\n');
+ SURVEY.asv.description(
+  document.getElementById('survey_description').value
+ );
+ SURVEY.asv.name(
+  document.getElementById('survey_name').value
+ );
+ SURVEY.asv.owner(
+  document.getElementById('lib_menulist').value
+ );
+ var survey_start = document.getElementById('survey_start').value;
+ if (survey_start) {
+  SURVEY.asv.start_date(
+   survey_start
+  );
+ } else {
+  SURVEY.asv.start_date(
+   null
+  );
+ }
+ var survey_end = document.getElementById('survey_end').value;
+ if (survey_end) {
+  SURVEY.asv.end_date(
+   survey_end
+  );
+ } else {
+  SURVEY.asv.end_date(
+   null
+  );
+ }
+ if ( document.getElementById('required_checkbox').checked ) {
+  SURVEY.asv.required('1');
+ } else {
+  SURVEY.asv.required('0');
+ }
+ if ( document.getElementById('opac_checkbox').checked ) {
+  SURVEY.asv.opac('1');
+ } else {
+  SURVEY.asv.opac('0');
+ }
+ if ( document.getElementById('poll_checkbox').checked ) {
+  SURVEY.asv.poll('1');
+ } else {
+  SURVEY.asv.poll('0');
+ }
+
+ if ( document.getElementById('patron_summary_checkbox').checked ) {
+  SURVEY.asv.usr_summary('1');
+ } else {
+  SURVEY.asv.usr_summary('0');
+ }
+ g.error.sdump('D_SURVEY', 'before survey = ' + js2JSON( SURVEY.asv ) + '\n');
+ try {
+  var result = g.network.request(
+   api.FM_ASV_CREATE.app,
+   api.FM_ASV_CREATE.method,
+   [ ses(), SURVEY.asv ]
+  );
+  if (! (result instanceof asv) ) {
+   throw('save_survey: result not an asv');
+  } else {
+   var surveys_list = g.OpenILS.data.list.asv;
+   var surveys_hash = g.OpenILS.data.hash.asv;
+   surveys_list.push( result );
+   surveys_hash[ result.id() ] = result;
+   g.OpenILS.data.stash('list','hash');
+  }
+ } catch(E) {
+  var err = ('Survey failed: ' + js2JSON(E) + '\n');
+  g.error.sdump('D_ERROR',err);
+  alert(err);
+  throw(err);
+ }
+ g.error.sdump('D_SURVEY', 'after  survey = ' + js2JSON( SURVEY.asv ) + '\n');
 }
 
 var original_description;
 function setDescription(e,t) {
-	var page = document.getElementById(e);
-	var desc = page.getAttribute('description');
-	if (!original_description) original_description = desc;
-	var value = document.getElementById(t).value;
-	page.setAttribute('description',original_description + ' ' + value); 
+ var page = document.getElementById(e);
+ var desc = page.getAttribute('description');
+ if (!original_description) original_description = desc;
+ var value = document.getElementById(t).value;
+ page.setAttribute('description',original_description + ' ' + value); 
 }
 
 var new_id = -1;
 function add_answer(e, my_asvq_id) {
-	var row = e.target.parentNode;
-	var rows = row.parentNode;
-	var answer = e.target.previousSibling; answer.select();
-
-	if (! answer.value ) { return; }
-	
-	/* XUL */
-	var n_row = document.createElement('row');
-	rows.insertBefore( n_row, row );
-	var label_1 = document.createElement('label');
-	n_row.appendChild( label_1 );
-	var label_2 = document.createElement('label');
-		label_2.setAttribute('value', answer.value );
-	n_row.appendChild( label_2 );
-
-	/* OBJECT */
-
-	var my_asva = new asva(); my_asva.isnew('1'); my_asva.id( new_id-- );
-	my_asva.answer( answer.value );
-
-	JSAN.use('util.functional');
-	var my_asvq = util.functional.find_id_object_in_list( SURVEY.asv.questions(), my_asvq_id );
-	if (my_asvq.answers() == null) {
-		my_asvq.answers( [] );
-	}
-
-	my_asvq.answers().push( my_asva );
-
-	var num_of_answers = my_asvq.answers().length;
-	var last_number = 96 + num_of_answers;
-	var next_number = 97 + num_of_answers;
-	var last_letter = String.fromCharCode( last_number );
-	var next_letter = String.fromCharCode( next_number );
-	label_1.setAttribute('value', last_letter + ')' );
-	row.firstChild.setAttribute('value', next_letter + ')' );
-
-	if (num_of_answers == 26) {
-		rows.removeChild(row);
-	}
+ var row = e.target.parentNode;
+ var rows = row.parentNode;
+ var answer = e.target.previousSibling; answer.select();
+
+ if (! answer.value ) { return; }
+ 
+ /* XUL */
+ var n_row = document.createElement('row');
+ rows.insertBefore( n_row, row );
+ var label_1 = document.createElement('label');
+ n_row.appendChild( label_1 );
+ var label_2 = document.createElement('label');
+  label_2.setAttribute('value', answer.value );
+ n_row.appendChild( label_2 );
+
+ /* OBJECT */
+
+ var my_asva = new asva(); my_asva.isnew('1'); my_asva.id( new_id-- );
+ my_asva.answer( answer.value );
+
+ JSAN.use('util.functional');
+ var my_asvq = util.functional.find_id_object_in_list( SURVEY.asv.questions(), my_asvq_id );
+ if (my_asvq.answers() == null) {
+  my_asvq.answers( [] );
+ }
+
+ my_asvq.answers().push( my_asva );
+
+ var num_of_answers = my_asvq.answers().length;
+ var last_number = 96 + num_of_answers;
+ var next_number = 97 + num_of_answers;
+ var last_letter = String.fromCharCode( last_number );
+ var next_letter = String.fromCharCode( next_number );
+ label_1.setAttribute('value', last_letter + ')' );
+ row.firstChild.setAttribute('value', next_letter + ')' );
+
+ if (num_of_answers == 26) {
+  rows.removeChild(row);
+ }
 }
 
 function add_question() {
-	SURVEY.num_of_questions++;
-	var question = document.getElementById('new_question');
+ SURVEY.num_of_questions++;
+ var question = document.getElementById('new_question');
 
-	if (! question.value ) { return; }
+ if (! question.value ) { return; }
 
-	document.getElementById('survey_add').canAdvance = true;
+ document.getElementById('survey_add').canAdvance = true;
 
-	var my_asvq = new asvq(); my_asvq.isnew('1'); my_asvq.id( new_id-- );
-	my_asvq.question( question.value );
+ var my_asvq = new asvq(); my_asvq.isnew('1'); my_asvq.id( new_id-- );
+ my_asvq.question( question.value );
 
-	if ( SURVEY.asv.questions() == null ) {
-		SURVEY.asv.questions( [] );
-	}
+ if ( SURVEY.asv.questions() == null ) {
+  SURVEY.asv.questions( [] );
+ }
 
-	SURVEY.asv.questions().push( my_asvq );
+ SURVEY.asv.questions().push( my_asvq );
 
-	add_question_row(my_asvq);
+ add_question_row(my_asvq);
 
-	document.getElementById('new_question_label').setAttribute('value', '#' + (SURVEY.num_of_questions + 1) );
-	//question.select();
-	if (last_answer) last_answer.focus();
+ document.getElementById('new_question_label').setAttribute('value', '#' + (SURVEY.num_of_questions + 1) );
+ //question.select();
+ if (last_answer) last_answer.focus();
 }
 
 function add_question_row(my_asvq) {
-	var rows = document.getElementById('page2_grid1_rows');
-	var row = document.createElement('row');
-	rows.insertBefore(row, document.getElementById('page2_grid1_row1'));
-
-	var label_number = document.createElement('label');
-		label_number.setAttribute('value','#' + SURVEY['num_of_questions']);
-	row.appendChild(label_number);
-
-	var grid = document.createElement('grid');
-	row.appendChild(grid);
-	var g_cols = document.createElement('columns');
-	grid.appendChild(g_cols);
-	var g_col_1 = document.createElement('column');
-	g_cols.appendChild(g_col_1);
-	var g_col_2 = document.createElement('column');
-		g_col_2.setAttribute('flex','1');
-	g_cols.appendChild(g_col_2);
-	var g_col_3 = document.createElement('column');
-	g_cols.appendChild(g_col_3);
-	var g_rows = document.createElement('rows');
-	grid.appendChild(g_rows);
-	var g_row_1 = document.createElement('row');
-	g_rows.appendChild(g_row_1);
-	var g_label_1 = document.createElement('label');
-	g_row_1.appendChild(g_label_1);
-	var g_label_2 = document.createElement('label');
-		g_label_2.setAttribute('value', my_asvq.question() );
-	g_row_1.appendChild(g_label_2);
-	var g_row_2 = document.createElement('row');
-	g_rows.appendChild(g_row_2);
-	var g_label2_1 = document.createElement('label');
-		g_label2_1.setAttribute('value', 'a)' );
-	g_row_2.appendChild(g_label2_1);
-	var g_tb = document.createElement('textbox');
-		g_tb.setAttribute('flex','1');
-	g_row_2.appendChild(g_tb);
-	if (last_button) last_button.setAttribute('accesskey','');
-	var g_b = document.createElement('button');
-	var strbundle = document.getElementById("offlineStrings");
-	g_b.setAttribute('label', strbundle.getString('staff.admin.survey.save_response.label'));
-	g_b.setAttribute('accesskey', strbundle.getString('staff.admin.survey.save_response.label'));
-	g_b.setAttribute('oncommand','add_answer(event,' + my_asvq.id() + ');');
-	g_row_2.appendChild(g_b);
-
-	var blank = document.createElement('row');
-	rows.insertBefore( blank , document.getElementById('page2_grid1_row1') );
-	var blank2 = document.createElement('label');
-		blank2.setAttribute('value', ' ');
-	blank.appendChild( blank2 );
-
-	last_answer = g_tb;
-	last_button = g_b;
+ var rows = document.getElementById('page2_grid1_rows');
+ var row = document.createElement('row');
+ rows.insertBefore(row, document.getElementById('page2_grid1_row1'));
+
+ var label_number = document.createElement('label');
+  label_number.setAttribute('value','#' + SURVEY['num_of_questions']);
+ row.appendChild(label_number);
+
+ var grid = document.createElement('grid');
+ row.appendChild(grid);
+ var g_cols = document.createElement('columns');
+ grid.appendChild(g_cols);
+ var g_col_1 = document.createElement('column');
+ g_cols.appendChild(g_col_1);
+ var g_col_2 = document.createElement('column');
+  g_col_2.setAttribute('flex','1');
+ g_cols.appendChild(g_col_2);
+ var g_col_3 = document.createElement('column');
+ g_cols.appendChild(g_col_3);
+ var g_rows = document.createElement('rows');
+ grid.appendChild(g_rows);
+ var g_row_1 = document.createElement('row');
+ g_rows.appendChild(g_row_1);
+ var g_label_1 = document.createElement('label');
+ g_row_1.appendChild(g_label_1);
+ var g_label_2 = document.createElement('label');
+  g_label_2.setAttribute('value', my_asvq.question() );
+ g_row_1.appendChild(g_label_2);
+ var g_row_2 = document.createElement('row');
+ g_rows.appendChild(g_row_2);
+ var g_label2_1 = document.createElement('label');
+  g_label2_1.setAttribute('value', 'a)' );
+ g_row_2.appendChild(g_label2_1);
+ var g_tb = document.createElement('textbox');
+  g_tb.setAttribute('flex','1');
+ g_row_2.appendChild(g_tb);
+ if (last_button) last_button.setAttribute('accesskey','');
+ var g_b = document.createElement('button');
+ var strbundle = document.getElementById("offlineStrings");
+ g_b.setAttribute('label', strbundle.getString('staff.admin.survey.save_response.label'));
+ g_b.setAttribute('accesskey', strbundle.getString('staff.admin.survey.save_response.label'));
+ g_b.setAttribute('oncommand','add_answer(event,' + my_asvq.id() + ');');
+ g_row_2.appendChild(g_b);
+
+ var blank = document.createElement('row');
+ rows.insertBefore( blank , document.getElementById('page2_grid1_row1') );
+ var blank2 = document.createElement('label');
+  blank2.setAttribute('value', ' ');
+ blank.appendChild( blank2 );
+
+ last_answer = g_tb;
+ last_button = g_b;
 }
 
 function page1_check_advance() {
-	if ( document.getElementById('survey_name').value ) {
-		document.getElementById('survey_add').canAdvance = true;
-	} else {
-		document.getElementById('survey_add').canAdvance = false;
-	}
+ if ( document.getElementById('survey_name').value ) {
+  document.getElementById('survey_add').canAdvance = true;
+ } else {
+  document.getElementById('survey_add').canAdvance = false;
+ }
 }
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/admin/survey_overlay.xul b/Open-ILS/xul/staff_client/chrome/content/admin/survey_overlay.xul
index 0ac3dca092..068519c3d6 100644
--- a/Open-ILS/xul/staff_client/chrome/content/admin/survey_overlay.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/admin/survey_overlay.xul
@@ -1,96 +1,96 @@
 <?xml version="1.0"?>
 <!DOCTYPE overlay SYSTEM "chrome://open_ils_staff_client/locale/lang.dtd">
 <overlay id="survey_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<script>dump('survey_overlay.xul loading\n');</script>
+ <script>dump('survey_overlay.xul loading\n');</script>
 
-	<wizardpage id="page1" 
-		description="&staff.survey.wizard.page1;" 
-		onpageadvanced="setDescription('page2','survey_name');"
-		onpageshow="document.getElementById('survey_name').focus();"
-	>
-		<grid id="page1_grid1"/>
-	</wizardpage>
+ <wizardpage id="page1" 
+  description="&staff.survey.wizard.page1;" 
+  onpageadvanced="setDescription('page2','survey_name');"
+  onpageshow="document.getElementById('survey_name').focus();"
+ >
+  <grid id="page1_grid1"/>
+ </wizardpage>
 
-	<grid id="page1_grid1">
-		<columns id="page1_grid1_columns">
-			<column id="page1_grid1_column1"/>
-			<column id="page1_grid1_column2"/>
-		</columns>
-		<rows id="page1_grid1_rows">
-			<row id="page1_grid1_row1">
-				<label id="page1_row1_label1" value="&staff.admin.survey.available.label;" class="wizard_label"/>
+ <grid id="page1_grid1">
+  <columns id="page1_grid1_columns">
+   <column id="page1_grid1_column1"/>
+   <column id="page1_grid1_column2"/>
+  </columns>
+  <rows id="page1_grid1_rows">
+   <row id="page1_grid1_row1">
+    <label id="page1_row1_label1" value="&staff.admin.survey.available.label;" class="wizard_label"/>
                 <hbox id="placeholder" />
-			</row>
+   </row>
 
-			<row id="page1_grid1_row2">
-				<label id="page1_row2_label1" value="&staff.admin.survey.name.label;" class="wizard_label"/>
-				<textbox id="survey_name" onchange="page1_check_advance();" onkeyup="page1_check_advance();" />
-			</row>
+   <row id="page1_grid1_row2">
+    <label id="page1_row2_label1" value="&staff.admin.survey.name.label;" class="wizard_label"/>
+    <textbox id="survey_name" onchange="page1_check_advance();" onkeyup="page1_check_advance();" />
+   </row>
 
-			<row id="page1_grid1_row3">
-				<label id="page1_row3_label1" value="&staff.admin.survey.description.label;" class="wizard_label"/>
-				<textbox id="survey_description" multiline="true" rows="4"/>
-			</row>
+   <row id="page1_grid1_row3">
+    <label id="page1_row3_label1" value="&staff.admin.survey.description.label;" class="wizard_label"/>
+    <textbox id="survey_description" multiline="true" rows="4"/>
+   </row>
 
-			<row>
-				<label id="page1_row1_label2" value="&staff.admin.survey.required.label;" class="wizard_label"/>
-				<checkbox id="required_checkbox"/>
-			</row>
-			
-			<row id="page1_grid1_row1c">
-				<label id="page1_row1c_label3" value="&staff.admin.survey.format.label;" class="wizard_label"/>
-				<checkbox id="poll_checkbox"/>
-			</row>
+   <row>
+    <label id="page1_row1_label2" value="&staff.admin.survey.required.label;" class="wizard_label"/>
+    <checkbox id="required_checkbox"/>
+   </row>
+   
+   <row id="page1_grid1_row1c">
+    <label id="page1_row1c_label3" value="&staff.admin.survey.format.label;" class="wizard_label"/>
+    <checkbox id="poll_checkbox"/>
+   </row>
 
 
-			<row id="page1_grid1_row1a">
-				<label id="page1_row1a_label3" value="&staff.admin.survey.opac_visible.label;" class="wizard_label"/>
-				<checkbox id="opac_checkbox"/>
-			</row>
+   <row id="page1_grid1_row1a">
+    <label id="page1_row1a_label3" value="&staff.admin.survey.opac_visible.label;" class="wizard_label"/>
+    <checkbox id="opac_checkbox"/>
+   </row>
 
-			<row id="page1_grid1_row1b">
-				<label id="page1_row1b_label3" value="&staff.admin.survey.staff_client.label;" class="wizard_label"/>
-				<checkbox id="patron_summary_checkbox"/>
-			</row>
-			<row id="page1_grid1_row1d">
-				<label id="page1_row2_label2" value="&staff.admin.survey.start.label;" class="wizard_label"/>
-				<textbox id="survey_start"/>
-			</row>
-			<row>
-				<label id="page1_row3_label2" value="&staff.admin.survey.end.label;" class="wizard_label"/>
-				<textbox id="survey_end"/>
-			</row>
-		</rows>
-	</grid>
+   <row id="page1_grid1_row1b">
+    <label id="page1_row1b_label3" value="&staff.admin.survey.staff_client.label;" class="wizard_label"/>
+    <checkbox id="patron_summary_checkbox"/>
+   </row>
+   <row id="page1_grid1_row1d">
+    <label id="page1_row2_label2" value="&staff.admin.survey.start.label;" class="wizard_label"/>
+    <textbox id="survey_start"/>
+   </row>
+   <row>
+    <label id="page1_row3_label2" value="&staff.admin.survey.end.label;" class="wizard_label"/>
+    <textbox id="survey_end"/>
+   </row>
+  </rows>
+ </grid>
 
-	<wizardpage id="page2" 
-		description="&staff.survey.wizard.page2;" 
-		onpageshow="document.getElementById('survey_add').canAdvance = false; document.getElementById('new_question').focus();"
-	>
-		<separator id="page2_separator1"/>
-		<grid id="page2_grid1"/>
-	</wizardpage>
+ <wizardpage id="page2" 
+  description="&staff.survey.wizard.page2;" 
+  onpageshow="document.getElementById('survey_add').canAdvance = false; document.getElementById('new_question').focus();"
+ >
+  <separator id="page2_separator1"/>
+  <grid id="page2_grid1"/>
+ </wizardpage>
 
-	<grid id='page2_grid1'>
-		<columns id="page2_grid1_columns">
-			<column id="page2_grid1_column1"/>
-			<column id="page2_grid1_column2" flex="1"/>
-			<column id="page2_grid1_column3"/>
-		</columns>
-		<rows id="page2_grid1_rows"/>
-	</grid>
+ <grid id='page2_grid1'>
+  <columns id="page2_grid1_columns">
+   <column id="page2_grid1_column1"/>
+   <column id="page2_grid1_column2" flex="1"/>
+   <column id="page2_grid1_column3"/>
+  </columns>
+  <rows id="page2_grid1_rows"/>
+ </grid>
 
 
-	<rows id="page2_grid1_rows">
-		<row id="page2_grid1_row1">
-			<label id="new_question_label" value="#1"/>
-			<textbox id="new_question" flex="1"/>
-			<button id="page2_button1" label="&staff.admin.survey.save_question.label;" accesskey="&staff.admin.survey.save_question.accesskey;" oncommand="add_question(event);"/>
-		</row>
-	</rows>
+ <rows id="page2_grid1_rows">
+  <row id="page2_grid1_row1">
+   <label id="new_question_label" value="#1"/>
+   <textbox id="new_question" flex="1"/>
+   <button id="page2_button1" label="&staff.admin.survey.save_question.label;" accesskey="&staff.admin.survey.save_question.accesskey;" oncommand="add_question(event);"/>
+  </row>
+ </rows>
 
-	<script>dump('survey_overlay.xul loaded\n');</script>
+ <script>dump('survey_overlay.xul loaded\n');</script>
 </overlay>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul b/Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul
index 11930178b8..cc46c85f50 100644
--- a/Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul
@@ -2,65 +2,65 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://open_ils_staff_client/skin/global.css" type="text/css"?>
 
-	<!-- Overlays for this XUL file -->
-	<?xul-overlay href="chrome://open_ils_staff_client/content/admin/survey_overlay.xul"?>
-	<?xul-overlay href="chrome://open_ils_staff_client/content/OpenILS/util_overlay_chrome.xul"?>
+ <!-- Overlays for this XUL file -->
+ <?xul-overlay href="chrome://open_ils_staff_client/content/admin/survey_overlay.xul"?>
+ <?xul-overlay href="chrome://open_ils_staff_client/content/OpenILS/util_overlay_chrome.xul"?>
 
 <!-- This DTD declaration needs to be fixed for Mozilla locales -->
 <!DOCTYPE wizard SYSTEM "chrome://open_ils_staff_client/locale/lang.dtd">
 <wizard id="survey_add" title="&staff.survey.wizard.title;" 
-	orient="vertical" style="overflow: auto" width="800" height="600"
-	onload="try{ my_init(); } catch(E) { alert(E); }"
-	onwizardfinish="save_survey();"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ orient="vertical" style="overflow: auto" width="800" height="600"
+ onload="try{ my_init(); } catch(E) { alert(E); }"
+ onwizardfinish="save_survey();"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script>dump('survey_wizard.xul loading\n');</script>
-	<script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
-	<script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
-	<scripts id="openils_util_scripts"/>
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
+ <script>dump('survey_wizard.xul loading\n');</script>
+ <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
+ <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
+ <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="chrome://open_ils_staff_client/content/admin/survey.js" />
-	<script type="text/javascript">
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		        if (typeof JSAN == 'undefined') { throw( document.getElementById("offlineStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('..');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for survey_wizard.xul');
+ <script type="text/javascript" src="chrome://open_ils_staff_client/content/admin/survey.js" />
+ <script type="text/javascript">
+ <![CDATA[
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+          if (typeof JSAN == 'undefined') { throw( document.getElementById("offlineStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('..');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for survey_wizard.xul');
 
-				g.cgi = new CGI();
+    g.cgi = new CGI();
 
-				JSAN.use('OpenILS.data'); g.OpenILS = {};
-				g.OpenILS.data = new OpenILS.data(); g.OpenILS.data.init({'via':'stash'});
+    JSAN.use('OpenILS.data'); g.OpenILS = {};
+    g.OpenILS.data = new OpenILS.data(); g.OpenILS.data.init({'via':'stash'});
 
-				XML_HTTP_SERVER = g.OpenILS.data.server_unadorned;
+    XML_HTTP_SERVER = g.OpenILS.data.server_unadorned;
 
-				JSAN.use('util.network');
-				g.network = new util.network();
+    JSAN.use('util.network');
+    g.network = new util.network();
 
-				survey_init(); // legacy init
-				document.getElementById('survey_add').canAdvance = false; 
-	
-			} catch(E) {
-				var err_msg = document.getElementById("offlineStrings").getFormattedString('common.exception', ['survey_wizard.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-	]]>
-	</script>
+    survey_init(); // legacy init
+    document.getElementById('survey_add').canAdvance = false; 
+ 
+   } catch(E) {
+    var err_msg = document.getElementById("offlineStrings").getFormattedString('common.exception', ['survey_wizard.xul', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+ ]]>
+ </script>
 
-	<messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+ <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
-	<!-- Layout to be filled in by overlays and javascript -->
-	<wizardpage id="page1"/>
-	<wizardpage id="page2"/>
+ <!-- Layout to be filled in by overlays and javascript -->
+ <wizardpage id="page1"/>
+ <wizardpage id="page2"/>
 
-	<script>dump('survey_wizard.xul loaded\n');</script>
+ <script>dump('survey_wizard.xul loaded\n');</script>
 </wizard>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/auth/controller.js b/Open-ILS/xul/staff_client/chrome/content/auth/controller.js
index c48565c83a..cdf36ca5af 100644
--- a/Open-ILS/xul/staff_client/chrome/content/auth/controller.js
+++ b/Open-ILS/xul/staff_client/chrome/content/auth/controller.js
@@ -3,63 +3,63 @@ dump('entering auth/controller.js\n');
 
 if (typeof auth == 'undefined') auth = {};
 auth.controller = function (params) {
-	JSAN.use('util.error'); this.error = new util.error();
-	this.w = params.window;
+ JSAN.use('util.error'); this.error = new util.error();
+ this.w = params.window;
 
-	return this;
+ return this;
 };
 
 auth.controller.prototype = {
 
-	'init' : function () {
-
-		var obj = this;  // so the 'this' in event handlers don't confuse us
-		var w = obj.w;
-
-		JSAN.use('OpenILS.data');
-		obj.data = new OpenILS.data(); obj.data.init({'via':'stash'});
-
-		// MVC
-		JSAN.use('util.controller'); obj.controller = new util.controller();
-		obj.controller.init(
-			{
-				'control_map' : {
-					'cmd_login' : [
-						['command'],
-						function() {
-							obj.login();
-						}
-					],
-					'cmd_standalone' : [
-						['command'],
-						function() {
-							obj.standalone();
-						}
-					],
-					'cmd_standalone_import' : [
-						['command'],
-						function() {
-							obj.standalone_import();
-						}
-					],
-					'cmd_standalone_export' : [
-						['command'],
-						function() {
-							obj.standalone_export();
-						}
-					],
-					'cmd_clear_cache' : [
-						['command'],
-						function() {
-							obj.debug('clear_cache');
-						}
-					],
-					'cmd_js_console' : [
-						['command'],
-						function() {
-							obj.debug('js_console');
-						}
-					],
+ 'init' : function () {
+
+  var obj = this;  // so the 'this' in event handlers don't confuse us
+  var w = obj.w;
+
+  JSAN.use('OpenILS.data');
+  obj.data = new OpenILS.data(); obj.data.init({'via':'stash'});
+
+  // MVC
+  JSAN.use('util.controller'); obj.controller = new util.controller();
+  obj.controller.init(
+   {
+    'control_map' : {
+     'cmd_login' : [
+      ['command'],
+      function() {
+       obj.login();
+      }
+     ],
+     'cmd_standalone' : [
+      ['command'],
+      function() {
+       obj.standalone();
+      }
+     ],
+     'cmd_standalone_import' : [
+      ['command'],
+      function() {
+       obj.standalone_import();
+      }
+     ],
+     'cmd_standalone_export' : [
+      ['command'],
+      function() {
+       obj.standalone_export();
+      }
+     ],
+     'cmd_clear_cache' : [
+      ['command'],
+      function() {
+       obj.debug('clear_cache');
+      }
+     ],
+     'cmd_js_console' : [
+      ['command'],
+      function() {
+       obj.debug('js_console');
+      }
+     ],
                     'cmd_debugger' : [
                         ['command'],
                         function() {
@@ -84,30 +84,30 @@ auth.controller.prototype = {
                             start_js_shell();
                         }
                     ],
-					'cmd_override' : [
-						['command'],
-						function() {
-							obj.override();
-						}
-					],
-					'cmd_logoff' : [
-						['command'],
-						function() {
-							obj.logoff()
-						}
-					],
-					'cmd_close_window' : [
-						['command'],
-						function() {
-							obj.close()
-						}
-					],
-					'cmd_test_server' : [
-						['command'],
-						function() {
-							obj.test_server( obj.controller.view.server_prompt.value );
-						}
-					],
+     'cmd_override' : [
+      ['command'],
+      function() {
+       obj.override();
+      }
+     ],
+     'cmd_logoff' : [
+      ['command'],
+      function() {
+       obj.logoff()
+      }
+     ],
+     'cmd_close_window' : [
+      ['command'],
+      function() {
+       obj.close()
+      }
+     ],
+     'cmd_test_server' : [
+      ['command'],
+      function() {
+       obj.test_server( obj.controller.view.server_prompt.value );
+      }
+     ],
                     'ssl_exception' : [
                         ['render'],
                         function(e) {
@@ -136,13 +136,13 @@ auth.controller.prototype = {
                                     'prefetchCert' : true 
                                 } 
                             );
-		                    obj.test_server( obj.controller.view.server_prompt.value );
+                      obj.test_server( obj.controller.view.server_prompt.value );
                         }
                     ],
-					'server_prompt' : [
-						['keypress'],
-						handle_keypress
-					],
+     'server_prompt' : [
+      ['keypress'],
+      handle_keypress
+     ],
                     'server_menu' : [
                         ['render'],
                         function(e) {
@@ -156,405 +156,405 @@ auth.controller.prototype = {
                             };
                         }
                     ],
-					'name_prompt' : [
-						['keypress'],
-						handle_keypress
-					],
-					'password_prompt' : [
-						['keypress'],
-						handle_keypress
-					],
-					'submit_button' : [
-						['render'],
-						function(e) { return function() {} }
-					],
-					'apply_locale_btn' : [
-						['render'],
-						function(e) { return function() {} }
-					],
-					'progress_bar' : [
-						['render'],
-						function(e) { return function() {} }
-					],
-					'status' : [
-						['render'],
-						function(e) { return function() {
-						} }
-					],
-					'ws_deck' : [
-						['render'],
-						function(e) { return function() {
-							try {
-								JSAN.use('util.widgets'); util.widgets.remove_children(e);
-								var x = document.createElement('description');
-								e.appendChild(x);
-								if (obj.data.ws_info 
-									&& obj.data.ws_info[ obj.controller.view.server_prompt.value ]) {
-									var ws = obj.data.ws_info[ obj.controller.view.server_prompt.value ];
-									x.appendChild(
-										document.createTextNode(
-											ws.name /*+ ' @  ' + ws.lib_shortname*/
-										)
-									);
-									netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-									JSAN.use('util.file'); var file = new util.file('last_ws_server');
-									file.set_object(obj.controller.view.server_prompt.value);
-									file.close();
-								} else {
-									x.appendChild(
-										document.createTextNode(
-											document.getElementById('authStrings').getString('staff.auth.controller.not_configured')
-										)
-									);
-								}
-							} catch(E) {
-								alert(E);
-							}
-						} }
-					],
-					'menu_spot' : [
-						['render'],
-						function(e) { return function() {
-						} }
-					],
-
-				}
-			}
-		);
-		obj.controller.view.name_prompt.focus();
-
-		function handle_keypress(ev) {
-			try {
-				if (ev.keyCode && ev.keyCode == 13) {
-					switch(this) {
-						case obj.controller.view.server_prompt:
-							ev.preventDefault();
-							obj.controller.view.name_prompt.focus(); obj.controller.view.name_prompt.select();
-						break;
-						case obj.controller.view.name_prompt:
-							ev.preventDefault();
-							obj.controller.view.password_prompt.focus(); obj.controller.view.password_prompt.select();
-						break;
-						case obj.controller.view.password_prompt:
-							ev.preventDefault();
-							obj.controller.view.submit_button.focus(); 
-							obj.login();
-						break;
-						default: break;
-					}
-				}
-			} catch(E) {
-				alert(E);
-			}
-		}
-
-		obj.controller.view.server_prompt.addEventListener(
-			'change',
-			function (ev) { 
-				obj.test_server(ev.target.value);
-				obj.controller.render('ws_deck'); 
-			},
-			false
-		);
+     'name_prompt' : [
+      ['keypress'],
+      handle_keypress
+     ],
+     'password_prompt' : [
+      ['keypress'],
+      handle_keypress
+     ],
+     'submit_button' : [
+      ['render'],
+      function(e) { return function() {} }
+     ],
+     'apply_locale_btn' : [
+      ['render'],
+      function(e) { return function() {} }
+     ],
+     'progress_bar' : [
+      ['render'],
+      function(e) { return function() {} }
+     ],
+     'status' : [
+      ['render'],
+      function(e) { return function() {
+      } }
+     ],
+     'ws_deck' : [
+      ['render'],
+      function(e) { return function() {
+       try {
+        JSAN.use('util.widgets'); util.widgets.remove_children(e);
+        var x = document.createElement('description');
+        e.appendChild(x);
+        if (obj.data.ws_info 
+         && obj.data.ws_info[ obj.controller.view.server_prompt.value ]) {
+         var ws = obj.data.ws_info[ obj.controller.view.server_prompt.value ];
+         x.appendChild(
+          document.createTextNode(
+           ws.name /*+ ' @  ' + ws.lib_shortname*/
+          )
+         );
+         netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+         JSAN.use('util.file'); var file = new util.file('last_ws_server');
+         file.set_object(obj.controller.view.server_prompt.value);
+         file.close();
+        } else {
+         x.appendChild(
+          document.createTextNode(
+           document.getElementById('authStrings').getString('staff.auth.controller.not_configured')
+          )
+         );
+        }
+       } catch(E) {
+        alert(E);
+       }
+      } }
+     ],
+     'menu_spot' : [
+      ['render'],
+      function(e) { return function() {
+      } }
+     ],
+
+    }
+   }
+  );
+  obj.controller.view.name_prompt.focus();
+
+  function handle_keypress(ev) {
+   try {
+    if (ev.keyCode && ev.keyCode == 13) {
+     switch(this) {
+      case obj.controller.view.server_prompt:
+       ev.preventDefault();
+       obj.controller.view.name_prompt.focus(); obj.controller.view.name_prompt.select();
+      break;
+      case obj.controller.view.name_prompt:
+       ev.preventDefault();
+       obj.controller.view.password_prompt.focus(); obj.controller.view.password_prompt.select();
+      break;
+      case obj.controller.view.password_prompt:
+       ev.preventDefault();
+       obj.controller.view.submit_button.focus(); 
+       obj.login();
+      break;
+      default: break;
+     }
+    }
+   } catch(E) {
+    alert(E);
+   }
+  }
+
+  obj.controller.view.server_prompt.addEventListener(
+   'change',
+   function (ev) { 
+    obj.test_server(ev.target.value);
+    obj.controller.render('ws_deck'); 
+   },
+   false
+  );
         obj.controller.view.server_prompt.addEventListener(
             'command',
             function (ev) {
                 obj.controller.view.name_prompt.focus();
                 obj.controller.view.name_prompt.select();
-				obj.test_server(ev.target.value);
-				obj.controller.render('ws_deck'); 
+    obj.test_server(ev.target.value);
+    obj.controller.render('ws_deck'); 
             },
             false
         );
 
-		// This talks to our ILS
-		JSAN.use('auth.session');
-		obj.session = new auth.session(obj.controller.view);
-
-		obj.controller.render();
-		obj.test_server( obj.controller.view.server_prompt.value );
-		obj.controller.render('ws_deck'); 
-
-		if (typeof this.on_init == 'function') {
-			this.error.sdump('D_AUTH','auth.controller.on_init()\n');
-			this.on_init();
-		}
-	},
-
-	'test_server' : function(url) {
-		var obj = this;
-		if (!url) {
-			netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-			JSAN.use('util.file'); var file = new util.file('last_ws_server');
-			if (file._file.exists()) {
-				url = file.get_object(); file.close();
-				obj.controller.view.server_prompt.value = url;
-			}
-		}
-		obj.controller.view.submit_button.disabled = true;
-		obj.controller.view.server_prompt.disabled = true;
-		var s = document.getElementById('status');
-		s.setAttribute('value', document.getElementById('authStrings').getString('staff.auth.controller.testing_hostname'));
-		s.setAttribute('style','color: orange;');
-		document.getElementById('version').value = '';
-		if (!url) {
-			s.setAttribute('value', document.getElementById('authStrings').getString('staff.auth.controller.prompt_hostname'));
-			s.setAttribute('style','color: red;');
-			obj.controller.view.server_prompt.disabled = false;
-			obj.controller.view.server_prompt.focus();
-			return;
-		}
-		try {
-			if ( ! url.match(/^https:\/\//) ) url = 'https://' + url;
-			var x = new XMLHttpRequest();
-			dump('server url = ' + url + '\n');
-			x.open("GET",url,true);
-			x.onreadystatechange = function() {
-				try {
-					if (x.readyState != 4) return;
-					s.setAttribute('value', document.getElementById('authStrings').getFormattedString('staff.auth.controller.status', [x.status, x.statusText]));
-					if (x.status == 200) {
-						s.setAttribute('style','color: green;');
-					} else {
-						s.setAttribute('style','color: red;');
-					}
-					obj.test_version(url);
-				} catch(E) {
-					obj.controller.view.server_prompt.disabled = false;
-					obj.controller.view.server_prompt.focus();
-					s.setAttribute('value', document.getElementById('authStrings').getString('staff.auth.controller.error_hostname'));
-					s.setAttribute('style','color: red;');
-					obj.error.sdump('D_ERROR',E);
-				}
-			}
-			x.send(null);
-		} catch(E) {
-			s.setAttribute('value', document.getElementById('authStrings').getString('staff.auth.controller.error_hostname'));
-			s.setAttribute('style','color: brown;');
-			obj.error.sdump('D_ERROR',E);
-			obj.controller.view.server_prompt.disabled = false;
-			obj.controller.view.server_prompt.focus();
-		}
-	},
-
-	'test_version' : function(url) {
-		var obj = this;
-		var s = document.getElementById('version');
-		s.setAttribute('value', document.getElementById('authStrings').getString('staff.auth.controller.testing_version'));
-		s.setAttribute('style','color: orange;');
-		try {
-			var x = new XMLHttpRequest();
-			var url2 = url + '/xul/server/';
-			dump('version url = ' + url2 + '\n');
-			x.open("GET",url2,true);
-			x.onreadystatechange = function() {
-				try {
-					if (x.readyState != 4) return;
-					s.setAttribute('value', document.getElementById('authStrings').getFormattedString('staff.auth.controller.status', [x.status, x.statusText]));
-					if (x.status == 200) {
-						s.setAttribute('style','color: green;');
-						obj.controller.view.submit_button.disabled = false;
-					} else {
-						s.setAttribute('style','color: red;');
-						obj.test_upgrade_instructions(url);
-					}
-					obj.controller.view.server_prompt.disabled = false;
-				} catch(E) {
-					s.setAttribute('value', document.getElementById('authStrings').getString('staff.auth.controller.error_version'));
-					s.setAttribute('style','color: red;');
-					obj.error.sdump('D_ERROR',E);
-					obj.controller.view.server_prompt.disabled = false;
-				}
-			}
-			x.send(null);
-		} catch(E) {
-			s.setAttribute('value', document.getElementById('authStrings').getString('staff.auth.controller.error_version'));
-			s.setAttribute('style','color: brown;');
-			obj.error.sdump('D_ERROR',E);
-			obj.controller.view.server_prompt.disabled = false;
-		}
-	},
-
-	'test_upgrade_instructions' : function(url) {
-		var obj = this;
-		try {
-			var x = new XMLHttpRequest();
-			var url2 = url + '/xul/versions.html';
-			dump('upgrade url = ' + url2 + '\n');
-			x.open("GET",url2,true);
-			x.onreadystatechange = function() {
-				try {
-					if (x.readyState != 4) return;
-					if (x.status == 200) {
-						window.open('data:text/html,'+window.escape(x.responseText),'upgrade','chrome,resizable,modal,centered');
-					} else {
-						alert(document.getElementById('authStrings').getString('staff.auth.controller.version_mismatch'));
-					}
-					obj.controller.view.server_prompt.disabled = false;
-				} catch(E) {
-					obj.error.sdump('D_ERROR',E);
-					obj.controller.view.server_prompt.disabled = false;
-				}
-			}
-			x.send(null);
-		} catch(E) {
-			obj.error.sdump('D_ERROR',E);
-			obj.controller.view.server_prompt.disabled = false;
-		}
-	},
-
-	'login' : function() { 
-
-		var obj = this;
-
-		this.error.sdump('D_AUTH',
-			document.getElementById('authStrings').getFormattedString(
-				'staff.auth.controller.error_login', [
-					this.controller.view.name_prompt.value,
-					this.controller.view.password_prompt.value,
-					this.controller.view.server_prompt.value
-				]
-			)
-		); 
-		this.controller.view.server_prompt.disabled = true;
-		this.controller.view.name_prompt.disabled = true;
-		this.controller.view.password_prompt.disabled = true;
-		this.controller.view.submit_button.disabled = true;
-		this.controller.view.apply_locale_btn.disabled = true;
-		XML_HTTP_SERVER = this.controller.view.server_prompt.value;
-
-		try {
-
-			if (typeof this.on_login == 'function') {
-				this.error.sdump('D_AUTH','auth.controller.session.on_init = ' +
-					'auth.controller.on_login\n');
-				this.session.on_init = this.on_login;
-				this.session.on_error = function() { obj.logoff(); };
-			}
-			
-			this.session.init();
-
-		} catch(E) {
-			var error = '!! ' + E + '\n';
-			this.error.sdump('D_ERROR',error); 
-			alert(error);
-			this.logoff();
-			if (E == 'open-ils.auth.authenticate.init returned false\n') {
-				this.controller.view.server_prompt.focus();
-				this.controller.view.server_prompt.select();
-			}
-
-			if (typeof this.on_login_error == 'function') {
-				this.error.sdump('D_AUTH','auth.controller.on_login_error()\n');
-				this.on_login_error(E);
-			}
-		}
-
-	},
-
-	'standalone' : function() {
-		var obj = this;
-		try {
-			if (typeof this.on_standalone == 'function') {
-				obj.on_standalone();
-			}
-		} catch(E) {
-			var error = '!! ' + E + '\n';
-			obj.error.sdump('D_ERROR',error); 
-			alert(error);
-		}
-	},
-
-	'standalone_import' : function() {
-		var obj = this;
-		try {
-			if (typeof this.on_standalone_import == 'function') {
-				obj.on_standalone_import();
-			}
-		} catch(E) {
-			var error = '!! ' + E + '\n';
-			obj.error.sdump('D_ERROR',error); 
-			alert(error);
-		}
-	},
-
-	'standalone_export' : function() {
-		var obj = this;
-		try {
-			if (typeof this.on_standalone_export == 'function') {
-				obj.on_standalone_export();
-			}
-		} catch(E) {
-			var error = '!! ' + E + '\n';
-			obj.error.sdump('D_ERROR',error); 
-			alert(error);
-		}
-	},
-
-	'debug' : function(action) {
-		var obj = this;
-		try {
-			if (typeof this.on_debug == 'function') {
-				obj.on_debug(action);
-			}
-		} catch(E) {
-			var error = '!! ' + E + '\n';
-			obj.error.sdump('D_ERROR',error);
-			alert(error);
-		}
-	},
-
-	'logoff' : function() { 
-	
-		this.error.sdump('D_AUTH','logoff' + this.w + '\n'); 
-		this.controller.view.progress_bar.value = 0; 
-		this.controller.view.progress_bar.setAttribute('real','0.0');
-		this.controller.view.submit_button.disabled = false;
-		this.controller.view.apply_locale_btn.disabled = false;
-		this.controller.view.password_prompt.disabled = false;
-		this.controller.view.password_prompt.value = '';
-		this.controller.view.name_prompt.disabled = false;
-		this.controller.view.name_prompt.focus(); 
-		this.controller.view.name_prompt.select();
-		this.controller.view.server_prompt.disabled = false;
-
-		var windowManager = Components.classes["@mozilla.org/appshell/window-mediator;1"].getService();
-		var windowManagerInterface = windowManager.QueryInterface(Components.interfaces.nsIWindowMediator);
-		var enumerator = windowManagerInterface.getEnumerator(null);
-
-		var w; // close all other windows
-		while ( w = enumerator.getNext() ) {
-			if (w != window) w.close();
-		}
-
-		this.controller.render('ws_deck');
-
-		this.session.close();
-
-		/* FIXME - need some locking or object destruction for the async tests */
-		/* this.test_server( this.controller.view.server_prompt.value ); */
-
-		if (typeof this.on_logoff == 'function') {
-			this.error.sdump('D_AUTH','auth.controller.on_logoff()\n');
-			this.on_logoff();
-		}
-		
-	},
-	'close' : function() { 
-	
-		this.error.sdump('D_AUTH','close' + this.w + '\n');
-
-		if (window.confirm(document.getElementById('authStrings').getString('staff.auth.controller.confirm_close'))) {
-			this.logoff();
-			this.w.close(); /* Probably won't go any further */
-
-			if (typeof this.on_close == 'function') {
-				this.error.sdump('D_AUTH','auth.controller.on_close()\n');
-				this.on_close();
-			}
-		}
-		
-	}
+  // This talks to our ILS
+  JSAN.use('auth.session');
+  obj.session = new auth.session(obj.controller.view);
+
+  obj.controller.render();
+  obj.test_server( obj.controller.view.server_prompt.value );
+  obj.controller.render('ws_deck'); 
+
+  if (typeof this.on_init == 'function') {
+   this.error.sdump('D_AUTH','auth.controller.on_init()\n');
+   this.on_init();
+  }
+ },
+
+ 'test_server' : function(url) {
+  var obj = this;
+  if (!url) {
+   netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+   JSAN.use('util.file'); var file = new util.file('last_ws_server');
+   if (file._file.exists()) {
+    url = file.get_object(); file.close();
+    obj.controller.view.server_prompt.value = url;
+   }
+  }
+  obj.controller.view.submit_button.disabled = true;
+  obj.controller.view.server_prompt.disabled = true;
+  var s = document.getElementById('status');
+  s.setAttribute('value', document.getElementById('authStrings').getString('staff.auth.controller.testing_hostname'));
+  s.setAttribute('style','color: orange;');
+  document.getElementById('version').value = '';
+  if (!url) {
+   s.setAttribute('value', document.getElementById('authStrings').getString('staff.auth.controller.prompt_hostname'));
+   s.setAttribute('style','color: red;');
+   obj.controller.view.server_prompt.disabled = false;
+   obj.controller.view.server_prompt.focus();
+   return;
+  }
+  try {
+   if ( ! url.match(/^https:\/\//) ) url = 'https://' + url;
+   var x = new XMLHttpRequest();
+   dump('server url = ' + url + '\n');
+   x.open("GET",url,true);
+   x.onreadystatechange = function() {
+    try {
+     if (x.readyState != 4) return;
+     s.setAttribute('value', document.getElementById('authStrings').getFormattedString('staff.auth.controller.status', [x.status, x.statusText]));
+     if (x.status == 200) {
+      s.setAttribute('style','color: green;');
+     } else {
+      s.setAttribute('style','color: red;');
+     }
+     obj.test_version(url);
+    } catch(E) {
+     obj.controller.view.server_prompt.disabled = false;
+     obj.controller.view.server_prompt.focus();
+     s.setAttribute('value', document.getElementById('authStrings').getString('staff.auth.controller.error_hostname'));
+     s.setAttribute('style','color: red;');
+     obj.error.sdump('D_ERROR',E);
+    }
+   }
+   x.send(null);
+  } catch(E) {
+   s.setAttribute('value', document.getElementById('authStrings').getString('staff.auth.controller.error_hostname'));
+   s.setAttribute('style','color: brown;');
+   obj.error.sdump('D_ERROR',E);
+   obj.controller.view.server_prompt.disabled = false;
+   obj.controller.view.server_prompt.focus();
+  }
+ },
+
+ 'test_version' : function(url) {
+  var obj = this;
+  var s = document.getElementById('version');
+  s.setAttribute('value', document.getElementById('authStrings').getString('staff.auth.controller.testing_version'));
+  s.setAttribute('style','color: orange;');
+  try {
+   var x = new XMLHttpRequest();
+   var url2 = url + '/xul/server/';
+   dump('version url = ' + url2 + '\n');
+   x.open("GET",url2,true);
+   x.onreadystatechange = function() {
+    try {
+     if (x.readyState != 4) return;
+     s.setAttribute('value', document.getElementById('authStrings').getFormattedString('staff.auth.controller.status', [x.status, x.statusText]));
+     if (x.status == 200) {
+      s.setAttribute('style','color: green;');
+      obj.controller.view.submit_button.disabled = false;
+     } else {
+      s.setAttribute('style','color: red;');
+      obj.test_upgrade_instructions(url);
+     }
+     obj.controller.view.server_prompt.disabled = false;
+    } catch(E) {
+     s.setAttribute('value', document.getElementById('authStrings').getString('staff.auth.controller.error_version'));
+     s.setAttribute('style','color: red;');
+     obj.error.sdump('D_ERROR',E);
+     obj.controller.view.server_prompt.disabled = false;
+    }
+   }
+   x.send(null);
+  } catch(E) {
+   s.setAttribute('value', document.getElementById('authStrings').getString('staff.auth.controller.error_version'));
+   s.setAttribute('style','color: brown;');
+   obj.error.sdump('D_ERROR',E);
+   obj.controller.view.server_prompt.disabled = false;
+  }
+ },
+
+ 'test_upgrade_instructions' : function(url) {
+  var obj = this;
+  try {
+   var x = new XMLHttpRequest();
+   var url2 = url + '/xul/versions.html';
+   dump('upgrade url = ' + url2 + '\n');
+   x.open("GET",url2,true);
+   x.onreadystatechange = function() {
+    try {
+     if (x.readyState != 4) return;
+     if (x.status == 200) {
+      window.open('data:text/html,'+window.escape(x.responseText),'upgrade','chrome,resizable,modal,centered');
+     } else {
+      alert(document.getElementById('authStrings').getString('staff.auth.controller.version_mismatch'));
+     }
+     obj.controller.view.server_prompt.disabled = false;
+    } catch(E) {
+     obj.error.sdump('D_ERROR',E);
+     obj.controller.view.server_prompt.disabled = false;
+    }
+   }
+   x.send(null);
+  } catch(E) {
+   obj.error.sdump('D_ERROR',E);
+   obj.controller.view.server_prompt.disabled = false;
+  }
+ },
+
+ 'login' : function() { 
+
+  var obj = this;
+
+  this.error.sdump('D_AUTH',
+   document.getElementById('authStrings').getFormattedString(
+    'staff.auth.controller.error_login', [
+     this.controller.view.name_prompt.value,
+     this.controller.view.password_prompt.value,
+     this.controller.view.server_prompt.value
+    ]
+   )
+  ); 
+  this.controller.view.server_prompt.disabled = true;
+  this.controller.view.name_prompt.disabled = true;
+  this.controller.view.password_prompt.disabled = true;
+  this.controller.view.submit_button.disabled = true;
+  this.controller.view.apply_locale_btn.disabled = true;
+  XML_HTTP_SERVER = this.controller.view.server_prompt.value;
+
+  try {
+
+   if (typeof this.on_login == 'function') {
+    this.error.sdump('D_AUTH','auth.controller.session.on_init = ' +
+     'auth.controller.on_login\n');
+    this.session.on_init = this.on_login;
+    this.session.on_error = function() { obj.logoff(); };
+   }
+   
+   this.session.init();
+
+  } catch(E) {
+   var error = '!! ' + E + '\n';
+   this.error.sdump('D_ERROR',error); 
+   alert(error);
+   this.logoff();
+   if (E == 'open-ils.auth.authenticate.init returned false\n') {
+    this.controller.view.server_prompt.focus();
+    this.controller.view.server_prompt.select();
+   }
+
+   if (typeof this.on_login_error == 'function') {
+    this.error.sdump('D_AUTH','auth.controller.on_login_error()\n');
+    this.on_login_error(E);
+   }
+  }
+
+ },
+
+ 'standalone' : function() {
+  var obj = this;
+  try {
+   if (typeof this.on_standalone == 'function') {
+    obj.on_standalone();
+   }
+  } catch(E) {
+   var error = '!! ' + E + '\n';
+   obj.error.sdump('D_ERROR',error); 
+   alert(error);
+  }
+ },
+
+ 'standalone_import' : function() {
+  var obj = this;
+  try {
+   if (typeof this.on_standalone_import == 'function') {
+    obj.on_standalone_import();
+   }
+  } catch(E) {
+   var error = '!! ' + E + '\n';
+   obj.error.sdump('D_ERROR',error); 
+   alert(error);
+  }
+ },
+
+ 'standalone_export' : function() {
+  var obj = this;
+  try {
+   if (typeof this.on_standalone_export == 'function') {
+    obj.on_standalone_export();
+   }
+  } catch(E) {
+   var error = '!! ' + E + '\n';
+   obj.error.sdump('D_ERROR',error); 
+   alert(error);
+  }
+ },
+
+ 'debug' : function(action) {
+  var obj = this;
+  try {
+   if (typeof this.on_debug == 'function') {
+    obj.on_debug(action);
+   }
+  } catch(E) {
+   var error = '!! ' + E + '\n';
+   obj.error.sdump('D_ERROR',error);
+   alert(error);
+  }
+ },
+
+ 'logoff' : function() { 
+ 
+  this.error.sdump('D_AUTH','logoff' + this.w + '\n'); 
+  this.controller.view.progress_bar.value = 0; 
+  this.controller.view.progress_bar.setAttribute('real','0.0');
+  this.controller.view.submit_button.disabled = false;
+  this.controller.view.apply_locale_btn.disabled = false;
+  this.controller.view.password_prompt.disabled = false;
+  this.controller.view.password_prompt.value = '';
+  this.controller.view.name_prompt.disabled = false;
+  this.controller.view.name_prompt.focus(); 
+  this.controller.view.name_prompt.select();
+  this.controller.view.server_prompt.disabled = false;
+
+  var windowManager = Components.classes["@mozilla.org/appshell/window-mediator;1"].getService();
+  var windowManagerInterface = windowManager.QueryInterface(Components.interfaces.nsIWindowMediator);
+  var enumerator = windowManagerInterface.getEnumerator(null);
+
+  var w; // close all other windows
+  while ( w = enumerator.getNext() ) {
+   if (w != window) w.close();
+  }
+
+  this.controller.render('ws_deck');
+
+  this.session.close();
+
+  /* FIXME - need some locking or object destruction for the async tests */
+  /* this.test_server( this.controller.view.server_prompt.value ); */
+
+  if (typeof this.on_logoff == 'function') {
+   this.error.sdump('D_AUTH','auth.controller.on_logoff()\n');
+   this.on_logoff();
+  }
+  
+ },
+ 'close' : function() { 
+ 
+  this.error.sdump('D_AUTH','close' + this.w + '\n');
+
+  if (window.confirm(document.getElementById('authStrings').getString('staff.auth.controller.confirm_close'))) {
+   this.logoff();
+   this.w.close(); /* Probably won't go any further */
+
+   if (typeof this.on_close == 'function') {
+    this.error.sdump('D_AUTH','auth.controller.on_close()\n');
+    this.on_close();
+   }
+  }
+  
+ }
 }
 
 dump('exiting auth/controller.js\n');
diff --git a/Open-ILS/xul/staff_client/chrome/content/auth/session.js b/Open-ILS/xul/staff_client/chrome/content/auth/session.js
index db1cff8883..ebb1ba8d19 100644
--- a/Open-ILS/xul/staff_client/chrome/content/auth/session.js
+++ b/Open-ILS/xul/staff_client/chrome/content/auth/session.js
@@ -4,128 +4,128 @@ dump('entering auth/session.js\n');
 if (typeof auth == 'undefined') auth = {};
 auth.session = function (view,login_type) {
 
-	JSAN.use('util.error'); this.error = new util.error();
-	JSAN.use('util.network'); this.network = new util.network();
-	this.view = view;
-	this.login_type = login_type || 'staff';
+ JSAN.use('util.error'); this.error = new util.error();
+ JSAN.use('util.network'); this.network = new util.network();
+ this.view = view;
+ this.login_type = login_type || 'staff';
 
-	return this;
+ return this;
 };
 
 auth.session.prototype = {
 
-	'init' : function () {
-
-		var obj = this;
-
-		try {
-			var init = this.network.request(
-				api.AUTH_INIT.app,
-				api.AUTH_INIT.method,
-				[ this.view.name_prompt.value ]
-			);
-
-			if (init) {
-				JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.stash_retrieve();
-
-				var params = { 
-					'username' : this.view.name_prompt.value,
-					'password' : hex_md5(
-						init +
-						hex_md5(
-							this.view.password_prompt.value
-						)
-					),
-					'type' : 'temp',
-				};
-
-				if (data.ws_info[ this.view.server_prompt.value ]) {
-					params.type = this.login_type;
-					params.workstation = data.ws_info[ this.view.server_prompt.value ].name;
-					data.ws_name = params.workstation; data.stash('ws_name');
-				}
-
-				var robj = this.network.simple_request( 'AUTH_COMPLETE', [ params ]);
-
-				switch (Number(robj.ilsevent)) {
-					case 0:
-						this.key = robj.payload.authtoken;
-						this.authtime = robj.payload.authtime;
-					break;
-					case 1520 /* WORKSTATION_NOT_FOUND */:
-						alert(document.getElementById('authStrings').getFormattedString('staff.auth.session.unregistered', [params.workstation]));
-						delete(params.workstation);
-						delete(data.ws_info[ this.view.server_prompt.value ]);
-						data.stash('ws_info');
-						data.ws_name = null; data.stash('ws_name');
-						params.type = 'temp';
-						robj = this.network.simple_request('AUTH_COMPLETE',[ params ]);
-						if (robj.ilsevent == 0) {
-							this.key = robj.payload.authtoken;
-							this.authtime = robj.payload.authtime;
-						} else {
-							//this.error.standard_unexpected_error_alert('auth.session.init',robj);
-							throw(robj);
-						}
-					break;
-					default:
-					//obj.error.standard_unexpected_error_alert('auth.session.init',robj);
-					throw(robj);
-					break;
-				}
-
-				this.error.sdump('D_AUTH','auth.session.key = ' + this.key + '\n');
-
-				if (typeof this.on_init == 'function') {
-					this.error.sdump('D_AUTH','auth.session.on_init()\n');
-					this.on_init();
-				}
-
-			} else {
-
-				var error = document.getElementById('authStrings').getString('staff.auth.session.init_false') + '\n';
-				this.error.sdump('D_ERROR',error);
-				throw(error);
-			}
-
-		} catch(E) {
-			alert(document.getElementById('authStrings').getString('staff.auth.session.login_failed'));
-			//obj.error.standard_unexpected_error_alert('Error on auth.session.init()',E); 
-
-			if (typeof this.on_init_error == 'function') {
-				this.error.sdump('D_AUTH','auth.session.on_init_error()\n');
-				this.on_init_error(E);
-			}
-			if (typeof this.on_error == 'function') {
-				this.error.sdump('D_AUTH','auth.session.on_error()\n');
-				this.on_error();
-			}
-
-			//throw(E);
-			/* This was for testing
-			if (typeof this.on_init == 'function') {
-				this.error.sdump('D_AUTH','auth.session.on_init() despite error\n');
-				this.on_init();
-			}
-			*/
-		}
-	},
-
-	'close' : function () { 
-		var obj = this;
-		obj.error.sdump('D_AUTH','auth.session.close()\n'); 
-		if (obj.key) obj.network.request(
-			api.AUTH_DELETE.app,
-			api.AUTH_DELETE.method,
-			[ obj.key ],
-			function(req) {}
-		);
-		obj.key = null;
-		if (typeof obj.on_close == 'function') {
-			obj.error.sdump('D_AUTH','auth.session.on_close()\n');
-			obj.on_close();
-		}
-	}
+ 'init' : function () {
+
+  var obj = this;
+
+  try {
+   var init = this.network.request(
+    api.AUTH_INIT.app,
+    api.AUTH_INIT.method,
+    [ this.view.name_prompt.value ]
+   );
+
+   if (init) {
+    JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.stash_retrieve();
+
+    var params = { 
+     'username' : this.view.name_prompt.value,
+     'password' : hex_md5(
+      init +
+      hex_md5(
+       this.view.password_prompt.value
+      )
+     ),
+     'type' : 'temp',
+    };
+
+    if (data.ws_info[ this.view.server_prompt.value ]) {
+     params.type = this.login_type;
+     params.workstation = data.ws_info[ this.view.server_prompt.value ].name;
+     data.ws_name = params.workstation; data.stash('ws_name');
+    }
+
+    var robj = this.network.simple_request( 'AUTH_COMPLETE', [ params ]);
+
+    switch (Number(robj.ilsevent)) {
+     case 0:
+      this.key = robj.payload.authtoken;
+      this.authtime = robj.payload.authtime;
+     break;
+     case 1520 /* WORKSTATION_NOT_FOUND */:
+      alert(document.getElementById('authStrings').getFormattedString('staff.auth.session.unregistered', [params.workstation]));
+      delete(params.workstation);
+      delete(data.ws_info[ this.view.server_prompt.value ]);
+      data.stash('ws_info');
+      data.ws_name = null; data.stash('ws_name');
+      params.type = 'temp';
+      robj = this.network.simple_request('AUTH_COMPLETE',[ params ]);
+      if (robj.ilsevent == 0) {
+       this.key = robj.payload.authtoken;
+       this.authtime = robj.payload.authtime;
+      } else {
+       //this.error.standard_unexpected_error_alert('auth.session.init',robj);
+       throw(robj);
+      }
+     break;
+     default:
+     //obj.error.standard_unexpected_error_alert('auth.session.init',robj);
+     throw(robj);
+     break;
+    }
+
+    this.error.sdump('D_AUTH','auth.session.key = ' + this.key + '\n');
+
+    if (typeof this.on_init == 'function') {
+     this.error.sdump('D_AUTH','auth.session.on_init()\n');
+     this.on_init();
+    }
+
+   } else {
+
+    var error = document.getElementById('authStrings').getString('staff.auth.session.init_false') + '\n';
+    this.error.sdump('D_ERROR',error);
+    throw(error);
+   }
+
+  } catch(E) {
+   alert(document.getElementById('authStrings').getString('staff.auth.session.login_failed'));
+   //obj.error.standard_unexpected_error_alert('Error on auth.session.init()',E); 
+
+   if (typeof this.on_init_error == 'function') {
+    this.error.sdump('D_AUTH','auth.session.on_init_error()\n');
+    this.on_init_error(E);
+   }
+   if (typeof this.on_error == 'function') {
+    this.error.sdump('D_AUTH','auth.session.on_error()\n');
+    this.on_error();
+   }
+
+   //throw(E);
+   /* This was for testing
+   if (typeof this.on_init == 'function') {
+    this.error.sdump('D_AUTH','auth.session.on_init() despite error\n');
+    this.on_init();
+   }
+   */
+  }
+ },
+
+ 'close' : function () { 
+  var obj = this;
+  obj.error.sdump('D_AUTH','auth.session.close()\n'); 
+  if (obj.key) obj.network.request(
+   api.AUTH_DELETE.app,
+   api.AUTH_DELETE.method,
+   [ obj.key ],
+   function(req) {}
+  );
+  obj.key = null;
+  if (typeof obj.on_close == 'function') {
+   obj.error.sdump('D_AUTH','auth.session.on_close()\n');
+   obj.on_close();
+  }
+ }
 
 }
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/cat/opac.js b/Open-ILS/xul/staff_client/chrome/content/cat/opac.js
index fc5a9ce28b..6214156ebc 100644
--- a/Open-ILS/xul/staff_client/chrome/content/cat/opac.js
+++ b/Open-ILS/xul/staff_client/chrome/content/cat/opac.js
@@ -8,74 +8,74 @@ var hold_browser_reset = true;
 function $(id) { return document.getElementById(id); }
 
 function my_init() {
-	try {
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		if (typeof JSAN == 'undefined') { throw(document.getElementById('offlineStrings').getString('common.jsan.missing')); }
-		JSAN.errorLevel = "die"; // none, warn, or die
-		JSAN.addRepository('..');
-		JSAN.use('util.error'); g.error = new util.error();
-		g.error.sdump('D_TRACE','my_init() for cat/opac.xul');
+ try {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  if (typeof JSAN == 'undefined') { throw(document.getElementById('offlineStrings').getString('common.jsan.missing')); }
+  JSAN.errorLevel = "die"; // none, warn, or die
+  JSAN.addRepository('..');
+  JSAN.use('util.error'); g.error = new util.error();
+  g.error.sdump('D_TRACE','my_init() for cat/opac.xul');
 
-		JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-		XML_HTTP_SERVER = g.data.server_unadorned;
+  JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+  XML_HTTP_SERVER = g.data.server_unadorned;
 
         //JSAN.addRepository('http://' + g.data.server_unadorned + '/xul/server/');
         //JSAN._loadJSFromUrl('http://' + g.data.server_unadorned + '/xul/server/cat/util.js');
 
-		JSAN.use('util.network'); g.network = new util.network();
+  JSAN.use('util.network'); g.network = new util.network();
 
-		g.cgi = new CGI();
-		try { authtime = g.cgi.param('authtime') || xulG.authtime; } catch(E) { g.error.sdump('D_ERROR',E); }
-		try { docid = g.cgi.param('docid') || xulG.docid; } catch(E) { g.error.sdump('D_ERROR',E); }
-		try { opac_url = g.cgi.param('opac_url') || xulG.opac_url; } catch(E) { g.error.sdump('D_ERROR',E); }
+  g.cgi = new CGI();
+  try { authtime = g.cgi.param('authtime') || xulG.authtime; } catch(E) { g.error.sdump('D_ERROR',E); }
+  try { docid = g.cgi.param('docid') || xulG.docid; } catch(E) { g.error.sdump('D_ERROR',E); }
+  try { opac_url = g.cgi.param('opac_url') || xulG.opac_url; } catch(E) { g.error.sdump('D_ERROR',E); }
 
-		JSAN.use('util.deck');
-		top_pane = new util.deck('top_pane');
-		bottom_pane = new util.deck('bottom_pane');
+  JSAN.use('util.deck');
+  top_pane = new util.deck('top_pane');
+  bottom_pane = new util.deck('bottom_pane');
 
-		set_opac();
+  set_opac();
 
-	} catch(E) {
-		var err_msg = document.getElementById("offlineStrings").getFormattedString("common.exception", ["cat/opac.xul", E]);
-		try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-		alert(err_msg);
-	}
+ } catch(E) {
+  var err_msg = document.getElementById("offlineStrings").getFormattedString("common.exception", ["cat/opac.xul", E]);
+  try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+  alert(err_msg);
+ }
 }
 
 function set_brief_view() {
-	var url = xulG.url_prefix( urls.XUL_BIB_BRIEF ) + '?docid=' + window.escape(docid); 
-	dump('spawning ' + url + '\n');
-	top_pane.set_iframe( 
-		url,
-		{}, 
-		{ 
-			'set_tab_name' : function(n) { 
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					try { window.xulG.set_tab_name(document.getElementById('offlineStrings').getFormattedString("cat.bib_record", [n])); } catch(E) { alert(E); }
-				} else {
-					dump('no set_tab_name\n');
-				}
-			}
-		}  
-	);
+ var url = xulG.url_prefix( urls.XUL_BIB_BRIEF ) + '?docid=' + window.escape(docid); 
+ dump('spawning ' + url + '\n');
+ top_pane.set_iframe( 
+  url,
+  {}, 
+  { 
+   'set_tab_name' : function(n) { 
+    if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+     try { window.xulG.set_tab_name(document.getElementById('offlineStrings').getFormattedString("cat.bib_record", [n])); } catch(E) { alert(E); }
+    } else {
+     dump('no set_tab_name\n');
+    }
+   }
+  }  
+ );
 }
 
 function set_marc_view() {
-	g.view = 'marc_view';
-	if (marc_view_reset) {
-		bottom_pane.reset_iframe( xulG.url_prefix( urls.XUL_MARC_VIEW ) + '?docid=' + window.escape(docid),{},xulG);
+ g.view = 'marc_view';
+ if (marc_view_reset) {
+  bottom_pane.reset_iframe( xulG.url_prefix( urls.XUL_MARC_VIEW ) + '?docid=' + window.escape(docid),{},xulG);
         marc_view_reset = false;
-	} else {
-		bottom_pane.set_iframe( xulG.url_prefix( urls.XUL_MARC_VIEW ) + '?docid=' + window.escape(docid),{},xulG);
-	}
+ } else {
+  bottom_pane.set_iframe( xulG.url_prefix( urls.XUL_MARC_VIEW ) + '?docid=' + window.escape(docid),{},xulG);
+ }
 }
 
 function set_marc_edit() {
-	g.view = 'marc_edit';
-	var a =	xulG.url_prefix( urls.XUL_MARC_EDIT );
-	var b =	{};
-	var c =	{
-			'record' : { 'url' : '/opac/extras/supercat/retrieve/marcxml/record/' + docid },
+ g.view = 'marc_edit';
+ var a = xulG.url_prefix( urls.XUL_MARC_EDIT );
+ var b = {};
+ var c = {
+   'record' : { 'url' : '/opac/extras/supercat/retrieve/marcxml/record/' + docid },
             /* // FIXME - disable this until we find a good way of pulling remote JSAN libraries into chrome
             'fast_add_item' : function(doc_id,cn_label,cp_barcode) {
                 try {
@@ -85,188 +85,188 @@ function set_marc_edit() {
                 }
             },
             */
-			'save' : {
-				'label' : document.getElementById('offlineStrings').getString('cat.save_record'),
-				'func' : function (new_marcxml) {
-					try {
-						var r = g.network.simple_request('MARC_XML_RECORD_UPDATE', [ ses(), docid, new_marcxml ]);
+   'save' : {
+    'label' : document.getElementById('offlineStrings').getString('cat.save_record'),
+    'func' : function (new_marcxml) {
+     try {
+      var r = g.network.simple_request('MARC_XML_RECORD_UPDATE', [ ses(), docid, new_marcxml ]);
                         marc_view_reset = true;
                         copy_browser_reset = true;
                         hold_browser_reset = true;
-						if (typeof r.ilsevent != 'undefined') {
-							throw(r);
-						} else {
-							alert(document.getElementById('offlineStrings').getString("cat.save.success"));
+      if (typeof r.ilsevent != 'undefined') {
+       throw(r);
+      } else {
+       alert(document.getElementById('offlineStrings').getString("cat.save.success"));
                             return {
                                 'id' : r.id(),
                                 'oncomplete' : function() {}
                             };
-						}
-					} catch(E) {
-							g.error.standard_unexpected_error_alert(document.getElementById('offlineStrings').getString("cat.save.failure"), E);
-					}
-				}
-			}
-		};
-	if (marc_edit_reset) {
-		bottom_pane.reset_iframe( a,b,c );
+      }
+     } catch(E) {
+       g.error.standard_unexpected_error_alert(document.getElementById('offlineStrings').getString("cat.save.failure"), E);
+     }
+    }
+   }
+  };
+ if (marc_edit_reset) {
+  bottom_pane.reset_iframe( a,b,c );
         marc_edit_reset = false;
-	} else {
-		bottom_pane.set_iframe( a,b,c );
-	}
+ } else {
+  bottom_pane.set_iframe( a,b,c );
+ }
 }
 
 function set_copy_browser() {
-	g.view = 'copy_browser';
-	if (copy_browser_reset) {
-		bottom_pane.reset_iframe( xulG.url_prefix( urls.XUL_COPY_VOLUME_BROWSE ) + '?docid=' + window.escape(docid),{},xulG);
+ g.view = 'copy_browser';
+ if (copy_browser_reset) {
+  bottom_pane.reset_iframe( xulG.url_prefix( urls.XUL_COPY_VOLUME_BROWSE ) + '?docid=' + window.escape(docid),{},xulG);
         copy_browser_reset =false;
-	} else {
-		bottom_pane.set_iframe( xulG.url_prefix( urls.XUL_COPY_VOLUME_BROWSE ) + '?docid=' + window.escape(docid),{},xulG);
-	}
+ } else {
+  bottom_pane.set_iframe( xulG.url_prefix( urls.XUL_COPY_VOLUME_BROWSE ) + '?docid=' + window.escape(docid),{},xulG);
+ }
 }
 
 function set_hold_browser() {
-	g.view = 'hold_browser';
-	if (hold_browser_reset) {
-		bottom_pane.reset_iframe( xulG.url_prefix( urls.XUL_HOLDS_BROWSER ) + '?docid=' + window.escape(docid),{},xulG);
+ g.view = 'hold_browser';
+ if (hold_browser_reset) {
+  bottom_pane.reset_iframe( xulG.url_prefix( urls.XUL_HOLDS_BROWSER ) + '?docid=' + window.escape(docid),{},xulG);
         hold_browser_reset = false;
-	} else {
-		bottom_pane.set_iframe( xulG.url_prefix( urls.XUL_HOLDS_BROWSER ) + '?docid=' + window.escape(docid),{},xulG);
-	}
+ } else {
+  bottom_pane.set_iframe( xulG.url_prefix( urls.XUL_HOLDS_BROWSER ) + '?docid=' + window.escape(docid),{},xulG);
+ }
 }
 
 function set_opac() {
-	g.view = 'opac';
-	try {
-		var content_params = { 
-			'show_nav_buttons' : true,
-			'show_print_button' : true,
-			'passthru_content_params' : { 
-				'authtoken' : ses(), 
-				'authtime' : ses('authtime'),
-				'window_open' : function(a,b,c) {
-					try {
-						netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
-						return window.open(a,b,c);
-					} catch(E) {
-						g.error.standard_unexpected_error_alert('window_open',E);
-					}
-				}
-			},
-			'on_url_load' : function(f) {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				var win;
-				try {
-					if (typeof f.contentWindow.wrappedJSObject.attachEvt != 'undefined') {
-						win = f.contentWindow.wrappedJSObject;
-					} else {
-						win = f.contentWindow;
-					}
-				} catch(E) {
-					win = f.contentWindow;
-				}
-				win.attachEvt("rdetail", "recordRetrieved",
-					function(id){
-						try {
-							if (docid == id) return;
-							docid = id;
-							refresh_display(id);
-						} catch(E) {
-							g.error.standard_unexpected_error_alert('rdetail -> recordRetrieved',E);
-						}
-					}
-				);
-				
-				g.f_record_start = null; g.f_record_prev = null; g.f_record_next = null; g.f_record_end = null;
-				$('record_start').disabled = true; $('record_next').disabled = true;
-				$('record_prev').disabled = true; $('record_end').disabled = true;
-				$('record_pos').setAttribute('value','');
+ g.view = 'opac';
+ try {
+  var content_params = { 
+   'show_nav_buttons' : true,
+   'show_print_button' : true,
+   'passthru_content_params' : { 
+    'authtoken' : ses(), 
+    'authtime' : ses('authtime'),
+    'window_open' : function(a,b,c) {
+     try {
+      netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
+      return window.open(a,b,c);
+     } catch(E) {
+      g.error.standard_unexpected_error_alert('window_open',E);
+     }
+    }
+   },
+   'on_url_load' : function(f) {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    var win;
+    try {
+     if (typeof f.contentWindow.wrappedJSObject.attachEvt != 'undefined') {
+      win = f.contentWindow.wrappedJSObject;
+     } else {
+      win = f.contentWindow;
+     }
+    } catch(E) {
+     win = f.contentWindow;
+    }
+    win.attachEvt("rdetail", "recordRetrieved",
+     function(id){
+      try {
+       if (docid == id) return;
+       docid = id;
+       refresh_display(id);
+      } catch(E) {
+       g.error.standard_unexpected_error_alert('rdetail -> recordRetrieved',E);
+      }
+     }
+    );
+    
+    g.f_record_start = null; g.f_record_prev = null; g.f_record_next = null; g.f_record_end = null;
+    $('record_start').disabled = true; $('record_next').disabled = true;
+    $('record_prev').disabled = true; $('record_end').disabled = true;
+    $('record_pos').setAttribute('value','');
 
-				win.attachEvt("rdetail", "nextPrevDrawn",
-					function(rIndex,rCount){
-						$('record_pos').setAttribute('value', document.getElementById('offlineStrings').getFormattedString('cat.record.counter', [(1+rIndex), rCount ? rCount : 1]));
-						if (win.rdetailNext) {
-							g.f_record_next = function() { 
-								g.view_override = g.view; 
-								win.rdetailNext(); 
-							}
-							$('record_next').disabled = false;
-						}
-						if (win.rdetailPrev) {
-							g.f_record_prev = function() { 
-								g.view_override = g.view; 
-								win.rdetailPrev(); 
-							}
-							$('record_prev').disabled = false;
-						}
-						if (win.rdetailStart) {
-							g.f_record_start = function() { 
-								g.view_override = g.view; 
-								win.rdetailStart(); 
-							}
-							$('record_start').disabled = false;
-						}
-						if (win.rdetailEnd) {
-							g.f_record_end = function() { 
-								g.view_override = g.view; 
-								win.rdetailEnd(); 
-							}
-							$('record_end').disabled = false;
-						}
-					}
-				);
-			},
-			'url_prefix' : xulG.url_prefix,
-		};
-		if (opac_url) { content_params.url = opac_url; } else { content_params.url = xulG.url_prefix( urls.browser ); }
-		browser_frame = bottom_pane.set_iframe( xulG.url_prefix(urls.XUL_BROWSER) + '?name=Catalog', {}, content_params);
+    win.attachEvt("rdetail", "nextPrevDrawn",
+     function(rIndex,rCount){
+      $('record_pos').setAttribute('value', document.getElementById('offlineStrings').getFormattedString('cat.record.counter', [(1+rIndex), rCount ? rCount : 1]));
+      if (win.rdetailNext) {
+       g.f_record_next = function() { 
+        g.view_override = g.view; 
+        win.rdetailNext(); 
+       }
+       $('record_next').disabled = false;
+      }
+      if (win.rdetailPrev) {
+       g.f_record_prev = function() { 
+        g.view_override = g.view; 
+        win.rdetailPrev(); 
+       }
+       $('record_prev').disabled = false;
+      }
+      if (win.rdetailStart) {
+       g.f_record_start = function() { 
+        g.view_override = g.view; 
+        win.rdetailStart(); 
+       }
+       $('record_start').disabled = false;
+      }
+      if (win.rdetailEnd) {
+       g.f_record_end = function() { 
+        g.view_override = g.view; 
+        win.rdetailEnd(); 
+       }
+       $('record_end').disabled = false;
+      }
+     }
+    );
+   },
+   'url_prefix' : xulG.url_prefix,
+  };
+  if (opac_url) { content_params.url = opac_url; } else { content_params.url = xulG.url_prefix( urls.browser ); }
+  browser_frame = bottom_pane.set_iframe( xulG.url_prefix(urls.XUL_BROWSER) + '?name=Catalog', {}, content_params);
         /* // Remember to use the REMOTE_BROWSER if we ever try to move this to remote xul again
-		browser_frame = bottom_pane.set_iframe( xulG.url_prefix(urls.XUL_REMOTE_BROWSER) + '?name=Catalog', {}, content_params);
+  browser_frame = bottom_pane.set_iframe( xulG.url_prefix(urls.XUL_REMOTE_BROWSER) + '?name=Catalog', {}, content_params);
         */
-	} catch(E) {
-		g.error.sdump('D_ERROR','set_opac: ' + E);
-	}
+ } catch(E) {
+  g.error.sdump('D_ERROR','set_opac: ' + E);
+ }
 }
 
 function bib_in_new_tab() {
-	try {
-		var url = browser_frame.contentWindow.g.browser.controller.view.browser_browser.contentWindow.wrappedJSObject.location.href;
-		var content_params = { 'session' : ses(), 'authtime' : ses('authtime'), 'opac_url' : url };
-		xulG.new_tab(xulG.url_prefix(urls.XUL_OPAC_WRAPPER), {}, content_params);
-	} catch(E) {
-		g.error.sdump('D_ERROR',E);
-	}
+ try {
+  var url = browser_frame.contentWindow.g.browser.controller.view.browser_browser.contentWindow.wrappedJSObject.location.href;
+  var content_params = { 'session' : ses(), 'authtime' : ses('authtime'), 'opac_url' : url };
+  xulG.new_tab(xulG.url_prefix(urls.XUL_OPAC_WRAPPER), {}, content_params);
+ } catch(E) {
+  g.error.sdump('D_ERROR',E);
+ }
 }
 
 function remove_me() {
-	var url = xulG.url_prefix( urls.XUL_BIB_BRIEF ) + '?docid=' + window.escape(docid);
-	dump('removing ' + url + '\n');
-	try { top_pane.remove_iframe( url ); } catch(E) { dump(E + '\n'); }
-	$('nav').setAttribute('hidden','true');
+ var url = xulG.url_prefix( urls.XUL_BIB_BRIEF ) + '?docid=' + window.escape(docid);
+ dump('removing ' + url + '\n');
+ try { top_pane.remove_iframe( url ); } catch(E) { dump(E + '\n'); }
+ $('nav').setAttribute('hidden','true');
 }
 
 function add_to_bucket() {
-	JSAN.use('util.window'); var win = new util.window();
-	win.open(
-		xulG.url_prefix(urls.XUL_RECORD_BUCKETS_QUICK),
-		'sel_bucket_win' + win.window_name_increment(),
-		'chrome,resizable,modal,center',
-		{
-			record_ids: [ docid ]
-		}
-	);
+ JSAN.use('util.window'); var win = new util.window();
+ win.open(
+  xulG.url_prefix(urls.XUL_RECORD_BUCKETS_QUICK),
+  'sel_bucket_win' + win.window_name_increment(),
+  'chrome,resizable,modal,center',
+  {
+   record_ids: [ docid ]
+  }
+ );
 }
 
 function mark_for_overlay() {
-	g.data.marked_record = docid;
-	g.data.stash('marked_record');
-	var robj = g.network.simple_request('MODS_SLIM_RECORD_RETRIEVE.authoritative',[docid]);
+ g.data.marked_record = docid;
+ g.data.stash('marked_record');
+ var robj = g.network.simple_request('MODS_SLIM_RECORD_RETRIEVE.authoritative',[docid]);
     if (typeof robj.ilsevent == 'undefined') {
         g.data.marked_record_mvr = robj;
     } else {
         g.data.marked_record_mvr = null;
-		g.error.standard_unexpected_error_alert('in mark_for_overlay',robj);
+  g.error.standard_unexpected_error_alert('in mark_for_overlay',robj);
     }
     g.data.stash('marked_record_mvr');
     if (g.data.marked_record_mvr) {
@@ -277,86 +277,86 @@ function mark_for_overlay() {
 }
 
 function delete_record() {
-	if (g.error.yns_alert(
-		document.getElementById('offlineStrings').getFormattedString('cat.opac.delete_record.confirm', [docid]),
-		document.getElementById('offlineStrings').getString('cat.opac.delete_record'),
-		document.getElementById('offlineStrings').getString('cat.opac.delete'),
-		document.getElementById('offlineStrings').getString('cat.opac.cancel'),
-		null,
-		document.getElementById('offlineStrings').getString('cat.opac.record_deleted.confirm')) == 0) {
-		var robj = g.network.simple_request('FM_BRE_DELETE',[ses(),docid]);
-		if (typeof robj.ilsevent != 'undefined') {
-			alert(document.getElementById('offlineStrings').getFormattedString('cat.opac.record_deleted.error',  [docid, robj.textcode, robj.desc]) + '\n');
-		} else {
-			alert(document.getElementById('offlineStrings').getString('cat.opac.record_deleted'));
-			refresh_display(docid);
-		}
-	}
+ if (g.error.yns_alert(
+  document.getElementById('offlineStrings').getFormattedString('cat.opac.delete_record.confirm', [docid]),
+  document.getElementById('offlineStrings').getString('cat.opac.delete_record'),
+  document.getElementById('offlineStrings').getString('cat.opac.delete'),
+  document.getElementById('offlineStrings').getString('cat.opac.cancel'),
+  null,
+  document.getElementById('offlineStrings').getString('cat.opac.record_deleted.confirm')) == 0) {
+  var robj = g.network.simple_request('FM_BRE_DELETE',[ses(),docid]);
+  if (typeof robj.ilsevent != 'undefined') {
+   alert(document.getElementById('offlineStrings').getFormattedString('cat.opac.record_deleted.error',  [docid, robj.textcode, robj.desc]) + '\n');
+  } else {
+   alert(document.getElementById('offlineStrings').getString('cat.opac.record_deleted'));
+   refresh_display(docid);
+  }
+ }
 }
 
 function undelete_record() {
     if (g.error.yns_alert(
-		document.getElementById('offlineStrings').getFormattedString('cat.opac.undelete_record.confirm', [docid]),
-		document.getElementById('offlineStrings').getString('cat.opac.undelete_record'),
-		document.getElementById('offlineStrings').getString('cat.opac.undelete'),
-		document.getElementById('offlineStrings').getString('cat.opac.cancel'),
-		null,
-		document.getElementById('offlineStrings').getString('cat.opac.record_undeleted.confirm')) == 0) {
+  document.getElementById('offlineStrings').getFormattedString('cat.opac.undelete_record.confirm', [docid]),
+  document.getElementById('offlineStrings').getString('cat.opac.undelete_record'),
+  document.getElementById('offlineStrings').getString('cat.opac.undelete'),
+  document.getElementById('offlineStrings').getString('cat.opac.cancel'),
+  null,
+  document.getElementById('offlineStrings').getString('cat.opac.record_undeleted.confirm')) == 0) {
 
         var robj = g.network.simple_request('FM_BRE_UNDELETE',[ses(),docid]);
         if (typeof robj.ilsevent != 'undefined') {
-			alert(document.getElementById('offlineStrings').getFormattedString('cat.opac.record_undeleted.error',  [docid, robj.textcode, robj.desc]) + '\n');
+   alert(document.getElementById('offlineStrings').getFormattedString('cat.opac.record_undeleted.error',  [docid, robj.textcode, robj.desc]) + '\n');
         } else {
-			alert(document.getElementById('offlineStrings').getString('cat.opac.record_undeleted'));
-			refresh_display(docid);
+   alert(document.getElementById('offlineStrings').getString('cat.opac.record_undeleted'));
+   refresh_display(docid);
         }
     }
 }
 
 function refresh_display(id) {
-	try { 
+ try { 
         marc_view_reset = true;
         marc_edit_reset = true;
         copy_browser_reset = true;
         hold_browser_reset = true;
-		while(top_pane.node.lastChild) top_pane.node.removeChild( top_pane.node.lastChild );
-		var children = bottom_pane.node.childNodes;
-		for (var i = 0; i < children.length; i++) {
-			if (children[i] != browser_frame) bottom_pane.node.removeChild(children[i]);
-		}
+  while(top_pane.node.lastChild) top_pane.node.removeChild( top_pane.node.lastChild );
+  var children = bottom_pane.node.childNodes;
+  for (var i = 0; i < children.length; i++) {
+   if (children[i] != browser_frame) bottom_pane.node.removeChild(children[i]);
+  }
 
-		set_brief_view();
-		$('nav').setAttribute('hidden','false');
-		var settings = g.network.simple_request(
-			'FM_AUS_RETRIEVE',
-			[ ses(), g.data.list.au[0].id() ]
-		);
-		var view = settings['staff_client.catalog.record_view.default'];
-		if (g.view_override) {
-			view = g.view_override;
-			g.view_override = null;
-		}
-		switch(view) {
-			case 'marc_view' : set_marc_view(); break;
-			case 'marc_edit' : set_marc_edit(); break;
-			case 'copy_browser' : set_copy_browser(); break;
-			case 'hold_browser' : set_hold_browser(); break;
-			case 'opac' :
-			default: set_opac(); break;
-		}
-	} catch(E) {
-		g.error.standard_unexpected_error_alert('in refresh_display',E);
-	}
+  set_brief_view();
+  $('nav').setAttribute('hidden','false');
+  var settings = g.network.simple_request(
+   'FM_AUS_RETRIEVE',
+   [ ses(), g.data.list.au[0].id() ]
+  );
+  var view = settings['staff_client.catalog.record_view.default'];
+  if (g.view_override) {
+   view = g.view_override;
+   g.view_override = null;
+  }
+  switch(view) {
+   case 'marc_view' : set_marc_view(); break;
+   case 'marc_edit' : set_marc_edit(); break;
+   case 'copy_browser' : set_copy_browser(); break;
+   case 'hold_browser' : set_hold_browser(); break;
+   case 'opac' :
+   default: set_opac(); break;
+  }
+ } catch(E) {
+  g.error.standard_unexpected_error_alert('in refresh_display',E);
+ }
 }
 
 function set_default() {
-	var robj = g.network.simple_request(
-		'FM_AUS_UPDATE',
-		[ ses(), g.data.list.au[0].id(), { 'staff_client.catalog.record_view.default' : g.view } ]
-	)
-	if (typeof robj.ilsevent != 'undefined') {
-		if (robj.ilsevent != 0) g.error.standard_unexpected_error_alert(document.getElementById('offlineStrings').getString('cat.preference.error'), robj);
-	}
+ var robj = g.network.simple_request(
+  'FM_AUS_UPDATE',
+  [ ses(), g.data.list.au[0].id(), { 'staff_client.catalog.record_view.default' : g.view } ]
+ )
+ if (typeof robj.ilsevent != 'undefined') {
+  if (robj.ilsevent != 0) g.error.standard_unexpected_error_alert(document.getElementById('offlineStrings').getString('cat.preference.error'), robj);
+ }
 }
 
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul b/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
index 46f7e8f676..86704eb69f 100644
--- a/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
@@ -16,56 +16,56 @@
 <?xul-overlay href="chrome://open_ils_staff_client/content/OpenILS/util_overlay_chrome.xul"?>
 
 <window id="opac_win"
-	onload="try { my_init(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-	</script>
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
-	<script type="text/javascript" src="chrome://open_ils_staff_client/content/cat/opac.js"/>
-	
-	<messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+ <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
+ <script type="text/javascript" src="chrome://open_ils_staff_client/content/cat/opac.js"/>
+ 
+ <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
-	<vbox flex="1">
-		<deck id="top_pane"/>
-		<hbox id="nav" hidden="true">
-			<label id="record_pos"/>
-			<button id="record_start" accesskey="&staff.cat.opac.record_start.accesskey;" label="&staff.cat.opac.record_start.label;" oncommand="if (g.f_record_start) g.f_record_start();"/>
-			<button id="record_prev" accesskey="&staff.cat.opac.record_prev.accesskey;" label="&staff.cat.opac.record_prev.label;" oncommand="if (g.f_record_prev) g.f_record_prev();"/>
-			<button id="record_next" accesskey="&staff.cat.opac.record_next.accesskey;" label="&staff.cat.opac.record_next.label;" oncommand="if (g.f_record_next) g.f_record_next();"/>
-			<button id="record_end" accesskey="&staff.cat.opac.record_end.accesskey;" label="&staff.cat.opac.record_end.label;" oncommand="if (g.f_record_end) g.f_record_end();"/>
-			<spacer flex="1"/>
-			<menubar>
-				<menu label="&staff.cat.opac.menu.label;" accesskey="&staff.cat.opac.menu.accesskey;">
-				<menupopup>
-				<menuitem label="&staff.cat.opac.opac_view.label;" accesskey="" id="opac_view" oncommand="set_opac();"/>
-				<menuitem label="&staff.cat.opac.marc_view.label;" accesskey="&staff.cat.opac.marc_view.accesskey;" id="marc_view" oncommand="set_marc_view();"/>
-				<menuitem label="&staff.cat.opac.marc_edit.label;" accesskey="&staff.cat.opac.marc_edit.accesskey;" id="marc_edit" oncommand="set_marc_edit();"/>
-				<menuitem label="&staff.cat.opac.copy_browse.label;" accesskey="&staff.cat.opac.copy_browse.accesskey;" id="copy_browse" oncommand="set_copy_browser();"/>
-				<menuitem label="&staff.cat.opac.view_holds.label;" accesskey="&staff.cat.opac.view_holds.accesskey;" id="view_holds" oncommand="set_hold_browser();"/>
-				<menuseparator/>
-				<menuitem label="&staff.cat.opac.add_bucket.label;" accesskey="&staff.cat.opac.add_bucket.accesskey;" id="add_bucket" oncommand="add_to_bucket();"/>
-				<menuitem label="&staff.cat.opac.mark_for_overlay.label;" accesskey="&staff.cat.opac.mark_for_overlay.accesskey;" id="mark_for_overlay" oncommand="mark_for_overlay();"/>
-				<menuitem label="&staff.cat.opac.delete_record.label;" accesskey="&staff.cat.opac.delete_record.accesskey;" id="delete_record" oncommand="delete_record();"/>
-				<menuitem label="&staff.cat.opac.undelete_record.label;" accesskey="&staff.cat.opac.undelete_record.accesskey;" id="undelete_record" oncommand="undelete_record();"/>
-				<menuseparator/>
-				<menuitem label="&staff.cat.opac.bib_in_new_tab.label;" id="bib_in_new_tab" oncommand="bib_in_new_tab();"/>
-				<menuitem label="&staff.cat.opac.remove_me.label;" id="remove_me" oncommand="remove_me();"/>
-				<menuseparator/>
-				<menuitem label="&staff.cat.opac.default.label;" id="default" oncommand="set_default();"/>
-				<menuitem label="&staff.cat.opac.refresh_me.label;" id="refresh_me" oncommand="refresh_display(docid);"/>
-				</menupopup>
-				</menu>
-			</menubar>
-		</hbox>
-		<deck id="bottom_pane" flex="1"/>
-	</vbox>
+ <vbox flex="1">
+  <deck id="top_pane"/>
+  <hbox id="nav" hidden="true">
+   <label id="record_pos"/>
+   <button id="record_start" accesskey="&staff.cat.opac.record_start.accesskey;" label="&staff.cat.opac.record_start.label;" oncommand="if (g.f_record_start) g.f_record_start();"/>
+   <button id="record_prev" accesskey="&staff.cat.opac.record_prev.accesskey;" label="&staff.cat.opac.record_prev.label;" oncommand="if (g.f_record_prev) g.f_record_prev();"/>
+   <button id="record_next" accesskey="&staff.cat.opac.record_next.accesskey;" label="&staff.cat.opac.record_next.label;" oncommand="if (g.f_record_next) g.f_record_next();"/>
+   <button id="record_end" accesskey="&staff.cat.opac.record_end.accesskey;" label="&staff.cat.opac.record_end.label;" oncommand="if (g.f_record_end) g.f_record_end();"/>
+   <spacer flex="1"/>
+   <menubar>
+    <menu label="&staff.cat.opac.menu.label;" accesskey="&staff.cat.opac.menu.accesskey;">
+    <menupopup>
+    <menuitem label="&staff.cat.opac.opac_view.label;" accesskey="" id="opac_view" oncommand="set_opac();"/>
+    <menuitem label="&staff.cat.opac.marc_view.label;" accesskey="&staff.cat.opac.marc_view.accesskey;" id="marc_view" oncommand="set_marc_view();"/>
+    <menuitem label="&staff.cat.opac.marc_edit.label;" accesskey="&staff.cat.opac.marc_edit.accesskey;" id="marc_edit" oncommand="set_marc_edit();"/>
+    <menuitem label="&staff.cat.opac.copy_browse.label;" accesskey="&staff.cat.opac.copy_browse.accesskey;" id="copy_browse" oncommand="set_copy_browser();"/>
+    <menuitem label="&staff.cat.opac.view_holds.label;" accesskey="&staff.cat.opac.view_holds.accesskey;" id="view_holds" oncommand="set_hold_browser();"/>
+    <menuseparator/>
+    <menuitem label="&staff.cat.opac.add_bucket.label;" accesskey="&staff.cat.opac.add_bucket.accesskey;" id="add_bucket" oncommand="add_to_bucket();"/>
+    <menuitem label="&staff.cat.opac.mark_for_overlay.label;" accesskey="&staff.cat.opac.mark_for_overlay.accesskey;" id="mark_for_overlay" oncommand="mark_for_overlay();"/>
+    <menuitem label="&staff.cat.opac.delete_record.label;" accesskey="&staff.cat.opac.delete_record.accesskey;" id="delete_record" oncommand="delete_record();"/>
+    <menuitem label="&staff.cat.opac.undelete_record.label;" accesskey="&staff.cat.opac.undelete_record.accesskey;" id="undelete_record" oncommand="undelete_record();"/>
+    <menuseparator/>
+    <menuitem label="&staff.cat.opac.bib_in_new_tab.label;" id="bib_in_new_tab" oncommand="bib_in_new_tab();"/>
+    <menuitem label="&staff.cat.opac.remove_me.label;" id="remove_me" oncommand="remove_me();"/>
+    <menuseparator/>
+    <menuitem label="&staff.cat.opac.default.label;" id="default" oncommand="set_default();"/>
+    <menuitem label="&staff.cat.opac.refresh_me.label;" id="refresh_me" oncommand="refresh_display(docid);"/>
+    </menupopup>
+    </menu>
+   </menubar>
+  </hbox>
+  <deck id="bottom_pane" flex="1"/>
+ </vbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline.js b/Open-ILS/xul/staff_client/chrome/content/circ/offline.js
index 4d083e328c..4caff74406 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline.js
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline.js
@@ -2,153 +2,153 @@ dump('entering circ.offline.js\n');
 
 if (typeof circ == 'undefined') circ = {};
 circ.offline = function (params) {
-	try {
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		JSAN.use('util.error'); this.error = new util.error();
-	} catch(E) {
-		dump('circ.offline: ' + E + '\n');
-	}
+ try {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  JSAN.use('util.error'); this.error = new util.error();
+ } catch(E) {
+  dump('circ.offline: ' + E + '\n');
+ }
 }
 
 circ.offline.prototype = {
 
-	'init' : function( params ) {
+ 'init' : function( params ) {
 
-		try {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  try {
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
-			var obj = this;
+   var obj = this;
 
-			JSAN.use('util.deck'); obj.deck = new util.deck('main');
+   JSAN.use('util.deck'); obj.deck = new util.deck('main');
 
-			JSAN.use('util.controller'); obj.controller = new util.controller();
-			obj.controller.init(
-				{
-					control_map : {
-						'cmd_broken' : [
-							['command'],
-							function() { alert('Not Yet Implemented'); }
-						],
-						'cmd_checkout' : [
-							['command'],
-							function() { obj.deck.set_iframe('offline_checkout.xul',{},{}); }
-						],
-						'cmd_renew' : [
-							['command'],
-							function() { obj.deck.set_iframe('offline_renew.xul',{},{}); }
-						],
-						'cmd_in_house_use' : [
-							['command'],
-							function() { obj.deck.set_iframe('offline_in_house_use.xul',{},{}); }
-						],
-						'cmd_checkin' : [
-							['command'],
-							function() { obj.deck.set_iframe('offline_checkin.xul',{},{}); }
-						],
-						'cmd_register_patron' : [
-							['command'],
-							function() { obj.deck.set_iframe('offline_register.xul',{},{}); }
-						],
-						'cmd_print_last_receipt' : [
-							['command'],
-							function() { 
-								JSAN.use('util.print'); var print = new util.print();
-								print.reprint_last();
-							}
-						],
-						'cmd_exit' : [
-							['command'],
-							function() { try { xulG.close_tab(); } catch(E) { window.close(); } }
-						],
-					}
-				}
-			);
+   JSAN.use('util.controller'); obj.controller = new util.controller();
+   obj.controller.init(
+    {
+     control_map : {
+      'cmd_broken' : [
+       ['command'],
+       function() { alert('Not Yet Implemented'); }
+      ],
+      'cmd_checkout' : [
+       ['command'],
+       function() { obj.deck.set_iframe('offline_checkout.xul',{},{}); }
+      ],
+      'cmd_renew' : [
+       ['command'],
+       function() { obj.deck.set_iframe('offline_renew.xul',{},{}); }
+      ],
+      'cmd_in_house_use' : [
+       ['command'],
+       function() { obj.deck.set_iframe('offline_in_house_use.xul',{},{}); }
+      ],
+      'cmd_checkin' : [
+       ['command'],
+       function() { obj.deck.set_iframe('offline_checkin.xul',{},{}); }
+      ],
+      'cmd_register_patron' : [
+       ['command'],
+       function() { obj.deck.set_iframe('offline_register.xul',{},{}); }
+      ],
+      'cmd_print_last_receipt' : [
+       ['command'],
+       function() { 
+        JSAN.use('util.print'); var print = new util.print();
+        print.reprint_last();
+       }
+      ],
+      'cmd_exit' : [
+       ['command'],
+       function() { try { xulG.close_tab(); } catch(E) { window.close(); } }
+      ],
+     }
+    }
+   );
 
-			obj.receipt_init();
+   obj.receipt_init();
 
-			obj.patron_init();
+   obj.patron_init();
 
-		} catch(E) {
-			this.error.sdump('D_ERROR','circ.offline.init: ' + E + '\n');
-		}
-	},
+  } catch(E) {
+   this.error.sdump('D_ERROR','circ.offline.init: ' + E + '\n');
+  }
+ },
 
-	'receipt_init' : function() {
-		function backup_receipt_templates() {
-			data.print_list_templates = {
-				'offline_checkout' : {
-					'type' : 'offline_checkout',
-					'header' : 'Patron %patron_barcode%<br/>\r\nYou checked out the following items:<hr/><ol>',
-					'line_item' : '<li>Barcode: %barcode%<br/>\r\nDue: %due_date%\r\n',
-					'footer' : '</ol><hr />%TODAY_TRIM%<br/>\r\n<br/>\r\n',
-				},
-				'offline_checkin' : {
-					'type' : 'offline_checkin',
-					'header' : 'You checked in the following items:<hr/><ol>',
-					'line_item' : '<li>Barcode: %barcode%\r\n',
-					'footer' : '</ol><hr />%TODAY_TRIM%<br/>\r\n<br/>\r\n',
-				},
-				'offline_renew' : {
-					'type' : 'offline_renew',
-					'header' : 'You renewed the following items:<hr/><ol>',
-					'line_item' : '<li>Barcode: %barcode%\r\n',
-					'footer' : '</ol><hr />%TODAY_TRIM%<br/>\r\n<br/>\r\n',
-				},
-				'offline_inhouse_use' : {
-					'type' : 'offline_inhouse_use',
-					'header' : 'You marked the following in-house items used:<hr/><ol>',
-					'line_item' : '<li>Barcode: %barcode%\r\nUses: %count%',
-					'footer' : '</ol><hr />%TODAY_TRIM%<br/>\r\n<br/>\r\n',
-				},
-			};
-			data.stash('print_list_templates');
-		}
+ 'receipt_init' : function() {
+  function backup_receipt_templates() {
+   data.print_list_templates = {
+    'offline_checkout' : {
+     'type' : 'offline_checkout',
+     'header' : 'Patron %patron_barcode%<br/>\r\nYou checked out the following items:<hr/><ol>',
+     'line_item' : '<li>Barcode: %barcode%<br/>\r\nDue: %due_date%\r\n',
+     'footer' : '</ol><hr />%TODAY_TRIM%<br/>\r\n<br/>\r\n',
+    },
+    'offline_checkin' : {
+     'type' : 'offline_checkin',
+     'header' : 'You checked in the following items:<hr/><ol>',
+     'line_item' : '<li>Barcode: %barcode%\r\n',
+     'footer' : '</ol><hr />%TODAY_TRIM%<br/>\r\n<br/>\r\n',
+    },
+    'offline_renew' : {
+     'type' : 'offline_renew',
+     'header' : 'You renewed the following items:<hr/><ol>',
+     'line_item' : '<li>Barcode: %barcode%\r\n',
+     'footer' : '</ol><hr />%TODAY_TRIM%<br/>\r\n<br/>\r\n',
+    },
+    'offline_inhouse_use' : {
+     'type' : 'offline_inhouse_use',
+     'header' : 'You marked the following in-house items used:<hr/><ol>',
+     'line_item' : '<li>Barcode: %barcode%\r\nUses: %count%',
+     'footer' : '</ol><hr />%TODAY_TRIM%<br/>\r\n<br/>\r\n',
+    },
+   };
+   data.stash('print_list_templates');
+  }
 
-		JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-		JSAN.use('util.file'); var file = new util.file('print_list_templates');
-		if (file._file.exists()) {
-			try {
-				var x = file.get_object();
-				if (x) {
-					data.print_list_templates = x;
-					data.stash('print_list_templates');
-				} else {
-					backup_receipt_templates();
-				}
-			} catch(E) {
-				alert(E);
-				backup_receipt_templates();
-			}
-		} else {
-			backup_receipt_templates();
-		}
-		file.close();
-	},
+  JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+  JSAN.use('util.file'); var file = new util.file('print_list_templates');
+  if (file._file.exists()) {
+   try {
+    var x = file.get_object();
+    if (x) {
+     data.print_list_templates = x;
+     data.stash('print_list_templates');
+    } else {
+     backup_receipt_templates();
+    }
+   } catch(E) {
+    alert(E);
+    backup_receipt_templates();
+   }
+  } else {
+   backup_receipt_templates();
+  }
+  file.close();
+ },
 
-	'patron_init' : function() {
-		JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-		JSAN.use('util.file'); var file = new util.file('offline_patron_list');
-		if (file._file.exists()) {
-			var lines = file.get_content().split(/\n/);
-			var hash = {};
-			for (var i = 0; i < lines.length; i++) {
-				hash[ lines[i].split(/\s+/)[0] ] = lines[i].split(/\s+/)[1];
-			}
-			delete(lines);
-			data.bad_patrons = hash;
-			data.stash('bad_patrons');
-			var file2 = new util.file('offline_patron_list.date');
-			if (file2._file.exists()) {
-				data.bad_patrons_date = file2.get_content();
-				data.stash('bad_patrons_date');
-			}
-			file2.close();
-		} else {
-			data.bad_patrons = {};
-			data.stash('bad_patrons');
-		}
-		file.close();
-	},
+ 'patron_init' : function() {
+  JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+  JSAN.use('util.file'); var file = new util.file('offline_patron_list');
+  if (file._file.exists()) {
+   var lines = file.get_content().split(/\n/);
+   var hash = {};
+   for (var i = 0; i < lines.length; i++) {
+    hash[ lines[i].split(/\s+/)[0] ] = lines[i].split(/\s+/)[1];
+   }
+   delete(lines);
+   data.bad_patrons = hash;
+   data.stash('bad_patrons');
+   var file2 = new util.file('offline_patron_list.date');
+   if (file2._file.exists()) {
+    data.bad_patrons_date = file2.get_content();
+    data.stash('bad_patrons_date');
+   }
+   file2.close();
+  } else {
+   data.bad_patrons = {};
+   data.stash('bad_patrons');
+  }
+  file.close();
+ },
 
 }
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline.xul b/Open-ILS/xul/staff_client/chrome/content/circ/offline.xul
index e9d899247f..7460de2c0d 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline.xul
@@ -16,85 +16,85 @@
 <?xul-overlay href="chrome://open_ils_staff_client/content/OpenILS/util_overlay_offline.xul"?>
 
 <window id="offline_win" sizemode="maximized"
-	onload="try { my_init(); } catch(E) { alert(E); }"
-	xmlns:html="http://www.w3.org/1999/xhtml"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); } catch(E) { alert(E); }"
+ xmlns:html="http://www.w3.org/1999/xhtml"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+ </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		var offlineStrings;
+ <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  var offlineStrings;
 
-		function my_init() {
-			try {
-				offlineStrings = document.getElementById('offlineStrings');
+  function my_init() {
+   try {
+    offlineStrings = document.getElementById('offlineStrings');
 
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		                if (typeof JSAN == 'undefined') { throw(offlineStrings.getString('common.jsan.missing')); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('..');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for offline.xul');
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                  if (typeof JSAN == 'undefined') { throw(offlineStrings.getString('common.jsan.missing')); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('..');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for offline.xul');
 
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					try { window.xulG.set_tab_name(offlineStrings.getString('circ.standalone')); } catch(E) { alert(E); }
-				}
+    if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+     try { window.xulG.set_tab_name(offlineStrings.getString('circ.standalone')); } catch(E) { alert(E); }
+    }
 
-				g.cgi = new CGI();
+    g.cgi = new CGI();
 
-				JSAN.use('circ.offline'); g.offline = new circ.offline();
+    JSAN.use('circ.offline'); g.offline = new circ.offline();
 
-				g.offline.init();
+    g.offline.init();
 
 
-				JSAN.use('util.date');
-				
-				function update_clock() {
-					/* I18N to-do: enable localized date formats */
-					var today = util.date.formatted_date(new Date(),"%F %H:%M:%s");
-					document.getElementById('today').setAttribute('label',today);
-					setTimeout(update_clock,1);
-				}
+    JSAN.use('util.date');
+    
+    function update_clock() {
+     /* I18N to-do: enable localized date formats */
+     var today = util.date.formatted_date(new Date(),"%F %H:%M:%s");
+     document.getElementById('today').setAttribute('label',today);
+     setTimeout(update_clock,1);
+    }
 
-				update_clock();
+    update_clock();
 
-			} catch(E) {
-				var err_msg = offlineStrings.getFormattedString('common.exception', ["circ/offline.xul", E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
+   } catch(E) {
+    var err_msg = offlineStrings.getFormattedString('common.exception', ["circ/offline.xul", E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
 
-	]]>
-	</script>
+ ]]>
+ </script>
 
     <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
-	<groupbox flex="1" class="my_overflow">
-		<caption label="&staff.circ.offline.main.label;"/>
-		<hbox id="nav">
-			<button id="today" onclick="alert('&common.unimplemented;');" tooltiptext="&staff.circ.offline.server_time.tooltiptext;"/>
-			<spacer flex="1"/>
-			<button id="cmd_checkout" label="&staff.circ.offline.cmd_checkout.label;" accesskey="&staff.circ.offline.cmd_checkout.accesskey;"/>
-			<button id="cmd_renew" label="&staff.circ.offline.cmd_renew.label;" accesskey="&staff.circ.offline.cmd_renew.accesskey;"/>
-			<button id="cmd_in_house_use" label="&staff.circ.offline.cmd_in_house_use.label;" accesskey="&staff.circ.offline.cmd_in_house_use.accesskey;"/>
-			<button id="cmd_checkin" label="&staff.circ.offline.cmd_checkin.label;" accesskey="&staff.circ.offline.cmd_checkin.accesskey;"/>
-			<button id="cmd_register_patron" label="&staff.circ.offline.cmd_register_patron.label;" accesskey="&staff.circ.offline.cmd_register_patron.accesskey;"/>
-			<button id="cmd_print_last_receipt" label="&staff.circ.offline.cmd_print_last_receipt.label;" accesskey="&staff.circ.offline.cmd_print_last_receipt.accesskey;"/>
-			<button id="cmd_exit" label="&staff.circ.offline.cmd_exit.label;" accesskey="&staff.circ.offline.cmd_exit.accesskey;"/>
-		</hbox>
-		<deck id="main" style="border: solid thin red; background-color: #FFAAAA;" flex="1">
-			<vbox flex="1">
-			</vbox>
-		</deck>
-	</groupbox>
+ <groupbox flex="1" class="my_overflow">
+  <caption label="&staff.circ.offline.main.label;"/>
+  <hbox id="nav">
+   <button id="today" onclick="alert('&common.unimplemented;');" tooltiptext="&staff.circ.offline.server_time.tooltiptext;"/>
+   <spacer flex="1"/>
+   <button id="cmd_checkout" label="&staff.circ.offline.cmd_checkout.label;" accesskey="&staff.circ.offline.cmd_checkout.accesskey;"/>
+   <button id="cmd_renew" label="&staff.circ.offline.cmd_renew.label;" accesskey="&staff.circ.offline.cmd_renew.accesskey;"/>
+   <button id="cmd_in_house_use" label="&staff.circ.offline.cmd_in_house_use.label;" accesskey="&staff.circ.offline.cmd_in_house_use.accesskey;"/>
+   <button id="cmd_checkin" label="&staff.circ.offline.cmd_checkin.label;" accesskey="&staff.circ.offline.cmd_checkin.accesskey;"/>
+   <button id="cmd_register_patron" label="&staff.circ.offline.cmd_register_patron.label;" accesskey="&staff.circ.offline.cmd_register_patron.accesskey;"/>
+   <button id="cmd_print_last_receipt" label="&staff.circ.offline.cmd_print_last_receipt.label;" accesskey="&staff.circ.offline.cmd_print_last_receipt.accesskey;"/>
+   <button id="cmd_exit" label="&staff.circ.offline.cmd_exit.label;" accesskey="&staff.circ.offline.cmd_exit.accesskey;"/>
+  </hbox>
+  <deck id="main" style="border: solid thin red; background-color: #FFAAAA;" flex="1">
+   <vbox flex="1">
+   </vbox>
+  </deck>
+ </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.js b/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.js
index 68b6d74d51..45af01d0b4 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.js
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.js
@@ -1,116 +1,116 @@
 var offlineStrings;
 
 function my_init() {
-	try {
-		offlineStrings = $('offlineStrings');
+ try {
+  offlineStrings = $('offlineStrings');
 
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		if (typeof JSAN == 'undefined') { throw(offlineStrings.getString('common.jsan.missing')); }
-		JSAN.errorLevel = "die"; // none, warn, or die
-		JSAN.addRepository('..');
-		JSAN.use('util.error'); g.error = new util.error();
-		g.error.sdump('D_TRACE','my_init() for offline_checkin.xul');
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  if (typeof JSAN == 'undefined') { throw(offlineStrings.getString('common.jsan.missing')); }
+  JSAN.errorLevel = "die"; // none, warn, or die
+  JSAN.addRepository('..');
+  JSAN.use('util.error'); g.error = new util.error();
+  g.error.sdump('D_TRACE','my_init() for offline_checkin.xul');
 
-		if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-			try { window.xulG.set_tab_name(offlineStrings.getString('circ.standalone')); } catch(E) { alert(E); }
-		}
+  if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+   try { window.xulG.set_tab_name(offlineStrings.getString('circ.standalone')); } catch(E) { alert(E); }
+  }
 
-		JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+  JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
 
-		JSAN.use('util.list'); g.list = new util.list('checkin_list');
-		JSAN.use('circ.util');
-		g.list.init( {
-			'columns' : circ.util.offline_checkin_columns(),
-			'map_row_to_column' : circ.util.std_map_row_to_column(),
-		} );
+  JSAN.use('util.list'); g.list = new util.list('checkin_list');
+  JSAN.use('circ.util');
+  g.list.init( {
+   'columns' : circ.util.offline_checkin_columns(),
+   'map_row_to_column' : circ.util.std_map_row_to_column(),
+  } );
 
-		JSAN.use('util.date');
+  JSAN.use('util.date');
 
-		$('i_barcode').addEventListener('keypress',handle_keypress,false);
-		$('i_barcode').focus();	
+  $('i_barcode').addEventListener('keypress',handle_keypress,false);
+  $('i_barcode').focus(); 
 
-		$('enter').addEventListener('command',handle_enter,false);
+  $('enter').addEventListener('command',handle_enter,false);
 
-		$('submit').addEventListener('command',next_patron,false);
+  $('submit').addEventListener('command',next_patron,false);
 
-		JSAN.use('util.file');
-		var file = new util.file('offline_delta'); 
-		if (file._file.exists()) { g.delta = file.get_object()[0]; file.close(); } else { g.delta = 0; }
+  JSAN.use('util.file');
+  var file = new util.file('offline_delta'); 
+  if (file._file.exists()) { g.delta = file.get_object()[0]; file.close(); } else { g.delta = 0; }
 
-	} catch(E) {
-		var err_msg = offlineStrings.getFormattedString('common.exception', ["circ/offline_checkin.xul", E]);
-		try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-		alert(err_msg);
-	}
+ } catch(E) {
+  var err_msg = offlineStrings.getFormattedString('common.exception', ["circ/offline_checkin.xul", E]);
+  try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+  alert(err_msg);
+ }
 }
 
 function $(id) { return document.getElementById(id); }
 
 function handle_keypress(ev) {
-	if ( (! ev.keyCode) || (ev.keyCode != 13) ) return;
-	switch(ev.target) {
-		case $('i_barcode') : handle_enter(); break;
-		default: break;
-	}
+ if ( (! ev.keyCode) || (ev.keyCode != 13) ) return;
+ switch(ev.target) {
+  case $('i_barcode') : handle_enter(); break;
+  default: break;
+ }
 }
 
 function handle_enter(ev) {
-	JSAN.use('util.barcode');
-	if ( ($('strict_i_barcode').checked) && (! util.barcode.check($('i_barcode').value)) ) {
-		var r = g.error.yns_alert(offlineStrings.getString('circ.bad_checkdigit'),offlineStrings.getString('circ.barcode.warning'),offlineStrings.getString('common.ok'),offlineStrings.getString('common.clear'),null,offlineStrings.getString('common.confirm'));
-		if (r == 1) {
-			setTimeout(
-				function() {
-					$('i_barcode').value = '';
-					$('i_barcode').focus();
-				},0
-			);
-		} else {
-			append_to_list();
-		}
-	} else {
-		append_to_list();
-	}
+ JSAN.use('util.barcode');
+ if ( ($('strict_i_barcode').checked) && (! util.barcode.check($('i_barcode').value)) ) {
+  var r = g.error.yns_alert(offlineStrings.getString('circ.bad_checkdigit'),offlineStrings.getString('circ.barcode.warning'),offlineStrings.getString('common.ok'),offlineStrings.getString('common.clear'),null,offlineStrings.getString('common.confirm'));
+  if (r == 1) {
+   setTimeout(
+    function() {
+     $('i_barcode').value = '';
+     $('i_barcode').focus();
+    },0
+   );
+  } else {
+   append_to_list();
+  }
+ } else {
+  append_to_list();
+ }
 }
 
 function append_to_list() {
 
-	try {
+ try {
 
-		var my = {};
+  var my = {};
 
-		my.type = 'checkin';
-		my.timestamp = parseInt( new Date().getTime() / 1000) + g.delta;
-		/* I18N to-do: enable localized date formats */
-		my.backdate = util.date.formatted_date(new Date(),"%F %H:%M:%s");
+  my.type = 'checkin';
+  my.timestamp = parseInt( new Date().getTime() / 1000) + g.delta;
+  /* I18N to-do: enable localized date formats */
+  my.backdate = util.date.formatted_date(new Date(),"%F %H:%M:%s");
 
-		var i_barcode = $('i_barcode').value;
-		if (! i_barcode) return; 
-		my.barcode = i_barcode; 
-	
-		g.list.append( { 'row' : { 'my' : my }, 'to_top' : true } );
+  var i_barcode = $('i_barcode').value;
+  if (! i_barcode) return; 
+  my.barcode = i_barcode; 
+ 
+  g.list.append( { 'row' : { 'my' : my }, 'to_top' : true } );
 
-		var x = $('i_barcode'); x.value = ''; x.focus();
+  var x = $('i_barcode'); x.value = ''; x.focus();
 
-	} catch(E) {
+ } catch(E) {
 
-		dump(E+'\n'); alert(E);
+  dump(E+'\n'); alert(E);
 
-	}
+ }
 }
 
 function next_patron() {
-	try {
-		JSAN.use('util.file'); var file = new util.file('pending_xacts');
-		var rows = g.list.dump_with_keys();
-		for (var i = 0; i < rows.length; i++) {
-			var row = rows[i]; row.delta = g.delta;
-			file.append_object(row);
-		}
-		file.close();
-
-		if ($('print_receipt').checked) {
-			try {
+ try {
+  JSAN.use('util.file'); var file = new util.file('pending_xacts');
+  var rows = g.list.dump_with_keys();
+  for (var i = 0; i < rows.length; i++) {
+   var row = rows[i]; row.delta = g.delta;
+   file.append_object(row);
+  }
+  file.close();
+
+  if ($('print_receipt').checked) {
+   try {
                 var params = {
                     'template' : 'offline_checkin',
                     'callback' : function() {
@@ -119,16 +119,16 @@ function next_patron() {
                     }
                 };
                 g.list.print( params );
-			} catch(E) {
-				g.error.sdump('D_ERROR','print: ' + E);
-				alert('print: ' + E);
-			}
-		} else {
+   } catch(E) {
+    g.error.sdump('D_ERROR','print: ' + E);
+    alert('print: ' + E);
+   }
+  } else {
             g.list.clear();
             var x = $('i_barcode'); x.value = ''; x.focus();
         }
 
-	} catch(E) {
-		dump(E+'\n'); alert(E);
-	}
+ } catch(E) {
+  dump(E+'\n'); alert(E);
+ }
 }
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.xul b/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.xul
index 8fa3bc47bb..10e60ef6c9 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.xul
@@ -16,73 +16,73 @@
 <?xul-overlay href="chrome://open_ils_staff_client/content/OpenILS/util_overlay_offline.xul"?>
 
 <window id="offline_checkin_win" sizemode="maximized"
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+ </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
-	<script type="text/javascript" src="offline_checkin.js"/>
+ <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
+ <script type="text/javascript" src="offline_checkin.js"/>
 
-	<messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+ <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
-	<groupbox flex="1">
-		<caption label="&staff.circ.offline_checkin.main.label;"/>
-		<hbox flex="1">
-			<vbox flex="1">
-				<hbox>
- 					<label value="&common.step1.label;" style="font-weight: bold" />
- 					<description>&common.check_date.description;</description>
-				</hbox>
-				<hbox>
- 					<label value="&common.step2.label;" style="font-weight: bold" accesskey="&common.step2.accesskey;" control="i_barcode"/>
- 					<description>&common.enter_barcode.description;</description>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<hbox><textbox id="i_barcode"/><button id="enter" label="&staff.circ.offline_checkin.step2a.label;" accesskey="&staff.circ.offline_checkin.step2a.accesskey;"/></hbox>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<description>&common.check_barcode.description;</description>
-					<checkbox id="strict_i_barcode" oils_persist="checked"/>
-				</hbox>
-				<hbox>
-					<label value="&common.step3.label;" style="font-weight: bold"/>
-					<description>&staff.circ.offline_checkin.step3.description;</description>
-				</hbox>
-				<hbox>
-					<label value="&common.step4.label;" style="font-weight: bold"/>
-					<description>&staff.circ.offline.finish.description;</description>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<description>&staff.circ.offline.print.description;</description>
-					<checkbox id="print_receipt" oils_persist="checked"/>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<button id="cancel" label="&common.cancel;" oncommand="g.list.clear()"/>
-					<button id="submit" label="&common.save_transactions.label;" accesskey="&common.save_transactions.accesskey;" />
-				</hbox>
-			</vbox>
-			<splitter>
-				<grippy />
-			</splitter>
-			<vbox flex="2">
-				<tree id="checkin_list" flex="1" enableColumnDrag="true"/>
-				<hbox id="checkin_bottom_ui">
-					<spacer flex="1"/>
-					<button id="delete" label="&common.delete_transactions.label;" oncommand="alert('&common.unimplemented;');"/>
-				</hbox>
-			</vbox>
-		</hbox>
-	</groupbox>
+ <groupbox flex="1">
+  <caption label="&staff.circ.offline_checkin.main.label;"/>
+  <hbox flex="1">
+   <vbox flex="1">
+    <hbox>
+      <label value="&common.step1.label;" style="font-weight: bold" />
+      <description>&common.check_date.description;</description>
+    </hbox>
+    <hbox>
+      <label value="&common.step2.label;" style="font-weight: bold" accesskey="&common.step2.accesskey;" control="i_barcode"/>
+      <description>&common.enter_barcode.description;</description>
+    </hbox>
+    <hbox>
+     <spacer flex="1"/>
+     <hbox><textbox id="i_barcode"/><button id="enter" label="&staff.circ.offline_checkin.step2a.label;" accesskey="&staff.circ.offline_checkin.step2a.accesskey;"/></hbox>
+    </hbox>
+    <hbox>
+     <spacer flex="1"/>
+     <description>&common.check_barcode.description;</description>
+     <checkbox id="strict_i_barcode" oils_persist="checked"/>
+    </hbox>
+    <hbox>
+     <label value="&common.step3.label;" style="font-weight: bold"/>
+     <description>&staff.circ.offline_checkin.step3.description;</description>
+    </hbox>
+    <hbox>
+     <label value="&common.step4.label;" style="font-weight: bold"/>
+     <description>&staff.circ.offline.finish.description;</description>
+    </hbox>
+    <hbox>
+     <spacer flex="1"/>
+     <description>&staff.circ.offline.print.description;</description>
+     <checkbox id="print_receipt" oils_persist="checked"/>
+    </hbox>
+    <hbox>
+     <spacer flex="1"/>
+     <button id="cancel" label="&common.cancel;" oncommand="g.list.clear()"/>
+     <button id="submit" label="&common.save_transactions.label;" accesskey="&common.save_transactions.accesskey;" />
+    </hbox>
+   </vbox>
+   <splitter>
+    <grippy />
+   </splitter>
+   <vbox flex="2">
+    <tree id="checkin_list" flex="1" enableColumnDrag="true"/>
+    <hbox id="checkin_bottom_ui">
+     <spacer flex="1"/>
+     <button id="delete" label="&common.delete_transactions.label;" oncommand="alert('&common.unimplemented;');"/>
+    </hbox>
+   </vbox>
+  </hbox>
+ </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.js b/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.js
index 2648cef087..51822cb683 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.js
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.js
@@ -1,276 +1,276 @@
 var offlineStrings;
 
 function my_init() {
-	try {
-		offlineStrings = $('offlineStrings');
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		if (typeof JSAN == 'undefined') { throw(offlineStrings.getString('common.jsan.missing')); }
-		JSAN.errorLevel = "die"; // none, warn, or die
-		JSAN.addRepository('..');
-		JSAN.use('util.error'); g.error = new util.error();
-		g.error.sdump('D_TRACE','my_init() for offline_checkout.xul');
-
-		JSAN.use('util.widgets'); JSAN.use('util.file');
-
-		if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-			try { window.xulG.set_tab_name(offlineStrings.getString('circ.standalone')); } catch(E) { alert(E); }
-		}
-
-		JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-
-		JSAN.use('util.list'); g.list = new util.list('checkout_list');
-		JSAN.use('circ.util');
-		g.list.init( {
-			'columns' : circ.util.offline_checkout_columns(),
-			'map_row_to_column' : circ.util.std_map_row_to_column(),
-		} );
-
-		JSAN.use('util.date');
-		var today = new Date();
-		var todayPlus = new Date(); todayPlus.setTime( today.getTime() + 24*60*60*1000*14 );
-		todayPlus = util.date.formatted_date(todayPlus,"%F");
-
-		$('duedate').setAttribute('value',todayPlus);
-		$('duedate').addEventListener('change',check_date,false);
-
-		$('p_barcode').addEventListener('change',test_patron,false);
-
-		$('p_barcode').addEventListener('keypress',handle_keypress,false);
-		$('p_barcode').focus();	
-
-		$('i_barcode').addEventListener('keypress',handle_keypress,false);
-		$('enter').addEventListener('command',handle_enter,false);
-
-		$('duedate_menu').addEventListener('command',handle_duedate_menu,false);
-
-		$('submit').addEventListener('command',function(ev){
-			save_xacts(); next_patron();
-		},false);
-		$('cancel').addEventListener('command',function(ev){
-			next_patron('cancel');
-		},false);
-
-		var file; var list_data; var ml;
-
-		file = new util.file('offline_cnct_list'); 
-		if (file._file.exists()) {
-			list_data = file.get_object(); file.close();
-			ml = util.widgets.make_menulist( 
-				[ [offlineStrings.getString('circ.offline_checkout.nonbarcoded'), ''] ].concat(list_data[0]), 
-				list_data[1] 
-			);
-			ml.setAttribute('id','noncat_type_menu'); $('x_noncat_type').appendChild(ml);
-			ml.addEventListener(
-				'command',
-				function(ev) { 
-					var count = window.prompt(offlineStrings.getString('circ.offline_checkout.items'),1,ml.getAttribute('label'));
-					append_to_list('noncat',count);	
-					ml.value = '';
-				},
-				false
-			);
-		} else {
-			alert(offlineStrings.getString('circ.offline_checkout.download.warning'));
-		}
-
-		var file = new util.file('offline_delta'); 
-		if (file._file.exists()) { g.delta = file.get_object()[0]; file.close(); } else { g.delta = 0; }
-
-	} catch(E) {
-		var err_msg = offlineStrings.getFormattedString('common.exception', ["circ/offline_checkout.xul", E]);
-		try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-		alert(err_msg);
-	}
+ try {
+  offlineStrings = $('offlineStrings');
+
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  if (typeof JSAN == 'undefined') { throw(offlineStrings.getString('common.jsan.missing')); }
+  JSAN.errorLevel = "die"; // none, warn, or die
+  JSAN.addRepository('..');
+  JSAN.use('util.error'); g.error = new util.error();
+  g.error.sdump('D_TRACE','my_init() for offline_checkout.xul');
+
+  JSAN.use('util.widgets'); JSAN.use('util.file');
+
+  if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+   try { window.xulG.set_tab_name(offlineStrings.getString('circ.standalone')); } catch(E) { alert(E); }
+  }
+
+  JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+
+  JSAN.use('util.list'); g.list = new util.list('checkout_list');
+  JSAN.use('circ.util');
+  g.list.init( {
+   'columns' : circ.util.offline_checkout_columns(),
+   'map_row_to_column' : circ.util.std_map_row_to_column(),
+  } );
+
+  JSAN.use('util.date');
+  var today = new Date();
+  var todayPlus = new Date(); todayPlus.setTime( today.getTime() + 24*60*60*1000*14 );
+  todayPlus = util.date.formatted_date(todayPlus,"%F");
+
+  $('duedate').setAttribute('value',todayPlus);
+  $('duedate').addEventListener('change',check_date,false);
+
+  $('p_barcode').addEventListener('change',test_patron,false);
+
+  $('p_barcode').addEventListener('keypress',handle_keypress,false);
+  $('p_barcode').focus(); 
+
+  $('i_barcode').addEventListener('keypress',handle_keypress,false);
+  $('enter').addEventListener('command',handle_enter,false);
+
+  $('duedate_menu').addEventListener('command',handle_duedate_menu,false);
+
+  $('submit').addEventListener('command',function(ev){
+   save_xacts(); next_patron();
+  },false);
+  $('cancel').addEventListener('command',function(ev){
+   next_patron('cancel');
+  },false);
+
+  var file; var list_data; var ml;
+
+  file = new util.file('offline_cnct_list'); 
+  if (file._file.exists()) {
+   list_data = file.get_object(); file.close();
+   ml = util.widgets.make_menulist( 
+    [ [offlineStrings.getString('circ.offline_checkout.nonbarcoded'), ''] ].concat(list_data[0]), 
+    list_data[1] 
+   );
+   ml.setAttribute('id','noncat_type_menu'); $('x_noncat_type').appendChild(ml);
+   ml.addEventListener(
+    'command',
+    function(ev) { 
+     var count = window.prompt(offlineStrings.getString('circ.offline_checkout.items'),1,ml.getAttribute('label'));
+     append_to_list('noncat',count); 
+     ml.value = '';
+    },
+    false
+   );
+  } else {
+   alert(offlineStrings.getString('circ.offline_checkout.download.warning'));
+  }
+
+  var file = new util.file('offline_delta'); 
+  if (file._file.exists()) { g.delta = file.get_object()[0]; file.close(); } else { g.delta = 0; }
+
+ } catch(E) {
+  var err_msg = offlineStrings.getFormattedString('common.exception', ["circ/offline_checkout.xul", E]);
+  try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+  alert(err_msg);
+ }
 }
 
 function $(id) { return document.getElementById(id); }
 
 function test_patron(ev) {
-	try {
-		var barcode = ev.target.value;
-		JSAN.use('util.barcode');
-		if ( ($('strict_p_barcode').checked) && (! util.barcode.check(barcode)) ) {
-			var r = g.error.yns_alert(offlineStrings.getString('circ.bad_checkdigit'),offlineStrings.getString('circ.barcode.warning'),offlineStrings.getString('common.ok'),offlineStrings.getString('common.clear'),null,offlineStrings.getString('common.confirm'));
-			if (r == 1) {
-				setTimeout(
-					function() {
-						ev.target.value = '';
-						ev.target.focus();
-					},0
-				);
-			}
-
-		}
-
-		if (g.data.bad_patrons[barcode]) {
-			var code;
-			switch(g.data.bad_patrons[barcode]) {
-				case 'L' : code = offlineStrings.getString('common.barcode.status.warning.lost'); break;
-				case 'E' : code = offlineStrings.getString('common.barcode.status.warning.expired'); break;
-				case 'B' : code = offlineStrings.getString('common.barcode.status.warning.barred'); break;
-				case 'D' : code = offlineStrings.getString('common.barcode.status.warning.blocked'); break;
-				default : code = offlineStrings.getFormattedString('common.barcode.status.warning.blocked', [g.data.bad_patrons[barcode]]); break;
-			}
-
-			var msg = offlineStrings.getFormattedString('common.barcode.status.warning', [g.data.bad_patrons_date.substr(0,15), barcode, code]);
-			var r = g.error.yns_alert(msg,offlineStrings.getString('circ.barcode.warning'),offlineStrings.getString('common.ok'),offlineStrings.getString('common.clear'),null,offlineStrings.getString('common.confirm'));
-			if (r == 1) {
-				setTimeout(
-					function() {
-						ev.target.value = '';
-						ev.target.focus();
-					},0
-				);
-			}
-		}
-	} catch(E) {
-		alert(E);
-	}
+ try {
+  var barcode = ev.target.value;
+  JSAN.use('util.barcode');
+  if ( ($('strict_p_barcode').checked) && (! util.barcode.check(barcode)) ) {
+   var r = g.error.yns_alert(offlineStrings.getString('circ.bad_checkdigit'),offlineStrings.getString('circ.barcode.warning'),offlineStrings.getString('common.ok'),offlineStrings.getString('common.clear'),null,offlineStrings.getString('common.confirm'));
+   if (r == 1) {
+    setTimeout(
+     function() {
+      ev.target.value = '';
+      ev.target.focus();
+     },0
+    );
+   }
+
+  }
+
+  if (g.data.bad_patrons[barcode]) {
+   var code;
+   switch(g.data.bad_patrons[barcode]) {
+    case 'L' : code = offlineStrings.getString('common.barcode.status.warning.lost'); break;
+    case 'E' : code = offlineStrings.getString('common.barcode.status.warning.expired'); break;
+    case 'B' : code = offlineStrings.getString('common.barcode.status.warning.barred'); break;
+    case 'D' : code = offlineStrings.getString('common.barcode.status.warning.blocked'); break;
+    default : code = offlineStrings.getFormattedString('common.barcode.status.warning.blocked', [g.data.bad_patrons[barcode]]); break;
+   }
+
+   var msg = offlineStrings.getFormattedString('common.barcode.status.warning', [g.data.bad_patrons_date.substr(0,15), barcode, code]);
+   var r = g.error.yns_alert(msg,offlineStrings.getString('circ.barcode.warning'),offlineStrings.getString('common.ok'),offlineStrings.getString('common.clear'),null,offlineStrings.getString('common.confirm'));
+   if (r == 1) {
+    setTimeout(
+     function() {
+      ev.target.value = '';
+      ev.target.focus();
+     },0
+    );
+   }
+  }
+ } catch(E) {
+  alert(E);
+ }
 }
 
 function check_date(ev) {
-	JSAN.use('util.date');
-	try {
-		if (! util.date.check('YYYY-MM-DD',ev.target.value) ) { throw(offlineStrings.getString('common.date.invalid')); }
-		if (util.date.check_past('YYYY-MM-DD',ev.target.value) ) { throw(offlineStrings.getString('circ.offline_checkout.date.early')); }
-		if (util.date.formatted_date(new Date(),'%F') == ev.target.value) { throw(offlineStrings.getString('circ.offline_checkout.date.early')); }
-	} catch(E) {
-		alert(E);
-		var today = new Date();
-		var todayPlus = new Date(); todayPlus.setTime( today.getTime() + 24*60*60*1000*14 );
-		todayPlus = util.date.formatted_date(todayPlus,"%F");
-		ev.target.value = todayPlus;
-	}
+ JSAN.use('util.date');
+ try {
+  if (! util.date.check('YYYY-MM-DD',ev.target.value) ) { throw(offlineStrings.getString('common.date.invalid')); }
+  if (util.date.check_past('YYYY-MM-DD',ev.target.value) ) { throw(offlineStrings.getString('circ.offline_checkout.date.early')); }
+  if (util.date.formatted_date(new Date(),'%F') == ev.target.value) { throw(offlineStrings.getString('circ.offline_checkout.date.early')); }
+ } catch(E) {
+  alert(E);
+  var today = new Date();
+  var todayPlus = new Date(); todayPlus.setTime( today.getTime() + 24*60*60*1000*14 );
+  todayPlus = util.date.formatted_date(todayPlus,"%F");
+  ev.target.value = todayPlus;
+ }
 }
 
 function handle_keypress(ev) {
-	if ( (! ev.keyCode) || (ev.keyCode != 13) ) return;
-	switch(ev.target) {
-		case $('p_barcode') : /*$('p_barcode').disabled = true;*/ setTimeout( function() { $('i_barcode').focus(); },0 ); break;
-		case $('i_barcode') : handle_enter(); break;
-		default: break;
-	}
+ if ( (! ev.keyCode) || (ev.keyCode != 13) ) return;
+ switch(ev.target) {
+  case $('p_barcode') : /*$('p_barcode').disabled = true;*/ setTimeout( function() { $('i_barcode').focus(); },0 ); break;
+  case $('i_barcode') : handle_enter(); break;
+  default: break;
+ }
 }
 
 function handle_enter(ev) {
-	JSAN.use('util.barcode');
-	if ( ($('strict_i_barcode').checked) && (! util.barcode.check($('i_barcode').value)) ) {
-		var r = g.error.yns_alert(offlineStrings.getString('circ.bad_checkdigit'),offlineStrings.getString('circ.barcode.warning'),offlineStrings.getString('common.ok'),offlineStrings.getString('common.clear'),null,offlineStrings.getString('common.confirm'));
-		if (r == 1) {
-			setTimeout(
-				function() {
-					$('i_barcode').value = '';
-					$('i_barcode').focus();
-				},0
-			);
-		} else {
-			append_to_list('barcode');
-		}
-	} else {
-		append_to_list('barcode');
-	}
+ JSAN.use('util.barcode');
+ if ( ($('strict_i_barcode').checked) && (! util.barcode.check($('i_barcode').value)) ) {
+  var r = g.error.yns_alert(offlineStrings.getString('circ.bad_checkdigit'),offlineStrings.getString('circ.barcode.warning'),offlineStrings.getString('common.ok'),offlineStrings.getString('common.clear'),null,offlineStrings.getString('common.confirm'));
+  if (r == 1) {
+   setTimeout(
+    function() {
+     $('i_barcode').value = '';
+     $('i_barcode').focus();
+    },0
+   );
+  } else {
+   append_to_list('barcode');
+  }
+ } else {
+  append_to_list('barcode');
+ }
 }
 
 function handle_duedate_menu(ev) {
-	if (ev.target.value=='0') return; 
-	JSAN.use('util.date'); 
-	var today = new Date(); 
-	var todayPlus = new Date(); 
-	todayPlus.setTime( today.getTime() + 24*60*60*1000*ev.target.value ); 
-	todayPlus = util.date.formatted_date(todayPlus,'%F'); 
-	$('duedate').setAttribute('value',todayPlus); 
-	$('duedate').value = todayPlus;
+ if (ev.target.value=='0') return; 
+ JSAN.use('util.date'); 
+ var today = new Date(); 
+ var todayPlus = new Date(); 
+ todayPlus.setTime( today.getTime() + 24*60*60*1000*ev.target.value ); 
+ todayPlus = util.date.formatted_date(todayPlus,'%F'); 
+ $('duedate').setAttribute('value',todayPlus); 
+ $('duedate').value = todayPlus;
 }
 
 function append_to_list(checkout_type,count) {
 
-	try {
-
-		var my = {};
-
-		my.type = 'checkout';
-		my.timestamp = parseInt( new Date().getTime() / 1000) + g.delta;
-		my.checkout_time = util.date.formatted_date(new Date(),"%F %H:%M:%s");
-
-		var p_barcode = $('p_barcode').value;
-		if (! p_barcode) {
-			g.error.yns_alert(offlineStrings.getString('circ.barcode.enter'),offlineStrings.getString('circ.offline_checkout.required_field'),offlineStrings.getString('common.ok'),null,null,offlineStrings.getString('common.confirm'));
-			return;
-		} else {
-
-			// Need to validate patron barcode against bad patron list
-			my.patron_barcode = p_barcode;
-		}
-
-		var due_date = $('duedate').value; // Need to validate this
-		my.due_date = due_date;
-
-		var i_barcode = $('i_barcode').value;
-		switch(checkout_type) {
-			case 'barcode' : 
-				if (! i_barcode) return; 
-				
-				var rows = g.list.dump_with_keys();
-				for (var i = 0; i < rows.length; i++) {
-					if (rows[i].barcode == i_barcode) {
-						g.error.yns_alert(offlineStrings.getString('circ.duplicate_scan.msg'),offlineStrings.getString('circ.duplicate_scan.field'),offlineStrings.getString('common.ok'),null,null,offlineStrings.getString('common.confirm'));
-						return;
-					}
-				}
-
-				my.barcode = i_barcode; 
-			break;
-			case 'noncat' :
-				count = parseInt(count); if (! (count>0) ) {
-					g.error.yns_alert(offlineStrings.getString('circ.offline_checkout.valid_count'),offlineStrings.getString('circ.offline_checkout.required_value'),offlineStrings.getString('common.ok'),null,null,offlineStrings.getString('common.confirm'));
-					return;
-				}
-				my.barcode = $('noncat_type_menu').getAttribute('label');
-				my.noncat = 1;
-				my.noncat_type = JSON2js($('noncat_type_menu').value)[0];
-				my.noncat_count = count;
-			break;
-			default: alert(offlineStrings.getString('common.error.default')); break;
-		}
-	
-		g.list.append( { 'row' : { 'my' : my }, 'to_top' : true } );
-
-		var x = $('i_barcode'); x.value = ''; x.focus();
-
-	} catch(E) {
-
-		dump(E+'\n'); alert(E);
-
-	}
+ try {
+
+  var my = {};
+
+  my.type = 'checkout';
+  my.timestamp = parseInt( new Date().getTime() / 1000) + g.delta;
+  my.checkout_time = util.date.formatted_date(new Date(),"%F %H:%M:%s");
+
+  var p_barcode = $('p_barcode').value;
+  if (! p_barcode) {
+   g.error.yns_alert(offlineStrings.getString('circ.barcode.enter'),offlineStrings.getString('circ.offline_checkout.required_field'),offlineStrings.getString('common.ok'),null,null,offlineStrings.getString('common.confirm'));
+   return;
+  } else {
+
+   // Need to validate patron barcode against bad patron list
+   my.patron_barcode = p_barcode;
+  }
+
+  var due_date = $('duedate').value; // Need to validate this
+  my.due_date = due_date;
+
+  var i_barcode = $('i_barcode').value;
+  switch(checkout_type) {
+   case 'barcode' : 
+    if (! i_barcode) return; 
+    
+    var rows = g.list.dump_with_keys();
+    for (var i = 0; i < rows.length; i++) {
+     if (rows[i].barcode == i_barcode) {
+      g.error.yns_alert(offlineStrings.getString('circ.duplicate_scan.msg'),offlineStrings.getString('circ.duplicate_scan.field'),offlineStrings.getString('common.ok'),null,null,offlineStrings.getString('common.confirm'));
+      return;
+     }
+    }
+
+    my.barcode = i_barcode; 
+   break;
+   case 'noncat' :
+    count = parseInt(count); if (! (count>0) ) {
+     g.error.yns_alert(offlineStrings.getString('circ.offline_checkout.valid_count'),offlineStrings.getString('circ.offline_checkout.required_value'),offlineStrings.getString('common.ok'),null,null,offlineStrings.getString('common.confirm'));
+     return;
+    }
+    my.barcode = $('noncat_type_menu').getAttribute('label');
+    my.noncat = 1;
+    my.noncat_type = JSON2js($('noncat_type_menu').value)[0];
+    my.noncat_count = count;
+   break;
+   default: alert(offlineStrings.getString('common.error.default')); break;
+  }
+ 
+  g.list.append( { 'row' : { 'my' : my }, 'to_top' : true } );
+
+  var x = $('i_barcode'); x.value = ''; x.focus();
+
+ } catch(E) {
+
+  dump(E+'\n'); alert(E);
+
+ }
 }
 
 
 function save_xacts() {
-	JSAN.use('util.file'); var file = new util.file('pending_xacts');
-	var rows = g.list.dump_with_keys();
-	for (var i = 0; i < rows.length; i++) {
-		var row = rows[i]; row.delta = g.delta;
-		if (row.noncat == 1) {
-			delete(row.barcode);
-		} else {
-			delete(row.noncat);
-			delete(row.noncat_type);
-			delete(row.noncat_count);
-		}
-		file.append_object(row);
-	}
-	file.close();
+ JSAN.use('util.file'); var file = new util.file('pending_xacts');
+ var rows = g.list.dump_with_keys();
+ for (var i = 0; i < rows.length; i++) {
+  var row = rows[i]; row.delta = g.delta;
+  if (row.noncat == 1) {
+   delete(row.barcode);
+  } else {
+   delete(row.noncat);
+   delete(row.noncat_type);
+   delete(row.noncat_count);
+  }
+  file.append_object(row);
+ }
+ file.close();
 }
 
 function next_patron(cancel) {
-	try {
-	
-		if ($('print_receipt').checked && (cancel!='cancel')) {
-			try {
-				var params = {
-					'patron_barcode' : $('p_barcode').value,
-					'template' : 'offline_checkout',
+ try {
+ 
+  if ($('print_receipt').checked && (cancel!='cancel')) {
+   try {
+    var params = {
+     'patron_barcode' : $('p_barcode').value,
+     'template' : 'offline_checkout',
                     'callback' : function() {
                         g.list.clear();
                         var x = $('i_barcode'); x.value = '';
@@ -278,20 +278,20 @@ function next_patron(cancel) {
                         x.setAttribute('disabled','false'); x.disabled = false; 
                         x.focus();
                     }
-				};
-				g.list.print( params );
-			} catch(E) {
-				g.error.sdump('D_ERROR','print: ' + E);
-				alert('print: ' + E);
-			}
-		} else {
+    };
+    g.list.print( params );
+   } catch(E) {
+    g.error.sdump('D_ERROR','print: ' + E);
+    alert('print: ' + E);
+   }
+  } else {
             g.list.clear();
             var x = $('i_barcode'); x.value = '';
             x = $('p_barcode'); x.value = ''; 
             x.setAttribute('disabled','false'); x.disabled = false; 
             x.focus();
-		}
-	} catch(E) {
-		dump(E+'\n'); alert(E);
-	}
+  }
+ } catch(E) {
+  dump(E+'\n'); alert(E);
+ }
 }
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.xul b/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.xul
index 2744d4bfc4..1b21579cc4 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.xul
@@ -16,110 +16,110 @@
 <?xul-overlay href="chrome://open_ils_staff_client/content/OpenILS/util_overlay_offline.xul"?>
 
 <window id="offline_checkout_win" sizemode="maximized"
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+ </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
-	<script type="text/javascript" src="offline_checkout.js"/>
+ <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
+ <script type="text/javascript" src="offline_checkout.js"/>
 
-	<messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+ <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
-	<groupbox flex="1">
-		<caption label="&staff.circ.offline_checkout.main.label;"/>
-		<hbox flex="1">
-			<vbox flex="1">
-				<hbox>
- 					<label value="&common.step1.label;" style="font-weight: bold" />
- 					<description>&common.check_date.description;</description>
-				</hbox>
-				<hbox>
- 					<label value="&common.step2.label;" style="font-weight: bold" accesskey="&common.step2.accesskey;" control="p_barcode"/>
-					<description>&staff.circ.offline_checkout.step2.description;</description>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<textbox id="p_barcode"/>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<description>&common.check_barcode.description;</description>
-					<checkbox id="strict_p_barcode" oils_persist="checked"/>
-				</hbox>
-				<hbox>
-					<label value="&common.step3.label;" style="font-weight: bold" accesskey="&common.step3.accesskey;" control="duedate"/>
-					<description>&common.due_date.description;</description>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<textbox id="duedate" style="font-family: monospace;"/>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<menulist id="duedate_menu">
-						<menupopup>
-							<menuitem label="&common.date_helper;" value="0"/>
-							<menuitem label="&common.date_helper.3_days;" value="3"/>
-							<menuitem label="&common.date_helper.7_days;" value="7"/>
-							<menuitem label="&common.date_helper.14_days;" value="14"/>
-							<menuitem label="&common.date_helper.30_days;" value="30"/>
-						</menupopup>
-					</menulist>
-				</hbox>
-				<hbox>
-					<label value="&common.step4.label;" style="font-weight: bold" accesskey="&common.step4.accesskey;" control="i_barcode"/>
-					<description>&common.enter_barcode.description;</description>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<hbox><textbox id="i_barcode"/><button id="enter" label="&common.enter.label;" accesskey="&common.enter.accesskey;"/></hbox>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<hbox id="x_noncat_type"/>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<description>&common.check_barcode.description;</description>
-					<checkbox id="strict_i_barcode" oils_persist="checked"/>
-				</hbox>
-				<hbox>
-					<label value="&common.step5.label;" style="font-weight: bold"/>
-					<description>&staff.circ.offline_checkout.step5.description;</description>
-				</hbox>
-				<hbox>
-					<label value="&common.step6.label;" style="font-weight: bold"/>
-					<description>&staff.circ.offline.finish.description;</description>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<description>&staff.circ.offline.print.description;</description>
-					<checkbox id="print_receipt" oils_persist="checked"/>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<button id="cancel" label="&common.cancel;" />
-					<button id="submit" label="&common.save_transactions.label;" accesskey="&common.save_transactions.accesskey;" />
-				</hbox>
-			</vbox>
-			<splitter>
-				<grippy />
-			</splitter>
-			<vbox flex="2">
-				<tree id="checkout_list" flex="1" enableColumnDrag="true"/>
-				<hbox id="checkout_bottom_ui">
-					<spacer flex="1"/>
-					<button id="delete" label="&common.delete_transactions.label;" oncommand="alert('&common.unimplemented;');"/>
-				</hbox>
-			</vbox>
-		</hbox>
-	</groupbox>
+ <groupbox flex="1">
+  <caption label="&staff.circ.offline_checkout.main.label;"/>
+  <hbox flex="1">
+   <vbox flex="1">
+    <hbox>
+      <label value="&common.step1.label;" style="font-weight: bold" />
+      <description>&common.check_date.description;</description>
+    </hbox>
+    <hbox>
+      <label value="&common.step2.label;" style="font-weight: bold" accesskey="&common.step2.accesskey;" control="p_barcode"/>
+     <description>&staff.circ.offline_checkout.step2.description;</description>
+    </hbox>
+    <hbox>
+     <spacer flex="1"/>
+     <textbox id="p_barcode"/>
+    </hbox>
+    <hbox>
+     <spacer flex="1"/>
+     <description>&common.check_barcode.description;</description>
+     <checkbox id="strict_p_barcode" oils_persist="checked"/>
+    </hbox>
+    <hbox>
+     <label value="&common.step3.label;" style="font-weight: bold" accesskey="&common.step3.accesskey;" control="duedate"/>
+     <description>&common.due_date.description;</description>
+    </hbox>
+    <hbox>
+     <spacer flex="1"/>
+     <textbox id="duedate" style="font-family: monospace;"/>
+    </hbox>
+    <hbox>
+     <spacer flex="1"/>
+     <menulist id="duedate_menu">
+      <menupopup>
+       <menuitem label="&common.date_helper;" value="0"/>
+       <menuitem label="&common.date_helper.3_days;" value="3"/>
+       <menuitem label="&common.date_helper.7_days;" value="7"/>
+       <menuitem label="&common.date_helper.14_days;" value="14"/>
+       <menuitem label="&common.date_helper.30_days;" value="30"/>
+      </menupopup>
+     </menulist>
+    </hbox>
+    <hbox>
+     <label value="&common.step4.label;" style="font-weight: bold" accesskey="&common.step4.accesskey;" control="i_barcode"/>
+     <description>&common.enter_barcode.description;</description>
+    </hbox>
+    <hbox>
+     <spacer flex="1"/>
+     <hbox><textbox id="i_barcode"/><button id="enter" label="&common.enter.label;" accesskey="&common.enter.accesskey;"/></hbox>
+    </hbox>
+    <hbox>
+     <spacer flex="1"/>
+     <hbox id="x_noncat_type"/>
+    </hbox>
+    <hbox>
+     <spacer flex="1"/>
+     <description>&common.check_barcode.description;</description>
+     <checkbox id="strict_i_barcode" oils_persist="checked"/>
+    </hbox>
+    <hbox>
+     <label value="&common.step5.label;" style="font-weight: bold"/>
+     <description>&staff.circ.offline_checkout.step5.description;</description>
+    </hbox>
+    <hbox>
+     <label value="&common.step6.label;" style="font-weight: bold"/>
+     <description>&staff.circ.offline.finish.description;</description>
+    </hbox>
+    <hbox>
+     <spacer flex="1"/>
+     <description>&staff.circ.offline.print.description;</description>
+     <checkbox id="print_receipt" oils_persist="checked"/>
+    </hbox>
+    <hbox>
+     <spacer flex="1"/>
+     <button id="cancel" label="&common.cancel;" />
+     <button id="submit" label="&common.save_transactions.label;" accesskey="&common.save_transactions.accesskey;" />
+    </hbox>
+   </vbox>
+   <splitter>
+    <grippy />
+   </splitter>
+   <vbox flex="2">
+    <tree id="checkout_list" flex="1" enableColumnDrag="true"/>
+    <hbox id="checkout_bottom_ui">
+     <spacer flex="1"/>
+     <button id="delete" label="&common.delete_transactions.label;" oncommand="alert('&common.unimplemented;');"/>
+    </hbox>
+   </vbox>
+  </hbox>
+ </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline_in_house_use.js b/Open-ILS/xul/staff_client/chrome/content/circ/offline_in_house_use.js
index aeda8e5d0e..8d0f2d8a1d 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline_in_house_use.js
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline_in_house_use.js
@@ -1,136 +1,136 @@
 var offlineStrings;
 
 function my_init() {
-	try {
-		offlineStrings = document.getElementById('offlineStrings');
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		if (typeof JSAN == 'undefined') { throw(offlineStrings.getString('common.jsan.missing')); }
-		JSAN.errorLevel = "die"; // none, warn, or die
-		JSAN.addRepository('..');
-		JSAN.use('util.error'); g.error = new util.error();
-		g.error.sdump('D_TRACE','my_init() for offline_checkout.xul');
-
-		if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-			try { window.xulG.set_tab_name(offlineStrings.getString('circ.standalone')); } catch(E) { alert(E); }
-		}
-
-		JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-
-		JSAN.use('util.list'); g.list = new util.list('checkout_list');
-		JSAN.use('circ.util');
-		g.list.init( {
-			'columns' : circ.util.offline_inhouse_use_columns(),
-			'map_row_to_column' : circ.util.std_map_row_to_column(),
-		} );
-
-		$('i_barcode').addEventListener('keypress',handle_keypress,false);
-		$('enter').addEventListener('command',handle_enter,false);
-		$('submit').addEventListener('command',next_patron,false);
-
-		$('i_barcode').focus();
-
-		JSAN.use('util.file');
-		var file = new util.file('offline_delta'); 
-		if (file._file.exists()) { g.delta = file.get_object()[0]; file.close(); } else { g.delta = 0; }
-
-	} catch(E) {
-		var err_msg = offlineStrings.getFormattedString('common.exception', ["circ/offline_in_house_use.xul", E]);
-		try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-		alert(err_msg);
-	}
+ try {
+  offlineStrings = document.getElementById('offlineStrings');
+
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  if (typeof JSAN == 'undefined') { throw(offlineStrings.getString('common.jsan.missing')); }
+  JSAN.errorLevel = "die"; // none, warn, or die
+  JSAN.addRepository('..');
+  JSAN.use('util.error'); g.error = new util.error();
+  g.error.sdump('D_TRACE','my_init() for offline_checkout.xul');
+
+  if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+   try { window.xulG.set_tab_name(offlineStrings.getString('circ.standalone')); } catch(E) { alert(E); }
+  }
+
+  JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+
+  JSAN.use('util.list'); g.list = new util.list('checkout_list');
+  JSAN.use('circ.util');
+  g.list.init( {
+   'columns' : circ.util.offline_inhouse_use_columns(),
+   'map_row_to_column' : circ.util.std_map_row_to_column(),
+  } );
+
+  $('i_barcode').addEventListener('keypress',handle_keypress,false);
+  $('enter').addEventListener('command',handle_enter,false);
+  $('submit').addEventListener('command',next_patron,false);
+
+  $('i_barcode').focus();
+
+  JSAN.use('util.file');
+  var file = new util.file('offline_delta'); 
+  if (file._file.exists()) { g.delta = file.get_object()[0]; file.close(); } else { g.delta = 0; }
+
+ } catch(E) {
+  var err_msg = offlineStrings.getFormattedString('common.exception', ["circ/offline_in_house_use.xul", E]);
+  try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+  alert(err_msg);
+ }
 }
 
 function $(id) { return document.getElementById(id); }
 
 function handle_keypress(ev) {
-	if ( (! ev.keyCode) || (ev.keyCode != 13) ) return;
-	switch(ev.target) {
-		case $('i_barcode') : handle_enter(); break;
-		default: break;
-	}
+ if ( (! ev.keyCode) || (ev.keyCode != 13) ) return;
+ switch(ev.target) {
+  case $('i_barcode') : handle_enter(); break;
+  default: break;
+ }
 }
 
 function handle_enter(ev) {
-	JSAN.use('util.barcode');
-	if ( ($('strict_i_barcode').checked) && (! util.barcode.check($('i_barcode').value)) ) {
-		var r = g.error.yns_alert(offlineStrings.getString('circ.bad_checkdigit'),offlineStrings.getString('circ.barcode.warning'),offlineStrings.getString('common.ok'),offlineStrings.getString('common.clear'),null,offlineStrings.getString('common.confirm'));
-		if (r == 1) {
-			setTimeout(
-				function() {
-					$('i_barcode').value = '';
-					$('i_barcode').focus();
-				},0
-			);
-		} else {
-			append_to_list();
-		}
-	} else {
-		append_to_list();
-	}
+ JSAN.use('util.barcode');
+ if ( ($('strict_i_barcode').checked) && (! util.barcode.check($('i_barcode').value)) ) {
+  var r = g.error.yns_alert(offlineStrings.getString('circ.bad_checkdigit'),offlineStrings.getString('circ.barcode.warning'),offlineStrings.getString('common.ok'),offlineStrings.getString('common.clear'),null,offlineStrings.getString('common.confirm'));
+  if (r == 1) {
+   setTimeout(
+    function() {
+     $('i_barcode').value = '';
+     $('i_barcode').focus();
+    },0
+   );
+  } else {
+   append_to_list();
+  }
+ } else {
+  append_to_list();
+ }
 }
 
 function append_to_list() {
 
-	try {
+ try {
 
-		JSAN.use('util.date');
+  JSAN.use('util.date');
 
-		var my = {};
+  var my = {};
 
-		my.type = 'in_house_use';
-		my.timestamp = parseInt( new Date().getTime() / 1000) + g.delta;
-		/* I18N to-do: enable localized date formats */
-		my.use_time = util.date.formatted_date(new Date(),"%F %H:%M:%s");
+  my.type = 'in_house_use';
+  my.timestamp = parseInt( new Date().getTime() / 1000) + g.delta;
+  /* I18N to-do: enable localized date formats */
+  my.use_time = util.date.formatted_date(new Date(),"%F %H:%M:%s");
 
-		var i_barcode = $('i_barcode').value;
-		if (! i_barcode) return; 
-		my.barcode = i_barcode; 
+  var i_barcode = $('i_barcode').value;
+  if (! i_barcode) return; 
+  my.barcode = i_barcode; 
 
-		var count = $('count').value;
-		if (!Number(count) || count < 1) count = 1;
-		my.count = count;
+  var count = $('count').value;
+  if (!Number(count) || count < 1) count = 1;
+  my.count = count;
 
-		g.list.append( { 'row' : { 'my' : my }, 'to_top' : true } );
+  g.list.append( { 'row' : { 'my' : my }, 'to_top' : true } );
 
-		var x = $('i_barcode'); x.value = ''; x.focus();
+  var x = $('i_barcode'); x.value = ''; x.focus();
 
-	} catch(E) {
+ } catch(E) {
 
-		dump(E+'\n'); alert(E);
+  dump(E+'\n'); alert(E);
 
-	}
+ }
 }
 
 function next_patron() {
-	try {
-		JSAN.use('util.file'); var file = new util.file('pending_xacts');
-		var rows = g.list.dump_with_keys();
-		for (var i = 0; i < rows.length; i++) {
-			var row = rows[i]; row.delta = g.delta;
-			file.append_object(row);
-		}
-		file.close();
-		
-		if ($('print_receipt').checked) {
-			try {
-				var params = {
-					'template' : 'offline_inhouse_use',
+ try {
+  JSAN.use('util.file'); var file = new util.file('pending_xacts');
+  var rows = g.list.dump_with_keys();
+  for (var i = 0; i < rows.length; i++) {
+   var row = rows[i]; row.delta = g.delta;
+   file.append_object(row);
+  }
+  file.close();
+  
+  if ($('print_receipt').checked) {
+   try {
+    var params = {
+     'template' : 'offline_inhouse_use',
                     'callback' : function() {
                         g.list.clear();
                         var x = $('i_barcode'); x.value = ''; x.focus();
                     }
-				};
-				g.list.print( params );
-			} catch(E) {
-				g.error.sdump('D_ERROR','print: ' + E);
-				alert('print: ' + E);
-			}
-		} else {
+    };
+    g.list.print( params );
+   } catch(E) {
+    g.error.sdump('D_ERROR','print: ' + E);
+    alert('print: ' + E);
+   }
+  } else {
             g.list.clear();
             var x = $('i_barcode'); x.value = ''; x.focus();
         }
-	} catch(E) {
-		dump(E+'\n'); alert(E);
-	}
+ } catch(E) {
+  dump(E+'\n'); alert(E);
+ }
 }
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline_in_house_use.xul b/Open-ILS/xul/staff_client/chrome/content/circ/offline_in_house_use.xul
index e635c4123e..4fcdb6d3de 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline_in_house_use.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline_in_house_use.xul
@@ -16,82 +16,82 @@
 <?xul-overlay href="chrome://open_ils_staff_client/content/OpenILS/util_overlay_offline.xul"?>
 
 <window id="offline_checkout_win" sizemode="maximized"
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+ </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
-	<script type="text/javascript" src="offline_in_house_use.js"/>
+ <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
+ <script type="text/javascript" src="offline_in_house_use.js"/>
 
-	<messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+ <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
-	<groupbox flex="1">
-		<caption label="&staff.circ.offline_in_house_use.main.label;"/>
-		<hbox flex="1">
-			<vbox flex="1">
-				<hbox>
-					<label value="&common.step1.label;" style="font-weight: bold" />
-					<description>&common.check_date.description;</description>
-				</hbox>
-				<hbox>
-					<label value="&common.step2.label;" style="font-weight: bold" accesskey="&common.step2.accesskey;" control="count"/>
-					<description>&staff.circ.offline_in_house_use.uses.label;</description>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<textbox id="count" value="1"/>
-				</hbox>
+ <groupbox flex="1">
+  <caption label="&staff.circ.offline_in_house_use.main.label;"/>
+  <hbox flex="1">
+   <vbox flex="1">
+    <hbox>
+     <label value="&common.step1.label;" style="font-weight: bold" />
+     <description>&common.check_date.description;</description>
+    </hbox>
+    <hbox>
+     <label value="&common.step2.label;" style="font-weight: bold" accesskey="&common.step2.accesskey;" control="count"/>
+     <description>&staff.circ.offline_in_house_use.uses.label;</description>
+    </hbox>
+    <hbox>
+     <spacer flex="1"/>
+     <textbox id="count" value="1"/>
+    </hbox>
 
-				<hbox>
-					<label value="&common.step3.label;" style="font-weight: bold" accesskey="&common.step3.accesskey;" control="i_barcode"/>
-					<description>&common.enter_barcode.description;</description>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<hbox><textbox id="i_barcode"/><button id="enter" label="&common.enter.label;" accesskey="&common.enter.accesskey;"/></hbox>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<description>&common.check_barcode.description;</description>
-					<checkbox id="strict_i_barcode" oils_persist="checked"/>
-				</hbox>
-				<hbox>
-					<label value="&common.step4.label;" style="font-weight: bold"/>
-					<description>&staff.circ.offline_in_house_use.step4.description;</description>
-				</hbox>
-				<hbox>
-					<label value="&common.step5.label;" style="font-weight: bold"/>
-					<description>&staff.circ.offline.finish.description;</description>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<description>&staff.circ.offline.print.description;</description>
-					<checkbox id="print_receipt" oils_persist="checked"/>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<button id="cancel" label="&common.cancel;" oncommand="g.list.clear()"/>
-					<button id="submit" label="&common.save_transactions.label;" accesskey="&common.save_transactions.accesskey;" />
-				</hbox>
-			</vbox>
-			<splitter>
-				<grippy />
-			</splitter>
-			<vbox flex="2">
-				<tree id="checkout_list" flex="1" enableColumnDrag="true"/>
-				<hbox id="checkout_bottom_ui">
-					<spacer flex="1"/>
-					<button id="delete" label="&common.delete_transactions.label;" oncommand="alert('&common.unimplemented;');"/>
-				</hbox>
-			</vbox>
-		</hbox>
-	</groupbox>
+    <hbox>
+     <label value="&common.step3.label;" style="font-weight: bold" accesskey="&common.step3.accesskey;" control="i_barcode"/>
+     <description>&common.enter_barcode.description;</description>
+    </hbox>
+    <hbox>
+     <spacer flex="1"/>
+     <hbox><textbox id="i_barcode"/><button id="enter" label="&common.enter.label;" accesskey="&common.enter.accesskey;"/></hbox>
+    </hbox>
+    <hbox>
+     <spacer flex="1"/>
+     <description>&common.check_barcode.description;</description>
+     <checkbox id="strict_i_barcode" oils_persist="checked"/>
+    </hbox>
+    <hbox>
+     <label value="&common.step4.label;" style="font-weight: bold"/>
+     <description>&staff.circ.offline_in_house_use.step4.description;</description>
+    </hbox>
+    <hbox>
+     <label value="&common.step5.label;" style="font-weight: bold"/>
+     <description>&staff.circ.offline.finish.description;</description>
+    </hbox>
+    <hbox>
+     <spacer flex="1"/>
+     <description>&staff.circ.offline.print.description;</description>
+     <checkbox id="print_receipt" oils_persist="checked"/>
+    </hbox>
+    <hbox>
+     <spacer flex="1"/>
+     <button id="cancel" label="&common.cancel;" oncommand="g.list.clear()"/>
+     <button id="submit" label="&common.save_transactions.label;" accesskey="&common.save_transactions.accesskey;" />
+    </hbox>
+   </vbox>
+   <splitter>
+    <grippy />
+   </splitter>
+   <vbox flex="2">
+    <tree id="checkout_list" flex="1" enableColumnDrag="true"/>
+    <hbox id="checkout_bottom_ui">
+     <spacer flex="1"/>
+     <button id="delete" label="&common.delete_transactions.label;" oncommand="alert('&common.unimplemented;');"/>
+    </hbox>
+   </vbox>
+  </hbox>
+ </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline_register.js b/Open-ILS/xul/staff_client/chrome/content/circ/offline_register.js
index f2c94d0596..4a87054add 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline_register.js
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline_register.js
@@ -1,334 +1,334 @@
 var offlineStrings;
 
 function my_init() {
-	try {
-		offlineStrings = $('offlineStrings');
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		if (typeof JSAN == 'undefined') { throw(offlineStrings.getString('common.jsan.missing')); }
-		JSAN.errorLevel = "die"; // none, warn, or die
-		JSAN.addRepository('..');
-		JSAN.use('util.error'); g.error = new util.error();
-		g.error.sdump('D_TRACE','my_init() for offline_register.xul');
-
-		JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-
-		if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-			try { window.xulG.set_tab_name(offlineStrings.getString('circ.standalone')); } catch(E) { alert(E); }
-		}
-
-		$('barcode').addEventListener('change',test_patron,false);
-		$('barcode').addEventListener('keypress',handle_keypress,false);
-		$('submit').addEventListener('command',next_patron,false);
-
-		JSAN.use('util.file');
-		JSAN.use('util.widgets');
-
-		var file; var list_data; var ml; var errors = '';
-
-		file = new util.file('offline_ou_list'); 
-		if (file._file.exists()) {
-			list_data = file.get_object(); file.close();
-			ml = util.widgets.make_menulist( list_data[0], list_data[1] );
-			ml.setAttribute('id','home_ou'); $('x_home_ou').appendChild(ml);
-		} else {
-			errors += offlineStrings.getString('circ.offline_register.missing.library.list') + "\n";
-		}
-
-		file = new util.file('offline_pgt_list');
-		if (file._file.exists()) {
-			list_data = file.get_object(); file.close();
-			ml = util.widgets.make_menulist( list_data[0], list_data[1] );
-			ml.setAttribute('id','profile'); $('x_profile').appendChild(ml);
-		} else {
-			errors += offlineStrings.getString('circ.offline_register.missing.profile.list') + "\n";
-		}
-
-		file = new util.file('offline_cit_list'); 
-		if (file._file.exists()) {
-			list_data = file.get_object(); file.close();
-			ml = util.widgets.make_menulist( list_data[0], list_data[1] );
-			ml.setAttribute('id','ident_type'); $('x_ident_type').appendChild(ml);
-		} else {
-			errors += offlineStrings.getString('circ.offline_register.missing.id.type.list') + "\n";
-		}
-
-		file = new util.file('offline_asv_list'); 
-		if (file._file.exists()) {
-			list_data = file.get_object(); file.close();
-			render_surveys('x_surveys', list_data);
-		} else {
-			errors += offlineStrings.getString('circ.offline_register.missing.required.surveys');
-		}
-
-		if (errors != '') {
-			alert(offlineStrings.getString('circ.offline_register.missing.files.error') + errors);
-			location.href = 'about:blank';
-		}
-
-		$('passwd').value = parseInt(Math.random()*8999+1000);
-
-		$('dob').addEventListener('change',handle_check_date,false);
-		$('barcode').focus();
-
-		var file = new util.file('offline_delta'); 
-		if (file._file.exists()) { g.delta = file.get_object()[0]; file.close(); } else { g.delta = 0; }
-
-	} catch(E) {
-		var err_msg = offlineStrings.getFormattedString('common.exception', ["circ/offline_register.xul", E]);
-		try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-		alert(err_msg);
-	}
+ try {
+  offlineStrings = $('offlineStrings');
+
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  if (typeof JSAN == 'undefined') { throw(offlineStrings.getString('common.jsan.missing')); }
+  JSAN.errorLevel = "die"; // none, warn, or die
+  JSAN.addRepository('..');
+  JSAN.use('util.error'); g.error = new util.error();
+  g.error.sdump('D_TRACE','my_init() for offline_register.xul');
+
+  JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+
+  if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+   try { window.xulG.set_tab_name(offlineStrings.getString('circ.standalone')); } catch(E) { alert(E); }
+  }
+
+  $('barcode').addEventListener('change',test_patron,false);
+  $('barcode').addEventListener('keypress',handle_keypress,false);
+  $('submit').addEventListener('command',next_patron,false);
+
+  JSAN.use('util.file');
+  JSAN.use('util.widgets');
+
+  var file; var list_data; var ml; var errors = '';
+
+  file = new util.file('offline_ou_list'); 
+  if (file._file.exists()) {
+   list_data = file.get_object(); file.close();
+   ml = util.widgets.make_menulist( list_data[0], list_data[1] );
+   ml.setAttribute('id','home_ou'); $('x_home_ou').appendChild(ml);
+  } else {
+   errors += offlineStrings.getString('circ.offline_register.missing.library.list') + "\n";
+  }
+
+  file = new util.file('offline_pgt_list');
+  if (file._file.exists()) {
+   list_data = file.get_object(); file.close();
+   ml = util.widgets.make_menulist( list_data[0], list_data[1] );
+   ml.setAttribute('id','profile'); $('x_profile').appendChild(ml);
+  } else {
+   errors += offlineStrings.getString('circ.offline_register.missing.profile.list') + "\n";
+  }
+
+  file = new util.file('offline_cit_list'); 
+  if (file._file.exists()) {
+   list_data = file.get_object(); file.close();
+   ml = util.widgets.make_menulist( list_data[0], list_data[1] );
+   ml.setAttribute('id','ident_type'); $('x_ident_type').appendChild(ml);
+  } else {
+   errors += offlineStrings.getString('circ.offline_register.missing.id.type.list') + "\n";
+  }
+
+  file = new util.file('offline_asv_list'); 
+  if (file._file.exists()) {
+   list_data = file.get_object(); file.close();
+   render_surveys('x_surveys', list_data);
+  } else {
+   errors += offlineStrings.getString('circ.offline_register.missing.required.surveys');
+  }
+
+  if (errors != '') {
+   alert(offlineStrings.getString('circ.offline_register.missing.files.error') + errors);
+   location.href = 'about:blank';
+  }
+
+  $('passwd').value = parseInt(Math.random()*8999+1000);
+
+  $('dob').addEventListener('change',handle_check_date,false);
+  $('barcode').focus();
+
+  var file = new util.file('offline_delta'); 
+  if (file._file.exists()) { g.delta = file.get_object()[0]; file.close(); } else { g.delta = 0; }
+
+ } catch(E) {
+  var err_msg = offlineStrings.getFormattedString('common.exception', ["circ/offline_register.xul", E]);
+  try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+  alert(err_msg);
+ }
 }
 
 function $(id) { return document.getElementById(id); }
 
 function test_patron(ev) {
-	try {
-		var barcode = ev.target.value;
-		JSAN.use('util.barcode');
-		if ( ! util.barcode.check(ev.target.value) ) {
-			var r = g.error.yns_alert(offlineStrings.getString('circ.bad_checkdigit'),offlineStrings.getString('circ.barcode.warning'),offlineStrings.getString('common.ok'),offlineStrings.getString('common.clear'),null,offlineStrings.getString('common.confirm'));
-			if (r == 1) {
-				setTimeout(
-					function() {
-						ev.target.value = '';
-						ev.target.focus();
-					},0
-				);
-			}
-
-		}
-		if (g.data.bad_patrons[barcode]) {
-			var code;
-			switch(g.data.bad_patrons[barcode]) {
-				case 'L' : code = offlineStrings.getString('common.barcode.status.warning.lost'); break;
-				case 'E' : code = offlineStrings.getString('common.barcode.status.warning.expired'); break;
-				case 'B' : code = offlineStrings.getString('common.barcode.status.warning.barred'); break;
-				case 'D' : code = offlineStrings.getString('common.barcode.status.warning.blocked'); break;
-				default : code = offlineStrings.getFormattedString('common.barcode.status.warning.blocked', [g.data.bad_patrons[barcode]]); break;
-			}
-
-			var msg = offlineStrings.getFormattedString('common.barcode.status.warning', [g.data.bad_patrons_date.substr(0,15), barcode, code]);
-			var r = g.error.yns_alert(msg,offlineStrings.getString('circ.barcode.warning'),offlineStrings.getString('common.ok'),offlineStrings.getString('common.clear'),null,offlineStrings.getString('common.confirm'));
-			if (r == 1) {
-				setTimeout(
-					function() {
-						ev.target.value = '';
-						ev.target.focus();
-					},0
-				);
-			}
-		}
-	} catch(E) {
-		alert(E);
-	}
+ try {
+  var barcode = ev.target.value;
+  JSAN.use('util.barcode');
+  if ( ! util.barcode.check(ev.target.value) ) {
+   var r = g.error.yns_alert(offlineStrings.getString('circ.bad_checkdigit'),offlineStrings.getString('circ.barcode.warning'),offlineStrings.getString('common.ok'),offlineStrings.getString('common.clear'),null,offlineStrings.getString('common.confirm'));
+   if (r == 1) {
+    setTimeout(
+     function() {
+      ev.target.value = '';
+      ev.target.focus();
+     },0
+    );
+   }
+
+  }
+  if (g.data.bad_patrons[barcode]) {
+   var code;
+   switch(g.data.bad_patrons[barcode]) {
+    case 'L' : code = offlineStrings.getString('common.barcode.status.warning.lost'); break;
+    case 'E' : code = offlineStrings.getString('common.barcode.status.warning.expired'); break;
+    case 'B' : code = offlineStrings.getString('common.barcode.status.warning.barred'); break;
+    case 'D' : code = offlineStrings.getString('common.barcode.status.warning.blocked'); break;
+    default : code = offlineStrings.getFormattedString('common.barcode.status.warning.blocked', [g.data.bad_patrons[barcode]]); break;
+   }
+
+   var msg = offlineStrings.getFormattedString('common.barcode.status.warning', [g.data.bad_patrons_date.substr(0,15), barcode, code]);
+   var r = g.error.yns_alert(msg,offlineStrings.getString('circ.barcode.warning'),offlineStrings.getString('common.ok'),offlineStrings.getString('common.clear'),null,offlineStrings.getString('common.confirm'));
+   if (r == 1) {
+    setTimeout(
+     function() {
+      ev.target.value = '';
+      ev.target.focus();
+     },0
+    );
+   }
+  }
+ } catch(E) {
+  alert(E);
+ }
 }
 
 function handle_check_date(ev) {
-	ev.target.value = check_date(ev.target.value);
+ ev.target.value = check_date(ev.target.value);
 }
 
 function check_date(value) {
-	JSAN.use('util.date');
-	try {
-		if (! util.date.check('YYYY-MM-DD',value) ) { throw(offlineStrings.getString('common.date.invalid')); }
-		if (! util.date.check_past('YYYY-MM-DD',value) ) { throw(offlineStrings.getString('circ.offline_register.future.birth.date')); }
-		if ( util.date.formatted_date(new Date(),'%F') == value) { throw(offlineStrings.getString('circ.offline_register.invalid.birth.date')); }
-	} catch(E) {
-		alert(E);
-		value = '';
-	}
-	return value;
+ JSAN.use('util.date');
+ try {
+  if (! util.date.check('YYYY-MM-DD',value) ) { throw(offlineStrings.getString('common.date.invalid')); }
+  if (! util.date.check_past('YYYY-MM-DD',value) ) { throw(offlineStrings.getString('circ.offline_register.future.birth.date')); }
+  if ( util.date.formatted_date(new Date(),'%F') == value) { throw(offlineStrings.getString('circ.offline_register.invalid.birth.date')); }
+ } catch(E) {
+  alert(E);
+  value = '';
+ }
+ return value;
 }
 
 function render_surveys(node,obj) {
-	node = util.widgets.get(node);
-	util.widgets.remove_children(node);
-
-	for (var i in obj) {
-		var survey = obj[i];
-		var x_gb = document.createElement('groupbox'); node.appendChild(x_gb);
-		var x_cp = document.createElement('caption'); 
-		x_cp.setAttribute('label',i); x_gb.appendChild(x_cp);
-		var x_d = document.createElement('description');
-		x_d.appendChild( document.createTextNode( survey.description ) ); x_gb.appendChild(x_d);
-		for (var j = 0; j < survey.questions.length; j++) {
-			var question = survey.questions[j];
-			var x_d = document.createElement('description');
-			x_d.appendChild( document.createTextNode( (j+1) + ') ' + question.question ) ); 
-			x_gb.appendChild( x_d );
-			var x_hb = document.createElement('hbox'); x_hb.setAttribute('flex','1'); 
-			x_gb.appendChild(x_hb);
-			var x_spacer = document.createElement('spacer'); x_spacer.setAttribute('flex','1');
-			x_hb.appendChild(x_spacer);
-			var x_ml = util.widgets.make_menulist( [ [offlineStrings.getString('circ.offline_register.survey.prompt'),''] ].concat(question.answers) );
-			x_ml.setAttribute('name','survey'); x_hb.appendChild(x_ml);
-		}
-	}
+ node = util.widgets.get(node);
+ util.widgets.remove_children(node);
+
+ for (var i in obj) {
+  var survey = obj[i];
+  var x_gb = document.createElement('groupbox'); node.appendChild(x_gb);
+  var x_cp = document.createElement('caption'); 
+  x_cp.setAttribute('label',i); x_gb.appendChild(x_cp);
+  var x_d = document.createElement('description');
+  x_d.appendChild( document.createTextNode( survey.description ) ); x_gb.appendChild(x_d);
+  for (var j = 0; j < survey.questions.length; j++) {
+   var question = survey.questions[j];
+   var x_d = document.createElement('description');
+   x_d.appendChild( document.createTextNode( (j+1) + ') ' + question.question ) ); 
+   x_gb.appendChild( x_d );
+   var x_hb = document.createElement('hbox'); x_hb.setAttribute('flex','1'); 
+   x_gb.appendChild(x_hb);
+   var x_spacer = document.createElement('spacer'); x_spacer.setAttribute('flex','1');
+   x_hb.appendChild(x_spacer);
+   var x_ml = util.widgets.make_menulist( [ [offlineStrings.getString('circ.offline_register.survey.prompt'),''] ].concat(question.answers) );
+   x_ml.setAttribute('name','survey'); x_hb.appendChild(x_ml);
+  }
+ }
 }
 
 function handle_keypress(ev) {
-	if ( (! ev.keyCode) || (ev.keyCode != 13) ) return;
-	switch(ev.target) {
-		case $('barcode') : setTimeout( function() { $('family_name').focus(); },0 ); break;
-		default: break;
-	}
+ if ( (! ev.keyCode) || (ev.keyCode != 13) ) return;
+ switch(ev.target) {
+  case $('barcode') : setTimeout( function() { $('family_name').focus(); },0 ); break;
+  default: break;
+ }
 }
 
 function check_patron(obj) {
-	var errors = '';
-	if (! obj.user.billing_address.post_code ) {
-		errors += offlineStrings.getString('circ.offline_register.missing.post_code') + "\n";
-		$('post_code').focus();
-		$('post_code').parentNode.setAttribute('style','background-color: red');
-	} else {
-		$('post_code').parentNode.setAttribute('style','');
-	}
-	if (! obj.user.billing_address.state ) {
-		errors += offlineStrings.getString('circ.offline_register.missing.state') + "\n";
-		$('state').focus();
-		$('state').parentNode.setAttribute('style','background-color: red');
-	} else {
-		$('state').parentNode.setAttribute('style','');
-	}
-	if (! obj.user.billing_address.city ) {
-		errors += offlineStrings.getString('circ.offline_register.missing.city') + "\n";
-		$('city').focus();
-		$('city').parentNode.setAttribute('style','background-color: red');
-	} else {
-		$('city').parentNode.setAttribute('style','');
-	}
-	if (! obj.user.billing_address.street1 ) {
-		errors += offlineStrings.getString('circ.offline_register.missing.street1') + "\n";
-		$('street1').focus();
-		$('street1').parentNode.setAttribute('style','background-color: red');
-	} else {
-		$('street1').parentNode.setAttribute('style','');
-	}
-	if (! obj.user.ident_value ) {
-		errors += offlineStrings.getString('circ.offline_register.missing.ident_value') + "\n";
-		$('ident_value').focus();
-		$('ident_value').parentNode.setAttribute('style','background-color: red');
-	} else {
-		$('ident_value').parentNode.setAttribute('style','');
-	}
-	if (! obj.user.ident_type ) {
-		errors += offlineStrings.getString('circ.offline_register.missing.ident_type') + "\n";
-		$('ident_type').focus();
-		$('ident_type').parentNode.setAttribute('style','background-color: red');
-	} else {
-		$('ident_type').parentNode.setAttribute('style','');
-	}
-	if (! obj.user.dob ) {
-		errors += offlineStrings.getString('circ.offline_register.missing.dob') + "\n";
-		$('dob').focus();
-		$('dob').parentNode.parentNode.setAttribute('style','background-color: red');
-	} else {
-		$('dob').parentNode.parentNode.setAttribute('style','');
-	}
-	if (! obj.user.first_given_name ) {
-		errors += offlineStrings.getString('circ.offline_register.missing.first_given_name') + "\n";
-		$('first_given_name').focus();
-		$('first_given_name').parentNode.setAttribute('style','background-color: red');
-	} else {
-		$('first_given_name').parentNode.setAttribute('style','');
-	}
-	if (! obj.user.family_name ) {
-		errors += offlineStrings.getString('circ.offline_register.missing.family_name') + "\n";
-		$('family_name').focus();
-		$('family_name').parentNode.setAttribute('style','background-color: red');
-	} else {
-		$('family_name').parentNode.setAttribute('style','');
-	}
-	if (! obj.user.passwd ) {
-		errors += offlineStrings.getString('circ.offline_register.missing.passwd') + "\n";
-		$('passwd').focus();
-		$('passwd').parentNode.setAttribute('style','background-color: red');
-	} else {
-		$('passwd').parentNode.setAttribute('style','');
-	}
-	if (! obj.user.card.barcode ) {
-		errors += offlineStrings.getString('circ.offline_register.missing.barcode') + "\n";
-		$('barcode').focus();
-		$('barcode').parentNode.setAttribute('style','background-color: red');
-	} else {
-		$('barcode').parentNode.setAttribute('style','');
-	}
-	if (! obj.user.profile ) {
-		errors += offlineStrings.getString('circ.offline_register.missing.profile') + "\n";
-		$('profile').focus();
-		$('profile').parentNode.setAttribute('style','background-color: red');
-	} else {
-		$('profile').parentNode.setAttribute('style','');
-	}
-	if (! obj.user.home_ou ) {
-		errors += offlineStrings.getString('circ.offline_register.missing.home_ou') + "\n";
-		$('home_ou').focus();
-		$('home_ou').parentNode.setAttribute('style','background-color: red');
-	} else {
-		$('home_ou').parentNode.setAttribute('style','');
-	}
-	if (errors != '') throw(errors);
+ var errors = '';
+ if (! obj.user.billing_address.post_code ) {
+  errors += offlineStrings.getString('circ.offline_register.missing.post_code') + "\n";
+  $('post_code').focus();
+  $('post_code').parentNode.setAttribute('style','background-color: red');
+ } else {
+  $('post_code').parentNode.setAttribute('style','');
+ }
+ if (! obj.user.billing_address.state ) {
+  errors += offlineStrings.getString('circ.offline_register.missing.state') + "\n";
+  $('state').focus();
+  $('state').parentNode.setAttribute('style','background-color: red');
+ } else {
+  $('state').parentNode.setAttribute('style','');
+ }
+ if (! obj.user.billing_address.city ) {
+  errors += offlineStrings.getString('circ.offline_register.missing.city') + "\n";
+  $('city').focus();
+  $('city').parentNode.setAttribute('style','background-color: red');
+ } else {
+  $('city').parentNode.setAttribute('style','');
+ }
+ if (! obj.user.billing_address.street1 ) {
+  errors += offlineStrings.getString('circ.offline_register.missing.street1') + "\n";
+  $('street1').focus();
+  $('street1').parentNode.setAttribute('style','background-color: red');
+ } else {
+  $('street1').parentNode.setAttribute('style','');
+ }
+ if (! obj.user.ident_value ) {
+  errors += offlineStrings.getString('circ.offline_register.missing.ident_value') + "\n";
+  $('ident_value').focus();
+  $('ident_value').parentNode.setAttribute('style','background-color: red');
+ } else {
+  $('ident_value').parentNode.setAttribute('style','');
+ }
+ if (! obj.user.ident_type ) {
+  errors += offlineStrings.getString('circ.offline_register.missing.ident_type') + "\n";
+  $('ident_type').focus();
+  $('ident_type').parentNode.setAttribute('style','background-color: red');
+ } else {
+  $('ident_type').parentNode.setAttribute('style','');
+ }
+ if (! obj.user.dob ) {
+  errors += offlineStrings.getString('circ.offline_register.missing.dob') + "\n";
+  $('dob').focus();
+  $('dob').parentNode.parentNode.setAttribute('style','background-color: red');
+ } else {
+  $('dob').parentNode.parentNode.setAttribute('style','');
+ }
+ if (! obj.user.first_given_name ) {
+  errors += offlineStrings.getString('circ.offline_register.missing.first_given_name') + "\n";
+  $('first_given_name').focus();
+  $('first_given_name').parentNode.setAttribute('style','background-color: red');
+ } else {
+  $('first_given_name').parentNode.setAttribute('style','');
+ }
+ if (! obj.user.family_name ) {
+  errors += offlineStrings.getString('circ.offline_register.missing.family_name') + "\n";
+  $('family_name').focus();
+  $('family_name').parentNode.setAttribute('style','background-color: red');
+ } else {
+  $('family_name').parentNode.setAttribute('style','');
+ }
+ if (! obj.user.passwd ) {
+  errors += offlineStrings.getString('circ.offline_register.missing.passwd') + "\n";
+  $('passwd').focus();
+  $('passwd').parentNode.setAttribute('style','background-color: red');
+ } else {
+  $('passwd').parentNode.setAttribute('style','');
+ }
+ if (! obj.user.card.barcode ) {
+  errors += offlineStrings.getString('circ.offline_register.missing.barcode') + "\n";
+  $('barcode').focus();
+  $('barcode').parentNode.setAttribute('style','background-color: red');
+ } else {
+  $('barcode').parentNode.setAttribute('style','');
+ }
+ if (! obj.user.profile ) {
+  errors += offlineStrings.getString('circ.offline_register.missing.profile') + "\n";
+  $('profile').focus();
+  $('profile').parentNode.setAttribute('style','background-color: red');
+ } else {
+  $('profile').parentNode.setAttribute('style','');
+ }
+ if (! obj.user.home_ou ) {
+  errors += offlineStrings.getString('circ.offline_register.missing.home_ou') + "\n";
+  $('home_ou').focus();
+  $('home_ou').parentNode.setAttribute('style','background-color: red');
+ } else {
+  $('home_ou').parentNode.setAttribute('style','');
+ }
+ if (errors != '') throw(errors);
 }
 
 function next_patron() {
-	try {
-		var obj = {}
-		obj.timestamp = parseInt( new Date().getTime() / 1000) + g.delta;
-		obj.type = 'register';
-		obj.user = {};
-		obj.user.card = { 'barcode' : $('barcode').value };
-		obj.user.profile = $('profile').value;
-		obj.user.passwd = $('passwd').value;
-		obj.user.ident_type = $('ident_type').value;
-		obj.user.ident_value = $('ident_value').value;
-		obj.user.first_given_name = $('first_given_name').value;
-		obj.user.family_name = $('family_name').value;
-		obj.user.home_ou = $('home_ou').value;
-		obj.user.dob = $('dob').value;
-		obj.user.billing_address = {};
-		obj.user.billing_address.street1 = $('street1').value;
-		obj.user.billing_address.street2 = $('street2').value;
-		obj.user.billing_address.city = $('city').value;
-		obj.user.billing_address.state = $('state').value;
-		obj.user.billing_address.country = $('country').value;
-		obj.user.billing_address.post_code = $('post_code').value;
-		obj.user.survey_responses = [];
-
-		var nl = document.getElementsByAttribute('name','survey');
-		for (var i = 0; i < nl.length; i++) {
-			var value = nl[i].value; if (value == '') continue;
-			var values = JSON2js( value );
-			var response = { 'survey' : values[2], 'question' : values[1], 'answer' : values[0] };
-			obj.user.survey_responses.push( response );
-		}
-
-		try {
-			check_patron(obj);
-		} catch(E) {
-			alert(offlineStrings.getString('circ.offline_register.missing.alert') + "\n" + E);
-			return;
-		}
-
-		JSAN.use('util.file'); var file = new util.file('pending_xacts');
-		obj.delta = g.delta;
-		file.append_object(obj);
-		file.close();
-
-		alert(offlineStrings.getString('circ.offline_register.patron.saved'));
-
-		$('passwd').value = parseInt(Math.random()*8999+1000);
-		$('barcode').value = ''; $('ident_value').value = ''; $('first_given_name').value = '';
-		$('family_name').value = ''; $('dob').value = ''; $('street1').value = '';
-		$('street2').value = '';
-
-		file = new util.file('offline_asv_list'); var list_data = file.get_object(); file.close();
-		render_surveys('x_surveys', list_data);
-
-		$('barcode').focus();
-
-	} catch(E) {
-		dump(E+'\n'); alert(E);
-	}
+ try {
+  var obj = {}
+  obj.timestamp = parseInt( new Date().getTime() / 1000) + g.delta;
+  obj.type = 'register';
+  obj.user = {};
+  obj.user.card = { 'barcode' : $('barcode').value };
+  obj.user.profile = $('profile').value;
+  obj.user.passwd = $('passwd').value;
+  obj.user.ident_type = $('ident_type').value;
+  obj.user.ident_value = $('ident_value').value;
+  obj.user.first_given_name = $('first_given_name').value;
+  obj.user.family_name = $('family_name').value;
+  obj.user.home_ou = $('home_ou').value;
+  obj.user.dob = $('dob').value;
+  obj.user.billing_address = {};
+  obj.user.billing_address.street1 = $('street1').value;
+  obj.user.billing_address.street2 = $('street2').value;
+  obj.user.billing_address.city = $('city').value;
+  obj.user.billing_address.state = $('state').value;
+  obj.user.billing_address.country = $('country').value;
+  obj.user.billing_address.post_code = $('post_code').value;
+  obj.user.survey_responses = [];
+
+  var nl = document.getElementsByAttribute('name','survey');
+  for (var i = 0; i < nl.length; i++) {
+   var value = nl[i].value; if (value == '') continue;
+   var values = JSON2js( value );
+   var response = { 'survey' : values[2], 'question' : values[1], 'answer' : values[0] };
+   obj.user.survey_responses.push( response );
+  }
+
+  try {
+   check_patron(obj);
+  } catch(E) {
+   alert(offlineStrings.getString('circ.offline_register.missing.alert') + "\n" + E);
+   return;
+  }
+
+  JSAN.use('util.file'); var file = new util.file('pending_xacts');
+  obj.delta = g.delta;
+  file.append_object(obj);
+  file.close();
+
+  alert(offlineStrings.getString('circ.offline_register.patron.saved'));
+
+  $('passwd').value = parseInt(Math.random()*8999+1000);
+  $('barcode').value = ''; $('ident_value').value = ''; $('first_given_name').value = '';
+  $('family_name').value = ''; $('dob').value = ''; $('street1').value = '';
+  $('street2').value = '';
+
+  file = new util.file('offline_asv_list'); var list_data = file.get_object(); file.close();
+  render_surveys('x_surveys', list_data);
+
+  $('barcode').focus();
+
+ } catch(E) {
+  dump(E+'\n'); alert(E);
+ }
 }
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline_register.xul b/Open-ILS/xul/staff_client/chrome/content/circ/offline_register.xul
index e6d9fdc600..58a33c00e7 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline_register.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline_register.xul
@@ -16,121 +16,121 @@
 <?xul-overlay href="chrome://open_ils_staff_client/content/OpenILS/util_overlay_offline.xul"?>
 
 <window id="offline_register_win" sizemode="maximized"
-	onload="try { my_init(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+ </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
-	<script type="text/javascript" src="offline_register.js"/>
+ <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
+ <script type="text/javascript" src="offline_register.js"/>
 
-	<messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+ <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
-	<groupbox flex="1">
-		<caption label="&staff.circ.offline_register.main.label;"/>
-		<grid>
-			<columns><column/><column/></columns>
-			<rows>
-				<row>
-					<label value="&staff.circ.offline_register.x_home_ou.label;"/>
-					<hbox id="x_home_ou"/>
-				</row>
-				<row>
-					<label value="&staff.circ.offline_register.x_profile.label;"/>
-					<hbox id="x_profile"/>
-				</row>
-				<row>
-					<label value=" "/>
-				</row>
-			</rows>
-		</grid>
-		<hbox flex="1">
-			<vbox flex="1">
-				<grid>
-					<columns><column/><column/></columns>
-					<rows>
-						<row>
-							<label value="&staff.circ.offline_register.barcode.label;"/>
-							<textbox id="barcode"/>
-						</row>
-						<row>
-							<label value="&staff.circ.offline_register.passwd.label;"/>
-							<textbox id="passwd"/>
-						</row>
-						<row><label value=" "/></row>
-						<row>
-							<label value="&staff.circ.offline_register.family_name.label;"/>
-							<textbox id="family_name"/>
-						</row>
-						<row>
-							<label value="&staff.circ.offline_register.first_given_name.label;"/>
-							<textbox id="first_given_name"/>
-						</row>
-						<row>
-							<label value="&staff.circ.offline_register.dob.label;"/>
-							<textbox id="dob" style="font-family: monospace;"/>
-						</row>
-						<row><label value=" "/></row>
-						<row>
-							<label value="&staff.circ.offline_register.x_ident_type.label;"/>
-							<hbox id="x_ident_type"/>
-						</row>
-						<row>
-							<label value="&staff.circ.offline_register.ident_value.label;"/>
-							<textbox id="ident_value"/>
-						</row>
-					</rows>
-				</grid>
-			</vbox>
-			<splitter><grippy/></splitter>
-			<vbox flex="1">
-				<grid>
-					<columns><column/><column/></columns>
-					<rows>
-						<row>
-							<label value="&staff.circ.offline_register.billing_address.label;"/>
-						</row>
-						<row>
-							<label value="&staff.circ.offline_register.street1.label;"/>
-							<textbox id="street1"/>
-						</row>
-						<row>
-							<label value="&staff.circ.offline_register.street2.label;"/>
-							<textbox id="street2"/>
-						</row>
-						<row>
-							<label value="&staff.circ.offline_register.city.label;"/>
-							<textbox id="city"/>
-						</row>
-						<row>
-							<label value="&staff.circ.offline_register.state.label;"/>
-							<textbox id="state" value="&staff.circ.offline_register.state.default_value;"/>
-						</row>
-						<row>
-							<label value="&staff.circ.offline_register.post_code.label;"/>
-							<textbox id="post_code"/>
-						</row>
-						<row hidden="true">
-							<label value="&staff.circ.offline_register.country.label;"/>
-							<textbox id="country" value="&staff.circ.offline_register.country.default_value;"/>
-						</row>
-						<row><label value=" "/></row>
-					</rows>
-				</grid>
-				<vbox id="x_surveys" flex="1"/>
-			</vbox>
-		</hbox>
-		<hbox>
-			<spacer flex="1"/>
-			<button id="cancel" label="&common.cancel;" />
-			<button id="submit" label="&staff.circ.offline_register.submit.label;" accesskey="&staff.circ.offline_register.submit.accesskey;" />
-		</hbox>
-	</groupbox>
+ <groupbox flex="1">
+  <caption label="&staff.circ.offline_register.main.label;"/>
+  <grid>
+   <columns><column/><column/></columns>
+   <rows>
+    <row>
+     <label value="&staff.circ.offline_register.x_home_ou.label;"/>
+     <hbox id="x_home_ou"/>
+    </row>
+    <row>
+     <label value="&staff.circ.offline_register.x_profile.label;"/>
+     <hbox id="x_profile"/>
+    </row>
+    <row>
+     <label value=" "/>
+    </row>
+   </rows>
+  </grid>
+  <hbox flex="1">
+   <vbox flex="1">
+    <grid>
+     <columns><column/><column/></columns>
+     <rows>
+      <row>
+       <label value="&staff.circ.offline_register.barcode.label;"/>
+       <textbox id="barcode"/>
+      </row>
+      <row>
+       <label value="&staff.circ.offline_register.passwd.label;"/>
+       <textbox id="passwd"/>
+      </row>
+      <row><label value=" "/></row>
+      <row>
+       <label value="&staff.circ.offline_register.family_name.label;"/>
+       <textbox id="family_name"/>
+      </row>
+      <row>
+       <label value="&staff.circ.offline_register.first_given_name.label;"/>
+       <textbox id="first_given_name"/>
+      </row>
+      <row>
+       <label value="&staff.circ.offline_register.dob.label;"/>
+       <textbox id="dob" style="font-family: monospace;"/>
+      </row>
+      <row><label value=" "/></row>
+      <row>
+       <label value="&staff.circ.offline_register.x_ident_type.label;"/>
+       <hbox id="x_ident_type"/>
+      </row>
+      <row>
+       <label value="&staff.circ.offline_register.ident_value.label;"/>
+       <textbox id="ident_value"/>
+      </row>
+     </rows>
+    </grid>
+   </vbox>
+   <splitter><grippy/></splitter>
+   <vbox flex="1">
+    <grid>
+     <columns><column/><column/></columns>
+     <rows>
+      <row>
+       <label value="&staff.circ.offline_register.billing_address.label;"/>
+      </row>
+      <row>
+       <label value="&staff.circ.offline_register.street1.label;"/>
+       <textbox id="street1"/>
+      </row>
+      <row>
+       <label value="&staff.circ.offline_register.street2.label;"/>
+       <textbox id="street2"/>
+      </row>
+      <row>
+       <label value="&staff.circ.offline_register.city.label;"/>
+       <textbox id="city"/>
+      </row>
+      <row>
+       <label value="&staff.circ.offline_register.state.label;"/>
+       <textbox id="state" value="&staff.circ.offline_register.state.default_value;"/>
+      </row>
+      <row>
+       <label value="&staff.circ.offline_register.post_code.label;"/>
+       <textbox id="post_code"/>
+      </row>
+      <row hidden="true">
+       <label value="&staff.circ.offline_register.country.label;"/>
+       <textbox id="country" value="&staff.circ.offline_register.country.default_value;"/>
+      </row>
+      <row><label value=" "/></row>
+     </rows>
+    </grid>
+    <vbox id="x_surveys" flex="1"/>
+   </vbox>
+  </hbox>
+  <hbox>
+   <spacer flex="1"/>
+   <button id="cancel" label="&common.cancel;" />
+   <button id="submit" label="&staff.circ.offline_register.submit.label;" accesskey="&staff.circ.offline_register.submit.accesskey;" />
+  </hbox>
+ </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline_renew.js b/Open-ILS/xul/staff_client/chrome/content/circ/offline_renew.js
index b7795a3490..afc0880747 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline_renew.js
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline_renew.js
@@ -1,249 +1,249 @@
 var offlineStrings;
 function my_init() {
-	try {
-		offlineStrings = $('offlineStrings');
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
-		JSAN.errorLevel = "die"; // none, warn, or die
-		JSAN.addRepository('..');
-		JSAN.use('util.error'); g.error = new util.error();
-		g.error.sdump('D_TRACE','my_init() for offline_renew.xul');
-
-		if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-			try { window.xulG.set_tab_name('Standalone'); } catch(E) { alert(E); }
-		}
-
-		JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-
-		JSAN.use('util.list'); g.list = new util.list('checkout_list');
-		JSAN.use('circ.util');
-		g.list.init( {
-			'columns' : circ.util.offline_renew_columns(),
-			'map_row_to_column' : circ.util.std_map_row_to_column(),
-		} );
-
-		JSAN.use('util.date');
-		var today = new Date();
-		var todayPlus = new Date(); todayPlus.setTime( today.getTime() + 24*60*60*1000*14 );
-		todayPlus = util.date.formatted_date(todayPlus,"%F");
-
-		$('duedate').setAttribute('value',todayPlus);
-		$('duedate').addEventListener('change',check_date,false);
-
-		$('p_barcode').addEventListener('change',test_patron,false);
-
-		$('p_barcode').addEventListener('keypress',handle_keypress,false);
-		$('p_barcode').focus();	
-
-		$('i_barcode').addEventListener('keypress',handle_keypress,false);
-		$('enter').addEventListener('command',handle_enter,false);
-
-		$('duedate_menu').addEventListener('command',handle_duedate_menu,false);
-
-		$('submit').addEventListener('command',next_patron,false);
-		$('cancel').addEventListener('command',function(){next_patron('cancel');},false);
-
-		JSAN.use('util.file');
-		var file = new util.file('offline_delta'); 
-		if (file._file.exists()) { g.delta = file.get_object()[0]; file.close(); } else { g.delta = 0; }
-
-	} catch(E) {
-		var err_msg = "!! This software has encountered an error.  Please tell your friendly " +
-			"system administrator or software developer the following:\ncirc/offline_renew.xul\n" + E + '\n';
-		try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-		alert(err_msg);
-	}
+ try {
+  offlineStrings = $('offlineStrings');
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
+  JSAN.errorLevel = "die"; // none, warn, or die
+  JSAN.addRepository('..');
+  JSAN.use('util.error'); g.error = new util.error();
+  g.error.sdump('D_TRACE','my_init() for offline_renew.xul');
+
+  if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+   try { window.xulG.set_tab_name('Standalone'); } catch(E) { alert(E); }
+  }
+
+  JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+
+  JSAN.use('util.list'); g.list = new util.list('checkout_list');
+  JSAN.use('circ.util');
+  g.list.init( {
+   'columns' : circ.util.offline_renew_columns(),
+   'map_row_to_column' : circ.util.std_map_row_to_column(),
+  } );
+
+  JSAN.use('util.date');
+  var today = new Date();
+  var todayPlus = new Date(); todayPlus.setTime( today.getTime() + 24*60*60*1000*14 );
+  todayPlus = util.date.formatted_date(todayPlus,"%F");
+
+  $('duedate').setAttribute('value',todayPlus);
+  $('duedate').addEventListener('change',check_date,false);
+
+  $('p_barcode').addEventListener('change',test_patron,false);
+
+  $('p_barcode').addEventListener('keypress',handle_keypress,false);
+  $('p_barcode').focus(); 
+
+  $('i_barcode').addEventListener('keypress',handle_keypress,false);
+  $('enter').addEventListener('command',handle_enter,false);
+
+  $('duedate_menu').addEventListener('command',handle_duedate_menu,false);
+
+  $('submit').addEventListener('command',next_patron,false);
+  $('cancel').addEventListener('command',function(){next_patron('cancel');},false);
+
+  JSAN.use('util.file');
+  var file = new util.file('offline_delta'); 
+  if (file._file.exists()) { g.delta = file.get_object()[0]; file.close(); } else { g.delta = 0; }
+
+ } catch(E) {
+  var err_msg = "!! This software has encountered an error.  Please tell your friendly " +
+   "system administrator or software developer the following:\ncirc/offline_renew.xul\n" + E + '\n';
+  try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+  alert(err_msg);
+ }
 }
 
 function $(id) { return document.getElementById(id); }
 
 function test_patron(ev) {
-	try {
-		var barcode = ev.target.value;
-		JSAN.use('util.barcode');
-		if ( ($('strict_p_barcode').checked) && (! util.barcode.check(barcode)) ) {
-			var r = g.error.yns_alert('This barcode has a bad checkdigit.','Barcode Warning','Ok','Clear',null,'Check here to confirm this message');
-			if (r == 1) {
-				setTimeout(
-					function() {
-						ev.target.value = '';
-						ev.target.focus();
-					},0
-				);
-			}
-
-		}
-
-		if (g.data.bad_patrons[barcode]) {
-			var msg = 'Warning: As of ' + g.data.bad_patrons_date.substr(0,15) + ', this barcode (' + barcode + ') was flagged ';
-			switch(g.data.bad_patrons[barcode]) {
-				case 'L' : msg += 'Lost'; break;
-				case 'E' : msg += 'Expired'; break;
-				case 'B' : msg += 'Barred'; break;
-				case 'D' : msg += 'Blocked'; break;
-				default : msg += ' with an unknown code: ' + g.data.bad_patrons[barcode]; break;
-			}
-			var r = g.error.yns_alert(msg,'Barcode Warning','Ok','Clear',null,'Check here to confirm this message');
-			if (r == 1) {
-				setTimeout(
-					function() {
-						ev.target.value = '';
-						ev.target.focus();
-					},0
-				);
-			}
-		}
-	} catch(E) {
-		alert(E);
-	}
+ try {
+  var barcode = ev.target.value;
+  JSAN.use('util.barcode');
+  if ( ($('strict_p_barcode').checked) && (! util.barcode.check(barcode)) ) {
+   var r = g.error.yns_alert('This barcode has a bad checkdigit.','Barcode Warning','Ok','Clear',null,'Check here to confirm this message');
+   if (r == 1) {
+    setTimeout(
+     function() {
+      ev.target.value = '';
+      ev.target.focus();
+     },0
+    );
+   }
+
+  }
+
+  if (g.data.bad_patrons[barcode]) {
+   var msg = 'Warning: As of ' + g.data.bad_patrons_date.substr(0,15) + ', this barcode (' + barcode + ') was flagged ';
+   switch(g.data.bad_patrons[barcode]) {
+    case 'L' : msg += 'Lost'; break;
+    case 'E' : msg += 'Expired'; break;
+    case 'B' : msg += 'Barred'; break;
+    case 'D' : msg += 'Blocked'; break;
+    default : msg += ' with an unknown code: ' + g.data.bad_patrons[barcode]; break;
+   }
+   var r = g.error.yns_alert(msg,'Barcode Warning','Ok','Clear',null,'Check here to confirm this message');
+   if (r == 1) {
+    setTimeout(
+     function() {
+      ev.target.value = '';
+      ev.target.focus();
+     },0
+    );
+   }
+  }
+ } catch(E) {
+  alert(E);
+ }
 }
 
 function handle_keypress(ev) {
-	if ( (! ev.keyCode) || (ev.keyCode != 13) ) return;
-	switch(ev.target) {
-		case $('p_barcode') : setTimeout( function() { $('i_barcode').focus(); },0 ); break;
-		case $('i_barcode') : handle_enter(); break;
-		default: break;
-	}
+ if ( (! ev.keyCode) || (ev.keyCode != 13) ) return;
+ switch(ev.target) {
+  case $('p_barcode') : setTimeout( function() { $('i_barcode').focus(); },0 ); break;
+  case $('i_barcode') : handle_enter(); break;
+  default: break;
+ }
 }
 
 function handle_enter(ev) {
-	JSAN.use('util.barcode');
-	if ( ($('strict_i_barcode').checked) && (! util.barcode.check($('i_barcode').value)) ) {
-		var r = g.error.yns_alert('This barcode has a bad checkdigit.','Barcode Warning','Ok','Clear',null,'Check here to confirm this message');
-		if (r == 1) {
-			setTimeout(
-				function() {
-					ev.target.value = '';
-					ev.target.focus();
-				},0
-			);
-		} else {
-			append_to_list('barcode');
-		}
-	} else {
-		append_to_list('barcode');
-	}
+ JSAN.use('util.barcode');
+ if ( ($('strict_i_barcode').checked) && (! util.barcode.check($('i_barcode').value)) ) {
+  var r = g.error.yns_alert('This barcode has a bad checkdigit.','Barcode Warning','Ok','Clear',null,'Check here to confirm this message');
+  if (r == 1) {
+   setTimeout(
+    function() {
+     ev.target.value = '';
+     ev.target.focus();
+    },0
+   );
+  } else {
+   append_to_list('barcode');
+  }
+ } else {
+  append_to_list('barcode');
+ }
 }
 
 function handle_duedate_menu(ev) {
-	if (ev.target.value=='0') return; 
-	JSAN.use('util.date'); 
-	var today = new Date(); 
-	var todayPlus = new Date(); 
-	todayPlus.setTime( today.getTime() + 24*60*60*1000*ev.target.value ); 
-	todayPlus = util.date.formatted_date(todayPlus,'%F'); 
-	$('duedate').setAttribute('value',todayPlus); 
-	$('duedate').value = todayPlus;
+ if (ev.target.value=='0') return; 
+ JSAN.use('util.date'); 
+ var today = new Date(); 
+ var todayPlus = new Date(); 
+ todayPlus.setTime( today.getTime() + 24*60*60*1000*ev.target.value ); 
+ todayPlus = util.date.formatted_date(todayPlus,'%F'); 
+ $('duedate').setAttribute('value',todayPlus); 
+ $('duedate').value = todayPlus;
 }
 
 function check_date(ev) {
-	JSAN.use('util.date');
-	try {
-		if (! util.date.check('YYYY-MM-DD',ev.target.value) ) { throw('Invalid Date'); }
-		if (util.date.check_past('YYYY-MM-DD',ev.target.value) ) { throw('Due date needs to be after today.'); }
-		if ( util.date.formatted_date(new Date(),'%F') == ev.target.value) { throw('Due date needs to be after today.'); }
-	} catch(E) {
-		alert(E);
-		var today = new Date();
-		var todayPlus = new Date(); todayPlus.setTime( today.getTime() + 24*60*60*1000*14 );
-		todayPlus = util.date.formatted_date(todayPlus,"%F");
-		ev.target.value = todayPlus;
-	}
+ JSAN.use('util.date');
+ try {
+  if (! util.date.check('YYYY-MM-DD',ev.target.value) ) { throw('Invalid Date'); }
+  if (util.date.check_past('YYYY-MM-DD',ev.target.value) ) { throw('Due date needs to be after today.'); }
+  if ( util.date.formatted_date(new Date(),'%F') == ev.target.value) { throw('Due date needs to be after today.'); }
+ } catch(E) {
+  alert(E);
+  var today = new Date();
+  var todayPlus = new Date(); todayPlus.setTime( today.getTime() + 24*60*60*1000*14 );
+  todayPlus = util.date.formatted_date(todayPlus,"%F");
+  ev.target.value = todayPlus;
+ }
 }
 
 function append_to_list(checkout_type,count) {
 
-	try {
+ try {
 
-		var my = {};
+  var my = {};
 
-		my.type = 'renew';
-		my.timestamp = parseInt( new Date().getTime() / 1000) + g.delta;
-		my.checkout_time = util.date.formatted_date(new Date(),"%F %H:%M:%s");
+  my.type = 'renew';
+  my.timestamp = parseInt( new Date().getTime() / 1000) + g.delta;
+  my.checkout_time = util.date.formatted_date(new Date(),"%F %H:%M:%s");
 
-		var p_barcode = $('p_barcode').value;
-		if (! p_barcode) {
-			/* Not strictly necessary for a renewal
-			alert('Please enter a patron barcode first.');
-			return;
-			*/
-		} else {
+  var p_barcode = $('p_barcode').value;
+  if (! p_barcode) {
+   /* Not strictly necessary for a renewal
+   alert('Please enter a patron barcode first.');
+   return;
+   */
+  } else {
 
-			// Need to validate patron barcode against bad patron list
-			my.patron_barcode = p_barcode;
-		}
+   // Need to validate patron barcode against bad patron list
+   my.patron_barcode = p_barcode;
+  }
 
-		var due_date = $('duedate').value; // Need to validate this
-		my.due_date = due_date;
+  var due_date = $('duedate').value; // Need to validate this
+  my.due_date = due_date;
 
-		var i_barcode = $('i_barcode').value;
-		switch(checkout_type) {
-			case 'barcode' : 
-				if (! i_barcode) return; 
-				
-				var rows = g.list.dump_with_keys();
-				for (var i = 0; i < rows.length; i++) {
-					if (rows[i].barcode == i_barcode) {
-						g.error.yns_alert('This barcode has already been scanned.','Duplicate Scan','Ok',null,null,'Check here to confirm this message');
-						return;
-					}
-				}
+  var i_barcode = $('i_barcode').value;
+  switch(checkout_type) {
+   case 'barcode' : 
+    if (! i_barcode) return; 
+    
+    var rows = g.list.dump_with_keys();
+    for (var i = 0; i < rows.length; i++) {
+     if (rows[i].barcode == i_barcode) {
+      g.error.yns_alert('This barcode has already been scanned.','Duplicate Scan','Ok',null,null,'Check here to confirm this message');
+      return;
+     }
+    }
 
-				my.barcode = i_barcode; 
-			break;
-			default: alert("Please report that this happened."); break;
-		}
-	
-		g.list.append( { 'row' : { 'my' : my }, 'to_top' : true } );
+    my.barcode = i_barcode; 
+   break;
+   default: alert("Please report that this happened."); break;
+  }
+ 
+  g.list.append( { 'row' : { 'my' : my }, 'to_top' : true } );
 
-		var x = $('i_barcode'); x.value = ''; x.focus();
+  var x = $('i_barcode'); x.value = ''; x.focus();
 
-	} catch(E) {
+ } catch(E) {
 
-		dump(E+'\n'); alert(E);
+  dump(E+'\n'); alert(E);
 
-	}
+ }
 }
 
 function next_patron(cancel) {
-	try {
-
-		if (cancel!='cancel') {
-				JSAN.use('util.file'); var file = new util.file('pending_xacts');
-				var rows = g.list.dump_with_keys();
-				for (var i = 0; i < rows.length; i++) {
-					var row = rows[i]; row.delta = g.delta;
-					if (row.patron_barcode == '') {
-						delete(row.patron_barcode);
-					}
-					file.append_object(row);
-				}
-				file.close();
-				
-				if ($('print_receipt').checked) {
-					try {
-						var params = {
-							'patron_barcode' : $('p_barcode').value,
-							'template' : 'offline_renew',
+ try {
+
+  if (cancel!='cancel') {
+    JSAN.use('util.file'); var file = new util.file('pending_xacts');
+    var rows = g.list.dump_with_keys();
+    for (var i = 0; i < rows.length; i++) {
+     var row = rows[i]; row.delta = g.delta;
+     if (row.patron_barcode == '') {
+      delete(row.patron_barcode);
+     }
+     file.append_object(row);
+    }
+    file.close();
+    
+    if ($('print_receipt').checked) {
+     try {
+      var params = {
+       'patron_barcode' : $('p_barcode').value,
+       'template' : 'offline_renew',
                             'callback' : function() {
                                 g.list.clear();
                                 var x = $('i_barcode'); x.value = '';
                                 x = $('p_barcode'); x.value = ''; x.focus();
                             }
-						};
-						g.list.print( params );
-					} catch(E) {
-						g.error.sdump('D_ERROR','print: ' + E);
-						alert('print: ' + E);
-					}
-				} else {
+      };
+      g.list.print( params );
+     } catch(E) {
+      g.error.sdump('D_ERROR','print: ' + E);
+      alert('print: ' + E);
+     }
+    } else {
                     g.list.clear();
                     var x = $('i_barcode'); x.value = '';
                     x = $('p_barcode'); x.value = ''; x.focus();
                 }
-		}
-	} catch(E) {
-		dump(E+'\n'); alert(E);
-	}
+  }
+ } catch(E) {
+  dump(E+'\n'); alert(E);
+ }
 }
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline_renew.xul b/Open-ILS/xul/staff_client/chrome/content/circ/offline_renew.xul
index 00400096e0..7ca3e00b6c 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline_renew.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline_renew.xul
@@ -16,106 +16,106 @@
 <?xul-overlay href="chrome://open_ils_staff_client/content/OpenILS/util_overlay_offline.xul"?>
 
 <window id="offline_checkout_win" sizemode="maximized"
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+ </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
-	<script type="text/javascript" src="offline_renew.js"/>
+ <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
+ <script type="text/javascript" src="offline_renew.js"/>
 
-	<messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+ <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
-	<groupbox flex="1">
-		<caption label="&staff.circ.offline_renew.main.label;"/>
-		<hbox flex="1">
-			<vbox flex="1">
-				<hbox>
-					<label value="&common.step1.label;" style="font-weight: bold" />
-					<description>&common.check_date.description;</description>
-				</hbox>
-				<hbox>
-					<label value="&common.step2.label;" style="font-weight: bold" accesskey="&common.step2.accesskey;" control="p_barcode"/>
-					<description>&staff.circ.offline_renew.p_barcode.description;</description>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<textbox id="p_barcode" />
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<description>&common.check_barcode.description;</description>
-					<checkbox id="strict_p_barcode" oils_persist="checked"/>
-				</hbox>
-				<hbox>
-					<label value="&common.step3.label;" style="font-weight: bold" accesskey="&common.step3.accesskey;" control="duedate"/>
-					<description>&common.due_date.description;</description>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<textbox id="duedate" style="font-family: monospace;"/>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<menulist id="duedate_menu">
-						<menupopup>
-							<menuitem label="&common.date_helper;" value="0"/>
-							<menuitem label="&common.date_helper.3_days;" value="3"/>
-							<menuitem label="&common.date_helper.7_days;" value="7"/>
-							<menuitem label="&common.date_helper.14_days;" value="14"/>
-							<menuitem label="&common.date_helper.30_days;" value="30"/>
-						</menupopup>
-					</menulist>
-				</hbox>
-				<hbox>
-					<label value="&common.step4.label;" style="font-weight: bold" accesskey="&common.step4.accesskey;" control="i_barcode"/>
-					<description>&common.enter_barcode.description;</description>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<hbox><textbox id="i_barcode"/><button id="enter" label="&common.enter.label;" accesskey="&common.enter.accesskey;"/></hbox>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<description>&common.check_barcode.description;</description>
-					<checkbox id="strict_i_barcode" oils_persist="checked"/>
-				</hbox>
-				<hbox>
-					<label value="&common.step5.label;" style="font-weight: bold"/>
-					<description>&staff.circ.offline_renew.step5.label;</description>
-				</hbox>
-				<hbox>
-					<label value="&common.step6.label;" style="font-weight: bold"/>
-					<description>&staff.circ.offline.finish.description;</description>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<description>&staff.circ.offline.print.description;</description>
-					<checkbox id="print_receipt" oils_persist="checked"/>
-				</hbox>
-				<hbox>
-					<spacer flex="1"/>
-					<button id="cancel" label="&common.cancel;" />
-					<button id="submit" label="&common.save_transactions.label;" accesskey="&common.save_transactions.accesskey;" />
-				</hbox>
-			</vbox>
-			<splitter>
-				<grippy />
-			</splitter>
-			<vbox flex="2">
-				<tree id="checkout_list" flex="1" enableColumnDrag="true"/>
-				<hbox id="checkout_bottom_ui">
-					<spacer flex="1"/>
-					<button id="delete" label="&common.delete_transactions.label;" oncommand="alert('&common.unimplemented;');"/>
-				</hbox>
-			</vbox>
-		</hbox>
-	</groupbox>
+ <groupbox flex="1">
+  <caption label="&staff.circ.offline_renew.main.label;"/>
+  <hbox flex="1">
+   <vbox flex="1">
+    <hbox>
+     <label value="&common.step1.label;" style="font-weight: bold" />
+     <description>&common.check_date.description;</description>
+    </hbox>
+    <hbox>
+     <label value="&common.step2.label;" style="font-weight: bold" accesskey="&common.step2.accesskey;" control="p_barcode"/>
+     <description>&staff.circ.offline_renew.p_barcode.description;</description>
+    </hbox>
+    <hbox>
+     <spacer flex="1"/>
+     <textbox id="p_barcode" />
+    </hbox>
+    <hbox>
+     <spacer flex="1"/>
+     <description>&common.check_barcode.description;</description>
+     <checkbox id="strict_p_barcode" oils_persist="checked"/>
+    </hbox>
+    <hbox>
+     <label value="&common.step3.label;" style="font-weight: bold" accesskey="&common.step3.accesskey;" control="duedate"/>
+     <description>&common.due_date.description;</description>
+    </hbox>
+    <hbox>
+     <spacer flex="1"/>
+     <textbox id="duedate" style="font-family: monospace;"/>
+    </hbox>
+    <hbox>
+     <spacer flex="1"/>
+     <menulist id="duedate_menu">
+      <menupopup>
+       <menuitem label="&common.date_helper;" value="0"/>
+       <menuitem label="&common.date_helper.3_days;" value="3"/>
+       <menuitem label="&common.date_helper.7_days;" value="7"/>
+       <menuitem label="&common.date_helper.14_days;" value="14"/>
+       <menuitem label="&common.date_helper.30_days;" value="30"/>
+      </menupopup>
+     </menulist>
+    </hbox>
+    <hbox>
+     <label value="&common.step4.label;" style="font-weight: bold" accesskey="&common.step4.accesskey;" control="i_barcode"/>
+     <description>&common.enter_barcode.description;</description>
+    </hbox>
+    <hbox>
+     <spacer flex="1"/>
+     <hbox><textbox id="i_barcode"/><button id="enter" label="&common.enter.label;" accesskey="&common.enter.accesskey;"/></hbox>
+    </hbox>
+    <hbox>
+     <spacer flex="1"/>
+     <description>&common.check_barcode.description;</description>
+     <checkbox id="strict_i_barcode" oils_persist="checked"/>
+    </hbox>
+    <hbox>
+     <label value="&common.step5.label;" style="font-weight: bold"/>
+     <description>&staff.circ.offline_renew.step5.label;</description>
+    </hbox>
+    <hbox>
+     <label value="&common.step6.label;" style="font-weight: bold"/>
+     <description>&staff.circ.offline.finish.description;</description>
+    </hbox>
+    <hbox>
+     <spacer flex="1"/>
+     <description>&staff.circ.offline.print.description;</description>
+     <checkbox id="print_receipt" oils_persist="checked"/>
+    </hbox>
+    <hbox>
+     <spacer flex="1"/>
+     <button id="cancel" label="&common.cancel;" />
+     <button id="submit" label="&common.save_transactions.label;" accesskey="&common.save_transactions.accesskey;" />
+    </hbox>
+   </vbox>
+   <splitter>
+    <grippy />
+   </splitter>
+   <vbox flex="2">
+    <tree id="checkout_list" flex="1" enableColumnDrag="true"/>
+    <hbox id="checkout_bottom_ui">
+     <spacer flex="1"/>
+     <button id="delete" label="&common.delete_transactions.label;" oncommand="alert('&common.unimplemented;');"/>
+    </hbox>
+   </vbox>
+  </hbox>
+ </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/util.js b/Open-ILS/xul/staff_client/chrome/content/circ/util.js
index cd189d9265..3c75d71913 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/util.js
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/util.js
@@ -3,279 +3,279 @@ dump('entering circ/util.js\n');
 if (typeof circ == 'undefined') var circ = {};
 circ.util = {};
 
-circ.util.EXPORT_OK	= [ 
-	'offline_checkout_columns', 
-	'offline_checkin_columns', 
-	'offline_renew_columns', 
-	'offline_inhouse_use_columns', 
-	'hold_columns', 'CHECKIN_VIA_BARCODE', 'std_map_row_to_column', 'hold_capture_via_copy_barcode'
+circ.util.EXPORT_OK = [ 
+ 'offline_checkout_columns', 
+ 'offline_checkin_columns', 
+ 'offline_renew_columns', 
+ 'offline_inhouse_use_columns', 
+ 'hold_columns', 'CHECKIN_VIA_BARCODE', 'std_map_row_to_column', 'hold_capture_via_copy_barcode'
 ];
-circ.util.EXPORT_TAGS	= { ':all' : circ.util.EXPORT_OK };
+circ.util.EXPORT_TAGS = { ':all' : circ.util.EXPORT_OK };
 
 circ.util.offline_checkout_columns = function(modify,params) {
-	
-	var c = [
-		{ 
-			'id' : 'timestamp', 
-			'label' : 'Timestamp', 
-			'flex' : 1, 'primary' : false, 'hidden' : true, 
-			'render' : 'my.timestamp' 
-		},
-		{ 
-			'id' : 'checkout_time', 
-			'label' : 'Check Out Time', 
-			'flex' : 1, 'primary' : false, 'hidden' : true, 
-			'render' : 'my.checkout_time' 
-		},
-		{ 
-			'id' : 'type', 
-			'label' : 'Transaction Type', 
-			'flex' : 1, 'primary' : false, 'hidden' : true, 
-			'render' : 'my.type' 
-		},
-		{
-			'id' : 'noncat',
-			'label' : 'Non-Cataloged?',
-			'flex' : 1, 'primary' : false, 'hidden' : true, 
-			'render' : 'my.noncat'
-		},
-		{
-			'id' : 'noncat_type',
-			'label' : 'Non-Cat Type ID',
-			'flex' : 1, 'primary' : false, 'hidden' : true,
-			'render' : 'my.noncat_type'
-		},
-		{
-			'id' : 'noncat_count',
-			'label' : 'Count',
-			'flex' : 1, 'primary' : false, 'hidden' : false,
-			'render' : 'my.noncat_count'
-		},
-		{ 
-			'id' : 'patron_barcode', 
-			'label' : 'Patron Barcode', 
-			'flex' : 1, 'primary' : false, 'hidden' : true, 
-			'render' : 'my.patron_barcode' 
-		},
-		{ 
-			'id' : 'barcode', 
-			'label' : 'Item Barcode', 
-			'flex' : 2, 'primary' : true, 'hidden' : false, 
-			'render' : 'my.barcode' 
-		},
-		{ 
-			'id' : 'due_date', 
-			'label' : 'Due Date', 
-			'flex' : 1, 'primary' : false, 'hidden' : false, 
-			'render' : 'my.due_date' 
-		},
-	];
-	if (modify) for (var i = 0; i < c.length; i++) {
-		if (modify[ c[i].id ]) {
-			for (var j in modify[ c[i].id ]) {
-				c[i][j] = modify[ c[i].id ][j];
-			}
-		}
-	}
-	if (params) {
-		if (params.just_these) {
-			JSAN.use('util.functional');
-			var new_c = [];
-			for (var i = 0; i < params.just_these.length; i++) {
-				var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
-				new_c.push( function(y){ return y; }( x ) );
-			}
-			return new_c;
-		}
-	}
-	return c;
+ 
+ var c = [
+  { 
+   'id' : 'timestamp', 
+   'label' : 'Timestamp', 
+   'flex' : 1, 'primary' : false, 'hidden' : true, 
+   'render' : 'my.timestamp' 
+  },
+  { 
+   'id' : 'checkout_time', 
+   'label' : 'Check Out Time', 
+   'flex' : 1, 'primary' : false, 'hidden' : true, 
+   'render' : 'my.checkout_time' 
+  },
+  { 
+   'id' : 'type', 
+   'label' : 'Transaction Type', 
+   'flex' : 1, 'primary' : false, 'hidden' : true, 
+   'render' : 'my.type' 
+  },
+  {
+   'id' : 'noncat',
+   'label' : 'Non-Cataloged?',
+   'flex' : 1, 'primary' : false, 'hidden' : true, 
+   'render' : 'my.noncat'
+  },
+  {
+   'id' : 'noncat_type',
+   'label' : 'Non-Cat Type ID',
+   'flex' : 1, 'primary' : false, 'hidden' : true,
+   'render' : 'my.noncat_type'
+  },
+  {
+   'id' : 'noncat_count',
+   'label' : 'Count',
+   'flex' : 1, 'primary' : false, 'hidden' : false,
+   'render' : 'my.noncat_count'
+  },
+  { 
+   'id' : 'patron_barcode', 
+   'label' : 'Patron Barcode', 
+   'flex' : 1, 'primary' : false, 'hidden' : true, 
+   'render' : 'my.patron_barcode' 
+  },
+  { 
+   'id' : 'barcode', 
+   'label' : 'Item Barcode', 
+   'flex' : 2, 'primary' : true, 'hidden' : false, 
+   'render' : 'my.barcode' 
+  },
+  { 
+   'id' : 'due_date', 
+   'label' : 'Due Date', 
+   'flex' : 1, 'primary' : false, 'hidden' : false, 
+   'render' : 'my.due_date' 
+  },
+ ];
+ if (modify) for (var i = 0; i < c.length; i++) {
+  if (modify[ c[i].id ]) {
+   for (var j in modify[ c[i].id ]) {
+    c[i][j] = modify[ c[i].id ][j];
+   }
+  }
+ }
+ if (params) {
+  if (params.just_these) {
+   JSAN.use('util.functional');
+   var new_c = [];
+   for (var i = 0; i < params.just_these.length; i++) {
+    var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
+    new_c.push( function(y){ return y; }( x ) );
+   }
+   return new_c;
+  }
+ }
+ return c;
 }
 
 circ.util.offline_checkin_columns = function(modify,params) {
-	
-	var c = [
-		{ 
-			'id' : 'timestamp', 
-			'label' : 'Timestamp', 
-			'flex' : 1, 'primary' : false, 'hidden' : true, 
-			'render' : 'my.timestamp' 
-		},
-		{ 
-			'id' : 'backdate', 
-			'label' : 'Back Date', 
-			'flex' : 1, 'primary' : false, 'hidden' : true, 
-			'render' : 'my.backdate' 
-		},
-		{ 
-			'id' : 'type', 
-			'label' : 'Transaction Type', 
-			'flex' : 1, 'primary' : false, 'hidden' : true, 
-			'render' : 'my.type' 
-		},
-		{ 
-			'id' : 'barcode', 
-			'label' : 'Item Barcode', 
-			'flex' : 2, 'primary' : true, 'hidden' : false, 
-			'render' : 'my.barcode' 
-		},
-	];
-	if (modify) for (var i = 0; i < c.length; i++) {
-		if (modify[ c[i].id ]) {
-			for (var j in modify[ c[i].id ]) {
-				c[i][j] = modify[ c[i].id ][j];
-			}
-		}
-	}
-	if (params) {
-		if (params.just_these) {
-			JSAN.use('util.functional');
-			var new_c = [];
-			for (var i = 0; i < params.just_these.length; i++) {
-				var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
-				new_c.push( function(y){ return y; }( x ) );
-			}
-			return new_c;
-		}
-	}
-	return c;
+ 
+ var c = [
+  { 
+   'id' : 'timestamp', 
+   'label' : 'Timestamp', 
+   'flex' : 1, 'primary' : false, 'hidden' : true, 
+   'render' : 'my.timestamp' 
+  },
+  { 
+   'id' : 'backdate', 
+   'label' : 'Back Date', 
+   'flex' : 1, 'primary' : false, 'hidden' : true, 
+   'render' : 'my.backdate' 
+  },
+  { 
+   'id' : 'type', 
+   'label' : 'Transaction Type', 
+   'flex' : 1, 'primary' : false, 'hidden' : true, 
+   'render' : 'my.type' 
+  },
+  { 
+   'id' : 'barcode', 
+   'label' : 'Item Barcode', 
+   'flex' : 2, 'primary' : true, 'hidden' : false, 
+   'render' : 'my.barcode' 
+  },
+ ];
+ if (modify) for (var i = 0; i < c.length; i++) {
+  if (modify[ c[i].id ]) {
+   for (var j in modify[ c[i].id ]) {
+    c[i][j] = modify[ c[i].id ][j];
+   }
+  }
+ }
+ if (params) {
+  if (params.just_these) {
+   JSAN.use('util.functional');
+   var new_c = [];
+   for (var i = 0; i < params.just_these.length; i++) {
+    var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
+    new_c.push( function(y){ return y; }( x ) );
+   }
+   return new_c;
+  }
+ }
+ return c;
 }
 
 circ.util.offline_renew_columns = function(modify,params) {
-	
-	var c = [
-		{ 
-			'id' : 'timestamp', 
-			'label' : 'Timestamp', 
-			'flex' : 1, 'primary' : false, 'hidden' : true, 
-			'render' : 'my.timestamp' 
-		},
-		{ 
-			'id' : 'checkout_time', 
-			'label' : 'Check Out Time', 
-			'flex' : 1, 'primary' : false, 'hidden' : true, 
-			'render' : 'my.checkout_time' 
-		},
-		{ 
-			'id' : 'type', 
-			'label' : 'Transaction Type', 
-			'flex' : 1, 'primary' : false, 'hidden' : true, 
-			'render' : 'my.type' 
-		},
-		{ 
-			'id' : 'patron_barcode', 
-			'label' : 'Patron Barcode', 
-			'flex' : 1, 'primary' : false, 'hidden' : true, 
-			'render' : 'my.patron_barcode' 
-		},
-		{ 
-			'id' : 'barcode', 
-			'label' : 'Item Barcode', 
-			'flex' : 2, 'primary' : true, 'hidden' : false, 
-			'render' : 'my.barcode' 
-		},
-		{ 
-			'id' : 'due_date', 
-			'label' : 'Due Date', 
-			'flex' : 1, 'primary' : false, 'hidden' : false, 
-			'render' : 'my.due_date' 
-		},
-	];
-	if (modify) for (var i = 0; i < c.length; i++) {
-		if (modify[ c[i].id ]) {
-			for (var j in modify[ c[i].id ]) {
-				c[i][j] = modify[ c[i].id ][j];
-			}
-		}
-	}
-	if (params) {
-		if (params.just_these) {
-			JSAN.use('util.functional');
-			var new_c = [];
-			for (var i = 0; i < params.just_these.length; i++) {
-				var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
-				new_c.push( function(y){ return y; }( x ) );
-			}
-			return new_c;
-		}
-	}
-	return c;
+ 
+ var c = [
+  { 
+   'id' : 'timestamp', 
+   'label' : 'Timestamp', 
+   'flex' : 1, 'primary' : false, 'hidden' : true, 
+   'render' : 'my.timestamp' 
+  },
+  { 
+   'id' : 'checkout_time', 
+   'label' : 'Check Out Time', 
+   'flex' : 1, 'primary' : false, 'hidden' : true, 
+   'render' : 'my.checkout_time' 
+  },
+  { 
+   'id' : 'type', 
+   'label' : 'Transaction Type', 
+   'flex' : 1, 'primary' : false, 'hidden' : true, 
+   'render' : 'my.type' 
+  },
+  { 
+   'id' : 'patron_barcode', 
+   'label' : 'Patron Barcode', 
+   'flex' : 1, 'primary' : false, 'hidden' : true, 
+   'render' : 'my.patron_barcode' 
+  },
+  { 
+   'id' : 'barcode', 
+   'label' : 'Item Barcode', 
+   'flex' : 2, 'primary' : true, 'hidden' : false, 
+   'render' : 'my.barcode' 
+  },
+  { 
+   'id' : 'due_date', 
+   'label' : 'Due Date', 
+   'flex' : 1, 'primary' : false, 'hidden' : false, 
+   'render' : 'my.due_date' 
+  },
+ ];
+ if (modify) for (var i = 0; i < c.length; i++) {
+  if (modify[ c[i].id ]) {
+   for (var j in modify[ c[i].id ]) {
+    c[i][j] = modify[ c[i].id ][j];
+   }
+  }
+ }
+ if (params) {
+  if (params.just_these) {
+   JSAN.use('util.functional');
+   var new_c = [];
+   for (var i = 0; i < params.just_these.length; i++) {
+    var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
+    new_c.push( function(y){ return y; }( x ) );
+   }
+   return new_c;
+  }
+ }
+ return c;
 }
 
 circ.util.offline_inhouse_use_columns = function(modify,params) {
-	
-	var c = [
-		{ 
-			'id' : 'timestamp', 
-			'label' : 'Timestamp', 
-			'flex' : 1, 'primary' : false, 'hidden' : true, 
-			'render' : 'my.timestamp' 
-		},
-		{ 
-			'id' : 'use_time', 
-			'label' : 'Use Time', 
-			'flex' : 1, 'primary' : false, 'hidden' : true, 
-			'render' : 'my.use_time' 
-		},
-		{ 
-			'id' : 'type', 
-			'label' : 'Transaction Type', 
-			'flex' : 1, 'primary' : false, 'hidden' : true, 
-			'render' : 'my.type' 
-		},
-		{
-			'id' : 'count',
-			'label' : 'Count',
-			'flex' : 1, 'primary' : false, 'hidden' : false,
-			'render' : 'my.count'
-		},
-		{ 
-			'id' : 'barcode', 
-			'label' : 'Item Barcode', 
-			'flex' : 2, 'primary' : true, 'hidden' : false, 
-			'render' : 'my.barcode' 
-		},
-	];
-	if (modify) for (var i = 0; i < c.length; i++) {
-		if (modify[ c[i].id ]) {
-			for (var j in modify[ c[i].id ]) {
-				c[i][j] = modify[ c[i].id ][j];
-			}
-		}
-	}
-	if (params) {
-		if (params.just_these) {
-			JSAN.use('util.functional');
-			var new_c = [];
-			for (var i = 0; i < params.just_these.length; i++) {
-				var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
-				new_c.push( function(y){ return y; }( x ) );
-			}
-			return new_c;
-		}
-	}
-	return c;
+ 
+ var c = [
+  { 
+   'id' : 'timestamp', 
+   'label' : 'Timestamp', 
+   'flex' : 1, 'primary' : false, 'hidden' : true, 
+   'render' : 'my.timestamp' 
+  },
+  { 
+   'id' : 'use_time', 
+   'label' : 'Use Time', 
+   'flex' : 1, 'primary' : false, 'hidden' : true, 
+   'render' : 'my.use_time' 
+  },
+  { 
+   'id' : 'type', 
+   'label' : 'Transaction Type', 
+   'flex' : 1, 'primary' : false, 'hidden' : true, 
+   'render' : 'my.type' 
+  },
+  {
+   'id' : 'count',
+   'label' : 'Count',
+   'flex' : 1, 'primary' : false, 'hidden' : false,
+   'render' : 'my.count'
+  },
+  { 
+   'id' : 'barcode', 
+   'label' : 'Item Barcode', 
+   'flex' : 2, 'primary' : true, 'hidden' : false, 
+   'render' : 'my.barcode' 
+  },
+ ];
+ if (modify) for (var i = 0; i < c.length; i++) {
+  if (modify[ c[i].id ]) {
+   for (var j in modify[ c[i].id ]) {
+    c[i][j] = modify[ c[i].id ][j];
+   }
+  }
+ }
+ if (params) {
+  if (params.just_these) {
+   JSAN.use('util.functional');
+   var new_c = [];
+   for (var i = 0; i < params.just_these.length; i++) {
+    var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
+    new_c.push( function(y){ return y; }( x ) );
+   }
+   return new_c;
+  }
+ }
+ return c;
 }
 
 
 
 circ.util.std_map_row_to_column = function(error_value) {
-	return function(row,col) {
-		// row contains { 'my' : { 'barcode' : xxx, 'duedate' : xxx } }
-		// col contains one of the objects listed above in columns
+ return function(row,col) {
+  // row contains { 'my' : { 'barcode' : xxx, 'duedate' : xxx } }
+  // col contains one of the objects listed above in columns
 
-		var my = row.my;
-		var value;
-		try {
-			value = eval( col.render );
-			if (typeof value == 'undefined') value = '';
+  var my = row.my;
+  var value;
+  try {
+   value = eval( col.render );
+   if (typeof value == 'undefined') value = '';
 
-		} catch(E) {
-			JSAN.use('util.error'); var error = new util.error();
-			error.sdump('D_WARN','map_row_to_column: ' + E);
-			if (error_value) value = error_value; else value = '???';
-		}
-		return value;
-	}
+  } catch(E) {
+   JSAN.use('util.error'); var error = new util.error();
+   error.sdump('D_WARN','map_row_to_column: ' + E);
+   if (error_value) value = error_value; else value = '???';
+  }
+  return value;
+ }
 }
 
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/about.html b/Open-ILS/xul/staff_client/chrome/content/main/about.html
index b79c13a718..b1a261ab8f 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/about.html
+++ b/Open-ILS/xul/staff_client/chrome/content/main/about.html
@@ -43,14 +43,14 @@ Our deepest thanks to everyone in the Evergreen community who contributes docume
 <blockquote>
 <pre>
 GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+         Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
      59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+       Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -100,7 +100,7 @@ patent must be licensed for everyone's free use or not licensed at all.
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
+      GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -299,7 +299,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+       NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -321,9 +321,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+       END OF TERMS AND CONDITIONS
 
-	    How to Apply These Terms to Your New Programs
+     How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/constants.js b/Open-ILS/xul/staff_client/chrome/content/main/constants.js
index 03f5a6c0ce..7f9bb109f0 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/constants.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/constants.js
@@ -3,16 +3,16 @@ dump('Loading constants.js\n');
 /* Get locale from preferences */
 var LOCALE = '';
 try {
-	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-	var pref = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
-	LOCALE = pref.getCharPref('general.useragent.locale');
+ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ var pref = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
+ LOCALE = pref.getCharPref('general.useragent.locale');
 } catch (E) {
-	dump("Failed to fetch a locale from preferences: " + E + "\n");
+ dump("Failed to fetch a locale from preferences: " + E + "\n");
 }
 
 /* Fall back to en-US if we didn't get a locale from the preferences */
 if (!LOCALE) {
-	LOCALE = 'en-US';
+ LOCALE = 'en-US';
 }
 
 const MODE_RDONLY   = 0x01;
@@ -26,223 +26,223 @@ const PERMS_FILE      = 0644;
 const PERMS_DIR      = 0755;
 
 const my_constants = {
-	'magical_statuses' : {
-		'1' : { 'disable_in_copy_editor' : true, 'block_mark_item_damaged' : false, 'block_mark_item_action' : true }, /* | Checked out    | t */
-		'3' : { 'disable_in_copy_editor' : true, 'block_mark_item_damaged' : false, 'block_mark_item_action' : true }, /* | Lost           | f */
-		'6' : { 'disable_in_copy_editor' : true, 'block_mark_item_damaged' : false, 'block_mark_item_action' : true }, /* | In transit     | t */
-		'8' : { 'disable_in_copy_editor' : true, 'block_mark_item_damaged' : false, 'block_mark_item_action' : false } /* | On holds shelf | t */
-	}
+ 'magical_statuses' : {
+  '1' : { 'disable_in_copy_editor' : true, 'block_mark_item_damaged' : false, 'block_mark_item_action' : true }, /* | Checked out    | t */
+  '3' : { 'disable_in_copy_editor' : true, 'block_mark_item_damaged' : false, 'block_mark_item_action' : true }, /* | Lost           | f */
+  '6' : { 'disable_in_copy_editor' : true, 'block_mark_item_damaged' : false, 'block_mark_item_action' : true }, /* | In transit     | t */
+  '8' : { 'disable_in_copy_editor' : true, 'block_mark_item_damaged' : false, 'block_mark_item_action' : false } /* | On holds shelf | t */
+ }
 }
 
 const api = {
-	'TEST_SECURE' : { 'app' : 'open-ils.actor', 'method' : 'opensrf.system.time' },
-	'TEST_UNSECURE' : { 'app' : 'open-ils.actor', 'method' : 'opensrf.system.time', 'secure' : false },
-	'AUTH_INIT' : { 'app' : 'open-ils.auth', 'method' : 'open-ils.auth.authenticate.init' },
-	'AUTH_COMPLETE' : { 'app' : 'open-ils.auth', 'method' : 'open-ils.auth.authenticate.complete' },
-	'AUTH_DELETE' : { 'app' : 'open-ils.auth', 'method' : 'open-ils.auth.session.delete' },
-	'AUTH_WORKSTATION' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.workstation.register' },
-	'AUTH_VERIFY_CREDENTIALS' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.verify_user_password' },
-	'BILL_PAY' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.money.payment' },
-	'BLOB_AU_PARTS_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.retrieve.parts', 'cacheable' : true, 'ttl' : 120000 },
-	'BLOB_MARC_CALLNUMBERS_RETRIEVE' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.biblio.record.marc_cn.retrieve', 'secure' : false },
-	'BLOB_MOBTS_CIRC_MVR_HAVING_BALANCE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.have_balance.fleshed' },
-	'BLOB_MOBTS_CIRC_MVR_OPEN' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.fleshed' },
-	'BUCKET_CREATE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.container.create' },
-	'BUCKET_FLESH' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.container.flesh.authoritative' },
-	'BUCKET_DELETE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.container.full_delete' },
-	'BUCKET_RETRIEVE_VIA_USER' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.container.all.retrieve_by_user.authoritative' },
-	'BUCKET_ITEM_CREATE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.container.item.create' },
-	'BUCKET_ITEM_DELETE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.container.item.delete' },
-	'CAPTURE_COPY_FOR_HOLD_VIA_BARCODE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.hold.capture_copy.barcode' },
-	'CHECKIN_VIA_BARCODE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.checkin' },
-	'CHECKOUT' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.checkout' },
-	'CHECKOUT_FULL' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.checkout.full' },
-	'CHECKOUT_PERMIT' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.checkout.permit' },
-	'CHECKOUT_RENEW' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.renew' },
-	'CIRC_MODIFIER_LIST' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.circ_modifier.retrieve.all' },
-	'FM_ACN_RETRIEVE' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.callnumber.retrieve', 'secure' : false },
-	'FM_ACN_RETRIEVE.authoritative' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.callnumber.retrieve.authoritative', 'secure' : false },
-	'FM_ACN_TREE_UPDATE' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.asset.volume.fleshed.batch.update' },
-	'FM_ACN_TREE_LIST_RETRIEVE_VIA_RECORD_ID_AND_ORG_IDS' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.asset.copy_tree.retrieve', 'secure' : false },
-	'FM_ACN_TREE_LIST_RETRIEVE_VIA_RECORD_ID_AND_ORG_IDS.authoritative' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.asset.copy_tree.retrieve.authoritative', 'secure' : false },
-	'FM_ACN_TRANSFER' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.asset.volume.batch.transfer' },
-	'FM_ACN_FIND_OR_CREATE' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.call_number.find_or_create', 'secure' : false },
-	'FM_ACP_DETAILS' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.copy_details.retrieve' },
-	'FM_ACP_DETAILS_VIA_BARCODE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.copy_details.retrieve.barcode' },
-	'FM_ACP_DETAILS_VIA_BARCODE.authoritative' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.copy_details.retrieve.barcode.authoritative' },
-	//'FM_ACP_RETRIEVE' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.asset.copy.fleshed.retrieve' },
-	'FM_ACP_RETRIEVE' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.asset.copy.fleshed2.retrieve', 'secure' : false },
-	//'FM_ACP_RETRIEVE_VIA_BARCODE' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.asset.copy.find_by_barcode' },
-	'FM_ACP_RETRIEVE_VIA_BARCODE' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.asset.copy.fleshed2.find_by_barcode', 'secure' : false },
-	'FM_ACP_RETRIEVE_VIA_BARCODE.authoritative' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.asset.copy.fleshed2.find_by_barcode.authoritative', 'secure' : false },
-	'FM_ACP_FLESHED_BATCH_RETRIEVE' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.asset.copy.fleshed.batch.retrieve', 'secure' : false },
-	'FM_ACP_FLESHED_BATCH_RETRIEVE.authoritative' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.asset.copy.fleshed.batch.retrieve.authoritative', 'secure' : false },
-	'FM_ACP_FLESHED_BATCH_UPDATE' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.asset.copy.fleshed.batch.update' },
-	'FM_ACP_COUNT' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.biblio.record.copy_count.staff', 'secure' : false },
-	'FM_ACP_COUNT.authoritative' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.biblio.record.copy_count.staff.authoritative', 'secure' : false },
-	'FM_ACPL_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.copy_location.retrieve.all', 'secure' : false },
-	'FM_ACPL_RETRIEVE_VIA_ID' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.copy_location.retrieve', 'secure' : false },
-	'FM_ACPL_RETRIEVE_VIA_ID.authoritative' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.copy_location.retrieve.authoritative', 'secure' : false },
-	'FM_ACPN_RETRIEVE_ALL' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.copy_note.retrieve.all', 'secure' : false },
-	'FM_ACPN_CREATE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.copy_note.create' },
-	'FM_ACPN_DELETE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.copy_note.delete', 'secure' : false },
-	'FM_ACTSC_RETRIEVE_BATCH' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.stat_cat.actor.retrieve.batch', 'secure' : false },
-	'FM_ACTSC_RETRIEVE_VIA_AOU' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.stat_cat.actor.retrieve.all', 'secure' : false },
-	'FM_AHN_CREATE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.hold_notification.create' },
-	'FM_AHN_RETRIEVE_VIA_AHR' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.hold_notification.retrieve_by_hold' },
-	'FM_AHR_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.holds.retrieve_by_id' },
-	'FM_AHR_BLOB_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.hold.details.retrieve' },
-	'FM_AHR_BLOB_RETRIEVE.authoritative' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.hold.details.retrieve.authoritative' },
-	'FM_AHR_RETRIEVE_VIA_AU' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.holds.retrieve' },
-	'FM_AHR_ID_LIST_RETRIEVE_VIA_AU' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.holds.id_list.retrieve' },
-	'FM_AHR_ID_LIST_RETRIEVE_VIA_AU.authoritative' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.holds.id_list.retrieve.authoritative' },
-	'FM_AHR_RETRIEVE_VIA_BRE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.open_holds.retrieve' },
-	'FM_AHR_RETRIEVE_ALL_VIA_BRE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.holds.retrieve_all_from_title' },
-	'FM_AHR_RETRIEVE_VIA_PICKUP_AOU' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.holds.retrieve_by_pickup_lib' },
-	'FM_AHR_ID_LIST_RETRIEVE_VIA_PICKUP_AOU' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.holds.id_list.retrieve_by_pickup_lib' },
-	'FM_AHR_PULL_LIST' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.hold_pull_list.retrieve' },
-	'FM_AHR_ID_LIST_PULL_LIST' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.hold_pull_list.id_list.retrieve', 'secure' : false },
-	'FM_AHR_ONSHELF_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.captured_holds.on_shelf.retrieve' },
-	'FM_AHR_ID_LIST_ONSHELF_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.captured_holds.id_list.on_shelf.retrieve', 'secure' : false },
-	'FM_AHR_COUNT_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.hold_requests.count', 'cacheable' : true, 'ttl' : 60000  },
-	'FM_AHR_COUNT_RETRIEVE.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.hold_requests.count.authoritative', 'cacheable' : true, 'ttl' : 60000  },
-	'FM_AHR_CANCEL' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.hold.cancel' },
-	'FM_AHR_UPDATE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.hold.update' },
-	'FM_AHR_RESET' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.hold.reset' },
-	'FM_AHR_STATUS' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.hold.status.retrieve' },
-	'FM_AIHU_CREATE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.in_house_use.create' },
-	'FM_ANCC_RETRIEVE_VIA_ID' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.non_cataloged_circulation.retrieve' },
-	'FM_ANCC_RETRIEVE_VIA_USER' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.open_non_cataloged_circulation.user' },
-	'FM_ANCC_RETRIEVE_VIA_USER.authoritative' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.open_non_cataloged_circulation.user.authoritative' },
-	'FM_ANCIHU_CREATE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.non_cat_in_house_use.create' },
-	'FM_AOA_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.org_unit.address.retrieve', 'secure' : false },
-	'FM_AOU_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.org_tree.retrieve', 'secure' : false },
-	'FM_AOU_DESCENDANTS_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.org_tree.descendants.retrieve', 'secure' : false },
-	'FM_AOU_RETRIEVE_RELATED_VIA_SESSION' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.org_unit.full_path.retrieve' },
-	'FM_AOU_IDS_RETRIEVE_VIA_RECORD_ID' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.actor.org_unit.retrieve_by_title', 'secure' : false },
-	'FM_AOU_IDS_RETRIEVE_VIA_RECORD_ID.authoritative' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.actor.org_unit.retrieve_by_title.authoritative', 'secure' : false },
+ 'TEST_SECURE' : { 'app' : 'open-ils.actor', 'method' : 'opensrf.system.time' },
+ 'TEST_UNSECURE' : { 'app' : 'open-ils.actor', 'method' : 'opensrf.system.time', 'secure' : false },
+ 'AUTH_INIT' : { 'app' : 'open-ils.auth', 'method' : 'open-ils.auth.authenticate.init' },
+ 'AUTH_COMPLETE' : { 'app' : 'open-ils.auth', 'method' : 'open-ils.auth.authenticate.complete' },
+ 'AUTH_DELETE' : { 'app' : 'open-ils.auth', 'method' : 'open-ils.auth.session.delete' },
+ 'AUTH_WORKSTATION' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.workstation.register' },
+ 'AUTH_VERIFY_CREDENTIALS' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.verify_user_password' },
+ 'BILL_PAY' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.money.payment' },
+ 'BLOB_AU_PARTS_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.retrieve.parts', 'cacheable' : true, 'ttl' : 120000 },
+ 'BLOB_MARC_CALLNUMBERS_RETRIEVE' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.biblio.record.marc_cn.retrieve', 'secure' : false },
+ 'BLOB_MOBTS_CIRC_MVR_HAVING_BALANCE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.have_balance.fleshed' },
+ 'BLOB_MOBTS_CIRC_MVR_OPEN' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.fleshed' },
+ 'BUCKET_CREATE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.container.create' },
+ 'BUCKET_FLESH' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.container.flesh.authoritative' },
+ 'BUCKET_DELETE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.container.full_delete' },
+ 'BUCKET_RETRIEVE_VIA_USER' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.container.all.retrieve_by_user.authoritative' },
+ 'BUCKET_ITEM_CREATE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.container.item.create' },
+ 'BUCKET_ITEM_DELETE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.container.item.delete' },
+ 'CAPTURE_COPY_FOR_HOLD_VIA_BARCODE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.hold.capture_copy.barcode' },
+ 'CHECKIN_VIA_BARCODE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.checkin' },
+ 'CHECKOUT' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.checkout' },
+ 'CHECKOUT_FULL' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.checkout.full' },
+ 'CHECKOUT_PERMIT' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.checkout.permit' },
+ 'CHECKOUT_RENEW' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.renew' },
+ 'CIRC_MODIFIER_LIST' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.circ_modifier.retrieve.all' },
+ 'FM_ACN_RETRIEVE' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.callnumber.retrieve', 'secure' : false },
+ 'FM_ACN_RETRIEVE.authoritative' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.callnumber.retrieve.authoritative', 'secure' : false },
+ 'FM_ACN_TREE_UPDATE' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.asset.volume.fleshed.batch.update' },
+ 'FM_ACN_TREE_LIST_RETRIEVE_VIA_RECORD_ID_AND_ORG_IDS' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.asset.copy_tree.retrieve', 'secure' : false },
+ 'FM_ACN_TREE_LIST_RETRIEVE_VIA_RECORD_ID_AND_ORG_IDS.authoritative' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.asset.copy_tree.retrieve.authoritative', 'secure' : false },
+ 'FM_ACN_TRANSFER' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.asset.volume.batch.transfer' },
+ 'FM_ACN_FIND_OR_CREATE' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.call_number.find_or_create', 'secure' : false },
+ 'FM_ACP_DETAILS' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.copy_details.retrieve' },
+ 'FM_ACP_DETAILS_VIA_BARCODE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.copy_details.retrieve.barcode' },
+ 'FM_ACP_DETAILS_VIA_BARCODE.authoritative' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.copy_details.retrieve.barcode.authoritative' },
+ //'FM_ACP_RETRIEVE' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.asset.copy.fleshed.retrieve' },
+ 'FM_ACP_RETRIEVE' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.asset.copy.fleshed2.retrieve', 'secure' : false },
+ //'FM_ACP_RETRIEVE_VIA_BARCODE' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.asset.copy.find_by_barcode' },
+ 'FM_ACP_RETRIEVE_VIA_BARCODE' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.asset.copy.fleshed2.find_by_barcode', 'secure' : false },
+ 'FM_ACP_RETRIEVE_VIA_BARCODE.authoritative' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.asset.copy.fleshed2.find_by_barcode.authoritative', 'secure' : false },
+ 'FM_ACP_FLESHED_BATCH_RETRIEVE' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.asset.copy.fleshed.batch.retrieve', 'secure' : false },
+ 'FM_ACP_FLESHED_BATCH_RETRIEVE.authoritative' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.asset.copy.fleshed.batch.retrieve.authoritative', 'secure' : false },
+ 'FM_ACP_FLESHED_BATCH_UPDATE' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.asset.copy.fleshed.batch.update' },
+ 'FM_ACP_COUNT' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.biblio.record.copy_count.staff', 'secure' : false },
+ 'FM_ACP_COUNT.authoritative' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.biblio.record.copy_count.staff.authoritative', 'secure' : false },
+ 'FM_ACPL_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.copy_location.retrieve.all', 'secure' : false },
+ 'FM_ACPL_RETRIEVE_VIA_ID' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.copy_location.retrieve', 'secure' : false },
+ 'FM_ACPL_RETRIEVE_VIA_ID.authoritative' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.copy_location.retrieve.authoritative', 'secure' : false },
+ 'FM_ACPN_RETRIEVE_ALL' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.copy_note.retrieve.all', 'secure' : false },
+ 'FM_ACPN_CREATE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.copy_note.create' },
+ 'FM_ACPN_DELETE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.copy_note.delete', 'secure' : false },
+ 'FM_ACTSC_RETRIEVE_BATCH' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.stat_cat.actor.retrieve.batch', 'secure' : false },
+ 'FM_ACTSC_RETRIEVE_VIA_AOU' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.stat_cat.actor.retrieve.all', 'secure' : false },
+ 'FM_AHN_CREATE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.hold_notification.create' },
+ 'FM_AHN_RETRIEVE_VIA_AHR' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.hold_notification.retrieve_by_hold' },
+ 'FM_AHR_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.holds.retrieve_by_id' },
+ 'FM_AHR_BLOB_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.hold.details.retrieve' },
+ 'FM_AHR_BLOB_RETRIEVE.authoritative' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.hold.details.retrieve.authoritative' },
+ 'FM_AHR_RETRIEVE_VIA_AU' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.holds.retrieve' },
+ 'FM_AHR_ID_LIST_RETRIEVE_VIA_AU' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.holds.id_list.retrieve' },
+ 'FM_AHR_ID_LIST_RETRIEVE_VIA_AU.authoritative' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.holds.id_list.retrieve.authoritative' },
+ 'FM_AHR_RETRIEVE_VIA_BRE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.open_holds.retrieve' },
+ 'FM_AHR_RETRIEVE_ALL_VIA_BRE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.holds.retrieve_all_from_title' },
+ 'FM_AHR_RETRIEVE_VIA_PICKUP_AOU' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.holds.retrieve_by_pickup_lib' },
+ 'FM_AHR_ID_LIST_RETRIEVE_VIA_PICKUP_AOU' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.holds.id_list.retrieve_by_pickup_lib' },
+ 'FM_AHR_PULL_LIST' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.hold_pull_list.retrieve' },
+ 'FM_AHR_ID_LIST_PULL_LIST' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.hold_pull_list.id_list.retrieve', 'secure' : false },
+ 'FM_AHR_ONSHELF_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.captured_holds.on_shelf.retrieve' },
+ 'FM_AHR_ID_LIST_ONSHELF_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.captured_holds.id_list.on_shelf.retrieve', 'secure' : false },
+ 'FM_AHR_COUNT_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.hold_requests.count', 'cacheable' : true, 'ttl' : 60000  },
+ 'FM_AHR_COUNT_RETRIEVE.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.hold_requests.count.authoritative', 'cacheable' : true, 'ttl' : 60000  },
+ 'FM_AHR_CANCEL' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.hold.cancel' },
+ 'FM_AHR_UPDATE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.hold.update' },
+ 'FM_AHR_RESET' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.hold.reset' },
+ 'FM_AHR_STATUS' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.hold.status.retrieve' },
+ 'FM_AIHU_CREATE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.in_house_use.create' },
+ 'FM_ANCC_RETRIEVE_VIA_ID' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.non_cataloged_circulation.retrieve' },
+ 'FM_ANCC_RETRIEVE_VIA_USER' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.open_non_cataloged_circulation.user' },
+ 'FM_ANCC_RETRIEVE_VIA_USER.authoritative' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.open_non_cataloged_circulation.user.authoritative' },
+ 'FM_ANCIHU_CREATE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.non_cat_in_house_use.create' },
+ 'FM_AOA_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.org_unit.address.retrieve', 'secure' : false },
+ 'FM_AOU_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.org_tree.retrieve', 'secure' : false },
+ 'FM_AOU_DESCENDANTS_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.org_tree.descendants.retrieve', 'secure' : false },
+ 'FM_AOU_RETRIEVE_RELATED_VIA_SESSION' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.org_unit.full_path.retrieve' },
+ 'FM_AOU_IDS_RETRIEVE_VIA_RECORD_ID' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.actor.org_unit.retrieve_by_title', 'secure' : false },
+ 'FM_AOU_IDS_RETRIEVE_VIA_RECORD_ID.authoritative' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.actor.org_unit.retrieve_by_title.authoritative', 'secure' : false },
     'FM_AOUS_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.org_unit_setting.values.ranged.retrieve' },
-	'FM_AOUT_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.org_types.retrieve', 'secure' : false },
-	'FM_ASC_BATCH_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.stat_cat.asset.retrieve.batch', 'secure' : false },
-	'FM_ASC_RETRIEVE_VIA_AOU' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.stat_cat.asset.retrieve.all', 'secure' : false },
-	'FM_ASV_CREATE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.survey.create' },
-	'FM_ASV_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.survey.retrieve.all', 'secure' : false },
-	'FM_ASV_RETRIEVE_REQUIRED' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.survey.retrieve.required' },
-	'FM_ASVR_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.survey.response.retrieve' },
-	'FM_ATC_VOID' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.transit.abort' },
-	'FM_ATC_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.transit.retrieve', 'secure' : false },
-	'FM_ATC_RETRIEVE_VIA_AOU' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.transit.retrieve_by_lib', 'secure' : false },
+ 'FM_AOUT_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.org_types.retrieve', 'secure' : false },
+ 'FM_ASC_BATCH_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.stat_cat.asset.retrieve.batch', 'secure' : false },
+ 'FM_ASC_RETRIEVE_VIA_AOU' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.stat_cat.asset.retrieve.all', 'secure' : false },
+ 'FM_ASV_CREATE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.survey.create' },
+ 'FM_ASV_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.survey.retrieve.all', 'secure' : false },
+ 'FM_ASV_RETRIEVE_REQUIRED' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.survey.retrieve.required' },
+ 'FM_ASVR_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.survey.response.retrieve' },
+ 'FM_ATC_VOID' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.transit.abort' },
+ 'FM_ATC_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.transit.retrieve', 'secure' : false },
+ 'FM_ATC_RETRIEVE_VIA_AOU' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.transit.retrieve_by_lib', 'secure' : false },
     'FM_AU_ID_RETRIEVE_VIA_BARCODE_OR_USERNAME' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.retrieve_id_by_barcode_or_username' },
-	'FM_AU_IDS_RETRIEVE_VIA_HASH' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.patron.search.advanced' },
-	'FM_AU_LIST_RETRIEVE_VIA_GROUP' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.usergroup.members.retrieve' },
-	'FM_AU_LIST_RETRIEVE_VIA_GROUP.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.usergroup.members.retrieve.authoritative' },
-	'FM_AU_RETRIEVE_VIA_SESSION' : { 'app' : 'open-ils.auth', 'method' : 'open-ils.auth.session.retrieve' },
-	'FM_AU_RETRIEVE_VIA_BARCODE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.fleshed.retrieve_by_barcode', 'cacheable' : true, 'ttl' : 60000 },
-	'FM_AU_RETRIEVE_VIA_BARCODE.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.fleshed.retrieve_by_barcode.authoritative', 'cacheable' : true, 'ttl' : 60000 },
-	'FM_AU_RETRIEVE_VIA_ID' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.retrieve', 'cacheable' : true, 'ttl' : 60000 },
-	'FM_AU_RETRIEVE_VIA_ID.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.retrieve.authoritative', 'cacheable' : true, 'ttl' : 60000 },
-	'FM_AU_FLESHED_RETRIEVE_VIA_ID' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.fleshed.retrieve', 'cacheable' : true, 'ttl' : 60000 },
-	'FM_AU_FLESHED_RETRIEVE_VIA_ID.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.fleshed.retrieve.authoritative', 'cacheable' : true, 'ttl' : 60000 },
+ 'FM_AU_IDS_RETRIEVE_VIA_HASH' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.patron.search.advanced' },
+ 'FM_AU_LIST_RETRIEVE_VIA_GROUP' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.usergroup.members.retrieve' },
+ 'FM_AU_LIST_RETRIEVE_VIA_GROUP.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.usergroup.members.retrieve.authoritative' },
+ 'FM_AU_RETRIEVE_VIA_SESSION' : { 'app' : 'open-ils.auth', 'method' : 'open-ils.auth.session.retrieve' },
+ 'FM_AU_RETRIEVE_VIA_BARCODE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.fleshed.retrieve_by_barcode', 'cacheable' : true, 'ttl' : 60000 },
+ 'FM_AU_RETRIEVE_VIA_BARCODE.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.fleshed.retrieve_by_barcode.authoritative', 'cacheable' : true, 'ttl' : 60000 },
+ 'FM_AU_RETRIEVE_VIA_ID' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.retrieve', 'cacheable' : true, 'ttl' : 60000 },
+ 'FM_AU_RETRIEVE_VIA_ID.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.retrieve.authoritative', 'cacheable' : true, 'ttl' : 60000 },
+ 'FM_AU_FLESHED_RETRIEVE_VIA_ID' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.fleshed.retrieve', 'cacheable' : true, 'ttl' : 60000 },
+ 'FM_AU_FLESHED_RETRIEVE_VIA_ID.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.fleshed.retrieve.authoritative', 'cacheable' : true, 'ttl' : 60000 },
     'FM_AU_MERGE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.merge' },
-	'FM_AU_NEW_USERGROUP' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.usergroup.new' },
-	'FM_AU_UPDATE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.patron.update' },
-	'FM_AUN_RETRIEVE_ALL' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.note.retrieve.all', 'cacheable' : false, 'ttl' : 60000 },
-	'FM_AUN_RETRIEVE_ALL.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.note.retrieve.all.authoritative', 'cacheable' : false, 'ttl' : 60000 },
-	'FM_AUN_CREATE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.note.create' },
-	'FM_AUN_DELETE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.note.delete' },
-	'FM_AUS_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.patron.settings.retrieve' },
-	'FM_AUS_UPDATE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.patron.settings.update' },
-	'FM_AUSP_APPLY' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.penalty.apply' },
-	'FM_AUSP_REMOVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.penalty.remove' },
-	'FM_AUSP_UPDATE_NOTE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.penalty.note.update' },
-	'FM_BRE_RETRIEVE_VIA_ID' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.biblio.record.metadata.retrieve', 'secure' : false },
-	'FM_BRE_RETRIEVE_VIA_ID.authoritative' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.biblio.record.metadata.retrieve.authoritative', 'secure' : false },
-	'FM_BRE_ID_SEARCH_VIA_BARCODE' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.biblio.find_by_barcode', 'secure' : false },
+ 'FM_AU_NEW_USERGROUP' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.usergroup.new' },
+ 'FM_AU_UPDATE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.patron.update' },
+ 'FM_AUN_RETRIEVE_ALL' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.note.retrieve.all', 'cacheable' : false, 'ttl' : 60000 },
+ 'FM_AUN_RETRIEVE_ALL.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.note.retrieve.all.authoritative', 'cacheable' : false, 'ttl' : 60000 },
+ 'FM_AUN_CREATE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.note.create' },
+ 'FM_AUN_DELETE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.note.delete' },
+ 'FM_AUS_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.patron.settings.retrieve' },
+ 'FM_AUS_UPDATE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.patron.settings.update' },
+ 'FM_AUSP_APPLY' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.penalty.apply' },
+ 'FM_AUSP_REMOVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.penalty.remove' },
+ 'FM_AUSP_UPDATE_NOTE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.penalty.note.update' },
+ 'FM_BRE_RETRIEVE_VIA_ID' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.biblio.record.metadata.retrieve', 'secure' : false },
+ 'FM_BRE_RETRIEVE_VIA_ID.authoritative' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.biblio.record.metadata.retrieve.authoritative', 'secure' : false },
+ 'FM_BRE_ID_SEARCH_VIA_BARCODE' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.biblio.find_by_barcode', 'secure' : false },
     'FM_BRE_ID_SEARCH_VIA_MULTICLASS_QUERY' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.biblio.multiclass.query.staff' },
-	'FM_BRE_ID_SEARCH_VIA_TCN' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.biblio.tcn', 'secure' : false },
-	'FM_BRE_DELETE' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.biblio.record_entry.delete', 'secure' : false },
-	'FM_BRE_UNDELETE' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.biblio.record_entry.undelete', 'secure' : false },
-	'FM_BRN_FROM_MARCXML' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.z3950.marcxml_to_brn', 'secure' : false },
-	'FM_CBT_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.billing_type.ranged.retrieve.all', 'secure' : false },
-	'FM_CCS_RETRIEVE' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.config.copy_status.retrieve.all', 'secure' : false },
-	'FM_CIRC_DETAILS' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.fleshed.retrieve' },
-	'FM_CIRC_DETAILS.authoritative' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.fleshed.retrieve.authoritative' },
-	'FM_CIRC_RETRIEVE_VIA_ID' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.retrieve' },
-	/*'FM_CIRC_RETRIEVE_VIA_USER' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.actor.user.checked_out.slim' },*/
-	'FM_CIRC_IN_WITH_FINES_VIA_USER' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.checked_in_with_fines' },
-	'FM_CIRC_IN_WITH_FINES_VIA_USER.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.checked_in_with_fines.authoritative' },
-	'FM_CIRC_RETRIEVE_VIA_USER' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.checked_out' },
-	'FM_CIRC_RETRIEVE_VIA_USER.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.checked_out.authoritative' },
-	'FM_CIRC_RETRIEVE_VIA_COPY' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.copy_checkout_history.retrieve' },
-	/*'FM_CIRC_COUNT_RETRIEVE_VIA_USER' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.checked_out.count' },*/
-	'FM_CIRC_COUNT_RETRIEVE_VIA_USER' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.checked_out.count', 'cacheable' : true, 'ttl' : 60000 },
-	'FM_CIRC_COUNT_RETRIEVE_VIA_USER.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.checked_out.count.authoritative', 'cacheable' : true, 'ttl' : 60000 },
-	'FM_CIRC_COUNT_RETRIEVE_VIA_COPY' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.circulation.count' },
-	'FM_CIRC_EDIT_DUE_DATE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.circulation.due_date.update' },
-	'FM_CIT_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.ident_types.retrieve', 'secure' : false },
-	'FM_CITM_RETRIEVE' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.biblio.item_type_map.retrieve.all', 'secure' : false },
-	'FM_CNAL_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.net_access_level.retrieve.all', 'secure' : false },
-	'FM_CNCT_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.non_cat_types.retrieve.all', 'secure' : false },
-	'FM_CRAHP_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.config.rules.age_hold_protect.retrieve.all', 'secure' : false },
+ 'FM_BRE_ID_SEARCH_VIA_TCN' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.biblio.tcn', 'secure' : false },
+ 'FM_BRE_DELETE' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.biblio.record_entry.delete', 'secure' : false },
+ 'FM_BRE_UNDELETE' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.biblio.record_entry.undelete', 'secure' : false },
+ 'FM_BRN_FROM_MARCXML' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.z3950.marcxml_to_brn', 'secure' : false },
+ 'FM_CBT_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.billing_type.ranged.retrieve.all', 'secure' : false },
+ 'FM_CCS_RETRIEVE' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.config.copy_status.retrieve.all', 'secure' : false },
+ 'FM_CIRC_DETAILS' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.fleshed.retrieve' },
+ 'FM_CIRC_DETAILS.authoritative' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.fleshed.retrieve.authoritative' },
+ 'FM_CIRC_RETRIEVE_VIA_ID' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.retrieve' },
+ /*'FM_CIRC_RETRIEVE_VIA_USER' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.actor.user.checked_out.slim' },*/
+ 'FM_CIRC_IN_WITH_FINES_VIA_USER' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.checked_in_with_fines' },
+ 'FM_CIRC_IN_WITH_FINES_VIA_USER.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.checked_in_with_fines.authoritative' },
+ 'FM_CIRC_RETRIEVE_VIA_USER' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.checked_out' },
+ 'FM_CIRC_RETRIEVE_VIA_USER.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.checked_out.authoritative' },
+ 'FM_CIRC_RETRIEVE_VIA_COPY' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.copy_checkout_history.retrieve' },
+ /*'FM_CIRC_COUNT_RETRIEVE_VIA_USER' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.checked_out.count' },*/
+ 'FM_CIRC_COUNT_RETRIEVE_VIA_USER' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.checked_out.count', 'cacheable' : true, 'ttl' : 60000 },
+ 'FM_CIRC_COUNT_RETRIEVE_VIA_USER.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.checked_out.count.authoritative', 'cacheable' : true, 'ttl' : 60000 },
+ 'FM_CIRC_COUNT_RETRIEVE_VIA_COPY' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.circulation.count' },
+ 'FM_CIRC_EDIT_DUE_DATE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.circulation.due_date.update' },
+ 'FM_CIT_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.ident_types.retrieve', 'secure' : false },
+ 'FM_CITM_RETRIEVE' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.biblio.item_type_map.retrieve.all', 'secure' : false },
+ 'FM_CNAL_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.net_access_level.retrieve.all', 'secure' : false },
+ 'FM_CNCT_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.non_cat_types.retrieve.all', 'secure' : false },
+ 'FM_CRAHP_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.config.rules.age_hold_protect.retrieve.all', 'secure' : false },
     'FM_CSP_PCRUD_SEARCH' : { 'app' : 'open-ils.pcrud', 'method' : 'open-ils.pcrud.search.csp.atomic', 'secure' : false },
-	'FM_CST_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.standings.retrieve', 'secure' : false },
-	'FM_MB_CREATE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.money.billing.create' },
-	'FM_MB_RETRIEVE_VIA_MBTS_ID' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.money.billing.retrieve.all' },
-	'FM_MB_RETRIEVE_VIA_MBTS_ID.authoritative' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.money.billing.retrieve.all.authoritative' },
-	'FM_MB_VOID' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.money.billing.void' },
-	'FM_MBTS_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.money.billable_xact_summary.retrieve' },
-	'FM_MBTS_RETRIEVE.authoritative' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.money.billable_xact_summary.retrieve.authoritative' },
-	'FM_MBTS_IDS_RETRIEVE_ALL' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.history' },
-	'FM_MBTS_IDS_RETRIEVE_ALL_HAVING_CHARGE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.history.have_charge' },
-	'FM_MBTS_IDS_RETRIEVE_ALL_HAVING_BALANCE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.history.have_balance' },
-	'FM_MBTS_IDS_RETRIEVE_ALL_HAVING_BALANCE.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.history.have_balance.authoritative' },
-	'FM_MBTS_IDS_RETRIEVE_ALL_STILL_OPEN' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.history.still_open' },
-	'FM_MBTS_IDS_RETRIEVE_ALL_HAVING_BILL' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.history.have_bill' },
-	'FM_MBTS_IDS_RETRIEVE_ALL_HAVING_BILL.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.history.have_bill.authoritative' },
-	'FM_MBTS_IDS_RETRIEVE_FOR_HISTORY' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.history.have_bill' },
-	'FM_MBTS_IDS_RETRIEVE_FOR_HISTORY.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.history.have_bill.authoritative' },
-	'FM_MP_RETRIEVE_VIA_MBTS_ID' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.money.payment.retrieve.all' },
-	'FM_MP_RETRIEVE_VIA_MBTS_ID.authoritative' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.money.payment.retrieve.all.authoritative' },
-	'FM_MG_CREATE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.money.grocery.create' },
-	'FM_MG_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.money.grocery.retrieve' },
-	'FM_MOBTS_HAVING_BALANCE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.have_balance' },
-	'FM_MOBTS_HAVING_BALANCE.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.have_balance.authoritative' },
-	'FM_MOBTS_TOTAL_HAVING_BALANCE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.have_balance.total' },
-	'FM_MOBTS_COUNT_HAVING_BALANCE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.have_balance.count' },
-	'FM_MOBTS_OPEN' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions' },
-	'FM_MOBTS_TOTAL_OPEN' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.total' },
-	'FM_MOBTS_COUNT_OPEN' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.count' },
-	'FM_MOUS_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.fines.summary', 'cacheable' : true, 'ttl' : 60000 },
-	'FM_MOUS_RETRIEVE.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.fines.summary.authoritative', 'cacheable' : true, 'ttl' : 60000 },
-	'FM_PGT_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.groups.tree.retrieve', 'secure' : false },
-	'MARC_HTML_RETRIEVE' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.biblio.record.html', 'secure' : false },
-	'FM_BLOB_RETRIEVE_VIA_Z3950_SEARCH' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.z3950.search_class' },
-	'FM_BLOB_RETRIEVE_VIA_Z3950_RAW_SEARCH' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.z3950.search_service' },
-	'RETRIEVE_Z3950_SERVICES' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.z3950.retrieve_services', 'secure' : false },
-	'MARK_ITEM_DAMAGED' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.mark_item_damaged' },
-	'MARK_ITEM_MISSING' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.mark_item_missing' },
-	'MARK_ITEM_LOST' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.circulation.set_lost' },
-	'MARK_ITEM_CLAIM_RETURNED' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.circulation.set_claims_returned' },
-	'MODS_SLIM_METARECORD_RETRIEVE' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.biblio.metarecord.mods_slim.retrieve', 'secure' : false },
-	'MODS_SLIM_RECORD_RETRIEVE' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.biblio.record.mods_slim.retrieve', 'secure' : false },
-	'MODS_SLIM_RECORD_RETRIEVE.authoritative' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.biblio.record.mods_slim.retrieve.authoritative', 'secure' : false },
-	'MODS_SLIM_RECORD_RETRIEVE_VIA_COPY' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.biblio.mods_from_copy', 'secure' : false },
-	'MODS_SLIM_RECORD_RETRIEVE_VIA_COPY.authoritative' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.biblio.mods_from_copy', 'secure' : false },
-	'PERM_CHECK' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.perm.check' },
-	'PERM_MULTI_ORG_CHECK' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.perm.check.multi_org' },
-	'PERM_RETRIEVE_HIGHEST_ORG' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.perm.highest_org' },
-	'PERM_RETRIEVE_WORK_OU' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.has_work_perm_at' },
-	'BATCH_PERM_RETRIEVE_WORK_OU' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.has_work_perm_at.batch' },
-	'MARC_XML_RECORD_CREATE' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.biblio.record.xml.create' },
-	'MARC_XML_RECORD_IMPORT' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.biblio.record.xml.import' },
-	'MARC_XML_RECORD_REPLACE' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.biblio.record.marc.replace' },
-	'MARC_XML_RECORD_UPDATE' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.biblio.record.xml.update' },
-	'MARC_XML_TEMPLATE_RETRIEVE' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.biblio.marc_template.retrieve', 'secure' : false },
-	'MARC_XML_TEMPLATE_LIST' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.marc_template.types.retrieve', 'secure' : false },
-	'MERGE_RECORDS' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.biblio.records.merge' },
-	'PATRON_BARCODE_EXISTS' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.barcode.exists' },
-	'PATRON_BARCODE_EXISTS.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.barcode.exists.authoritative' },
-	'RECALCULATE_STANDING_PENALTIES' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.penalties.update' },
+ 'FM_CST_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.standings.retrieve', 'secure' : false },
+ 'FM_MB_CREATE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.money.billing.create' },
+ 'FM_MB_RETRIEVE_VIA_MBTS_ID' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.money.billing.retrieve.all' },
+ 'FM_MB_RETRIEVE_VIA_MBTS_ID.authoritative' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.money.billing.retrieve.all.authoritative' },
+ 'FM_MB_VOID' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.money.billing.void' },
+ 'FM_MBTS_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.money.billable_xact_summary.retrieve' },
+ 'FM_MBTS_RETRIEVE.authoritative' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.money.billable_xact_summary.retrieve.authoritative' },
+ 'FM_MBTS_IDS_RETRIEVE_ALL' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.history' },
+ 'FM_MBTS_IDS_RETRIEVE_ALL_HAVING_CHARGE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.history.have_charge' },
+ 'FM_MBTS_IDS_RETRIEVE_ALL_HAVING_BALANCE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.history.have_balance' },
+ 'FM_MBTS_IDS_RETRIEVE_ALL_HAVING_BALANCE.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.history.have_balance.authoritative' },
+ 'FM_MBTS_IDS_RETRIEVE_ALL_STILL_OPEN' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.history.still_open' },
+ 'FM_MBTS_IDS_RETRIEVE_ALL_HAVING_BILL' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.history.have_bill' },
+ 'FM_MBTS_IDS_RETRIEVE_ALL_HAVING_BILL.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.history.have_bill.authoritative' },
+ 'FM_MBTS_IDS_RETRIEVE_FOR_HISTORY' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.history.have_bill' },
+ 'FM_MBTS_IDS_RETRIEVE_FOR_HISTORY.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.history.have_bill.authoritative' },
+ 'FM_MP_RETRIEVE_VIA_MBTS_ID' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.money.payment.retrieve.all' },
+ 'FM_MP_RETRIEVE_VIA_MBTS_ID.authoritative' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.money.payment.retrieve.all.authoritative' },
+ 'FM_MG_CREATE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.money.grocery.create' },
+ 'FM_MG_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.money.grocery.retrieve' },
+ 'FM_MOBTS_HAVING_BALANCE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.have_balance' },
+ 'FM_MOBTS_HAVING_BALANCE.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.have_balance.authoritative' },
+ 'FM_MOBTS_TOTAL_HAVING_BALANCE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.have_balance.total' },
+ 'FM_MOBTS_COUNT_HAVING_BALANCE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.have_balance.count' },
+ 'FM_MOBTS_OPEN' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions' },
+ 'FM_MOBTS_TOTAL_OPEN' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.total' },
+ 'FM_MOBTS_COUNT_OPEN' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.count' },
+ 'FM_MOUS_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.fines.summary', 'cacheable' : true, 'ttl' : 60000 },
+ 'FM_MOUS_RETRIEVE.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.fines.summary.authoritative', 'cacheable' : true, 'ttl' : 60000 },
+ 'FM_PGT_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.groups.tree.retrieve', 'secure' : false },
+ 'MARC_HTML_RETRIEVE' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.biblio.record.html', 'secure' : false },
+ 'FM_BLOB_RETRIEVE_VIA_Z3950_SEARCH' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.z3950.search_class' },
+ 'FM_BLOB_RETRIEVE_VIA_Z3950_RAW_SEARCH' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.z3950.search_service' },
+ 'RETRIEVE_Z3950_SERVICES' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.z3950.retrieve_services', 'secure' : false },
+ 'MARK_ITEM_DAMAGED' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.mark_item_damaged' },
+ 'MARK_ITEM_MISSING' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.mark_item_missing' },
+ 'MARK_ITEM_LOST' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.circulation.set_lost' },
+ 'MARK_ITEM_CLAIM_RETURNED' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.circulation.set_claims_returned' },
+ 'MODS_SLIM_METARECORD_RETRIEVE' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.biblio.metarecord.mods_slim.retrieve', 'secure' : false },
+ 'MODS_SLIM_RECORD_RETRIEVE' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.biblio.record.mods_slim.retrieve', 'secure' : false },
+ 'MODS_SLIM_RECORD_RETRIEVE.authoritative' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.biblio.record.mods_slim.retrieve.authoritative', 'secure' : false },
+ 'MODS_SLIM_RECORD_RETRIEVE_VIA_COPY' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.biblio.mods_from_copy', 'secure' : false },
+ 'MODS_SLIM_RECORD_RETRIEVE_VIA_COPY.authoritative' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.biblio.mods_from_copy', 'secure' : false },
+ 'PERM_CHECK' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.perm.check' },
+ 'PERM_MULTI_ORG_CHECK' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.perm.check.multi_org' },
+ 'PERM_RETRIEVE_HIGHEST_ORG' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.perm.highest_org' },
+ 'PERM_RETRIEVE_WORK_OU' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.has_work_perm_at' },
+ 'BATCH_PERM_RETRIEVE_WORK_OU' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.has_work_perm_at.batch' },
+ 'MARC_XML_RECORD_CREATE' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.biblio.record.xml.create' },
+ 'MARC_XML_RECORD_IMPORT' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.biblio.record.xml.import' },
+ 'MARC_XML_RECORD_REPLACE' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.biblio.record.marc.replace' },
+ 'MARC_XML_RECORD_UPDATE' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.biblio.record.xml.update' },
+ 'MARC_XML_TEMPLATE_RETRIEVE' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.biblio.marc_template.retrieve', 'secure' : false },
+ 'MARC_XML_TEMPLATE_LIST' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.marc_template.types.retrieve', 'secure' : false },
+ 'MERGE_RECORDS' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.biblio.records.merge' },
+ 'PATRON_BARCODE_EXISTS' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.barcode.exists' },
+ 'PATRON_BARCODE_EXISTS.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.barcode.exists.authoritative' },
+ 'RECALCULATE_STANDING_PENALTIES' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.penalties.update' },
     'USER_ORG_UNIT_OPT_IN_FEATURE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.org_unit_opt_in.enabled' },
     'USER_ORG_UNIT_OPT_IN_CHECK' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.org_unit_opt_in.check' },
     'USER_ORG_UNIT_OPT_IN_CREATE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.org_unit_opt_in.create' }
@@ -250,101 +250,101 @@ const api = {
 
 const urls = {
 
-	'opac' : '/opac/' + LOCALE + '/skin/default/xml/advanced.xml?nps=1',
-	'opac_rdetail' : '/opac/' + LOCALE + '/skin/default/xml/rdetail.xml',
-	'opac_rresult' : '/opac/' + LOCALE + '/skin/default/xml/rresult.xml',
-	'org_tree' : '/opac/common/js/' + LOCALE + '/OrgTree.js',
-	'browser' : '/opac/' + LOCALE + '/skin/default/xml/advanced.xml?nps=1',
-	'fieldmapper' : '/opac/common/js/fmall.js',
-	'isodate_lib_remote' : '/opac/common/js/DP_DateExtensions.js',
-	'isodate_lib_local' : 'chrome://open_ils_staff_client/content/OpenILS/util/DP_DateExtensions.js',
-	'xsl_marc2html' : '/opac/extras/xsl/oilsMARC21slim2HTML.xsl',
+ 'opac' : '/opac/' + LOCALE + '/skin/default/xml/advanced.xml?nps=1',
+ 'opac_rdetail' : '/opac/' + LOCALE + '/skin/default/xml/rdetail.xml',
+ 'opac_rresult' : '/opac/' + LOCALE + '/skin/default/xml/rresult.xml',
+ 'org_tree' : '/opac/common/js/' + LOCALE + '/OrgTree.js',
+ 'browser' : '/opac/' + LOCALE + '/skin/default/xml/advanced.xml?nps=1',
+ 'fieldmapper' : '/opac/common/js/fmall.js',
+ 'isodate_lib_remote' : '/opac/common/js/DP_DateExtensions.js',
+ 'isodate_lib_local' : 'chrome://open_ils_staff_client/content/OpenILS/util/DP_DateExtensions.js',
+ 'xsl_marc2html' : '/opac/extras/xsl/oilsMARC21slim2HTML.xsl',
 
-	'AUDIO_GOOD_SOUND' : '/xul/server/skin/media/audio/bonus.wav',
-	'AUDIO_BAD_SOUND' : '/xul/server/skin/media/audio/question.wav',
-	'AUDIO_HORRIBLE_SOUND' : '/xul/server/skin/media/audio/redalert.wav',
-	'AUDIO_CIRC_GOOD_SOUND' : '/xul/server/skin/media/audio/toggled.wav',
-	'AUDIO_CIRC_BAD_SOUND' : '/xul/server/skin/media/audio/question.wav',
+ 'AUDIO_GOOD_SOUND' : '/xul/server/skin/media/audio/bonus.wav',
+ 'AUDIO_BAD_SOUND' : '/xul/server/skin/media/audio/question.wav',
+ 'AUDIO_HORRIBLE_SOUND' : '/xul/server/skin/media/audio/redalert.wav',
+ 'AUDIO_CIRC_GOOD_SOUND' : '/xul/server/skin/media/audio/toggled.wav',
+ 'AUDIO_CIRC_BAD_SOUND' : '/xul/server/skin/media/audio/question.wav',
 
-	'XUL_AUTH_SIMPLE' : '/xul/server/main/simple_auth.xul',
-	'XUL_BIB_BRIEF' : '/xul/server/cat/bib_brief.xul',
-	'XUL_BROWSER' : 'chrome://open_ils_staff_client/content/util/browser.xul',
-	'XUL_CHECKIN' : '/xul/server/circ/checkin.xul',
-	'XUL_CHECKOUT' : '/xul/server/circ/checkout.xul',
-	'XUL_CIRC_BRIEF' : '/xul/server/circ/circ_brief.xul',
-	'XUL_CIRC_SUMMARY' : '/xul/server/circ/circ_summary.xul',
-	'XUL_COPY_BUCKETS_QUICK' : '/xul/server/cat/copy_buckets_quick.xul',
-	'XUL_COPY_BUCKETS' : '/xul/server/cat/copy_buckets.xul',
-	'XUL_COPY_DETAILS' : '/xul/server/circ/copy_details.xul',
-	'XUL_COPY_EDITOR' : '/xul/server/cat/copy_editor.xul',
-	'XUL_COPY_LOCATION_EDIT' : '/xul/server/admin/copy_locations.xhtml',
-	'XUL_COPY_NOTES' : '/xul/server/cat/copy_notes.xul',
-	'XUL_COPY_STATUS' : '/xul/server/circ/copy_status.xul',
-	'XUL_COPY_SUMMARY' : '/xul/server/cat/copy_summary.xul',
-	'XUL_COPY_VOLUME_BROWSE' : '/xul/server/cat/copy_browser.xul',
-	'XUL_DEBUG_CONSOLE' : 'chrome://global/content/console.xul',
-	'XUL_DEBUG_FIELDMAPPER' : '/xul/server/util/fm_view.xul',
-	'XUL_DEBUG_FILTER_CONSOLE' : '/xul/server/util/filter_console.xul',
-	'XUL_DEBUG_SHELL' : '/xul/server/util/shell.html',
-	'XUL_DEBUG_XULEDITOR' : '/xul/server/util/xuledit.xul',
-	'XUL_FANCY_PROMPT' : '/xul/server/util/fancy_prompt.xul',
-	'XUL_HOLD_CAPTURE' : '/xul/server/circ/hold_capture.xul',
-	'XUL_HOLD_PULL_LIST' : '/xul/server/admin/hold_pull_list.xhtml',
-	'XUL_HOLDS_BROWSER' : '/xul/server/patron/holds.xul',
-	'XUL_HOLD_NOTICES' : '/xul/server/patron/hold_notices.xul',
-	'XUL_IN_HOUSE_USE' : '/xul/server/circ/in_house_use.xul',
-	'XUL_LIST_CLIPBOARD' : '/xul/server/util/list_clipboard.xul',
-	'XUL_LOCAL_ADMIN' : '/xul/server/admin/index.xhtml',
-	'XUL_MARC_NEW' : '/xul/server/cat/marc_new.xul',
-	'XUL_MARC_EDIT' : '/xul/server/cat/marcedit.xul',
-	'XUL_MARC_VIEW' : '/xul/server/cat/marc_view.xul',
-	'XUL_MENU_FRAME' : 'chrome://open_ils_staff_client/content/main/menu_frame.xul',
-	'XUL_NON_CAT_LABEL_EDIT' : '/xul/server/admin/non_cat_types.xhtml',
-	'XUL_OFFLINE_UPLOAD_XACTS' : '/xul/server/admin/upload_xacts.xhtml',
-	'XUL_OFFLINE_MANAGE_XACTS' : '/xul/server/admin/offline_manage_xacts.xul',
-	'XUL_OFFLINE_MANAGE_XACTS_CGI' : '/cgi-bin/offline/offline.pl',
-	'XUL_OFFLINE_GENERATE_WIDGETS' : '/xul/server/main/gen_offline_widgets.xul',
-	'XUL_REMOTE_OPAC_WRAPPER' : '/xul/server/cat/opac.xul',
-	'XUL_OPAC_WRAPPER' : 'chrome://open_ils_staff_client/content/cat/opac.xul',
-	'XUL_PATRON_BARCODE_ENTRY' : '/xul/server/patron/barcode_entry.xul',
-	'XUL_PATRON_BILLS' : '/xul/server/patron/bills.xul',
-	'XUL_PATRON_BILL_CC_INFO' : '/xul/server/patron/bill_cc_info.xul',
-	'XUL_PATRON_BILL_CHECK_INFO' : '/xul/server/patron/bill_check_info.xul',
-	'XUL_PATRON_BILL_DETAILS' : '/xul/server/patron/bill_details.xul',
-	'XUL_PATRON_BILL_HISTORY' : '/xul/server/patron/bill_history.xul',
-	'XUL_PATRON_BILL_WIZARD' : '/xul/server/patron/bill_wizard.xul',
-	'XUL_PATRON_DISPLAY' : '/xul/server/patron/display.xul',
-	'XUL_PATRON_HORIZ_DISPLAY' : '/xul/server/patron/display_horiz.xul',
-	'XUL_PATRON_EDIT' : '/xul/server/patron/ue.xhtml',
-	'XUL_USER_PERM_EDITOR' : '/xul/server/patron/user_edit.xhtml',
-	'XUL_PATRON_HOLDS' : '/xul/server/patron/holds.xul',
-	'XUL_PATRON_INFO_NOTES' : '/xul/server/patron/info_notes.xul',
-	'XUL_PATRON_INFO_STAT_CATS' : '/xul/server/patron/info_stat_cats.xul',
-	'XUL_PATRON_INFO_SURVEYS' : '/xul/server/patron/info_surveys.xul',
-	'XUL_PATRON_INFO_GROUP' : '/xul/server/patron/info_group.xul',
-	'XUL_PATRON_ITEMS' : '/xul/server/patron/items.xul',
-	'XUL_PATRON_SEARCH_FORM' : '/xul/server/patron/search_form.xul',
-	'XUL_PATRON_HORIZONTAL_SEARCH_FORM' : '/xul/server/patron/search_form_horiz.xul',
-	'XUL_PATRON_SEARCH_RESULT' : '/xul/server/patron/search_result.xul',
-	'XUL_PATRON_SUMMARY' : '/xul/server/patron/summary.xul',
-	'XUL_PRE_CAT' : '/xul/server/circ/pre_cat_fields.xul',
-	'XUL_PRINT_LIST_TEMPLATE_EDITOR' : '/xul/server/circ/print_list_template_editor.xul',
-	'XUL_RECORD_BUCKETS' : '/xul/server/cat/record_buckets.xul',
-	'XUL_RECORD_BUCKETS_QUICK' : '/xul/server/cat/record_buckets_quick.xul',
-	'XUL_REMOTE_BROWSER' : '/xul/server/util/rbrowser.xul',
-	'XUL_SPINE_LABEL' : '/xul/server/cat/spine_labels.xul',
-	'XUL_STANDALONE' : 'chrome://open_ils_staff_client/content/circ/offline.xul',
-	'XUL_STANDING_PENALTIES' : '/xul/server/patron/standing_penalties.xul',
-	'XUL_STAT_CAT_EDIT' : '/xul/server/admin/stat_cat_editor.xhtml',
-	'XUL_SURVEY_WIZARD' : 'chrome://open_ils_staff_client/content/admin/survey_wizard.xul',
-	'XUL_USER_BUCKETS' : '/xul/server/patron/user_buckets.xul',
-	'XUL_VERIFY_CREDENTIALS' : '/xul/server/main/verify_credentials.xul',
-	'XUL_VOLUME_BUCKETS' : '/xul/server/cat/volume_buckets.xul',
-	'XUL_VOLUME_COPY_CREATOR' : '/xul/server/cat/volume_copy_creator.xul',
-	'XUL_VOLUME_EDITOR' : '/xul/server/cat/volume_editor.xul',
-	'XUL_Z3950_IMPORT' : '/xul/server/cat/z3950.xul',
-	'TEST_HTML' : '/xul/server/main/test.html',
-	'TEST_XUL' : '/xul/server/main/test.xul',
+ 'XUL_AUTH_SIMPLE' : '/xul/server/main/simple_auth.xul',
+ 'XUL_BIB_BRIEF' : '/xul/server/cat/bib_brief.xul',
+ 'XUL_BROWSER' : 'chrome://open_ils_staff_client/content/util/browser.xul',
+ 'XUL_CHECKIN' : '/xul/server/circ/checkin.xul',
+ 'XUL_CHECKOUT' : '/xul/server/circ/checkout.xul',
+ 'XUL_CIRC_BRIEF' : '/xul/server/circ/circ_brief.xul',
+ 'XUL_CIRC_SUMMARY' : '/xul/server/circ/circ_summary.xul',
+ 'XUL_COPY_BUCKETS_QUICK' : '/xul/server/cat/copy_buckets_quick.xul',
+ 'XUL_COPY_BUCKETS' : '/xul/server/cat/copy_buckets.xul',
+ 'XUL_COPY_DETAILS' : '/xul/server/circ/copy_details.xul',
+ 'XUL_COPY_EDITOR' : '/xul/server/cat/copy_editor.xul',
+ 'XUL_COPY_LOCATION_EDIT' : '/xul/server/admin/copy_locations.xhtml',
+ 'XUL_COPY_NOTES' : '/xul/server/cat/copy_notes.xul',
+ 'XUL_COPY_STATUS' : '/xul/server/circ/copy_status.xul',
+ 'XUL_COPY_SUMMARY' : '/xul/server/cat/copy_summary.xul',
+ 'XUL_COPY_VOLUME_BROWSE' : '/xul/server/cat/copy_browser.xul',
+ 'XUL_DEBUG_CONSOLE' : 'chrome://global/content/console.xul',
+ 'XUL_DEBUG_FIELDMAPPER' : '/xul/server/util/fm_view.xul',
+ 'XUL_DEBUG_FILTER_CONSOLE' : '/xul/server/util/filter_console.xul',
+ 'XUL_DEBUG_SHELL' : '/xul/server/util/shell.html',
+ 'XUL_DEBUG_XULEDITOR' : '/xul/server/util/xuledit.xul',
+ 'XUL_FANCY_PROMPT' : '/xul/server/util/fancy_prompt.xul',
+ 'XUL_HOLD_CAPTURE' : '/xul/server/circ/hold_capture.xul',
+ 'XUL_HOLD_PULL_LIST' : '/xul/server/admin/hold_pull_list.xhtml',
+ 'XUL_HOLDS_BROWSER' : '/xul/server/patron/holds.xul',
+ 'XUL_HOLD_NOTICES' : '/xul/server/patron/hold_notices.xul',
+ 'XUL_IN_HOUSE_USE' : '/xul/server/circ/in_house_use.xul',
+ 'XUL_LIST_CLIPBOARD' : '/xul/server/util/list_clipboard.xul',
+ 'XUL_LOCAL_ADMIN' : '/xul/server/admin/index.xhtml',
+ 'XUL_MARC_NEW' : '/xul/server/cat/marc_new.xul',
+ 'XUL_MARC_EDIT' : '/xul/server/cat/marcedit.xul',
+ 'XUL_MARC_VIEW' : '/xul/server/cat/marc_view.xul',
+ 'XUL_MENU_FRAME' : 'chrome://open_ils_staff_client/content/main/menu_frame.xul',
+ 'XUL_NON_CAT_LABEL_EDIT' : '/xul/server/admin/non_cat_types.xhtml',
+ 'XUL_OFFLINE_UPLOAD_XACTS' : '/xul/server/admin/upload_xacts.xhtml',
+ 'XUL_OFFLINE_MANAGE_XACTS' : '/xul/server/admin/offline_manage_xacts.xul',
+ 'XUL_OFFLINE_MANAGE_XACTS_CGI' : '/cgi-bin/offline/offline.pl',
+ 'XUL_OFFLINE_GENERATE_WIDGETS' : '/xul/server/main/gen_offline_widgets.xul',
+ 'XUL_REMOTE_OPAC_WRAPPER' : '/xul/server/cat/opac.xul',
+ 'XUL_OPAC_WRAPPER' : 'chrome://open_ils_staff_client/content/cat/opac.xul',
+ 'XUL_PATRON_BARCODE_ENTRY' : '/xul/server/patron/barcode_entry.xul',
+ 'XUL_PATRON_BILLS' : '/xul/server/patron/bills.xul',
+ 'XUL_PATRON_BILL_CC_INFO' : '/xul/server/patron/bill_cc_info.xul',
+ 'XUL_PATRON_BILL_CHECK_INFO' : '/xul/server/patron/bill_check_info.xul',
+ 'XUL_PATRON_BILL_DETAILS' : '/xul/server/patron/bill_details.xul',
+ 'XUL_PATRON_BILL_HISTORY' : '/xul/server/patron/bill_history.xul',
+ 'XUL_PATRON_BILL_WIZARD' : '/xul/server/patron/bill_wizard.xul',
+ 'XUL_PATRON_DISPLAY' : '/xul/server/patron/display.xul',
+ 'XUL_PATRON_HORIZ_DISPLAY' : '/xul/server/patron/display_horiz.xul',
+ 'XUL_PATRON_EDIT' : '/xul/server/patron/ue.xhtml',
+ 'XUL_USER_PERM_EDITOR' : '/xul/server/patron/user_edit.xhtml',
+ 'XUL_PATRON_HOLDS' : '/xul/server/patron/holds.xul',
+ 'XUL_PATRON_INFO_NOTES' : '/xul/server/patron/info_notes.xul',
+ 'XUL_PATRON_INFO_STAT_CATS' : '/xul/server/patron/info_stat_cats.xul',
+ 'XUL_PATRON_INFO_SURVEYS' : '/xul/server/patron/info_surveys.xul',
+ 'XUL_PATRON_INFO_GROUP' : '/xul/server/patron/info_group.xul',
+ 'XUL_PATRON_ITEMS' : '/xul/server/patron/items.xul',
+ 'XUL_PATRON_SEARCH_FORM' : '/xul/server/patron/search_form.xul',
+ 'XUL_PATRON_HORIZONTAL_SEARCH_FORM' : '/xul/server/patron/search_form_horiz.xul',
+ 'XUL_PATRON_SEARCH_RESULT' : '/xul/server/patron/search_result.xul',
+ 'XUL_PATRON_SUMMARY' : '/xul/server/patron/summary.xul',
+ 'XUL_PRE_CAT' : '/xul/server/circ/pre_cat_fields.xul',
+ 'XUL_PRINT_LIST_TEMPLATE_EDITOR' : '/xul/server/circ/print_list_template_editor.xul',
+ 'XUL_RECORD_BUCKETS' : '/xul/server/cat/record_buckets.xul',
+ 'XUL_RECORD_BUCKETS_QUICK' : '/xul/server/cat/record_buckets_quick.xul',
+ 'XUL_REMOTE_BROWSER' : '/xul/server/util/rbrowser.xul',
+ 'XUL_SPINE_LABEL' : '/xul/server/cat/spine_labels.xul',
+ 'XUL_STANDALONE' : 'chrome://open_ils_staff_client/content/circ/offline.xul',
+ 'XUL_STANDING_PENALTIES' : '/xul/server/patron/standing_penalties.xul',
+ 'XUL_STAT_CAT_EDIT' : '/xul/server/admin/stat_cat_editor.xhtml',
+ 'XUL_SURVEY_WIZARD' : 'chrome://open_ils_staff_client/content/admin/survey_wizard.xul',
+ 'XUL_USER_BUCKETS' : '/xul/server/patron/user_buckets.xul',
+ 'XUL_VERIFY_CREDENTIALS' : '/xul/server/main/verify_credentials.xul',
+ 'XUL_VOLUME_BUCKETS' : '/xul/server/cat/volume_buckets.xul',
+ 'XUL_VOLUME_COPY_CREATOR' : '/xul/server/cat/volume_copy_creator.xul',
+ 'XUL_VOLUME_EDITOR' : '/xul/server/cat/volume_editor.xul',
+ 'XUL_Z3950_IMPORT' : '/xul/server/cat/z3950.xul',
+ 'TEST_HTML' : '/xul/server/main/test.html',
+ 'TEST_XUL' : '/xul/server/main/test.xul',
     'CONIFY' : '/conify/' + LOCALE + '/global',
     'EG_WEB_BASE' : '/eg',
     'XUL_LOCAL_ADMIN_BASE' : '/xul/server/admin',
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/main.js b/Open-ILS/xul/staff_client/chrome/content/main/main.js
index cb992f4bba..4183d12d5a 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/main.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/main.js
@@ -6,34 +6,34 @@ var offlineStrings;
 var authStrings;
 
 function grant_perms(url) {
-	var perms = "UniversalXPConnect UniversalPreferencesWrite UniversalBrowserWrite UniversalPreferencesRead UniversalBrowserRead UniversalFileRead";
-	dump('Granting ' + perms + ' to ' + url + '\n');
-	if (G.pref) {
-		G.pref.setCharPref("capability.principal.codebase.p0.granted", perms);
-		G.pref.setCharPref("capability.principal.codebase.p0.id", url);
-		G.pref.setCharPref("capability.principal.codebase.p1.granted", perms);
-		G.pref.setCharPref("capability.principal.codebase.p1.id", url.replace('http:','https:'));
-		G.pref.setBoolPref("dom.disable_open_during_load",false);
-		G.pref.setBoolPref("browser.popups.showPopupBlocker",false);
-	}
+ var perms = "UniversalXPConnect UniversalPreferencesWrite UniversalBrowserWrite UniversalPreferencesRead UniversalBrowserRead UniversalFileRead";
+ dump('Granting ' + perms + ' to ' + url + '\n');
+ if (G.pref) {
+  G.pref.setCharPref("capability.principal.codebase.p0.granted", perms);
+  G.pref.setCharPref("capability.principal.codebase.p0.id", url);
+  G.pref.setCharPref("capability.principal.codebase.p1.granted", perms);
+  G.pref.setCharPref("capability.principal.codebase.p1.id", url.replace('http:','https:'));
+  G.pref.setBoolPref("dom.disable_open_during_load",false);
+  G.pref.setBoolPref("browser.popups.showPopupBlocker",false);
+ }
 
 }
 
 function clear_the_cache() {
-	try {
-		var cacheClass 		= Components.classes["@mozilla.org/network/cache-service;1"];
-		var cacheService	= cacheClass.getService(Components.interfaces.nsICacheService);
-		cacheService.evictEntries(Components.interfaces.nsICache.STORE_ON_DISK);
-		cacheService.evictEntries(Components.interfaces.nsICache.STORE_IN_MEMORY);
-	} catch(E) {
-		dump(E+'\n');alert(E);
-	}
+ try {
+  var cacheClass   = Components.classes["@mozilla.org/network/cache-service;1"];
+  var cacheService = cacheClass.getService(Components.interfaces.nsICacheService);
+  cacheService.evictEntries(Components.interfaces.nsICache.STORE_ON_DISK);
+  cacheService.evictEntries(Components.interfaces.nsICache.STORE_IN_MEMORY);
+ } catch(E) {
+  dump(E+'\n');alert(E);
+ }
 }
 
 function toOpenWindowByType(inType, uri) { /* for Venkman */
     try {
-    	var winopts = "chrome,extrachrome,menubar,resizable,scrollbars,status,toolbar";
-    	window.open(uri, "_blank", winopts);
+     var winopts = "chrome,extrachrome,menubar,resizable,scrollbars,status,toolbar";
+     window.open(uri, "_blank", winopts);
     } catch(E) {
         alert(E); throw(E);
     }
@@ -72,66 +72,66 @@ function start_js_shell() {
 };
 
 function main_init() {
-	dump('entering main_init()\n');
-	try {
-		clear_the_cache();
+ dump('entering main_init()\n');
+ try {
+  clear_the_cache();
 
-		// Now we can safely load the strings without the cache getting wiped
-		offlineStrings = document.getElementById('offlineStrings');
-		authStrings = document.getElementById('authStrings');
+  // Now we can safely load the strings without the cache getting wiped
+  offlineStrings = document.getElementById('offlineStrings');
+  authStrings = document.getElementById('authStrings');
 
-		if (typeof JSAN == 'undefined') {
-			throw(
-				offlineStrings.getString('common.jsan.missing')
-			);
-		}
-		/////////////////////////////////////////////////////////////////////////////
+  if (typeof JSAN == 'undefined') {
+   throw(
+    offlineStrings.getString('common.jsan.missing')
+   );
+  }
+  /////////////////////////////////////////////////////////////////////////////
 
-		JSAN.errorLevel = "die"; // none, warn, or die
-		JSAN.addRepository('..');
+  JSAN.errorLevel = "die"; // none, warn, or die
+  JSAN.addRepository('..');
 
-		//JSAN.use('test.test'); test.test.hello_world();
+  //JSAN.use('test.test'); test.test.hello_world();
 
-		var mw = self;
-		G =  {};
+  var mw = self;
+  G =  {};
         
-		G.pref = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
+  G.pref = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
 
-		JSAN.use('util.error');
-		G.error = new util.error();
-		G.error.sdump('D_ERROR', offlineStrings.getString('main.testing'));
+  JSAN.use('util.error');
+  G.error = new util.error();
+  G.error.sdump('D_ERROR', offlineStrings.getString('main.testing'));
 
-		JSAN.use('util.window');
-		G.window = new util.window();
+  JSAN.use('util.window');
+  G.window = new util.window();
 
-		JSAN.use('auth.controller');
-		G.auth = new auth.controller( { 'window' : mw } );
+  JSAN.use('auth.controller');
+  G.auth = new auth.controller( { 'window' : mw } );
 
-		JSAN.use('OpenILS.data');
-		G.data = new OpenILS.data();
-		G.data.on_error = G.auth.logoff;
+  JSAN.use('OpenILS.data');
+  G.data = new OpenILS.data();
+  G.data.on_error = G.auth.logoff;
 
-		JSAN.use('util.file');
-		G.file = new util.file();
-		try {
-			G.file.get('ws_info');
-			G.ws_info = G.file.get_object(); G.file.close();
-		} catch(E) {
-			G.ws_info = {};
-		}
-		G.data.ws_info = G.ws_info; G.data.stash('ws_info');
+  JSAN.use('util.file');
+  G.file = new util.file();
+  try {
+   G.file.get('ws_info');
+   G.ws_info = G.file.get_object(); G.file.close();
+  } catch(E) {
+   G.ws_info = {};
+  }
+  G.data.ws_info = G.ws_info; G.data.stash('ws_info');
 
-		G.auth.on_login = function() {
+  G.auth.on_login = function() {
 
-			var url = G.auth.controller.view.server_prompt.value || urls.remote;
+   var url = G.auth.controller.view.server_prompt.value || urls.remote;
 
-			G.data.server_unadorned = url; G.data.stash('server_unadorned'); G.data.stash_retrieve();
+   G.data.server_unadorned = url; G.data.stash('server_unadorned'); G.data.stash_retrieve();
 
-			if (! url.match( '^http://' ) ) { url = 'http://' + url; }
+   if (! url.match( '^http://' ) ) { url = 'http://' + url; }
 
-			G.data.server = url; G.data.stash('server'); 
-			G.data.session = { 'key' : G.auth.session.key, 'auth' : G.auth.session.authtime }; G.data.stash('session');
-			G.data.stash_retrieve();
+   G.data.server = url; G.data.stash('server'); 
+   G.data.session = { 'key' : G.auth.session.key, 'auth' : G.auth.session.authtime }; G.data.stash('session');
+   G.data.stash_retrieve();
             try {
                 var ios = Components.classes["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService);
                 var cookieUri = ios.newURI("http://" + G.data.server_unadorned, null, null);
@@ -147,199 +147,199 @@ function main_init() {
                 alert(offlineStrings.getFormattedString(main.session_cookie.error, [E]));
             }
 
-			grant_perms(url);
+   grant_perms(url);
 
-			xulG = {
-				'auth' : G.auth,
-				'url' : url,
-				'window' : G.window,
+   xulG = {
+    'auth' : G.auth,
+    'url' : url,
+    'window' : G.window,
                 'data' : G.data,
-				'pref' : G.pref
-			};
-
-			if (G.data.ws_info && G.data.ws_info[G.auth.controller.view.server_prompt.value]) {
-				JSAN.use('util.widgets');
-				var deck = document.getElementById('progress_space');
-				util.widgets.remove_children( deck );
-				var iframe = document.createElement('iframe'); deck.appendChild(iframe);
-				iframe.setAttribute( 'src', url + '/xul/server/main/data.xul' );
-				iframe.contentWindow.xulG = xulG;
+    'pref' : G.pref
+   };
+
+   if (G.data.ws_info && G.data.ws_info[G.auth.controller.view.server_prompt.value]) {
+    JSAN.use('util.widgets');
+    var deck = document.getElementById('progress_space');
+    util.widgets.remove_children( deck );
+    var iframe = document.createElement('iframe'); deck.appendChild(iframe);
+    iframe.setAttribute( 'src', url + '/xul/server/main/data.xul' );
+    iframe.contentWindow.xulG = xulG;
                 G.data_xul = iframe.contentWindow;
-			} else {
-				xulG.file = G.file;
-				var deck = G.auth.controller.view.ws_deck;
-				JSAN.use('util.widgets'); util.widgets.remove_children('ws_deck');
-				var iframe = document.createElement('iframe'); deck.appendChild(iframe);
-				iframe.setAttribute( 'src', url + '/xul/server/main/ws_info.xul' );
-				iframe.contentWindow.xulG = xulG;
-				deck.selectedIndex = deck.childNodes.length - 1;
-			}
-		};
-
-		G.auth.on_standalone = function() {
-			try {
-				G.window.open(urls.XUL_STANDALONE,'Offline','chrome,resizable');
-			} catch(E) {
-				alert(E);
-			}
-		};
-
-		G.auth.on_standalone_export = function() {
-			try {
-				JSAN.use('util.file'); var file = new util.file('pending_xacts');
-				if (file._file.exists()) {
+   } else {
+    xulG.file = G.file;
+    var deck = G.auth.controller.view.ws_deck;
+    JSAN.use('util.widgets'); util.widgets.remove_children('ws_deck');
+    var iframe = document.createElement('iframe'); deck.appendChild(iframe);
+    iframe.setAttribute( 'src', url + '/xul/server/main/ws_info.xul' );
+    iframe.contentWindow.xulG = xulG;
+    deck.selectedIndex = deck.childNodes.length - 1;
+   }
+  };
+
+  G.auth.on_standalone = function() {
+   try {
+    G.window.open(urls.XUL_STANDALONE,'Offline','chrome,resizable');
+   } catch(E) {
+    alert(E);
+   }
+  };
+
+  G.auth.on_standalone_export = function() {
+   try {
+    JSAN.use('util.file'); var file = new util.file('pending_xacts');
+    if (file._file.exists()) {
                     var file2 = new util.file('');
-					var f = file2.pick_file( { 'mode' : 'save', 'title' : offlineStrings.getString('main.transaction_export.title') } );
-					if (f) {
-						if (f.exists()) {
-							var r = G.error.yns_alert(
-								offlineStrings.getFormattedString('main.transaction_export.prompt', [f.leafName]),
-								offlineStrings.getString('main.transaction_export.prompt.title'),
-								offlineStrings.getString('common.yes'),
-								offlineStrings.getString('common.no'),
-								null,
-								offlineStrings.getString('common.confirm')
-							);
-							if (r != 0) { file.close(); return; }
-						}
-						var e_file = new util.file(''); e_file._file = f;
-						e_file.write_content( 'truncate', file.get_content() );
-						e_file.close();
-						var r = G.error.yns_alert(
-							offlineStrings.getFormattedString('main.transaction_export.success.prompt', [f.leafName]),
-							offlineStrings.getString('main.transaction_export.success.title'),
-							offlineStrings.getString('common.yes'),
-							offlineStrings.getString('common.no'),
-							null,
-							offlineStrings.getString('common.confirm')
-						);
-						if (r == 0) {
-							var count = 0;
-							var filename = 'pending_xacts_exported_' + new Date().getTime();
-							var t_file = new util.file(filename);
-							while (t_file._file.exists()) {
-								filename = 'pending_xacts_' + new Date().getTime() + '.exported';
-								t_file = new util.file(filename);
-								if (count++ > 100) {
-									throw(offlineStrings.getString('main.transaction_export.filename.error'));
-								}
-							}
-							file._file.moveTo(null,filename);
-						} else {
-							alert(offlineStrings.getString('main.transaction_export.duplicate.warning'));
-						}
-					} else {
-						alert(offlineStrings.getString('main.transaction_export.no_filename.error'));
-					}
-				} else {
-					alert(offlineStrings.getString('main.transaction_export.no_transactions.error'));
-				}
-				file.close();
-			} catch(E) {
-				alert(E);
-			}
-		};
-
-		G.auth.on_standalone_import = function() {
-			try {
-				JSAN.use('util.file'); var file = new util.file('pending_xacts');
-				if (file._file.exists()) {
-					alert(offlineStrings.getString('main.transaction_import.outstanding.error'));
-				} else {
+     var f = file2.pick_file( { 'mode' : 'save', 'title' : offlineStrings.getString('main.transaction_export.title') } );
+     if (f) {
+      if (f.exists()) {
+       var r = G.error.yns_alert(
+        offlineStrings.getFormattedString('main.transaction_export.prompt', [f.leafName]),
+        offlineStrings.getString('main.transaction_export.prompt.title'),
+        offlineStrings.getString('common.yes'),
+        offlineStrings.getString('common.no'),
+        null,
+        offlineStrings.getString('common.confirm')
+       );
+       if (r != 0) { file.close(); return; }
+      }
+      var e_file = new util.file(''); e_file._file = f;
+      e_file.write_content( 'truncate', file.get_content() );
+      e_file.close();
+      var r = G.error.yns_alert(
+       offlineStrings.getFormattedString('main.transaction_export.success.prompt', [f.leafName]),
+       offlineStrings.getString('main.transaction_export.success.title'),
+       offlineStrings.getString('common.yes'),
+       offlineStrings.getString('common.no'),
+       null,
+       offlineStrings.getString('common.confirm')
+      );
+      if (r == 0) {
+       var count = 0;
+       var filename = 'pending_xacts_exported_' + new Date().getTime();
+       var t_file = new util.file(filename);
+       while (t_file._file.exists()) {
+        filename = 'pending_xacts_' + new Date().getTime() + '.exported';
+        t_file = new util.file(filename);
+        if (count++ > 100) {
+         throw(offlineStrings.getString('main.transaction_export.filename.error'));
+        }
+       }
+       file._file.moveTo(null,filename);
+      } else {
+       alert(offlineStrings.getString('main.transaction_export.duplicate.warning'));
+      }
+     } else {
+      alert(offlineStrings.getString('main.transaction_export.no_filename.error'));
+     }
+    } else {
+     alert(offlineStrings.getString('main.transaction_export.no_transactions.error'));
+    }
+    file.close();
+   } catch(E) {
+    alert(E);
+   }
+  };
+
+  G.auth.on_standalone_import = function() {
+   try {
+    JSAN.use('util.file'); var file = new util.file('pending_xacts');
+    if (file._file.exists()) {
+     alert(offlineStrings.getString('main.transaction_import.outstanding.error'));
+    } else {
                     var file2 = new util.file('');
-					var f = file2.pick_file( { 'mode' : 'open', 'title' : offlineStrings.getString('main.transaction_import.title')} );
-					if (f && f.exists()) {
-						var i_file = new util.file(''); i_file._file = f;
-						file.write_content( 'truncate', i_file.get_content() );
-						i_file.close();
-						var r = G.error.yns_alert(
-							offlineStrings.getFormattedString('main.transaction_import.delete.prompt', [f.leafName]),
-							offlineStrings.getString('main.transaction_import.success'),
-							offlineStrings.getString('common.yes'),
-							offlineStrings.getString('common.no'),
-							null,
-							offlineStrings.getString('common.confirm')
-						);
-						if (r == 0) {
-							f.remove(false);
-						}
-					}
-				}
-				file.close();
-			} catch(E) {
-				alert(E);
-			}
-		};
-
-		G.auth.on_debug = function(action) {
-			switch(action) {
-				case 'js_console' :
-					G.window.open(urls.XUL_DEBUG_CONSOLE,'testconsole','chrome,resizable');
-				break;
-				case 'clear_cache' :
-					clear_the_cache();
-					alert(offlineStrings.getString('main.on_debug.clear_cache'));
-				break;
-				default:
-					alert(offlineStrings.getString('main.on_debug.debug'));
-				break;
-			}
-		};
-
-		G.auth.init();
-		// XML_HTTP_SERVER will get reset to G.auth.controller.view.server_prompt.value
-
-		/////////////////////////////////////////////////////////////////////////////
-
-		var version = '/xul/server/'.split(/\//)[2];
-		if (version == 'server') {
-			version = 'versionless debug build';
-			document.getElementById('debug_gb').hidden = false;
-		}
+     var f = file2.pick_file( { 'mode' : 'open', 'title' : offlineStrings.getString('main.transaction_import.title')} );
+     if (f && f.exists()) {
+      var i_file = new util.file(''); i_file._file = f;
+      file.write_content( 'truncate', i_file.get_content() );
+      i_file.close();
+      var r = G.error.yns_alert(
+       offlineStrings.getFormattedString('main.transaction_import.delete.prompt', [f.leafName]),
+       offlineStrings.getString('main.transaction_import.success'),
+       offlineStrings.getString('common.yes'),
+       offlineStrings.getString('common.no'),
+       null,
+       offlineStrings.getString('common.confirm')
+      );
+      if (r == 0) {
+       f.remove(false);
+      }
+     }
+    }
+    file.close();
+   } catch(E) {
+    alert(E);
+   }
+  };
+
+  G.auth.on_debug = function(action) {
+   switch(action) {
+    case 'js_console' :
+     G.window.open(urls.XUL_DEBUG_CONSOLE,'testconsole','chrome,resizable');
+    break;
+    case 'clear_cache' :
+     clear_the_cache();
+     alert(offlineStrings.getString('main.on_debug.clear_cache'));
+    break;
+    default:
+     alert(offlineStrings.getString('main.on_debug.debug'));
+    break;
+   }
+  };
+
+  G.auth.init();
+  // XML_HTTP_SERVER will get reset to G.auth.controller.view.server_prompt.value
+
+  /////////////////////////////////////////////////////////////////////////////
+
+  var version = '/xul/server/'.split(/\//)[2];
+  if (version == 'server') {
+   version = 'versionless debug build';
+   document.getElementById('debug_gb').hidden = false;
+  }
 
         if (G.pref && G.pref.getBoolPref('open-ils.debug_options')) {
-			document.getElementById('debug_gb').hidden = false;
+   document.getElementById('debug_gb').hidden = false;
         }
 
         window.title = authStrings.getFormattedString('staff.auth.titlebar.label', version);
-		var x = document.getElementById('about_btn');
-		x.addEventListener(
-			'command',
-			function() {
-				try { 
-					G.window.open('about.html','about','chrome,resizable,width=800,height=600');
-				} catch(E) { alert(E); }
-			}, 
-			false
-		);
-
-		var y = document.getElementById('new_window_btn');
-		y.addEventListener(
-			'command',
-			function() {
-				if (G.data.session) {
-					try {
-						//G.data_xul.g.open_menu();
+  var x = document.getElementById('about_btn');
+  x.addEventListener(
+   'command',
+   function() {
+    try { 
+     G.window.open('about.html','about','chrome,resizable,width=800,height=600');
+    } catch(E) { alert(E); }
+   }, 
+   false
+  );
+
+  var y = document.getElementById('new_window_btn');
+  y.addEventListener(
+   'command',
+   function() {
+    if (G.data.session) {
+     try {
+      //G.data_xul.g.open_menu();
                         netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
                         var mframe = xulG.window.open(( String(urls.XUL_MENU_FRAME).match(/^chrome:/) ? '' : G.data.server ) + urls.XUL_MENU_FRAME
                             + '?server='+window.escape(G.data.server),
                             'main'+xulG.window.window_name_increment(),'chrome,resizable'
                         );
                         mframe.xulG = xulG; 
-					} catch(E) { alert(E); }
-				} else {
-					alert ( offlineStrings.getString('main.new_window_btn.login_first_warning') );
-				}
-			},
-			false
-		);
-
-		JSAN.use('util.mozilla');
-		var z = document.getElementById('locale_menupopup');
-		if (z) {
-			while (z.lastChild) z.removeChild(z.lastChild);
-			var locales = util.mozilla.chromeRegistry().getLocalesForPackage( String( location.href ).split(/\//)[2] );
-			var current_locale = util.mozilla.prefs().getCharPref('general.useragent.locale');
+     } catch(E) { alert(E); }
+    } else {
+     alert ( offlineStrings.getString('main.new_window_btn.login_first_warning') );
+    }
+   },
+   false
+  );
+
+  JSAN.use('util.mozilla');
+  var z = document.getElementById('locale_menupopup');
+  if (z) {
+   while (z.lastChild) z.removeChild(z.lastChild);
+   var locales = util.mozilla.chromeRegistry().getLocalesForPackage( String( location.href ).split(/\//)[2] );
+   var current_locale = util.mozilla.prefs().getCharPref('general.useragent.locale');
             while (locales.hasMore()) {
                 var locale = locales.getNext();
                 var parts = locale.split(/-/);
@@ -356,9 +356,9 @@ function main_init() {
                 } catch(E) {
                     label = locale;
                 }
-				var mi = document.createElement('menuitem');
-				mi.setAttribute('label',label);
-				mi.setAttribute('value',locale);
+    var mi = document.createElement('menuitem');
+    mi.setAttribute('label',label);
+    mi.setAttribute('value',locale);
                 if (locale == current_locale) {
                     if (z.parentNode.tagName == 'menulist') {
                         mi.setAttribute('selected','true');
@@ -368,82 +368,82 @@ function main_init() {
                 }
                 z.appendChild( mi );
             }
-		}
-		var xx = document.getElementById('apply_locale_btn');
-		xx.addEventListener(
-			'command',
-			function() {
-				util.mozilla.change_locale(z.parentNode.value);
-			},
-			false
-		);
-
-		if ( found_ws_info_in_Achrome() && G.pref && G.pref.getBoolPref("open-ils.write_in_user_chrome_directory") ) {
-			//var hbox = x.parentNode; var b = document.createElement('button'); 
-			//b.setAttribute('label','Migrate legacy settings'); hbox.appendChild(b);
-			//b.addEventListener(
-			//	'command',
-			//	function() {
-			//		try {
-			//			handle_migration();
-			//		} catch(E) { alert(E); }
-			//	},
-			//	false
-			//);
-			if (window.confirm(offlineStrings.getString('main.settings.migrate'))) {
-				setTimeout( function() { handle_migration(); }, 0 );
-			}
-		}
-
-	} catch(E) {
-		var error = offlineStrings.getFormattedString('common.exception', [E, '']);
-		try { G.error.sdump('D_ERROR',error); } catch(E) { dump(error); }
-		alert(error);
-	}
-	dump('exiting main_init()\n');
+  }
+  var xx = document.getElementById('apply_locale_btn');
+  xx.addEventListener(
+   'command',
+   function() {
+    util.mozilla.change_locale(z.parentNode.value);
+   },
+   false
+  );
+
+  if ( found_ws_info_in_Achrome() && G.pref && G.pref.getBoolPref("open-ils.write_in_user_chrome_directory") ) {
+   //var hbox = x.parentNode; var b = document.createElement('button'); 
+   //b.setAttribute('label','Migrate legacy settings'); hbox.appendChild(b);
+   //b.addEventListener(
+   // 'command',
+   // function() {
+   //  try {
+   //   handle_migration();
+   //  } catch(E) { alert(E); }
+   // },
+   // false
+   //);
+   if (window.confirm(offlineStrings.getString('main.settings.migrate'))) {
+    setTimeout( function() { handle_migration(); }, 0 );
+   }
+  }
+
+ } catch(E) {
+  var error = offlineStrings.getFormattedString('common.exception', [E, '']);
+  try { G.error.sdump('D_ERROR',error); } catch(E) { dump(error); }
+  alert(error);
+ }
+ dump('exiting main_init()\n');
 }
 
 function found_ws_info_in_Achrome() {
-	JSAN.use('util.file');
-	var f = new util.file();
-	var f_in_chrome = f.get('ws_info','chrome');
-	var path = f_in_chrome.exists() ? f_in_chrome.path : false;
-	f.close();
-	return path;
+ JSAN.use('util.file');
+ var f = new util.file();
+ var f_in_chrome = f.get('ws_info','chrome');
+ var path = f_in_chrome.exists() ? f_in_chrome.path : false;
+ f.close();
+ return path;
 }
 
 function found_ws_info_in_Uchrome() {
-	JSAN.use('util.file');
-	var f = new util.file();
-	var f_in_uchrome = f.get('ws_info','uchrome');
-	var path = f_in_uchrome.exists() ? f_in_uchrome.path : false;
-	f.close();
-	return path;
+ JSAN.use('util.file');
+ var f = new util.file();
+ var f_in_uchrome = f.get('ws_info','uchrome');
+ var path = f_in_uchrome.exists() ? f_in_uchrome.path : false;
+ f.close();
+ return path;
 }
 
 function handle_migration() {
-	if ( found_ws_info_in_Uchrome() ) {
-		alert(offlineStrings.getFormattedString('main.settings.migrate.failed', [found_ws_info_in_Uchrome(), found_ws_info_in_Achrome()])
-		);
-	} else {
-		var dirService = Components.classes["@mozilla.org/file/directory_service;1"].getService( Components.interfaces.nsIProperties );
-		var f_new = dirService.get( "UChrm", Components.interfaces.nsIFile );
-		var f_old = dirService.get( "AChrom", Components.interfaces.nsIFile );
-		f_old.append(myPackageDir); f_old.append("content"); f_old.append("conf"); 
-		if (window.confirm(offlineStrings.getFormattedString("main.settings.migrate.confirm", [f_old.path, f_new.path]))) {
-			var files = f_old.directoryEntries;
-			while (files.hasMoreElements()) {
-				var file = files.getNext();
-				var file2 = file.QueryInterface( Components.interfaces.nsILocalFile );
-				try {
-					file2.moveTo( f_new, '' );
-				} catch(E) {
-					alert(offlineStrings.getFormattedString('main.settings.migrate.error', [file2.path, f_new.path]) + '\n');
-				}
-			}
-			location.href = location.href; // huh?
-		}
-	}
+ if ( found_ws_info_in_Uchrome() ) {
+  alert(offlineStrings.getFormattedString('main.settings.migrate.failed', [found_ws_info_in_Uchrome(), found_ws_info_in_Achrome()])
+  );
+ } else {
+  var dirService = Components.classes["@mozilla.org/file/directory_service;1"].getService( Components.interfaces.nsIProperties );
+  var f_new = dirService.get( "UChrm", Components.interfaces.nsIFile );
+  var f_old = dirService.get( "AChrom", Components.interfaces.nsIFile );
+  f_old.append(myPackageDir); f_old.append("content"); f_old.append("conf"); 
+  if (window.confirm(offlineStrings.getFormattedString("main.settings.migrate.confirm", [f_old.path, f_new.path]))) {
+   var files = f_old.directoryEntries;
+   while (files.hasMoreElements()) {
+    var file = files.getNext();
+    var file2 = file.QueryInterface( Components.interfaces.nsILocalFile );
+    try {
+     file2.moveTo( f_new, '' );
+    } catch(E) {
+     alert(offlineStrings.getFormattedString('main.settings.migrate.error', [file2.path, f_new.path]) + '\n');
+    }
+   }
+   location.href = location.href; // huh?
+  }
+ }
 }
 
 dump('exiting main/main.js\n');
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/main.xul b/Open-ILS/xul/staff_client/chrome/content/main/main.xul
index c7f0ea367d..3f4b5ea7f6 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/main.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/main.xul
@@ -19,170 +19,170 @@
 -->
 
 <window id="main_win" 
-	onload="try { main_init(); } catch(E) { alert(E); }"
-	onunload="try { G.auth.logoff(); } catch(E) { alert(E); }"
-	title="&staff.auth.title;"
-	width="640" height="480"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var G;</script>
-	<script>dump('Loading main/main.xul\n');</script>
-	<scripts id="openils_util_scripts">
-		<script type="text/javascript" src="constants.js" />
-		<script type="text/javascript" src="../OpenILS/util/utils.js" />
-		<script type="text/javascript" src="../OpenILS/util/CGI.js" />
-		<script type="text/javascript" src="../OpenILS/util/md5.js" />
-		<script type="text/javascript" src="../OpenILS/util/JSON_v1.js" />
-		<!--
-		<script type="text/javascript" src="../OpenILS/util/fmall.js" />
-		<script type="text/javascript" src="../OpenILS/util/fmgen.js" />
-		-->
-		<script type="text/javascript" src="../OpenILS/util/RemoteRequest.js" />
-		<!--
-		<script type="text/javascript" src="../OpenILS/util/OrgTree.js" />
-		-->
-		<script type="text/javascript" src="../OpenILS/util/org_utils.js" />   
-	</scripts>
-	<script>dump('Loaded main/main.xul\n');</script>
-
-
-	<script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
-	<script type="text/javascript" src="chrome://open_ils_staff_client/content/main/main.js"/>
-	<script>
-		dump("lang.version = &lang.version;" + '\n');
-	</script>
+ onload="try { main_init(); } catch(E) { alert(E); }"
+ onunload="try { G.auth.logoff(); } catch(E) { alert(E); }"
+ title="&staff.auth.title;"
+ width="640" height="480"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
+ <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var G;</script>
+ <script>dump('Loading main/main.xul\n');</script>
+ <scripts id="openils_util_scripts">
+  <script type="text/javascript" src="constants.js" />
+  <script type="text/javascript" src="../OpenILS/util/utils.js" />
+  <script type="text/javascript" src="../OpenILS/util/CGI.js" />
+  <script type="text/javascript" src="../OpenILS/util/md5.js" />
+  <script type="text/javascript" src="../OpenILS/util/JSON_v1.js" />
+  <!--
+  <script type="text/javascript" src="../OpenILS/util/fmall.js" />
+  <script type="text/javascript" src="../OpenILS/util/fmgen.js" />
+  -->
+  <script type="text/javascript" src="../OpenILS/util/RemoteRequest.js" />
+  <!--
+  <script type="text/javascript" src="../OpenILS/util/OrgTree.js" />
+  -->
+  <script type="text/javascript" src="../OpenILS/util/org_utils.js" />   
+ </scripts>
+ <script>dump('Loaded main/main.xul\n');</script>
+
+
+ <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
+ <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/main.js"/>
+ <script>
+  dump("lang.version = &lang.version;" + '\n');
+ </script>
 
     <script type="text/javascript" src="chrome://venkman/content/venkman-overlay.js"/>
     <script type="application/x-javascript" src="chrome://inspector/content/hooks.js"/>
     <script type="application/x-javascript" src="chrome://chromelist/content/overlay/ChromeListOverlay.js" />
 
-	<messagecatalog id="authStrings" src="chrome://open_ils_staff_client/locale/auth.properties"/>
-	<messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
-
-	<commandset id="auth_cmds">
-		<command id="cmd_login" />
-		<command id="cmd_logoff"/>
-		<command id="cmd_override" />
-		<command id="cmd_close_window"/>
-		<command id="cmd_standalone"/>
-		<command id="cmd_standalone_export"/>
-		<command id="cmd_standalone_import"/>
-		<command id="cmd_js_console"/>
-		<command id="cmd_debugger"/>
-		<command id="cmd_inspector"/>
-		<command id="cmd_chrome_list"/>
-		<command id="cmd_js_shell"/>
-		<command id="cmd_clear_cache"/>
-		<command id="cmd_test_server"/>
-		<command id="cmd_ssl_exception" hidden="true"/>
-	</commandset>
-
-	<keyset id="auth_keys">
-		<key id="auth-login-key" modifiers="accel" key="S" command="cmd_login"/>
-		<key id="auth-logoff-key" modifiers="accel" key="L" command="cmd_logoff"/>
-		<key id="auth-close-key" modifiers="accel" key="Q" command="cmd_close_window"/>
-	</keyset>
-
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- CONTENT -->
-	<deck id="main_deck" flex="1">
-	<groupbox id="main_groupbox" flex="1" style="overflow: auto;">
-		<caption id="main_caption" label="&staff.main.auth.caption;"/>
-		<hbox>
-			<button id="about_btn" label="&staff.auth.about_btn.label;" accesskey="&staff.auth.about_btn.accesskey;" />
-
-			<button id="new_window_btn" label="&staff.auth.new_window_btn.label;" accesskey="&staff.auth.new_window_btn.accesskey;" />
+ <messagecatalog id="authStrings" src="chrome://open_ils_staff_client/locale/auth.properties"/>
+ <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+
+ <commandset id="auth_cmds">
+  <command id="cmd_login" />
+  <command id="cmd_logoff"/>
+  <command id="cmd_override" />
+  <command id="cmd_close_window"/>
+  <command id="cmd_standalone"/>
+  <command id="cmd_standalone_export"/>
+  <command id="cmd_standalone_import"/>
+  <command id="cmd_js_console"/>
+  <command id="cmd_debugger"/>
+  <command id="cmd_inspector"/>
+  <command id="cmd_chrome_list"/>
+  <command id="cmd_js_shell"/>
+  <command id="cmd_clear_cache"/>
+  <command id="cmd_test_server"/>
+  <command id="cmd_ssl_exception" hidden="true"/>
+ </commandset>
+
+ <keyset id="auth_keys">
+  <key id="auth-login-key" modifiers="accel" key="S" command="cmd_login"/>
+  <key id="auth-logoff-key" modifiers="accel" key="L" command="cmd_logoff"/>
+  <key id="auth-close-key" modifiers="accel" key="Q" command="cmd_close_window"/>
+ </keyset>
+
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- CONTENT -->
+ <deck id="main_deck" flex="1">
+ <groupbox id="main_groupbox" flex="1" style="overflow: auto;">
+  <caption id="main_caption" label="&staff.main.auth.caption;"/>
+  <hbox>
+   <button id="about_btn" label="&staff.auth.about_btn.label;" accesskey="&staff.auth.about_btn.accesskey;" />
+
+   <button id="new_window_btn" label="&staff.auth.new_window_btn.label;" accesskey="&staff.auth.new_window_btn.accesskey;" />
 
             <label value="&staff.auth.locale.label;" accesskey="&staff.auth.locale.accesskey;" control="locale_menu"/>
             <menulist id="locale_menu">
                 <menupopup id="locale_menupopup">
                 </menupopup>
             </menulist>
-			<button id="apply_locale_btn" label="&staff.auth.apply_locale_btn.label;" accesskey="&staff.auth.apply_locale_btn.accesskey;" />
-		</hbox>
-		<label value=" "/>
+   <button id="apply_locale_btn" label="&staff.auth.apply_locale_btn.label;" accesskey="&staff.auth.apply_locale_btn.accesskey;" />
+  </hbox>
+  <label value=" "/>
 
 <grid flex="1">
-	<columns><column flex="1"/><column flex="1"/></columns>
-	<rows flex="1">
+ <columns><column flex="1"/><column flex="1"/></columns>
+ <rows flex="1">
 <row flex="1">
-		<groupbox flex="1">
-			<caption label="&staff.main.auth.server;"/>
-			<grid>
-				<columns><column /><column /></columns>
-				<rows>
-					<row>
-						<label value="&staff.main.auth.hostname;" control="server_prompt" accesskey="&staff.main.auth.hostname.accesskey;"/>
-						<vbox>
-							<menulist editable="true" id="server_prompt" flex="1">
+  <groupbox flex="1">
+   <caption label="&staff.main.auth.server;"/>
+   <grid>
+    <columns><column /><column /></columns>
+    <rows>
+     <row>
+      <label value="&staff.main.auth.hostname;" control="server_prompt" accesskey="&staff.main.auth.hostname.accesskey;"/>
+      <vbox>
+       <menulist editable="true" id="server_prompt" flex="1">
                                 <menupopup id="server_menu" />
                             </menulist>
                             <hbox>
-							    <button label="&staff.main.auth.retest;" id="retest" accesskey="&staff.main.auth.retest.accesskey;" command="cmd_test_server"/>
-							    <button label="&staff.main.auth.add_ssl_exception;" id="ssl_exception" command="cmd_ssl_exception"/>
+           <button label="&staff.main.auth.retest;" id="retest" accesskey="&staff.main.auth.retest.accesskey;" command="cmd_test_server"/>
+           <button label="&staff.main.auth.add_ssl_exception;" id="ssl_exception" command="cmd_ssl_exception"/>
                             </hbox>
-						</vbox>
-					</row>
-					<row>
-						<label value="&staff.main.auth.status;"/>
-						<label id="status" />
-					</row>
-					<row>
-						<label value="&staff.main.auth.version;"/>
-						<label id="version" />
-					</row>
-				</rows>
-			</grid>
-		</groupbox>
-
-		<groupbox flex="1">
-			<caption label="&staff.main.auth.workstation;"/>
-			<deck id="ws_deck" flex="1">
-			</deck>
-		</groupbox>
+      </vbox>
+     </row>
+     <row>
+      <label value="&staff.main.auth.status;"/>
+      <label id="status" />
+     </row>
+     <row>
+      <label value="&staff.main.auth.version;"/>
+      <label id="version" />
+     </row>
+    </rows>
+   </grid>
+  </groupbox>
+
+  <groupbox flex="1">
+   <caption label="&staff.main.auth.workstation;"/>
+   <deck id="ws_deck" flex="1">
+   </deck>
+  </groupbox>
 
 </row>
 <row flex="1">
-		<groupbox flex="1">
-			<caption label="&staff.main.authentication.caption;"/>
-			<grid>
-				<columns> <column /> <column /> </columns>
-				<rows>
-					<row> <label value="&common.username;" control="name_prompt" accesskey="&common.username.accesskey;"/> <textbox id="name_prompt" value=""/>
-					</row>
-					<row>
-						<label value="&common.password;" control="password_prompt" accesskey="&common.password.accesskey;"/>
-						<textbox id="password_prompt" value="" type="password"/>
-					</row>
-					<row>
-						<spacer />
-						<hbox>
-							<button id="submit_button" label="&common.login;" accesskey="&common.login.accesskey;" command="cmd_login" />
-							<button label="&staff.auth.logoff_prompt;" accesskey="&staff.auth.logoff_prompt.accesskey;" command="cmd_logoff" />
-						</hbox>
-					</row>
-				</rows>
-			</grid>
-		</groupbox>
-
-		<groupbox flex="1">
-			<caption label="&staff.main.auth.offline.caption;"/>
-			<hbox><button label="&staff.main.auth.offline.interface;" accesskey="&staff.main.auth.offline.interface.accesskey;" command="cmd_standalone"/></hbox>
-			<hbox><button label="&staff.main.auth.offline.export;" command="cmd_standalone_export"/></hbox>
-			<hbox><button label="&staff.main.auth.offline.import;" command="cmd_standalone_import"/></hbox>
-		</groupbox>
+  <groupbox flex="1">
+   <caption label="&staff.main.authentication.caption;"/>
+   <grid>
+    <columns> <column /> <column /> </columns>
+    <rows>
+     <row> <label value="&common.username;" control="name_prompt" accesskey="&common.username.accesskey;"/> <textbox id="name_prompt" value=""/>
+     </row>
+     <row>
+      <label value="&common.password;" control="password_prompt" accesskey="&common.password.accesskey;"/>
+      <textbox id="password_prompt" value="" type="password"/>
+     </row>
+     <row>
+      <spacer />
+      <hbox>
+       <button id="submit_button" label="&common.login;" accesskey="&common.login.accesskey;" command="cmd_login" />
+       <button label="&staff.auth.logoff_prompt;" accesskey="&staff.auth.logoff_prompt.accesskey;" command="cmd_logoff" />
+      </hbox>
+     </row>
+    </rows>
+   </grid>
+  </groupbox>
+
+  <groupbox flex="1">
+   <caption label="&staff.main.auth.offline.caption;"/>
+   <hbox><button label="&staff.main.auth.offline.interface;" accesskey="&staff.main.auth.offline.interface.accesskey;" command="cmd_standalone"/></hbox>
+   <hbox><button label="&staff.main.auth.offline.export;" command="cmd_standalone_export"/></hbox>
+   <hbox><button label="&staff.main.auth.offline.import;" command="cmd_standalone_import"/></hbox>
+  </groupbox>
 </row>
 </rows>
 </grid>
-		<vbox id="progress_space">
-			<progressmeter id="progress_bar" mode="normal" value="0" hidden="true"/>
-		</vbox>
-		<button label="&staff.auth.quit_prompt;" accesskey="&staff.auth.quit_prompt.accesskey;" command="cmd_close_window"/>
-		<groupbox id="debug_gb" flex="1" hidden="true">
-			<caption label="&staff.main.auth.debug.caption;"/>
+  <vbox id="progress_space">
+   <progressmeter id="progress_bar" mode="normal" value="0" hidden="true"/>
+  </vbox>
+  <button label="&staff.auth.quit_prompt;" accesskey="&staff.auth.quit_prompt.accesskey;" command="cmd_close_window"/>
+  <groupbox id="debug_gb" flex="1" hidden="true">
+   <caption label="&staff.main.auth.debug.caption;"/>
             <hbox>
                 <arrowscrollbox orient="horizontal" flex="1">
                     <button label="&staff.main.auth.debug.javascript;" accesskey="&staff.main.auth.debug.javascript.accesskey;" command="cmd_js_console"/>
@@ -193,10 +193,10 @@
                     <button label="&staff.main.auth.debug.clear;" accesskey="&staff.main.auth.debug.clear.accesskey;" command="cmd_clear_cache"/>
                 </arrowscrollbox>
             </hbox>
-		</groupbox>
+  </groupbox>
 
-	</groupbox>
-	</deck>
+ </groupbox>
+ </deck>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu.js b/Open-ILS/xul/staff_client/chrome/content/main/menu.js
index 4663f32726..b2fa6073b5 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu.js
@@ -8,10 +8,10 @@ main.menu = function () {
 
     netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
     offlineStrings = document.getElementById('offlineStrings');
-	JSAN.use('util.error'); this.error = new util.error();
-	JSAN.use('util.window'); this.window = new util.window();
+ JSAN.use('util.error'); this.error = new util.error();
+ JSAN.use('util.window'); this.window = new util.window();
 
-	this.w = window;
+ this.w = window;
     var x = document.getElementById('network_progress');
     x.setAttribute('count','0');
     x.addEventListener(
@@ -27,32 +27,32 @@ main.menu = function () {
         false
     );
 
-	if (xulG.pref.getBoolPref('open-ils.disable_accesskeys_on_tabs')) {
-		var tabs = document.getElementById('main_tabs');
-		for (var i = 0; i < tabs.childNodes.length; i++) {
-			tabs.childNodes[i].setAttribute('accesskey','');
-		}
-	}
+ if (xulG.pref.getBoolPref('open-ils.disable_accesskeys_on_tabs')) {
+  var tabs = document.getElementById('main_tabs');
+  for (var i = 0; i < tabs.childNodes.length; i++) {
+   tabs.childNodes[i].setAttribute('accesskey','');
+  }
+ }
 }
 
 main.menu.prototype = {
 
-	'id_incr' : 0,
+ 'id_incr' : 0,
 
-	'url_prefix' : function(url) {
-		if (url.match(/^\//)) url = urls.remote + url;
-		if (! url.match(/^(http|chrome):\/\//) && ! url.match(/^data:/) ) url = 'http://' + url;
-		dump('url_prefix = ' + url + '\n');
-		return url;
-	},
+ 'url_prefix' : function(url) {
+  if (url.match(/^\//)) url = urls.remote + url;
+  if (! url.match(/^(http|chrome):\/\//) && ! url.match(/^data:/) ) url = 'http://' + url;
+  dump('url_prefix = ' + url + '\n');
+  return url;
+ },
 
-	'init' : function( params ) {
+ 'init' : function( params ) {
 
-		urls.remote = params['server'];
+  urls.remote = params['server'];
 
-		var obj = this;
+  var obj = this;
 
-		JSAN.use('OpenILS.data'); obj.data = new OpenILS.data(); obj.data.init({'via':'stash'});
+  JSAN.use('OpenILS.data'); obj.data = new OpenILS.data(); obj.data.init({'via':'stash'});
 
         var button_bar = String( obj.data.hash.aous['ui.general.button_bar'] ) == 'true';
         if (button_bar) {
@@ -117,126 +117,126 @@ main.menu.prototype = {
         }
 
 
-		var cmd_map = {
-			'cmd_broken' : [
-				['oncommand'],
-				function() { alert(offlineStrings.getString('common.unimplemented')); }
-			],
-
-			/* File Menu */
-			'cmd_close_window' : [ 
-				['oncommand'], 
-				function() { window.close(); } 
-			],
-			'cmd_new_window' : [
-				['oncommand'],
-				function() {
-					obj.data.stash_retrieve();
-					var mframe = obj.window.open(
-						obj.url_prefix(urls.XUL_MENU_FRAME)
-						+ '?server='+window.escape(urls.remote),
-						'main' + obj.window.window_name_increment(),
-						'chrome,resizable'); 
+  var cmd_map = {
+   'cmd_broken' : [
+    ['oncommand'],
+    function() { alert(offlineStrings.getString('common.unimplemented')); }
+   ],
+
+   /* File Menu */
+   'cmd_close_window' : [ 
+    ['oncommand'], 
+    function() { window.close(); } 
+   ],
+   'cmd_new_window' : [
+    ['oncommand'],
+    function() {
+     obj.data.stash_retrieve();
+     var mframe = obj.window.open(
+      obj.url_prefix(urls.XUL_MENU_FRAME)
+      + '?server='+window.escape(urls.remote),
+      'main' + obj.window.window_name_increment(),
+      'chrome,resizable'); 
                     netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
                     mframe.xulG = xulG;
-				}
-			],
-			'cmd_new_tab' : [
-				['oncommand'],
-				function() { obj.new_tab(null,{'focus':true},null); }
-			],
-			'cmd_close_tab' : [
-				['oncommand'],
-				function() { obj.close_tab(); }
-			],
-			'cmd_close_all_tabs' : [
-				['oncommand'],
-				function() { obj.close_all_tabs(); }
-			],
-
-			/* Edit Menu */
-			'cmd_edit_copy_buckets' : [
-				['oncommand'],
-				function() {
-					obj.data.stash_retrieve();
-					obj.set_tab(obj.url_prefix(urls.XUL_COPY_BUCKETS),{'tab_name':offlineStrings.getString('menu.cmd_edit_copy_buckets.tab')},{});
-				}
-			],
-			'cmd_edit_volume_buckets' : [
-				['oncommand'],
-				function() {
-					obj.data.stash_retrieve();
-					obj.set_tab(obj.url_prefix(urls.XUL_VOLUME_BUCKETS),{'tab_name':offlineStrings.getString('menu.cmd_edit_volume_buckets.tab')},{});
-				}
-			],
-			'cmd_edit_record_buckets' : [
-				['oncommand'],
-				function() {
-					obj.data.stash_retrieve();
-					obj.set_tab(obj.url_prefix(urls.XUL_RECORD_BUCKETS),{'tab_name':offlineStrings.getString('menu.cmd_edit_record_buckets.tab')},{});
-				}
-			],
-			'cmd_edit_user_buckets' : [
-				['oncommand'],
-				function() {
-					obj.data.stash_retrieve();
-					obj.set_tab(obj.url_prefix(urls.XUL_USER_BUCKETS),{'tab_name':offlineStrings.getString('menu.cmd_edit_user_buckets.tab')},{});
-				}
-			],
-
-
-			'cmd_replace_barcode' : [
-				['oncommand'],
-				function() {
-					try {
-						JSAN.use('util.network');
-						var network = new util.network();
-
-						var old_bc = window.prompt(offlineStrings.getString('menu.cmd_replace_barcode.prompt'),'',offlineStrings.getString('menu.cmd_replace_barcode.label'));
-						if (!old_bc) return;
-	
-						var copy;
+    }
+   ],
+   'cmd_new_tab' : [
+    ['oncommand'],
+    function() { obj.new_tab(null,{'focus':true},null); }
+   ],
+   'cmd_close_tab' : [
+    ['oncommand'],
+    function() { obj.close_tab(); }
+   ],
+   'cmd_close_all_tabs' : [
+    ['oncommand'],
+    function() { obj.close_all_tabs(); }
+   ],
+
+   /* Edit Menu */
+   'cmd_edit_copy_buckets' : [
+    ['oncommand'],
+    function() {
+     obj.data.stash_retrieve();
+     obj.set_tab(obj.url_prefix(urls.XUL_COPY_BUCKETS),{'tab_name':offlineStrings.getString('menu.cmd_edit_copy_buckets.tab')},{});
+    }
+   ],
+   'cmd_edit_volume_buckets' : [
+    ['oncommand'],
+    function() {
+     obj.data.stash_retrieve();
+     obj.set_tab(obj.url_prefix(urls.XUL_VOLUME_BUCKETS),{'tab_name':offlineStrings.getString('menu.cmd_edit_volume_buckets.tab')},{});
+    }
+   ],
+   'cmd_edit_record_buckets' : [
+    ['oncommand'],
+    function() {
+     obj.data.stash_retrieve();
+     obj.set_tab(obj.url_prefix(urls.XUL_RECORD_BUCKETS),{'tab_name':offlineStrings.getString('menu.cmd_edit_record_buckets.tab')},{});
+    }
+   ],
+   'cmd_edit_user_buckets' : [
+    ['oncommand'],
+    function() {
+     obj.data.stash_retrieve();
+     obj.set_tab(obj.url_prefix(urls.XUL_USER_BUCKETS),{'tab_name':offlineStrings.getString('menu.cmd_edit_user_buckets.tab')},{});
+    }
+   ],
+
+
+   'cmd_replace_barcode' : [
+    ['oncommand'],
+    function() {
+     try {
+      JSAN.use('util.network');
+      var network = new util.network();
+
+      var old_bc = window.prompt(offlineStrings.getString('menu.cmd_replace_barcode.prompt'),'',offlineStrings.getString('menu.cmd_replace_barcode.label'));
+      if (!old_bc) return;
+ 
+      var copy;
                         try {
                             copy = network.simple_request('FM_ACP_RETRIEVE_VIA_BARCODE',[ old_bc ]);
-    						if (typeof copy.ilsevent != 'undefined') throw(copy); 
-    						if (!copy) throw(copy);
+          if (typeof copy.ilsevent != 'undefined') throw(copy); 
+          if (!copy) throw(copy);
                         } catch(E) {
                             alert(offlineStrings.getFormattedString('menu.cmd_replace_barcode.retrieval.error', [old_bc]) + '\n');
                             return;
                         }
-	
-						// Why did I want to do this twice?  Because this copy is more fleshed?
+ 
+      // Why did I want to do this twice?  Because this copy is more fleshed?
                         try {
-    						copy = network.simple_request('FM_ACP_RETRIEVE',[ copy.id() ]);
-    						if (typeof copy.ilsevent != 'undefined') throw(copy);
-    						if (!copy) throw(copy);
+          copy = network.simple_request('FM_ACP_RETRIEVE',[ copy.id() ]);
+          if (typeof copy.ilsevent != 'undefined') throw(copy);
+          if (!copy) throw(copy);
                         } catch(E) {
                             try { alert(offlineStrings.getFormattedString('menu.cmd_replace_barcode.retrieval.error', [old_bc]) + '\n' + (typeof E.ilsevent == 'undefined' ? '' : E.textcode + ' : ' + E.desc)); } catch(F) { alert(E + '\n' + F); }
                             return;
                         }
-	
-						var new_bc = window.prompt(offlineStrings.getString('menu.cmd_replace_barcode.replacement.prompt'),'',offlineStrings.getString('menu.cmd_replace_barcode.replacement.label'));
-						new_bc = String( new_bc ).replace(/\s/g,'');
-						/* Casting a possibly null input value to a String turns it into "null" */
-						if (!new_bc || new_bc == 'null') {
-							alert(offlineStrings.getString('menu.cmd_replace_barcode.blank.error'));
-							return;
-						}
-	
-						var test = network.simple_request('FM_ACP_RETRIEVE_VIA_BARCODE',[ new_bc ]);
-						if (typeof test.ilsevent == 'undefined') {
-    						alert(offlineStrings.getFormattedString('menu.cmd_replace_barcode.duplicate.error', [new_bc]));
-							return;
-						} else {
-							if (test.ilsevent != 1502 /* ASSET_COPY_NOT_FOUND */) {
-						        obj.error.standard_unexpected_error_alert(offlineStrings.getFormattedString('menu.cmd_replace_barcode.testing.error', [new_bc]),test);
-								return;
-							}	
-						}
-
-						copy.barcode(new_bc); copy.ischanged('1');
-						var r = network.simple_request('FM_ACP_FLESHED_BATCH_UPDATE', [ ses(), [ copy ] ]);
-						if (typeof r.ilsevent != 'undefined') { 
+ 
+      var new_bc = window.prompt(offlineStrings.getString('menu.cmd_replace_barcode.replacement.prompt'),'',offlineStrings.getString('menu.cmd_replace_barcode.replacement.label'));
+      new_bc = String( new_bc ).replace(/\s/g,'');
+      /* Casting a possibly null input value to a String turns it into "null" */
+      if (!new_bc || new_bc == 'null') {
+       alert(offlineStrings.getString('menu.cmd_replace_barcode.blank.error'));
+       return;
+      }
+ 
+      var test = network.simple_request('FM_ACP_RETRIEVE_VIA_BARCODE',[ new_bc ]);
+      if (typeof test.ilsevent == 'undefined') {
+          alert(offlineStrings.getFormattedString('menu.cmd_replace_barcode.duplicate.error', [new_bc]));
+       return;
+      } else {
+       if (test.ilsevent != 1502 /* ASSET_COPY_NOT_FOUND */) {
+              obj.error.standard_unexpected_error_alert(offlineStrings.getFormattedString('menu.cmd_replace_barcode.testing.error', [new_bc]),test);
+        return;
+       } 
+      }
+
+      copy.barcode(new_bc); copy.ischanged('1');
+      var r = network.simple_request('FM_ACP_FLESHED_BATCH_UPDATE', [ ses(), [ copy ] ]);
+      if (typeof r.ilsevent != 'undefined') { 
                             if (r.ilsevent != 0) {
                                 if (r.ilsevent == 5000 /* PERM_FAILURE */) {
                                     alert(offlineStrings.getString('menu.cmd_replace_barcode.permission.error'));
@@ -245,224 +245,224 @@ main.menu.prototype = {
                                 }
                             }
                         }
-					} catch(E) {
-						obj.error.standard_unexpected_error_alert(offlineStrings.getString('menu.cmd_replace_barcode.renaming.failure'),copy);
-					}
-				}
-			],
-
-			/* Search Menu */
-			'cmd_patron_search' : [
-				['oncommand'],
-				function() {
+     } catch(E) {
+      obj.error.standard_unexpected_error_alert(offlineStrings.getString('menu.cmd_replace_barcode.renaming.failure'),copy);
+     }
+    }
+   ],
+
+   /* Search Menu */
+   'cmd_patron_search' : [
+    ['oncommand'],
+    function() {
                     obj.set_patron_tab();
-				}
-			],
-			'cmd_search_opac' : [
-				['oncommand'],
-				function() {
-					obj.data.stash_retrieve();
-					var content_params = { 'session' : ses(), 'authtime' : ses('authtime') };
-					obj.set_tab(obj.url_prefix(urls.XUL_OPAC_WRAPPER), {'tab_name':offlineStrings.getString('menu.cmd_search_opac.tab')}, content_params);
-				}
-			],
-			'cmd_search_tcn' : [
-				['oncommand'],
-				function() {
-					var tcn = prompt(offlineStrings.getString('menu.cmd_search_tcn.tab'),'',offlineStrings.getString('menu.cmd_search_tcn.prompt'));
-
-					function spawn_tcn(r) {
-						for (var i = 0; i < r.count; i++) {
-							var id = r.ids[i];
-							var opac_url = obj.url_prefix( urls.opac_rdetail ) + '?r=' + id;
-							obj.data.stash_retrieve();
-							var content_params = { 
-								'session' : ses(), 
-								'authtime' : ses('authtime'),
-								'opac_url' : opac_url,
-							};
-							if (i == 0) {
-								obj.set_tab(
-									obj.url_prefix(urls.XUL_OPAC_WRAPPER), 
-									{'tab_name':tcn}, 
-									content_params
-								);
-							} else {
-								obj.new_tab(
-									obj.url_prefix(urls.XUL_OPAC_WRAPPER), 
-									{'tab_name':tcn}, 
-									content_params
-								);
-							}
-						}
-					}
-
-					if (tcn) {
-						JSAN.use('util.network');
-						var network = new util.network();
-						var robj = network.simple_request('FM_BRE_ID_SEARCH_VIA_TCN',[tcn]);
-						if (robj.count != robj.ids.length) throw('FIXME -- FM_BRE_ID_SEARCH_VIA_TCN = ' + js2JSON(robj));
-						if (robj.count == 0) {
-							var robj2 = network.simple_request('FM_BRE_ID_SEARCH_VIA_TCN',[tcn,1]);
-							if (robj2.count == 0) {
-								alert(offlineStrings.getFormattedString('menu.cmd_search_tcn.not_found.error', [tcn]));
-							} else {
-								if ( window.confirm(offlineStrings.getFormattedString('menu.cmd_search_tcn.deleted.error', [tcn])) ) {
-									spawn_tcn(robj2);
-								}
-							}
-						} else {
-							spawn_tcn(robj);
-						}
-					}
-				}
-			],
-			'cmd_search_bib_id' : [
-				['oncommand'],
-				function() {
-					var bib_id = prompt(offlineStrings.getString('menu.cmd_search_bib_id.tab'),'',offlineStrings.getString('menu.cmd_search_bib_id.prompt'));
+    }
+   ],
+   'cmd_search_opac' : [
+    ['oncommand'],
+    function() {
+     obj.data.stash_retrieve();
+     var content_params = { 'session' : ses(), 'authtime' : ses('authtime') };
+     obj.set_tab(obj.url_prefix(urls.XUL_OPAC_WRAPPER), {'tab_name':offlineStrings.getString('menu.cmd_search_opac.tab')}, content_params);
+    }
+   ],
+   'cmd_search_tcn' : [
+    ['oncommand'],
+    function() {
+     var tcn = prompt(offlineStrings.getString('menu.cmd_search_tcn.tab'),'',offlineStrings.getString('menu.cmd_search_tcn.prompt'));
+
+     function spawn_tcn(r) {
+      for (var i = 0; i < r.count; i++) {
+       var id = r.ids[i];
+       var opac_url = obj.url_prefix( urls.opac_rdetail ) + '?r=' + id;
+       obj.data.stash_retrieve();
+       var content_params = { 
+        'session' : ses(), 
+        'authtime' : ses('authtime'),
+        'opac_url' : opac_url,
+       };
+       if (i == 0) {
+        obj.set_tab(
+         obj.url_prefix(urls.XUL_OPAC_WRAPPER), 
+         {'tab_name':tcn}, 
+         content_params
+        );
+       } else {
+        obj.new_tab(
+         obj.url_prefix(urls.XUL_OPAC_WRAPPER), 
+         {'tab_name':tcn}, 
+         content_params
+        );
+       }
+      }
+     }
+
+     if (tcn) {
+      JSAN.use('util.network');
+      var network = new util.network();
+      var robj = network.simple_request('FM_BRE_ID_SEARCH_VIA_TCN',[tcn]);
+      if (robj.count != robj.ids.length) throw('FIXME -- FM_BRE_ID_SEARCH_VIA_TCN = ' + js2JSON(robj));
+      if (robj.count == 0) {
+       var robj2 = network.simple_request('FM_BRE_ID_SEARCH_VIA_TCN',[tcn,1]);
+       if (robj2.count == 0) {
+        alert(offlineStrings.getFormattedString('menu.cmd_search_tcn.not_found.error', [tcn]));
+       } else {
+        if ( window.confirm(offlineStrings.getFormattedString('menu.cmd_search_tcn.deleted.error', [tcn])) ) {
+         spawn_tcn(robj2);
+        }
+       }
+      } else {
+       spawn_tcn(robj);
+      }
+     }
+    }
+   ],
+   'cmd_search_bib_id' : [
+    ['oncommand'],
+    function() {
+     var bib_id = prompt(offlineStrings.getString('menu.cmd_search_bib_id.tab'),'',offlineStrings.getString('menu.cmd_search_bib_id.prompt'));
                     if (!bib_id) return;
 
-					var opac_url = obj.url_prefix( urls.opac_rdetail ) + '?r=' + bib_id;
-					var content_params = { 
-						'session' : ses(), 
-						'authtime' : ses('authtime'),
-						'opac_url' : opac_url,
-					};
-					obj.set_tab(
-						obj.url_prefix(urls.XUL_OPAC_WRAPPER), 
-						{'tab_name':'#' + bib_id}, 
-						content_params
-					);
-				}
-			],
-			'cmd_copy_status' : [
-				['oncommand'],
-				function() {
-					obj.data.stash_retrieve();
-					obj.set_tab(obj.url_prefix(urls.XUL_COPY_STATUS),{},{});
-				}
-			],
-
-			/* Circulation Menu */
-			'cmd_patron_register' : [
-				['oncommand'],
-				function() {
-								function spawn_editor(p) {
-									var url = urls.XUL_PATRON_EDIT;
-									var param_count = 0;
-									for (var i in p) {
-										if (param_count++ == 0) url += '?'; else url += '&';
-										url += i + '=' + window.escape(p[i]);
-									}
-									var loc = obj.url_prefix( urls.XUL_BROWSER ) + '?url=' + window.escape( obj.url_prefix(url) );
-									obj.new_tab(
-										loc, 
-										{}, 
-										{ 
-											'show_print_button' : true , 
-											'tab_name' : offline.getString('menu.cmd_patron_register.related.tab'),
-											'passthru_content_params' : {
-												'spawn_search' : function(s) { obj.spawn_search(s); },
-												'spawn_editor' : spawn_editor,
-											}
-										}
-									);
-								}
-
-					obj.data.stash_retrieve();
-					var loc = obj.url_prefix( urls.XUL_BROWSER ) 
-						+ '?url=' + window.escape( obj.url_prefix(urls.XUL_PATRON_EDIT) + '?ses=' + window.escape( ses() ) );
-					obj.set_tab(
-						loc, 
-						{}, 
-						{ 
-							'show_print_button' : true , 
-							'tab_name' : offlineStrings.getString('menu.cmd_patron_register.tab'),
-							'passthru_content_params' : {
-								'spawn_search' : function(s) { obj.spawn_search(s); },
-								'spawn_editor' : spawn_editor,
-							}
-						}
-					);
-				}
-			],
-			'cmd_circ_checkin' : [
-				['oncommand'],
-				function() { 
-					obj.data.stash_retrieve();
-					obj.set_tab(obj.url_prefix(urls.XUL_CHECKIN),{},{});
-				}
-			],
-			'cmd_circ_checkout' : [
-				['oncommand'],
-				function() { 
-					obj.data.stash_retrieve();
-					obj.set_tab(obj.url_prefix(urls.XUL_PATRON_BARCODE_ENTRY),{},{});
-				}
-			],
-			'cmd_circ_hold_capture' : [
-				['oncommand'],
-				function() { 
-					obj.data.stash_retrieve();
-					obj.set_tab(obj.url_prefix(urls.XUL_CHECKIN)+'?hold_capture=1',{},{});
-				}
-			],
-			'cmd_browse_holds' : [
-				['oncommand'],
-				function() { 
-					obj.data.stash_retrieve();
-					obj.set_tab(obj.url_prefix(urls.XUL_HOLDS_BROWSER),{ 'tab_name' : offlineStrings.getString('menu.cmd_browse_holds.tab') },{});
-				}
-			],
-			'cmd_browse_holds_shelf' : [
-				['oncommand'],
-				function() { 
-					obj.data.stash_retrieve();
-					obj.set_tab(obj.url_prefix(urls.XUL_HOLDS_BROWSER)+'?shelf=1',{ 'tab_name' : offlineStrings.getString('menu.cmd_browse_holds_shelf.tab') },{});
-				}
-			],
-			'cmd_circ_hold_pull_list' : [
-				['oncommand'],
-				function() { 
-					obj.data.stash_retrieve();
-					var loc = urls.XUL_BROWSER + '?url=' + window.escape(
-						obj.url_prefix(urls.XUL_HOLD_PULL_LIST) + '?ses='+window.escape(ses())
-					);
-					obj.set_tab( loc, {'tab_name' : offlineStrings.getString('menu.cmd_browse_hold_pull_list.tab')}, { 'show_print_button' : true } );
-				}
-			],
-
-			'cmd_in_house_use' : [
-				['oncommand'],
-				function() { 
-					obj.data.stash_retrieve();
-					obj.set_tab(obj.url_prefix(urls.XUL_IN_HOUSE_USE),{},{});
-				}
-			],
-
-			'cmd_standalone' : [
-				['oncommand'],
-				function() { 
-					obj.set_tab(obj.url_prefix(urls.XUL_STANDALONE),{},{});
-				}
-			],
-
-			'cmd_local_admin' : [
-				['oncommand'],
-				function() { 
-					//obj.set_tab(obj.url_prefix(urls.XUL_LOCAL_ADMIN)+'?ses='+window.escape(ses())+'&session='+window.escape(ses()),{},{});
-					var loc = urls.XUL_BROWSER + '?url=' + window.escape(
+     var opac_url = obj.url_prefix( urls.opac_rdetail ) + '?r=' + bib_id;
+     var content_params = { 
+      'session' : ses(), 
+      'authtime' : ses('authtime'),
+      'opac_url' : opac_url,
+     };
+     obj.set_tab(
+      obj.url_prefix(urls.XUL_OPAC_WRAPPER), 
+      {'tab_name':'#' + bib_id}, 
+      content_params
+     );
+    }
+   ],
+   'cmd_copy_status' : [
+    ['oncommand'],
+    function() {
+     obj.data.stash_retrieve();
+     obj.set_tab(obj.url_prefix(urls.XUL_COPY_STATUS),{},{});
+    }
+   ],
+
+   /* Circulation Menu */
+   'cmd_patron_register' : [
+    ['oncommand'],
+    function() {
+        function spawn_editor(p) {
+         var url = urls.XUL_PATRON_EDIT;
+         var param_count = 0;
+         for (var i in p) {
+          if (param_count++ == 0) url += '?'; else url += '&';
+          url += i + '=' + window.escape(p[i]);
+         }
+         var loc = obj.url_prefix( urls.XUL_BROWSER ) + '?url=' + window.escape( obj.url_prefix(url) );
+         obj.new_tab(
+          loc, 
+          {}, 
+          { 
+           'show_print_button' : true , 
+           'tab_name' : offline.getString('menu.cmd_patron_register.related.tab'),
+           'passthru_content_params' : {
+            'spawn_search' : function(s) { obj.spawn_search(s); },
+            'spawn_editor' : spawn_editor,
+           }
+          }
+         );
+        }
+
+     obj.data.stash_retrieve();
+     var loc = obj.url_prefix( urls.XUL_BROWSER ) 
+      + '?url=' + window.escape( obj.url_prefix(urls.XUL_PATRON_EDIT) + '?ses=' + window.escape( ses() ) );
+     obj.set_tab(
+      loc, 
+      {}, 
+      { 
+       'show_print_button' : true , 
+       'tab_name' : offlineStrings.getString('menu.cmd_patron_register.tab'),
+       'passthru_content_params' : {
+        'spawn_search' : function(s) { obj.spawn_search(s); },
+        'spawn_editor' : spawn_editor,
+       }
+      }
+     );
+    }
+   ],
+   'cmd_circ_checkin' : [
+    ['oncommand'],
+    function() { 
+     obj.data.stash_retrieve();
+     obj.set_tab(obj.url_prefix(urls.XUL_CHECKIN),{},{});
+    }
+   ],
+   'cmd_circ_checkout' : [
+    ['oncommand'],
+    function() { 
+     obj.data.stash_retrieve();
+     obj.set_tab(obj.url_prefix(urls.XUL_PATRON_BARCODE_ENTRY),{},{});
+    }
+   ],
+   'cmd_circ_hold_capture' : [
+    ['oncommand'],
+    function() { 
+     obj.data.stash_retrieve();
+     obj.set_tab(obj.url_prefix(urls.XUL_CHECKIN)+'?hold_capture=1',{},{});
+    }
+   ],
+   'cmd_browse_holds' : [
+    ['oncommand'],
+    function() { 
+     obj.data.stash_retrieve();
+     obj.set_tab(obj.url_prefix(urls.XUL_HOLDS_BROWSER),{ 'tab_name' : offlineStrings.getString('menu.cmd_browse_holds.tab') },{});
+    }
+   ],
+   'cmd_browse_holds_shelf' : [
+    ['oncommand'],
+    function() { 
+     obj.data.stash_retrieve();
+     obj.set_tab(obj.url_prefix(urls.XUL_HOLDS_BROWSER)+'?shelf=1',{ 'tab_name' : offlineStrings.getString('menu.cmd_browse_holds_shelf.tab') },{});
+    }
+   ],
+   'cmd_circ_hold_pull_list' : [
+    ['oncommand'],
+    function() { 
+     obj.data.stash_retrieve();
+     var loc = urls.XUL_BROWSER + '?url=' + window.escape(
+      obj.url_prefix(urls.XUL_HOLD_PULL_LIST) + '?ses='+window.escape(ses())
+     );
+     obj.set_tab( loc, {'tab_name' : offlineStrings.getString('menu.cmd_browse_hold_pull_list.tab')}, { 'show_print_button' : true } );
+    }
+   ],
+
+   'cmd_in_house_use' : [
+    ['oncommand'],
+    function() { 
+     obj.data.stash_retrieve();
+     obj.set_tab(obj.url_prefix(urls.XUL_IN_HOUSE_USE),{},{});
+    }
+   ],
+
+   'cmd_standalone' : [
+    ['oncommand'],
+    function() { 
+     obj.set_tab(obj.url_prefix(urls.XUL_STANDALONE),{},{});
+    }
+   ],
+
+   'cmd_local_admin' : [
+    ['oncommand'],
+    function() { 
+     //obj.set_tab(obj.url_prefix(urls.XUL_LOCAL_ADMIN)+'?ses='+window.escape(ses())+'&session='+window.escape(ses()),{},{});
+     var loc = urls.XUL_BROWSER + '?url=' + window.escape(
                         obj.url_prefix( urls.XUL_LOCAL_ADMIN+'?ses='+window.escape(ses())+'&session='+window.escape(ses()) )
-					);
-					obj.set_tab( 
-						loc, 
-						{'tab_name' : offlineStrings.getString('menu.cmd_local_admin.tab'), 'browser' : false }, 
-						{ 'no_xulG' : false, 'show_nav_buttons' : true, 'show_print_button' : true } 
-					);
+     );
+     obj.set_tab( 
+      loc, 
+      {'tab_name' : offlineStrings.getString('menu.cmd_local_admin.tab'), 'browser' : false }, 
+      { 'no_xulG' : false, 'show_nav_buttons' : true, 'show_print_button' : true } 
+     );
 
-				}
-			],
+    }
+   ],
 
             'cmd_toggle_buttonbar' : [
                 ['oncommand'],
@@ -472,21 +472,21 @@ main.menu.prototype = {
                 }
             ],
 
-			'cmd_local_admin_reports' : [
-				['oncommand'],
-				function() { 
-					var loc = urls.XUL_BROWSER + '?url=' + window.escape( obj.url_prefix(urls.XUL_REPORTS) + '?ses=' + ses());
-					obj.set_tab( 
-						loc, 
-						{'tab_name' : offlineStrings.getString('menu.cmd_local_admin_reports.tab'), 'browser' : false }, 
-						{'no_xulG' : false, 'show_print_button' : false, show_nav_buttons : true } 
-					);
-				}
-			],
-			'cmd_open_vandelay' : [
-				['oncommand'],
+   'cmd_local_admin_reports' : [
+    ['oncommand'],
+    function() { 
+     var loc = urls.XUL_BROWSER + '?url=' + window.escape( obj.url_prefix(urls.XUL_REPORTS) + '?ses=' + ses());
+     obj.set_tab( 
+      loc, 
+      {'tab_name' : offlineStrings.getString('menu.cmd_local_admin_reports.tab'), 'browser' : false }, 
+      {'no_xulG' : false, 'show_print_button' : false, show_nav_buttons : true } 
+     );
+    }
+   ],
+   'cmd_open_vandelay' : [
+    ['oncommand'],
                 function() { open_eg_web_page('vandelay/vandelay'); }
-			],
+   ],
             'cmd_local_admin_transit_list' : [
                 ['oncommand'],
                 function() { open_admin_page('transit_list.xul', 'menu.cmd_local_admin_transit_list.tab'); }
@@ -589,526 +589,526 @@ main.menu.prototype = {
                 ['oncommand'],
                 function() { open_eg_web_page('conify/global/config/circ_modifier'); }
             ],
-			'cmd_acq_view_picklist' : [
-				['oncommand'],
-				function() { open_eg_web_page('acq/picklist/list', 'menu.cmd_acq_view_picklist.tab'); }
-			],
-			'cmd_acq_view_po' : [
-				['oncommand'],
-				function() { open_eg_web_page('acq/po/search', 'menu.cmd_acq_view_po.tab'); }
-			],
-			'cmd_acq_upload' : [
-				['oncommand'],
-				function() { open_eg_web_page('acq/picklist/upload', 'menu.cmd_acq_upload.tab'); }
-			],
-			'cmd_acq_bib_search' : [
-				['oncommand'],
-				function() { open_eg_web_page('acq/picklist/bib_search', 'menu.cmd_acq_bib_search.tab'); }
-			],
-			'cmd_acq_new_brief_record' : [
-				['oncommand'],
-				function() { open_eg_web_page('acq/picklist/brief_record', 'menu.cmd_acq_new_brief_record.tab'); }
-			],
+   'cmd_acq_view_picklist' : [
+    ['oncommand'],
+    function() { open_eg_web_page('acq/picklist/list', 'menu.cmd_acq_view_picklist.tab'); }
+   ],
+   'cmd_acq_view_po' : [
+    ['oncommand'],
+    function() { open_eg_web_page('acq/po/search', 'menu.cmd_acq_view_po.tab'); }
+   ],
+   'cmd_acq_upload' : [
+    ['oncommand'],
+    function() { open_eg_web_page('acq/picklist/upload', 'menu.cmd_acq_upload.tab'); }
+   ],
+   'cmd_acq_bib_search' : [
+    ['oncommand'],
+    function() { open_eg_web_page('acq/picklist/bib_search', 'menu.cmd_acq_bib_search.tab'); }
+   ],
+   'cmd_acq_new_brief_record' : [
+    ['oncommand'],
+    function() { open_eg_web_page('acq/picklist/brief_record', 'menu.cmd_acq_new_brief_record.tab'); }
+   ],
             'cmd_acq_view_fund' : [
-				['oncommand'],
-				function() { open_eg_web_page('acq/fund/list', 'menu.cmd_acq_view_fund.tab'); }
-			],
+    ['oncommand'],
+    function() { open_eg_web_page('acq/fund/list', 'menu.cmd_acq_view_fund.tab'); }
+   ],
             'cmd_acq_view_funding_source' : [
-				['oncommand'],
-				function() { open_eg_web_page('acq/funding_source/list', 'menu.cmd_acq_view_funding_source.tab'); }
-			],
+    ['oncommand'],
+    function() { open_eg_web_page('acq/funding_source/list', 'menu.cmd_acq_view_funding_source.tab'); }
+   ],
             'cmd_acq_view_provider' : [
-				['oncommand'],
-				function() { open_eg_web_page('conify/global/acq/provider', 'menu.cmd_acq_view_provider.tab'); }
-			],
+    ['oncommand'],
+    function() { open_eg_web_page('conify/global/acq/provider', 'menu.cmd_acq_view_provider.tab'); }
+   ],
             'cmd_acq_view_currency_type' : [
-				['oncommand'],
-				function() { open_eg_web_page('acq/currency_type/list', 'menu.cmd_acq_view_currency_type.tab'); }
-			],
+    ['oncommand'],
+    function() { open_eg_web_page('acq/currency_type/list', 'menu.cmd_acq_view_currency_type.tab'); }
+   ],
             'cmd_acq_view_exchange_rate' : [
-				['oncommand'],
-				function() { open_eg_web_page('conify/global/acq/exchange_rate', 'menu.cmd_acq_view_exchange_rate.tab'); }
-			],
+    ['oncommand'],
+    function() { open_eg_web_page('conify/global/acq/exchange_rate', 'menu.cmd_acq_view_exchange_rate.tab'); }
+   ],
             'cmd_acq_view_distrib_formula' : [
-				['oncommand'],
-				function() { open_eg_web_page('conify/global/acq/distribution_formula', 'menu.cmd_acq_view_distrib_formula.tab'); }
-			],
-
-			'cmd_reprint' : [
-				['oncommand'],
-				function() {
-					try {
-						JSAN.use('util.print'); var print = new util.print();
-						print.reprint_last();
-					} catch(E) {
-						alert(E);
-					}
-				}
-			],
-
-			'cmd_retrieve_last_patron' : [
-				['oncommand'],
-				function() {
-					obj.data.stash_retrieve();
-					if (!obj.data.last_patron) {
-						alert(offlineStrings.getString('menu.cmd_retrieve_last_patron.session.error'));
-						return;
-					}
+    ['oncommand'],
+    function() { open_eg_web_page('conify/global/acq/distribution_formula', 'menu.cmd_acq_view_distrib_formula.tab'); }
+   ],
+
+   'cmd_reprint' : [
+    ['oncommand'],
+    function() {
+     try {
+      JSAN.use('util.print'); var print = new util.print();
+      print.reprint_last();
+     } catch(E) {
+      alert(E);
+     }
+    }
+   ],
+
+   'cmd_retrieve_last_patron' : [
+    ['oncommand'],
+    function() {
+     obj.data.stash_retrieve();
+     if (!obj.data.last_patron) {
+      alert(offlineStrings.getString('menu.cmd_retrieve_last_patron.session.error'));
+      return;
+     }
                     var horizontal_interface = String( obj.data.hash.aous['ui.circ.patron_summary.horizontal'] ) == 'true';
                     var url = obj.url_prefix( horizontal_interface ? urls.XUL_PATRON_HORIZ_DISPLAY : urls.XUL_PATRON_DISPLAY );
-					obj.set_tab( url, {}, { 'id' : obj.data.last_patron } );
-				}
-			],
-			
-			'cmd_retrieve_last_record' : [
-				['oncommand'],
-				function() {
-					obj.data.stash_retrieve();
-					if (!obj.data.last_record) {
-						alert(offlineStrings.getString('menu.cmd_retrieve_last_record.session.error'));
-						return;
-					}
-					var opac_url = obj.url_prefix( urls.opac_rdetail ) + '?r=' + obj.data.last_record;
-					var content_params = {
-						'session' : ses(),
-						'authtime' : ses('authtime'),
-						'opac_url' : opac_url,
-					};
-					obj.set_tab(
-						obj.url_prefix(urls.XUL_OPAC_WRAPPER),
-						{'tab_name' : offlineStrings.getString('menu.cmd_retrieve_last_record.status')},
-						content_params
-					);
-				}
-			],
+     obj.set_tab( url, {}, { 'id' : obj.data.last_patron } );
+    }
+   ],
+   
+   'cmd_retrieve_last_record' : [
+    ['oncommand'],
+    function() {
+     obj.data.stash_retrieve();
+     if (!obj.data.last_record) {
+      alert(offlineStrings.getString('menu.cmd_retrieve_last_record.session.error'));
+      return;
+     }
+     var opac_url = obj.url_prefix( urls.opac_rdetail ) + '?r=' + obj.data.last_record;
+     var content_params = {
+      'session' : ses(),
+      'authtime' : ses('authtime'),
+      'opac_url' : opac_url,
+     };
+     obj.set_tab(
+      obj.url_prefix(urls.XUL_OPAC_WRAPPER),
+      {'tab_name' : offlineStrings.getString('menu.cmd_retrieve_last_record.status')},
+      content_params
+     );
+    }
+   ],
 
             'cmd_verify_credentials' : [
                 ['oncommand'],
                 function() {
-					obj.set_tab(
-						obj.url_prefix(urls.XUL_VERIFY_CREDENTIALS),
-						{ 'tab_name' : offlineStrings.getString('menu.cmd_verify_credentials.tabname') },
-						{}
-					);
+     obj.set_tab(
+      obj.url_prefix(urls.XUL_VERIFY_CREDENTIALS),
+      { 'tab_name' : offlineStrings.getString('menu.cmd_verify_credentials.tabname') },
+      {}
+     );
                 }
             ],
 
-			/* Cataloging Menu */
-			'cmd_z39_50_import' : [
-				['oncommand'],
-				function() {
-					obj.data.stash_retrieve();
-					obj.set_tab(obj.url_prefix(urls.XUL_Z3950_IMPORT),{},{});
-				}
-			],
-			'cmd_create_marc' : [
-				['oncommand'],
-				function() {
-					obj.data.stash_retrieve();
-					obj.set_tab(obj.url_prefix(urls.XUL_MARC_NEW),{},{});
-				}
-			],
-
-			/* Admin menu */
-			'cmd_change_session' : [
-				['oncommand'],
-				function() {
-					try {
-						obj.data.stash_retrieve();
-						JSAN.use('util.network'); var network = new util.network();
-						var x = document.getElementById('oc_menuitem');
-						var x_label = x.getAttribute('label_orig');
-						var temp_au = js2JSON( obj.data.list.au[0] );
-						var temp_ses = js2JSON( obj.data.session );
-						if (obj.data.list.au.length > 1) {
-							obj.data.list.au = [ obj.data.list.au[1] ];
-							obj.data.stash('list');
-							network.reset_titlebars( obj.data );
-							x.setAttribute('label', x_label );
-							network.simple_request('AUTH_DELETE', [ obj.data.session.key ] );
-							obj.data.session = obj.data.previous_session;
-							obj.data.stash('session');
-				            try {
+   /* Cataloging Menu */
+   'cmd_z39_50_import' : [
+    ['oncommand'],
+    function() {
+     obj.data.stash_retrieve();
+     obj.set_tab(obj.url_prefix(urls.XUL_Z3950_IMPORT),{},{});
+    }
+   ],
+   'cmd_create_marc' : [
+    ['oncommand'],
+    function() {
+     obj.data.stash_retrieve();
+     obj.set_tab(obj.url_prefix(urls.XUL_MARC_NEW),{},{});
+    }
+   ],
+
+   /* Admin menu */
+   'cmd_change_session' : [
+    ['oncommand'],
+    function() {
+     try {
+      obj.data.stash_retrieve();
+      JSAN.use('util.network'); var network = new util.network();
+      var x = document.getElementById('oc_menuitem');
+      var x_label = x.getAttribute('label_orig');
+      var temp_au = js2JSON( obj.data.list.au[0] );
+      var temp_ses = js2JSON( obj.data.session );
+      if (obj.data.list.au.length > 1) {
+       obj.data.list.au = [ obj.data.list.au[1] ];
+       obj.data.stash('list');
+       network.reset_titlebars( obj.data );
+       x.setAttribute('label', x_label );
+       network.simple_request('AUTH_DELETE', [ obj.data.session.key ] );
+       obj.data.session = obj.data.previous_session;
+       obj.data.stash('session');
+                try {
                                 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-								var ios = Components.classes["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService);
-								var cookieUri = ios.newURI("http://" + obj.data.server_unadorned, null, null);
-								var cookieUriSSL = ios.newURI("https://" + obj.data.server_unadorned, null, null);
-								var cookieSvc = Components.classes["@mozilla.org/cookieService;1"].getService(Components.interfaces.nsICookieService);
-
-								cookieSvc.setCookieString(cookieUri, null, "ses="+obj.data.session.key, null);
-								cookieSvc.setCookieString(cookieUriSSL, null, "ses="+obj.data.session.key, null);
-
-					    } catch(E) {
-						    alert(offlineStrings.getFormattedString(main.session_cookie.error, [E]));
-					    }
-
-							removeCSSClass(document.getElementById('main_tabbox'),'operator_change');
-						} else {
-							if (network.get_new_session(offlineStrings.getString('menu.cmd_chg_session.label'),{'url_prefix':obj.url_prefix})) {
-								obj.data.stash_retrieve();
-								obj.data.list.au[1] = JSON2js( temp_au );
-								obj.data.stash('list');
-								obj.data.previous_session = JSON2js( temp_ses );
-								obj.data.stash('previous_session');
-								x.setAttribute('label', offlineStrings.getFormattedString('menu.cmd_chg_session.operator.label', [obj.data.list.au[1].usrname()]) );
-								addCSSClass(document.getElementById('main_tabbox'),'operator_change');
-							}
-						}
-					} catch(E) {
-						obj.error.standard_unexpected_error_alert('cmd_change_session',E);
-					}
-				}
-			],
-			'cmd_manage_offline_xacts' : [
-				['oncommand'],
-				function() {
-					obj.set_tab(obj.url_prefix(urls.XUL_OFFLINE_MANAGE_XACTS), {'tab_name' : offlineStrings.getString('menu.cmd_manage_offline_xacts.tab')}, {});
-				}
-			],
-			'cmd_download_patrons' : [
-				['oncommand'],
-				function() {
-					try {
-						netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-						var x = new XMLHttpRequest();
-						var url = 'http://' + XML_HTTP_SERVER + '/standalone/list.txt';
-						x.open("GET",url,false);
-						x.send(null);
-						if (x.status == 200) {
-							JSAN.use('util.file'); var file = new util.file('offline_patron_list');
-							file.write_content('truncate',x.responseText);
-							file.close();
-							file = new util.file('offline_patron_list.date');
-							file.write_content('truncate',new Date());
-							file.close();
-							alert(offlineStrings.getString('menu.cmd_download_patrons.complete.status'));
-						} else {
-							alert(offlineStrings.getFormattedString('menu.cmd_download_patrons.error', [x.status, x.statusText]));
-						}
-					} catch(E) {
-						obj.error.standard_unexpected_error_alert('cmd_download_patrons',E);
-					}
-				}
-			],
-			'cmd_adv_user_edit' : [
-				['oncommand'],
-				function() {
-					obj.data.stash_retrieve();
-					obj.set_tab(obj.url_prefix(urls.XUL_PATRON_BARCODE_ENTRY), {}, { 'perm_editor' : true });
-				}
-			],
-			'cmd_print_list_template_edit' : [
-				['oncommand'],
-				function() {
-					obj.data.stash_retrieve();
-					obj.set_tab(obj.url_prefix(urls.XUL_PRINT_LIST_TEMPLATE_EDITOR), {}, {});
-				}
-			],
-			'cmd_stat_cat_edit' : [
-				['oncommand'],
-				function() {
-					obj.data.stash_retrieve();
-					obj.set_tab(obj.url_prefix(urls.XUL_STAT_CAT_EDIT) + '?ses='+window.escape(ses()), {'tab_name' : offlineStrings.getString('menu.cmd_stat_cat_edit.tab')},{});
-				}
-			],
-			'cmd_non_cat_type_edit' : [
-				['oncommand'],
-				function() {
-					obj.data.stash_retrieve();
-					obj.set_tab(obj.url_prefix(urls.XUL_NON_CAT_LABEL_EDIT) + '?ses='+window.escape(ses()), {'tab_name' : offlineStrings.getString('menu.cmd_non_cat_type_edit.tab')},{});
-				}
-			],
-			'cmd_copy_location_edit' : [
-				['oncommand'],
-				function() {
-					obj.data.stash_retrieve();
-					obj.set_tab(obj.url_prefix(urls.XUL_COPY_LOCATION_EDIT) + '?ses='+window.escape(ses()),{'tab_name' : offlineStrings.getString('menu.cmd_copy_location_edit.tab')},{});
-				}
-			],
-			'cmd_test' : [
-				['oncommand'],
-				function() {
-					obj.data.stash_retrieve();
-					var content_params = { 'session' : ses(), 'authtime' : ses('authtime') };
-					obj.set_tab(obj.url_prefix(urls.XUL_OPAC_WRAPPER), {}, content_params);
-				}
-			],
-			'cmd_test_html' : [
-				['oncommand'],
-				function() {
-					obj.data.stash_retrieve();
-					obj.set_tab(obj.url_prefix(urls.TEST_HTML) + '?ses='+window.escape(ses()),{ 'browser' : true },{});
-				}
-			],
-			'cmd_test_xul' : [
-				['oncommand'],
-				function() {
-					obj.data.stash_retrieve();
-					obj.set_tab(obj.url_prefix(urls.TEST_XUL) + '?ses='+window.escape(ses()),{ 'browser' : false },{});
-				}
-			],
-			'cmd_console' : [
-				['oncommand'],
-				function() {
-					obj.set_tab(obj.url_prefix(urls.XUL_DEBUG_CONSOLE),{'tab_name' : offlineStrings.getString('menu.cmd_console.tab')},{});
-				}
-			],
-			'cmd_shell' : [
-				['oncommand'],
-				function() {
-					obj.set_tab(obj.url_prefix(urls.XUL_DEBUG_SHELL),{'tab_name' : offlineStrings.getString('menu.cmd_shell.tab')},{});
-				}
-			],
-			'cmd_xuleditor' : [
-				['oncommand'],
-				function() {
-					obj.set_tab(obj.url_prefix(urls.XUL_DEBUG_XULEDITOR),{'tab_name' : offlineStrings.getString('menu.cmd_xuleditor.tab')},{});
-				}
-			],
-			'cmd_fieldmapper' : [
-				['oncommand'],
-				function() {
-					obj.set_tab(obj.url_prefix(urls.XUL_DEBUG_FIELDMAPPER),{'tab_name' : offlineStrings.getString('menu.cmd_fieldmapper.tab')},{});
-				}
-			],
-			'cmd_survey_wizard' : [
-				['oncommand'],
-				function() {
-					obj.data.stash_retrieve();
-					xulG.window.open(obj.url_prefix(urls.XUL_SURVEY_WIZARD),'survey_wizard','chrome'); 
-				}
-			],
-			'cmd_public_opac' : [
-				['oncommand'],
-				function() {
-					var loc = urls.XUL_BROWSER + '?url=' + window.escape(
-						obj.url_prefix(urls.remote)
-					);
-					obj.set_tab( 
-						loc, 
-						{'tab_name' : offlineStrings.getString('menu.cmd_public_opac.tab'), 'browser' : false}, 
-						{ 'no_xulG' : true, 'show_nav_buttons' : true, 'show_print_button' : true } 
-					);
-				}
-			],
-			'cmd_clear_cache' : [
-				['oncommand'],
-				function clear_the_cache() {
-					try {
+        var ios = Components.classes["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService);
+        var cookieUri = ios.newURI("http://" + obj.data.server_unadorned, null, null);
+        var cookieUriSSL = ios.newURI("https://" + obj.data.server_unadorned, null, null);
+        var cookieSvc = Components.classes["@mozilla.org/cookieService;1"].getService(Components.interfaces.nsICookieService);
+
+        cookieSvc.setCookieString(cookieUri, null, "ses="+obj.data.session.key, null);
+        cookieSvc.setCookieString(cookieUriSSL, null, "ses="+obj.data.session.key, null);
+
+         } catch(E) {
+          alert(offlineStrings.getFormattedString(main.session_cookie.error, [E]));
+         }
+
+       removeCSSClass(document.getElementById('main_tabbox'),'operator_change');
+      } else {
+       if (network.get_new_session(offlineStrings.getString('menu.cmd_chg_session.label'),{'url_prefix':obj.url_prefix})) {
+        obj.data.stash_retrieve();
+        obj.data.list.au[1] = JSON2js( temp_au );
+        obj.data.stash('list');
+        obj.data.previous_session = JSON2js( temp_ses );
+        obj.data.stash('previous_session');
+        x.setAttribute('label', offlineStrings.getFormattedString('menu.cmd_chg_session.operator.label', [obj.data.list.au[1].usrname()]) );
+        addCSSClass(document.getElementById('main_tabbox'),'operator_change');
+       }
+      }
+     } catch(E) {
+      obj.error.standard_unexpected_error_alert('cmd_change_session',E);
+     }
+    }
+   ],
+   'cmd_manage_offline_xacts' : [
+    ['oncommand'],
+    function() {
+     obj.set_tab(obj.url_prefix(urls.XUL_OFFLINE_MANAGE_XACTS), {'tab_name' : offlineStrings.getString('menu.cmd_manage_offline_xacts.tab')}, {});
+    }
+   ],
+   'cmd_download_patrons' : [
+    ['oncommand'],
+    function() {
+     try {
+      netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+      var x = new XMLHttpRequest();
+      var url = 'http://' + XML_HTTP_SERVER + '/standalone/list.txt';
+      x.open("GET",url,false);
+      x.send(null);
+      if (x.status == 200) {
+       JSAN.use('util.file'); var file = new util.file('offline_patron_list');
+       file.write_content('truncate',x.responseText);
+       file.close();
+       file = new util.file('offline_patron_list.date');
+       file.write_content('truncate',new Date());
+       file.close();
+       alert(offlineStrings.getString('menu.cmd_download_patrons.complete.status'));
+      } else {
+       alert(offlineStrings.getFormattedString('menu.cmd_download_patrons.error', [x.status, x.statusText]));
+      }
+     } catch(E) {
+      obj.error.standard_unexpected_error_alert('cmd_download_patrons',E);
+     }
+    }
+   ],
+   'cmd_adv_user_edit' : [
+    ['oncommand'],
+    function() {
+     obj.data.stash_retrieve();
+     obj.set_tab(obj.url_prefix(urls.XUL_PATRON_BARCODE_ENTRY), {}, { 'perm_editor' : true });
+    }
+   ],
+   'cmd_print_list_template_edit' : [
+    ['oncommand'],
+    function() {
+     obj.data.stash_retrieve();
+     obj.set_tab(obj.url_prefix(urls.XUL_PRINT_LIST_TEMPLATE_EDITOR), {}, {});
+    }
+   ],
+   'cmd_stat_cat_edit' : [
+    ['oncommand'],
+    function() {
+     obj.data.stash_retrieve();
+     obj.set_tab(obj.url_prefix(urls.XUL_STAT_CAT_EDIT) + '?ses='+window.escape(ses()), {'tab_name' : offlineStrings.getString('menu.cmd_stat_cat_edit.tab')},{});
+    }
+   ],
+   'cmd_non_cat_type_edit' : [
+    ['oncommand'],
+    function() {
+     obj.data.stash_retrieve();
+     obj.set_tab(obj.url_prefix(urls.XUL_NON_CAT_LABEL_EDIT) + '?ses='+window.escape(ses()), {'tab_name' : offlineStrings.getString('menu.cmd_non_cat_type_edit.tab')},{});
+    }
+   ],
+   'cmd_copy_location_edit' : [
+    ['oncommand'],
+    function() {
+     obj.data.stash_retrieve();
+     obj.set_tab(obj.url_prefix(urls.XUL_COPY_LOCATION_EDIT) + '?ses='+window.escape(ses()),{'tab_name' : offlineStrings.getString('menu.cmd_copy_location_edit.tab')},{});
+    }
+   ],
+   'cmd_test' : [
+    ['oncommand'],
+    function() {
+     obj.data.stash_retrieve();
+     var content_params = { 'session' : ses(), 'authtime' : ses('authtime') };
+     obj.set_tab(obj.url_prefix(urls.XUL_OPAC_WRAPPER), {}, content_params);
+    }
+   ],
+   'cmd_test_html' : [
+    ['oncommand'],
+    function() {
+     obj.data.stash_retrieve();
+     obj.set_tab(obj.url_prefix(urls.TEST_HTML) + '?ses='+window.escape(ses()),{ 'browser' : true },{});
+    }
+   ],
+   'cmd_test_xul' : [
+    ['oncommand'],
+    function() {
+     obj.data.stash_retrieve();
+     obj.set_tab(obj.url_prefix(urls.TEST_XUL) + '?ses='+window.escape(ses()),{ 'browser' : false },{});
+    }
+   ],
+   'cmd_console' : [
+    ['oncommand'],
+    function() {
+     obj.set_tab(obj.url_prefix(urls.XUL_DEBUG_CONSOLE),{'tab_name' : offlineStrings.getString('menu.cmd_console.tab')},{});
+    }
+   ],
+   'cmd_shell' : [
+    ['oncommand'],
+    function() {
+     obj.set_tab(obj.url_prefix(urls.XUL_DEBUG_SHELL),{'tab_name' : offlineStrings.getString('menu.cmd_shell.tab')},{});
+    }
+   ],
+   'cmd_xuleditor' : [
+    ['oncommand'],
+    function() {
+     obj.set_tab(obj.url_prefix(urls.XUL_DEBUG_XULEDITOR),{'tab_name' : offlineStrings.getString('menu.cmd_xuleditor.tab')},{});
+    }
+   ],
+   'cmd_fieldmapper' : [
+    ['oncommand'],
+    function() {
+     obj.set_tab(obj.url_prefix(urls.XUL_DEBUG_FIELDMAPPER),{'tab_name' : offlineStrings.getString('menu.cmd_fieldmapper.tab')},{});
+    }
+   ],
+   'cmd_survey_wizard' : [
+    ['oncommand'],
+    function() {
+     obj.data.stash_retrieve();
+     xulG.window.open(obj.url_prefix(urls.XUL_SURVEY_WIZARD),'survey_wizard','chrome'); 
+    }
+   ],
+   'cmd_public_opac' : [
+    ['oncommand'],
+    function() {
+     var loc = urls.XUL_BROWSER + '?url=' + window.escape(
+      obj.url_prefix(urls.remote)
+     );
+     obj.set_tab( 
+      loc, 
+      {'tab_name' : offlineStrings.getString('menu.cmd_public_opac.tab'), 'browser' : false}, 
+      { 'no_xulG' : true, 'show_nav_buttons' : true, 'show_print_button' : true } 
+     );
+    }
+   ],
+   'cmd_clear_cache' : [
+    ['oncommand'],
+    function clear_the_cache() {
+     try {
                         netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-						var cacheClass 		= Components.classes["@mozilla.org/network/cache-service;1"];
-						var cacheService	= cacheClass.getService(Components.interfaces.nsICacheService);
-						cacheService.evictEntries(Components.interfaces.nsICache.STORE_ON_DISK);
-						cacheService.evictEntries(Components.interfaces.nsICache.STORE_IN_MEMORY);
-					} catch(E) {
-						dump(E+'\n');alert(E);
-					}
-				}
-			],
-			'cmd_restore_all_tabs' : [
-				['oncommand'],
-				function() {
-					var tabs = obj.controller.view.tabs;
-					for (var i = 0; i < tabs.childNodes.length; i++) {
-						tabs.childNodes[i].hidden = false;
-					}
-				}
-			],
-			'cmd_extension_manager' : [
-				['oncommand'],
-				function() {
-					obj.set_tab('chrome://mozapps/content/extensions/extensions.xul?type=extensions',{'tab_name' : offlineStrings.getString('menu.cmd_extension_manager.tab')},{});
-				}
-			],
-			'cmd_theme_manager' : [
-				['oncommand'],
-				function() {
-					obj.set_tab('chrome://mozapps/content/extensions/extensions.xul?type=themes',{'tab_name' : offlineStrings.getString('menu.cmd_theme_manager.tab')},{});
-				}
-			],
-			'cmd_about_config' : [
-				['oncommand'],
-				function() {
-					obj.set_tab('chrome://global/content/config.xul',{'tab_name' : 'about:config'},{});
-				}
-			],
-			'cmd_shutdown' : [
-				['oncommand'],
-				function() {
-					if (window.confirm(offlineStrings.getString('menu.cmd_shutdown.prompt'))) {
+      var cacheClass   = Components.classes["@mozilla.org/network/cache-service;1"];
+      var cacheService = cacheClass.getService(Components.interfaces.nsICacheService);
+      cacheService.evictEntries(Components.interfaces.nsICache.STORE_ON_DISK);
+      cacheService.evictEntries(Components.interfaces.nsICache.STORE_IN_MEMORY);
+     } catch(E) {
+      dump(E+'\n');alert(E);
+     }
+    }
+   ],
+   'cmd_restore_all_tabs' : [
+    ['oncommand'],
+    function() {
+     var tabs = obj.controller.view.tabs;
+     for (var i = 0; i < tabs.childNodes.length; i++) {
+      tabs.childNodes[i].hidden = false;
+     }
+    }
+   ],
+   'cmd_extension_manager' : [
+    ['oncommand'],
+    function() {
+     obj.set_tab('chrome://mozapps/content/extensions/extensions.xul?type=extensions',{'tab_name' : offlineStrings.getString('menu.cmd_extension_manager.tab')},{});
+    }
+   ],
+   'cmd_theme_manager' : [
+    ['oncommand'],
+    function() {
+     obj.set_tab('chrome://mozapps/content/extensions/extensions.xul?type=themes',{'tab_name' : offlineStrings.getString('menu.cmd_theme_manager.tab')},{});
+    }
+   ],
+   'cmd_about_config' : [
+    ['oncommand'],
+    function() {
+     obj.set_tab('chrome://global/content/config.xul',{'tab_name' : 'about:config'},{});
+    }
+   ],
+   'cmd_shutdown' : [
+    ['oncommand'],
+    function() {
+     if (window.confirm(offlineStrings.getString('menu.cmd_shutdown.prompt'))) {
                         netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-						var windowManager = Components.classes["@mozilla.org/appshell/window-mediator;1"].getService();
-						var windowManagerInterface = windowManager.QueryInterface(Components.interfaces.nsIWindowMediator);
-						var enumerator = windowManagerInterface.getEnumerator(null);
-						var w; // close all other windows
-						while ( w = enumerator.getNext() ) {
-							if (w != window) w.close();
-						}
-						window.close();
-					}
-				}
-			],
-
-		};
-
-		JSAN.use('util.controller');
-		var cmd;
-		obj.controller = new util.controller();
-		obj.controller.init( { 'window_knows_me_by' : 'g.menu.controller', 'control_map' : cmd_map } );
-
-		obj.controller.view.tabbox = window.document.getElementById('main_tabbox');
-		obj.controller.view.tabs = obj.controller.view.tabbox.firstChild;
-		obj.controller.view.panels = obj.controller.view.tabbox.lastChild;
-
-		obj.new_tab(null,{'focus':true},null);
-
-		obj.init_tab_focus_handlers();
-	},
-
-	'spawn_search' : function(s) {
-		var obj = this;
-		obj.error.sdump('D_TRACE', offlineStrings.getFormattedString('menu.spawn_search.msg', [js2JSON(s)]) ); 
-		obj.data.stash_retrieve();
-		var loc = obj.url_prefix(urls.XUL_PATRON_DISPLAY);
-		loc += '?doit=1&query=' + window.escape(js2JSON(s));
-		obj.new_tab( loc, {}, {} );
-	},
-
-	'init_tab_focus_handlers' : function() {
-		var obj = this;
-		for (var i = 0; i < obj.controller.view.tabs.childNodes.length; i++) {
-			var tab = obj.controller.view.tabs.childNodes[i];
-			var panel = obj.controller.view.panels.childNodes[i];
-			tab.addEventListener(
-				'command',
-				function(p) {
-					return function() {
-						try {
-								netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-								if (p
-									&& p.firstChild 
-									&& ( p.firstChild.nodeName == 'iframe' || p.firstChild.nodeName == 'browser' )
-									&& p.firstChild.contentWindow 
-								) {
-									if (typeof p.firstChild.contentWindow.default_focus == 'function') {
-										p.firstChild.contentWindow.default_focus();
-									} else {
-										//p.firstChild.contentWindow.firstChild.focus();
-									}
-								}
-						} catch(E) {
-							obj.error.sdump('D_ERROR','init_tab_focus_handler: ' + js2JSON(E));
-						}
-					}
-				}(panel),
-				false
-			);
-		}
-	},
-
-	'close_all_tabs' : function() {
-		var obj = this;
-		try {
-			var count = obj.controller.view.tabs.childNodes.length;
-			for (var i = 0; i < count; i++) obj.close_tab();
-			setTimeout( function(){ obj.controller.view.tabs.firstChild.focus(); }, 0);
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert(offlineStrings.getString('menu.close_all_tabs.error'),E);
-		}
-	},
-
-	'close_tab' : function () {
-		var idx = this.controller.view.tabs.selectedIndex;
-		var tab = this.controller.view.tabs.childNodes[idx];
-		var panel = this.controller.view.panels.childNodes[ idx ];
-		while ( panel.lastChild ) panel.removeChild( panel.lastChild );
-		if (idx == 0) {
-			try {
-				this.controller.view.tabs.advanceSelectedTab(+1);
-			} catch(E) {
-				this.error.sdump('D_TAB','failed tabs.advanceSelectedTab(+1):'+js2JSON(E) + '\n');
-				try {
-					this.controller.view.tabs.advanceSelectedTab(-1);
-				} catch(E) {
-					this.error.sdump('D_TAB','failed again tabs.advanceSelectedTab(-1):'+
-						js2JSON(E) + '\n');
-				}
-			}
-		} else {
-			try {
-				this.controller.view.tabs.advanceSelectedTab(-1);
-			} catch(E) {
-				this.error.sdump('D_TAB','failed tabs.advanceSelectedTab(-1):'+js2JSON(E) + '\n');
-				try {
-					this.controller.view.tabs.advanceSelectedTab(+1);
-				} catch(E) {
-					this.error.sdump('D_TAB','failed again tabs.advanceSelectedTab(+1):'+
-						js2JSON(E) + '\n');
-				}
-			}
-
-		}
-		
-		this.error.sdump('D_TAB','\tnew tabbox.selectedIndex = ' + this.controller.view.tabbox.selectedIndex + '\n');
-
-		this.controller.view.tabs.childNodes[ idx ].hidden = true;
-		this.error.sdump('D_TAB','tabs.childNodes[ ' + idx + ' ].hidden = true;\n');
-
-		// Make sure we keep at least one tab open.
-		var tab_flag = true;
-		for (var i = 0; i < this.controller.view.tabs.childNodes.length; i++) {
-			var tab = this.controller.view.tabs.childNodes[i];
-			if (!tab.hidden)
-				tab_flag = false;
-		}
-		if (tab_flag) {
-			this.controller.view.tabs.selectedIndex = 0;
-			this.new_tab(); 
-		}
-	},
-
-	'find_free_tab' : function() {
-		var last_not_hidden = -1;
-		for (var i = 0; i<this.controller.view.tabs.childNodes.length; i++) {
-			var tab = this.controller.view.tabs.childNodes[i];
-			if (!tab.hidden)
-				last_not_hidden = i;
-		}
-		if (last_not_hidden == this.controller.view.tabs.childNodes.length - 1)
-			last_not_hidden = -1;
-		// If the one next to last_not_hidden is hidden, we want it.
-		// Basically, we fill in tabs after existing tabs for as 
-		// long as possible.
-		var idx = last_not_hidden + 1;
-		var candidate = this.controller.view.tabs.childNodes[ idx ];
-		if (candidate.hidden)
-			return idx;
-		// Alright, find the first hidden then
-		for (var i = 0; i<this.controller.view.tabs.childNodes.length; i++) {
-			var tab = this.controller.view.tabs.childNodes[i];
-			if (tab.hidden)
-				return i;
-		}
-		return -1;
-	},
-
-	'new_tab' : function(url,params,content_params) {
-		var tc = this.find_free_tab();
-		if (tc == -1) { return null; } // 9 tabs max
-		var tab = this.controller.view.tabs.childNodes[ tc ];
-		tab.hidden = false;
-		if (!content_params) content_params = {};
-		if (!params) params = {};
-		if (!params.tab_name) params.tab_name = offlineStrings.getString('menu.new_tab.tab');
-		if (!params.nofocus) params.focus = true; /* make focus the default */
-		try {
-			if (params.focus) this.controller.view.tabs.selectedIndex = tc;
-			params.index = tc;
-			this.set_tab(url,params,content_params);
-		} catch(E) {
-			this.error.sdump('D_ERROR',E);
-		}
-	},
+      var windowManager = Components.classes["@mozilla.org/appshell/window-mediator;1"].getService();
+      var windowManagerInterface = windowManager.QueryInterface(Components.interfaces.nsIWindowMediator);
+      var enumerator = windowManagerInterface.getEnumerator(null);
+      var w; // close all other windows
+      while ( w = enumerator.getNext() ) {
+       if (w != window) w.close();
+      }
+      window.close();
+     }
+    }
+   ],
+
+  };
+
+  JSAN.use('util.controller');
+  var cmd;
+  obj.controller = new util.controller();
+  obj.controller.init( { 'window_knows_me_by' : 'g.menu.controller', 'control_map' : cmd_map } );
+
+  obj.controller.view.tabbox = window.document.getElementById('main_tabbox');
+  obj.controller.view.tabs = obj.controller.view.tabbox.firstChild;
+  obj.controller.view.panels = obj.controller.view.tabbox.lastChild;
+
+  obj.new_tab(null,{'focus':true},null);
+
+  obj.init_tab_focus_handlers();
+ },
+
+ 'spawn_search' : function(s) {
+  var obj = this;
+  obj.error.sdump('D_TRACE', offlineStrings.getFormattedString('menu.spawn_search.msg', [js2JSON(s)]) ); 
+  obj.data.stash_retrieve();
+  var loc = obj.url_prefix(urls.XUL_PATRON_DISPLAY);
+  loc += '?doit=1&query=' + window.escape(js2JSON(s));
+  obj.new_tab( loc, {}, {} );
+ },
+
+ 'init_tab_focus_handlers' : function() {
+  var obj = this;
+  for (var i = 0; i < obj.controller.view.tabs.childNodes.length; i++) {
+   var tab = obj.controller.view.tabs.childNodes[i];
+   var panel = obj.controller.view.panels.childNodes[i];
+   tab.addEventListener(
+    'command',
+    function(p) {
+     return function() {
+      try {
+        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+        if (p
+         && p.firstChild 
+         && ( p.firstChild.nodeName == 'iframe' || p.firstChild.nodeName == 'browser' )
+         && p.firstChild.contentWindow 
+        ) {
+         if (typeof p.firstChild.contentWindow.default_focus == 'function') {
+          p.firstChild.contentWindow.default_focus();
+         } else {
+          //p.firstChild.contentWindow.firstChild.focus();
+         }
+        }
+      } catch(E) {
+       obj.error.sdump('D_ERROR','init_tab_focus_handler: ' + js2JSON(E));
+      }
+     }
+    }(panel),
+    false
+   );
+  }
+ },
+
+ 'close_all_tabs' : function() {
+  var obj = this;
+  try {
+   var count = obj.controller.view.tabs.childNodes.length;
+   for (var i = 0; i < count; i++) obj.close_tab();
+   setTimeout( function(){ obj.controller.view.tabs.firstChild.focus(); }, 0);
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert(offlineStrings.getString('menu.close_all_tabs.error'),E);
+  }
+ },
+
+ 'close_tab' : function () {
+  var idx = this.controller.view.tabs.selectedIndex;
+  var tab = this.controller.view.tabs.childNodes[idx];
+  var panel = this.controller.view.panels.childNodes[ idx ];
+  while ( panel.lastChild ) panel.removeChild( panel.lastChild );
+  if (idx == 0) {
+   try {
+    this.controller.view.tabs.advanceSelectedTab(+1);
+   } catch(E) {
+    this.error.sdump('D_TAB','failed tabs.advanceSelectedTab(+1):'+js2JSON(E) + '\n');
+    try {
+     this.controller.view.tabs.advanceSelectedTab(-1);
+    } catch(E) {
+     this.error.sdump('D_TAB','failed again tabs.advanceSelectedTab(-1):'+
+      js2JSON(E) + '\n');
+    }
+   }
+  } else {
+   try {
+    this.controller.view.tabs.advanceSelectedTab(-1);
+   } catch(E) {
+    this.error.sdump('D_TAB','failed tabs.advanceSelectedTab(-1):'+js2JSON(E) + '\n');
+    try {
+     this.controller.view.tabs.advanceSelectedTab(+1);
+    } catch(E) {
+     this.error.sdump('D_TAB','failed again tabs.advanceSelectedTab(+1):'+
+      js2JSON(E) + '\n');
+    }
+   }
+
+  }
+  
+  this.error.sdump('D_TAB','\tnew tabbox.selectedIndex = ' + this.controller.view.tabbox.selectedIndex + '\n');
+
+  this.controller.view.tabs.childNodes[ idx ].hidden = true;
+  this.error.sdump('D_TAB','tabs.childNodes[ ' + idx + ' ].hidden = true;\n');
+
+  // Make sure we keep at least one tab open.
+  var tab_flag = true;
+  for (var i = 0; i < this.controller.view.tabs.childNodes.length; i++) {
+   var tab = this.controller.view.tabs.childNodes[i];
+   if (!tab.hidden)
+    tab_flag = false;
+  }
+  if (tab_flag) {
+   this.controller.view.tabs.selectedIndex = 0;
+   this.new_tab(); 
+  }
+ },
+
+ 'find_free_tab' : function() {
+  var last_not_hidden = -1;
+  for (var i = 0; i<this.controller.view.tabs.childNodes.length; i++) {
+   var tab = this.controller.view.tabs.childNodes[i];
+   if (!tab.hidden)
+    last_not_hidden = i;
+  }
+  if (last_not_hidden == this.controller.view.tabs.childNodes.length - 1)
+   last_not_hidden = -1;
+  // If the one next to last_not_hidden is hidden, we want it.
+  // Basically, we fill in tabs after existing tabs for as 
+  // long as possible.
+  var idx = last_not_hidden + 1;
+  var candidate = this.controller.view.tabs.childNodes[ idx ];
+  if (candidate.hidden)
+   return idx;
+  // Alright, find the first hidden then
+  for (var i = 0; i<this.controller.view.tabs.childNodes.length; i++) {
+   var tab = this.controller.view.tabs.childNodes[i];
+   if (tab.hidden)
+    return i;
+  }
+  return -1;
+ },
+
+ 'new_tab' : function(url,params,content_params) {
+  var tc = this.find_free_tab();
+  if (tc == -1) { return null; } // 9 tabs max
+  var tab = this.controller.view.tabs.childNodes[ tc ];
+  tab.hidden = false;
+  if (!content_params) content_params = {};
+  if (!params) params = {};
+  if (!params.tab_name) params.tab_name = offlineStrings.getString('menu.new_tab.tab');
+  if (!params.nofocus) params.focus = true; /* make focus the default */
+  try {
+   if (params.focus) this.controller.view.tabs.selectedIndex = tc;
+   params.index = tc;
+   this.set_tab(url,params,content_params);
+  } catch(E) {
+   this.error.sdump('D_ERROR',E);
+  }
+ },
 
     'network_meter' : {
         'inc' : function(app,method) {
@@ -1175,80 +1175,80 @@ main.menu.prototype = {
         var url = obj.url_prefix( horizontal_interface ? urls.XUL_PATRON_HORIZ_DISPLAY : urls.XUL_PATRON_DISPLAY );
         obj.new_tab(url,params ? params : {},content_params ? content_params : {});
     },
-	'set_tab' : function(url,params,content_params) {
-		var obj = this;
-		if (!url) url = '/xul/server/';
-		if (!url.match(/:\/\//) && !url.match(/^data:/)) url = urls.remote + url;
-		if (!params) params = {};
-		if (!content_params) content_params = {};
-		var idx = this.controller.view.tabs.selectedIndex;
-		if (params && typeof params.index != 'undefined') idx = params.index;
-		var tab = this.controller.view.tabs.childNodes[ idx ];
-		if (params.focus) tab.focus();
-		var panel = this.controller.view.panels.childNodes[ idx ];
-		while ( panel.lastChild ) panel.removeChild( panel.lastChild );
-
-		content_params.new_tab = function(a,b,c) { return obj.new_tab(a,b,c); };
-		content_params.set_tab = function(a,b,c) { return obj.set_tab(a,b,c); };
-		content_params.close_tab = function() { return obj.close_tab(); };
-		content_params.new_patron_tab = function(a,b) { return obj.new_patron_tab(a,b); };
-		content_params.set_patron_tab = function(a,b) { return obj.set_patron_tab(a,b); };
-		content_params.set_tab_name = function(name) { tab.setAttribute('label',(idx + 1) + ' ' + name); };
-		content_params.open_chrome_window = function(a,b,c) { return xulG.window.open(a,b,c); };
-		content_params.url_prefix = function(url) { return obj.url_prefix(url); };
+ 'set_tab' : function(url,params,content_params) {
+  var obj = this;
+  if (!url) url = '/xul/server/';
+  if (!url.match(/:\/\//) && !url.match(/^data:/)) url = urls.remote + url;
+  if (!params) params = {};
+  if (!content_params) content_params = {};
+  var idx = this.controller.view.tabs.selectedIndex;
+  if (params && typeof params.index != 'undefined') idx = params.index;
+  var tab = this.controller.view.tabs.childNodes[ idx ];
+  if (params.focus) tab.focus();
+  var panel = this.controller.view.panels.childNodes[ idx ];
+  while ( panel.lastChild ) panel.removeChild( panel.lastChild );
+
+  content_params.new_tab = function(a,b,c) { return obj.new_tab(a,b,c); };
+  content_params.set_tab = function(a,b,c) { return obj.set_tab(a,b,c); };
+  content_params.close_tab = function() { return obj.close_tab(); };
+  content_params.new_patron_tab = function(a,b) { return obj.new_patron_tab(a,b); };
+  content_params.set_patron_tab = function(a,b) { return obj.set_patron_tab(a,b); };
+  content_params.set_tab_name = function(name) { tab.setAttribute('label',(idx + 1) + ' ' + name); };
+  content_params.open_chrome_window = function(a,b,c) { return xulG.window.open(a,b,c); };
+  content_params.url_prefix = function(url) { return obj.url_prefix(url); };
         content_params.network_meter = obj.network_meter;
         content_params.chrome_xulG = xulG;
-		if (params && params.tab_name) content_params.set_tab_name( params.tab_name );
-		
-		var frame;
-		try {
+  if (params && params.tab_name) content_params.set_tab_name( params.tab_name );
+  
+  var frame;
+  try {
             if (typeof params.browser == 'undefined') params.browser = false;
-			if (params.browser) {
-				obj.id_incr++;
-				frame = this.w.document.createElement('browser');
-				frame.setAttribute('flex','1');
-				frame.setAttribute('type','content');
-				frame.setAttribute('id','frame_'+obj.id_incr);
-				panel.appendChild(frame);
-				try {
-					dump('creating browser with src = ' + url + '\n');
-					JSAN.use('util.browser');
-					var b = new util.browser();
-					b.init(
-						{
-							'url' : url,
-							'push_xulG' : true,
-							'alt_print' : false,
-							'browser_id' : 'frame_'+obj.id_incr,
-							'passthru_content_params' : content_params,
-						}
-					);
-				} catch(E) {
-					alert(E);
-				}
-			} else {
-				frame = this.w.document.createElement('iframe');
-				frame.setAttribute('flex','1');
-				panel.appendChild(frame);
-				dump('creating iframe with src = ' + url + '\n');
-				frame.setAttribute('src',url);
-				try {
-					netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-					var cw = frame.contentWindow;
-					if (typeof cw.wrappedJSObject != 'undefined') cw = cw.wrappedJSObject;
-					cw.IAMXUL = true;
-					cw.xulG = content_params;
-				} catch(E) {
-					this.error.sdump('D_ERROR', 'main.menu: ' + E);
-				}
-			}
-		} catch(E) {
-			this.error.sdump('D_ERROR', 'main.menu:2: ' + E);
-			alert(offlineStrings.getString('menu.set_tab.error'));
-		}
-
-		return frame;
-	}
+   if (params.browser) {
+    obj.id_incr++;
+    frame = this.w.document.createElement('browser');
+    frame.setAttribute('flex','1');
+    frame.setAttribute('type','content');
+    frame.setAttribute('id','frame_'+obj.id_incr);
+    panel.appendChild(frame);
+    try {
+     dump('creating browser with src = ' + url + '\n');
+     JSAN.use('util.browser');
+     var b = new util.browser();
+     b.init(
+      {
+       'url' : url,
+       'push_xulG' : true,
+       'alt_print' : false,
+       'browser_id' : 'frame_'+obj.id_incr,
+       'passthru_content_params' : content_params,
+      }
+     );
+    } catch(E) {
+     alert(E);
+    }
+   } else {
+    frame = this.w.document.createElement('iframe');
+    frame.setAttribute('flex','1');
+    panel.appendChild(frame);
+    dump('creating iframe with src = ' + url + '\n');
+    frame.setAttribute('src',url);
+    try {
+     netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+     var cw = frame.contentWindow;
+     if (typeof cw.wrappedJSObject != 'undefined') cw = cw.wrappedJSObject;
+     cw.IAMXUL = true;
+     cw.xulG = content_params;
+    } catch(E) {
+     this.error.sdump('D_ERROR', 'main.menu: ' + E);
+    }
+   }
+  } catch(E) {
+   this.error.sdump('D_ERROR', 'main.menu:2: ' + E);
+   alert(offlineStrings.getString('menu.set_tab.error'));
+  }
+
+  return frame;
+ }
 
 }
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame.xul b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame.xul
index ad5cee151b..310d943124 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame.xul
@@ -28,68 +28,68 @@
 -->
 
 <window id="menu_frame_win"
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	orient="vertical" width="800" height="500"
-	sizemode="maximized" oils_persist="width height" title="&staff.main.menu.title;"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+ orient="vertical" width="800" height="500"
+ sizemode="maximized" oils_persist="width height" title="&staff.main.menu.title;"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="JSAN.js"/>
-	<script type="text/javascript" src="constants.js"/>
-	<script type="text/javascript" src="../OpenILS/util/fmall.js"/>
-	<script type="text/javascript">
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw(document.getElementById('offlineStrings').getString('common.jsan.missing')); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				/*
-				JSAN.addRepository('/xul/server/');
-				*/
-				JSAN.addRepository('..');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for menu_frame.xul');
+ <script type="text/javascript" src="JSAN.js"/>
+ <script type="text/javascript" src="constants.js"/>
+ <script type="text/javascript" src="../OpenILS/util/fmall.js"/>
+ <script type="text/javascript">
+ <![CDATA[
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw(document.getElementById('offlineStrings').getString('common.jsan.missing')); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    /*
+    JSAN.addRepository('/xul/server/');
+    */
+    JSAN.addRepository('..');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for menu_frame.xul');
 
-				g.cgi = new CGI();
+    g.cgi = new CGI();
 
-				JSAN.use('main.menu'); g.menu = new main.menu();
-				g.menu.init( { 
-					'server' : g.cgi.param('server'),
-				} );
+    JSAN.use('main.menu'); g.menu = new main.menu();
+    g.menu.init( { 
+     'server' : g.cgi.param('server'),
+    } );
 
-				JSAN.use('util.window'); g.window = new util.window();
+    JSAN.use('util.window'); g.window = new util.window();
 
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-				XML_HTTP_SERVER = g.data.server_unadorned;
+    JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+    XML_HTTP_SERVER = g.data.server_unadorned;
 
-				document.title = g.window.appshell_name_increment() + ': ' + g.data.list.au[0].usrname() + '@' + g.data.ws_name + '.' + g.data.server_unadorned;
+    document.title = g.window.appshell_name_increment() + ': ' + g.data.list.au[0].usrname() + '@' + g.data.ws_name + '.' + g.data.server_unadorned;
 
-			} catch(E) {
-				var err_msg = document.getElementById("offlineStrings").getFormattedString("common.exception", ["menu_frame.xul", E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-	]]>
-	</script>
+   } catch(E) {
+    var err_msg = document.getElementById("offlineStrings").getFormattedString("common.exception", ["menu_frame.xul", E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+ ]]>
+ </script>
 
-	<messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties" />	
+ <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties" /> 
 
-	<commandset id="universal_cmds" />
+ <commandset id="universal_cmds" />
 
-	<keyset id="menu_frame_keys" />
+ <keyset id="menu_frame_keys" />
 
-	<popupset id="universal_popupset" />
+ <popupset id="universal_popupset" />
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- CONTENT -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- CONTENT -->
 
-	<box id="menu_frame_main" class="my_overflow"/>
+ <box id="menu_frame_main" class="my_overflow"/>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
index f5682a36e2..1eb343acfd 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
@@ -1,84 +1,84 @@
 <?xml version="1.0"?>
 <!DOCTYPE overlay SYSTEM "chrome://open_ils_staff_client/locale/lang.dtd">
 <overlay id="menu_frame_menus" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading menu_frame_menus.xul\n');</script>
 
 <commandset id="universal_cmds">
-	<command id="cmd_forward"/>
-	<command id="cmd_back"/>
-	<command id="cmd_close_window" key="close-window-key" />
-	<command id="cmd_new_window" key="new-window-key" />
-	<command id="cmd_new_tab" key="new-tab-key" />
-	<command id="cmd_close_tab" key="close-tab-key" />
-	<command id="cmd_close_all_tabs" key="close-all-tabs-key" />
-	<command id="cmd_shutdown" />
+ <command id="cmd_forward"/>
+ <command id="cmd_back"/>
+ <command id="cmd_close_window" key="close-window-key" />
+ <command id="cmd_new_window" key="new-window-key" />
+ <command id="cmd_new_tab" key="new-tab-key" />
+ <command id="cmd_close_tab" key="close-tab-key" />
+ <command id="cmd_close_all_tabs" key="close-all-tabs-key" />
+ <command id="cmd_shutdown" />
 
-	<command id="cmd_edit_copy_buckets" />
-	<command id="cmd_edit_volume_buckets" />
-	<command id="cmd_edit_record_buckets" />
-	<command id="cmd_edit_user_buckets" />
+ <command id="cmd_edit_copy_buckets" />
+ <command id="cmd_edit_volume_buckets" />
+ <command id="cmd_edit_record_buckets" />
+ <command id="cmd_edit_user_buckets" />
 
-	<command id="cmd_cat_main" key="cat-main-key" />
-	<command id="cmd_create_marc" />
-	<command id="cmd_circ_checkout" key="circ-checkout-key" />
-	<command id="cmd_patron_search" key="patron-search-key" />
-	<command id="cmd_circ_checkin" key="circ-checkin-key" />
-	<command id="cmd_circ_hold_capture" key="circ-hold-capture-key" />
-	<command id="cmd_circ_hold_pull_list" />
-	<command id="cmd_browse_holds" />
-	<command id="cmd_browse_holds_shelf" />
-	<command id="cmd_in_house_use" key="circ-in-house-use" />
-	<command id="cmd_copy_status" key="copy-status-key" />
-	<command id="cmd_search_opac" key="search-opac-key" />
-	<command id="cmd_public_opac" />
-	<command id="cmd_search_tcn" />
-	<command id="cmd_search_bib_id" />
-	<command id="cmd_patron_register" key="patron-register-key" />
-	<command id="cmd_standalone" />
-	<command id="cmd_survey_wizard" />
-	<command id="cmd_stat_cat_edit" />
-	<command id="cmd_non_cat_type_edit" />
-	<command id="cmd_copy_location_edit" />
-	<command id="cmd_print_list_template_edit" />
-	<command id="cmd_z39_50_import" />
-	<command id="cmd_create_new_marc_book" />
-	<command id="cmd_replace_barcode" />
-	<command id="cmd_reprint" />
-	<command id="cmd_retrieve_last_patron" />
-	<command id="cmd_retrieve_last_record" />
-	<command id="cmd_verify_credentials" />
+ <command id="cmd_cat_main" key="cat-main-key" />
+ <command id="cmd_create_marc" />
+ <command id="cmd_circ_checkout" key="circ-checkout-key" />
+ <command id="cmd_patron_search" key="patron-search-key" />
+ <command id="cmd_circ_checkin" key="circ-checkin-key" />
+ <command id="cmd_circ_hold_capture" key="circ-hold-capture-key" />
+ <command id="cmd_circ_hold_pull_list" />
+ <command id="cmd_browse_holds" />
+ <command id="cmd_browse_holds_shelf" />
+ <command id="cmd_in_house_use" key="circ-in-house-use" />
+ <command id="cmd_copy_status" key="copy-status-key" />
+ <command id="cmd_search_opac" key="search-opac-key" />
+ <command id="cmd_public_opac" />
+ <command id="cmd_search_tcn" />
+ <command id="cmd_search_bib_id" />
+ <command id="cmd_patron_register" key="patron-register-key" />
+ <command id="cmd_standalone" />
+ <command id="cmd_survey_wizard" />
+ <command id="cmd_stat_cat_edit" />
+ <command id="cmd_non_cat_type_edit" />
+ <command id="cmd_copy_location_edit" />
+ <command id="cmd_print_list_template_edit" />
+ <command id="cmd_z39_50_import" />
+ <command id="cmd_create_new_marc_book" />
+ <command id="cmd_replace_barcode" />
+ <command id="cmd_reprint" />
+ <command id="cmd_retrieve_last_patron" />
+ <command id="cmd_retrieve_last_record" />
+ <command id="cmd_verify_credentials" />
 
-	<command id="cmd_change_session" />
-	<command id="cmd_manage_offline_xacts" />
-	<command id="cmd_download_patrons" />
-	<command id="cmd_local_admin" />
-	<command id="cmd_toggle_buttonbar" />
+ <command id="cmd_change_session" />
+ <command id="cmd_manage_offline_xacts" />
+ <command id="cmd_download_patrons" />
+ <command id="cmd_local_admin" />
+ <command id="cmd_toggle_buttonbar" />
 
-	<command id="cmd_extension_manager"/>
-	<command id="cmd_theme_manager"/>
-	<command id="cmd_about_config"/>
+ <command id="cmd_extension_manager"/>
+ <command id="cmd_theme_manager"/>
+ <command id="cmd_about_config"/>
 
-	<command id="cmd_adv_user_edit" />
-	<command id="cmd_console" />
-	<command id="cmd_shell" />
-	<command id="cmd_xuleditor" />
-	<command id="cmd_fieldmapper" />
-	<command id="cmd_test_html" />
-	<command id="cmd_test_xul" />
-	<command id="cmd_clear_cache" />
-	<command id="cmd_restore_all_tabs" />
+ <command id="cmd_adv_user_edit" />
+ <command id="cmd_console" />
+ <command id="cmd_shell" />
+ <command id="cmd_xuleditor" />
+ <command id="cmd_fieldmapper" />
+ <command id="cmd_test_html" />
+ <command id="cmd_test_xul" />
+ <command id="cmd_clear_cache" />
+ <command id="cmd_restore_all_tabs" />
 
-	<command id="cmd_test" />
-	<command id="cmd_broken" disabled="true" />
-	<command id="cmd_open_vandelay" />
+ <command id="cmd_test" />
+ <command id="cmd_broken" disabled="true" />
+ <command id="cmd_open_vandelay" />
     
-	<command id="cmd_acq_view_picklist" />
-	<command id="cmd_acq_upload" />
-	<command id="cmd_acq_view_po" />
-	<command id="cmd_acq_bib_search" />
-	<command id="cmd_acq_new_brief_record" />
+ <command id="cmd_acq_view_picklist" />
+ <command id="cmd_acq_upload" />
+ <command id="cmd_acq_view_po" />
+ <command id="cmd_acq_bib_search" />
+ <command id="cmd_acq_new_brief_record" />
     <command id="cmd_acq_view_fund" />
     <command id="cmd_acq_view_funding_source" />
     <command id="cmd_acq_view_provider" />
@@ -122,166 +122,166 @@
 
 <!-- Accelerator Keys (Accessor Keys are in DTD's) -->
 <keyset id="menu_frame_keys">
-	<key id="new-window-key" modifiers="accel" key="N" command="cmd_new_window"/>
-	<key id="new-tab-key" modifiers="accel" key="T" command="cmd_new_tab"/>
-	<key id="open-key" modifiers="accel" key="O" command=""/>
-	<key id="save-key" modifiers="accel" key="S" command=""/>
-	<key id="close-tab-key" modifiers="accel" key="W" command="cmd_close_tab"/>
-	<key id="close-all-tabs-key" modifiers="accel,shift" key="W" command="cmd_close_all_tabs"/>
-	<key id="close-window-key" modifiers="accel" key="Q" command="cmd_close_window"/>
-	<key id="circ-checkout-key" keycode="VK_F1" command="cmd_circ_checkout"/>
-	<key id="circ-checkin-key" keycode="VK_F2" command="cmd_circ_checkin"/>
-	<key id="reprint-receipt-key" keycode="VK_F9" command="cmd_reprint"/>
-	<key id="search-opac-key" keycode="VK_F3" command="cmd_search_opac"/>
-	<key id="search-tcn-key" keycode="VK_F3" modifiers="shift" command="cmd_search_tcn"/>
-	<key id="patron-search-key" keycode="VK_F4" command="cmd_patron_search"/>
-	<key id="copy-status-key" keycode="VK_F5" command="cmd_copy_status"/>
-	<key id="circ-in-house-use-key" keycode="VK_F6" command="cmd_in_house_use"/>
-	<key id="circ-hold-capture-key" keycode="VK_F2" modifiers="shift" command="cmd_circ_hold_capture"/>
-	<key id="patron-register-key" keycode="VK_F1" modifiers="shift" command="cmd_patron_register"/>
-	<key id="retrieve_last_patron_key" keycode="VK_F8" command="cmd_retrieve_last_patron"/>
-	<key id="retrieve_last_record_key" keycode="VK_F8" modifiers="shift" command="cmd_retrieve_last_record"/>
+ <key id="new-window-key" modifiers="accel" key="N" command="cmd_new_window"/>
+ <key id="new-tab-key" modifiers="accel" key="T" command="cmd_new_tab"/>
+ <key id="open-key" modifiers="accel" key="O" command=""/>
+ <key id="save-key" modifiers="accel" key="S" command=""/>
+ <key id="close-tab-key" modifiers="accel" key="W" command="cmd_close_tab"/>
+ <key id="close-all-tabs-key" modifiers="accel,shift" key="W" command="cmd_close_all_tabs"/>
+ <key id="close-window-key" modifiers="accel" key="Q" command="cmd_close_window"/>
+ <key id="circ-checkout-key" keycode="VK_F1" command="cmd_circ_checkout"/>
+ <key id="circ-checkin-key" keycode="VK_F2" command="cmd_circ_checkin"/>
+ <key id="reprint-receipt-key" keycode="VK_F9" command="cmd_reprint"/>
+ <key id="search-opac-key" keycode="VK_F3" command="cmd_search_opac"/>
+ <key id="search-tcn-key" keycode="VK_F3" modifiers="shift" command="cmd_search_tcn"/>
+ <key id="patron-search-key" keycode="VK_F4" command="cmd_patron_search"/>
+ <key id="copy-status-key" keycode="VK_F5" command="cmd_copy_status"/>
+ <key id="circ-in-house-use-key" keycode="VK_F6" command="cmd_in_house_use"/>
+ <key id="circ-hold-capture-key" keycode="VK_F2" modifiers="shift" command="cmd_circ_hold_capture"/>
+ <key id="patron-register-key" keycode="VK_F1" modifiers="shift" command="cmd_patron_register"/>
+ <key id="retrieve_last_patron_key" keycode="VK_F8" command="cmd_retrieve_last_patron"/>
+ <key id="retrieve_last_record_key" keycode="VK_F8" modifiers="shift" command="cmd_retrieve_last_record"/>
 </keyset>
 
 <!-- The File menu on the main menu -->
 <menu id="main.menu.file" label="&staff.main.menu.file.label;" accesskey="&staff.main.menu.file.accesskey;" >
-	<menupopup id="main.menu.file.popup">
-		<menuitem label="&staff.main.menu.file.new.label;" accesskey="&staff.main.menu.file.new.accesskey;" key="new-window-key" command="cmd_new_window"/>
-		<menuitem label="&staff.main.menu.file.new_tab.label;" accesskey="&staff.main.menu.file.new_tab.accesskey;" key="new-tab-key" command="cmd_new_tab"/>
-		<menuseparator />
-		<menuitem label="&staff.main.menu.file.close_tab.label;" accesskey="&staff.main.menu.file.close_tab.accesskey;" oldaccesskey="&staff.main.menu.file.close_tab.key;" key="close-tab-key" command="cmd_close_tab"/>
-		<menuitem label="&staff.main.menu.tabs.close;" accesskey="&staff.main.menu.tabs.close.accesskey;" key="close-all-tabs-key" command="cmd_close_all_tabs"/>
-		<menuitem label="&staff.main.menu.file.close.label;" accesskey="&staff.main.menu.file.close.accesskey;" oldaccesskey="&staff.main.menu.file.close.key;" key="close-window-key" command="cmd_close_window"/>
-		<menuseparator />
-		<menuitem label="&staff.main.menu.quit;" accesskey="&staff.main.menu.quit.accesskey;" command="cmd_shutdown"/>
-	</menupopup>
+ <menupopup id="main.menu.file.popup">
+  <menuitem label="&staff.main.menu.file.new.label;" accesskey="&staff.main.menu.file.new.accesskey;" key="new-window-key" command="cmd_new_window"/>
+  <menuitem label="&staff.main.menu.file.new_tab.label;" accesskey="&staff.main.menu.file.new_tab.accesskey;" key="new-tab-key" command="cmd_new_tab"/>
+  <menuseparator />
+  <menuitem label="&staff.main.menu.file.close_tab.label;" accesskey="&staff.main.menu.file.close_tab.accesskey;" oldaccesskey="&staff.main.menu.file.close_tab.key;" key="close-tab-key" command="cmd_close_tab"/>
+  <menuitem label="&staff.main.menu.tabs.close;" accesskey="&staff.main.menu.tabs.close.accesskey;" key="close-all-tabs-key" command="cmd_close_all_tabs"/>
+  <menuitem label="&staff.main.menu.file.close.label;" accesskey="&staff.main.menu.file.close.accesskey;" oldaccesskey="&staff.main.menu.file.close.key;" key="close-window-key" command="cmd_close_window"/>
+  <menuseparator />
+  <menuitem label="&staff.main.menu.quit;" accesskey="&staff.main.menu.quit.accesskey;" command="cmd_shutdown"/>
+ </menupopup>
 </menu>
 
 <!-- The Edit menu on the main menu -->
 <menu id="main.menu.edit" label="&staff.main.menu.edit.label;" accesskey="&staff.main.menu.edit.accesskey;">
-	<menupopup id="main.menu.edit.popup">
-		<menuitem label="&staff.main.menu.edit.buckets.copies;" command="cmd_edit_copy_buckets" accesskey="&staff.main.menu.edit.buckets.copies.accesskey;"/>
+ <menupopup id="main.menu.edit.popup">
+  <menuitem label="&staff.main.menu.edit.buckets.copies;" command="cmd_edit_copy_buckets" accesskey="&staff.main.menu.edit.buckets.copies.accesskey;"/>
         <!--
-		<menuitem label="&staff.main.menu.edit.buckets.volumes;" command="cmd_edit_volume_buckets" accesskey="&staff.main.menu.edit.buckets.volumes.accesskey;"/>
+  <menuitem label="&staff.main.menu.edit.buckets.volumes;" command="cmd_edit_volume_buckets" accesskey="&staff.main.menu.edit.buckets.volumes.accesskey;"/>
         -->
-		<menuitem label="&staff.main.menu.edit.buckets.records;" command="cmd_edit_record_buckets" accesskey="&staff.main.menu.edit.buckets.records.accesskey;"/>
+  <menuitem label="&staff.main.menu.edit.buckets.records;" command="cmd_edit_record_buckets" accesskey="&staff.main.menu.edit.buckets.records.accesskey;"/>
         <!--
-		<menuitem label="&staff.main.menu.edit.buckets.users;" command="cmd_edit_user_buckets" accesskey="&staff.main.menu.edit.buckets.users.accesskey;"/>
+  <menuitem label="&staff.main.menu.edit.buckets.users;" command="cmd_edit_user_buckets" accesskey="&staff.main.menu.edit.buckets.users.accesskey;"/>
         -->
-		<menuseparator />
-		<menuitem label="&staff.main.menu.replace_barcode.label;" command="cmd_replace_barcode"/>
-	</menupopup>
+  <menuseparator />
+  <menuitem label="&staff.main.menu.replace_barcode.label;" command="cmd_replace_barcode"/>
+ </menupopup>
 </menu>
 
 <!-- The Circulation menu on the main menu -->
 <menu id="main.menu.circ" label="&staff.main.menu.circ.label;" accesskey="&staff.main.menu.circ.accesskey;">
-	<menupopup id="main.menu.circ.popup">
-		<menuitem label="&staff.main.menu.circ.checkout.label;" accesskey="&staff.main.menu.circ.checkout.accesskey;" key="circ-checkout-key" command="cmd_circ_checkout"/>
-		<menuitem label="&staff.main.menu.circ.checkin.label;" accesskey="&staff.main.menu.circ.checkin.accesskey;" key="circ-checkin-key" command="cmd_circ_checkin"/>
-		<menuitem label="&staff.main.menu.circ.patron_registration.label;" accesskey="&staff.main.menu.circ.patron_registration.accesskey;" key="patron-register-key" command="cmd_patron_register"/>
-		<menuitem label="&staff.main.menu.circ.patron_retrieve.label;" accesskey="&staff.main.menu.circ.patron_retrieve.accesskey;" command="cmd_retrieve_last_patron" key="retrieve_last_patron_key"/>
-		<menuseparator />
-		<menuitem label="&staff.main.menu.circ.hold_capture.label;" accesskey="&staff.main.menu.circ.hold_capture.accesskey;" key="circ-hold-capture-key" command="cmd_circ_hold_capture"/>
-		<menuitem label="&staff.main.menu.circ.hold_pull.label;" accesskey="&staff.main.menu.circ.hold_pull.accesskey;" command="cmd_circ_hold_pull_list"/>
-		<menuitem label="&staff.main.menu.circ.hold_browse.label;" command="cmd_browse_holds_shelf" accesskey="&staff.main.menu.circ.hold_browse.accesskey;"/>
-		<menuitem label="&staff.main.menu.circ.place_hold.label;" accesskey="&staff.main.menu.circ.place_hold.accesskey;" key="search-opac-key" command="cmd_search_opac"/>
-		<menuseparator />
-		<menuitem label="&staff.main.menu.circ.barcode.show_item;" accesskey="&staff.main.menu.circ.barcode.show_item.accesskey;" key="copy-status-key" command="cmd_copy_status"/>
-		<menuitem label="&staff.main.menu.circ.barcode.retrieve_patron;" accesskey="&staff.main.menu.circ.barcode.retrieve_patron.accesskey;" key="circ-checkout-key" command="cmd_circ_checkout"/>
-		<menuitem label="&staff.main.menu.circ.verify_credentials;" accesskey="&staff.main.menu.circ.verify_credentials.accesskey;" command="cmd_verify_credentials"/>
-		<menuitem label="&staff.main.menu.replace_barcode.label;" command="cmd_replace_barcode"/>
-		<menuitem label="&staff.main.menu.circ.in_house.label;" accesskey="&staff.main.menu.circ.in_house.accesskey;" key="circ-in-house-use-key" command="cmd_in_house_use"/>
-		<menuseparator />
-		<menuitem label="&staff.main.menu.circ.reprint.label;" accesskey="&staff.main.menu.circ.reprint.accesskey;" key="reprint-receipt-key" command="cmd_reprint"/>
-		<menuitem label="&staff.main.menu.circ.offline.label;" command="cmd_standalone" accesskey="&staff.main.menu.circ.offline.accesskey;"/>
-	</menupopup>
+ <menupopup id="main.menu.circ.popup">
+  <menuitem label="&staff.main.menu.circ.checkout.label;" accesskey="&staff.main.menu.circ.checkout.accesskey;" key="circ-checkout-key" command="cmd_circ_checkout"/>
+  <menuitem label="&staff.main.menu.circ.checkin.label;" accesskey="&staff.main.menu.circ.checkin.accesskey;" key="circ-checkin-key" command="cmd_circ_checkin"/>
+  <menuitem label="&staff.main.menu.circ.patron_registration.label;" accesskey="&staff.main.menu.circ.patron_registration.accesskey;" key="patron-register-key" command="cmd_patron_register"/>
+  <menuitem label="&staff.main.menu.circ.patron_retrieve.label;" accesskey="&staff.main.menu.circ.patron_retrieve.accesskey;" command="cmd_retrieve_last_patron" key="retrieve_last_patron_key"/>
+  <menuseparator />
+  <menuitem label="&staff.main.menu.circ.hold_capture.label;" accesskey="&staff.main.menu.circ.hold_capture.accesskey;" key="circ-hold-capture-key" command="cmd_circ_hold_capture"/>
+  <menuitem label="&staff.main.menu.circ.hold_pull.label;" accesskey="&staff.main.menu.circ.hold_pull.accesskey;" command="cmd_circ_hold_pull_list"/>
+  <menuitem label="&staff.main.menu.circ.hold_browse.label;" command="cmd_browse_holds_shelf" accesskey="&staff.main.menu.circ.hold_browse.accesskey;"/>
+  <menuitem label="&staff.main.menu.circ.place_hold.label;" accesskey="&staff.main.menu.circ.place_hold.accesskey;" key="search-opac-key" command="cmd_search_opac"/>
+  <menuseparator />
+  <menuitem label="&staff.main.menu.circ.barcode.show_item;" accesskey="&staff.main.menu.circ.barcode.show_item.accesskey;" key="copy-status-key" command="cmd_copy_status"/>
+  <menuitem label="&staff.main.menu.circ.barcode.retrieve_patron;" accesskey="&staff.main.menu.circ.barcode.retrieve_patron.accesskey;" key="circ-checkout-key" command="cmd_circ_checkout"/>
+  <menuitem label="&staff.main.menu.circ.verify_credentials;" accesskey="&staff.main.menu.circ.verify_credentials.accesskey;" command="cmd_verify_credentials"/>
+  <menuitem label="&staff.main.menu.replace_barcode.label;" command="cmd_replace_barcode"/>
+  <menuitem label="&staff.main.menu.circ.in_house.label;" accesskey="&staff.main.menu.circ.in_house.accesskey;" key="circ-in-house-use-key" command="cmd_in_house_use"/>
+  <menuseparator />
+  <menuitem label="&staff.main.menu.circ.reprint.label;" accesskey="&staff.main.menu.circ.reprint.accesskey;" key="reprint-receipt-key" command="cmd_reprint"/>
+  <menuitem label="&staff.main.menu.circ.offline.label;" command="cmd_standalone" accesskey="&staff.main.menu.circ.offline.accesskey;"/>
+ </menupopup>
 </menu>
 
 <!-- The Cataloging menu on the main menu -->
 <menu id="main.menu.cat" label="&staff.main.menu.cat.label;" accesskey="&staff.main.menu.cat.accesskey;">
-	<menupopup id="main.menu.cat.popup">
-		<menuitem label="&staff.main.menu.cat.bib_search.label;" accesskey="&staff.main.menu.cat.bib_search.accesskey;" key="search-opac-key" command="cmd_search_opac"/>
-		<menuitem label="&staff.main.menu.cat.search_tcn.label;" accesskey="&staff.main.menu.cat.search_tcn.accesskey;" key="search-tcn-key" command="cmd_search_tcn" />
-		<menuitem label="&staff.main.menu.cat.search_bib_id.label;" accesskey="&staff.main.menu.cat.search_bib_id.accesskey;" key="search-bib-id-key" command="cmd_search_bib_id" />
-		<menuitem label="&staff.main.menu.cat.copy_status.label;" accesskey="&staff.main.menu.cat.copy_status.accesskey;" key="copy-status-key" command="cmd_copy_status"/>
-		<menuseparator />
-		<!--
-		<menuitem disabled="true" label="&staff.main.menu.cat.dedup.label;" accesskey="&staff.main.menu.cat.dedup.accesskey;" command="cmd_broken"/>
-		-->
-		<menuitem label="&staff.main.menu.cat.edit_copy_buckets.label;" command="cmd_edit_copy_buckets" accesskey="&staff.main.menu.cat.edit_copy_buckets.accesskey;"/>
+ <menupopup id="main.menu.cat.popup">
+  <menuitem label="&staff.main.menu.cat.bib_search.label;" accesskey="&staff.main.menu.cat.bib_search.accesskey;" key="search-opac-key" command="cmd_search_opac"/>
+  <menuitem label="&staff.main.menu.cat.search_tcn.label;" accesskey="&staff.main.menu.cat.search_tcn.accesskey;" key="search-tcn-key" command="cmd_search_tcn" />
+  <menuitem label="&staff.main.menu.cat.search_bib_id.label;" accesskey="&staff.main.menu.cat.search_bib_id.accesskey;" key="search-bib-id-key" command="cmd_search_bib_id" />
+  <menuitem label="&staff.main.menu.cat.copy_status.label;" accesskey="&staff.main.menu.cat.copy_status.accesskey;" key="copy-status-key" command="cmd_copy_status"/>
+  <menuseparator />
+  <!--
+  <menuitem disabled="true" label="&staff.main.menu.cat.dedup.label;" accesskey="&staff.main.menu.cat.dedup.accesskey;" command="cmd_broken"/>
+  -->
+  <menuitem label="&staff.main.menu.cat.edit_copy_buckets.label;" command="cmd_edit_copy_buckets" accesskey="&staff.main.menu.cat.edit_copy_buckets.accesskey;"/>
         <!--
-		<menuitem label="&staff.main.menu.cat.edit_volume_buckets.label;" command="cmd_edit_volume_buckets" accesskey="&staff.main.menu.cat.edit_volume_buckets.accesskey;"/>
+  <menuitem label="&staff.main.menu.cat.edit_volume_buckets.label;" command="cmd_edit_volume_buckets" accesskey="&staff.main.menu.cat.edit_volume_buckets.accesskey;"/>
         -->
-		<menuitem label="&staff.main.menu.cat.edit_record_buckets.label;" command="cmd_edit_record_buckets" accesskey="&staff.main.menu.cat.edit_record_buckets.accesskey;"/>
-		<menuseparator />
-		<menuitem label="&staff.main.menu.cat.create_marc.label;" accesskey="&staff.main.menu.cat.create_marc.accesskey;" command="cmd_create_marc"/>
-		<menuitem label="&staff.main.menu.cat.z39_50_import.label;" accesskey="&staff.main.menu.cat.z39_50_import.accesskey;" command="cmd_z39_50_import"/>
-		<menuitem label="&staff.main.menu.cat.vandelay.label;" command="cmd_open_vandelay"/>
-		<menuseparator />
-		<menuitem label="&staff.main.menu.replace_barcode.label;" command="cmd_replace_barcode"/>
-		<menuitem label="&staff.main.menu.cat.retrieve_last_record.label;" accesskey="&staff.main.menu.cat.retrieve_last_record.accesskey;" command="cmd_retrieve_last_record" key="retrieve_last_record_key"/>
-	</menupopup>
+  <menuitem label="&staff.main.menu.cat.edit_record_buckets.label;" command="cmd_edit_record_buckets" accesskey="&staff.main.menu.cat.edit_record_buckets.accesskey;"/>
+  <menuseparator />
+  <menuitem label="&staff.main.menu.cat.create_marc.label;" accesskey="&staff.main.menu.cat.create_marc.accesskey;" command="cmd_create_marc"/>
+  <menuitem label="&staff.main.menu.cat.z39_50_import.label;" accesskey="&staff.main.menu.cat.z39_50_import.accesskey;" command="cmd_z39_50_import"/>
+  <menuitem label="&staff.main.menu.cat.vandelay.label;" command="cmd_open_vandelay"/>
+  <menuseparator />
+  <menuitem label="&staff.main.menu.replace_barcode.label;" command="cmd_replace_barcode"/>
+  <menuitem label="&staff.main.menu.cat.retrieve_last_record.label;" accesskey="&staff.main.menu.cat.retrieve_last_record.accesskey;" command="cmd_retrieve_last_record" key="retrieve_last_record_key"/>
+ </menupopup>
 </menu>
 
 
 <!-- The Acquisitions menu on the main menu -->
 <menu id="main.menu.acq" label="&staff.main.menu.acq.label;">
-	<menupopup id="main.menu.acq.popup">
-		<menuitem label="&staff.main.menu.acq.picklist.label;" command="cmd_acq_view_picklist"/>
-		<menuitem label="&staff.main.menu.acq.bib_search.label;" command="cmd_acq_bib_search"/>
-		<menuitem label="&staff.main.menu.acq.upload.label;" command="cmd_acq_upload"/>
-		<menuitem label="&staff.main.menu.acq.brief_record.label;" command="cmd_acq_new_brief_record"/>
-		<menuseparator />
-		<menuitem label="&staff.main.menu.acq.po.label;" command="cmd_acq_view_po" />
-		<menuseparator />
-		<menuitem label="&staff.main.menu.acq.fund.label;" command="cmd_acq_view_fund" />
-		<menuitem label="&staff.main.menu.acq.funding_source.label;" command="cmd_acq_view_funding_source" />
-		<menuitem label="&staff.main.menu.acq.provider.label;" command="cmd_acq_view_provider" />
-		<menuitem label="&staff.main.menu.acq.currency_type.label;" command="cmd_acq_view_currency_type" />
-		<menuitem label="&staff.main.menu.acq.exchange_rate.label;" command="cmd_acq_view_exchange_rate" />
-		<menuitem label="&staff.main.menu.acq.distrib_formula.label;" command="cmd_acq_view_distrib_formula" />
+ <menupopup id="main.menu.acq.popup">
+  <menuitem label="&staff.main.menu.acq.picklist.label;" command="cmd_acq_view_picklist"/>
+  <menuitem label="&staff.main.menu.acq.bib_search.label;" command="cmd_acq_bib_search"/>
+  <menuitem label="&staff.main.menu.acq.upload.label;" command="cmd_acq_upload"/>
+  <menuitem label="&staff.main.menu.acq.brief_record.label;" command="cmd_acq_new_brief_record"/>
+  <menuseparator />
+  <menuitem label="&staff.main.menu.acq.po.label;" command="cmd_acq_view_po" />
+  <menuseparator />
+  <menuitem label="&staff.main.menu.acq.fund.label;" command="cmd_acq_view_fund" />
+  <menuitem label="&staff.main.menu.acq.funding_source.label;" command="cmd_acq_view_funding_source" />
+  <menuitem label="&staff.main.menu.acq.provider.label;" command="cmd_acq_view_provider" />
+  <menuitem label="&staff.main.menu.acq.currency_type.label;" command="cmd_acq_view_currency_type" />
+  <menuitem label="&staff.main.menu.acq.exchange_rate.label;" command="cmd_acq_view_exchange_rate" />
+  <menuitem label="&staff.main.menu.acq.distrib_formula.label;" command="cmd_acq_view_distrib_formula" />
     </menupopup>
 </menu>
 
 
 <!-- The Search menu on the main menu -->
 <menu id="main.menu.search" label="&staff.main.menu.search.label;" accesskey="&staff.main.menu.search.accesskey;">
-	<menupopup id="main.menu.search.popup">
-		<menuitem label="&staff.main.menu.search.patrons.label;" accesskey="&staff.main.menu.search.patrons.accesskey;" key="patron-search-key" command="cmd_patron_search" />
-		<menuitem label="&staff.main.menu.search.catalog.label;" accesskey="&staff.main.menu.search.catalog.accesskey;" key="search-opac-key" command="cmd_search_opac" />
-		<menuitem label="&staff.main.menu.search.record.label;" accesskey="&staff.main.menu.search.record.accesskey;" key="search-tcn-key" command="cmd_search_tcn" />
-		<menuitem label="&staff.main.menu.search.record_via_id.label;" accesskey="&staff.main.menu.search.record_via_id.accesskey;" key="search-bib-id-key" command="cmd_search_bib_id" />
-		<menuitem label="&staff.main.menu.search.copies.label;" accesskey="&staff.main.menu.search.copies.accesskey;" key="copy-status-key" command="cmd_copy_status"/>
-		<menuitem label="&staff.main.menu.search.patrons_barcode.label;" accesskey="&staff.main.menu.search.patrons_barcode.accesskey;" key="circ-checkout-key" command="cmd_circ_checkout"/>
-	</menupopup>
+ <menupopup id="main.menu.search.popup">
+  <menuitem label="&staff.main.menu.search.patrons.label;" accesskey="&staff.main.menu.search.patrons.accesskey;" key="patron-search-key" command="cmd_patron_search" />
+  <menuitem label="&staff.main.menu.search.catalog.label;" accesskey="&staff.main.menu.search.catalog.accesskey;" key="search-opac-key" command="cmd_search_opac" />
+  <menuitem label="&staff.main.menu.search.record.label;" accesskey="&staff.main.menu.search.record.accesskey;" key="search-tcn-key" command="cmd_search_tcn" />
+  <menuitem label="&staff.main.menu.search.record_via_id.label;" accesskey="&staff.main.menu.search.record_via_id.accesskey;" key="search-bib-id-key" command="cmd_search_bib_id" />
+  <menuitem label="&staff.main.menu.search.copies.label;" accesskey="&staff.main.menu.search.copies.accesskey;" key="copy-status-key" command="cmd_copy_status"/>
+  <menuitem label="&staff.main.menu.search.patrons_barcode.label;" accesskey="&staff.main.menu.search.patrons_barcode.accesskey;" key="circ-checkout-key" command="cmd_circ_checkout"/>
+ </menupopup>
 </menu>
 
 <!-- The Help menu on the main menu -->
 <menu id="main.menu.help" label="&staff.main.menu.help.label;" accesskey="&staff.main.menu.help.accesskey;">
-	<menupopup id="main.menu.help.popup">
-		<menuitem label="stub" />
-	</menupopup>
+ <menupopup id="main.menu.help.popup">
+  <menuitem label="stub" />
+ </menupopup>
 </menu>
 
 <!-- The Help menu on the main menu -->
 <menu id="main.menu.admin" label="&staff.main.menu.admin.label;" accesskey="&staff.main.menu.admin.accesskey;" old_accesskey="&staff.main.menu.admin.key;">
-	<menupopup id="main.menu.admin.popup">
-		<menuitem id="oc_menuitem" label="&staff.main.menu.admin.change_session.label;" label_orig="&staff.main.menu.admin.change_session.label;" 
-			accesskey="O" command="cmd_change_session"/>
-		<menuitem label="&staff.main.menu.admin.offline_xacts.label;" accesskey="&staff.main.menu.admin.offline_xacts.accesskey;" command="cmd_manage_offline_xacts"/>
-		<menuitem label="&staff.main.menu.admin.download_patrons.label;" accesskey="&staff.main.menu.admin.download_patrons.accesskey;" command="cmd_download_patrons"/>
-		<menuseparator />
+ <menupopup id="main.menu.admin.popup">
+  <menuitem id="oc_menuitem" label="&staff.main.menu.admin.change_session.label;" label_orig="&staff.main.menu.admin.change_session.label;" 
+   accesskey="O" command="cmd_change_session"/>
+  <menuitem label="&staff.main.menu.admin.offline_xacts.label;" accesskey="&staff.main.menu.admin.offline_xacts.accesskey;" command="cmd_manage_offline_xacts"/>
+  <menuitem label="&staff.main.menu.admin.download_patrons.label;" accesskey="&staff.main.menu.admin.download_patrons.accesskey;" command="cmd_download_patrons"/>
+  <menuseparator />
 
-		<menu id="main.menu.admin.local" label="&staff.main.menu.admin.local_admin.label;">
-			<menupopup id="main.menu.admin.local.popup">
-		        <menuitem label="&staff.main.menu.admin.template_edit.label;" accesskey="&staff.main.menu.admin.template_edit.accesskey;" command="cmd_print_list_template_edit"/>
-				<menuitem label="&staff.server.admin.index.fonts_and_sounds;" command="cmd_local_admin_fonts_and_sounds"/>
-				<menuitem label="&staff.server.admin.index.printer;" command="cmd_local_admin_printer"/>
-				<menuitem label="&staff.server.admin.index.closed_dates;" command="cmd_local_admin_closed_dates"/>
-				<menuitem label="&staff.server.admin.index.copy_locations;" command="cmd_local_admin_copy_locations"/>
-				<menuitem label="&staff.server.admin.index.library_settings;" command="cmd_local_admin_lib_settings"/>
-				<menuitem label="&staff.server.admin.index.non_cataloged_types;" command="cmd_local_admin_non_cat_types"/>
-				<menuitem label="&staff.server.admin.index.statistical_categories;" command="cmd_local_admin_stat_cats"/>
+  <menu id="main.menu.admin.local" label="&staff.main.menu.admin.local_admin.label;">
+   <menupopup id="main.menu.admin.local.popup">
+          <menuitem label="&staff.main.menu.admin.template_edit.label;" accesskey="&staff.main.menu.admin.template_edit.accesskey;" command="cmd_print_list_template_edit"/>
+    <menuitem label="&staff.server.admin.index.fonts_and_sounds;" command="cmd_local_admin_fonts_and_sounds"/>
+    <menuitem label="&staff.server.admin.index.printer;" command="cmd_local_admin_printer"/>
+    <menuitem label="&staff.server.admin.index.closed_dates;" command="cmd_local_admin_closed_dates"/>
+    <menuitem label="&staff.server.admin.index.copy_locations;" command="cmd_local_admin_copy_locations"/>
+    <menuitem label="&staff.server.admin.index.library_settings;" command="cmd_local_admin_lib_settings"/>
+    <menuitem label="&staff.server.admin.index.non_cataloged_types;" command="cmd_local_admin_non_cat_types"/>
+    <menuitem label="&staff.server.admin.index.statistical_categories;" command="cmd_local_admin_stat_cats"/>
                 <menuitem label="&staff.main.menu.admin.local_admin.conify.standing_penalty.label;" command="cmd_local_admin_standing_penalty"/>
                 <menuitem label="&staff.main.menu.admin.local_admin.conify.grp_penalty_threshold.label;" command="cmd_local_admin_grp_penalty_threshold"/>
                 <menuitem label="&staff.main.menu.admin.local_admin.conify.idl_field_doc.label;" command="cmd_local_admin_idl_field_doc"/>
@@ -294,8 +294,8 @@
                 <menuitem label="&staff.main.menu.admin.local_admin.hold_matrix_matchpoint.label;" command="cmd_local_admin_hold_matrix_matchpoint"/>
             </menupopup>
         </menu>
-		<menu id="main.menu.admin.server" label="&staff.main.menu.admin.server_admin.label;">
-			<menupopup id="main.menu.admin.server.popup">
+  <menu id="main.menu.admin.server" label="&staff.main.menu.admin.server_admin.label;">
+   <menupopup id="main.menu.admin.server.popup">
                 <menuitem label="&staff.main.menu.admin.server_admin.conify.org_unit_type.label;" command="cmd_server_admin_org_type"/>
                 <menuitem label="&staff.main.menu.admin.server_admin.conify.org_unit.label;" command="cmd_server_admin_org_unit"/>
                 <menuitem label="&staff.main.menu.admin.server_admin.conify.grp_tree.label;" command="cmd_server_admin_grp_tree"/>
@@ -308,40 +308,40 @@
             </menupopup>
         </menu>
 
-		<menuseparator />
-		<menuitem label="&staff.main.menu.admin.local_admin.label;" accesskey="&staff.main.menu.admin.local_admin.accesskey;" command="cmd_local_admin"/>
-		<menuitem label="&staff.main.menu.admin.user_edit.label;" accesskey="&staff.main.menu.admin.user_edit.accesskey;" command="cmd_adv_user_edit"/>
-		<menuitem label="&staff.main.menu.admin.toggle_buttonbar.label;" accesskey="&staff.main.menu.admin.toggle_buttonbar.accesskey;" command="cmd_toggle_buttonbar"/>
-		<menuseparator />
-		<menu id="main.menu.admin.sub" accesskey="&staff.main.menu.admin.developer.accesskey;" label="&staff.main.menu.admin.developer.label;">
-			<menupopup id="main.menu.admin.sub.popup">
-				<menuitem label="&staff.main.menu.admin.stat_cat_edit.label;" accesskey="&staff.main.menu.admin.stat_cat_edit.accesskey;" command="cmd_stat_cat_edit"/>
-				<menuitem label="&staff.main.menu.admin.non_cat_type_edit.label;" accesskey="&staff.main.menu.admin.non_cat_type_edit.accesskey;" command="cmd_non_cat_type_edit"/>
-				<menuitem label="&staff.main.menu.admin.copy_location_edit.label;" accesskey="&staff.main.menu.admin.copy_location_edit.accesskey;" command="cmd_copy_location_edit"/>
-				<menuitem label="&staff.main.menu.admin.browse_holds.label;" command="cmd_browse_holds" accesskey="&staff.main.menu.admin.browse_holds.accesskey;"/>
-				<menuseparator />
-				<menuitem label="&staff.main.menu.admin.public_opac.label;" command="cmd_public_opac" accesskey="&staff.main.menu.admin.public_opac.accesskey;"/>
-				<menuitem label="&staff.main.menu.admin.cmd_test.label;" old_accesskey="T" command="cmd_test"/>
-				<menuitem label="&staff.main.menu.admin.xuleditor.label;" accesskey="&staff.main.menu.admin.xuleditor.accesskey;" command="cmd_xuleditor"/>
-				<menuitem label="&staff.main.menu.admin.fieldmapper.label;" accesskey="&staff.main.menu.admin.fieldmapper.accesskey;" command="cmd_fieldmapper"/>
-				<menuitem label="&staff.main.menu.admin.cmd_console.label;" accesskey="&staff.main.menu.admin.cmd_console.accesskey;" command="cmd_console"/>
-				<menuitem label="&staff.main.menu.admin.cmd_shell.label;" accesskey="&staff.main.menu.admin.cmd_shell.accesskey;" command="cmd_shell"/>
-				<menuitem label="&staff.main.menu.admin.cmd_chrome_shell.label;" accesskey="&staff.main.menu.admin.cmd_chrome_shell.accesskey;" 
+  <menuseparator />
+  <menuitem label="&staff.main.menu.admin.local_admin.label;" accesskey="&staff.main.menu.admin.local_admin.accesskey;" command="cmd_local_admin"/>
+  <menuitem label="&staff.main.menu.admin.user_edit.label;" accesskey="&staff.main.menu.admin.user_edit.accesskey;" command="cmd_adv_user_edit"/>
+  <menuitem label="&staff.main.menu.admin.toggle_buttonbar.label;" accesskey="&staff.main.menu.admin.toggle_buttonbar.accesskey;" command="cmd_toggle_buttonbar"/>
+  <menuseparator />
+  <menu id="main.menu.admin.sub" accesskey="&staff.main.menu.admin.developer.accesskey;" label="&staff.main.menu.admin.developer.label;">
+   <menupopup id="main.menu.admin.sub.popup">
+    <menuitem label="&staff.main.menu.admin.stat_cat_edit.label;" accesskey="&staff.main.menu.admin.stat_cat_edit.accesskey;" command="cmd_stat_cat_edit"/>
+    <menuitem label="&staff.main.menu.admin.non_cat_type_edit.label;" accesskey="&staff.main.menu.admin.non_cat_type_edit.accesskey;" command="cmd_non_cat_type_edit"/>
+    <menuitem label="&staff.main.menu.admin.copy_location_edit.label;" accesskey="&staff.main.menu.admin.copy_location_edit.accesskey;" command="cmd_copy_location_edit"/>
+    <menuitem label="&staff.main.menu.admin.browse_holds.label;" command="cmd_browse_holds" accesskey="&staff.main.menu.admin.browse_holds.accesskey;"/>
+    <menuseparator />
+    <menuitem label="&staff.main.menu.admin.public_opac.label;" command="cmd_public_opac" accesskey="&staff.main.menu.admin.public_opac.accesskey;"/>
+    <menuitem label="&staff.main.menu.admin.cmd_test.label;" old_accesskey="T" command="cmd_test"/>
+    <menuitem label="&staff.main.menu.admin.xuleditor.label;" accesskey="&staff.main.menu.admin.xuleditor.accesskey;" command="cmd_xuleditor"/>
+    <menuitem label="&staff.main.menu.admin.fieldmapper.label;" accesskey="&staff.main.menu.admin.fieldmapper.accesskey;" command="cmd_fieldmapper"/>
+    <menuitem label="&staff.main.menu.admin.cmd_console.label;" accesskey="&staff.main.menu.admin.cmd_console.accesskey;" command="cmd_console"/>
+    <menuitem label="&staff.main.menu.admin.cmd_shell.label;" accesskey="&staff.main.menu.admin.cmd_shell.accesskey;" command="cmd_shell"/>
+    <menuitem label="&staff.main.menu.admin.cmd_chrome_shell.label;" accesskey="&staff.main.menu.admin.cmd_chrome_shell.accesskey;" 
                     oncommand="try{xulG.window.win.start_js_shell();}catch(E){alert(E);}"/>
-				<menuitem label="server/main/test.html" accesskey="1" command="cmd_test_html"/>
-				<menuitem label="server/main/test.xul" accesskey="2" command="cmd_test_xul"/>
-				<menuitem label="&staff.main.menu.admin.clear_cache.label;" accesskey="&staff.main.menu.admin.clear_cache.accesskey;" command="cmd_clear_cache"/>
-				<menuitem label="&staff.main.menu.admin.restore_all_tabs.label;" command="cmd_restore_all_tabs"/>
-				<menuitem label="&staff.main.menu.admin.extension_manager.label;" command="cmd_extension_manager"/>
-				<menuitem label="&staff.main.menu.admin.theme_manager.label;" command="cmd_theme_manager"/>
-				<menuitem label="&staff.main.menu.admin.about_config.label;" command="cmd_about_config"/>
-				<menuitem label="&staff.main.menu.admin.venkman.label;" oncommand="try{xulG.window.win.start_debugger();}catch(E){alert(E);}"/>
-				<menuitem label="&staff.main.auth.debug.inspector;" oncommand="try{xulG.window.win.start_inspector();}catch(E){alert(E);}"/>
-				<menuitem label="&staff.main.auth.debug.chrome_list;" oncommand="try{xulG.window.win.start_chrome_list();}catch(E){alert(E);}"/>
+    <menuitem label="server/main/test.html" accesskey="1" command="cmd_test_html"/>
+    <menuitem label="server/main/test.xul" accesskey="2" command="cmd_test_xul"/>
+    <menuitem label="&staff.main.menu.admin.clear_cache.label;" accesskey="&staff.main.menu.admin.clear_cache.accesskey;" command="cmd_clear_cache"/>
+    <menuitem label="&staff.main.menu.admin.restore_all_tabs.label;" command="cmd_restore_all_tabs"/>
+    <menuitem label="&staff.main.menu.admin.extension_manager.label;" command="cmd_extension_manager"/>
+    <menuitem label="&staff.main.menu.admin.theme_manager.label;" command="cmd_theme_manager"/>
+    <menuitem label="&staff.main.menu.admin.about_config.label;" command="cmd_about_config"/>
+    <menuitem label="&staff.main.menu.admin.venkman.label;" oncommand="try{xulG.window.win.start_debugger();}catch(E){alert(E);}"/>
+    <menuitem label="&staff.main.auth.debug.inspector;" oncommand="try{xulG.window.win.start_inspector();}catch(E){alert(E);}"/>
+    <menuitem label="&staff.main.auth.debug.chrome_list;" oncommand="try{xulG.window.win.start_chrome_list();}catch(E){alert(E);}"/>
                 <menuitem label="&staff.main.menu.admin.ping;" oncommand="try{netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');JSAN.use('util.network'); var n = new util.network(); alert(n.ping());}catch(E){alert(E);}"/>
-			</menupopup>
-		</menu>
-	</menupopup>
+   </menupopup>
+  </menu>
+ </menupopup>
 </menu>
 
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul
index 43248cd10b..307de90e01 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul
@@ -5,7 +5,7 @@
 <?xul-overlay href="/xul/server/main/menu_frame_menus.xul"?>
 -->
 <overlay id="menu_frame_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading menu_frame_overlay.xul\n');</script>
 
@@ -14,31 +14,31 @@
 
 <!-- The top level widget for the staff client -->
 <box id="menu_frame_main" flex="1" orient="vertical">
-	<toolbox id="main_toolbox"/>
-	<tabbox id="main_tabbox" flex="1" eventnode="window" handleCtrlTab="true">
-		<tabs id="main_tabs" closebutton="true" onclosetab="g.menu.close_tab()">
-			<tab id="tab_1" accesskey="&staff.chrome.menu_frame_overlay.tab1.accesskey;" label="&staff.chrome.menu_frame_overlay.tab1.label;" hidden="true" />
-			<tab id="tab_2" accesskey="&staff.chrome.menu_frame_overlay.tab2.accesskey;" label="&staff.chrome.menu_frame_overlay.tab2.label;" hidden="true" />
-			<tab id="tab_3" accesskey="&staff.chrome.menu_frame_overlay.tab3.accesskey;" label="&staff.chrome.menu_frame_overlay.tab3.label;" hidden="true" />
-			<tab id="tab_4" accesskey="&staff.chrome.menu_frame_overlay.tab4.accesskey;" label="&staff.chrome.menu_frame_overlay.tab4.label;" hidden="true" />
-			<tab id="tab_5" accesskey="&staff.chrome.menu_frame_overlay.tab5.accesskey;" label="&staff.chrome.menu_frame_overlay.tab5.label;" hidden="true" />
-			<tab id="tab_6" accesskey="&staff.chrome.menu_frame_overlay.tab6.accesskey;" label="&staff.chrome.menu_frame_overlay.tab6.label;" hidden="true" />
-			<tab id="tab_7" accesskey="&staff.chrome.menu_frame_overlay.tab7.accesskey;" label="&staff.chrome.menu_frame_overlay.tab7.label;" hidden="true" />
-			<tab id="tab_8" accesskey="&staff.chrome.menu_frame_overlay.tab8.accesskey;" label="&staff.chrome.menu_frame_overlay.tab8.label;" hidden="true" />
-			<tab id="tab_9" accesskey="&staff.chrome.menu_frame_overlay.tab9.accesskey;" label="&staff.chrome.menu_frame_overlay.tab9.label;" hidden="true" />
-		</tabs>
-		<tabpanels id="main_panels" flex="1">
-			<tabpanel id="panel_1"><label value="panel_1"/></tabpanel>
-			<tabpanel id="panel_2"><label value="panel_2"/></tabpanel>
-			<tabpanel id="panel_3"><label value="panel_3"/></tabpanel>
-			<tabpanel id="panel_4"><label value="panel_4"/></tabpanel>
-			<tabpanel id="panel_5"><label value="panel_5"/></tabpanel>
-			<tabpanel id="panel_6"><label value="panel_6"/></tabpanel>
-			<tabpanel id="panel_7"><label value="panel_7"/></tabpanel>
-			<tabpanel id="panel_8"><label value="panel_8"/></tabpanel>
-			<tabpanel id="panel_9"><label value="panel_9"/></tabpanel>
-		</tabpanels>
-	</tabbox>
+ <toolbox id="main_toolbox"/>
+ <tabbox id="main_tabbox" flex="1" eventnode="window" handleCtrlTab="true">
+  <tabs id="main_tabs" closebutton="true" onclosetab="g.menu.close_tab()">
+   <tab id="tab_1" accesskey="&staff.chrome.menu_frame_overlay.tab1.accesskey;" label="&staff.chrome.menu_frame_overlay.tab1.label;" hidden="true" />
+   <tab id="tab_2" accesskey="&staff.chrome.menu_frame_overlay.tab2.accesskey;" label="&staff.chrome.menu_frame_overlay.tab2.label;" hidden="true" />
+   <tab id="tab_3" accesskey="&staff.chrome.menu_frame_overlay.tab3.accesskey;" label="&staff.chrome.menu_frame_overlay.tab3.label;" hidden="true" />
+   <tab id="tab_4" accesskey="&staff.chrome.menu_frame_overlay.tab4.accesskey;" label="&staff.chrome.menu_frame_overlay.tab4.label;" hidden="true" />
+   <tab id="tab_5" accesskey="&staff.chrome.menu_frame_overlay.tab5.accesskey;" label="&staff.chrome.menu_frame_overlay.tab5.label;" hidden="true" />
+   <tab id="tab_6" accesskey="&staff.chrome.menu_frame_overlay.tab6.accesskey;" label="&staff.chrome.menu_frame_overlay.tab6.label;" hidden="true" />
+   <tab id="tab_7" accesskey="&staff.chrome.menu_frame_overlay.tab7.accesskey;" label="&staff.chrome.menu_frame_overlay.tab7.label;" hidden="true" />
+   <tab id="tab_8" accesskey="&staff.chrome.menu_frame_overlay.tab8.accesskey;" label="&staff.chrome.menu_frame_overlay.tab8.label;" hidden="true" />
+   <tab id="tab_9" accesskey="&staff.chrome.menu_frame_overlay.tab9.accesskey;" label="&staff.chrome.menu_frame_overlay.tab9.label;" hidden="true" />
+  </tabs>
+  <tabpanels id="main_panels" flex="1">
+   <tabpanel id="panel_1"><label value="panel_1"/></tabpanel>
+   <tabpanel id="panel_2"><label value="panel_2"/></tabpanel>
+   <tabpanel id="panel_3"><label value="panel_3"/></tabpanel>
+   <tabpanel id="panel_4"><label value="panel_4"/></tabpanel>
+   <tabpanel id="panel_5"><label value="panel_5"/></tabpanel>
+   <tabpanel id="panel_6"><label value="panel_6"/></tabpanel>
+   <tabpanel id="panel_7"><label value="panel_7"/></tabpanel>
+   <tabpanel id="panel_8"><label value="panel_8"/></tabpanel>
+   <tabpanel id="panel_9"><label value="panel_9"/></tabpanel>
+  </tabpanels>
+ </tabbox>
     <statusbar>
         <statusbarpanel />
         <spacer flex="1" />
@@ -65,19 +65,19 @@
 
 <!-- The main top level menubar -->
 <toolbox id="main_toolbox">
-	<menubar id="main_menubar">
-		<menu id="main.menu.file" />
-		<menu id="main.menu.edit" />
-		<menu id="main.menu.search" />
-		<menu id="main.menu.circ" />
-		<menu id="main.menu.cat" />
-		<menu id="main.menu.acq" />
-		<spacer flex="1" />
-		<menu id="main.menu.admin" />
+ <menubar id="main_menubar">
+  <menu id="main.menu.file" />
+  <menu id="main.menu.edit" />
+  <menu id="main.menu.search" />
+  <menu id="main.menu.circ" />
+  <menu id="main.menu.cat" />
+  <menu id="main.menu.acq" />
+  <spacer flex="1" />
+  <menu id="main.menu.admin" />
         <!--
-		<menu id="main.menu.help" />
+  <menu id="main.menu.help" />
         -->
-	</menubar>
+ </menubar>
     <toolbar id="main_toolbar" hidden="true">
         <toolbarbutton id="tb_checkout" 
             command="cmd_circ_checkout" 
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/simple_auth.xul b/Open-ILS/xul/staff_client/chrome/content/main/simple_auth.xul
index 3e58946dca..82c06d1a35 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/simple_auth.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/simple_auth.xul
@@ -14,7 +14,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -22,145 +22,145 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="simple_auth_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+ </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { 
-					throw( offlineStrings.getString('common.jsan.missing'));
-				}
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for simple_auth.xul');
-
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-				g.data.temporary_session = ''; g.data.stash('temporary_session');
-
-				$('server').value = g.data.server_unadorned;
-
-				addCSSClass(document.documentElement,xul_param('login_type',{'modal_xulG':true}))
-
-				if (xul_param('desc_brief',{'modal_xulG':true})) {
-					$('desc').hidden = false;
-					$('desc_brief').appendChild( document.createTextNode( xul_param('desc_brief',{'modal_xulG':true}) ) );
-				}
-				if (xul_param('desc_full',{'modal_xulG':true})) {
-					$('desc').hidden = false;
-					$('desc_full').appendChild( document.createTextNode( xul_param('desc_full',{'modal_xulG':true}) ) );
-				}
-
-				$('username').focus();
-
-				$('username').addEventListener('keypress',handle_keypress,false);
-				$('password').addEventListener('keypress',handle_keypress,false);
-
-			} catch(E) {
-				var err_msg =  offlineStrings.getFormattedString('common.exception', ['simple_auth.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function $(id) { return document.getElementById(id); }
-
-		function handle_keypress(ev) {
-			if ( (! ev.keyCode) || (ev.keyCode != 13) ) return;
-			switch(ev.target) {
-				case $('username') : $('password').focus(); break;
-				case $('password') : authorize(); break;
-				default: break;
-			}
-		}
-
-		function authorize() {
-			try {
-				JSAN.use('auth.session');
-				g.session = new auth.session(
-					{
-						'name_prompt' : $('username'),
-						'password_prompt' : $('password'),
-						'server_prompt' : $('server'),
-					},
-					xul_param('login_type',{'modal_xulG':true}) || 'temp'
-				);
-				g.session.on_init = function() { 
-					try {
-						JSAN.use('util.network'); var n = new util.network();
-						var staff = n.simple_request('FM_AU_RETRIEVE_VIA_SESSION',[ g.session.key ]);
-						g.data.temporary_session = {  // old way because of local chrome still out there
-							'key' : g.session.key, 
-							'authtime' : g.session.authtime, 
-							'usr' : js2JSON(staff)
-						}
-						g.data.stash('temporary_session');
-						var my_xulG = { // new way, to minimize the use of global spaces
-							'temporary_session' : g.data.temporary_session
-						};
-						update_modal_xulG(my_xulG);
-						window.close();
-					} catch(E) {
-						g.error.standard_unexpected_error_alert('simple_auth.session.on_init',E);
-					}
-				}
-				g.session.on_init_error = function() { 
-					$('password').value = '';
-					$('username').focus();
-					$('username').select();
-				 }
-				g.session.init();
-			} catch(E) {
-				alert(E);
-			}
-		}
-
-	]]>
-	</script>
-
-	<commandset id="simple_auth_cmds">
-		<command id="cmd_broken" />
-	</commandset>
-
-	<vbox id="simple_auth_main" flex="1">
-	<groupbox id="desc" hidden="true">
-		<caption label="&staff.main.simple_auth.exception.label;"/>
-		<description id="desc_brief" style="color: red"/>
-		<description id="desc_full"/>
-	</groupbox>
-	<groupbox>
-		<caption label="&staff.main.simple_auth.authorization.label;"/>
-		<grid>
-			<columns><column /><column /></columns>
-			<rows>
-				<row>
-					<label value="&common.username.label;" control="username" accesskey="&common.username.accesskey;"/>
-					<textbox id="username" />
-				</row>
-				<row>
-					<label value="&staff.auth.password_prompt;" control="password" accesskey="&staff.auth.password_prompt.accesskey;"/>
-					<textbox id="password" type="password"/>
-				</row>
-				<row>
-					<button label="&common.cancel;" accesskey="&common.cancel.accesskey;" oncommand="window.close()"/>
-					<button label="&staff.main.simple_auth.authorize.label;" accesskey="&staff.main.simple_auth.authorize.accesskey;" oncommand="authorize()"/>
-				</row>
-			</rows>
-		</grid>
-		<label id="server" hidden="true"/>
-	</groupbox>
-	<spacer flex="1"/>
-	</vbox>
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { 
+     throw( offlineStrings.getString('common.jsan.missing'));
+    }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for simple_auth.xul');
+
+    JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+    g.data.temporary_session = ''; g.data.stash('temporary_session');
+
+    $('server').value = g.data.server_unadorned;
+
+    addCSSClass(document.documentElement,xul_param('login_type',{'modal_xulG':true}))
+
+    if (xul_param('desc_brief',{'modal_xulG':true})) {
+     $('desc').hidden = false;
+     $('desc_brief').appendChild( document.createTextNode( xul_param('desc_brief',{'modal_xulG':true}) ) );
+    }
+    if (xul_param('desc_full',{'modal_xulG':true})) {
+     $('desc').hidden = false;
+     $('desc_full').appendChild( document.createTextNode( xul_param('desc_full',{'modal_xulG':true}) ) );
+    }
+
+    $('username').focus();
+
+    $('username').addEventListener('keypress',handle_keypress,false);
+    $('password').addEventListener('keypress',handle_keypress,false);
+
+   } catch(E) {
+    var err_msg =  offlineStrings.getFormattedString('common.exception', ['simple_auth.xul', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+
+  function $(id) { return document.getElementById(id); }
+
+  function handle_keypress(ev) {
+   if ( (! ev.keyCode) || (ev.keyCode != 13) ) return;
+   switch(ev.target) {
+    case $('username') : $('password').focus(); break;
+    case $('password') : authorize(); break;
+    default: break;
+   }
+  }
+
+  function authorize() {
+   try {
+    JSAN.use('auth.session');
+    g.session = new auth.session(
+     {
+      'name_prompt' : $('username'),
+      'password_prompt' : $('password'),
+      'server_prompt' : $('server'),
+     },
+     xul_param('login_type',{'modal_xulG':true}) || 'temp'
+    );
+    g.session.on_init = function() { 
+     try {
+      JSAN.use('util.network'); var n = new util.network();
+      var staff = n.simple_request('FM_AU_RETRIEVE_VIA_SESSION',[ g.session.key ]);
+      g.data.temporary_session = {  // old way because of local chrome still out there
+       'key' : g.session.key, 
+       'authtime' : g.session.authtime, 
+       'usr' : js2JSON(staff)
+      }
+      g.data.stash('temporary_session');
+      var my_xulG = { // new way, to minimize the use of global spaces
+       'temporary_session' : g.data.temporary_session
+      };
+      update_modal_xulG(my_xulG);
+      window.close();
+     } catch(E) {
+      g.error.standard_unexpected_error_alert('simple_auth.session.on_init',E);
+     }
+    }
+    g.session.on_init_error = function() { 
+     $('password').value = '';
+     $('username').focus();
+     $('username').select();
+     }
+    g.session.init();
+   } catch(E) {
+    alert(E);
+   }
+  }
+
+ ]]>
+ </script>
+
+ <commandset id="simple_auth_cmds">
+  <command id="cmd_broken" />
+ </commandset>
+
+ <vbox id="simple_auth_main" flex="1">
+ <groupbox id="desc" hidden="true">
+  <caption label="&staff.main.simple_auth.exception.label;"/>
+  <description id="desc_brief" style="color: red"/>
+  <description id="desc_full"/>
+ </groupbox>
+ <groupbox>
+  <caption label="&staff.main.simple_auth.authorization.label;"/>
+  <grid>
+   <columns><column /><column /></columns>
+   <rows>
+    <row>
+     <label value="&common.username.label;" control="username" accesskey="&common.username.accesskey;"/>
+     <textbox id="username" />
+    </row>
+    <row>
+     <label value="&staff.auth.password_prompt;" control="password" accesskey="&staff.auth.password_prompt.accesskey;"/>
+     <textbox id="password" type="password"/>
+    </row>
+    <row>
+     <button label="&common.cancel;" accesskey="&common.cancel.accesskey;" oncommand="window.close()"/>
+     <button label="&staff.main.simple_auth.authorize.label;" accesskey="&staff.main.simple_auth.authorize.accesskey;" oncommand="authorize()"/>
+    </row>
+   </rows>
+  </grid>
+  <label id="server" hidden="true"/>
+ </groupbox>
+ <spacer flex="1"/>
+ </vbox>
 </window>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/test.xul b/Open-ILS/xul/staff_client/chrome/content/main/test.xul
index d5e925447e..450364ffa5 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/test.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/test.xul
@@ -9,16 +9,16 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- OVERLAYS -->
 
 <window id="example_template_win" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<label value="&staff.main.test.example_template.label;" />
+ <label value="&staff.main.test.example_template.label;" />
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/test/test.js b/Open-ILS/xul/staff_client/chrome/content/test/test.js
index 33d7018276..5cf000c81c 100644
--- a/Open-ILS/xul/staff_client/chrome/content/test/test.js
+++ b/Open-ILS/xul/staff_client/chrome/content/test/test.js
@@ -3,11 +3,11 @@ dump('entering test/test.js\n');
 if (typeof test == 'undefined') var test = {};
 test.test = {};
 
-test.test.EXPORT_OK	= [ 'hello_world' ];
-test.test.EXPORT_TAGS	= { ':all' : test.test.EXPORT_OK };
+test.test.EXPORT_OK = [ 'hello_world' ];
+test.test.EXPORT_TAGS = { ':all' : test.test.EXPORT_OK };
 
 test.test.hello_world = function () {
-	alert('Hello World');
+ alert('Hello World');
 }
 
 dump('exiting test/test.js\n');
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/barcode.js b/Open-ILS/xul/staff_client/chrome/content/util/barcode.js
index 537385ff6b..d3a89835bf 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/barcode.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/barcode.js
@@ -3,36 +3,36 @@ dump('entering util/barcode.js\n');
 if (typeof util == 'undefined') var util = {};
 util.barcode = {};
 
-util.barcode.EXPORT_OK	= [ 
-	'check', 'checkdigit',
+util.barcode.EXPORT_OK = [ 
+ 'check', 'checkdigit',
 ];
-util.barcode.EXPORT_TAGS	= { ':all' : util.barcode.EXPORT_OK };
+util.barcode.EXPORT_TAGS = { ':all' : util.barcode.EXPORT_OK };
 
 util.barcode.check = function(bc) {
-	if (bc != Number(bc)) return false;
-	bc = bc.toString();
-	var last_digit = bc.substr(bc.length-1);
-	var stripped_barcode = bc.substr(0,bc.length-1);
-	return util.barcode.checkdigit(stripped_barcode).toString() == last_digit;
+ if (bc != Number(bc)) return false;
+ bc = bc.toString();
+ var last_digit = bc.substr(bc.length-1);
+ var stripped_barcode = bc.substr(0,bc.length-1);
+ return util.barcode.checkdigit(stripped_barcode).toString() == last_digit;
 }
 
 util.barcode.checkdigit = function(bc) {
-	var reverse_barcode = bc.toString().split('').reverse();
-	var check_sum = 0; var multiplier = 2;
-	for (var i = 0; i < reverse_barcode.length; i++) {
-		var digit = reverse_barcode[i];
-		var product = digit * multiplier; product = product.toString();
-		var temp_sum = 0;
-		for (var j = 0; j < product.length; j++) {
-			temp_sum += Number( product[j] );
-		}
-		check_sum += Number( temp_sum );
-		multiplier = ( multiplier == 2 ? 1 : 2 );
-	}
-	check_sum = check_sum.toString();
-	var next_multiple_of_10 = (check_sum.match(/(\d*)\d$/)[1] * 10) + 10;
-	var check_digit = next_multiple_of_10 - Number(check_sum); if (check_digit == 10) check_digit = 0;
-	return check_digit;
+ var reverse_barcode = bc.toString().split('').reverse();
+ var check_sum = 0; var multiplier = 2;
+ for (var i = 0; i < reverse_barcode.length; i++) {
+  var digit = reverse_barcode[i];
+  var product = digit * multiplier; product = product.toString();
+  var temp_sum = 0;
+  for (var j = 0; j < product.length; j++) {
+   temp_sum += Number( product[j] );
+  }
+  check_sum += Number( temp_sum );
+  multiplier = ( multiplier == 2 ? 1 : 2 );
+ }
+ check_sum = check_sum.toString();
+ var next_multiple_of_10 = (check_sum.match(/(\d*)\d$/)[1] * 10) + 10;
+ var check_digit = next_multiple_of_10 - Number(check_sum); if (check_digit == 10) check_digit = 0;
+ return check_digit;
 }
 
 dump('exiting util/barcode.js\n');
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/browser.js b/Open-ILS/xul/staff_client/chrome/content/util/browser.js
index 87b937d1a8..1b59c1e5db 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/browser.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/browser.js
@@ -2,265 +2,265 @@ dump('entering util.browser.js\n');
 
 if (typeof util == 'undefined') util = {};
 util.browser = function (params) {
-	try {
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		JSAN.use('util.error'); this.error = new util.error();
-	} catch(E) {
-		dump('util.browser: ' + E + '\n');
-	}
+ try {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  JSAN.use('util.error'); this.error = new util.error();
+ } catch(E) {
+  dump('util.browser: ' + E + '\n');
+ }
 }
 
 util.browser.prototype = {
 
-	'init' : function( params ) {
+ 'init' : function( params ) {
 
-		try {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  try {
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
-			var obj = this;
+   var obj = this;
 
-			obj.url = params['url'];
-			obj.push_xulG = params['push_xulG'];
-			obj.alt_print = params['alt_print'];
-			obj.browser_id = params['browser_id'];
-			obj.debug_label = params['debug_label'];
-			obj.passthru_content_params = params['passthru_content_params'];
-			obj.on_url_load = params['on_url_load'];
+   obj.url = params['url'];
+   obj.push_xulG = params['push_xulG'];
+   obj.alt_print = params['alt_print'];
+   obj.browser_id = params['browser_id'];
+   obj.debug_label = params['debug_label'];
+   obj.passthru_content_params = params['passthru_content_params'];
+   obj.on_url_load = params['on_url_load'];
 
-			JSAN.use('util.controller'); obj.controller = new util.controller();
-			obj.controller.init(
-				{
-					control_map : {
-						'cmd_broken' : [
-							['command'],
-							function() { alert('Not Yet Implemented'); }
-						],
-						'cmd_print' : [
-							['command'],
-							function() {
-								netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-								if (obj.alt_print) {
-									JSAN.use('util.print'); var p = new util.print();
-									p.NSPrint(obj.get_content(),false,{});
-								} else {
-									obj.get_content().print();
-								}
-							}
-						],
-						'cmd_forward' : [
-							['command'],
-							function() {
-								try {
-									netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-									var n = obj.getWebNavigation();
-									if (n.canGoForward) n.goForward();
-								} catch(E) {
-									var err = 'cmd_forward: ' + E;
-									obj.error.sdump('D_ERROR',err);
-								}
-							}
-						],
-						'cmd_back' : [
-							['command'],
-							function() {
-								try {
-									netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-									var n = obj.getWebNavigation();
-									if (n.canGoBack) n.goBack();
-								} catch(E) {
-									var err = 'cmd_back: ' + E;
-									obj.error.sdump('D_ERROR',err);
-								}
-							}
-						]
-					}
-				}
-			);
-			obj.controller.render();
+   JSAN.use('util.controller'); obj.controller = new util.controller();
+   obj.controller.init(
+    {
+     control_map : {
+      'cmd_broken' : [
+       ['command'],
+       function() { alert('Not Yet Implemented'); }
+      ],
+      'cmd_print' : [
+       ['command'],
+       function() {
+        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+        if (obj.alt_print) {
+         JSAN.use('util.print'); var p = new util.print();
+         p.NSPrint(obj.get_content(),false,{});
+        } else {
+         obj.get_content().print();
+        }
+       }
+      ],
+      'cmd_forward' : [
+       ['command'],
+       function() {
+        try {
+         netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+         var n = obj.getWebNavigation();
+         if (n.canGoForward) n.goForward();
+        } catch(E) {
+         var err = 'cmd_forward: ' + E;
+         obj.error.sdump('D_ERROR',err);
+        }
+       }
+      ],
+      'cmd_back' : [
+       ['command'],
+       function() {
+        try {
+         netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+         var n = obj.getWebNavigation();
+         if (n.canGoBack) n.goBack();
+        } catch(E) {
+         var err = 'cmd_back: ' + E;
+         obj.error.sdump('D_ERROR',err);
+        }
+       }
+      ]
+     }
+    }
+   );
+   obj.controller.render();
 
-			var browser_id = 'browser_browser'; if (obj.browser_id) browser_id = obj.browser_id;
-			obj.controller.view.browser_browser = document.getElementById(browser_id);
+   var browser_id = 'browser_browser'; if (obj.browser_id) browser_id = obj.browser_id;
+   obj.controller.view.browser_browser = document.getElementById(browser_id);
 
-			obj.buildProgressListener();
-			/*
-			dump('obj.controller.view.browser_browser.addProgressListener = ' 
-				+ obj.controller.view.browser_browser.addProgressListener + '\n');
-			*/
-			obj.controller.view.browser_browser.addProgressListener(obj.progressListener,
-			                Components.interfaces.nsIWebProgress.NOTIFY_ALL );
+   obj.buildProgressListener();
+   /*
+   dump('obj.controller.view.browser_browser.addProgressListener = ' 
+    + obj.controller.view.browser_browser.addProgressListener + '\n');
+   */
+   obj.controller.view.browser_browser.addProgressListener(obj.progressListener,
+                   Components.interfaces.nsIWebProgress.NOTIFY_ALL );
 
-			obj.controller.view.browser_browser.setAttribute('src',obj.url);
-			//dump('browser url = ' + obj.url + '\n');
+   obj.controller.view.browser_browser.setAttribute('src',obj.url);
+   //dump('browser url = ' + obj.url + '\n');
 
-		} catch(E) {
-			this.error.sdump('D_ERROR','util.browser.init: ' + E + '\n');
-		}
-	},
+  } catch(E) {
+   this.error.sdump('D_ERROR','util.browser.init: ' + E + '\n');
+  }
+ },
 
-	'get_content' : function() {
-		try {
-			if (this.controller.view.browser_browser.contentWindow.wrappedJSObject) {
-				return this.controller.view.browser_browser.contentWindow.wrappedJSObject;
-			} else {
-				return this.controller.view.browser_browser.contentWindow;
-			}
-		} catch(E) {
-			this.error.sdump('D_ERROR','util.browser.get_content(): ' + E);
-		}
-	},
+ 'get_content' : function() {
+  try {
+   if (this.controller.view.browser_browser.contentWindow.wrappedJSObject) {
+    return this.controller.view.browser_browser.contentWindow.wrappedJSObject;
+   } else {
+    return this.controller.view.browser_browser.contentWindow;
+   }
+  } catch(E) {
+   this.error.sdump('D_ERROR','util.browser.get_content(): ' + E);
+  }
+ },
 
-	'push_variables' : function() {
-		try {
-			var obj = this;
-			var s = '';
-			try { s += obj.url + '\n' + obj.get_content().location.href + '\n'; } catch(E) { s+=E + '\n'; }
-			if (!obj.push_xulG) return;
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			var cw = this.get_content();
-			cw.IAMXUL = true;
+ 'push_variables' : function() {
+  try {
+   var obj = this;
+   var s = '';
+   try { s += obj.url + '\n' + obj.get_content().location.href + '\n'; } catch(E) { s+=E + '\n'; }
+   if (!obj.push_xulG) return;
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   var cw = this.get_content();
+   cw.IAMXUL = true;
             cw.XUL_BUILD_ID = '/xul/server/'.split(/\//)[2];
-			cw.xulG = obj.passthru_content_params || {};
-			cw.xulG.set_tab = window.xulG.set_tab;
-			cw.xulG.new_tab = window.xulG.new_tab;
-			cw.xulG.url_prefix = window.xulG.url_prefix;
+   cw.xulG = obj.passthru_content_params || {};
+   cw.xulG.set_tab = window.xulG.set_tab;
+   cw.xulG.new_tab = window.xulG.new_tab;
+   cw.xulG.url_prefix = window.xulG.url_prefix;
             cw.xulG.urls = window.urls;
-			try { s += ('******** cw = ' + cw + ' cw.xulG = ' + (cw.xulG) + '\n'); } catch(E) { s+=E + '\n'; }
-			obj.error.sdump('D_BROWSER',s);
-		} catch(E) {
-			this.error.sdump('D_ERROR','util.browser.push_variables: ' + E + '\n');
-		}
-	},
+   try { s += ('******** cw = ' + cw + ' cw.xulG = ' + (cw.xulG) + '\n'); } catch(E) { s+=E + '\n'; }
+   obj.error.sdump('D_BROWSER',s);
+  } catch(E) {
+   this.error.sdump('D_ERROR','util.browser.push_variables: ' + E + '\n');
+  }
+ },
 
-	'getWebNavigation' : function() {
-		try {
-			var wn = this.controller.view.browser_browser.webNavigation;
-			var s = this.url + '\n' + this.get_content().location.href + '\n';
-			s += ('getWebNavigation() = ' + wn + '\n');
-			//this.error.sdump('D_BROWSER',s);
-			return wn;
-		} catch(E) {
-			this.error.sdump('D_ERROR','util.browser.getWebNavigation(): ' + E );
-		}
-	},
+ 'getWebNavigation' : function() {
+  try {
+   var wn = this.controller.view.browser_browser.webNavigation;
+   var s = this.url + '\n' + this.get_content().location.href + '\n';
+   s += ('getWebNavigation() = ' + wn + '\n');
+   //this.error.sdump('D_BROWSER',s);
+   return wn;
+  } catch(E) {
+   this.error.sdump('D_ERROR','util.browser.getWebNavigation(): ' + E );
+  }
+ },
 
-	'updateNavButtons' : function() {
-		var obj = this; 
-		var s = obj.url + '\n' + obj.get_content().location.href + '\n';
-		try {
-			var n = obj.getWebNavigation();
-			s += ('webNavigation = ' + n + '\n');
-			s += ('webNavigation.canGoForward = ' + n.canGoForward + '\n');
-			if (n.canGoForward) {
-				if (typeof obj.controller.view.cmd_forward != 'undefined') {
-					obj.controller.view.cmd_forward.disabled = false;
-					obj.controller.view.cmd_forward.setAttribute('disabled','false');
-				}
-			} else {
-				if (typeof obj.controller.view.cmd_forward != 'undefined') {
-					obj.controller.view.cmd_forward.disabled = true;
-					obj.controller.view.cmd_forward.setAttribute('disabled','true');
-				}
-			}
-		} catch(E) {
-			s += E + '\n';
-		}
-		try {
-			var n = obj.getWebNavigation();
-			s += ('webNavigation = ' + n + '\n');
-			s += ('webNavigation.canGoBack = ' + n.canGoBack + '\n');
-			if (n.canGoBack) {
-				if (typeof obj.controller.view.cmd_back != 'undefined') {
-					obj.controller.view.cmd_back.disabled = false;
-					obj.controller.view.cmd_back.setAttribute('disabled','false');
-				}
-			} else {
-				if (typeof obj.controller.view.cmd_back != 'undefined') {
-					obj.controller.view.cmd_back.disabled = true;
-					obj.controller.view.cmd_back.setAttribute('disabled','true');
-				}
-			}
-		} catch(E) {
-			s += E + '\n';
-		}
+ 'updateNavButtons' : function() {
+  var obj = this; 
+  var s = obj.url + '\n' + obj.get_content().location.href + '\n';
+  try {
+   var n = obj.getWebNavigation();
+   s += ('webNavigation = ' + n + '\n');
+   s += ('webNavigation.canGoForward = ' + n.canGoForward + '\n');
+   if (n.canGoForward) {
+    if (typeof obj.controller.view.cmd_forward != 'undefined') {
+     obj.controller.view.cmd_forward.disabled = false;
+     obj.controller.view.cmd_forward.setAttribute('disabled','false');
+    }
+   } else {
+    if (typeof obj.controller.view.cmd_forward != 'undefined') {
+     obj.controller.view.cmd_forward.disabled = true;
+     obj.controller.view.cmd_forward.setAttribute('disabled','true');
+    }
+   }
+  } catch(E) {
+   s += E + '\n';
+  }
+  try {
+   var n = obj.getWebNavigation();
+   s += ('webNavigation = ' + n + '\n');
+   s += ('webNavigation.canGoBack = ' + n.canGoBack + '\n');
+   if (n.canGoBack) {
+    if (typeof obj.controller.view.cmd_back != 'undefined') {
+     obj.controller.view.cmd_back.disabled = false;
+     obj.controller.view.cmd_back.setAttribute('disabled','false');
+    }
+   } else {
+    if (typeof obj.controller.view.cmd_back != 'undefined') {
+     obj.controller.view.cmd_back.disabled = true;
+     obj.controller.view.cmd_back.setAttribute('disabled','true');
+    }
+   }
+  } catch(E) {
+   s += E + '\n';
+  }
 
-		//this.error.sdump('D_BROWSER',s);
-	},
+  //this.error.sdump('D_BROWSER',s);
+ },
 
-	'buildProgressListener' : function() {
+ 'buildProgressListener' : function() {
 
-		try {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  try {
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
-			var obj = this;
-			obj.progressListener = {
-				onProgressChange	: function(){},
-				onLocationChange	: function(){},
-				onStatusChange		: function(){},
-				onSecurityChange	: function(){},
-				onStateChange 		: function ( webProgress, request, stateFlags, status) {
-					try {
-						netscape.security.PrivilegeManager.enablePrivilege( "UniversalXPConnect" );
-						var s = obj.url + '\n' + obj.get_content().location.href + '\n';
-						const nsIWebProgressListener = Components.interfaces.nsIWebProgressListener;
-						const nsIChannel = Components.interfaces.nsIChannel;
-						if (stateFlags == 65540 || stateFlags == 65537 || stateFlags == 65552) { return; }
-						s += ('onStateChange: stateFlags = ' + stateFlags + ' status = ' + status + '\n');
-						if (stateFlags & nsIWebProgressListener.STATE_IS_REQUEST) {
-							s += ('\tSTATE_IS_REQUEST\n');
-						}
-						if (stateFlags & nsIWebProgressListener.STATE_IS_DOCUMENT) {
-							s += ('\tSTATE_IS_DOCUMENT\n');
-							if( stateFlags & nsIWebProgressListener.STATE_STOP ) {
-								obj.push_variables(); obj.updateNavButtons();
-								if (typeof obj.on_url_load == 'function') {
-									try {
-										obj.error.sdump('D_TRACE','calling on_url_load');
-										obj.on_url_load( obj.controller.view.browser_browser );
-										if (obj.debug_label) {
-											try {
-												document.getElementById(obj.debug_label).setAttribute('tooltiptext','url: ' + obj.get_content().location.href);
-											} catch(E) {
-												obj.error.sdump('D_ERROR','on_url_load, debug_label: ' + E );
-											}
-										}
-									} catch(E) {
-										obj.error.sdump('D_ERROR','on_url_load: ' + E );
-									}
-								}
-							}
-						}
-						if (stateFlags & nsIWebProgressListener.STATE_IS_NETWORK) {
-							s += ('\tSTATE_IS_NETWORK\n');
-						}
-						if (stateFlags & nsIWebProgressListener.STATE_IS_WINDOW) {
-							s += ('\tSTATE_IS_WINDOW\n');
-						}
-						if (stateFlags & nsIWebProgressListener.STATE_START) {
-							s += ('\tSTATE_START\n');
-						}
-						if (stateFlags & nsIWebProgressListener.STATE_REDIRECTING) {
-							s += ('\tSTATE_REDIRECTING\n');
-						}
-						if (stateFlags & nsIWebProgressListener.STATE_TRANSFERING) {
-							s += ('\tSTATE_TRANSFERING\n');
-						}
-						if (stateFlags & nsIWebProgressListener.STATE_NEGOTIATING) {
-							s += ('\tSTATE_NEGOTIATING\n');
-						}
-						if (stateFlags & nsIWebProgressListener.STATE_STOP) {
-							s += ('\tSTATE_STOP\n');
-						}
-						//obj.error.sdump('D_BROWSER',s);	
-					} catch(E) {
-						obj.error.sdump('D_ERROR','util.browser.progresslistener.onstatechange: ' + (E));
-					}
-				}
-			}
-			obj.progressListener.QueryInterface = function(){return this;};
-		} catch(E) {
-			this.error.sdump('D_ERROR','util.browser.buildProgressListener: ' + E + '\n');
-		}
-	}
+   var obj = this;
+   obj.progressListener = {
+    onProgressChange : function(){},
+    onLocationChange : function(){},
+    onStatusChange  : function(){},
+    onSecurityChange : function(){},
+    onStateChange   : function ( webProgress, request, stateFlags, status) {
+     try {
+      netscape.security.PrivilegeManager.enablePrivilege( "UniversalXPConnect" );
+      var s = obj.url + '\n' + obj.get_content().location.href + '\n';
+      const nsIWebProgressListener = Components.interfaces.nsIWebProgressListener;
+      const nsIChannel = Components.interfaces.nsIChannel;
+      if (stateFlags == 65540 || stateFlags == 65537 || stateFlags == 65552) { return; }
+      s += ('onStateChange: stateFlags = ' + stateFlags + ' status = ' + status + '\n');
+      if (stateFlags & nsIWebProgressListener.STATE_IS_REQUEST) {
+       s += ('\tSTATE_IS_REQUEST\n');
+      }
+      if (stateFlags & nsIWebProgressListener.STATE_IS_DOCUMENT) {
+       s += ('\tSTATE_IS_DOCUMENT\n');
+       if( stateFlags & nsIWebProgressListener.STATE_STOP ) {
+        obj.push_variables(); obj.updateNavButtons();
+        if (typeof obj.on_url_load == 'function') {
+         try {
+          obj.error.sdump('D_TRACE','calling on_url_load');
+          obj.on_url_load( obj.controller.view.browser_browser );
+          if (obj.debug_label) {
+           try {
+            document.getElementById(obj.debug_label).setAttribute('tooltiptext','url: ' + obj.get_content().location.href);
+           } catch(E) {
+            obj.error.sdump('D_ERROR','on_url_load, debug_label: ' + E );
+           }
+          }
+         } catch(E) {
+          obj.error.sdump('D_ERROR','on_url_load: ' + E );
+         }
+        }
+       }
+      }
+      if (stateFlags & nsIWebProgressListener.STATE_IS_NETWORK) {
+       s += ('\tSTATE_IS_NETWORK\n');
+      }
+      if (stateFlags & nsIWebProgressListener.STATE_IS_WINDOW) {
+       s += ('\tSTATE_IS_WINDOW\n');
+      }
+      if (stateFlags & nsIWebProgressListener.STATE_START) {
+       s += ('\tSTATE_START\n');
+      }
+      if (stateFlags & nsIWebProgressListener.STATE_REDIRECTING) {
+       s += ('\tSTATE_REDIRECTING\n');
+      }
+      if (stateFlags & nsIWebProgressListener.STATE_TRANSFERING) {
+       s += ('\tSTATE_TRANSFERING\n');
+      }
+      if (stateFlags & nsIWebProgressListener.STATE_NEGOTIATING) {
+       s += ('\tSTATE_NEGOTIATING\n');
+      }
+      if (stateFlags & nsIWebProgressListener.STATE_STOP) {
+       s += ('\tSTATE_STOP\n');
+      }
+      //obj.error.sdump('D_BROWSER',s); 
+     } catch(E) {
+      obj.error.sdump('D_ERROR','util.browser.progresslistener.onstatechange: ' + (E));
+     }
+    }
+   }
+   obj.progressListener.QueryInterface = function(){return this;};
+  } catch(E) {
+   this.error.sdump('D_ERROR','util.browser.buildProgressListener: ' + E + '\n');
+  }
+ }
 }
 
 dump('exiting util.browser.js\n');
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/browser.xul b/Open-ILS/xul/staff_client/chrome/content/util/browser.xul
index 9e33902bf2..62fbac2b0c 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/browser.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/util/browser.xul
@@ -16,103 +16,103 @@
 <?xul-overlay href="chrome://open_ils_staff_client/content/OpenILS/util_overlay_chrome.xul"?>
 
 <window id="util_browser_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-	</script>
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		                if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('..');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for util_browser.xul');
-
-				JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-				XML_HTTP_SERVER = data.server_unadorned;
-
-				var name = xul_param('tab_name') || xul_param('name') || null;
-				var url; try { url = xul_param('url'); } catch(E) { dump(E + '\n'); };
-				if (!url) url = urls.browser;
-
-				JSAN.use('util.browser'); g.browser = new util.browser();
-
-				var push_xulG = true;
-				if (xul_param('no_xulG')) push_xulG = false;
-
-				var alt_print = false;
-				if (xul_param('alternate_print')) alt_print = true;
-
-				var p =	{ 
-					'url' : url,
-					'push_xulG' : push_xulG,
-					'alt_print' : alt_print,
-					'debug_label' : 'debug',
-				};
-				if (typeof window.xulG == 'object' && typeof window.xulG.passthru_content_params == 'object') {
-					p.passthru_content_params = window.xulG.passthru_content_params;
-				}
-				if (typeof window.xulG == 'object' && typeof window.xulG.on_url_load == 'function') {
-					p.on_url_load = window.xulG.on_url_load;
-				}
-
-				g.browser.init( p );
-
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					if (name) try { window.xulG.set_tab_name(name); } catch(E) { alert(E); }
-				}
-				if (xul_param('show_nav_buttons')) {
-					document.getElementById('back').hidden = false;
-					document.getElementById('forward').hidden = false;
-				}
-				if (xul_param('show_print_button')) {
-					document.getElementById('browser_print').hidden = false;
-				}
-
-				if (xul_param('title')) {
-					try { document.title = xul_param('title'); } catch(E) {}
-					try { window.title = xul_param('title'); } catch(E) {}
-				}
-
-			} catch(E) {
-				var err_msg = "!! This software has encountered an error.  Please tell your friendly " +
-					"system administrator or software developer the following:\n" + E + '\n';
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-	]]>
-	</script>
-
-	<commandset id="util_browser_cmds">
-		<command id="cmd_broken" />
-		<command id="cmd_print" />
-		<command id="cmd_back" />
-		<command id="cmd_forward" />
-	</commandset>
-
-	<vbox flex="1">
-		<hbox>
-			<button id="back" label="Go Back" command="cmd_back" accesskey="b" disabled="true" hidden="true"/>
-			<button id="forward" label="Go Forward" command="cmd_forward" accesskey="d" disabled="true" hidden="true"/>
-			<spacer flex="1"/>
-			<label id="debug" value="Debug" disabled="true" onclick="var m = (this.getAttribute('tooltiptext')+'\n'); dump(m); alert(m);"/>
-			<button id="browser_print" label="Print Page" command="cmd_print" hidden="true"/>
-		</hbox>
-		<browser id="browser_browser" flex="1" type="content"/>
-	</vbox>
+ <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                  if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('..');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for util_browser.xul');
+
+    JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+    XML_HTTP_SERVER = data.server_unadorned;
+
+    var name = xul_param('tab_name') || xul_param('name') || null;
+    var url; try { url = xul_param('url'); } catch(E) { dump(E + '\n'); };
+    if (!url) url = urls.browser;
+
+    JSAN.use('util.browser'); g.browser = new util.browser();
+
+    var push_xulG = true;
+    if (xul_param('no_xulG')) push_xulG = false;
+
+    var alt_print = false;
+    if (xul_param('alternate_print')) alt_print = true;
+
+    var p = { 
+     'url' : url,
+     'push_xulG' : push_xulG,
+     'alt_print' : alt_print,
+     'debug_label' : 'debug',
+    };
+    if (typeof window.xulG == 'object' && typeof window.xulG.passthru_content_params == 'object') {
+     p.passthru_content_params = window.xulG.passthru_content_params;
+    }
+    if (typeof window.xulG == 'object' && typeof window.xulG.on_url_load == 'function') {
+     p.on_url_load = window.xulG.on_url_load;
+    }
+
+    g.browser.init( p );
+
+    if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+     if (name) try { window.xulG.set_tab_name(name); } catch(E) { alert(E); }
+    }
+    if (xul_param('show_nav_buttons')) {
+     document.getElementById('back').hidden = false;
+     document.getElementById('forward').hidden = false;
+    }
+    if (xul_param('show_print_button')) {
+     document.getElementById('browser_print').hidden = false;
+    }
+
+    if (xul_param('title')) {
+     try { document.title = xul_param('title'); } catch(E) {}
+     try { window.title = xul_param('title'); } catch(E) {}
+    }
+
+   } catch(E) {
+    var err_msg = "!! This software has encountered an error.  Please tell your friendly " +
+     "system administrator or software developer the following:\n" + E + '\n';
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+
+ ]]>
+ </script>
+
+ <commandset id="util_browser_cmds">
+  <command id="cmd_broken" />
+  <command id="cmd_print" />
+  <command id="cmd_back" />
+  <command id="cmd_forward" />
+ </commandset>
+
+ <vbox flex="1">
+  <hbox>
+   <button id="back" label="Go Back" command="cmd_back" accesskey="b" disabled="true" hidden="true"/>
+   <button id="forward" label="Go Forward" command="cmd_forward" accesskey="d" disabled="true" hidden="true"/>
+   <spacer flex="1"/>
+   <label id="debug" value="Debug" disabled="true" onclick="var m = (this.getAttribute('tooltiptext')+'\n'); dump(m); alert(m);"/>
+   <button id="browser_print" label="Print Page" command="cmd_print" hidden="true"/>
+  </hbox>
+  <browser id="browser_browser" flex="1" type="content"/>
+ </vbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/clipboard.js b/Open-ILS/xul/staff_client/chrome/content/util/clipboard.js
index 0c402cb31b..2925db02c5 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/clipboard.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/clipboard.js
@@ -3,10 +3,10 @@ dump('entering util/clipboard.js\n');
 if (typeof util == 'undefined') var util = {};
 util.clipboard = {};
 
-util.clipboard.EXPORT_OK	= [ 
-	'cut', 'copy', 'paste'
+util.clipboard.EXPORT_OK = [ 
+ 'cut', 'copy', 'paste'
 ];
-util.clipboard.EXPORT_TAGS	= { ':all' : util.clipboard.EXPORT_OK };
+util.clipboard.EXPORT_TAGS = { ':all' : util.clipboard.EXPORT_OK };
 
 util.clipboard.cut = function() {
     try {
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/controller.js b/Open-ILS/xul/staff_client/chrome/content/util/controller.js
index 33647826aa..7dd799e0a3 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/controller.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/controller.js
@@ -3,64 +3,64 @@ dump('entering util/controller.js\n');
 if (typeof util == 'undefined') util = {};
 util.controller = function () {
 
-	JSAN.use('util.error'); this.error = new util.error();
+ JSAN.use('util.error'); this.error = new util.error();
 
-	return this;
+ return this;
 };
 
 util.controller.prototype = {
 
-	'cmds' : {},
+ 'cmds' : {},
 
-	'init' : function (params) {
+ 'init' : function (params) {
 
-		if (typeof params.control_map == 'undefined') throw('util.controller.init: No control_map');
+  if (typeof params.control_map == 'undefined') throw('util.controller.init: No control_map');
 
-		this.control_map = params.control_map;
-		this.window_knows_me_by = params.window_knows_me_by;
-		this.render_list = [];
-		this.view = {};
-		
-		for (var i in this.control_map) {
-			var cmd = document.getElementById(i);
-			if (cmd) {
-				for (var j in this.control_map[i][0]) {
-					if (this.control_map[i][1]) {
-						var ev_type = this.control_map[i][0][j];
-						switch(ev_type) {
-							case 'render':
-								this.render_list.push( [i, this.control_map[i][1](cmd)] ); 
-							break;
-							case 'oncommand':
-								if (!this.window_knows_me_by) 
-									throw('util.controller: on_command requires window_knows_me_by');
-								var s = 'try{'+this.window_knows_me_by+".cmds."+i+"();}catch(E){alert(E);}";
-								cmd.setAttribute(ev_type, s);
-								this.cmds[i] = this.control_map[i][1];
-							break;
-							default: cmd.addEventListener(ev_type,this.control_map[i][1],false);
-						}
-					}
-				}
-			}
-			this.view[i] = cmd;
-		}
-	},
+  this.control_map = params.control_map;
+  this.window_knows_me_by = params.window_knows_me_by;
+  this.render_list = [];
+  this.view = {};
+  
+  for (var i in this.control_map) {
+   var cmd = document.getElementById(i);
+   if (cmd) {
+    for (var j in this.control_map[i][0]) {
+     if (this.control_map[i][1]) {
+      var ev_type = this.control_map[i][0][j];
+      switch(ev_type) {
+       case 'render':
+        this.render_list.push( [i, this.control_map[i][1](cmd)] ); 
+       break;
+       case 'oncommand':
+        if (!this.window_knows_me_by) 
+         throw('util.controller: on_command requires window_knows_me_by');
+        var s = 'try{'+this.window_knows_me_by+".cmds."+i+"();}catch(E){alert(E);}";
+        cmd.setAttribute(ev_type, s);
+        this.cmds[i] = this.control_map[i][1];
+       break;
+       default: cmd.addEventListener(ev_type,this.control_map[i][1],false);
+      }
+     }
+    }
+   }
+   this.view[i] = cmd;
+  }
+ },
 
-	'render' : function(id,param) {
-		for (var i in this.render_list) {
-			try {
-				if (id) {
-					if (id == this.render_list[i][0]) this.render_list[i][1](param);
-				} else {
-					this.render_list[i][1](param);
-				}
-			} catch(E) {
-				var error = 'Problem in util.controller.render with\n' 
-					+ this.render_list[i] + '\n\n' + js2JSON(E);
-				this.error.sdump('D_ERROR',error);
-			}
-		}
-	}
+ 'render' : function(id,param) {
+  for (var i in this.render_list) {
+   try {
+    if (id) {
+     if (id == this.render_list[i][0]) this.render_list[i][1](param);
+    } else {
+     this.render_list[i][1](param);
+    }
+   } catch(E) {
+    var error = 'Problem in util.controller.render with\n' 
+     + this.render_list[i] + '\n\n' + js2JSON(E);
+    this.error.sdump('D_ERROR',error);
+   }
+  }
+ }
 }
 dump('exiting util/controller.js\n');
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/date.js b/Open-ILS/xul/staff_client/chrome/content/util/date.js
index aea0f44b3b..9aa4f2c7a2 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/date.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/date.js
@@ -3,127 +3,127 @@ dump('entering util/date.js\n');
 if (typeof util == 'undefined') var util = {};
 util.date = {};
 
-util.date.EXPORT_OK	= [ 
-	'check', 'timer_init', 'timer_elapsed', 'db_date2Date', 'formatted_date', 'interval_to_seconds'
+util.date.EXPORT_OK = [ 
+ 'check', 'timer_init', 'timer_elapsed', 'db_date2Date', 'formatted_date', 'interval_to_seconds'
 ];
-util.date.EXPORT_TAGS	= { ':all' : util.date.EXPORT_OK };
+util.date.EXPORT_TAGS = { ':all' : util.date.EXPORT_OK };
 
 util.date.check = function(format,date) {
-	if (format != 'YYYY-MM-DD') { throw('I only understand YYYY-MM-DD.  Fix me if you want.'); }
-	if (date.length != format.length) { return false; }
-	if ((date.substr(4,1) != '-') || (date.substr(7,1) != '-')) { return false; }
-	var yyyy = date.substr(0,4); var mm = date.substr(5,2); var dd = date.substr(8,2);
-	var d = new Date( yyyy, mm - 1, dd );
-	if (d.toString() == 'Invalid Date') { return false; }
-	if (d.getMonth() != mm -1) { return false; }
-	if (d.getFullYear() != yyyy) { return false; }
-	if (dd.substr(0,1)=='0') { dd = dd.substr(1,1); }
-	if (d.getDate() != dd) { return false; }
-	return true;
+ if (format != 'YYYY-MM-DD') { throw('I only understand YYYY-MM-DD.  Fix me if you want.'); }
+ if (date.length != format.length) { return false; }
+ if ((date.substr(4,1) != '-') || (date.substr(7,1) != '-')) { return false; }
+ var yyyy = date.substr(0,4); var mm = date.substr(5,2); var dd = date.substr(8,2);
+ var d = new Date( yyyy, mm - 1, dd );
+ if (d.toString() == 'Invalid Date') { return false; }
+ if (d.getMonth() != mm -1) { return false; }
+ if (d.getFullYear() != yyyy) { return false; }
+ if (dd.substr(0,1)=='0') { dd = dd.substr(1,1); }
+ if (d.getDate() != dd) { return false; }
+ return true;
 }
 
 util.date.check_past = function(format,date) {
-	if (format != 'YYYY-MM-DD') { throw('I only understand YYYY-MM-DD.  Fix me if you want.'); }
-	var yyyy = date.substr(0,4); var mm = date.substr(5,2); var dd = date.substr(8,2);
-	var test_date = new Date( yyyy, mm - 1, dd );
-	date = util.date.formatted_date(new Date(),'%F');
-	yyyy = date.substr(0,4); mm = date.substr(5,2); dd = date.substr(8,2);
-	var today = new Date( yyyy, mm - 1, dd );
-	return test_date < today;
+ if (format != 'YYYY-MM-DD') { throw('I only understand YYYY-MM-DD.  Fix me if you want.'); }
+ var yyyy = date.substr(0,4); var mm = date.substr(5,2); var dd = date.substr(8,2);
+ var test_date = new Date( yyyy, mm - 1, dd );
+ date = util.date.formatted_date(new Date(),'%F');
+ yyyy = date.substr(0,4); mm = date.substr(5,2); dd = date.substr(8,2);
+ var today = new Date( yyyy, mm - 1, dd );
+ return test_date < today;
 }
 
 util.date.timer_init = function (id) {
-	if (typeof util.date.timer_init.prototype.timer == 'undefined') {
-		util.date.timer_init.prototype.timer = {};
-	}
-	util.date.timer_init.prototype.timer[id] = (new Date).getTime();
+ if (typeof util.date.timer_init.prototype.timer == 'undefined') {
+  util.date.timer_init.prototype.timer = {};
+ }
+ util.date.timer_init.prototype.timer[id] = (new Date).getTime();
 }
 
 util.date.timer_elapsed = function (id) {
-	if (! util.date.timer_init.prototype.timer[id]) { util.date.timer_init(id); }
-	var ms = (new Date).getTime() - util.date.timer_init.prototype.timer[id];
-	return( ms + 'ms (' + ms/1000 + 's)' );
+ if (! util.date.timer_init.prototype.timer[id]) { util.date.timer_init(id); }
+ var ms = (new Date).getTime() - util.date.timer_init.prototype.timer[id];
+ return( ms + 'ms (' + ms/1000 + 's)' );
 }
 
 util.date.db_date2Date = function (date) {
-	var y  = date.substr(0,4);
-	var mo = date.substr(5,2);
-	var d  = date.substr(8,2);
-	var h  = date.substr(11,2);
-	var mi = date.substr(14,2);
-	var s  = date.substr(17,2);
-	return new Date(y,mo-1,d,h,mi,s);
+ var y  = date.substr(0,4);
+ var mo = date.substr(5,2);
+ var d  = date.substr(8,2);
+ var h  = date.substr(11,2);
+ var mi = date.substr(14,2);
+ var s  = date.substr(17,2);
+ return new Date(y,mo-1,d,h,mi,s);
 }
 
 util.date.formatted_date = function (orig_date,format) {
 
-	var _date = orig_date;
-
-	try { 
-
-	// pass in a Date object or epoch seconds or a postgres style date string (2005-07-19 10:38:25.211964-04)
-	if (typeof(_date) == 'string') {
-		if (_date.match(/:/) || _date.match(/-/)) {
-			_date = util.date.db_date2Date(_date);
-		} else {
-			_date = new Date( Number( _date + '000' ) );
-		}
-	} else if (typeof(_date) == 'number') {
-		_date = new Date( _date * 1000 );
-	} 
-	
-	if (_date == null) {
-		return '';
-	}
-
-	var mm = _date.getMonth() + 1; mm = mm.toString(); if (mm.length == 1) mm = '0' +mm;
-	var dd = _date.getDate().toString(); if (dd.length == 1) dd = '0' +dd;
-	var yyyy = _date.getFullYear().toString();
-	var yy = yyyy.substr(2);
-	var H = _date.getHours(); H = H.toString(); if (H.length == 1) H = '0' + H;
-	var I = _date.getHours(); if (I > 12) I -= 12; I = I.toString();
-	var M = _date.getMinutes(); M = M.toString(); if (M.length == 1) M = '0' + M;
-	var sec = _date.getSeconds(); sec = sec.toString(); if (sec.length == 1) sec = '0' + sec;
-
-	var s = format;
-	if (s == '') { s = '%F %H:%M'; }
-	if (typeof _date.iso8601Format != 'function') {
-	
-		try {
-			var js = JSAN._loadJSFromUrl( urls.isodate_lib_remote );
-			eval( js ); 
-
-		} catch(E) { 
-
-			try {
-				var js = JSAN._loadJSFromUrl( urls.isodate_lib_local );
-				eval( js );
-
-			} catch(F) {
-
-				alert('Problem loading ISO8601 date extension:' + E + '\n' + F); 
-
-			}
-		}
-
-	}
-	if (typeof _date.iso8601Format == 'function') {
-		s = s.replace( /%\{iso8601\}/g, _date.iso8601Format("YMDHMS") );
-	}
-	s = s.replace( /%m/g, mm );
-	s = s.replace( /%d/g, dd );
-	s = s.replace( /%Y/g, yyyy );
-	s = s.replace( /%D/g, mm + '/' + dd + '/' + yy );
-	s = s.replace( /%F/g, yyyy + '-' + mm + '-' + dd );
-	s = s.replace( /%H/g, H );
-	s = s.replace( /%I/g, I );
-	s = s.replace( /%M/g, M );
-	s = s.replace( /%s/g, sec );
-	return s;
-
-	} catch(E) {
-		alert('Error in util.date.formatted_date:\ntypeof orig_date = ' + typeof orig_date + ' orig_date = ' + orig_date + '\ntypeof _date = ' + typeof _date + ' _date = ' + _date + '\nformat = ' + format + '\n' + E);
-	}
+ var _date = orig_date;
+
+ try { 
+
+ // pass in a Date object or epoch seconds or a postgres style date string (2005-07-19 10:38:25.211964-04)
+ if (typeof(_date) == 'string') {
+  if (_date.match(/:/) || _date.match(/-/)) {
+   _date = util.date.db_date2Date(_date);
+  } else {
+   _date = new Date( Number( _date + '000' ) );
+  }
+ } else if (typeof(_date) == 'number') {
+  _date = new Date( _date * 1000 );
+ } 
+ 
+ if (_date == null) {
+  return '';
+ }
+
+ var mm = _date.getMonth() + 1; mm = mm.toString(); if (mm.length == 1) mm = '0' +mm;
+ var dd = _date.getDate().toString(); if (dd.length == 1) dd = '0' +dd;
+ var yyyy = _date.getFullYear().toString();
+ var yy = yyyy.substr(2);
+ var H = _date.getHours(); H = H.toString(); if (H.length == 1) H = '0' + H;
+ var I = _date.getHours(); if (I > 12) I -= 12; I = I.toString();
+ var M = _date.getMinutes(); M = M.toString(); if (M.length == 1) M = '0' + M;
+ var sec = _date.getSeconds(); sec = sec.toString(); if (sec.length == 1) sec = '0' + sec;
+
+ var s = format;
+ if (s == '') { s = '%F %H:%M'; }
+ if (typeof _date.iso8601Format != 'function') {
+ 
+  try {
+   var js = JSAN._loadJSFromUrl( urls.isodate_lib_remote );
+   eval( js ); 
+
+  } catch(E) { 
+
+   try {
+    var js = JSAN._loadJSFromUrl( urls.isodate_lib_local );
+    eval( js );
+
+   } catch(F) {
+
+    alert('Problem loading ISO8601 date extension:' + E + '\n' + F); 
+
+   }
+  }
+
+ }
+ if (typeof _date.iso8601Format == 'function') {
+  s = s.replace( /%\{iso8601\}/g, _date.iso8601Format("YMDHMS") );
+ }
+ s = s.replace( /%m/g, mm );
+ s = s.replace( /%d/g, dd );
+ s = s.replace( /%Y/g, yyyy );
+ s = s.replace( /%D/g, mm + '/' + dd + '/' + yy );
+ s = s.replace( /%F/g, yyyy + '-' + mm + '-' + dd );
+ s = s.replace( /%H/g, H );
+ s = s.replace( /%I/g, I );
+ s = s.replace( /%M/g, M );
+ s = s.replace( /%s/g, sec );
+ return s;
+
+ } catch(E) {
+  alert('Error in util.date.formatted_date:\ntypeof orig_date = ' + typeof orig_date + ' orig_date = ' + orig_date + '\ntypeof _date = ' + typeof _date + ' _date = ' + _date + '\nformat = ' + format + '\n' + E);
+ }
 }
 
 util.date.interval_to_seconds = function ( $interval ) {
@@ -132,52 +132,52 @@ util.date.interval_to_seconds = function ( $interval ) {
         $interval = $interval.replace( /,/, ' ' );
 
         var $amount = 0;
-	var results = $interval.match( /\s*\+?\s*(\d+)\s*(\w{1})\w*\s*/g);  
-	for (var i in results) {
-		var result = results[i].match( /\s*\+?\s*(\d+)\s*(\w{1})\w*\s*/ );
-		if (result[2] == 's') $amount += result[1] ;
-		if (result[2] == 'm') $amount += 60 * result[1] ;
-		if (result[2] == 'h') $amount += 60 * 60 * result[1] ;
-		if (result[2] == 'd') $amount += 60 * 60 * 24 * result[1] ;
-		if (result[2] == 'w') $amount += 60 * 60 * 24 * 7 * result[1] ;
-		if (result[2] == 'M') $amount += ((60 * 60 * 24 * 365)/12) * result[1] ;
-		if (result[2] == 'y') $amount += 60 * 60 * 24 * 365 * result[1] ;
+ var results = $interval.match( /\s*\+?\s*(\d+)\s*(\w{1})\w*\s*/g);  
+ for (var i in results) {
+  var result = results[i].match( /\s*\+?\s*(\d+)\s*(\w{1})\w*\s*/ );
+  if (result[2] == 's') $amount += result[1] ;
+  if (result[2] == 'm') $amount += 60 * result[1] ;
+  if (result[2] == 'h') $amount += 60 * 60 * result[1] ;
+  if (result[2] == 'd') $amount += 60 * 60 * 24 * result[1] ;
+  if (result[2] == 'w') $amount += 60 * 60 * 24 * 7 * result[1] ;
+  if (result[2] == 'M') $amount += ((60 * 60 * 24 * 365)/12) * result[1] ;
+  if (result[2] == 'y') $amount += 60 * 60 * 24 * 365 * result[1] ;
         }
         return $amount;
 }
 
 /* 
-	Lifted from /opac/common/js/util.js
+ Lifted from /opac/common/js/util.js
 
-	builds a JS date object with the given info.  The given data
-	has to be valid (e.g. months == 30 is not valid).  Returns NULL on 
-	invalid date 
-	Months are 1-12 (unlike the JS date object)
+ builds a JS date object with the given info.  The given data
+ has to be valid (e.g. months == 30 is not valid).  Returns NULL on 
+ invalid date 
+ Months are 1-12 (unlike the JS date object)
 */
 
 util.date.buildDate = function ( year, month, day, hours, minutes, seconds ) {
 
-	if(!year) year = 0;
-	if(!month) month = 1;
-	if(!day) day = 1;
-	if(!hours) hours = 0;
-	if(!minutes) minutes = 0;
-	if(!seconds) seconds = 0;
-
-	var d = new Date(year, month - 1, day, hours, minutes, seconds);
-	//alert('util.date.buildDate\nyear='+year+' month='+month+' day='+day+' hours='+hours+' minutes='+minutes+' seconds='+seconds+'\nd = ' + d);
-	
-	if( 
-		(d.getYear() + 1900) == year &&
-		d.getMonth()	== (month - 1) &&
-		d.getDate()		== new Number(day) &&
-		d.getHours()	== new Number(hours) &&
-		d.getMinutes() == new Number(minutes) &&
-		d.getSeconds() == new Number(seconds) ) {
-		return d;
-	}
-
-	return null;
+ if(!year) year = 0;
+ if(!month) month = 1;
+ if(!day) day = 1;
+ if(!hours) hours = 0;
+ if(!minutes) minutes = 0;
+ if(!seconds) seconds = 0;
+
+ var d = new Date(year, month - 1, day, hours, minutes, seconds);
+ //alert('util.date.buildDate\nyear='+year+' month='+month+' day='+day+' hours='+hours+' minutes='+minutes+' seconds='+seconds+'\nd = ' + d);
+ 
+ if( 
+  (d.getYear() + 1900) == year &&
+  d.getMonth() == (month - 1) &&
+  d.getDate()  == new Number(day) &&
+  d.getHours() == new Number(hours) &&
+  d.getMinutes() == new Number(minutes) &&
+  d.getSeconds() == new Number(seconds) ) {
+  return d;
+ }
+
+ return null;
 }
 
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/deck.js b/Open-ILS/xul/staff_client/chrome/content/util/deck.js
index ad2274d718..db2b42e7c4 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/deck.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/deck.js
@@ -3,184 +3,184 @@ dump('entering util/deck.js\n');
 if (typeof util == 'undefined') util = {};
 util.deck = function (id) {
 
-	this.node = document.getElementById(id);
-
-	JSAN.use('util.error'); this.error = new util.error();
-
-	if (!this.node) {
-		var error = 'util.deck: Could not find element ' + id;
-		this.error.sdump('D_ERROR',error);
-		throw(error);
-	}
-	if (this.node.nodeName != 'deck') {
-		var error = 'util.deck: ' + id + 'is not a deck' + "\nIt's a " + this.node.nodeName;
-		this.error.sdump('D_ERROR',error);
-		throw(error);
-	}
-
-	return this;
+ this.node = document.getElementById(id);
+
+ JSAN.use('util.error'); this.error = new util.error();
+
+ if (!this.node) {
+  var error = 'util.deck: Could not find element ' + id;
+  this.error.sdump('D_ERROR',error);
+  throw(error);
+ }
+ if (this.node.nodeName != 'deck') {
+  var error = 'util.deck: ' + id + 'is not a deck' + "\nIt's a " + this.node.nodeName;
+  this.error.sdump('D_ERROR',error);
+  throw(error);
+ }
+
+ return this;
 };
 
 util.deck.prototype = {
 
-	'clear' : function() {
-		while (this.node.lastChild) this.node.removeChild( this.node.lastChild );
-	},
-
-	'clear_all_except' : function(url) {
-		var keep_me = this.find_index(url); var remove_me = [];
-		for (var i = 0; i < this.node.childNodes.length; i++) {
-			if (i != keep_me) remove_me.push( this.node.childNodes[i] );
-		}
-		for (var i = 0; i < remove_me.length; i++) this.node.removeChild( remove_me[i] );
-	},
-
-	'find_index' : function (url) {
-		var idx = -1;
-		var nodes = this.node.childNodes;
-		for (var i = 0; i < nodes.length; i++) {
-			if (nodes[i].getAttribute('src') == url) idx = i;
-		}
-		return idx;
-	},
-
-	'set_iframe' : function (url,params,content_params) {
-		this.error.sdump('D_TRACE','util.deck.set_iframe: url = ' + url);
-		var idx = this.find_index(url);
-		if (idx>-1) {
-			this.node.selectedIndex = idx;
-
-			var iframe = this.node.childNodes[idx];
-
-			if (content_params) {
-				try {
-					netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-					this.error.sdump('D_DECK', 'set_iframe\nurl = ' + url + '\nframe.contentWindow = ' + iframe.contentWindow + '\n' + 'content_params = ' + (content_params) );
-					var cw = iframe.contentWindow; 
-					if (typeof iframe.contentWindow.wrappedJSObject != 'undefined') cw = iframe.contentWindow.wrappedJSObject;
-					cw.IAMXUL = true; cw.xulG = content_params;
-					setTimeout( function() { if (typeof cw.default_focus == 'function') cw.default_focus(); }, 0 );
-				} catch(E) {
-					this.error.sdump('D_ERROR','E: ' + E + '\n');
-				}
-			}
-
-			return iframe;
-		} else {
-			return this.new_iframe(url,params,content_params);
-		}
-		
-	},
-
-	'reset_iframe' : function (url,params,content_params) {
-		this.remove_iframe(url);
-		return this.new_iframe(url,params,content_params);
-	},
-
-	'new_iframe' : function (url,params,content_params) {
-		var idx = this.find_index(url);
-		if (idx>-1) throw('An iframe already exists in deck with url = ' + url);
-
-		var iframe = document.createElement('iframe');
-		iframe.setAttribute('src',url);
-		//iframe.setAttribute('flex','1');
-		//iframe.setAttribute('style','overflow: scroll');
-		//iframe.setAttribute('style','border: solid thin red');
-		this.node.appendChild( iframe );
-		this.node.selectedIndex = this.node.childNodes.length - 1;
-		if (content_params) {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				this.error.sdump('D_DECK', 'new_iframe\nurl = ' + url + '\nframe.contentWindow = ' + iframe.contentWindow + '\n' + 'content_params = ' + (content_params) );
-				var cw = iframe.contentWindow; 
-				if (typeof iframe.contentWindow.wrappedJSObject != 'undefined') cw = iframe.contentWindow.wrappedJSObject;
-				cw.IAMXUL = true; cw.xulG = content_params;
-				this.error.sdump('D_DECK', 'cw = ' + cw + ' cw.xulG = ' + (cw.xulG) );
-				setTimeout( function() { if (typeof cw.default_focus == 'function') cw.default_focus(); }, 0 );
-			} catch(E) {
-				this.error.sdump('D_ERROR','E: ' + E + '\n');
-			}
-		}
-		return iframe;
-	},
-
-	'remove_iframe' : function (url) {
-		var idx = this.find_index(url);
-		if (idx>-1) {
-			this.node.removeChild( this.node.childNodes[ idx ] );
-		}
-	},
-
-	/* FIXME -- consider all the browser stuff broken.. very weird behavior in new_browser */
-
-	'set_browser' : function (url,params,content_params) {
-		this.error.sdump('D_TRACE','util.deck.set_browser: url = ' + url);
-		var idx = this.find_index(url);
-		if (idx>-1) {
-			this.node.selectedIndex = idx;
-
-			var browser = this.node.childNodes[idx];
-
-			if (content_params) {
-				/* FIXME -- we'd need to reach in and change the passthru_content_params for the browser, as well as the xulG for the content */ 
-				alert("we're in set_browser, content_params = true");
-			}
-
-			return browser;
-		} else {
-			return this.new_browser(url,params,content_params);
-		}
-		
-	},
-
-	'reset_browser' : function (url,params,content_params) {
-		this.remove_browser(url);
-		return this.new_browser(url,params,content_params);
-	},
-
-	'new_browser' : function (url,params,content_params) {
-		try {
-		alert('in new_browser.. typeof xulG == ' + typeof xulG);
-		alert('in new_browser.. typeof content_params == ' + typeof content_params);
-		var obj = this;
-		var idx = this.find_index(url);
-		if (idx>-1) throw('A browser already exists in deck with url = ' + url);
-
-		var browser = document.createElement('browser');
-		obj.id_incr++;
-		browser.setAttribute('type','content');
-		browser.setAttribute('id','frame_'+obj.id_incr);
-		browser.setAttribute('src',url);
-		this.node.appendChild( browser );
-		alert('after append');
-		this.node.selectedIndex = this.node.childNodes.length - 1;
-			dump('creating browser with src = ' + url + '\n');
-			alert('content_params = ' + content_params);
-			JSAN.use('util.browser');
-			var b = new util.browser();
-			b.init(
-				{
-					'url' : url,
-					'push_xulG' : true,
-					'alt_print' : false,
-					'browser_id' : 'frame_'+obj.id_incr,
-					'passthru_content_params' : content_params
-				}
-			);
-		return browser;
-		} catch(E) {
-			alert(E);
-		}
-	},
-
-	'remove_browser' : function (url) {
-		var idx = this.find_index(url);
-		if (idx>-1) {
-			this.node.removeChild( this.node.childNodes[ idx ] );
-		}
-	},
-
-	'id_incr' : 0
-}	
+ 'clear' : function() {
+  while (this.node.lastChild) this.node.removeChild( this.node.lastChild );
+ },
+
+ 'clear_all_except' : function(url) {
+  var keep_me = this.find_index(url); var remove_me = [];
+  for (var i = 0; i < this.node.childNodes.length; i++) {
+   if (i != keep_me) remove_me.push( this.node.childNodes[i] );
+  }
+  for (var i = 0; i < remove_me.length; i++) this.node.removeChild( remove_me[i] );
+ },
+
+ 'find_index' : function (url) {
+  var idx = -1;
+  var nodes = this.node.childNodes;
+  for (var i = 0; i < nodes.length; i++) {
+   if (nodes[i].getAttribute('src') == url) idx = i;
+  }
+  return idx;
+ },
+
+ 'set_iframe' : function (url,params,content_params) {
+  this.error.sdump('D_TRACE','util.deck.set_iframe: url = ' + url);
+  var idx = this.find_index(url);
+  if (idx>-1) {
+   this.node.selectedIndex = idx;
+
+   var iframe = this.node.childNodes[idx];
+
+   if (content_params) {
+    try {
+     netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+     this.error.sdump('D_DECK', 'set_iframe\nurl = ' + url + '\nframe.contentWindow = ' + iframe.contentWindow + '\n' + 'content_params = ' + (content_params) );
+     var cw = iframe.contentWindow; 
+     if (typeof iframe.contentWindow.wrappedJSObject != 'undefined') cw = iframe.contentWindow.wrappedJSObject;
+     cw.IAMXUL = true; cw.xulG = content_params;
+     setTimeout( function() { if (typeof cw.default_focus == 'function') cw.default_focus(); }, 0 );
+    } catch(E) {
+     this.error.sdump('D_ERROR','E: ' + E + '\n');
+    }
+   }
+
+   return iframe;
+  } else {
+   return this.new_iframe(url,params,content_params);
+  }
+  
+ },
+
+ 'reset_iframe' : function (url,params,content_params) {
+  this.remove_iframe(url);
+  return this.new_iframe(url,params,content_params);
+ },
+
+ 'new_iframe' : function (url,params,content_params) {
+  var idx = this.find_index(url);
+  if (idx>-1) throw('An iframe already exists in deck with url = ' + url);
+
+  var iframe = document.createElement('iframe');
+  iframe.setAttribute('src',url);
+  //iframe.setAttribute('flex','1');
+  //iframe.setAttribute('style','overflow: scroll');
+  //iframe.setAttribute('style','border: solid thin red');
+  this.node.appendChild( iframe );
+  this.node.selectedIndex = this.node.childNodes.length - 1;
+  if (content_params) {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    this.error.sdump('D_DECK', 'new_iframe\nurl = ' + url + '\nframe.contentWindow = ' + iframe.contentWindow + '\n' + 'content_params = ' + (content_params) );
+    var cw = iframe.contentWindow; 
+    if (typeof iframe.contentWindow.wrappedJSObject != 'undefined') cw = iframe.contentWindow.wrappedJSObject;
+    cw.IAMXUL = true; cw.xulG = content_params;
+    this.error.sdump('D_DECK', 'cw = ' + cw + ' cw.xulG = ' + (cw.xulG) );
+    setTimeout( function() { if (typeof cw.default_focus == 'function') cw.default_focus(); }, 0 );
+   } catch(E) {
+    this.error.sdump('D_ERROR','E: ' + E + '\n');
+   }
+  }
+  return iframe;
+ },
+
+ 'remove_iframe' : function (url) {
+  var idx = this.find_index(url);
+  if (idx>-1) {
+   this.node.removeChild( this.node.childNodes[ idx ] );
+  }
+ },
+
+ /* FIXME -- consider all the browser stuff broken.. very weird behavior in new_browser */
+
+ 'set_browser' : function (url,params,content_params) {
+  this.error.sdump('D_TRACE','util.deck.set_browser: url = ' + url);
+  var idx = this.find_index(url);
+  if (idx>-1) {
+   this.node.selectedIndex = idx;
+
+   var browser = this.node.childNodes[idx];
+
+   if (content_params) {
+    /* FIXME -- we'd need to reach in and change the passthru_content_params for the browser, as well as the xulG for the content */ 
+    alert("we're in set_browser, content_params = true");
+   }
+
+   return browser;
+  } else {
+   return this.new_browser(url,params,content_params);
+  }
+  
+ },
+
+ 'reset_browser' : function (url,params,content_params) {
+  this.remove_browser(url);
+  return this.new_browser(url,params,content_params);
+ },
+
+ 'new_browser' : function (url,params,content_params) {
+  try {
+  alert('in new_browser.. typeof xulG == ' + typeof xulG);
+  alert('in new_browser.. typeof content_params == ' + typeof content_params);
+  var obj = this;
+  var idx = this.find_index(url);
+  if (idx>-1) throw('A browser already exists in deck with url = ' + url);
+
+  var browser = document.createElement('browser');
+  obj.id_incr++;
+  browser.setAttribute('type','content');
+  browser.setAttribute('id','frame_'+obj.id_incr);
+  browser.setAttribute('src',url);
+  this.node.appendChild( browser );
+  alert('after append');
+  this.node.selectedIndex = this.node.childNodes.length - 1;
+   dump('creating browser with src = ' + url + '\n');
+   alert('content_params = ' + content_params);
+   JSAN.use('util.browser');
+   var b = new util.browser();
+   b.init(
+    {
+     'url' : url,
+     'push_xulG' : true,
+     'alt_print' : false,
+     'browser_id' : 'frame_'+obj.id_incr,
+     'passthru_content_params' : content_params
+    }
+   );
+  return browser;
+  } catch(E) {
+   alert(E);
+  }
+ },
+
+ 'remove_browser' : function (url) {
+  var idx = this.find_index(url);
+  if (idx>-1) {
+   this.node.removeChild( this.node.childNodes[ idx ] );
+  }
+ },
+
+ 'id_incr' : 0
+} 
 
 dump('exiting util/deck.js\n');
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/error.js b/Open-ILS/xul/staff_client/chrome/content/util/error.js
index 5b6ad69cbd..c6de0f8e26 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/error.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/error.js
@@ -3,556 +3,556 @@ dump('entering util/error.js\n');
 if (typeof util == 'undefined') util = {};
 util.error = function () {
 
-	try {
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		this.consoleService = Components.classes['@mozilla.org/consoleservice;1']
-			.getService(Components.interfaces.nsIConsoleService);
-	} catch(E) {
-		this.consoleDump = false;
-		dump('util.error constructor: ' + E + '\n');
-	}
+ try {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  this.consoleService = Components.classes['@mozilla.org/consoleservice;1']
+   .getService(Components.interfaces.nsIConsoleService);
+ } catch(E) {
+  this.consoleDump = false;
+  dump('util.error constructor: ' + E + '\n');
+ }
 
-	this.sdump_last_time = new Date();
+ this.sdump_last_time = new Date();
 
-	this.OpenILS = {};
+ this.OpenILS = {};
 
-	JSAN.use('util.sound'); this.sound = new util.sound();
+ JSAN.use('util.sound'); this.sound = new util.sound();
 
-	return this;
+ return this;
 };
 
 util.error.prototype = {
 
-	'printDebug' : true,
-	'consoleDump' : false,
-	'debugDump' : true,
-	'fileDump' : false,
-	'alertDump' : false,
-	'arg_dump_full' : false,
-
-	'debug' : function(e){
-		dump('-----------------------------------------\n' 
-			+ e + '\n-----------------------------------------\n' );
-	},
-
-	'sdump_levels' : {
-
-		'D_NONE' : false, 
-		'D_ALL' : false, 
-		'D_ERROR' : { 'dump' : true, 'console' : true }, 
-		'D_DEBUG' : { 'dump' : true, 'console' : true }, 
-		'D_TRACE' :  { 'dump' : true }, 
-		'D_ALERT' : { 'alert' : true, 'dump' : true },
-		'D_WARN' : false, 
-		'D_COLUMN_RENDER_ERROR' : false, 
-		'D_XULRUNNER' : false, 
-		'D_DECK' : { 'dump' : true },
-		'D_TRACE_ENTER' :  false, 
-		'D_TRACE_EXIT' :  false, 
-		'D_TIMEOUT' :  false, 
-		'D_FILTER' : false,
-		'D_CONSTRUCTOR' : false, 
-		'D_FIREFOX' : false, 
-		'D_LEGACY' : false, 
-		'D_DATA_STASH' : { 'alert' : false }, 
-		'D_DATA_RETRIEVE' : false,
-
-		'D_CLAM' : false, 
-		'D_PAGED_TREE' : false, 
-		'D_GRID_LIST' : false, 
-		'D_HTML_TABLE' : false,
-		'D_TAB' : false, 
-		'D_LIST' : false, 
-		'D_LIST_DUMP_WITH_KEYS_ON_CLEAR' : false, 
-		'D_LIST_DUMP_ON_CLEAR' : false,
-
-		'D_AUTH' : { 'dump' : true }, 
-		'D_OPAC' : { 'dump' : true }, 
-		'D_CAT' : false, 
-		'D_BROWSER' : { 'dump' : true },
-
-		'D_PATRON_SEARCH' : false, 
-		'D_PATRON_SEARCH_FORM' : false, 
-		'D_PATRON_SEARCH_RESULTS' : false,
-
-		'D_PATRON_DISPLAY' : false, 
-		'D_PATRON_DISPLAY_STATUS' : false, 
-		'D_PATRON_DISPLAY_CONTACT' : false,
-
-		'D_PATRON_ITEMS' : false, 
-		'D_PATRON_CHECKOUT_ITEMS' : false, 
-		'D_PATRON_HOLDS' : false,
-		'D_PATRON_BILLS' : false, 
-		'D_PATRON_EDIT' : false,
-
-		'D_CHECKIN' : false, 
-		'D_CHECKIN_ITEMS' : false,
-
-		'D_HOLD_CAPTURE' : false, 
-		'D_HOLD_CAPTURE_ITEMS' : false,
-
-		'D_PATRON_UTILS' : false, 
-		'D_CIRC_UTILS' : false,
-
-		'D_FILE' : false, 
-		'D_EXPLODE' : false, 
-		'D_FM_UTILS' : false, 
-		'D_PRINT' : { 'dump' : true }, 
-		'D_OBSERVERS' : { 'dump' : true, 'console' : false, 'alert' : false },
-		'D_CACHE' : { 'dump' : true, 'console' : false, 'alert' : false },
-		'D_SES' : { 'dump' : true, 'console' : false },
-		'D_SES_FUNC' : false, 
-		'D_SES_RESULT' : { 'dump' : true }, 
-		'D_SES_ERROR' : { 'dump' : true, 'console' : true }, 
-		'D_SPAWN' : false, 
-		'D_STRING' : false,
-		'D_UTIL' : false, 
-		'D_WIN' : { 'dump' : true }, 
-		'D_WIDGETS' : false
-	},
-
-	'filter_console_init' : function (p) {
-		this.sdump('D_FILTER',this.arg_dump(arguments,{0:true}));
-
-		var filterConsoleListener = {
-			observe: function( msg ) {
-				try {
-					p.observe_msg( msg );
-				} catch(E) {
-					alert(E);
-				}
-			},
-			QueryInterface: function (iid) {
-				if (!iid.equals(Components.interfaces.nsIConsoleListener) &&
-					!iid.equals(Components.interfaces.nsISupports)) {
-						throw Components.results.NS_ERROR_NO_INTERFACE;
-				}
-			        return this;
-			}
-		};
-		try {
-			this.consoleService.registerListener(filterConsoleListener);	
-		} catch(E) {
-			alert(E);
-		}
-
-		this.sdump('D_TRACE_EXIT',this.arg_dump(arguments));
-	},
-
-	'sdump' : function (level,msg) {
-		try {
-			var now = new Date();
-			var message = now.valueOf() + '\tdelta = ' + (now.valueOf() - this.sdump_last_time.valueOf()) + '\t' + level + '\n' + msg;
-			if (this.sdump_levels['D_NONE']) return null;
-			if (this.sdump_levels[level]||this.sdump_levels['D_ALL']) {
-				this.sdump_last_time = now;
-				if (this.debugDump || ( this.sdump_levels[level] && this.sdump_levels[level].debug ) ) this.debug(message);
-				if (this.alertDump || ( this.sdump_levels[level] && this.sdump_levels[level].alert ) ) alert(message);
-				if (this.consoleDump || ( this.sdump_levels[level] && this.sdump_levels[level].console ) ) {
-					netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-					this.consoleService.logStringMessage(message);
-				}
-				if (this.fileDump || ( this.sdump_levels[level] && this.sdump_levels[level].file ) ) {
-					if (level!='D_FILE') {
-						netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-						JSAN.use('util.file'); var master_log = new util.file('log');
-						master_log.write_content('append',message); master_log.close();
-						var specific_log = new util.file('log_'+level);
-						specific_log.write_content('append',message); specific_log.close();
-					}
-				}
-			}
-		} catch(E) {
-			dump('Calling sdump but ' + E + '\n');
-		}
-	},
-
-	'arg_dump' : function (args,dump_these) {
-		var s = '*>*>*> Called function ';
-		try {
-			if (!dump_these)
-				dump_these = {};
-			s += args.callee.toString().match(/\w+/g)[1] + ' : ';
-			for (var i = 0; i < args.length; i++)
-				s += typeof(args[i]) + ' ';
-			s += '\n';
-			for (var i = 0; i < args.length; i++)
-				if (dump_these[i]) {
-
-					var arg = args[i];
-					//dump('dump_these[i] = ' + dump_these[i] + '  arg = ' + arg + '\n');
-
-					if (typeof(dump_these[i])=='string') {
-
-						if (dump_these[i].slice(0,1) == '.') {
-							var cmd = 'arg' + dump_these[i];
-							var result;
-							try {
-								result = eval( cmd );
-							} catch(E) {
-								result = cmd + ' ==> ' + E;
-							}
-							s += '\targ #' + i + ': ' + cmd + ' = ' + result;
-						} else {
-							var result;
-							try {
-								result = eval( dump_these[i] );
-							} catch(E) {
-								result = dump_these[i] + ' ==> ' + E;
-							}
-							s += '\targ #' + i + ': ' + result;
-						}
-	
-					} else {
-						s += '\targ #' + i + ' = ';
-						try {
-							//s += js2JSON( arg );
-							s += arg;
-						} catch(E) {
-							s += arg;
-						}
-					}
-	
-					s += '\n';
-					if (this.arg_dump_full)
-						s += 'Definition: ' + args.callee.toString() + '\n';
-	
-				}
-			return s;
-		} catch(E) {
-			return s + '\nDEBUG ME: ' + js2JSON(E) + '\n';
-		}
-	},
-
-	'handle_error' : function (E,annoy) {
-		var s = '';
-		if (instanceOf(E,ex)) {
-			s += E.err_msg();
-			//s += '\n\n=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n';
-			//s += 'This error was anticipated.\n\n';
-			//s += js2JSON(E).substr(0,200) + '...\n\n';
-			if (snd_bad) snd_bad();
-		} else {
-			s += '\n\n=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n';
-			s += 'This is a bug that we will fix later.\n\n';
-			try {
-				s += js2JSON(E).substr(0,1024) + '\n\n';
-			} catch(E2) {
-				try {
-					s += E.substr(0,1024) + '\n\n';
-				} catch(E3) {
-					s += E + '\n\n';
-				}
-			}
-			if (snd_really_bad) snd_really_bad();
-		}
-		sdump('D_ERROR',s);
-		if (annoy)
-			this.s_alert(s);
-		else
-			alert(s);
-	},
-
-	's_alert' : function (s) { alert(s); },
-
-	'standard_network_error_alert' : function(msg) {
-		var obj = this;
-		if (!msg) msg = '';
-		var alert_msg = 'We experienced a network/server communication failure.  Please check your internet connection and try this action again.  Repeated failures may require attention from your local IT staff or your friendly Evergreen developers.\n\n' + msg;
-		obj.yns_alert(
-			alert_msg,	
-			'Communication Failure',
-			'Ok', null, null, 'Check here to confirm this message'
-		);
-	},
-
-	'standard_unexpected_error_alert' : function(msg,E) {
-		var obj = this;
-		if (E != null && typeof E.ilsevent != 'undefined') {
-			if (E.ilsevent == 0 /* SUCCESS */ ) {
-				msg = "The action involved likely succeeded, however, this part of the software needs to be updated to better understand success messages from the server, so please let us know about it.";
-			}
-			if (E.ilsevent == -1 /* Network/Server Problem */ ) {
-				return obj.standard_network_error_alert(msg);
-			}
-			if (E.ilsevent == 5000 /* PERM_FAILURE */ ) {
-				msg = "The action involved likely failed due to insufficient permissions.  However, this part of the software needs to be updated to better understand permission messages from the server, so please let us know about it.";
-			}
-		}
-		if (!msg) msg = '';
-		var alert_msg = 'FIXME:  If you encounter this alert, please inform your IT/ILS helpdesk staff or your friendly Evergreen developers.\n\n' + (new Date()) + '\n\n' + msg + '\n\n' + (typeof E.ilsevent != 'undefined' ? E.textcode + '\n' + (E.desc ? E.desc + '\n' : '') : '') + ( typeof E.status != 'undefined' ? 'Status: ' + E.status + '\n': '' ) + ( typeof E == 'string' ? E + '\n' : '' );
-		obj.sdump('D_ERROR',msg + ' : ' + js2JSON(E));
-		var r = obj.yns_alert(
-			alert_msg,	
-			'Unhandled Error',
-			'Ok', 'Debug Output to send to Helpdesk', null, 'Check here to confirm this message',
-			'/xul/server/skin/media/images/skull.png'
-		);
-		if (r == 1) {
-			JSAN.use('util.window'); var win = new util.window();
-			win.open(
-				'data:text/plain,' + window.escape( 'Please open a helpdesk ticket and include the following text: \n\n' + (new Date()) + '\n\n' + msg + '\n\n' + obj.pretty_print(js2JSON(E)) ),
-				'error_alert',
-				'chrome,resizable,width=700,height=500'
-			);
-		}
-		if (r==2) {
-			alert('Not Yet Implemented');
-		}
-	},
-
-	'yns_alert' : function (s,title,b1,b2,b3,c,image) {
-
-		try {
-
-			if (location.href.match(/^chrome/)) return this.yns_alert_original(s,title,b1,b2,b3,c);
-
-		/* The original purpose of yns_alert was to prevent errors from being scanned through accidentally with a barcode scanner.  
-		However, this can be done in a less annoying manner by rolling our own dialog and not having any of the options in focus */
-
-		/*
-			s 	= Message to display
-			title 	= Text in Title Bar
-			b1	= Text for button 1
-			b2	= Text for button 2
-			b3	= Text for button 3
-			c	= Text for confirmation checkbox.  null for no confirm
-		*/
-
-		dump('yns_alert:\n\ts = ' + s + '\n\ttitle = ' + title + '\n\tb1 = ' + b1 + '\n\tb2 = ' + b2 + '\n\tb3 = ' + b3 + '\n\tc = ' + c + '\n');
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalBrowserWrite");
-
-		this.sound.bad();
-
-
-		//FIXME - is that good enough of an escape job?
-		s = s.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-
-		var xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" flex="1">' 
-			+ '<groupbox flex="1" style="overflow: auto; border: solid thin red;"><caption label="' + (title) + '"/>';
-
-		if (image) xml += '<hbox><image src="' + image + '"/><spacer flex="1"/></hbox>';
-		xml += '<description style="font-size: large">' + (s)
-			+ '</description></groupbox><groupbox><caption label="Options"/><hbox>';
-		var b1_key = b1 ? b1[0] : '';
-		var b2_key = b2 ? b2[0] : '';
-		var b3_key = b3 ? b3[0] : ''; /* FIXME - need to check for collisions */
-		if (b1) xml += '<button id="b1" accesskey="' + b1_key + '" label="' + (b1) + '" name="fancy_submit" value="b1"/>'
-		if (b2) xml += '<button id="b2" accesskey="' + b2_key + '" label="' + (b2) + '" name="fancy_submit" value="b2"/>'
-		if (b3) xml += '<button id="b3" accesskey="' + b3_key + '" label="' + (b3) + '" name="fancy_submit" value="b3"/>'
-		xml += '</hbox></groupbox></vbox>';
-		JSAN.use('OpenILS.data');
-		//var data = new OpenILS.data(); data.init({'via':'stash'});
-		//data.temp_yns_xml = xml; data.stash('temp_yns_xml');
-		var url = urls.XUL_FANCY_PROMPT; // + '?xml_in_stash=temp_yns_xml' + '&title=' + window.escape(title);
-		if (typeof xulG != 'undefined') if (typeof xulG.url_prefix == 'function') url = xulG.url_prefix( url );
-		JSAN.use('util.window'); var win = new util.window();
-		var fancy_prompt_data = win.open(
-			url, 'fancy_prompt', 'chrome,resizable,modal,width=700,height=500', { 'xml' : xml, 'title' : title }
-		);
-		if (fancy_prompt_data.fancy_status == 'complete') {
-			switch(fancy_prompt_data.fancy_submit) {
-				case 'b1' : return 0; break;
-				case 'b2' : return 1; break;
-				case 'b3' : return 2; break;
-			}
-		} else {
-			//return this.yns_alert(s,title,b1,b2,b3,c,image);
-			return null;
-		}
-
-		} catch(E) {
-
-			dump('yns_alert failed: ' + E + '\ns = ' + s + '\ntitle = ' + title + '\nb1 = ' + b1 + '\nb2 = ' + b2 + '\nb3 = ' + b3 + '\nc = ' + c + '\nimage = ' + image + '\n');
-
-			this.yns_alert_original(s + '\n\nAlso, yns_alert failed: ' + E,title,b1,b2,b3,c);
-
-		}
-	},
-
-	'yns_alert_formatted' : function (s,title,b1,b2,b3,c,image) {
-
-		try {
-
-			if (location.href.match(/^chrome/)) return this.yns_alert_original(s,title,b1,b2,b3,c);
-
-		/* The original purpose of yns_alert was to prevent errors from being scanned through accidentally with a barcode scanner.  
-		However, this can be done in a less annoying manner by rolling our own dialog and not having any of the options in focus */
-
-		/*
-			s 	= Message to display
-			title 	= Text in Title Bar
-			b1	= Text for button 1
-			b2	= Text for button 2
-			b3	= Text for button 3
-			c	= Text for confirmation checkbox.  null for no confirm
-		*/
-
-		dump('yns_alert:\n\ts = ' + s + '\n\ttitle = ' + title + '\n\tb1 = ' + b1 + '\n\tb2 = ' + b2 + '\n\tb3 = ' + b3 + '\n\tc = ' + c + '\n');
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalBrowserWrite");
-
-		this.sound.bad();
-
-
-		//FIXME - is that good enough of an escape job?
-		s = s.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-
-		var xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" flex="1">' 
-			+ '<groupbox flex="1" style="overflow: auto; border: solid thin red;"><caption label="' + (title) + '"/>';
-
-		if (image) xml += '<hbox><image src="' + image + '"/><spacer flex="1"/></hbox>';
-		xml += '<description style="font-size: large"><html:pre style="font-size: large">' + (s)
-			+ '</html:pre></description></groupbox><groupbox><caption label="Options"/><hbox>';
-		var b1_key = b1 ? b1[0] : '';
-		var b2_key = b2 ? b2[0] : '';
-		var b3_key = b3 ? b3[0] : ''; /* FIXME - need to check for collisions */
-		if (b1) xml += '<button id="b1" accesskey="' + b1_key + '" label="' + (b1) + '" name="fancy_submit" value="b1"/>'
-		if (b2) xml += '<button id="b2" accesskey="' + b2_key + '" label="' + (b2) + '" name="fancy_submit" value="b2"/>'
-		if (b3) xml += '<button id="b3" accesskey="' + b3_key + '" label="' + (b3) + '" name="fancy_submit" value="b3"/>'
-		xml += '</hbox></groupbox></vbox>';
-		JSAN.use('OpenILS.data');
-		//var data = new OpenILS.data(); data.init({'via':'stash'});
-		//data.temp_yns_xml = xml; data.stash('temp_yns_xml');
-		var url = urls.XUL_FANCY_PROMPT; // + '?xml_in_stash=temp_yns_xml' + '&title=' + window.escape(title);
-		if (typeof xulG != 'undefined') if (typeof xulG.url_prefix == 'function') url = xulG.url_prefix( url );
-		JSAN.use('util.window'); var win = new util.window();
-		var fancy_prompt_data = win.open(
-			url, 'fancy_prompt', 'chrome,resizable,modal,width=700,height=500', { 'xml' : xml, 'title' : title }
-		);
-		if (fancy_prompt_data.fancy_status == 'complete') {
-			switch(fancy_prompt_data.fancy_submit) {
-				case 'b1' : return 0; break;
-				case 'b2' : return 1; break;
-				case 'b3' : return 2; break;
-			}
-		} else {
-			//return this.yns_alert(s,title,b1,b2,b3,c,image);
-			return null;
-		}
-
-		} catch(E) {
-
-			alert('yns_alert_formatted failed: ' + E + '\ns = ' + s + '\ntitle = ' + title + '\nb1 = ' + b1 + '\nb2 = ' + b2 + '\nb3 = ' + b3 + '\nc = ' + c + '\nimage = ' + image + '\n');
-
-		}
-
-	},
-
-	'yns_alert_original' : function (s,title,b1,b2,b3,c) {
-
-		/*
-			s 	= Message to display
-			title 	= Text in Title Bar
-			b1	= Text for button 1
-			b2	= Text for button 2
-			b3	= Text for button 3
-			c	= Text for confirmation checkbox.  null for no confirm
-		*/
-
-		dump('yns_alert:\n\ts = ' + s + '\n\ttitle = ' + title + '\n\tb1 = ' + b1 + '\n\tb2 = ' + b2 + '\n\tb3 = ' + b3 + '\n\tc = ' + c + '\n');
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-		this.sound.bad();
-
-		// get a reference to the prompt service component.
-		var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
-			.getService(Components.interfaces.nsIPromptService);
-
-		// set the buttons that will appear on the dialog. It should be
-		// a set of constants multiplied by button position constants. In this case,
-		// three buttons appear, Save, Cancel and a custom button.
-		//var flags=promptService.BUTTON_TITLE_OK * promptService.BUTTON_POS_0 +
-		//	promptService.BUTTON_TITLE_CANCEL * promptService.BUTTON_POS_1 +
-		//	promptService.BUTTON_TITLE_IS_STRING * promptService.BUTTON_POS_2;
-		var flags = promptService.BUTTON_TITLE_IS_STRING * promptService.BUTTON_POS_0 +
-			promptService.BUTTON_TITLE_IS_STRING * promptService.BUTTON_POS_1 +
-			promptService.BUTTON_TITLE_IS_STRING * promptService.BUTTON_POS_2; 
-
-		// display the dialog box. The flags set above are passed
-		// as the fourth argument. The next three arguments are custom labels used for
-		// the buttons, which are used if BUTTON_TITLE_IS_STRING is assigned to a
-		// particular button. The last two arguments are for an optional check box.
-		var check = {};
-		
-		// promptService.confirmEx does not offer scrollbars for long
-		// content, so trim error lines to avoid spilling offscreen
-		//
-		// There's probably a better way of doing this.
-
-		var maxlines = 30;
-		var ss = '';
-		var linefeeds = 0;
-		for (var i=0, chr; linefeeds < maxlines && i < s.length; i++) {  
-			if ((chr = this.getWholeChar(s, i)) === false) {continue;}
-			if (chr == '\u000A') { // \n
-				linefeeds++;
-			}	
-			ss = ss + chr;
-		}
-		
-		var rv = promptService.confirmEx(window,title, ss, flags, b1, b2, b3, c, check);
-		if (c && !check.value) {
-			return this.yns_alert(ss,title,b1,b2,b3,c);
-		}
-		return rv;
-	},
-
-	'print_tabs' : function(t) {
-		var r = '';
-		for (var j = 0; j < t; j++ ) { r = r + "\t"; }
-		return r;
-	},
-
-	'pretty_print' : function(s) {
-		var r = ''; var t = 0;
-		for (var i in s) {
-			if (s[i] == '{') {
-				r = r + "\n" + this.print_tabs(t) + s[i]; t++;
-				r = r + "\n" + this.print_tabs(t);
-			} else if (s[i] == '[') {
-				r = r + "\n" + this.print_tabs(t) + s[i]; t++;
-				r = r + "\n" + this.print_tabs(t);
-			} else if (s[i] == '}') {
-				t--; r = r + "\n" + this.print_tabs(t) + s[i];
-				r = r + "\n" + this.print_tabs(t);
-			} else if (s[i] == ']') {
-				t--; r = r + "\n" + this.print_tabs(t) + s[i];
-				r = r + "\n" + this.print_tabs(t);
-			} else if (s[i] == ',') {
-				r = r + s[i];
-				r = r + "\n" + this.print_tabs(t);
-			} else {
-				r = r + s[i];
-			}
-		}
-		return r;
-	},
-
-	// Copied from https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Global_Objects/String/charCodeAt
-	'getWholeChar' : function(str, i) {  
-		var code = str.charCodeAt(i);  
-		if (0xD800 <= code && code <= 0xDBFF) { // High surrogate(could change last hex to 0xDB7F to treat high private surrogates as single characters)  
-			if (str.length <= (i+1))  {  
-				throw 'High surrogate without following low surrogate';  
-			}  
-			var next = str.charCodeAt(i+1);  
-			if (0xDC00 > next || next > 0xDFFF) {  
-				throw 'High surrogate without following low surrogate';  
-			}  
-			return str[i]+str[i+1];  
-		}  
-		else if (0xDC00 <= code && code <= 0xDFFF) { // Low surrogate  
-			if (i === 0) {  
-				throw 'Low surrogate without preceding high surrogate';  
-			}  
-			var prev = str.charCodeAt(i-1);  
-			if (0xD800 > prev || prev > 0xDBFF) { //(could change last hex to 0xDB7F to treat high private surrogates as single characters)  
-				throw 'Low surrogate without preceding high surrogate';  
-			}  
-			return false; // We can pass over low surrogates now as the second component in a pair which we have already processed  
-		}  
-		return str[i];  
-	}  
+ 'printDebug' : true,
+ 'consoleDump' : false,
+ 'debugDump' : true,
+ 'fileDump' : false,
+ 'alertDump' : false,
+ 'arg_dump_full' : false,
+
+ 'debug' : function(e){
+  dump('-----------------------------------------\n' 
+   + e + '\n-----------------------------------------\n' );
+ },
+
+ 'sdump_levels' : {
+
+  'D_NONE' : false, 
+  'D_ALL' : false, 
+  'D_ERROR' : { 'dump' : true, 'console' : true }, 
+  'D_DEBUG' : { 'dump' : true, 'console' : true }, 
+  'D_TRACE' :  { 'dump' : true }, 
+  'D_ALERT' : { 'alert' : true, 'dump' : true },
+  'D_WARN' : false, 
+  'D_COLUMN_RENDER_ERROR' : false, 
+  'D_XULRUNNER' : false, 
+  'D_DECK' : { 'dump' : true },
+  'D_TRACE_ENTER' :  false, 
+  'D_TRACE_EXIT' :  false, 
+  'D_TIMEOUT' :  false, 
+  'D_FILTER' : false,
+  'D_CONSTRUCTOR' : false, 
+  'D_FIREFOX' : false, 
+  'D_LEGACY' : false, 
+  'D_DATA_STASH' : { 'alert' : false }, 
+  'D_DATA_RETRIEVE' : false,
+
+  'D_CLAM' : false, 
+  'D_PAGED_TREE' : false, 
+  'D_GRID_LIST' : false, 
+  'D_HTML_TABLE' : false,
+  'D_TAB' : false, 
+  'D_LIST' : false, 
+  'D_LIST_DUMP_WITH_KEYS_ON_CLEAR' : false, 
+  'D_LIST_DUMP_ON_CLEAR' : false,
+
+  'D_AUTH' : { 'dump' : true }, 
+  'D_OPAC' : { 'dump' : true }, 
+  'D_CAT' : false, 
+  'D_BROWSER' : { 'dump' : true },
+
+  'D_PATRON_SEARCH' : false, 
+  'D_PATRON_SEARCH_FORM' : false, 
+  'D_PATRON_SEARCH_RESULTS' : false,
+
+  'D_PATRON_DISPLAY' : false, 
+  'D_PATRON_DISPLAY_STATUS' : false, 
+  'D_PATRON_DISPLAY_CONTACT' : false,
+
+  'D_PATRON_ITEMS' : false, 
+  'D_PATRON_CHECKOUT_ITEMS' : false, 
+  'D_PATRON_HOLDS' : false,
+  'D_PATRON_BILLS' : false, 
+  'D_PATRON_EDIT' : false,
+
+  'D_CHECKIN' : false, 
+  'D_CHECKIN_ITEMS' : false,
+
+  'D_HOLD_CAPTURE' : false, 
+  'D_HOLD_CAPTURE_ITEMS' : false,
+
+  'D_PATRON_UTILS' : false, 
+  'D_CIRC_UTILS' : false,
+
+  'D_FILE' : false, 
+  'D_EXPLODE' : false, 
+  'D_FM_UTILS' : false, 
+  'D_PRINT' : { 'dump' : true }, 
+  'D_OBSERVERS' : { 'dump' : true, 'console' : false, 'alert' : false },
+  'D_CACHE' : { 'dump' : true, 'console' : false, 'alert' : false },
+  'D_SES' : { 'dump' : true, 'console' : false },
+  'D_SES_FUNC' : false, 
+  'D_SES_RESULT' : { 'dump' : true }, 
+  'D_SES_ERROR' : { 'dump' : true, 'console' : true }, 
+  'D_SPAWN' : false, 
+  'D_STRING' : false,
+  'D_UTIL' : false, 
+  'D_WIN' : { 'dump' : true }, 
+  'D_WIDGETS' : false
+ },
+
+ 'filter_console_init' : function (p) {
+  this.sdump('D_FILTER',this.arg_dump(arguments,{0:true}));
+
+  var filterConsoleListener = {
+   observe: function( msg ) {
+    try {
+     p.observe_msg( msg );
+    } catch(E) {
+     alert(E);
+    }
+   },
+   QueryInterface: function (iid) {
+    if (!iid.equals(Components.interfaces.nsIConsoleListener) &&
+     !iid.equals(Components.interfaces.nsISupports)) {
+      throw Components.results.NS_ERROR_NO_INTERFACE;
+    }
+           return this;
+   }
+  };
+  try {
+   this.consoleService.registerListener(filterConsoleListener); 
+  } catch(E) {
+   alert(E);
+  }
+
+  this.sdump('D_TRACE_EXIT',this.arg_dump(arguments));
+ },
+
+ 'sdump' : function (level,msg) {
+  try {
+   var now = new Date();
+   var message = now.valueOf() + '\tdelta = ' + (now.valueOf() - this.sdump_last_time.valueOf()) + '\t' + level + '\n' + msg;
+   if (this.sdump_levels['D_NONE']) return null;
+   if (this.sdump_levels[level]||this.sdump_levels['D_ALL']) {
+    this.sdump_last_time = now;
+    if (this.debugDump || ( this.sdump_levels[level] && this.sdump_levels[level].debug ) ) this.debug(message);
+    if (this.alertDump || ( this.sdump_levels[level] && this.sdump_levels[level].alert ) ) alert(message);
+    if (this.consoleDump || ( this.sdump_levels[level] && this.sdump_levels[level].console ) ) {
+     netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+     this.consoleService.logStringMessage(message);
+    }
+    if (this.fileDump || ( this.sdump_levels[level] && this.sdump_levels[level].file ) ) {
+     if (level!='D_FILE') {
+      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+      JSAN.use('util.file'); var master_log = new util.file('log');
+      master_log.write_content('append',message); master_log.close();
+      var specific_log = new util.file('log_'+level);
+      specific_log.write_content('append',message); specific_log.close();
+     }
+    }
+   }
+  } catch(E) {
+   dump('Calling sdump but ' + E + '\n');
+  }
+ },
+
+ 'arg_dump' : function (args,dump_these) {
+  var s = '*>*>*> Called function ';
+  try {
+   if (!dump_these)
+    dump_these = {};
+   s += args.callee.toString().match(/\w+/g)[1] + ' : ';
+   for (var i = 0; i < args.length; i++)
+    s += typeof(args[i]) + ' ';
+   s += '\n';
+   for (var i = 0; i < args.length; i++)
+    if (dump_these[i]) {
+
+     var arg = args[i];
+     //dump('dump_these[i] = ' + dump_these[i] + '  arg = ' + arg + '\n');
+
+     if (typeof(dump_these[i])=='string') {
+
+      if (dump_these[i].slice(0,1) == '.') {
+       var cmd = 'arg' + dump_these[i];
+       var result;
+       try {
+        result = eval( cmd );
+       } catch(E) {
+        result = cmd + ' ==> ' + E;
+       }
+       s += '\targ #' + i + ': ' + cmd + ' = ' + result;
+      } else {
+       var result;
+       try {
+        result = eval( dump_these[i] );
+       } catch(E) {
+        result = dump_these[i] + ' ==> ' + E;
+       }
+       s += '\targ #' + i + ': ' + result;
+      }
+ 
+     } else {
+      s += '\targ #' + i + ' = ';
+      try {
+       //s += js2JSON( arg );
+       s += arg;
+      } catch(E) {
+       s += arg;
+      }
+     }
+ 
+     s += '\n';
+     if (this.arg_dump_full)
+      s += 'Definition: ' + args.callee.toString() + '\n';
+ 
+    }
+   return s;
+  } catch(E) {
+   return s + '\nDEBUG ME: ' + js2JSON(E) + '\n';
+  }
+ },
+
+ 'handle_error' : function (E,annoy) {
+  var s = '';
+  if (instanceOf(E,ex)) {
+   s += E.err_msg();
+   //s += '\n\n=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n';
+   //s += 'This error was anticipated.\n\n';
+   //s += js2JSON(E).substr(0,200) + '...\n\n';
+   if (snd_bad) snd_bad();
+  } else {
+   s += '\n\n=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n';
+   s += 'This is a bug that we will fix later.\n\n';
+   try {
+    s += js2JSON(E).substr(0,1024) + '\n\n';
+   } catch(E2) {
+    try {
+     s += E.substr(0,1024) + '\n\n';
+    } catch(E3) {
+     s += E + '\n\n';
+    }
+   }
+   if (snd_really_bad) snd_really_bad();
+  }
+  sdump('D_ERROR',s);
+  if (annoy)
+   this.s_alert(s);
+  else
+   alert(s);
+ },
+
+ 's_alert' : function (s) { alert(s); },
+
+ 'standard_network_error_alert' : function(msg) {
+  var obj = this;
+  if (!msg) msg = '';
+  var alert_msg = 'We experienced a network/server communication failure.  Please check your internet connection and try this action again.  Repeated failures may require attention from your local IT staff or your friendly Evergreen developers.\n\n' + msg;
+  obj.yns_alert(
+   alert_msg, 
+   'Communication Failure',
+   'Ok', null, null, 'Check here to confirm this message'
+  );
+ },
+
+ 'standard_unexpected_error_alert' : function(msg,E) {
+  var obj = this;
+  if (E != null && typeof E.ilsevent != 'undefined') {
+   if (E.ilsevent == 0 /* SUCCESS */ ) {
+    msg = "The action involved likely succeeded, however, this part of the software needs to be updated to better understand success messages from the server, so please let us know about it.";
+   }
+   if (E.ilsevent == -1 /* Network/Server Problem */ ) {
+    return obj.standard_network_error_alert(msg);
+   }
+   if (E.ilsevent == 5000 /* PERM_FAILURE */ ) {
+    msg = "The action involved likely failed due to insufficient permissions.  However, this part of the software needs to be updated to better understand permission messages from the server, so please let us know about it.";
+   }
+  }
+  if (!msg) msg = '';
+  var alert_msg = 'FIXME:  If you encounter this alert, please inform your IT/ILS helpdesk staff or your friendly Evergreen developers.\n\n' + (new Date()) + '\n\n' + msg + '\n\n' + (typeof E.ilsevent != 'undefined' ? E.textcode + '\n' + (E.desc ? E.desc + '\n' : '') : '') + ( typeof E.status != 'undefined' ? 'Status: ' + E.status + '\n': '' ) + ( typeof E == 'string' ? E + '\n' : '' );
+  obj.sdump('D_ERROR',msg + ' : ' + js2JSON(E));
+  var r = obj.yns_alert(
+   alert_msg, 
+   'Unhandled Error',
+   'Ok', 'Debug Output to send to Helpdesk', null, 'Check here to confirm this message',
+   '/xul/server/skin/media/images/skull.png'
+  );
+  if (r == 1) {
+   JSAN.use('util.window'); var win = new util.window();
+   win.open(
+    'data:text/plain,' + window.escape( 'Please open a helpdesk ticket and include the following text: \n\n' + (new Date()) + '\n\n' + msg + '\n\n' + obj.pretty_print(js2JSON(E)) ),
+    'error_alert',
+    'chrome,resizable,width=700,height=500'
+   );
+  }
+  if (r==2) {
+   alert('Not Yet Implemented');
+  }
+ },
+
+ 'yns_alert' : function (s,title,b1,b2,b3,c,image) {
+
+  try {
+
+   if (location.href.match(/^chrome/)) return this.yns_alert_original(s,title,b1,b2,b3,c);
+
+  /* The original purpose of yns_alert was to prevent errors from being scanned through accidentally with a barcode scanner.  
+  However, this can be done in a less annoying manner by rolling our own dialog and not having any of the options in focus */
+
+  /*
+   s  = Message to display
+   title  = Text in Title Bar
+   b1 = Text for button 1
+   b2 = Text for button 2
+   b3 = Text for button 3
+   c = Text for confirmation checkbox.  null for no confirm
+  */
+
+  dump('yns_alert:\n\ts = ' + s + '\n\ttitle = ' + title + '\n\tb1 = ' + b1 + '\n\tb2 = ' + b2 + '\n\tb3 = ' + b3 + '\n\tc = ' + c + '\n');
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalBrowserWrite");
+
+  this.sound.bad();
+
+
+  //FIXME - is that good enough of an escape job?
+  s = s.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+
+  var xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" flex="1">' 
+   + '<groupbox flex="1" style="overflow: auto; border: solid thin red;"><caption label="' + (title) + '"/>';
+
+  if (image) xml += '<hbox><image src="' + image + '"/><spacer flex="1"/></hbox>';
+  xml += '<description style="font-size: large">' + (s)
+   + '</description></groupbox><groupbox><caption label="Options"/><hbox>';
+  var b1_key = b1 ? b1[0] : '';
+  var b2_key = b2 ? b2[0] : '';
+  var b3_key = b3 ? b3[0] : ''; /* FIXME - need to check for collisions */
+  if (b1) xml += '<button id="b1" accesskey="' + b1_key + '" label="' + (b1) + '" name="fancy_submit" value="b1"/>'
+  if (b2) xml += '<button id="b2" accesskey="' + b2_key + '" label="' + (b2) + '" name="fancy_submit" value="b2"/>'
+  if (b3) xml += '<button id="b3" accesskey="' + b3_key + '" label="' + (b3) + '" name="fancy_submit" value="b3"/>'
+  xml += '</hbox></groupbox></vbox>';
+  JSAN.use('OpenILS.data');
+  //var data = new OpenILS.data(); data.init({'via':'stash'});
+  //data.temp_yns_xml = xml; data.stash('temp_yns_xml');
+  var url = urls.XUL_FANCY_PROMPT; // + '?xml_in_stash=temp_yns_xml' + '&title=' + window.escape(title);
+  if (typeof xulG != 'undefined') if (typeof xulG.url_prefix == 'function') url = xulG.url_prefix( url );
+  JSAN.use('util.window'); var win = new util.window();
+  var fancy_prompt_data = win.open(
+   url, 'fancy_prompt', 'chrome,resizable,modal,width=700,height=500', { 'xml' : xml, 'title' : title }
+  );
+  if (fancy_prompt_data.fancy_status == 'complete') {
+   switch(fancy_prompt_data.fancy_submit) {
+    case 'b1' : return 0; break;
+    case 'b2' : return 1; break;
+    case 'b3' : return 2; break;
+   }
+  } else {
+   //return this.yns_alert(s,title,b1,b2,b3,c,image);
+   return null;
+  }
+
+  } catch(E) {
+
+   dump('yns_alert failed: ' + E + '\ns = ' + s + '\ntitle = ' + title + '\nb1 = ' + b1 + '\nb2 = ' + b2 + '\nb3 = ' + b3 + '\nc = ' + c + '\nimage = ' + image + '\n');
+
+   this.yns_alert_original(s + '\n\nAlso, yns_alert failed: ' + E,title,b1,b2,b3,c);
+
+  }
+ },
+
+ 'yns_alert_formatted' : function (s,title,b1,b2,b3,c,image) {
+
+  try {
+
+   if (location.href.match(/^chrome/)) return this.yns_alert_original(s,title,b1,b2,b3,c);
+
+  /* The original purpose of yns_alert was to prevent errors from being scanned through accidentally with a barcode scanner.  
+  However, this can be done in a less annoying manner by rolling our own dialog and not having any of the options in focus */
+
+  /*
+   s  = Message to display
+   title  = Text in Title Bar
+   b1 = Text for button 1
+   b2 = Text for button 2
+   b3 = Text for button 3
+   c = Text for confirmation checkbox.  null for no confirm
+  */
+
+  dump('yns_alert:\n\ts = ' + s + '\n\ttitle = ' + title + '\n\tb1 = ' + b1 + '\n\tb2 = ' + b2 + '\n\tb3 = ' + b3 + '\n\tc = ' + c + '\n');
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalBrowserWrite");
+
+  this.sound.bad();
+
+
+  //FIXME - is that good enough of an escape job?
+  s = s.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+
+  var xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" flex="1">' 
+   + '<groupbox flex="1" style="overflow: auto; border: solid thin red;"><caption label="' + (title) + '"/>';
+
+  if (image) xml += '<hbox><image src="' + image + '"/><spacer flex="1"/></hbox>';
+  xml += '<description style="font-size: large"><html:pre style="font-size: large">' + (s)
+   + '</html:pre></description></groupbox><groupbox><caption label="Options"/><hbox>';
+  var b1_key = b1 ? b1[0] : '';
+  var b2_key = b2 ? b2[0] : '';
+  var b3_key = b3 ? b3[0] : ''; /* FIXME - need to check for collisions */
+  if (b1) xml += '<button id="b1" accesskey="' + b1_key + '" label="' + (b1) + '" name="fancy_submit" value="b1"/>'
+  if (b2) xml += '<button id="b2" accesskey="' + b2_key + '" label="' + (b2) + '" name="fancy_submit" value="b2"/>'
+  if (b3) xml += '<button id="b3" accesskey="' + b3_key + '" label="' + (b3) + '" name="fancy_submit" value="b3"/>'
+  xml += '</hbox></groupbox></vbox>';
+  JSAN.use('OpenILS.data');
+  //var data = new OpenILS.data(); data.init({'via':'stash'});
+  //data.temp_yns_xml = xml; data.stash('temp_yns_xml');
+  var url = urls.XUL_FANCY_PROMPT; // + '?xml_in_stash=temp_yns_xml' + '&title=' + window.escape(title);
+  if (typeof xulG != 'undefined') if (typeof xulG.url_prefix == 'function') url = xulG.url_prefix( url );
+  JSAN.use('util.window'); var win = new util.window();
+  var fancy_prompt_data = win.open(
+   url, 'fancy_prompt', 'chrome,resizable,modal,width=700,height=500', { 'xml' : xml, 'title' : title }
+  );
+  if (fancy_prompt_data.fancy_status == 'complete') {
+   switch(fancy_prompt_data.fancy_submit) {
+    case 'b1' : return 0; break;
+    case 'b2' : return 1; break;
+    case 'b3' : return 2; break;
+   }
+  } else {
+   //return this.yns_alert(s,title,b1,b2,b3,c,image);
+   return null;
+  }
+
+  } catch(E) {
+
+   alert('yns_alert_formatted failed: ' + E + '\ns = ' + s + '\ntitle = ' + title + '\nb1 = ' + b1 + '\nb2 = ' + b2 + '\nb3 = ' + b3 + '\nc = ' + c + '\nimage = ' + image + '\n');
+
+  }
+
+ },
+
+ 'yns_alert_original' : function (s,title,b1,b2,b3,c) {
+
+  /*
+   s  = Message to display
+   title  = Text in Title Bar
+   b1 = Text for button 1
+   b2 = Text for button 2
+   b3 = Text for button 3
+   c = Text for confirmation checkbox.  null for no confirm
+  */
+
+  dump('yns_alert:\n\ts = ' + s + '\n\ttitle = ' + title + '\n\tb1 = ' + b1 + '\n\tb2 = ' + b2 + '\n\tb3 = ' + b3 + '\n\tc = ' + c + '\n');
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
+  this.sound.bad();
+
+  // get a reference to the prompt service component.
+  var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
+   .getService(Components.interfaces.nsIPromptService);
+
+  // set the buttons that will appear on the dialog. It should be
+  // a set of constants multiplied by button position constants. In this case,
+  // three buttons appear, Save, Cancel and a custom button.
+  //var flags=promptService.BUTTON_TITLE_OK * promptService.BUTTON_POS_0 +
+  // promptService.BUTTON_TITLE_CANCEL * promptService.BUTTON_POS_1 +
+  // promptService.BUTTON_TITLE_IS_STRING * promptService.BUTTON_POS_2;
+  var flags = promptService.BUTTON_TITLE_IS_STRING * promptService.BUTTON_POS_0 +
+   promptService.BUTTON_TITLE_IS_STRING * promptService.BUTTON_POS_1 +
+   promptService.BUTTON_TITLE_IS_STRING * promptService.BUTTON_POS_2; 
+
+  // display the dialog box. The flags set above are passed
+  // as the fourth argument. The next three arguments are custom labels used for
+  // the buttons, which are used if BUTTON_TITLE_IS_STRING is assigned to a
+  // particular button. The last two arguments are for an optional check box.
+  var check = {};
+  
+  // promptService.confirmEx does not offer scrollbars for long
+  // content, so trim error lines to avoid spilling offscreen
+  //
+  // There's probably a better way of doing this.
+
+  var maxlines = 30;
+  var ss = '';
+  var linefeeds = 0;
+  for (var i=0, chr; linefeeds < maxlines && i < s.length; i++) {  
+   if ((chr = this.getWholeChar(s, i)) === false) {continue;}
+   if (chr == '\u000A') { // \n
+    linefeeds++;
+   } 
+   ss = ss + chr;
+  }
+  
+  var rv = promptService.confirmEx(window,title, ss, flags, b1, b2, b3, c, check);
+  if (c && !check.value) {
+   return this.yns_alert(ss,title,b1,b2,b3,c);
+  }
+  return rv;
+ },
+
+ 'print_tabs' : function(t) {
+  var r = '';
+  for (var j = 0; j < t; j++ ) { r = r + "\t"; }
+  return r;
+ },
+
+ 'pretty_print' : function(s) {
+  var r = ''; var t = 0;
+  for (var i in s) {
+   if (s[i] == '{') {
+    r = r + "\n" + this.print_tabs(t) + s[i]; t++;
+    r = r + "\n" + this.print_tabs(t);
+   } else if (s[i] == '[') {
+    r = r + "\n" + this.print_tabs(t) + s[i]; t++;
+    r = r + "\n" + this.print_tabs(t);
+   } else if (s[i] == '}') {
+    t--; r = r + "\n" + this.print_tabs(t) + s[i];
+    r = r + "\n" + this.print_tabs(t);
+   } else if (s[i] == ']') {
+    t--; r = r + "\n" + this.print_tabs(t) + s[i];
+    r = r + "\n" + this.print_tabs(t);
+   } else if (s[i] == ',') {
+    r = r + s[i];
+    r = r + "\n" + this.print_tabs(t);
+   } else {
+    r = r + s[i];
+   }
+  }
+  return r;
+ },
+
+ // Copied from https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Global_Objects/String/charCodeAt
+ 'getWholeChar' : function(str, i) {  
+  var code = str.charCodeAt(i);  
+  if (0xD800 <= code && code <= 0xDBFF) { // High surrogate(could change last hex to 0xDB7F to treat high private surrogates as single characters)  
+   if (str.length <= (i+1))  {  
+    throw 'High surrogate without following low surrogate';  
+   }  
+   var next = str.charCodeAt(i+1);  
+   if (0xDC00 > next || next > 0xDFFF) {  
+    throw 'High surrogate without following low surrogate';  
+   }  
+   return str[i]+str[i+1];  
+  }  
+  else if (0xDC00 <= code && code <= 0xDFFF) { // Low surrogate  
+   if (i === 0) {  
+    throw 'Low surrogate without preceding high surrogate';  
+   }  
+   var prev = str.charCodeAt(i-1);  
+   if (0xD800 > prev || prev > 0xDBFF) { //(could change last hex to 0xDB7F to treat high private surrogates as single characters)  
+    throw 'Low surrogate without preceding high surrogate';  
+   }  
+   return false; // We can pass over low surrogates now as the second component in a pair which we have already processed  
+  }  
+  return str[i];  
+ }  
 }
 
 dump('exiting util/error.js\n');
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/exec.js b/Open-ILS/xul/staff_client/chrome/content/util/exec.js
index e3122b324e..cbd3cda851 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/exec.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/exec.js
@@ -2,11 +2,11 @@ dump('entering util/exec.js\n');
 
 if (typeof util == 'undefined') var util = {};
 util.exec = function(chunk_size) {
-	//JSAN.use('util.error'); this.error = new util.error();
+ //JSAN.use('util.error'); this.error = new util.error();
 
-	this.chunk_size = chunk_size || 1;
+ this.chunk_size = chunk_size || 1;
 
-	return this;
+ return this;
 };
 
 util.exec.prototype = {
@@ -24,66 +24,66 @@ util.exec.prototype = {
         );
         window.addEventListener('unload',function() { window.clearInterval(intervalId); },false);
     },
-	// This executes a series of functions, but tries to give other events/functions a chance to
-	// execute between each one.
-	'chain' : function () {
-		var args = [];
-		var obj = this;
-		for (var i = 0; i < arguments.length; i++) {
-			var arg = arguments[i];
-			switch(arg.constructor.name) {
-				case 'Function' :
-					args.push( arg );
-				break;
-				case 'Array' :
-					for (var j = 0; j < arg.length; j++) {
-						if (typeof arg[j] == 'function') args.push( arg[j] );
-					}
-				break;
-				case 'Object' :
-					for (var j in arg) {
-						if (typeof arg[j] == 'function') args.push( arg[j] );
-					}
-				break;
-			}
-		}
-		if (args.length > 0) setTimeout(
-			function() {
-				try {
-					for (var i = 0; (i < args.length && i < obj.chunk_size) ; i++) {
-						try {
-							if (typeof args[i] == 'function') {
-								args[i]();
-							} else {
-								alert('FIXME -- typeof args['+i+'] == ' + typeof args[i]);
-							}
-						} catch(E) {
-							dump('util.exec.chain error: ' + js2JSON(E) + '\n');
-							var keep_going = false;
-							if (typeof obj.on_error == 'function') {
-								keep_going = obj.on_error(E);
-							}
-							if (keep_going) {
-								dump('chain not broken\n');
-								try {
-									if (args.length > 1 ) obj.chain( args.slice(1) );
+ // This executes a series of functions, but tries to give other events/functions a chance to
+ // execute between each one.
+ 'chain' : function () {
+  var args = [];
+  var obj = this;
+  for (var i = 0; i < arguments.length; i++) {
+   var arg = arguments[i];
+   switch(arg.constructor.name) {
+    case 'Function' :
+     args.push( arg );
+    break;
+    case 'Array' :
+     for (var j = 0; j < arg.length; j++) {
+      if (typeof arg[j] == 'function') args.push( arg[j] );
+     }
+    break;
+    case 'Object' :
+     for (var j in arg) {
+      if (typeof arg[j] == 'function') args.push( arg[j] );
+     }
+    break;
+   }
+  }
+  if (args.length > 0) setTimeout(
+   function() {
+    try {
+     for (var i = 0; (i < args.length && i < obj.chunk_size) ; i++) {
+      try {
+       if (typeof args[i] == 'function') {
+        args[i]();
+       } else {
+        alert('FIXME -- typeof args['+i+'] == ' + typeof args[i]);
+       }
+      } catch(E) {
+       dump('util.exec.chain error: ' + js2JSON(E) + '\n');
+       var keep_going = false;
+       if (typeof obj.on_error == 'function') {
+        keep_going = obj.on_error(E);
+       }
+       if (keep_going) {
+        dump('chain not broken\n');
+        try {
+         if (args.length > 1 ) obj.chain( args.slice(1) );
 
-								} catch(E) {
-									dump('another error: ' + js2JSON(E) + '\n');
-								}
-							} else {
-								dump('chain broken\n');
+        } catch(E) {
+         dump('another error: ' + js2JSON(E) + '\n');
+        }
+       } else {
+        dump('chain broken\n');
                                 return;
-							}
-						}
-					}
-					if (args.length > obj.chunk_size ) obj.chain( args.slice(obj.chunk_size) );
-				} catch(E) {
-					alert(E);
-				}
-			}, 0
-		);
-	}
+       }
+      }
+     }
+     if (args.length > obj.chunk_size ) obj.chain( args.slice(obj.chunk_size) );
+    } catch(E) {
+     alert(E);
+    }
+   }, 0
+  );
+ }
 }
 
 dump('exiting util/exec.js\n');
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/fancy_prompt.xul b/Open-ILS/xul/staff_client/chrome/content/util/fancy_prompt.xul
index 7eed903edc..6e0acd1ef4 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/fancy_prompt.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/util/fancy_prompt.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/en-US/lang.dtd"-->
+ <!--#include virtual="/opac/locale/en-US/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,131 +19,131 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="fancy_prompt_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+ </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-
-		var xulG = {};
-
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		                if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for fancy_prompt.xul');
-
-				//JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-				//g.data.fancy_prompt_data = ''; g.data.stash('fancy_prompt_data');
-				//g.data.fancy_prompt_data = {};
-
-				//var key = location.pathname + location.search + location.hash;
-				//if (typeof g.data.modal_xulG_stack != 'undefined' && typeof g.data.modal_xulG_stack[key] != 'undefined') {
-				//	xulG = g.data.modal_xulG_stack[key][ g.data.modal_xulG_stack[key].length - 1 ];
-				//}
-
-				var top_xml = xul_param('top_xml',{'stash_name':xul_param('top_xml_in_stash',{'modal_xulG':true}),'modal_xulG':true});
-				if (top_xml) {
-					var parser = new DOMParser();
-					var doc = parser.parseFromString( top_xml, 'text/xml' );
-					var node = doc.documentElement;
-					if (node) document.getElementById('fancy_prompt_topbar').appendChild(node);
-				}
-
-				var my_xml = xul_param('xml',{'stash_name':xul_param('xml_in_stash',{'modal_xulG':true}),'modal_xulG':true});
-				if (my_xml) {
-					var parser = new DOMParser();
-					var doc = parser.parseFromString( my_xml, 'text/xml' );
-					var node = doc.documentElement;
-					if (node) document.getElementById('fancy_prompt_main').appendChild(node);
-				}
-
-				var bot_xml = xul_param('bottom_xml',{'stash_name':xul_param('bottom_xml_in_stash',{'modal_xulG':true}),'modal_xulG':true});;
-				if (bot_xml) {
-					var parser = new DOMParser();
-					var doc = parser.parseFromString( bot_xml, 'text/xml' );
-					var node = doc.documentElement;
-					if (node) document.getElementById('fancy_prompt_bottombar').appendChild(node);
-				}
-
-				var nl = document.getElementsByAttribute('name','fancy_submit');
-				for (var i = 0; i < nl.length; i++) {
-					nl[i].addEventListener('command',fancy_save,false);
-				}
-
-				var nl = document.getElementsByAttribute('name','fancy_cancel');
-				for (var i = 0; i < nl.length; i++) {
-					nl[i].addEventListener('command',function(ev) { window.close(); },false);
-				}
-
-				if (xul_param('title',{'modal_xulG':true})) {
-					try { window.title = xul_param('title',{'modal_xulG':true}); } catch(E) {}
-					try { document.title = xul_param('title',{'modal_xulG':true}); } catch(E) {}
-				}
-
-				if (xul_param('focus',{'modal_xulG':true})) {
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+
+  var xulG = {};
+
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                  if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for fancy_prompt.xul');
+
+    //JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+    //g.data.fancy_prompt_data = ''; g.data.stash('fancy_prompt_data');
+    //g.data.fancy_prompt_data = {};
+
+    //var key = location.pathname + location.search + location.hash;
+    //if (typeof g.data.modal_xulG_stack != 'undefined' && typeof g.data.modal_xulG_stack[key] != 'undefined') {
+    // xulG = g.data.modal_xulG_stack[key][ g.data.modal_xulG_stack[key].length - 1 ];
+    //}
+
+    var top_xml = xul_param('top_xml',{'stash_name':xul_param('top_xml_in_stash',{'modal_xulG':true}),'modal_xulG':true});
+    if (top_xml) {
+     var parser = new DOMParser();
+     var doc = parser.parseFromString( top_xml, 'text/xml' );
+     var node = doc.documentElement;
+     if (node) document.getElementById('fancy_prompt_topbar').appendChild(node);
+    }
+
+    var my_xml = xul_param('xml',{'stash_name':xul_param('xml_in_stash',{'modal_xulG':true}),'modal_xulG':true});
+    if (my_xml) {
+     var parser = new DOMParser();
+     var doc = parser.parseFromString( my_xml, 'text/xml' );
+     var node = doc.documentElement;
+     if (node) document.getElementById('fancy_prompt_main').appendChild(node);
+    }
+
+    var bot_xml = xul_param('bottom_xml',{'stash_name':xul_param('bottom_xml_in_stash',{'modal_xulG':true}),'modal_xulG':true});;
+    if (bot_xml) {
+     var parser = new DOMParser();
+     var doc = parser.parseFromString( bot_xml, 'text/xml' );
+     var node = doc.documentElement;
+     if (node) document.getElementById('fancy_prompt_bottombar').appendChild(node);
+    }
+
+    var nl = document.getElementsByAttribute('name','fancy_submit');
+    for (var i = 0; i < nl.length; i++) {
+     nl[i].addEventListener('command',fancy_save,false);
+    }
+
+    var nl = document.getElementsByAttribute('name','fancy_cancel');
+    for (var i = 0; i < nl.length; i++) {
+     nl[i].addEventListener('command',function(ev) { window.close(); },false);
+    }
+
+    if (xul_param('title',{'modal_xulG':true})) {
+     try { window.title = xul_param('title',{'modal_xulG':true}); } catch(E) {}
+     try { document.title = xul_param('title',{'modal_xulG':true}); } catch(E) {}
+    }
+
+    if (xul_param('focus',{'modal_xulG':true})) {
                     var focus_element = document.getElementById(xul_param('focus',{'modal_xulG':true}));
                     if (focus_element) focus_element.focus();
                 }
 
-				JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-				xulG.fancy_status = 'incomplete';
-				var key = location.pathname + location.search + location.hash;
-				data.modal_xulG_stack[key][ data.modal_xulG_stack[key].length - 1 ] = xulG;
-				data.stash('modal_xulG_stack');
-
-			} catch(E) {
-				var err_msg = "!! This software has encountered an error.  Please tell your friendly " +
-					"system administrator or software developer the following:\nfancy_prompt.xul\n" + E + '\n';
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function fancy_save(ev) {
-			try {
-				//if (ev.target.id) g.data.fancy_prompt_data[ ev.target.id ] = ev.target.value || ev.target.getAttribute('value');
-				//g.data.fancy_prompt_data[ 'fancy_submit' ] = ev.target.value || ev.target.getAttribute('value');
-				//var nl = document.getElementsByAttribute('name','fancy_data');
-				//for (var i = 0; i < nl.length; i++) {
-				//	g.data.fancy_prompt_data[ nl[i].id ] = nl[i].nodeName == 'checkbox' ? nl[i].checked : nl[i].value;
-				//}
-				//g.data.stash('fancy_prompt_data');
-	
-				JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-				if (ev.target.id) xulG[ ev.target.id ] = ev.target.value || ev.target.getAttribute('value');
-				xulG[ 'fancy_submit' ] = ev.target.value || ev.target.getAttribute('value');
-				var nl = document.getElementsByAttribute('name','fancy_data');
-					for (var i = 0; i < nl.length; i++) {
-					xulG[ nl[i].id ] = nl[i].nodeName == 'checkbox' ? nl[i].checked : nl[i].value;
-				}
-				xulG.fancy_status = 'complete';
-				var key = location.pathname + location.search + location.hash;
-				data.modal_xulG_stack[key][ data.modal_xulG_stack[key].length - 1 ] = xulG;
-				data.stash('modal_xulG_stack');
-	
-				window.close();
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert('fancy_save',E); } catch(F) { alert('fancy_save ' + E + ' ' + F); }
-			}
-		}
-	]]>
-	</script>
-
-	<vbox id="fancy_prompt_topbar"/>
-	<vbox id="fancy_prompt_main" flex="1" style="overflow: auto"/>
-	<vbox id="fancy_prompt_bottombar"/>
+    JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+    xulG.fancy_status = 'incomplete';
+    var key = location.pathname + location.search + location.hash;
+    data.modal_xulG_stack[key][ data.modal_xulG_stack[key].length - 1 ] = xulG;
+    data.stash('modal_xulG_stack');
+
+   } catch(E) {
+    var err_msg = "!! This software has encountered an error.  Please tell your friendly " +
+     "system administrator or software developer the following:\nfancy_prompt.xul\n" + E + '\n';
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+
+  function fancy_save(ev) {
+   try {
+    //if (ev.target.id) g.data.fancy_prompt_data[ ev.target.id ] = ev.target.value || ev.target.getAttribute('value');
+    //g.data.fancy_prompt_data[ 'fancy_submit' ] = ev.target.value || ev.target.getAttribute('value');
+    //var nl = document.getElementsByAttribute('name','fancy_data');
+    //for (var i = 0; i < nl.length; i++) {
+    // g.data.fancy_prompt_data[ nl[i].id ] = nl[i].nodeName == 'checkbox' ? nl[i].checked : nl[i].value;
+    //}
+    //g.data.stash('fancy_prompt_data');
+ 
+    JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+    if (ev.target.id) xulG[ ev.target.id ] = ev.target.value || ev.target.getAttribute('value');
+    xulG[ 'fancy_submit' ] = ev.target.value || ev.target.getAttribute('value');
+    var nl = document.getElementsByAttribute('name','fancy_data');
+     for (var i = 0; i < nl.length; i++) {
+     xulG[ nl[i].id ] = nl[i].nodeName == 'checkbox' ? nl[i].checked : nl[i].value;
+    }
+    xulG.fancy_status = 'complete';
+    var key = location.pathname + location.search + location.hash;
+    data.modal_xulG_stack[key][ data.modal_xulG_stack[key].length - 1 ] = xulG;
+    data.stash('modal_xulG_stack');
+ 
+    window.close();
+   } catch(E) {
+    try { g.error.standard_unexpected_error_alert('fancy_save',E); } catch(F) { alert('fancy_save ' + E + ' ' + F); }
+   }
+  }
+ ]]>
+ </script>
+
+ <vbox id="fancy_prompt_topbar"/>
+ <vbox id="fancy_prompt_main" flex="1" style="overflow: auto"/>
+ <vbox id="fancy_prompt_bottombar"/>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/file.js b/Open-ILS/xul/staff_client/chrome/content/util/file.js
index 1f4ceaf094..97dad90ff9 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/file.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/file.js
@@ -3,307 +3,307 @@ dump('entering util/file.js\n');
 if (typeof util == 'undefined') util = {};
 util.file = function (fname) {
 
-	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalPreferencesWrite UniversalBrowserWrite UniversalPreferencesRead UniversalBrowserRead UniversalFileRead");
+ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalPreferencesWrite UniversalBrowserWrite UniversalPreferencesRead UniversalBrowserRead UniversalFileRead");
 
-	JSAN.use('util.error'); this.error = new util.error();
+ JSAN.use('util.error'); this.error = new util.error();
 
-	this.dirService = Components.classes["@mozilla.org/file/directory_service;1"].
-		getService( Components.interfaces.nsIProperties );
+ this.dirService = Components.classes["@mozilla.org/file/directory_service;1"].
+  getService( Components.interfaces.nsIProperties );
 
-	if (fname) this.get(fname);
+ if (fname) this.get(fname);
 
-	return this;
+ return this;
 };
 
 util.file.prototype = {
 
-	'myPackageDir' : 'open_ils_staff_client',
-
-	'name' : '',
-	'_file' : null,
-	'_input_stream' : null,
-	'_output_stream' : null,
-
-	'get' : function( fname, path ) {
-		try {
-			if (!fname) { fname = this.name; } else { this.name = fname; }
-			if (!fname) throw('Must specify a filename.');
-
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalPreferencesWrite UniversalBrowserWrite UniversalPreferencesRead UniversalBrowserRead UniversalFileRead");
-				var pref = Components.classes["@mozilla.org/preferences-service;1"]
-					.getService(Components.interfaces.nsIPrefBranch);
-				if (!path && pref.getBoolPref("open-ils.write_in_user_chrome_directory")) path = 'uchrome';
-			} catch(E) {
-				// getBoolPref throws an exception if "open-ils.write_in_user_chrome_directory" is not defined at all
-				// in defaults/preferences/prefs.js
-			}
-
-			switch(path) {
-				case 'uchrome' :
-					this._file = this.dirService.get( "UChrm",  Components.interfaces.nsIFile );
-					//this._file = this.dirService.get( "ProfD",  Components.interfaces.nsIFile );
-				break;
-				default:
-				case 'chrome' : 
-					this._file = this.dirService.get( "AChrom",  Components.interfaces.nsIFile );
-					this._file.append(myPackageDir); 
-					this._file.append("content"); 
-					this._file.append("conf"); 
-				break;
-			}
-			this._file.append(fname);
-	
-			dump('file: ' + this._file.path + '\n');
-			this.error.sdump('D_FILE',this._file.path);
-
-			return this._file;
-
-		} catch(E) {
-			this.error.standard_unexpected_error_alert('error in util.file.get('+fname+','+path+')',E);
-			throw(E);
-		}
-	},
-
-	'close' : function() {
-		try {
-			if (!this._file) throw('Must .get() a file first.');
-			if (this._input_stream) { this._input_stream.close(); this._input_stream = null; }
-			if (this._output_stream) { this._output_stream.close(); this._output_stream = null; }
-			if (this._istream) { this._istream.close(); this._istream = null; }
-			if (this._f) { this._f = null; }
-
-		} catch(E) {
-			this.error.sdump('D_ERROR',this._file.path + '\nutil.file.close(): ' + E);
-			throw(E);
-		}
-	},
-
-	'append_object' : function(obj) {
-		try {
-			this.write_object('append',obj);
-		} catch(E) {
-			this.error.sdump('D_ERROR',this._file.path + '\nutil.file.append_object(): ' + E);
-			throw(E);
-		}
-	},
-
-	'set_object' : function(obj) {
-		try {
-			this.write_object('truncate',obj);
-			this.close();
-		} catch(E) {
-			this.error.sdump('D_ERROR',this._file.path + '\nutil.file.set_object(): ' + E);
-			throw(E);
-		}
-	},
-
-	'write_object' : function(write_type,obj) {
-		try {
-			if (!this._file) throw('Must .get() a file first.');
-			if (!obj) throw('Must specify an object.');
-
-			var obj_json; 
-			try { obj_json = js2JSON( obj ) + '\n'; } catch(E) { throw('Could not JSONify the object: ' + E); }
-
-			this.write_content(write_type,obj_json);
-
-		} catch(E) {
-			this.error.sdump('D_ERROR',this._file.path + '\nutil.file.write_object(): ' + E);
-			throw(E);
-		}
-	},
-
-	'write_content' : function(write_type,content) {
-		try {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalPreferencesWrite UniversalBrowserWrite UniversalPreferencesRead UniversalBrowserRead UniversalFileRead");
-			if (!this._output_stream) this._create_output_stream(write_type);
-			this._output_stream.write( content, String( content ).length );
-		} catch(E) {
-			this.error.sdump('D_ERROR',this._file.path + '\nutil.file.write_content(): ' + E);
-			//dump('write_type = ' + write_type + '\n');
-			//dump('content = ' + content + '\n');
-			throw(E);
-		}
-	},
-
-	'get_object' : function() {
-		try {
-			var data = this.get_content();
-			var obj; try { obj = JSON2js( data ); } catch(E) { throw('Could not js-ify the JSON: '+E); }
-			return obj;
-		} catch(E) {
-			this.error.sdump('D_ERROR',this._file.path + '\nutil.file.get_object(): ' + E);
-			throw(E);
-		}
-	},
-
-	'get_content' : function() {
-		try {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalPreferencesWrite UniversalBrowserWrite UniversalPreferencesRead UniversalBrowserRead UniversalFileRead");
-
-			if (!this._file) throw('Must .get() a file first.');
-			if (!this._file.exists()) throw('File does not exist.');
-			
-			if (!this._input_stream) this._create_input_stream();
-			var data = this._input_stream.read(-1);
-			//var data = {}; this._istream.readLine(data);
-			return data;
-		} catch(E) {
-			this.error.sdump('D_ERROR',this._file.path + '\nutil.file.get_content(): ' + E);
-			throw(E);
-		}
-	},
-
-	'_create_input_stream' : function() {
-		try {
-			//dump('_create_input_stream()\n');
-			
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalPreferencesWrite UniversalBrowserWrite UniversalPreferencesRead UniversalBrowserRead UniversalFileRead");
-
-			if (!this._file) throw('Must .get() a file first.');
-			if (!this._file.exists()) throw('File does not exist.');
-
-			this._f = Components.classes["@mozilla.org/network/file-input-stream;1"]
-				.createInstance(Components.interfaces.nsIFileInputStream);
-			this._f.init(this._file, MODE_RDONLY, 0, 0);
-			/*
-			this._f.QueryInterface(Components.interfaces.nsILineInputStream);
-			this._istream = this._f;
-			*/
-			this._input_stream = Components.classes["@mozilla.org/scriptableinputstream;1"]
-				.createInstance(Components.interfaces.nsIScriptableInputStream);
-			if (this._f) {
-				this._input_stream.init(this._f);
-			} else {
-				throw('Could not instantiate input stream.');
-			}
-			return this._input_stream;
-
-		} catch(E) {
-			this.error.sdump('D_ERROR',this._file.path + '\nutil.file._create_input_stream(): ' + E);
-			throw(E);
-		}
-	},
-
-	'_create_output_stream' : function(param) {
-		try {
-			//dump('_create_output_stream('+param+') for '+this._file.path+'\n');
-			
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalPreferencesWrite UniversalBrowserWrite UniversalPreferencesRead UniversalBrowserRead UniversalFileRead");
-
-			if (!this._file) throw('Must .get() a file first.');
-
-			if (! this._file.exists()) {
+ 'myPackageDir' : 'open_ils_staff_client',
+
+ 'name' : '',
+ '_file' : null,
+ '_input_stream' : null,
+ '_output_stream' : null,
+
+ 'get' : function( fname, path ) {
+  try {
+   if (!fname) { fname = this.name; } else { this.name = fname; }
+   if (!fname) throw('Must specify a filename.');
+
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalPreferencesWrite UniversalBrowserWrite UniversalPreferencesRead UniversalBrowserRead UniversalFileRead");
+    var pref = Components.classes["@mozilla.org/preferences-service;1"]
+     .getService(Components.interfaces.nsIPrefBranch);
+    if (!path && pref.getBoolPref("open-ils.write_in_user_chrome_directory")) path = 'uchrome';
+   } catch(E) {
+    // getBoolPref throws an exception if "open-ils.write_in_user_chrome_directory" is not defined at all
+    // in defaults/preferences/prefs.js
+   }
+
+   switch(path) {
+    case 'uchrome' :
+     this._file = this.dirService.get( "UChrm",  Components.interfaces.nsIFile );
+     //this._file = this.dirService.get( "ProfD",  Components.interfaces.nsIFile );
+    break;
+    default:
+    case 'chrome' : 
+     this._file = this.dirService.get( "AChrom",  Components.interfaces.nsIFile );
+     this._file.append(myPackageDir); 
+     this._file.append("content"); 
+     this._file.append("conf"); 
+    break;
+   }
+   this._file.append(fname);
+ 
+   dump('file: ' + this._file.path + '\n');
+   this.error.sdump('D_FILE',this._file.path);
+
+   return this._file;
+
+  } catch(E) {
+   this.error.standard_unexpected_error_alert('error in util.file.get('+fname+','+path+')',E);
+   throw(E);
+  }
+ },
+
+ 'close' : function() {
+  try {
+   if (!this._file) throw('Must .get() a file first.');
+   if (this._input_stream) { this._input_stream.close(); this._input_stream = null; }
+   if (this._output_stream) { this._output_stream.close(); this._output_stream = null; }
+   if (this._istream) { this._istream.close(); this._istream = null; }
+   if (this._f) { this._f = null; }
+
+  } catch(E) {
+   this.error.sdump('D_ERROR',this._file.path + '\nutil.file.close(): ' + E);
+   throw(E);
+  }
+ },
+
+ 'append_object' : function(obj) {
+  try {
+   this.write_object('append',obj);
+  } catch(E) {
+   this.error.sdump('D_ERROR',this._file.path + '\nutil.file.append_object(): ' + E);
+   throw(E);
+  }
+ },
+
+ 'set_object' : function(obj) {
+  try {
+   this.write_object('truncate',obj);
+   this.close();
+  } catch(E) {
+   this.error.sdump('D_ERROR',this._file.path + '\nutil.file.set_object(): ' + E);
+   throw(E);
+  }
+ },
+
+ 'write_object' : function(write_type,obj) {
+  try {
+   if (!this._file) throw('Must .get() a file first.');
+   if (!obj) throw('Must specify an object.');
+
+   var obj_json; 
+   try { obj_json = js2JSON( obj ) + '\n'; } catch(E) { throw('Could not JSONify the object: ' + E); }
+
+   this.write_content(write_type,obj_json);
+
+  } catch(E) {
+   this.error.sdump('D_ERROR',this._file.path + '\nutil.file.write_object(): ' + E);
+   throw(E);
+  }
+ },
+
+ 'write_content' : function(write_type,content) {
+  try {
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalPreferencesWrite UniversalBrowserWrite UniversalPreferencesRead UniversalBrowserRead UniversalFileRead");
+   if (!this._output_stream) this._create_output_stream(write_type);
+   this._output_stream.write( content, String( content ).length );
+  } catch(E) {
+   this.error.sdump('D_ERROR',this._file.path + '\nutil.file.write_content(): ' + E);
+   //dump('write_type = ' + write_type + '\n');
+   //dump('content = ' + content + '\n');
+   throw(E);
+  }
+ },
+
+ 'get_object' : function() {
+  try {
+   var data = this.get_content();
+   var obj; try { obj = JSON2js( data ); } catch(E) { throw('Could not js-ify the JSON: '+E); }
+   return obj;
+  } catch(E) {
+   this.error.sdump('D_ERROR',this._file.path + '\nutil.file.get_object(): ' + E);
+   throw(E);
+  }
+ },
+
+ 'get_content' : function() {
+  try {
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalPreferencesWrite UniversalBrowserWrite UniversalPreferencesRead UniversalBrowserRead UniversalFileRead");
+
+   if (!this._file) throw('Must .get() a file first.');
+   if (!this._file.exists()) throw('File does not exist.');
+   
+   if (!this._input_stream) this._create_input_stream();
+   var data = this._input_stream.read(-1);
+   //var data = {}; this._istream.readLine(data);
+   return data;
+  } catch(E) {
+   this.error.sdump('D_ERROR',this._file.path + '\nutil.file.get_content(): ' + E);
+   throw(E);
+  }
+ },
+
+ '_create_input_stream' : function() {
+  try {
+   //dump('_create_input_stream()\n');
+   
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalPreferencesWrite UniversalBrowserWrite UniversalPreferencesRead UniversalBrowserRead UniversalFileRead");
+
+   if (!this._file) throw('Must .get() a file first.');
+   if (!this._file.exists()) throw('File does not exist.');
+
+   this._f = Components.classes["@mozilla.org/network/file-input-stream;1"]
+    .createInstance(Components.interfaces.nsIFileInputStream);
+   this._f.init(this._file, MODE_RDONLY, 0, 0);
+   /*
+   this._f.QueryInterface(Components.interfaces.nsILineInputStream);
+   this._istream = this._f;
+   */
+   this._input_stream = Components.classes["@mozilla.org/scriptableinputstream;1"]
+    .createInstance(Components.interfaces.nsIScriptableInputStream);
+   if (this._f) {
+    this._input_stream.init(this._f);
+   } else {
+    throw('Could not instantiate input stream.');
+   }
+   return this._input_stream;
+
+  } catch(E) {
+   this.error.sdump('D_ERROR',this._file.path + '\nutil.file._create_input_stream(): ' + E);
+   throw(E);
+  }
+ },
+
+ '_create_output_stream' : function(param) {
+  try {
+   //dump('_create_output_stream('+param+') for '+this._file.path+'\n');
+   
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalPreferencesWrite UniversalBrowserWrite UniversalPreferencesRead UniversalBrowserRead UniversalFileRead");
+
+   if (!this._file) throw('Must .get() a file first.');
+
+   if (! this._file.exists()) {
                 if (param == 'truncate+exec') {
                     this._file.create( 0, 0777 );
                 } else {
                     this._file.create( 0, PERMS_FILE );
                 }
             }
-			this._output_stream = Components.classes["@mozilla.org/network/file-output-stream;1"]
-				.createInstance(Components.interfaces.nsIFileOutputStream);
-			switch(param){
-				case 'append' :
-					this._output_stream.init(this._file, MODE_WRONLY | MODE_APPEND, PERMS_FILE, 0);
-				break;
+   this._output_stream = Components.classes["@mozilla.org/network/file-output-stream;1"]
+    .createInstance(Components.interfaces.nsIFileOutputStream);
+   switch(param){
+    case 'append' :
+     this._output_stream.init(this._file, MODE_WRONLY | MODE_APPEND, PERMS_FILE, 0);
+    break;
                 case 'truncate+exec' :
-					this._output_stream.init(this._file, MODE_WRONLY | MODE_CREATE | MODE_TRUNCATE, PERMS_FILE, 0);
+     this._output_stream.init(this._file, MODE_WRONLY | MODE_CREATE | MODE_TRUNCATE, PERMS_FILE, 0);
                 break;
-				case 'truncate' :
-				default:
-					this._output_stream.init(this._file, MODE_WRONLY | MODE_CREATE | MODE_TRUNCATE, PERMS_FILE, 0);
-				break;
-			}
-
-			return this._output_stream;
-
-		} catch(E) {
-			this.error.sdump('D_ERROR',this._file.path + '\nutil.file._create_output_stream(): ' + E);
-			throw(E);
-		}
-	},
-
-	'pick_file' : function(params) {
-		try {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    case 'truncate' :
+    default:
+     this._output_stream.init(this._file, MODE_WRONLY | MODE_CREATE | MODE_TRUNCATE, PERMS_FILE, 0);
+    break;
+   }
+
+   return this._output_stream;
+
+  } catch(E) {
+   this.error.sdump('D_ERROR',this._file.path + '\nutil.file._create_output_stream(): ' + E);
+   throw(E);
+  }
+ },
+
+ 'pick_file' : function(params) {
+  try {
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
             if (typeof params == 'undefined') params = {};
             if (typeof params.mode == 'undefined') params.mode = 'open';
-			var nsIFilePicker = Components.interfaces.nsIFilePicker;
-			var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance( nsIFilePicker );
-			fp.init( 
-				window, 
+   var nsIFilePicker = Components.interfaces.nsIFilePicker;
+   var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance( nsIFilePicker );
+   fp.init( 
+    window, 
                 typeof params.title == 'undefined' ? params.mode : params.title,
-				params.mode == 'open' ? nsIFilePicker.modeOpen : nsIFilePicker.modeSave
-			);
+    params.mode == 'open' ? nsIFilePicker.modeOpen : nsIFilePicker.modeSave
+   );
             if (params.defaultFileName) {
                 fp.defaultString = params.defaultFileName;
             }
-			fp.appendFilters( nsIFilePicker.filterAll );
-			var fp_result = fp.show();
-			if ( ( fp_result == nsIFilePicker.returnOK || fp_result == nsIFilePicker.returnReplace ) && fp.file ) {
-				return fp.file;
-			} else {
-				return null;
-			}
-		} catch(E) {
-			this.error.standard_unexpected_error_alert('error picking file',E);
-		}
-	},
-
-	'export_file' : function(params) {
-		try {
-			var obj = this;
+   fp.appendFilters( nsIFilePicker.filterAll );
+   var fp_result = fp.show();
+   if ( ( fp_result == nsIFilePicker.returnOK || fp_result == nsIFilePicker.returnReplace ) && fp.file ) {
+    return fp.file;
+   } else {
+    return null;
+   }
+  } catch(E) {
+   this.error.standard_unexpected_error_alert('error picking file',E);
+  }
+ },
+
+ 'export_file' : function(params) {
+  try {
+   var obj = this;
             if (typeof params == 'undefined') params = {};
             params.mode = 'save';
             if (typeof params.data == 'undefined') throw('Need a .data field to export');
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			var f = obj.pick_file( params );
-			if (f) {
-				obj._file = f;
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   var f = obj.pick_file( params );
+   if (f) {
+    obj._file = f;
                 var temp = params.data;
                 if (typeof params.not_json == 'undefined') {
                     temp = js2JSON( temp );
                 }
-				obj.write_content( 'truncate', temp );
-				obj.close();
-				alert('Exported ' + f.leafName);
+    obj.write_content( 'truncate', temp );
+    obj.close();
+    alert('Exported ' + f.leafName);
                 return obj._file;
-			} else {
-				alert('File not chosen for export.');
+   } else {
+    alert('File not chosen for export.');
                 return null;
-			}
+   }
 
-		} catch(E) {
-			this.error.standard_unexpected_error_alert('Error exporting file',E);
+  } catch(E) {
+   this.error.standard_unexpected_error_alert('Error exporting file',E);
                 return null;
-		}
-	},
+  }
+ },
 
-	'import_file' : function(params) {
-		try {
-			var obj = this;
+ 'import_file' : function(params) {
+  try {
+   var obj = this;
             if (typeof params == 'undefined') params = {};
             params.mode = 'open';
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			var f = obj.pick_file(params);
-			if (f && f.exists()) {
-				obj._file = f;
-				var temp = obj.get_content();
-				obj.close();
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   var f = obj.pick_file(params);
+   if (f && f.exists()) {
+    obj._file = f;
+    var temp = obj.get_content();
+    obj.close();
                 if (typeof params.not_json == 'undefined') {
                     temp = JSON2js( obj.get_content() );
                 }
                 return temp;
-			} else {
-				alert('File not chosen for import.');
+   } else {
+    alert('File not chosen for import.');
                 return null;
-			}
-		} catch(E) {
-			this.error.standard_unexpected_error_alert('Error importing file',E);
+   }
+  } catch(E) {
+   this.error.standard_unexpected_error_alert('Error importing file',E);
             return null;
-		}
-	}
+  }
+ }
 
 }
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/fm_utils.js b/Open-ILS/xul/staff_client/chrome/content/util/fm_utils.js
index 1cc2a30d69..41b1d7504d 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/fm_utils.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/fm_utils.js
@@ -3,145 +3,145 @@ dump('entering util/fm_utils.js\n');
 if (typeof util == 'undefined') var util = {};
 util.fm_utils = {};
 
-util.fm_utils.EXPORT_OK	= [ 'flatten_ou_branch', 'find_ou', 'compare_aou_a_is_b_or_ancestor', 'sort_func_aou_by_depth_and_then_string', 'find_common_aou_ancestor', 'find_common_aou_ancestors' ];
-util.fm_utils.EXPORT_TAGS	= { ':all' : util.fm_utils.EXPORT_OK };
+util.fm_utils.EXPORT_OK = [ 'flatten_ou_branch', 'find_ou', 'compare_aou_a_is_b_or_ancestor', 'sort_func_aou_by_depth_and_then_string', 'find_common_aou_ancestor', 'find_common_aou_ancestors' ];
+util.fm_utils.EXPORT_TAGS = { ':all' : util.fm_utils.EXPORT_OK };
 
 util.fm_utils.flatten_ou_branch = function(branch) {
-	var my_array = new Array();
-	my_array.push( branch );
-	if (typeof branch.children == 'function') for (var i in branch.children() ) {
-		var child = branch.children()[i];
-		if (child != null) {
-			var temp_array = util.fm_utils.flatten_ou_branch(child);
-			for (var j in temp_array) {
-				my_array.push( temp_array[j] );
-			}
-		}
-	}
-	return my_array;
+ var my_array = new Array();
+ my_array.push( branch );
+ if (typeof branch.children == 'function') for (var i in branch.children() ) {
+  var child = branch.children()[i];
+  if (child != null) {
+   var temp_array = util.fm_utils.flatten_ou_branch(child);
+   for (var j in temp_array) {
+    my_array.push( temp_array[j] );
+   }
+  }
+ }
+ return my_array;
 }
 
 util.fm_utils.find_ou = function(tree,id) {
-	if (typeof(id)=='object') { id = id.id(); }
-	if (tree.id()==id) {
-		return tree;
-	}
-	for (var i in tree.children()) {
-		var child = tree.children()[i];
-		ou = util.fm_utils.find_ou( child, id );
-		if (ou) { return ou; }
-	}
-	return null;
+ if (typeof(id)=='object') { id = id.id(); }
+ if (tree.id()==id) {
+  return tree;
+ }
+ for (var i in tree.children()) {
+  var child = tree.children()[i];
+  ou = util.fm_utils.find_ou( child, id );
+  if (ou) { return ou; }
+ }
+ return null;
 }
 
 util.fm_utils.compare_aou_a_is_b_or_ancestor = function(a,b) {
-	JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.stash_retrieve();
-	if (typeof a != 'object') a = data.hash.aou[ a ];
-	if (typeof b != 'object') b = data.hash.aou[ b ];
-	var node = b;
-	while ( node != null ) {
-		if (a.id() == node.id()) return true;
-		node = typeof node.parent_ou() == 'object' ? node.parent_ou() : data.hash.aou[ node.parent_ou() ];
-	}
-	return false;
+ JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.stash_retrieve();
+ if (typeof a != 'object') a = data.hash.aou[ a ];
+ if (typeof b != 'object') b = data.hash.aou[ b ];
+ var node = b;
+ while ( node != null ) {
+  if (a.id() == node.id()) return true;
+  node = typeof node.parent_ou() == 'object' ? node.parent_ou() : data.hash.aou[ node.parent_ou() ];
+ }
+ return false;
 }
 
 util.fm_utils.sort_func_aou_by_depth_and_then_string = function(a,b) {
-	try {
-		JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.stash_retrieve();
-		var a_aou = a[0]; var b_aou = b[0];
-		var a_string = a[1]; var b_string = b[1];
-		if (typeof a_aou != 'object') a_aou = data.hash.aou[ a_aou ];
-		if (typeof b_aou != 'object') b_aou = data.hash.aou[ b_aou ];
-		var A = data.hash.aout[ a_aou.ou_type() ].depth();
-		var B = data.hash.aout[ b_aou.ou_type() ].depth();
-		if (A < B) return 1;
-		if (A > B) return -1;
-		if (a_string < b_string ) return -1;
-		if (a_string > b_string ) return 1;
-		return 0;
-	} catch(E) {
-		alert('error in util.fm_utils.sort_func_aou_by_depth_and_string: ' + E);
-		return 0;
-	}
+ try {
+  JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.stash_retrieve();
+  var a_aou = a[0]; var b_aou = b[0];
+  var a_string = a[1]; var b_string = b[1];
+  if (typeof a_aou != 'object') a_aou = data.hash.aou[ a_aou ];
+  if (typeof b_aou != 'object') b_aou = data.hash.aou[ b_aou ];
+  var A = data.hash.aout[ a_aou.ou_type() ].depth();
+  var B = data.hash.aout[ b_aou.ou_type() ].depth();
+  if (A < B) return 1;
+  if (A > B) return -1;
+  if (a_string < b_string ) return -1;
+  if (a_string > b_string ) return 1;
+  return 0;
+ } catch(E) {
+  alert('error in util.fm_utils.sort_func_aou_by_depth_and_string: ' + E);
+  return 0;
+ }
 }
 
 util.fm_utils.find_common_aou_ancestor = function(orgs) {
-	try {
-		JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+ try {
+  JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
 
-		var candidates = {};
-		for (var i = 0; i < orgs.length; i++) {
+  var candidates = {};
+  for (var i = 0; i < orgs.length; i++) {
 
-			var node = orgs[i]; 
+   var node = orgs[i]; 
 
-			while (node) {
+   while (node) {
 
-				if (typeof node != 'object') node = data.hash.aou[ node ];
-				if (!node) continue;
+    if (typeof node != 'object') node = data.hash.aou[ node ];
+    if (!node) continue;
 
-				if ( candidates[node.id()] ) {
+    if ( candidates[node.id()] ) {
 
-					candidates[node.id()]++;
-					
-				} else {
+     candidates[node.id()]++;
+     
+    } else {
 
-					candidates[node.id()] = 1;
-				}
+     candidates[node.id()] = 1;
+    }
 
-				if (candidates[node.id()] == orgs.length) return node;
+    if (candidates[node.id()] == orgs.length) return node;
 
-				node = node.parent_ou();
-			}
+    node = node.parent_ou();
+   }
 
-		}
+  }
 
-		return null;
+  return null;
 
-	} catch(E) {
-		alert('error in util.fm_utils.find_common_aou_ancestor: ' + E);
-		return null;
-	}
+ } catch(E) {
+  alert('error in util.fm_utils.find_common_aou_ancestor: ' + E);
+  return null;
+ }
 }
 
 util.fm_utils.find_common_aou_ancestors = function(orgs) {
-	try {
-		JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+ try {
+  JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
 
-		var candidates = {}; var winners = [];
-		for (var i = 0; i < orgs.length; i++) {
+  var candidates = {}; var winners = [];
+  for (var i = 0; i < orgs.length; i++) {
 
-			var node = orgs[i]; 
+   var node = orgs[i]; 
 
-			while (node) {
+   while (node) {
 
-				if (typeof node != 'object') node = data.hash.aou[ node ];
-				if (!node) continue;
+    if (typeof node != 'object') node = data.hash.aou[ node ];
+    if (!node) continue;
 
-				if ( candidates[node.id()] ) {
+    if ( candidates[node.id()] ) {
 
-					candidates[node.id()]++;
-					
-				} else {
+     candidates[node.id()]++;
+     
+    } else {
 
-					candidates[node.id()] = 1;
-				}
+     candidates[node.id()] = 1;
+    }
 
-				node = node.parent_ou();
-			}
+    node = node.parent_ou();
+   }
 
-		}
+  }
 
-		for (var i in candidates) {
+  for (var i in candidates) {
 
-			if (candidates[i] == orgs.length) winners.push( i );
-		}
+   if (candidates[i] == orgs.length) winners.push( i );
+  }
 
-		return winners;
+  return winners;
 
-	} catch(E) {
-		alert('error in util.fm_utils.find_common_aou_ancestors: ' + E);
-		return [];
-	}
+ } catch(E) {
+  alert('error in util.fm_utils.find_common_aou_ancestors: ' + E);
+  return [];
+ }
 }
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/fm_view.xul b/Open-ILS/xul/staff_client/chrome/content/util/fm_view.xul
index 0858796533..6b06b4a1cd 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/fm_view.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/util/fm_view.xul
@@ -10,198 +10,198 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="fm_view_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { dump(E+'\n'); alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); } catch(E) { dump(E+'\n'); alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
         <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-
-	<script>
-	<![CDATA[
-		var tree;
-		var mw = {
-			'get_list_from_tree_selection' : function() {
-				var d = document; var tree_w;
-				if (arguments.length == 1) {
-					tree_w = arguments[0];
-				} else {
-					d = arguments[0];
-					tree_w = arguments[1];
-				}
-				var hitlist;
-				if (typeof(tree_w) != 'object') {
-					hitlist = d.getElementById(tree_w);
-				} else {
-					hitlist = tree_w;
-				}
-				var list = [];
-				var start = new Object();
-				var end = new Object();
-				var numRanges = hitlist.view.selection.getRangeCount();
-				for (var t=0; t<numRanges; t++){
-					hitlist.view.selection.getRangeAt(t,start,end);
-					for (var v=start.value; v<=end.value; v++){
-						var i = hitlist.contentView.getItemAtIndex(v);
-						list.push( i );
-					}
-				}
-				return list;
-			}
-		};
-
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		                if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('util.window'); g.window = new util.window();
-				JSAN.use('util.functional');
-				g.error.sdump('D_TRACE','my_init() for fm_view.xul');
-
-				var treechildren = window.document.getElementById('tc');
-				var fm = g.network.request('open-ils.actor','opensrf.open-ils.system.fieldmapper',[]);
-				var fma = []; var fmh = {} ; 
-				for (var i in fm) { fmh[ fm[i].hint ] = fm[i]; fma.push( [ fm[i].hint, i ] ); }
-				fma.sort();
-				for (var i = 0; i < fma.length; i++) {
-					var hint = fma[i][0]; var name = fma[i][1]; var o = fmh[ hint ];
-					var ti = window.document.createElement('treeitem');
-					treechildren.appendChild( ti );
-					ti.setAttribute( 'container', 'true' );
-					var tr = window.document.createElement('treerow');
-					ti.appendChild( tr );
-					var tc = window.document.createElement('treecell');
-					tr.appendChild( tc );
-					tc.setAttribute('label',hint);
-					tc = window.document.createElement('treecell');
-					tr.appendChild( tc );
-					tc.setAttribute('label', name );
-					var _treechildren = window.document.createElement( 'treechildren' );
-					ti.appendChild( _treechildren );
-					for (var j in o.fields) {
-						var _ti = window.document.createElement( 'treeitem' );
-						_treechildren.appendChild( _ti );
-						_ti.setAttribute('fm_class',hint);
-						_ti.setAttribute('fm_field',j);
-						_ti.setAttribute('fm_virtual',o.fields[j].virtual);
-						_ti.setAttribute('fm_position',o.fields[j].position);
-						var _tr = window.document.createElement( 'treerow' );
-						_ti.appendChild( _tr );
-						var _tc = window.document.createElement( 'treecell' );
-						_tr.appendChild( _tc );
-						_tc.setAttribute('label',j);
-						_tc = window.document.createElement( 'treecell' );
-						_tr.appendChild( _tc );
-						_tc.setAttribute('label','\t         Position: ' + o.fields[j].position + '  Virtual: ' + o.fields[j].virtual);
-					}
-				}
-				tree = window.document.getElementById('t');
-				tree.view.selection.select( 0 ); tree.focus();
-			} catch(E) {
-			}
-		}
-
-		function gen_cols() {
-			var data_url = 'data:application/vnd.mozilla.xul+xml,<?xml version="1.0"?><window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"><?xml-stylesheet href="chrome://global/skin" type="text/css"?><vbox flex="1"><textbox id="desc" multiline="true" flex="1"/></vbox></window>';
-			var w = g.window.SafeWindowOpen(data_url,'paged_tree cols','chrome,resizable,width=800,height=600');
-			var css = '<?xml-stylesheet href="data:text/css,#a{-moz-box-flex:1;}"?>';
-			var treeitems = mw.get_list_from_tree_selection( tree );
-			setTimeout(
-				function() {
-					var tb = w.document.getElementById('desc');
-					for (var i = 0; i < treeitems.length; i++) {
-						var hint = treeitems[i].getAttribute('fm_class');
-						var field = treeitems[i].getAttribute('fm_field');
-						var text = (
-							"{\n\t'id' : '" + field + "', 'label' : getString('" + hint + "_" + 
-							field + "_label'), 'flex' : 1,\n" + 
-							"\t'primary' : false, 'hidden' : false, 'fm_class' : '" + hint + 
-							"', 'fm_field_render' : '." + field + "()'\n},\n"
-						);
-						tb.value += text;
-					}
-					dump(tb.value + '\n');
-				}, 0
-			);
-		}
-
-		function gen_properties() {
-			var data_url = 'data:application/vnd.mozilla.xul+xml,<?xml version="1.0"?><window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"><?xml-stylesheet href="chrome://global/skin" type="text/css"?><vbox flex="1"><textbox id="desc" multiline="true" flex="1"/></vbox></window>';
-			var w = g.window.SafeWindowOpen(data_url,'paged_tree cols','chrome,resizable,width=800,height=600');
-			var css = '<?xml-stylesheet href="data:text/css,#a{-moz-box-flex:1;}"?>';
-			var treeitems = mw.get_list_from_tree_selection( tree );
-			setTimeout(
-				function() {
-					var tb = w.document.getElementById('desc');
-					for (var i = 0; i < treeitems.length; i++) {
-						var hint = treeitems[i].getAttribute('fm_class');
-						var field = treeitems[i].getAttribute('fm_field');
-						var pretty = util.functional.map_list(
-							field.split('_'),
-							function (s) {
-								return s.substr(0,1).toUpperCase() + s.substr(1);
-							}
-						).join(' ');
-						var text = (
-							hint + '_' + field + '_label=' + pretty + '\n'
-						);
-						tb.value += text;
-					}
-					dump(tb.value + '\n');
-				}, 0
-			);
-		}
-
-		function gen_wikitable() {
-			var data_url = 'data:application/vnd.mozilla.xul+xml,<?xml version="1.0"?><window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"><?xml-stylesheet href="chrome://global/skin" type="text/css"?><vbox flex="1"><textbox id="desc" multiline="true" flex="1"/></vbox></window>';
-			var w = g.window.SafeWindowOpen(data_url,'paged_tree cols','chrome,resizable,width=800,height=600');
-			var css = '<?xml-stylesheet href="data:text/css,#a{-moz-box-flex:1;}"?>';
-			var treeitems = mw.get_list_from_tree_selection( tree );
-			setTimeout(
-				function() {
-					var tb = w.document.getElementById('desc');
-					for (var i = 0; i < treeitems.length; i++) {
-						var hint = treeitems[i].getAttribute('fm_class');
-						var field = treeitems[i].getAttribute('fm_field');
-						var text = (
-							'|' + hint + '|' + field
-						);
-					
-						if (treeitems[i].getAttribute('fm_virtual') == '1') text += ' * ';
-						text +=	'|\n'
-						tb.value += text;
-					}
-					dump(tb.value + '\n');
-				}, 0
-			);
-		}
-
-
-	]]>
-	</script>
-
-	<vbox flex="1" class="my_overflow">
-		<groupbox orient="vertical" flex="1">
-			<caption label="Fieldmapper Class Viewer"/>
-			<hbox>
-				<button label="Generate paged_tree cols for selected fields" accesskey="G" oncommand="gen_cols();"/>
-				<button label="Generate string bundle properties for selected fields" accesskey="P" oncommand="gen_properties();"/>
-				<button label="Generate dokuwiki table for selected fields" accesskey="P" oncommand="gen_wikitable();"/>
-			</hbox>
-			<tree id="t" flex="1">
-				<treecols>
-					<treecol id="tcol1" label="opensrf.open-ils.system.fieldmapper" primary="true" flex="0"/>
-					<treecol id="tcol2" label="" flex="1"/>
-				</treecols>
-				<treechildren id="tc"/>
-			</tree>
-		</groupbox>
-	</vbox>
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+
+ <script>
+ <![CDATA[
+  var tree;
+  var mw = {
+   'get_list_from_tree_selection' : function() {
+    var d = document; var tree_w;
+    if (arguments.length == 1) {
+     tree_w = arguments[0];
+    } else {
+     d = arguments[0];
+     tree_w = arguments[1];
+    }
+    var hitlist;
+    if (typeof(tree_w) != 'object') {
+     hitlist = d.getElementById(tree_w);
+    } else {
+     hitlist = tree_w;
+    }
+    var list = [];
+    var start = new Object();
+    var end = new Object();
+    var numRanges = hitlist.view.selection.getRangeCount();
+    for (var t=0; t<numRanges; t++){
+     hitlist.view.selection.getRangeAt(t,start,end);
+     for (var v=start.value; v<=end.value; v++){
+      var i = hitlist.contentView.getItemAtIndex(v);
+      list.push( i );
+     }
+    }
+    return list;
+   }
+  };
+
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                  if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    JSAN.use('util.network'); g.network = new util.network();
+    JSAN.use('util.window'); g.window = new util.window();
+    JSAN.use('util.functional');
+    g.error.sdump('D_TRACE','my_init() for fm_view.xul');
+
+    var treechildren = window.document.getElementById('tc');
+    var fm = g.network.request('open-ils.actor','opensrf.open-ils.system.fieldmapper',[]);
+    var fma = []; var fmh = {} ; 
+    for (var i in fm) { fmh[ fm[i].hint ] = fm[i]; fma.push( [ fm[i].hint, i ] ); }
+    fma.sort();
+    for (var i = 0; i < fma.length; i++) {
+     var hint = fma[i][0]; var name = fma[i][1]; var o = fmh[ hint ];
+     var ti = window.document.createElement('treeitem');
+     treechildren.appendChild( ti );
+     ti.setAttribute( 'container', 'true' );
+     var tr = window.document.createElement('treerow');
+     ti.appendChild( tr );
+     var tc = window.document.createElement('treecell');
+     tr.appendChild( tc );
+     tc.setAttribute('label',hint);
+     tc = window.document.createElement('treecell');
+     tr.appendChild( tc );
+     tc.setAttribute('label', name );
+     var _treechildren = window.document.createElement( 'treechildren' );
+     ti.appendChild( _treechildren );
+     for (var j in o.fields) {
+      var _ti = window.document.createElement( 'treeitem' );
+      _treechildren.appendChild( _ti );
+      _ti.setAttribute('fm_class',hint);
+      _ti.setAttribute('fm_field',j);
+      _ti.setAttribute('fm_virtual',o.fields[j].virtual);
+      _ti.setAttribute('fm_position',o.fields[j].position);
+      var _tr = window.document.createElement( 'treerow' );
+      _ti.appendChild( _tr );
+      var _tc = window.document.createElement( 'treecell' );
+      _tr.appendChild( _tc );
+      _tc.setAttribute('label',j);
+      _tc = window.document.createElement( 'treecell' );
+      _tr.appendChild( _tc );
+      _tc.setAttribute('label','\t         Position: ' + o.fields[j].position + '  Virtual: ' + o.fields[j].virtual);
+     }
+    }
+    tree = window.document.getElementById('t');
+    tree.view.selection.select( 0 ); tree.focus();
+   } catch(E) {
+   }
+  }
+
+  function gen_cols() {
+   var data_url = 'data:application/vnd.mozilla.xul+xml,<?xml version="1.0"?><window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"><?xml-stylesheet href="chrome://global/skin" type="text/css"?><vbox flex="1"><textbox id="desc" multiline="true" flex="1"/></vbox></window>';
+   var w = g.window.SafeWindowOpen(data_url,'paged_tree cols','chrome,resizable,width=800,height=600');
+   var css = '<?xml-stylesheet href="data:text/css,#a{-moz-box-flex:1;}"?>';
+   var treeitems = mw.get_list_from_tree_selection( tree );
+   setTimeout(
+    function() {
+     var tb = w.document.getElementById('desc');
+     for (var i = 0; i < treeitems.length; i++) {
+      var hint = treeitems[i].getAttribute('fm_class');
+      var field = treeitems[i].getAttribute('fm_field');
+      var text = (
+       "{\n\t'id' : '" + field + "', 'label' : getString('" + hint + "_" + 
+       field + "_label'), 'flex' : 1,\n" + 
+       "\t'primary' : false, 'hidden' : false, 'fm_class' : '" + hint + 
+       "', 'fm_field_render' : '." + field + "()'\n},\n"
+      );
+      tb.value += text;
+     }
+     dump(tb.value + '\n');
+    }, 0
+   );
+  }
+
+  function gen_properties() {
+   var data_url = 'data:application/vnd.mozilla.xul+xml,<?xml version="1.0"?><window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"><?xml-stylesheet href="chrome://global/skin" type="text/css"?><vbox flex="1"><textbox id="desc" multiline="true" flex="1"/></vbox></window>';
+   var w = g.window.SafeWindowOpen(data_url,'paged_tree cols','chrome,resizable,width=800,height=600');
+   var css = '<?xml-stylesheet href="data:text/css,#a{-moz-box-flex:1;}"?>';
+   var treeitems = mw.get_list_from_tree_selection( tree );
+   setTimeout(
+    function() {
+     var tb = w.document.getElementById('desc');
+     for (var i = 0; i < treeitems.length; i++) {
+      var hint = treeitems[i].getAttribute('fm_class');
+      var field = treeitems[i].getAttribute('fm_field');
+      var pretty = util.functional.map_list(
+       field.split('_'),
+       function (s) {
+        return s.substr(0,1).toUpperCase() + s.substr(1);
+       }
+      ).join(' ');
+      var text = (
+       hint + '_' + field + '_label=' + pretty + '\n'
+      );
+      tb.value += text;
+     }
+     dump(tb.value + '\n');
+    }, 0
+   );
+  }
+
+  function gen_wikitable() {
+   var data_url = 'data:application/vnd.mozilla.xul+xml,<?xml version="1.0"?><window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"><?xml-stylesheet href="chrome://global/skin" type="text/css"?><vbox flex="1"><textbox id="desc" multiline="true" flex="1"/></vbox></window>';
+   var w = g.window.SafeWindowOpen(data_url,'paged_tree cols','chrome,resizable,width=800,height=600');
+   var css = '<?xml-stylesheet href="data:text/css,#a{-moz-box-flex:1;}"?>';
+   var treeitems = mw.get_list_from_tree_selection( tree );
+   setTimeout(
+    function() {
+     var tb = w.document.getElementById('desc');
+     for (var i = 0; i < treeitems.length; i++) {
+      var hint = treeitems[i].getAttribute('fm_class');
+      var field = treeitems[i].getAttribute('fm_field');
+      var text = (
+       '|' + hint + '|' + field
+      );
+     
+      if (treeitems[i].getAttribute('fm_virtual') == '1') text += ' * ';
+      text += '|\n'
+      tb.value += text;
+     }
+     dump(tb.value + '\n');
+    }, 0
+   );
+  }
+
+
+ ]]>
+ </script>
+
+ <vbox flex="1" class="my_overflow">
+  <groupbox orient="vertical" flex="1">
+   <caption label="Fieldmapper Class Viewer"/>
+   <hbox>
+    <button label="Generate paged_tree cols for selected fields" accesskey="G" oncommand="gen_cols();"/>
+    <button label="Generate string bundle properties for selected fields" accesskey="P" oncommand="gen_properties();"/>
+    <button label="Generate dokuwiki table for selected fields" accesskey="P" oncommand="gen_wikitable();"/>
+   </hbox>
+   <tree id="t" flex="1">
+    <treecols>
+     <treecol id="tcol1" label="opensrf.open-ils.system.fieldmapper" primary="true" flex="0"/>
+     <treecol id="tcol2" label="" flex="1"/>
+    </treecols>
+    <treechildren id="tc"/>
+   </tree>
+  </groupbox>
+ </vbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/functional.js b/Open-ILS/xul/staff_client/chrome/content/util/functional.js
index 8a0279d098..e716372b1f 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/functional.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/functional.js
@@ -3,135 +3,135 @@ dump('entering util/functional.js\n');
 if (typeof util == 'undefined') var util = {};
 util.functional = {};
 
-util.functional.EXPORT_OK	= [ 
-	'filter_list', 'filter_object', 'find_list', 'find_object', 'map_list', 'map_flat_list', 
-	'map_object', 'map_object_to_list', 'convert_object_list_to_hash', 'find_id_object_in_list', 
-	'find_attr_object_in_list', 'walk_tree_preorder',
+util.functional.EXPORT_OK = [ 
+ 'filter_list', 'filter_object', 'find_list', 'find_object', 'map_list', 'map_flat_list', 
+ 'map_object', 'map_object_to_list', 'convert_object_list_to_hash', 'find_id_object_in_list', 
+ 'find_attr_object_in_list', 'walk_tree_preorder',
 ];
-util.functional.EXPORT_TAGS	= { ':all' : util.functional.EXPORT_OK };
+util.functional.EXPORT_TAGS = { ':all' : util.functional.EXPORT_OK };
 
 util.functional.filter_list = function(list,f) {
-	var new_list = [];
-	for (var i = 0; i < list.length; i++) {
-		var t = f( list[i] );
-		if (t) new_list.push( list[i] );
-	}
-	return new_list;
+ var new_list = [];
+ for (var i = 0; i < list.length; i++) {
+  var t = f( list[i] );
+  if (t) new_list.push( list[i] );
+ }
+ return new_list;
 }
 
 util.functional.filter_object = function(obj,f) {
-	var new_obj = {};
-	for (var i in obj) {
-		var t = f( i, obj[i] );
-		if (t) new_obj[i] = obj[i];
-	}
-	return new_obj;
+ var new_obj = {};
+ for (var i in obj) {
+  var t = f( i, obj[i] );
+  if (t) new_obj[i] = obj[i];
+ }
+ return new_obj;
 }
 
 util.functional.find_list = function(list,f) {
-	for (var i = 0; i < list.length; i++) {
-		var t = f( list[i] );
-		if (t) return list[i];
-	}
-	return null;
+ for (var i = 0; i < list.length; i++) {
+  var t = f( list[i] );
+  if (t) return list[i];
+ }
+ return null;
 }
 
 util.functional.find_object = function(obj,f) {
-	for (var i in obj) {
-		var t = f( i, obj[i] );
-		if (t) return obj[i];
-	}
-	return null;
+ for (var i in obj) {
+  var t = f( i, obj[i] );
+  if (t) return obj[i];
+ }
+ return null;
 }
 
 util.functional.walk_tree_preorder = function(node,children_func,f,parent_node) {
-	f(node,parent_node);
-	var children = children_func( node );
-	if (children) for (var i = 0; i < children.length; i++) {
-		util.functional.walk_tree_preorder(
-			children[i],
-			children_func,
-			f,
-			node
-		);	
-	}
+ f(node,parent_node);
+ var children = children_func( node );
+ if (children) for (var i = 0; i < children.length; i++) {
+  util.functional.walk_tree_preorder(
+   children[i],
+   children_func,
+   f,
+   node
+  ); 
+ }
 }
 
 util.functional.map_list = function(list,f) {
-	var new_list = []; var idx = 0;
-	for (var i in list) {
-		new_list.push( f( list[i], idx++ ) );
-	}
-	return new_list;
+ var new_list = []; var idx = 0;
+ for (var i in list) {
+  new_list.push( f( list[i], idx++ ) );
+ }
+ return new_list;
 }
 
 util.functional.map_flat_list = function(list,f) {
-	var new_list = [];
-	for (var i in list) {
-		new_list = new_list.concat( f( list[i] ) );
-	}
-	return new_list;
+ var new_list = [];
+ for (var i in list) {
+  new_list = new_list.concat( f( list[i] ) );
+ }
+ return new_list;
 }
 
 util.functional.map_object = function(obj,f) {
-	var new_obj = {};
-	for (var i in obj) {
-		new_obj[ f( i, obj[i] )[0] ] = f( i, obj[i] )[1];
-	}
-	return new_obj;
+ var new_obj = {};
+ for (var i in obj) {
+  new_obj[ f( i, obj[i] )[0] ] = f( i, obj[i] )[1];
+ }
+ return new_obj;
 }
 
 util.functional.map_object_to_list = function(obj,f) {
-	var new_list = [];
-	for (var i in obj) {
-		new_list.push( f( obj, i ) );
-	}
-	return new_list;
+ var new_list = [];
+ for (var i in obj) {
+  new_list.push( f( obj, i ) );
+ }
+ return new_list;
 }
 
 util.functional.convert_object_list_to_hash = function(list) {
-	var my_hash = new Object();
-	if (list) {
-		for (var i = 0; i < list.length; i++) {
-			if (typeof list[i].id == 'function') {
-				my_hash[ list[i].id() ] = list[i];
-			} else if (typeof list[i].code == 'function') {
-				my_hash[ list[i].code() ] = list[i];
-			}
-		}
-	}
-	return my_hash;
+ var my_hash = new Object();
+ if (list) {
+  for (var i = 0; i < list.length; i++) {
+   if (typeof list[i].id == 'function') {
+    my_hash[ list[i].id() ] = list[i];
+   } else if (typeof list[i].code == 'function') {
+    my_hash[ list[i].code() ] = list[i];
+   }
+  }
+ }
+ return my_hash;
 }
 
 util.functional.find_id_object_in_list = function(list,id) {
-	if (list) {
-		for (var i = 0; i < list.length; i++ ) {
-			try {
-				if ( list[i].id() == id ) {
-					return list[i];
-				}
-			} catch(E) {
-				throw(E);
-			}
-		}
-	}
-	return null;
+ if (list) {
+  for (var i = 0; i < list.length; i++ ) {
+   try {
+    if ( list[i].id() == id ) {
+     return list[i];
+    }
+   } catch(E) {
+    throw(E);
+   }
+  }
+ }
+ return null;
 }
 
 util.functional.find_attr_object_in_list = function(list,attr,value) {
-	if (list) {
-		for (var i = 0; i < list.length; i++ ) {
-			try {
-				var command = 'list[' + i + '].'+attr+'() == ' + value;
-				if ( eval(command) ) {
-					return list[i];
-				}
-			} catch(E) {
-				throw(E);
-			}
-		}
-	}
-	return null;
+ if (list) {
+  for (var i = 0; i < list.length; i++ ) {
+   try {
+    var command = 'list[' + i + '].'+attr+'() == ' + value;
+    if ( eval(command) ) {
+     return list[i];
+    }
+   } catch(E) {
+    throw(E);
+   }
+  }
+ }
+ return null;
 }
 
 dump('exiting util/functional.js\n');
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/list.js b/Open-ILS/xul/staff_client/chrome/content/util/list.js
index 7891b92237..35fff9dd35 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/list.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/list.js
@@ -3,97 +3,97 @@ dump('entering util.list.js\n');
 if (typeof main == 'undefined') main = {};
 util.list = function (id) {
 
-	this.node = document.getElementById(id);
+ this.node = document.getElementById(id);
 
-	this.row_count = { 'total' : 0, 'fleshed' : 0 };
+ this.row_count = { 'total' : 0, 'fleshed' : 0 };
 
-	if (!this.node) throw('Could not find element ' + id);
-	switch(this.node.nodeName) {
-		case 'listbox' : 
-		case 'tree' : break;
-		case 'richlistbox' :
-			throw(this.node.nodeName + ' not yet supported'); break;
-		default: throw(this.node.nodeName + ' not supported'); break;
-	}
+ if (!this.node) throw('Could not find element ' + id);
+ switch(this.node.nodeName) {
+  case 'listbox' : 
+  case 'tree' : break;
+  case 'richlistbox' :
+   throw(this.node.nodeName + ' not yet supported'); break;
+  default: throw(this.node.nodeName + ' not supported'); break;
+ }
 
-	JSAN.use('util.error'); this.error = new util.error();
+ JSAN.use('util.error'); this.error = new util.error();
 
-	return this;
+ return this;
 };
 
 util.list.prototype = {
 
-	'init' : function (params) {
-
-		var obj = this;
-
-		JSAN.use('util.widgets');
-
-		if (typeof params.map_row_to_column == 'function') obj.map_row_to_column = params.map_row_to_column;
-		if (typeof params.map_row_to_columns == 'function') obj.map_row_to_columns = params.map_row_to_columns;
-		if (typeof params.retrieve_row == 'function') obj.retrieve_row = params.retrieve_row;
-
-		obj.prebuilt = false;
-		if (typeof params.prebuilt != 'undefined') obj.prebuilt = params.prebuilt;
-
-		if (typeof params.columns == 'undefined') throw('util.list.init: No columns');
-		obj.columns = params.columns;
-
-		switch(obj.node.nodeName) {
-			case 'tree' : obj._init_tree(params); break;
-			case 'listbox' : obj._init_listbox(params); break;
-			default: throw('NYI: Need ._init() for ' + obj.node.nodeName); break;
-		}
-	},
-
-	'_init_tree' : function (params) {
-		var obj = this;
-		if (this.prebuilt) {
-		
-			this.treechildren = this.node.lastChild;	
-		
-		} else {
-			var treecols = document.createElement('treecols');
-			this.node.appendChild(treecols);
-			this.treecols = treecols;
-
-			for (var i = 0; i < this.columns.length; i++) {
-				var treecol = document.createElement('treecol');
-				for (var j in this.columns[i]) {
-					treecol.setAttribute(j,this.columns[i][j]);
-				}
-				treecols.appendChild(treecol);
-				treecol.addEventListener(
-					'click', 
-					function(ev) {
-						function do_it() {
-							var sortDir = ev.target.getAttribute('sortDir') || 'desc';
-							if (sortDir == 'desc') sortDir = 'asc'; else sortDir = 'desc';
-							ev.target.setAttribute('sortDir',sortDir);
-							obj._sort_tree(ev.target,sortDir);
-						}
-
-						if (obj.row_count.total != obj.row_count.fleshed && (obj.row_count.total - obj.row_count.fleshed) > 50) {
-							var r = window.confirm(document.getElementById('offlineStrings').getFormattedString('list.row_fetch_warning',[obj.row_count.fleshed,obj.row_count.total]));
-
-							if (r) {
-								setTimeout( do_it, 0 );
-							}
-						} else {
-								setTimeout( do_it, 0 );
-						}
-					},
-					false
-				);
-				var splitter = document.createElement('splitter');
-				splitter.setAttribute('class','tree-splitter');
-				treecols.appendChild(splitter);
-			}
-
-			var treechildren = document.createElement('treechildren');
-			this.node.appendChild(treechildren);
-			this.treechildren = treechildren;
-		}
+ 'init' : function (params) {
+
+  var obj = this;
+
+  JSAN.use('util.widgets');
+
+  if (typeof params.map_row_to_column == 'function') obj.map_row_to_column = params.map_row_to_column;
+  if (typeof params.map_row_to_columns == 'function') obj.map_row_to_columns = params.map_row_to_columns;
+  if (typeof params.retrieve_row == 'function') obj.retrieve_row = params.retrieve_row;
+
+  obj.prebuilt = false;
+  if (typeof params.prebuilt != 'undefined') obj.prebuilt = params.prebuilt;
+
+  if (typeof params.columns == 'undefined') throw('util.list.init: No columns');
+  obj.columns = params.columns;
+
+  switch(obj.node.nodeName) {
+   case 'tree' : obj._init_tree(params); break;
+   case 'listbox' : obj._init_listbox(params); break;
+   default: throw('NYI: Need ._init() for ' + obj.node.nodeName); break;
+  }
+ },
+
+ '_init_tree' : function (params) {
+  var obj = this;
+  if (this.prebuilt) {
+  
+   this.treechildren = this.node.lastChild; 
+  
+  } else {
+   var treecols = document.createElement('treecols');
+   this.node.appendChild(treecols);
+   this.treecols = treecols;
+
+   for (var i = 0; i < this.columns.length; i++) {
+    var treecol = document.createElement('treecol');
+    for (var j in this.columns[i]) {
+     treecol.setAttribute(j,this.columns[i][j]);
+    }
+    treecols.appendChild(treecol);
+    treecol.addEventListener(
+     'click', 
+     function(ev) {
+      function do_it() {
+       var sortDir = ev.target.getAttribute('sortDir') || 'desc';
+       if (sortDir == 'desc') sortDir = 'asc'; else sortDir = 'desc';
+       ev.target.setAttribute('sortDir',sortDir);
+       obj._sort_tree(ev.target,sortDir);
+      }
+
+      if (obj.row_count.total != obj.row_count.fleshed && (obj.row_count.total - obj.row_count.fleshed) > 50) {
+       var r = window.confirm(document.getElementById('offlineStrings').getFormattedString('list.row_fetch_warning',[obj.row_count.fleshed,obj.row_count.total]));
+
+       if (r) {
+        setTimeout( do_it, 0 );
+       }
+      } else {
+        setTimeout( do_it, 0 );
+      }
+     },
+     false
+    );
+    var splitter = document.createElement('splitter');
+    splitter.setAttribute('class','tree-splitter');
+    treecols.appendChild(splitter);
+   }
+
+   var treechildren = document.createElement('treechildren');
+   this.node.appendChild(treechildren);
+   this.treechildren = treechildren;
+  }
         this.node.addEventListener(
             'select',
             function(ev) {
@@ -108,580 +108,580 @@ util.list.prototype = {
             },
             false
         );
-		if (typeof params.on_click == 'function') {
-			this.node.addEventListener(
-				'click',
-				params.on_click,
-				false
-			);
-		}
-		/*
-		this.node.addEventListener(
-			'mousemove',
-			function(ev) { obj.detect_visible(); },
-			false
-		);
-		*/
-		this.node.addEventListener(
-			'keypress',
-			function(ev) { obj.auto_retrieve(); },
-			false
-		);
-		this.node.addEventListener(
-			'click',
-			function(ev) { obj.auto_retrieve(); },
-			false
-		);
-		window.addEventListener(
-			'resize',
-			function(ev) { obj.auto_retrieve(); },
-			false
-		);
-		/* FIXME -- find events on scrollbar to trigger this */
-		obj.detect_visible_polling();	
-		/*
-		var scrollbar = document.getAnonymousNodes( document.getAnonymousNodes(this.node)[1] )[1];
-		var slider = document.getAnonymousNodes( scrollbar )[2];
-		alert('scrollbar = ' + scrollbar.nodeName + ' grippy = ' + slider.nodeName);
-		scrollbar.addEventListener('click',function(){alert('sb click');},false);
-		scrollbar.addEventListener('command',function(){alert('sb command');},false);
-		scrollbar.addEventListener('scroll',function(){alert('sb scroll');},false);
-		slider.addEventListener('click',function(){alert('slider click');},false);
-		slider.addEventListener('command',function(){alert('slider command');},false);
-		slider.addEventListener('scroll',function(){alert('slider scroll');},false);
-		*/
-		this.node.addEventListener('scroll',function(){ obj.auto_retrieve(); },false);
-
-		this.restores_columns(params);
-	},
-
-	'_init_listbox' : function (params) {
-		if (this.prebuilt) {
-		} else {
-			var listhead = document.createElement('listhead');
-			this.node.appendChild(listhead);
-
-			var listcols = document.createElement('listcols');
-			this.node.appendChild(listcols);
-
-			for (var i = 0; i < this.columns.length; i++) {
-				var listheader = document.createElement('listheader');
-				listhead.appendChild(listheader);
-				var listcol = document.createElement('listcol');
-				listcols.appendChild(listcol);
-				for (var j in this.columns[i]) {
-					listheader.setAttribute(j,this.columns[i][j]);
-					listcol.setAttribute(j,this.columns[i][j]);
-				};
-			}
-		}
-	},
-
-	'save_columns' : function (params) {
-		var obj = this;
-		switch (this.node.nodeName) {
-			case 'tree' : this._save_columns_tree(params); break;
-			default: throw('NYI: Need .save_columns() for ' + this.node.nodeName); break;
-		}
-	},
-
-	'_save_columns_tree' : function (params) {
-		var obj = this;
-		try {
-			var id = obj.node.getAttribute('id'); if (!id) {
-				alert("FIXME: The columns for this list cannot be saved because the list has no id.");
-				return;
-			}
-			var my_cols = {};
-			var nl = obj.node.getElementsByTagName('treecol');
-			for (var i = 0; i < nl.length; i++) {
-				var col = nl[i];
-				var col_id = col.getAttribute('id');
-				if (!col_id) {
-					alert('FIXME: A column in this list does not have an id and cannot be saved');
-					continue;
-				}
-				var col_hidden = col.getAttribute('hidden'); 
-				var col_width = col.getAttribute('width'); 
-				var col_ordinal = col.getAttribute('ordinal'); 
-				my_cols[ col_id ] = { 'hidden' : col_hidden, 'width' : col_width, 'ordinal' : col_ordinal };
-			}
-			netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-			JSAN.use('util.file'); var file = new util.file('tree_columns_for_'+window.escape(id));
-			file.set_object(my_cols);
-			file.close();
-			alert(document.getElementById('offlineStrings').getString('list.columns_saved'));
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert('_save_columns_tree',E);
-		}
-	},
-
-	'restores_columns' : function (params) {
-		var obj = this;
-		switch (this.node.nodeName) {
-			case 'tree' : this._restores_columns_tree(params); break;
-			default: throw('NYI: Need .restores_columns() for ' + this.node.nodeName); break;
-		}
-	},
-
-	'_restores_columns_tree' : function (params) {
-		var obj = this;
-		try {
-			var id = obj.node.getAttribute('id'); if (!id) {
-				alert("FIXME: The columns for this list cannot be restored because the list has no id.");
-				return;
-			}
-
-			netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-			JSAN.use('util.file'); var file = new util.file('tree_columns_for_'+window.escape(id));
-			if (file._file.exists()) {
-				var my_cols = file.get_object(); file.close();
-				var nl = obj.node.getElementsByTagName('treecol');
-				for (var i = 0; i < nl.length; i++) {
-					var col = nl[i];
-					var col_id = col.getAttribute('id');
-					if (!col_id) {
-						alert('FIXME: A column in this list does not have an id and cannot be saved');
-						continue;
-					}
-					if (typeof my_cols[col_id] != 'undefined') {
-						col.setAttribute('hidden',my_cols[col_id].hidden); 
-						col.setAttribute('width',my_cols[col_id].width); 
-						col.setAttribute('ordinal',my_cols[col_id].ordinal); 
-					} else {
-						obj.error.sdump('D_ERROR','WARNING: Column ' + col_id + ' did not have a saved state.');
-					}
-				}
-			}
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert('_restore_columns_tree',E);
-		}
-	},
-
-	'clear' : function (params) {
-		var obj = this;
-		switch (this.node.nodeName) {
-			case 'tree' : this._clear_tree(params); break;
-			case 'listbox' : this._clear_listbox(params); break;
-			default: throw('NYI: Need .clear() for ' + this.node.nodeName); break;
-		}
-		this.error.sdump('D_LIST','Clearing list ' + this.node.getAttribute('id') + '\n');
-		this.row_count.total = 0;
-		this.row_count.fleshed = 0;
-		setTimeout( function() { obj.exec_on_all_fleshed(); }, 0 );
-	},
-
-	'_clear_tree' : function(params) {
-		var obj = this;
-		if (obj.error.sdump_levels.D_LIST_DUMP_ON_CLEAR) {
-			obj.error.sdump('D_LIST_DUMP_ON_CLEAR',obj.dump());
-		}
-		if (obj.error.sdump_levels.D_LIST_DUMP_WITH_KEYS_ON_CLEAR) {
-			obj.error.sdump('D_LIST_DUMP_WITH_KEYS_ON_CLEAR',obj.dump_with_keys());
-		}
-		while (obj.treechildren.lastChild) obj.treechildren.removeChild( obj.treechildren.lastChild );
-	},
-
-	'_clear_listbox' : function(params) {
-		var obj = this;
-		var items = [];
-		var nl = this.node.getElementsByTagName('listitem');
-		for (var i = 0; i < nl.length; i++) {
-			items.push( nl[i] );
-		}
-		for (var i = 0; i < items.length; i++) {
-			this.node.removeChild(items[i]);
-		}
-	},
-
-	'append' : function (params) {
-		var rnode;
-		var obj = this;
-		switch (this.node.nodeName) {
-			case 'tree' : rparams = this._append_to_tree(params); break;
-			case 'listbox' : rparams = this._append_to_listbox(params); break;
-			default: throw('NYI: Need .append() for ' + this.node.nodeName); break;
-		}
-		if (rparams && params.attributes) {
-			for (var i in params.attributes) {
-				rparams.my_node.setAttribute(i,params.attributes[i]);
-			}
-		}
-		this.row_count.total++;
-		if (this.row_count.fleshed == this.row_count.total) {
-			setTimeout( function() { obj.exec_on_all_fleshed(); }, 0 );
-		}
-		return rparams;
-	},
-	
-	'refresh_row' : function (params) {
-		var rnode;
-		var obj = this;
-		switch (this.node.nodeName) {
-			case 'tree' : rparams = this._refresh_row_in_tree(params); break;
-			default: throw('NYI: Need .refresh_row() for ' + this.node.nodeName); break;
-		}
-		if (rparams && params.attributes) {
-			for (var i in params.attributes) {
-				rparams.my_node.setAttribute(i,params.attributes[i]);
-			}
-		}
+  if (typeof params.on_click == 'function') {
+   this.node.addEventListener(
+    'click',
+    params.on_click,
+    false
+   );
+  }
+  /*
+  this.node.addEventListener(
+   'mousemove',
+   function(ev) { obj.detect_visible(); },
+   false
+  );
+  */
+  this.node.addEventListener(
+   'keypress',
+   function(ev) { obj.auto_retrieve(); },
+   false
+  );
+  this.node.addEventListener(
+   'click',
+   function(ev) { obj.auto_retrieve(); },
+   false
+  );
+  window.addEventListener(
+   'resize',
+   function(ev) { obj.auto_retrieve(); },
+   false
+  );
+  /* FIXME -- find events on scrollbar to trigger this */
+  obj.detect_visible_polling(); 
+  /*
+  var scrollbar = document.getAnonymousNodes( document.getAnonymousNodes(this.node)[1] )[1];
+  var slider = document.getAnonymousNodes( scrollbar )[2];
+  alert('scrollbar = ' + scrollbar.nodeName + ' grippy = ' + slider.nodeName);
+  scrollbar.addEventListener('click',function(){alert('sb click');},false);
+  scrollbar.addEventListener('command',function(){alert('sb command');},false);
+  scrollbar.addEventListener('scroll',function(){alert('sb scroll');},false);
+  slider.addEventListener('click',function(){alert('slider click');},false);
+  slider.addEventListener('command',function(){alert('slider command');},false);
+  slider.addEventListener('scroll',function(){alert('slider scroll');},false);
+  */
+  this.node.addEventListener('scroll',function(){ obj.auto_retrieve(); },false);
+
+  this.restores_columns(params);
+ },
+
+ '_init_listbox' : function (params) {
+  if (this.prebuilt) {
+  } else {
+   var listhead = document.createElement('listhead');
+   this.node.appendChild(listhead);
+
+   var listcols = document.createElement('listcols');
+   this.node.appendChild(listcols);
+
+   for (var i = 0; i < this.columns.length; i++) {
+    var listheader = document.createElement('listheader');
+    listhead.appendChild(listheader);
+    var listcol = document.createElement('listcol');
+    listcols.appendChild(listcol);
+    for (var j in this.columns[i]) {
+     listheader.setAttribute(j,this.columns[i][j]);
+     listcol.setAttribute(j,this.columns[i][j]);
+    };
+   }
+  }
+ },
+
+ 'save_columns' : function (params) {
+  var obj = this;
+  switch (this.node.nodeName) {
+   case 'tree' : this._save_columns_tree(params); break;
+   default: throw('NYI: Need .save_columns() for ' + this.node.nodeName); break;
+  }
+ },
+
+ '_save_columns_tree' : function (params) {
+  var obj = this;
+  try {
+   var id = obj.node.getAttribute('id'); if (!id) {
+    alert("FIXME: The columns for this list cannot be saved because the list has no id.");
+    return;
+   }
+   var my_cols = {};
+   var nl = obj.node.getElementsByTagName('treecol');
+   for (var i = 0; i < nl.length; i++) {
+    var col = nl[i];
+    var col_id = col.getAttribute('id');
+    if (!col_id) {
+     alert('FIXME: A column in this list does not have an id and cannot be saved');
+     continue;
+    }
+    var col_hidden = col.getAttribute('hidden'); 
+    var col_width = col.getAttribute('width'); 
+    var col_ordinal = col.getAttribute('ordinal'); 
+    my_cols[ col_id ] = { 'hidden' : col_hidden, 'width' : col_width, 'ordinal' : col_ordinal };
+   }
+   netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+   JSAN.use('util.file'); var file = new util.file('tree_columns_for_'+window.escape(id));
+   file.set_object(my_cols);
+   file.close();
+   alert(document.getElementById('offlineStrings').getString('list.columns_saved'));
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert('_save_columns_tree',E);
+  }
+ },
+
+ 'restores_columns' : function (params) {
+  var obj = this;
+  switch (this.node.nodeName) {
+   case 'tree' : this._restores_columns_tree(params); break;
+   default: throw('NYI: Need .restores_columns() for ' + this.node.nodeName); break;
+  }
+ },
+
+ '_restores_columns_tree' : function (params) {
+  var obj = this;
+  try {
+   var id = obj.node.getAttribute('id'); if (!id) {
+    alert("FIXME: The columns for this list cannot be restored because the list has no id.");
+    return;
+   }
+
+   netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+   JSAN.use('util.file'); var file = new util.file('tree_columns_for_'+window.escape(id));
+   if (file._file.exists()) {
+    var my_cols = file.get_object(); file.close();
+    var nl = obj.node.getElementsByTagName('treecol');
+    for (var i = 0; i < nl.length; i++) {
+     var col = nl[i];
+     var col_id = col.getAttribute('id');
+     if (!col_id) {
+      alert('FIXME: A column in this list does not have an id and cannot be saved');
+      continue;
+     }
+     if (typeof my_cols[col_id] != 'undefined') {
+      col.setAttribute('hidden',my_cols[col_id].hidden); 
+      col.setAttribute('width',my_cols[col_id].width); 
+      col.setAttribute('ordinal',my_cols[col_id].ordinal); 
+     } else {
+      obj.error.sdump('D_ERROR','WARNING: Column ' + col_id + ' did not have a saved state.');
+     }
+    }
+   }
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert('_restore_columns_tree',E);
+  }
+ },
+
+ 'clear' : function (params) {
+  var obj = this;
+  switch (this.node.nodeName) {
+   case 'tree' : this._clear_tree(params); break;
+   case 'listbox' : this._clear_listbox(params); break;
+   default: throw('NYI: Need .clear() for ' + this.node.nodeName); break;
+  }
+  this.error.sdump('D_LIST','Clearing list ' + this.node.getAttribute('id') + '\n');
+  this.row_count.total = 0;
+  this.row_count.fleshed = 0;
+  setTimeout( function() { obj.exec_on_all_fleshed(); }, 0 );
+ },
+
+ '_clear_tree' : function(params) {
+  var obj = this;
+  if (obj.error.sdump_levels.D_LIST_DUMP_ON_CLEAR) {
+   obj.error.sdump('D_LIST_DUMP_ON_CLEAR',obj.dump());
+  }
+  if (obj.error.sdump_levels.D_LIST_DUMP_WITH_KEYS_ON_CLEAR) {
+   obj.error.sdump('D_LIST_DUMP_WITH_KEYS_ON_CLEAR',obj.dump_with_keys());
+  }
+  while (obj.treechildren.lastChild) obj.treechildren.removeChild( obj.treechildren.lastChild );
+ },
+
+ '_clear_listbox' : function(params) {
+  var obj = this;
+  var items = [];
+  var nl = this.node.getElementsByTagName('listitem');
+  for (var i = 0; i < nl.length; i++) {
+   items.push( nl[i] );
+  }
+  for (var i = 0; i < items.length; i++) {
+   this.node.removeChild(items[i]);
+  }
+ },
+
+ 'append' : function (params) {
+  var rnode;
+  var obj = this;
+  switch (this.node.nodeName) {
+   case 'tree' : rparams = this._append_to_tree(params); break;
+   case 'listbox' : rparams = this._append_to_listbox(params); break;
+   default: throw('NYI: Need .append() for ' + this.node.nodeName); break;
+  }
+  if (rparams && params.attributes) {
+   for (var i in params.attributes) {
+    rparams.my_node.setAttribute(i,params.attributes[i]);
+   }
+  }
+  this.row_count.total++;
+  if (this.row_count.fleshed == this.row_count.total) {
+   setTimeout( function() { obj.exec_on_all_fleshed(); }, 0 );
+  }
+  return rparams;
+ },
+ 
+ 'refresh_row' : function (params) {
+  var rnode;
+  var obj = this;
+  switch (this.node.nodeName) {
+   case 'tree' : rparams = this._refresh_row_in_tree(params); break;
+   default: throw('NYI: Need .refresh_row() for ' + this.node.nodeName); break;
+  }
+  if (rparams && params.attributes) {
+   for (var i in params.attributes) {
+    rparams.my_node.setAttribute(i,params.attributes[i]);
+   }
+  }
         this.row_count.fleshed--;
-		return rparams;
-	},
-
-
-	'_append_to_tree' : function (params) {
-
-		var obj = this;
-
-		if (typeof params.row == 'undefined') throw('util.list.append: Object must contain a row');
-
-		var s = ('util.list.append: params = ' + (params) + '\n');
-
-		var treechildren_node = this.treechildren;
-
-		if (params.node && params.node.nodeName == 'treeitem') {
-			params.node.setAttribute('container','true'); /* params.node.setAttribute('open','true'); */
-			if (params.node.lastChild.nodeName == 'treechildren') {
-				treechildren_node = params.node.lastChild;
-			} else {
-				treechildren_node = document.createElement('treechildren');
-				params.node.appendChild(treechildren_node);
-			}
-		}
-
-		var treeitem = document.createElement('treeitem');
-		treeitem.setAttribute('retrieve_id',params.retrieve_id);
-		if (typeof params.to_bottom != 'undefined') {
-			treechildren_node.appendChild( treeitem );
-			if (typeof params.no_auto_select == 'undefined') {
-				if (!obj.auto_select_pending) {
-					obj.auto_select_pending = true;
-					setTimeout(function() {
-						dump('auto-selecting\n');
-						var idx = Number(obj.node.view.rowCount)-1;
-						try { obj.node.view.selection.select(idx); } catch(E) { obj.error.sdump('D_WARN','tree auto select: ' + E + '\n'); }
-						try { if (typeof params.on_select == 'function') params.on_select(); } catch(E) { obj.error.sdump('D_WARN','tree auto select, on_select: ' + E + '\n'); }
-						obj.auto_select_pending = false;
-						try { util.widgets.dispatch('flesh',obj.node.contentView.getItemAtIndex(idx).firstChild); } catch(E) { obj.error.sdump('D_WARN','tree auto select, flesh: ' + E + '\n'); }
-					}, 1000);
-				}
-			}
-		} else {
-			if (treechildren_node.firstChild) {
-				treechildren_node.insertBefore( treeitem, treechildren_node.firstChild );
-			} else {
-				treechildren_node.appendChild( treeitem );
-			}
-			if (typeof params.no_auto_select == 'undefined') {
-				if (!obj.auto_select_pending) {
-					obj.auto_select_pending = true;
-					setTimeout(function() {
-						try { obj.node.view.selection.select(0); } catch(E) { obj.error.sdump('D_WARN','tree auto select: ' + E + '\n'); }
-						try { if (typeof params.on_select == 'function') params.on_select(); } catch(E) { obj.error.sdump('D_WARN','tree auto select, on_select: ' + E + '\n'); }
-						obj.auto_select_pending = false;
-						try { util.widgets.dispatch('flesh',obj.node.contentView.getItemAtIndex(0).firstChild); } catch(E) { obj.error.sdump('D_WARN','tree auto select, flesh: ' + E + '\n'); }
-					}, 1000);
-				}
-			}
-		}
-		var treerow = document.createElement('treerow');
-		treeitem.appendChild( treerow );
-		treerow.setAttribute('retrieve_id',params.retrieve_id);
-
-		s += ('tree = ' + this.node + '  treechildren = ' + treechildren_node + '\n');
-		s += ('treeitem = ' + treeitem + '  treerow = ' + treerow + '\n');
-
-		if (typeof params.retrieve_row == 'function' || typeof this.retrieve_row == 'function') {
-
-			obj.put_retrieving_label(treerow);
-			treerow.addEventListener(
-				'flesh',
-				function() {
-
-					if (treerow.getAttribute('retrieved') == 'true') return; /* already running */
-
-					treerow.setAttribute('retrieved','true');
-
-					//dump('fleshing = ' + params.retrieve_id + '\n');
-
-					function inc_fleshed() {
-						if (treerow.getAttribute('fleshed') == 'true') return; /* already fleshed */
-						treerow.setAttribute('fleshed','true');
-						obj.row_count.fleshed++;
-						if (obj.row_count.fleshed >= obj.row_count.total) {
-							setTimeout( function() { obj.exec_on_all_fleshed(); }, 0 );
-						}
-					}
-
-					params.row_node = treeitem;
-					params.on_retrieve = function(p) {
-						try {
-							p.row = params.row;
-							obj._map_row_to_treecell(p,treerow);
-							inc_fleshed();
-							var idx = obj.node.contentView.getIndexOfItem( params.row_node );
-							dump('idx = ' + idx + '\n');
-							// if current row is selected, send another select event to re-sync data that the client code fetches on selects
-							if ( obj.node.view.selection.isSelected( idx ) ) {
-								dump('dispatching select event for on_retrieve for idx = ' + idx + '\n');
-								util.widgets.dispatch('select',obj.node);
-							}
-						} catch(E) {
+  return rparams;
+ },
+
+
+ '_append_to_tree' : function (params) {
+
+  var obj = this;
+
+  if (typeof params.row == 'undefined') throw('util.list.append: Object must contain a row');
+
+  var s = ('util.list.append: params = ' + (params) + '\n');
+
+  var treechildren_node = this.treechildren;
+
+  if (params.node && params.node.nodeName == 'treeitem') {
+   params.node.setAttribute('container','true'); /* params.node.setAttribute('open','true'); */
+   if (params.node.lastChild.nodeName == 'treechildren') {
+    treechildren_node = params.node.lastChild;
+   } else {
+    treechildren_node = document.createElement('treechildren');
+    params.node.appendChild(treechildren_node);
+   }
+  }
+
+  var treeitem = document.createElement('treeitem');
+  treeitem.setAttribute('retrieve_id',params.retrieve_id);
+  if (typeof params.to_bottom != 'undefined') {
+   treechildren_node.appendChild( treeitem );
+   if (typeof params.no_auto_select == 'undefined') {
+    if (!obj.auto_select_pending) {
+     obj.auto_select_pending = true;
+     setTimeout(function() {
+      dump('auto-selecting\n');
+      var idx = Number(obj.node.view.rowCount)-1;
+      try { obj.node.view.selection.select(idx); } catch(E) { obj.error.sdump('D_WARN','tree auto select: ' + E + '\n'); }
+      try { if (typeof params.on_select == 'function') params.on_select(); } catch(E) { obj.error.sdump('D_WARN','tree auto select, on_select: ' + E + '\n'); }
+      obj.auto_select_pending = false;
+      try { util.widgets.dispatch('flesh',obj.node.contentView.getItemAtIndex(idx).firstChild); } catch(E) { obj.error.sdump('D_WARN','tree auto select, flesh: ' + E + '\n'); }
+     }, 1000);
+    }
+   }
+  } else {
+   if (treechildren_node.firstChild) {
+    treechildren_node.insertBefore( treeitem, treechildren_node.firstChild );
+   } else {
+    treechildren_node.appendChild( treeitem );
+   }
+   if (typeof params.no_auto_select == 'undefined') {
+    if (!obj.auto_select_pending) {
+     obj.auto_select_pending = true;
+     setTimeout(function() {
+      try { obj.node.view.selection.select(0); } catch(E) { obj.error.sdump('D_WARN','tree auto select: ' + E + '\n'); }
+      try { if (typeof params.on_select == 'function') params.on_select(); } catch(E) { obj.error.sdump('D_WARN','tree auto select, on_select: ' + E + '\n'); }
+      obj.auto_select_pending = false;
+      try { util.widgets.dispatch('flesh',obj.node.contentView.getItemAtIndex(0).firstChild); } catch(E) { obj.error.sdump('D_WARN','tree auto select, flesh: ' + E + '\n'); }
+     }, 1000);
+    }
+   }
+  }
+  var treerow = document.createElement('treerow');
+  treeitem.appendChild( treerow );
+  treerow.setAttribute('retrieve_id',params.retrieve_id);
+
+  s += ('tree = ' + this.node + '  treechildren = ' + treechildren_node + '\n');
+  s += ('treeitem = ' + treeitem + '  treerow = ' + treerow + '\n');
+
+  if (typeof params.retrieve_row == 'function' || typeof this.retrieve_row == 'function') {
+
+   obj.put_retrieving_label(treerow);
+   treerow.addEventListener(
+    'flesh',
+    function() {
+
+     if (treerow.getAttribute('retrieved') == 'true') return; /* already running */
+
+     treerow.setAttribute('retrieved','true');
+
+     //dump('fleshing = ' + params.retrieve_id + '\n');
+
+     function inc_fleshed() {
+      if (treerow.getAttribute('fleshed') == 'true') return; /* already fleshed */
+      treerow.setAttribute('fleshed','true');
+      obj.row_count.fleshed++;
+      if (obj.row_count.fleshed >= obj.row_count.total) {
+       setTimeout( function() { obj.exec_on_all_fleshed(); }, 0 );
+      }
+     }
+
+     params.row_node = treeitem;
+     params.on_retrieve = function(p) {
+      try {
+       p.row = params.row;
+       obj._map_row_to_treecell(p,treerow);
+       inc_fleshed();
+       var idx = obj.node.contentView.getIndexOfItem( params.row_node );
+       dump('idx = ' + idx + '\n');
+       // if current row is selected, send another select event to re-sync data that the client code fetches on selects
+       if ( obj.node.view.selection.isSelected( idx ) ) {
+        dump('dispatching select event for on_retrieve for idx = ' + idx + '\n');
+        util.widgets.dispatch('select',obj.node);
+       }
+      } catch(E) {
                             // Let's not alert on this for now.  Getting contentView has no properties in record buckets under certain conditions
-							dump('fixme2: ' + E + '\n');
-						}
-					}
-
-					if (typeof params.retrieve_row == 'function') {
-
-						params.retrieve_row( params );
-
-					} else if (typeof obj.retrieve_row == 'function') {
-
-							obj.retrieve_row( params );
-
-					} else {
-					
-							inc_fleshed();
-					}
-				},
-				false
-			);
-			/*
-			setTimeout(
-				function() {
-					util.widgets.dispatch('flesh',treerow);
-				}, 0
-			);
-			*/
-		} else {
-			obj.put_retrieving_label(treerow);
-			treerow.addEventListener(
-				'flesh',
-				function() {
-					//dump('fleshing anon\n');
-					if (treerow.getAttribute('fleshed') == 'true') return; /* already fleshed */
-					obj._map_row_to_treecell(params,treerow);
-					treerow.setAttribute('retrieved','true');
-					treerow.setAttribute('fleshed','true');
-					obj.row_count.fleshed++;
-					if (obj.row_count.fleshed >= obj.row_count.total) {
-						setTimeout( function() { obj.exec_on_all_fleshed(); }, 0 );
-					}
-				},
-				false
-			);
-			/*
-			setTimeout(
-				function() {
-					util.widgets.dispatch('flesh',treerow);
-				}, 0
-			);
-			*/
-		}
-		this.error.sdump('D_LIST',s);
-
-			try {
-
-				if (obj.trim_list && obj.row_count.total >= obj.trim_list) {
-					// Remove oldest row
-					//if (typeof params.to_bottom != 'undefined') 
-					if (typeof params.to_top == 'undefined') {
-						treechildren_node.removeChild( treechildren_node.firstChild );
-					} else {
-						treechildren_node.removeChild( treechildren_node.lastChild );
-					}
-				}
-			} catch(E) {
-			}
-
-		setTimeout( function() { obj.auto_retrieve(); }, 0 );
-
-		params.my_node = treeitem;
-		return params;
-	},
-
-	'_refresh_row_in_tree' : function (params) {
-
-		var obj = this;
-
-		if (typeof params.row == 'undefined') throw('util.list.refresh_row: Object must contain a row');
-		if (typeof params.my_node == 'undefined') throw('util.list.refresh_row: Object must contain a my_node');
-		if (params.my_node.nodeName != 'treeitem') throw('util.list.refresh_rwo: my_node must be a treeitem');
-
-		var s = ('util.list.refresh_row: params = ' + (params) + '\n');
-
-		var treeitem = params.my_node;
-		treeitem.setAttribute('retrieve_id',params.retrieve_id);
-		if (typeof params.to_bottom != 'undefined') {
-			if (typeof params.no_auto_select == 'undefined') {
-				if (!obj.auto_select_pending) {
-					obj.auto_select_pending = true;
-					setTimeout(function() {
-						dump('auto-selecting\n');
-						var idx = Number(obj.node.view.rowCount)-1;
-						try { obj.node.view.selection.select(idx); } catch(E) { obj.error.sdump('D_WARN','tree auto select: ' + E + '\n'); }
-						try { if (typeof params.on_select == 'function') params.on_select(); } catch(E) { obj.error.sdump('D_WARN','tree auto select, on_select: ' + E + '\n'); }
-						obj.auto_select_pending = false;
-						try { util.widgets.dispatch('flesh',obj.node.contentView.getItemAtIndex(idx).firstChild); } catch(E) { obj.error.sdump('D_WARN','tree auto select, flesh: ' + E + '\n'); }
-					}, 1000);
-				}
-			}
-		}
-		var delete_me = [];
-		for (var i in treeitem.childNodes) if (treeitem.childNodes[i].nodeName == 'treerow') delete_me.push(treeitem.childNodes[i]);
-		for (var i = 0; i < delete_me.length; i++) treeitem.removeChild(delete_me[i]);
-		var treerow = document.createElement('treerow');
-		treeitem.appendChild( treerow );
-		treerow.setAttribute('retrieve_id',params.retrieve_id);
-
-		s += ('tree = ' + this.node + '\n');
-		s += ('treeitem = ' + treeitem + '  treerow = ' + treerow + '\n');
-
-		if (typeof params.retrieve_row == 'function' || typeof this.retrieve_row == 'function') {
-
-			obj.put_retrieving_label(treerow);
-			treerow.addEventListener(
-				'flesh',
-				function() {
-
-					if (treerow.getAttribute('retrieved') == 'true') return; /* already running */
-
-					treerow.setAttribute('retrieved','true');
-
-					//dump('fleshing = ' + params.retrieve_id + '\n');
-
-					function inc_fleshed() {
-						if (treerow.getAttribute('fleshed') == 'true') return; /* already fleshed */
-						treerow.setAttribute('fleshed','true');
-						obj.row_count.fleshed++;
-						if (obj.row_count.fleshed >= obj.row_count.total) {
-							setTimeout( function() { obj.exec_on_all_fleshed(); }, 0 );
-						}
-					}
-
-					params.row_node = treeitem;
-					params.on_retrieve = function(p) {
-						try {
-							p.row = params.row;
-							obj._map_row_to_treecell(p,treerow);
-							inc_fleshed();
-							var idx = obj.node.contentView.getIndexOfItem( params.row_node );
-							dump('idx = ' + idx + '\n');
-							// if current row is selected, send another select event to re-sync data that the client code fetches on selects
-							if ( obj.node.view.selection.isSelected( idx ) ) {
-								dump('dispatching select event for on_retrieve for idx = ' + idx + '\n');
-								util.widgets.dispatch('select',obj.node);
-							}
-						} catch(E) {
+       dump('fixme2: ' + E + '\n');
+      }
+     }
+
+     if (typeof params.retrieve_row == 'function') {
+
+      params.retrieve_row( params );
+
+     } else if (typeof obj.retrieve_row == 'function') {
+
+       obj.retrieve_row( params );
+
+     } else {
+     
+       inc_fleshed();
+     }
+    },
+    false
+   );
+   /*
+   setTimeout(
+    function() {
+     util.widgets.dispatch('flesh',treerow);
+    }, 0
+   );
+   */
+  } else {
+   obj.put_retrieving_label(treerow);
+   treerow.addEventListener(
+    'flesh',
+    function() {
+     //dump('fleshing anon\n');
+     if (treerow.getAttribute('fleshed') == 'true') return; /* already fleshed */
+     obj._map_row_to_treecell(params,treerow);
+     treerow.setAttribute('retrieved','true');
+     treerow.setAttribute('fleshed','true');
+     obj.row_count.fleshed++;
+     if (obj.row_count.fleshed >= obj.row_count.total) {
+      setTimeout( function() { obj.exec_on_all_fleshed(); }, 0 );
+     }
+    },
+    false
+   );
+   /*
+   setTimeout(
+    function() {
+     util.widgets.dispatch('flesh',treerow);
+    }, 0
+   );
+   */
+  }
+  this.error.sdump('D_LIST',s);
+
+   try {
+
+    if (obj.trim_list && obj.row_count.total >= obj.trim_list) {
+     // Remove oldest row
+     //if (typeof params.to_bottom != 'undefined') 
+     if (typeof params.to_top == 'undefined') {
+      treechildren_node.removeChild( treechildren_node.firstChild );
+     } else {
+      treechildren_node.removeChild( treechildren_node.lastChild );
+     }
+    }
+   } catch(E) {
+   }
+
+  setTimeout( function() { obj.auto_retrieve(); }, 0 );
+
+  params.my_node = treeitem;
+  return params;
+ },
+
+ '_refresh_row_in_tree' : function (params) {
+
+  var obj = this;
+
+  if (typeof params.row == 'undefined') throw('util.list.refresh_row: Object must contain a row');
+  if (typeof params.my_node == 'undefined') throw('util.list.refresh_row: Object must contain a my_node');
+  if (params.my_node.nodeName != 'treeitem') throw('util.list.refresh_rwo: my_node must be a treeitem');
+
+  var s = ('util.list.refresh_row: params = ' + (params) + '\n');
+
+  var treeitem = params.my_node;
+  treeitem.setAttribute('retrieve_id',params.retrieve_id);
+  if (typeof params.to_bottom != 'undefined') {
+   if (typeof params.no_auto_select == 'undefined') {
+    if (!obj.auto_select_pending) {
+     obj.auto_select_pending = true;
+     setTimeout(function() {
+      dump('auto-selecting\n');
+      var idx = Number(obj.node.view.rowCount)-1;
+      try { obj.node.view.selection.select(idx); } catch(E) { obj.error.sdump('D_WARN','tree auto select: ' + E + '\n'); }
+      try { if (typeof params.on_select == 'function') params.on_select(); } catch(E) { obj.error.sdump('D_WARN','tree auto select, on_select: ' + E + '\n'); }
+      obj.auto_select_pending = false;
+      try { util.widgets.dispatch('flesh',obj.node.contentView.getItemAtIndex(idx).firstChild); } catch(E) { obj.error.sdump('D_WARN','tree auto select, flesh: ' + E + '\n'); }
+     }, 1000);
+    }
+   }
+  }
+  var delete_me = [];
+  for (var i in treeitem.childNodes) if (treeitem.childNodes[i].nodeName == 'treerow') delete_me.push(treeitem.childNodes[i]);
+  for (var i = 0; i < delete_me.length; i++) treeitem.removeChild(delete_me[i]);
+  var treerow = document.createElement('treerow');
+  treeitem.appendChild( treerow );
+  treerow.setAttribute('retrieve_id',params.retrieve_id);
+
+  s += ('tree = ' + this.node + '\n');
+  s += ('treeitem = ' + treeitem + '  treerow = ' + treerow + '\n');
+
+  if (typeof params.retrieve_row == 'function' || typeof this.retrieve_row == 'function') {
+
+   obj.put_retrieving_label(treerow);
+   treerow.addEventListener(
+    'flesh',
+    function() {
+
+     if (treerow.getAttribute('retrieved') == 'true') return; /* already running */
+
+     treerow.setAttribute('retrieved','true');
+
+     //dump('fleshing = ' + params.retrieve_id + '\n');
+
+     function inc_fleshed() {
+      if (treerow.getAttribute('fleshed') == 'true') return; /* already fleshed */
+      treerow.setAttribute('fleshed','true');
+      obj.row_count.fleshed++;
+      if (obj.row_count.fleshed >= obj.row_count.total) {
+       setTimeout( function() { obj.exec_on_all_fleshed(); }, 0 );
+      }
+     }
+
+     params.row_node = treeitem;
+     params.on_retrieve = function(p) {
+      try {
+       p.row = params.row;
+       obj._map_row_to_treecell(p,treerow);
+       inc_fleshed();
+       var idx = obj.node.contentView.getIndexOfItem( params.row_node );
+       dump('idx = ' + idx + '\n');
+       // if current row is selected, send another select event to re-sync data that the client code fetches on selects
+       if ( obj.node.view.selection.isSelected( idx ) ) {
+        dump('dispatching select event for on_retrieve for idx = ' + idx + '\n');
+        util.widgets.dispatch('select',obj.node);
+       }
+      } catch(E) {
                             // Let's not alert on this for now.  Getting contentView has no properties in record buckets under certain conditions
-							dump('fixme2: ' + E + '\n');
-						}
-					}
-
-					if (typeof params.retrieve_row == 'function') {
-
-						params.retrieve_row( params );
-
-					} else if (typeof obj.retrieve_row == 'function') {
-
-							obj.retrieve_row( params );
-
-					} else {
-					
-							inc_fleshed();
-					}
-				},
-				false
-			);
-			/*
-			setTimeout(
-				function() {
-					util.widgets.dispatch('flesh',treerow);
-				}, 0
-			);
-			*/
-		} else {
-			obj.put_retrieving_label(treerow);
-			treerow.addEventListener(
-				'flesh',
-				function() {
-					//dump('fleshing anon\n');
-					if (treerow.getAttribute('fleshed') == 'true') return; /* already fleshed */
-					obj._map_row_to_treecell(params,treerow);
-					treerow.setAttribute('retrieved','true');
-					treerow.setAttribute('fleshed','true');
-					obj.row_count.fleshed++;
-					if (obj.row_count.fleshed >= obj.row_count.total) {
-						setTimeout( function() { obj.exec_on_all_fleshed(); }, 0 );
-					}
-				},
-				false
-			);
-			/*
-			setTimeout(
-				function() {
-					util.widgets.dispatch('flesh',treerow);
-				}, 0
-			);
-			*/
-		}
-		this.error.sdump('D_LIST',s);
-
-			try {
-
-				if (obj.trim_list && obj.row_count.total >= obj.trim_list) {
-					// Remove oldest row
-					//if (typeof params.to_bottom != 'undefined') 
-					if (typeof params.to_top == 'undefined') {
-						treechildren_node.removeChild( treechildren_node.firstChild );
-					} else {
-						treechildren_node.removeChild( treechildren_node.lastChild );
-					}
-				}
-			} catch(E) {
-			}
-
-		setTimeout( function() { obj.auto_retrieve(); }, 0 );
+       dump('fixme2: ' + E + '\n');
+      }
+     }
+
+     if (typeof params.retrieve_row == 'function') {
+
+      params.retrieve_row( params );
+
+     } else if (typeof obj.retrieve_row == 'function') {
+
+       obj.retrieve_row( params );
+
+     } else {
+     
+       inc_fleshed();
+     }
+    },
+    false
+   );
+   /*
+   setTimeout(
+    function() {
+     util.widgets.dispatch('flesh',treerow);
+    }, 0
+   );
+   */
+  } else {
+   obj.put_retrieving_label(treerow);
+   treerow.addEventListener(
+    'flesh',
+    function() {
+     //dump('fleshing anon\n');
+     if (treerow.getAttribute('fleshed') == 'true') return; /* already fleshed */
+     obj._map_row_to_treecell(params,treerow);
+     treerow.setAttribute('retrieved','true');
+     treerow.setAttribute('fleshed','true');
+     obj.row_count.fleshed++;
+     if (obj.row_count.fleshed >= obj.row_count.total) {
+      setTimeout( function() { obj.exec_on_all_fleshed(); }, 0 );
+     }
+    },
+    false
+   );
+   /*
+   setTimeout(
+    function() {
+     util.widgets.dispatch('flesh',treerow);
+    }, 0
+   );
+   */
+  }
+  this.error.sdump('D_LIST',s);
+
+   try {
+
+    if (obj.trim_list && obj.row_count.total >= obj.trim_list) {
+     // Remove oldest row
+     //if (typeof params.to_bottom != 'undefined') 
+     if (typeof params.to_top == 'undefined') {
+      treechildren_node.removeChild( treechildren_node.firstChild );
+     } else {
+      treechildren_node.removeChild( treechildren_node.lastChild );
+     }
+    }
+   } catch(E) {
+   }
+
+  setTimeout( function() { obj.auto_retrieve(); }, 0 );
 
         JSAN.use('util.widgets'); util.widgets.dispatch('select',obj.node);
 
-		return params;
-	},
-
-	'put_retrieving_label' : function(treerow) {
-		var obj = this;
-		try {
-			/*
-			var cols_idx = 0;
-			dump('put_retrieving_label.  columns = ' + js2JSON(obj.columns) + '\n');
-			while( obj.columns[cols_idx] && obj.columns[cols_idx].hidden && obj.columns[cols_idx].hidden == 'true') {
-				dump('\t' + cols_idx);
-				var treecell = document.createElement('treecell');
-				treerow.appendChild(treecell);
-				cols_idx++;
-			}
-			*/
-			for (var i = 0; i < obj.columns.length; i++) {
-			var treecell = document.createElement('treecell'); treecell.setAttribute('label',document.getElementById('offlineStrings').getString('list.row_retrieving'));
-			treerow.appendChild(treecell);
-			}
-			/*
-			dump('\t' + cols_idx + '\n');
-			*/
-		} catch(E) {
-			alert(E);
-		}
-	},
-
-	'detect_visible' : function() {
-		var obj = this;
-		try {
-			//dump('detect_visible  obj.node = ' + obj.node + '\n');
-			/* FIXME - this is a hack.. if the implementation of tree changes, this could break */
-			try {
+  return params;
+ },
+
+ 'put_retrieving_label' : function(treerow) {
+  var obj = this;
+  try {
+   /*
+   var cols_idx = 0;
+   dump('put_retrieving_label.  columns = ' + js2JSON(obj.columns) + '\n');
+   while( obj.columns[cols_idx] && obj.columns[cols_idx].hidden && obj.columns[cols_idx].hidden == 'true') {
+    dump('\t' + cols_idx);
+    var treecell = document.createElement('treecell');
+    treerow.appendChild(treecell);
+    cols_idx++;
+   }
+   */
+   for (var i = 0; i < obj.columns.length; i++) {
+   var treecell = document.createElement('treecell'); treecell.setAttribute('label',document.getElementById('offlineStrings').getString('list.row_retrieving'));
+   treerow.appendChild(treecell);
+   }
+   /*
+   dump('\t' + cols_idx + '\n');
+   */
+  } catch(E) {
+   alert(E);
+  }
+ },
+
+ 'detect_visible' : function() {
+  var obj = this;
+  try {
+   //dump('detect_visible  obj.node = ' + obj.node + '\n');
+   /* FIXME - this is a hack.. if the implementation of tree changes, this could break */
+   try {
                 /*var s = ''; var A = document.getAnonymousNodes(obj.node);
                 for (var i in A) {
                     var B = A[i];
@@ -692,86 +692,86 @@ util.list.prototype = {
                     }
                 }
                 obj.error.sdump('D_XULRUNNER','document.getAnonymousNodes(' + obj.node.nodeName + ') = \n' + s + '\n');*/
-				var scrollbar = document.getAnonymousNodes(obj.node)[2].firstChild;
-				var curpos = scrollbar.getAttribute('curpos');
-				var maxpos = scrollbar.getAttribute('maxpos');
-				//alert('curpos = ' + curpos + ' maxpos = ' + maxpos + ' obj.curpos = ' + obj.curpos + ' obj.maxpos = ' + obj.maxpos + '\n');
-				if ((curpos != obj.curpos) || (maxpos != obj.maxpos)) {
-					if ( obj.auto_retrieve() > 0 ) {
-						obj.curpos = curpos; obj.maxpos = maxpos;
-					}
-				}
-			} catch(E) {
-				obj.error.sdump('D_XULRUNNER', 'List implementation changed? ' + E);
-			}
-		} catch(E) { obj.error.sdump('D_ERROR',E); }
-	},
-
-	'detect_visible_polling' : function() {
-		try {
-			//alert('detect_visible_polling');
-			var obj = this;
-			obj.detect_visible();
-			setTimeout(function() { try { obj.detect_visible_polling(); } catch(E) { alert(E); } },2000);
-		} catch(E) {
-			alert(E);
-		}
-	},
-
-
-	'auto_retrieve' : function(params) {
-		var obj = this;
-		switch (this.node.nodeName) {
-			case 'tree' : obj._auto_retrieve_tree(params); break;
-			default: throw('NYI: Need .auto_retrieve() for ' + obj.node.nodeName); break;
-		}
-	},
-
-	'_auto_retrieve_tree' : function (params) {
-		var obj = this;
-		if (!obj.auto_retrieve_in_progress) {
-			obj.auto_retrieve_in_progress = true;
-			setTimeout(
-				function() {
-					try {
-							//alert('auto_retrieve\n');
-							var count = 0;
-							var startpos = obj.node.treeBoxObject.getFirstVisibleRow();
-							var endpos = obj.node.treeBoxObject.getLastVisibleRow();
-							if (startpos > endpos) endpos = obj.node.treeBoxObject.getPageLength();
-							//dump('startpos = ' + startpos + ' endpos = ' + endpos + '\n');
-							for (var i = startpos; i < endpos + 4; i++) {
-								try {
-									//dump('trying index ' + i + '\n');
-									var item = obj.node.contentView.getItemAtIndex(i).firstChild;
-									if (item && item.getAttribute('retrieved') != 'true' ) {
-										//dump('\tgot an unfleshed item = ' + item + ' = ' + item.nodeName + '\n');
-										util.widgets.dispatch('flesh',item); count++;
-									}
-								} catch(E) {
-									//dump(i + ' : ' + E + '\n');
-								}
-							}
-							obj.auto_retrieve_in_progress = false;
-							return count;
-					} catch(E) { alert(E); }
-				}, 1
-			);
-		}
-	},
+    var scrollbar = document.getAnonymousNodes(obj.node)[2].firstChild;
+    var curpos = scrollbar.getAttribute('curpos');
+    var maxpos = scrollbar.getAttribute('maxpos');
+    //alert('curpos = ' + curpos + ' maxpos = ' + maxpos + ' obj.curpos = ' + obj.curpos + ' obj.maxpos = ' + obj.maxpos + '\n');
+    if ((curpos != obj.curpos) || (maxpos != obj.maxpos)) {
+     if ( obj.auto_retrieve() > 0 ) {
+      obj.curpos = curpos; obj.maxpos = maxpos;
+     }
+    }
+   } catch(E) {
+    obj.error.sdump('D_XULRUNNER', 'List implementation changed? ' + E);
+   }
+  } catch(E) { obj.error.sdump('D_ERROR',E); }
+ },
+
+ 'detect_visible_polling' : function() {
+  try {
+   //alert('detect_visible_polling');
+   var obj = this;
+   obj.detect_visible();
+   setTimeout(function() { try { obj.detect_visible_polling(); } catch(E) { alert(E); } },2000);
+  } catch(E) {
+   alert(E);
+  }
+ },
+
+
+ 'auto_retrieve' : function(params) {
+  var obj = this;
+  switch (this.node.nodeName) {
+   case 'tree' : obj._auto_retrieve_tree(params); break;
+   default: throw('NYI: Need .auto_retrieve() for ' + obj.node.nodeName); break;
+  }
+ },
+
+ '_auto_retrieve_tree' : function (params) {
+  var obj = this;
+  if (!obj.auto_retrieve_in_progress) {
+   obj.auto_retrieve_in_progress = true;
+   setTimeout(
+    function() {
+     try {
+       //alert('auto_retrieve\n');
+       var count = 0;
+       var startpos = obj.node.treeBoxObject.getFirstVisibleRow();
+       var endpos = obj.node.treeBoxObject.getLastVisibleRow();
+       if (startpos > endpos) endpos = obj.node.treeBoxObject.getPageLength();
+       //dump('startpos = ' + startpos + ' endpos = ' + endpos + '\n');
+       for (var i = startpos; i < endpos + 4; i++) {
+        try {
+         //dump('trying index ' + i + '\n');
+         var item = obj.node.contentView.getItemAtIndex(i).firstChild;
+         if (item && item.getAttribute('retrieved') != 'true' ) {
+          //dump('\tgot an unfleshed item = ' + item + ' = ' + item.nodeName + '\n');
+          util.widgets.dispatch('flesh',item); count++;
+         }
+        } catch(E) {
+         //dump(i + ' : ' + E + '\n');
+        }
+       }
+       obj.auto_retrieve_in_progress = false;
+       return count;
+     } catch(E) { alert(E); }
+    }, 1
+   );
+  }
+ },
 
     'exec_on_all_fleshed' : function() {
         var obj = this;
         try {
             if (obj.on_all_fleshed) {
-				if (typeof obj.on_all_fleshed == 'function') {
+    if (typeof obj.on_all_fleshed == 'function') {
                     dump('exec_on_all_fleshed == function\n');
-					setTimeout( 
+     setTimeout( 
                         function() { 
                             try { obj.on_all_fleshed(); } catch(E) { obj.error.standard_unexpected_error_alert('_full_retrieve_tree callback',obj.on_all_fleshed); }
                         }, 0 
                     );
-				} else if (typeof obj.on_all_fleshed.length != 'undefined') {
+    } else if (typeof obj.on_all_fleshed.length != 'undefined') {
                     dump('exec_on_all_fleshed == array\n');
                     setTimeout(
                         function() {
@@ -787,7 +787,7 @@ util.list.prototype = {
                             }
                         }, 0
                     ); 
-				} else {
+    } else {
                     obj.error.standard_unexpected_error_alert('unexpected on_all_fleshed object: ', obj.on_all_fleshed);
                 }
             }
@@ -796,299 +796,299 @@ util.list.prototype = {
         }
     },
 
-	'full_retrieve' : function(params) {
-		var obj = this;
-		switch (this.node.nodeName) {
-			case 'tree' : obj._full_retrieve_tree(params); break;
-			default: throw('NYI: Need .full_retrieve() for ' + obj.node.nodeName); break;
-		}
-	},
-
-	'_full_retrieve_tree' : function(params) {
-		var obj = this;
-		try {
-			if (obj.row_count.fleshed >= obj.row_count.total) {
-				dump('Full retrieve... tree seems to be in sync\n' + js2JSON(obj.row_count) + '\n');
+ 'full_retrieve' : function(params) {
+  var obj = this;
+  switch (this.node.nodeName) {
+   case 'tree' : obj._full_retrieve_tree(params); break;
+   default: throw('NYI: Need .full_retrieve() for ' + obj.node.nodeName); break;
+  }
+ },
+
+ '_full_retrieve_tree' : function(params) {
+  var obj = this;
+  try {
+   if (obj.row_count.fleshed >= obj.row_count.total) {
+    dump('Full retrieve... tree seems to be in sync\n' + js2JSON(obj.row_count) + '\n');
                 obj.exec_on_all_fleshed();
-			} else {
-				dump('Full retrieve... syncing tree' + js2JSON(obj.row_count) + '\n');
-				JSAN.use('util.widgets');
-				var nodes = obj.treechildren.childNodes;
-				for (var i = 0; i < nodes.length; i++) {
-					util.widgets.dispatch('flesh',nodes[i].firstChild);
-				}
-			}
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert('_full_retrieve_tree',E);
-		}
-	},
-
-	'_append_to_listbox' : function (params) {
-
-		var obj = this;
-
-		if (typeof params.row == 'undefined') throw('util.list.append: Object must contain a row');
-
-		var s = ('util.list.append: params = ' + (params) + '\n');
-
-		var listitem = document.createElement('listitem');
-
-		s += ('listbox = ' + this.node + '  listitem = ' + listitem + '\n');
-
-		if (typeof params.retrieve_row == 'function' || typeof this.retrieve_row == 'function') {
-
-			setTimeout(
-				function() {
-					listitem.setAttribute('retrieve_id',params.retrieve_id);
-					//FIXME//Make async and fire when row is visible in list
-					var row;
-
-					params.row_node = listitem;
-					params.on_retrieve = function(row) {
-						params.row = row;
-						obj._map_row_to_listcell(params,listitem);
-						obj.node.appendChild( listitem );
-						util.widgets.dispatch('select',obj.node);
-					}
-
-					if (typeof params.retrieve_row == 'function') {
-
-						row = params.retrieve_row( params );
-
-					} else {
-
-						if (typeof obj.retrieve_row == 'function') {
-
-							row = obj.retrieve_row( params );
-
-						}
-					}
-				}, 0
-			);
-		} else {
-			this._map_row_to_listcell(params,listitem);
-			this.node.appendChild( listitem );
-		}
-
-		this.error.sdump('D_LIST',s);
-		params.my_node = listitem;
-		return params;
-
-	},
-
-	'_map_row_to_treecell' : function(params,treerow) {
-		var obj = this;
-		var s = '';
-		util.widgets.remove_children(treerow);
-
-		if (typeof params.map_row_to_column == 'function' || typeof this.map_row_to_column == 'function') {
-
-			for (var i = 0; i < this.columns.length; i++) {
-				var treecell = document.createElement('treecell');
-				var label = '';
-				if (params.skip_columns && (params.skip_columns.indexOf(i) != -1)) {
-					treecell.setAttribute('label',label);
-					treerow.appendChild( treecell );
-					s += ('treecell = ' + treecell + ' with label = ' + label + '\n');
-					continue;
-				}
-				if (params.skip_all_columns_except && (params.skip_all_columns_except.indexOf(i) == -1)) {
-					treecell.setAttribute('label',label);
-					treerow.appendChild( treecell );
-					s += ('treecell = ' + treecell + ' with label = ' + label + '\n');
-					continue;
-				}
-	
-				if (typeof params.map_row_to_column == 'function')  {
-	
-					label = params.map_row_to_column(params.row,this.columns[i]);
-	
-				} else if (typeof this.map_row_to_column == 'function') {
-	
-					label = this.map_row_to_column(params.row,this.columns[i]);
-	
-				}
-				treecell.setAttribute('label',label ? label : '');
-				treerow.appendChild( treecell );
-				s += ('treecell = ' + treecell + ' with label = ' + label + '\n');
-			}
-		} else if (typeof params.map_row_to_columns == 'function' || typeof this.map_row_to_columns == 'function') {
-
-			var labels = [];
-
-			if (typeof params.map_row_to_columns == 'function') {
-
-				labels = params.map_row_to_columns(params.row,this.columns);
-
-			} else if (typeof this.map_row_to_columns == 'function') {
-
-				labels = this.map_row_to_columns(params.row,this.columns);
-
-			}
-			for (var i = 0; i < labels.length; i++) {
-				var treecell = document.createElement('treecell');
-				treecell.setAttribute('label',typeof labels[i] == 'string' || typeof labels[i] == 'number' ? labels[i] : '');
-				treerow.appendChild( treecell );
-				s += ('treecell = ' + treecell + ' with label = ' + labels[i] + '\n');
-			}
-
-		} else {
-
-			throw('No row to column mapping function.');
-		}
-		this.error.sdump('D_LIST',s);
-	},
-
-	'_map_row_to_listcell' : function(params,listitem) {
-		var obj = this;
-		var s = '';
-		for (var i = 0; i < this.columns.length; i++) {
-			var value = '';
-			if (typeof params.map_row_to_column == 'function')  {
-
-				value = params.map_row_to_column(params.row,this.columns[i]);
-
-			} else {
-
-				if (typeof this.map_row_to_column == 'function') {
-
-					value = this.map_row_to_column(params.row,this.columns[i]);
-				}
-			}
-			if (typeof value == 'string' || typeof value == 'number') {
-				var listcell = document.createElement('listcell');
-				listcell.setAttribute('label',value);
-				listitem.appendChild(listcell);
-				s += ('listcell = ' + listcell + ' with label = ' + value + '\n');
-			} else {
-				listitem.appendChild(value);
-				s += ('listcell = ' + value + ' is really a ' + value.nodeName + '\n');
-			}
-		}
-		this.error.sdump('D_LIST',s);
-	},
-
-	'select_all' : function(params) {
-		var obj = this;
-		switch(this.node.nodeName) {
-			case 'tree' : return this._select_all_from_tree(params); break;
-			default: throw('NYI: Need ._select_all_from_() for ' + this.node.nodeName); break;
-		}
-	},
-
-	'_select_all_from_tree' : function(params) {
-		var obj = this;
-		this.node.view.selection.selectAll();
-	},
-
-	'retrieve_selection' : function(params) {
-		var obj = this;
-		switch(this.node.nodeName) {
-			case 'tree' : return this._retrieve_selection_from_tree(params); break;
-			default: throw('NYI: Need ._retrieve_selection_from_() for ' + this.node.nodeName); break;
-		}
-	},
-
-	'_retrieve_selection_from_tree' : function(params) {
-		var obj = this;
-		var list = [];
-		var start = new Object();
-		var end = new Object();
-		var numRanges = this.node.view.selection.getRangeCount();
-		for (var t=0; t<numRanges; t++){
-			this.node.view.selection.getRangeAt(t,start,end);
-			for (var v=start.value; v<=end.value; v++){
-				var i = this.node.contentView.getItemAtIndex(v);
-				list.push( i );
-			}
-		}
-		return list;
-	},
-
-	'dump' : function(params) {
-		var obj = this;
-		switch(this.node.nodeName) {
-			case 'tree' : return this._dump_tree(params); break;
-			default: throw('NYI: Need .dump() for ' + this.node.nodeName); break;
-		}
-	},
-
-	'_dump_tree' : function(params) {
-		var obj = this;
-		var dump = [];
-		for (var i = 0; i < this.treechildren.childNodes.length; i++) {
-			var row = [];
-			var treeitem = this.treechildren.childNodes[i];
-			var treerow = treeitem.firstChild;
-			for (var j = 0; j < treerow.childNodes.length; j++) {
-				row.push( treerow.childNodes[j].getAttribute('label') );
-			}
-			dump.push( row );
-		}
-		return dump;
-	},
-
-	'dump_with_keys' : function(params) {
-		var obj = this;
-		switch(this.node.nodeName) {
-			case 'tree' : return this._dump_tree_with_keys(params); break;
-			default: throw('NYI: Need .dump_with_keys() for ' + this.node.nodeName); break;
-		}
-
-	},
-
-	'_dump_tree_with_keys' : function(params) {
-		var obj = this;
-		var dump = [];
-		for (var i = 0; i < this.treechildren.childNodes.length; i++) {
-			var row = {};
-			var treeitem = this.treechildren.childNodes[i];
-			var treerow = treeitem.firstChild;
-			for (var j = 0; j < treerow.childNodes.length; j++) {
-				row[ obj.columns[j].id ] = treerow.childNodes[j].getAttribute('label');
-			}
-			dump.push( row );
-		}
-		return dump;
-	},
-
-	'dump_csv' : function(params) {
-		var obj = this;
-		switch(this.node.nodeName) {
-			case 'tree' : return this._dump_tree_csv(params); break;
-			default: throw('NYI: Need .dump_csv() for ' + this.node.nodeName); break;
-		}
-
-	},
-
-	'_dump_tree_csv' : function(params) {
-		var obj = this;
-		var dump = '';
-		for (var j = 0; j < obj.columns.length; j++) {
-			if (obj.node.treeBoxObject.columns.getColumnAt(j).element.getAttribute('hidden') == 'true') {
-				/* skip */
-			} else {
-				if (dump) dump += ',';
-				dump += '"' + obj.columns[j].label.replace(/"/g, '""') + '"';
-			}
-		}
-		dump += '\r\n';
-		for (var i = 0; i < this.treechildren.childNodes.length; i++) {
-			var row = '';
-			var treeitem = this.treechildren.childNodes[i];
-			var treerow = treeitem.firstChild;
-			for (var j = 0; j < treerow.childNodes.length; j++) {
-				if (obj.node.treeBoxObject.columns.getColumnAt(j).element.getAttribute('hidden') == 'true') {
-					/* skip */
-				} else {
-					if (row) row += ',';
-					row += '"' + treerow.childNodes[j].getAttribute('label').replace(/"/g, '""') + '"';
-				}
-			}
-			dump +=  row + '\r\n';
-		}
-		return dump;
-	},
+   } else {
+    dump('Full retrieve... syncing tree' + js2JSON(obj.row_count) + '\n');
+    JSAN.use('util.widgets');
+    var nodes = obj.treechildren.childNodes;
+    for (var i = 0; i < nodes.length; i++) {
+     util.widgets.dispatch('flesh',nodes[i].firstChild);
+    }
+   }
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert('_full_retrieve_tree',E);
+  }
+ },
+
+ '_append_to_listbox' : function (params) {
+
+  var obj = this;
+
+  if (typeof params.row == 'undefined') throw('util.list.append: Object must contain a row');
+
+  var s = ('util.list.append: params = ' + (params) + '\n');
+
+  var listitem = document.createElement('listitem');
+
+  s += ('listbox = ' + this.node + '  listitem = ' + listitem + '\n');
+
+  if (typeof params.retrieve_row == 'function' || typeof this.retrieve_row == 'function') {
+
+   setTimeout(
+    function() {
+     listitem.setAttribute('retrieve_id',params.retrieve_id);
+     //FIXME//Make async and fire when row is visible in list
+     var row;
+
+     params.row_node = listitem;
+     params.on_retrieve = function(row) {
+      params.row = row;
+      obj._map_row_to_listcell(params,listitem);
+      obj.node.appendChild( listitem );
+      util.widgets.dispatch('select',obj.node);
+     }
+
+     if (typeof params.retrieve_row == 'function') {
+
+      row = params.retrieve_row( params );
+
+     } else {
+
+      if (typeof obj.retrieve_row == 'function') {
+
+       row = obj.retrieve_row( params );
+
+      }
+     }
+    }, 0
+   );
+  } else {
+   this._map_row_to_listcell(params,listitem);
+   this.node.appendChild( listitem );
+  }
+
+  this.error.sdump('D_LIST',s);
+  params.my_node = listitem;
+  return params;
+
+ },
+
+ '_map_row_to_treecell' : function(params,treerow) {
+  var obj = this;
+  var s = '';
+  util.widgets.remove_children(treerow);
+
+  if (typeof params.map_row_to_column == 'function' || typeof this.map_row_to_column == 'function') {
+
+   for (var i = 0; i < this.columns.length; i++) {
+    var treecell = document.createElement('treecell');
+    var label = '';
+    if (params.skip_columns && (params.skip_columns.indexOf(i) != -1)) {
+     treecell.setAttribute('label',label);
+     treerow.appendChild( treecell );
+     s += ('treecell = ' + treecell + ' with label = ' + label + '\n');
+     continue;
+    }
+    if (params.skip_all_columns_except && (params.skip_all_columns_except.indexOf(i) == -1)) {
+     treecell.setAttribute('label',label);
+     treerow.appendChild( treecell );
+     s += ('treecell = ' + treecell + ' with label = ' + label + '\n');
+     continue;
+    }
+ 
+    if (typeof params.map_row_to_column == 'function')  {
+ 
+     label = params.map_row_to_column(params.row,this.columns[i]);
+ 
+    } else if (typeof this.map_row_to_column == 'function') {
+ 
+     label = this.map_row_to_column(params.row,this.columns[i]);
+ 
+    }
+    treecell.setAttribute('label',label ? label : '');
+    treerow.appendChild( treecell );
+    s += ('treecell = ' + treecell + ' with label = ' + label + '\n');
+   }
+  } else if (typeof params.map_row_to_columns == 'function' || typeof this.map_row_to_columns == 'function') {
+
+   var labels = [];
+
+   if (typeof params.map_row_to_columns == 'function') {
+
+    labels = params.map_row_to_columns(params.row,this.columns);
+
+   } else if (typeof this.map_row_to_columns == 'function') {
+
+    labels = this.map_row_to_columns(params.row,this.columns);
+
+   }
+   for (var i = 0; i < labels.length; i++) {
+    var treecell = document.createElement('treecell');
+    treecell.setAttribute('label',typeof labels[i] == 'string' || typeof labels[i] == 'number' ? labels[i] : '');
+    treerow.appendChild( treecell );
+    s += ('treecell = ' + treecell + ' with label = ' + labels[i] + '\n');
+   }
+
+  } else {
+
+   throw('No row to column mapping function.');
+  }
+  this.error.sdump('D_LIST',s);
+ },
+
+ '_map_row_to_listcell' : function(params,listitem) {
+  var obj = this;
+  var s = '';
+  for (var i = 0; i < this.columns.length; i++) {
+   var value = '';
+   if (typeof params.map_row_to_column == 'function')  {
+
+    value = params.map_row_to_column(params.row,this.columns[i]);
+
+   } else {
+
+    if (typeof this.map_row_to_column == 'function') {
+
+     value = this.map_row_to_column(params.row,this.columns[i]);
+    }
+   }
+   if (typeof value == 'string' || typeof value == 'number') {
+    var listcell = document.createElement('listcell');
+    listcell.setAttribute('label',value);
+    listitem.appendChild(listcell);
+    s += ('listcell = ' + listcell + ' with label = ' + value + '\n');
+   } else {
+    listitem.appendChild(value);
+    s += ('listcell = ' + value + ' is really a ' + value.nodeName + '\n');
+   }
+  }
+  this.error.sdump('D_LIST',s);
+ },
+
+ 'select_all' : function(params) {
+  var obj = this;
+  switch(this.node.nodeName) {
+   case 'tree' : return this._select_all_from_tree(params); break;
+   default: throw('NYI: Need ._select_all_from_() for ' + this.node.nodeName); break;
+  }
+ },
+
+ '_select_all_from_tree' : function(params) {
+  var obj = this;
+  this.node.view.selection.selectAll();
+ },
+
+ 'retrieve_selection' : function(params) {
+  var obj = this;
+  switch(this.node.nodeName) {
+   case 'tree' : return this._retrieve_selection_from_tree(params); break;
+   default: throw('NYI: Need ._retrieve_selection_from_() for ' + this.node.nodeName); break;
+  }
+ },
+
+ '_retrieve_selection_from_tree' : function(params) {
+  var obj = this;
+  var list = [];
+  var start = new Object();
+  var end = new Object();
+  var numRanges = this.node.view.selection.getRangeCount();
+  for (var t=0; t<numRanges; t++){
+   this.node.view.selection.getRangeAt(t,start,end);
+   for (var v=start.value; v<=end.value; v++){
+    var i = this.node.contentView.getItemAtIndex(v);
+    list.push( i );
+   }
+  }
+  return list;
+ },
+
+ 'dump' : function(params) {
+  var obj = this;
+  switch(this.node.nodeName) {
+   case 'tree' : return this._dump_tree(params); break;
+   default: throw('NYI: Need .dump() for ' + this.node.nodeName); break;
+  }
+ },
+
+ '_dump_tree' : function(params) {
+  var obj = this;
+  var dump = [];
+  for (var i = 0; i < this.treechildren.childNodes.length; i++) {
+   var row = [];
+   var treeitem = this.treechildren.childNodes[i];
+   var treerow = treeitem.firstChild;
+   for (var j = 0; j < treerow.childNodes.length; j++) {
+    row.push( treerow.childNodes[j].getAttribute('label') );
+   }
+   dump.push( row );
+  }
+  return dump;
+ },
+
+ 'dump_with_keys' : function(params) {
+  var obj = this;
+  switch(this.node.nodeName) {
+   case 'tree' : return this._dump_tree_with_keys(params); break;
+   default: throw('NYI: Need .dump_with_keys() for ' + this.node.nodeName); break;
+  }
+
+ },
+
+ '_dump_tree_with_keys' : function(params) {
+  var obj = this;
+  var dump = [];
+  for (var i = 0; i < this.treechildren.childNodes.length; i++) {
+   var row = {};
+   var treeitem = this.treechildren.childNodes[i];
+   var treerow = treeitem.firstChild;
+   for (var j = 0; j < treerow.childNodes.length; j++) {
+    row[ obj.columns[j].id ] = treerow.childNodes[j].getAttribute('label');
+   }
+   dump.push( row );
+  }
+  return dump;
+ },
+
+ 'dump_csv' : function(params) {
+  var obj = this;
+  switch(this.node.nodeName) {
+   case 'tree' : return this._dump_tree_csv(params); break;
+   default: throw('NYI: Need .dump_csv() for ' + this.node.nodeName); break;
+  }
+
+ },
+
+ '_dump_tree_csv' : function(params) {
+  var obj = this;
+  var dump = '';
+  for (var j = 0; j < obj.columns.length; j++) {
+   if (obj.node.treeBoxObject.columns.getColumnAt(j).element.getAttribute('hidden') == 'true') {
+    /* skip */
+   } else {
+    if (dump) dump += ',';
+    dump += '"' + obj.columns[j].label.replace(/"/g, '""') + '"';
+   }
+  }
+  dump += '\r\n';
+  for (var i = 0; i < this.treechildren.childNodes.length; i++) {
+   var row = '';
+   var treeitem = this.treechildren.childNodes[i];
+   var treerow = treeitem.firstChild;
+   for (var j = 0; j < treerow.childNodes.length; j++) {
+    if (obj.node.treeBoxObject.columns.getColumnAt(j).element.getAttribute('hidden') == 'true') {
+     /* skip */
+    } else {
+     if (row) row += ',';
+     row += '"' + treerow.childNodes[j].getAttribute('label').replace(/"/g, '""') + '"';
+    }
+   }
+   dump +=  row + '\r\n';
+  }
+  return dump;
+ },
 
     'dump_csv_to_clipboard' : function(params) {
         var obj = this;
@@ -1138,16 +1138,16 @@ util.list.prototype = {
 
     'print' : function(params) {
         if (!params) params = {};
-		switch(this.node.nodeName) {
-			case 'tree' : return this._print_tree(params); break;
-			default: throw('NYI: Need ._print() for ' + this.node.nodeName); break;
-		}
+  switch(this.node.nodeName) {
+   case 'tree' : return this._print_tree(params); break;
+   default: throw('NYI: Need ._print() for ' + this.node.nodeName); break;
+  }
     },
 
     '_print_tree' : function(params) {
         var obj = this;
         try {
-			JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.stash_retrieve();
+   JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.stash_retrieve();
             if (!params.staff && data.list.au && data.list.au[0]) {
                 params.staff = data.list.au[0];
             }
@@ -1167,161 +1167,161 @@ util.list.prototype = {
                         print.tree_list( params );
                         if (typeof params.callback == 'function') params.callback();
                     } catch(E) {
-			            obj.error.standard_unexpected_error_alert('inner _print_tree',E);
+               obj.error.standard_unexpected_error_alert('inner _print_tree',E);
                     }
                 }
             );
             
         } catch(E) {
-			obj.error.standard_unexpected_error_alert('_print_tree',E);
+   obj.error.standard_unexpected_error_alert('_print_tree',E);
         }
     },
 
-	'dump_selected_with_keys' : function(params) {
-		var obj = this;
-		switch(this.node.nodeName) {
-			case 'tree' : return this._dump_tree_selection_with_keys(params); break;
-			default: throw('NYI: Need .dump_selection_with_keys() for ' + this.node.nodeName); break;
-		}
-
-	},
-
-	'_dump_tree_selection_with_keys' : function(params) {
-		var obj = this;
-		var dump = [];
-		var list = obj._retrieve_selection_from_tree();
-		for (var i = 0; i < list.length; i++) {
-			var row = {};
-			var treeitem = list[i];
-			var treerow = treeitem.firstChild;
-			for (var j = 0; j < treerow.childNodes.length; j++) {
-				var value = treerow.childNodes[j].getAttribute('label');
-				if (params.skip_hidden_columns) if (obj.node.treeBoxObject.columns.getColumnAt(j).element.getAttribute('hidden') == 'true') continue;
-				var id = obj.columns[j].id; if (params.labels_instead_of_ids) id = obj.columns[j].label;
-				row[ id ] = value;
-			}
-			dump.push( row );
-		}
-		return dump;
-	},
-
-	'clipboard' : function(params) {
-		try {
-			var obj = this;
-			var dump = obj.dump_selected_with_keys({'skip_hidden_columns':true,'labels_instead_of_ids':true});
-			JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.stash_retrieve();
-			data.list_clipboard = dump; data.stash('list_clipboard');
-			JSAN.use('util.window'); var win = new util.window();
-			win.open(urls.XUL_LIST_CLIPBOARD,'list_clipboard','chrome,resizable,modal');
+ 'dump_selected_with_keys' : function(params) {
+  var obj = this;
+  switch(this.node.nodeName) {
+   case 'tree' : return this._dump_tree_selection_with_keys(params); break;
+   default: throw('NYI: Need .dump_selection_with_keys() for ' + this.node.nodeName); break;
+  }
+
+ },
+
+ '_dump_tree_selection_with_keys' : function(params) {
+  var obj = this;
+  var dump = [];
+  var list = obj._retrieve_selection_from_tree();
+  for (var i = 0; i < list.length; i++) {
+   var row = {};
+   var treeitem = list[i];
+   var treerow = treeitem.firstChild;
+   for (var j = 0; j < treerow.childNodes.length; j++) {
+    var value = treerow.childNodes[j].getAttribute('label');
+    if (params.skip_hidden_columns) if (obj.node.treeBoxObject.columns.getColumnAt(j).element.getAttribute('hidden') == 'true') continue;
+    var id = obj.columns[j].id; if (params.labels_instead_of_ids) id = obj.columns[j].label;
+    row[ id ] = value;
+   }
+   dump.push( row );
+  }
+  return dump;
+ },
+
+ 'clipboard' : function(params) {
+  try {
+   var obj = this;
+   var dump = obj.dump_selected_with_keys({'skip_hidden_columns':true,'labels_instead_of_ids':true});
+   JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.stash_retrieve();
+   data.list_clipboard = dump; data.stash('list_clipboard');
+   JSAN.use('util.window'); var win = new util.window();
+   win.open(urls.XUL_LIST_CLIPBOARD,'list_clipboard','chrome,resizable,modal');
             window.focus(); // sometimes the main window will lower after a clipboard action
-		} catch(E) {
-			this.error.standard_unexpected_error_alert('clipboard',E);
-		}
-	},
-
-	'dump_retrieve_ids' : function(params) {
-		var obj = this;
-		switch(this.node.nodeName) {
-			case 'tree' : return this._dump_retrieve_ids_tree(params); break;
-			default: throw('NYI: Need .dump_retrieve_ids() for ' + this.node.nodeName); break;
-		}
-	},
-
-	'_dump_retrieve_ids_tree' : function(params) {
-		var obj = this;
-		var dump = [];
-		for (var i = 0; i < this.treechildren.childNodes.length; i++) {
-			var treeitem = this.treechildren.childNodes[i];
-			dump.push( treeitem.getAttribute('retrieve_id') );
-		}
-		return dump;
-	},
+  } catch(E) {
+   this.error.standard_unexpected_error_alert('clipboard',E);
+  }
+ },
+
+ 'dump_retrieve_ids' : function(params) {
+  var obj = this;
+  switch(this.node.nodeName) {
+   case 'tree' : return this._dump_retrieve_ids_tree(params); break;
+   default: throw('NYI: Need .dump_retrieve_ids() for ' + this.node.nodeName); break;
+  }
+ },
+
+ '_dump_retrieve_ids_tree' : function(params) {
+  var obj = this;
+  var dump = [];
+  for (var i = 0; i < this.treechildren.childNodes.length; i++) {
+   var treeitem = this.treechildren.childNodes[i];
+   dump.push( treeitem.getAttribute('retrieve_id') );
+  }
+  return dump;
+ },
 
     'wrap_in_full_retrieve' : function(f) {
         var obj = this;
-		if (typeof obj.on_all_fleshed == 'function') { // legacy
+  if (typeof obj.on_all_fleshed == 'function') { // legacy
             obj.on_all_fleshed = [ obj.on_all_fleshed ];
-		}
+  }
         if (! obj.on_all_fleshed) obj.on_all_fleshed = [];
         obj.on_all_fleshed.push(f);
         obj.full_retrieve();
     },
 
-	'_sort_tree' : function(col,sortDir) {
-		var obj = this;
-		try {
-			if (obj.node.getAttribute('no_sort')) {
-				return;
-			}
-			var col_pos;
-			for (var i = 0; i < obj.columns.length; i++) { 
-				if (obj.columns[i].id == col.id) col_pos = function(a){return a;}(i); 
-			}
+ '_sort_tree' : function(col,sortDir) {
+  var obj = this;
+  try {
+   if (obj.node.getAttribute('no_sort')) {
+    return;
+   }
+   var col_pos;
+   for (var i = 0; i < obj.columns.length; i++) { 
+    if (obj.columns[i].id == col.id) col_pos = function(a){return a;}(i); 
+   }
             obj.wrap_in_full_retrieve(
                 function() {
-					try {
-						JSAN.use('util.money');
-						var rows = [];
-						var treeitems = obj.treechildren.childNodes;
-						for (var i = 0; i < treeitems.length; i++) {
-							var treeitem = treeitems[i];
-							var treerow = treeitem.firstChild;
-							var treecell = treerow.childNodes[ col_pos ];
-							value = ( { 'value' : treecell ? treecell.getAttribute('label') : '', 'node' : treeitem } );
-							rows.push( value );
-						}
-						rows = rows.sort( function(a,b) { 
-							a = a.value; b = b.value; 
-							if (col.getAttribute('sort_type')) {
-								switch(col.getAttribute('sort_type')) {
-									case 'number' :
-										a = Number(a); b = Number(b);
-									break;
-									case 'money' :
-										a = util.money.dollars_float_to_cents_integer(a);
-										b = util.money.dollars_float_to_cents_integer(b);
-									break;
-									case 'title' : /* special case for "a" and "the".  doesn't use marc 245 indicator */
-										a = String( a ).toUpperCase().replace( /^\s*(THE|A|AN)\s+/, '' );
-										b = String( b ).toUpperCase().replace( /^\s*(THE|A|AN)\s+/, '' );
-									break;
-									default:
-										a = String( a ).toUpperCase();
-										b = String( b ).toUpperCase();
-									break;
-								}
-							} else {
-								if (typeof a == 'string' || typeof b == 'string') {
-									a = String( a ).toUpperCase();
-									b = String( b ).toUpperCase();
-								}
-							}
-							if (a < b) return -1; 
-							if (a > b) return 1; 
-							return 0; 
-						} );
-						if (sortDir == 'asc') rows = rows.reverse();
-						while(obj.treechildren.lastChild) obj.treechildren.removeChild( obj.treechildren.lastChild );
-						for (var i = 0; i < rows.length; i++) {
-							obj.treechildren.appendChild( rows[i].node );
-						}
-					} catch(E) {
-						obj.error.standard_unexpected_error_alert('sorting',E); 
-					}
-				}
+     try {
+      JSAN.use('util.money');
+      var rows = [];
+      var treeitems = obj.treechildren.childNodes;
+      for (var i = 0; i < treeitems.length; i++) {
+       var treeitem = treeitems[i];
+       var treerow = treeitem.firstChild;
+       var treecell = treerow.childNodes[ col_pos ];
+       value = ( { 'value' : treecell ? treecell.getAttribute('label') : '', 'node' : treeitem } );
+       rows.push( value );
+      }
+      rows = rows.sort( function(a,b) { 
+       a = a.value; b = b.value; 
+       if (col.getAttribute('sort_type')) {
+        switch(col.getAttribute('sort_type')) {
+         case 'number' :
+          a = Number(a); b = Number(b);
+         break;
+         case 'money' :
+          a = util.money.dollars_float_to_cents_integer(a);
+          b = util.money.dollars_float_to_cents_integer(b);
+         break;
+         case 'title' : /* special case for "a" and "the".  doesn't use marc 245 indicator */
+          a = String( a ).toUpperCase().replace( /^\s*(THE|A|AN)\s+/, '' );
+          b = String( b ).toUpperCase().replace( /^\s*(THE|A|AN)\s+/, '' );
+         break;
+         default:
+          a = String( a ).toUpperCase();
+          b = String( b ).toUpperCase();
+         break;
+        }
+       } else {
+        if (typeof a == 'string' || typeof b == 'string') {
+         a = String( a ).toUpperCase();
+         b = String( b ).toUpperCase();
+        }
+       }
+       if (a < b) return -1; 
+       if (a > b) return 1; 
+       return 0; 
+      } );
+      if (sortDir == 'asc') rows = rows.reverse();
+      while(obj.treechildren.lastChild) obj.treechildren.removeChild( obj.treechildren.lastChild );
+      for (var i = 0; i < rows.length; i++) {
+       obj.treechildren.appendChild( rows[i].node );
+      }
+     } catch(E) {
+      obj.error.standard_unexpected_error_alert('sorting',E); 
+     }
+    }
             );
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert('pre sorting', E);
-		}
-	},
-
-	'render_list_actions' : function(params) {
-		var obj = this;
-		switch(this.node.nodeName) {
-			case 'tree' : return this._render_list_actions_for_tree(params); break;
-			default: throw('NYI: Need ._render_list_actions() for ' + this.node.nodeName); break;
-		}
-	},
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert('pre sorting', E);
+  }
+ },
+
+ 'render_list_actions' : function(params) {
+  var obj = this;
+  switch(this.node.nodeName) {
+   case 'tree' : return this._render_list_actions_for_tree(params); break;
+   default: throw('NYI: Need ._render_list_actions() for ' + this.node.nodeName); break;
+  }
+ },
 
     '_render_list_actions_for_tree' : function(params) {
         var obj = this;
@@ -1367,13 +1367,13 @@ util.list.prototype = {
         }
     },
 
-	'set_list_actions' : function(params) {
-		var obj = this;
-		switch(this.node.nodeName) {
-			case 'tree' : return this._set_list_actions_for_tree(params); break;
-			default: throw('NYI: Need ._set_list_actions() for ' + this.node.nodeName); break;
-		}
-	},
+ 'set_list_actions' : function(params) {
+  var obj = this;
+  switch(this.node.nodeName) {
+   case 'tree' : return this._set_list_actions_for_tree(params); break;
+   default: throw('NYI: Need ._set_list_actions() for ' + this.node.nodeName); break;
+  }
+ },
 
     '_set_list_actions_for_tree' : function(params) {
         // This should be called after the button element from render_list_actions has been appended to the DOM
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/list_clipboard.xul b/Open-ILS/xul/staff_client/chrome/content/util/list_clipboard.xul
index 630953cdb9..fc3ecddbac 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/list_clipboard.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/util/list_clipboard.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/en-US/lang.dtd"-->
+ <!--#include virtual="/opac/locale/en-US/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,90 +19,90 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="util_list_clipboard_win" 
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	width="300" height="300" oils_persist="width height"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+ width="300" height="300" oils_persist="width height"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+ </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-
-		function $(id) { return document.getElementById(id); }
-		function $c(n) { return document.createElement(n); }
-
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		                if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for util_list_clipboard.xul');
-
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.stash_retrieve();
-				if (! g.data.list_clipboard ) {
-					window.close();
-				} else {
-					for (var i = 0; i < g.data.list_clipboard.length; i++) {
-						var data_row = g.data.list_clipboard[i];
-						make_grid(data_row);
-					}
-				}
-
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert('util/list_clipboard.xul',E); } catch(F) { alert(E); }
-			}
-		}
-
-		function make_grid(data_row) {
-			try {
-				var vbox = $c('vbox'); vbox.setAttribute('flex','1'); $('area').appendChild(vbox);
-				var grid = $c('grid'); grid.setAttribute('flex','1'); grid.setAttribute('style','border: solid black');  vbox.appendChild(grid);
-				var columns = $c('columns'); grid.appendChild(columns);
-				var c1 = $c('column'); c1.setAttribute('flex','1'); columns.appendChild(c1);
-				var c2 = $c('column'); c2.setAttribute('flex','1'); columns.appendChild(c2);
-				var rows = $c('rows'); grid.appendChild(rows);
-				var data_row2 = [];
-				for (j in data_row) {
-					data_row2.push( { 'label' : j, 'value' : data_row[j] } );
-				}
-				data_row2.sort( function(a,b) { if ( a.label < b.label ) return -1; else return 1; } );
-				for (var j = 0; j < data_row2.length; j++) {
-					var label = data_row2[j].label;
-					var value = data_row2[j].value;
-					if (value == '???' || value == '' || value == 'undefined') continue;
-					var row = $c('row'); 
-					var l1 = $c('label'); l1.setAttribute('value',label); row.appendChild(l1);
-					var l2 = $c('label'); l2.setAttribute('value',value); 
-					l2.setAttribute('style','text-decoration: underline; color: blue; -moz-user-focus: normal'); 
-					l2.setAttribute('onfocus','this.setAttribute("class","clipboard_outline_me")');
-					l2.setAttribute('onblur','this.setAttribute("class","")');
-					l2.setAttribute('onclick','copy_to_clipboard(event); window.close();');
-					row.appendChild(l2);
-					rows.appendChild(row);
-					if (!g.focus) { g.focus = true; l2.focus(); }
-				}
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert('util/list_clipboard.xul, make_grid',E); } catch(F) { alert(E); }
-			}
-		}
-
-	]]>
-	</script>
-
-	<description style="font-weight: bold">Choose the data to copy into the clipboard:</description>
-
-	<hbox id="area" flex="1" style="overflow: scroll">
-	</hbox>
-
-	<hbox><spacer flex="1"/><button label="Close" accesskey="C" oncommand="window.close()"/></hbox>
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+
+  function $(id) { return document.getElementById(id); }
+  function $c(n) { return document.createElement(n); }
+
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                  if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for util_list_clipboard.xul');
+
+    JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.stash_retrieve();
+    if (! g.data.list_clipboard ) {
+     window.close();
+    } else {
+     for (var i = 0; i < g.data.list_clipboard.length; i++) {
+      var data_row = g.data.list_clipboard[i];
+      make_grid(data_row);
+     }
+    }
+
+   } catch(E) {
+    try { g.error.standard_unexpected_error_alert('util/list_clipboard.xul',E); } catch(F) { alert(E); }
+   }
+  }
+
+  function make_grid(data_row) {
+   try {
+    var vbox = $c('vbox'); vbox.setAttribute('flex','1'); $('area').appendChild(vbox);
+    var grid = $c('grid'); grid.setAttribute('flex','1'); grid.setAttribute('style','border: solid black');  vbox.appendChild(grid);
+    var columns = $c('columns'); grid.appendChild(columns);
+    var c1 = $c('column'); c1.setAttribute('flex','1'); columns.appendChild(c1);
+    var c2 = $c('column'); c2.setAttribute('flex','1'); columns.appendChild(c2);
+    var rows = $c('rows'); grid.appendChild(rows);
+    var data_row2 = [];
+    for (j in data_row) {
+     data_row2.push( { 'label' : j, 'value' : data_row[j] } );
+    }
+    data_row2.sort( function(a,b) { if ( a.label < b.label ) return -1; else return 1; } );
+    for (var j = 0; j < data_row2.length; j++) {
+     var label = data_row2[j].label;
+     var value = data_row2[j].value;
+     if (value == '???' || value == '' || value == 'undefined') continue;
+     var row = $c('row'); 
+     var l1 = $c('label'); l1.setAttribute('value',label); row.appendChild(l1);
+     var l2 = $c('label'); l2.setAttribute('value',value); 
+     l2.setAttribute('style','text-decoration: underline; color: blue; -moz-user-focus: normal'); 
+     l2.setAttribute('onfocus','this.setAttribute("class","clipboard_outline_me")');
+     l2.setAttribute('onblur','this.setAttribute("class","")');
+     l2.setAttribute('onclick','copy_to_clipboard(event); window.close();');
+     row.appendChild(l2);
+     rows.appendChild(row);
+     if (!g.focus) { g.focus = true; l2.focus(); }
+    }
+   } catch(E) {
+    try { g.error.standard_unexpected_error_alert('util/list_clipboard.xul, make_grid',E); } catch(F) { alert(E); }
+   }
+  }
+
+ ]]>
+ </script>
+
+ <description style="font-weight: bold">Choose the data to copy into the clipboard:</description>
+
+ <hbox id="area" flex="1" style="overflow: scroll">
+ </hbox>
+
+ <hbox><spacer flex="1"/><button label="Close" accesskey="C" oncommand="window.close()"/></hbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/money.js b/Open-ILS/xul/staff_client/chrome/content/util/money.js
index 8cdb3d3ae1..1a2a1890de 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/money.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/money.js
@@ -3,69 +3,69 @@ dump('entering util/money.js\n');
 if (typeof util == 'undefined') var util = {};
 util.money = {};
 
-util.money.EXPORT_OK	= [ 
-	'sanitize', 'dollars_float_to_cents_integer', 'cents_as_dollars'
+util.money.EXPORT_OK = [ 
+ 'sanitize', 'dollars_float_to_cents_integer', 'cents_as_dollars'
 ];
-util.money.EXPORT_TAGS	= { ':all' : util.money.EXPORT_OK };
+util.money.EXPORT_TAGS = { ':all' : util.money.EXPORT_OK };
 
 util.money.dollars_float_to_cents_integer = function( money ) {
-	try {
-		if (money == '' || money == null || money == undefined) money = 0;
-		// careful to avoid fractions of pennies
-		var negative; negative = money.toString().match(/-/) ? -1 : 1;
-		var money_s = money.toString().replace(/[^\.\d]/g, '');
-		var marray = money_s.split(".");
-		var dollars = marray[0];
-		var cents = marray[1];
-		try {
-			if (cents.length < 2) {
-				cents = cents + '0';
-			}
-		} catch(E) {
-		}
-		try {
-			if (cents.length > 2) {
-				dump("util.money: We don't round money\n");
-				cents = cents.substr(0,2);
-			}
-		} catch(E) {
-		}
-		var total = 0;
-		try {
-			if (Number(cents)) total += Number(cents);
-		} catch(E) {
-		}
-		try {
-			if (Number(dollars)) total += (Number(dollars) * 100);
-		} catch(E) {
-		}
-		return total * negative;	
-	} catch(E) {
-		alert('util.money.dollars_float_to_cents_integer:\n' + E);
-	}
+ try {
+  if (money == '' || money == null || money == undefined) money = 0;
+  // careful to avoid fractions of pennies
+  var negative; negative = money.toString().match(/-/) ? -1 : 1;
+  var money_s = money.toString().replace(/[^\.\d]/g, '');
+  var marray = money_s.split(".");
+  var dollars = marray[0];
+  var cents = marray[1];
+  try {
+   if (cents.length < 2) {
+    cents = cents + '0';
+   }
+  } catch(E) {
+  }
+  try {
+   if (cents.length > 2) {
+    dump("util.money: We don't round money\n");
+    cents = cents.substr(0,2);
+   }
+  } catch(E) {
+  }
+  var total = 0;
+  try {
+   if (Number(cents)) total += Number(cents);
+  } catch(E) {
+  }
+  try {
+   if (Number(dollars)) total += (Number(dollars) * 100);
+  } catch(E) {
+  }
+  return total * negative; 
+ } catch(E) {
+  alert('util.money.dollars_float_to_cents_integer:\n' + E);
+ }
 }
 
 util.money.cents_as_dollars = function( cents ) {
-	try {
-		if (cents == '' || cents == null || cents == undefined) cents = 0;
-		var negative; negative = cents.toString().match(/-/) ? '-' : '';
-		cents = cents.toString().replace(/[^\.\d]/g, ''); 
-		if (cents.match(/\./)) cents = util.money.dollars_float_to_cents_integer( cents ).toString();
-		try {
-			switch( cents.length ) {
-				case 0: cents = '000'; break;
-				case 1: cents = '00' + cents; break;
-			}
-		} catch(E) {
-		}
-		return negative + cents.substr(0,cents.length-2) + '.' + cents.substr(cents.length - 2);
-	} catch(E) {
-		alert('util.money.cents_as_dollars:\n' + E);
-	}
+ try {
+  if (cents == '' || cents == null || cents == undefined) cents = 0;
+  var negative; negative = cents.toString().match(/-/) ? '-' : '';
+  cents = cents.toString().replace(/[^\.\d]/g, ''); 
+  if (cents.match(/\./)) cents = util.money.dollars_float_to_cents_integer( cents ).toString();
+  try {
+   switch( cents.length ) {
+    case 0: cents = '000'; break;
+    case 1: cents = '00' + cents; break;
+   }
+  } catch(E) {
+  }
+  return negative + cents.substr(0,cents.length-2) + '.' + cents.substr(cents.length - 2);
+ } catch(E) {
+  alert('util.money.cents_as_dollars:\n' + E);
+ }
 }
 
 util.money.sanitize = function( money ) {
-	return util.money.cents_as_dollars( util.money.dollars_float_to_cents_integer( money ) );
+ return util.money.cents_as_dollars( util.money.dollars_float_to_cents_integer( money ) );
 }
 
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/mozilla.js b/Open-ILS/xul/staff_client/chrome/content/util/mozilla.js
index 75c49cd4e5..152bfac210 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/mozilla.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/mozilla.js
@@ -6,59 +6,59 @@ const Ci = Components.interfaces;
 if (typeof util == 'undefined') var util = {};
 util.mozilla = {};
 
-util.mozilla.EXPORT_OK	= [ 
-	'chromeRegistry', 'languages', 'regions', 'prefs'
+util.mozilla.EXPORT_OK = [ 
+ 'chromeRegistry', 'languages', 'regions', 'prefs'
 ];
-util.mozilla.EXPORT_TAGS	= { ':all' : util.mozilla.EXPORT_OK };
+util.mozilla.EXPORT_TAGS = { ':all' : util.mozilla.EXPORT_OK };
 
 util.mozilla.chromeRegistry = function() {
-	try {
+ try {
 
         netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
         return Cc['@mozilla.org/chrome/chrome-registry;1'].getService(Ci['nsIToolkitChromeRegistry']);
 
-	} catch(E) {
-		alert("FIXME: util.mozilla.reloadChrome() = " + E);
-	}
+ } catch(E) {
+  alert("FIXME: util.mozilla.reloadChrome() = " + E);
+ }
 }
 
 util.mozilla.languages = function() {
-	try {
+ try {
 
         netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
         var stringBundles = Cc['@mozilla.org/intl/stringbundle;1'].getService(Ci['nsIStringBundleService']);
         return stringBundles.createBundle('chrome://global/locale/languageNames.properties');
 
-	} catch(E) {
-		alert("FIXME: util.mozilla.reloadChrome() = " + E);
-	}
+ } catch(E) {
+  alert("FIXME: util.mozilla.reloadChrome() = " + E);
+ }
 }
 
 util.mozilla.regions = function() {
-	try {
+ try {
 
         netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
         var stringBundles = Cc['@mozilla.org/intl/stringbundle;1'].getService(Ci['nsIStringBundleService']);
         return stringBundles.createBundle('chrome://global/locale/regionNames.properties');
 
-	} catch(E) {
-		alert("FIXME: util.mozilla.reloadChrome() = " + E);
-	}
+ } catch(E) {
+  alert("FIXME: util.mozilla.reloadChrome() = " + E);
+ }
 }
 
 util.mozilla.prefs = function() {
-	try {
+ try {
 
         netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
         return Cc['@mozilla.org/preferences-service;1'].getService(Ci['nsIPrefBranch']);
 
-	} catch(E) {
-		alert("FIXME: util.mozilla.reloadChrome() = " + E);
-	}
+ } catch(E) {
+  alert("FIXME: util.mozilla.reloadChrome() = " + E);
+ }
 }
 
 util.mozilla.change_locale = function( locale ) {
-	try {
+ try {
         var current_locale = 'en-US';
         try { current_locale = util.mozilla.prefs().getCharPref('general.useragent.locale'); } catch(E) { alert('util.locale.change, prefs() = ' + E); }
         if (locale != current_locale) {
@@ -67,9 +67,9 @@ util.mozilla.change_locale = function( locale ) {
             util.mozilla.chromeRegistry().reloadChrome();
         }
 
-	} catch(E) {
-		alert('FIXME: util.mozilla.change_locale( "' + locale + ") = " + E);
-	}
+ } catch(E) {
+  alert('FIXME: util.mozilla.change_locale( "' + locale + ") = " + E);
+ }
 }
 
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/network.js b/Open-ILS/xul/staff_client/chrome/content/util/network.js
index 7b48545b89..91d4e4edc5 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/network.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/network.js
@@ -6,88 +6,88 @@ var offlineStrings;
 if (typeof util == 'undefined') util = {};
 util.network = function () {
 
-	JSAN.use('util.error'); this.error = new util.error();
-	JSAN.use('util.sound'); this.sound = new util.sound();
+ JSAN.use('util.error'); this.error = new util.error();
+ JSAN.use('util.sound'); this.sound = new util.sound();
 
     offlineStrings = document.getElementById('offlineStrings');
 
-	return this;
+ return this;
 };
 
 util.network.prototype = {
 
-	'link_id' : 0,
+ 'link_id' : 0,
 
     'network_timeout' : 55, /* seconds */
 
-	'NETWORK_FAILURE' : null,
-
-	'simple_request' : function(method_id,params,f,override_params) {
-		//var obj = this;
-		//var sparams = js2JSON(params);
-		//obj.error.sdump('D_SES','simple_request '+ method_id +' '+obj.error.pretty_print(sparams.slice(1,sparams.length-1))+
-		//	'\noverride_params = ' + override_params + '\n');
-		if (typeof api[method_id] == 'undefined') {
-			throw( offlineStrings.getFormattedString('network.method_not_found.error', [method_id]) );
-		}
-		var secure = true; if (typeof api[method_id].secure != 'undefined') secure = api[method_id].secure;
-		return this.request(api[method_id].app,api[method_id].method,params,f,override_params,{ 'secure' : secure, 'method_id' : method_id });
-	},
-
-	'get_result' : function (req) {
-		var obj = this;
-		var result;
+ 'NETWORK_FAILURE' : null,
+
+ 'simple_request' : function(method_id,params,f,override_params) {
+  //var obj = this;
+  //var sparams = js2JSON(params);
+  //obj.error.sdump('D_SES','simple_request '+ method_id +' '+obj.error.pretty_print(sparams.slice(1,sparams.length-1))+
+  // '\noverride_params = ' + override_params + '\n');
+  if (typeof api[method_id] == 'undefined') {
+   throw( offlineStrings.getFormattedString('network.method_not_found.error', [method_id]) );
+  }
+  var secure = true; if (typeof api[method_id].secure != 'undefined') secure = api[method_id].secure;
+  return this.request(api[method_id].app,api[method_id].method,params,f,override_params,{ 'secure' : secure, 'method_id' : method_id });
+ },
+
+ 'get_result' : function (req) {
+  var obj = this;
+  var result;
         var fake_ilsevent_for_network_errors = { 'ilsevent' : -1, 'textcode' : offlineStrings.getString('network.server_or_method.error') }; 
-		try {
+  try {
             if (req.cancelled) {
                 result = fake_ilsevent_for_network_errors;
             } else {
-    			result = req.getResultObject();	
+       result = req.getResultObject(); 
             }
-		} catch(E) {
-			try {
-				if (instanceOf(E, NetworkFailure)) {
-					obj.NETWORK_FAILURE = E;
-				} else {
-					try { obj.NETWORK_FAILURE = js2JSON(E); } catch(F) { dump(F + '\n'); obj.NETWORK_FAILURE = E; };
-				}
-			} catch(I) { 
-				obj.NETWORK_FAILURE = offlineStrings.getString('network.unknown_status');
-			}
+  } catch(E) {
+   try {
+    if (instanceOf(E, NetworkFailure)) {
+     obj.NETWORK_FAILURE = E;
+    } else {
+     try { obj.NETWORK_FAILURE = js2JSON(E); } catch(F) { dump(F + '\n'); obj.NETWORK_FAILURE = E; };
+    }
+   } catch(I) { 
+    obj.NETWORK_FAILURE = offlineStrings.getString('network.unknown_status');
+   }
             result = fake_ilsevent_for_network_errors;
         }
-		return result;
-	},
-
-	'request' : function (app,name,params,f,override_params,_params) {
-
-		var obj = this;
-		
-		//var sparams = js2JSON(params);
-		//obj.error.sdump('D_SES','request '+ app + ' ' + name +' '+obj.error.pretty_print(sparams.slice(1,sparams.length-1))+
-		//	'\noverride_params = ' + override_params + '\n_params = ' + _params + '\n');
-
-		try { 
-
-			var request =  this._request(app,name,params,f,override_params,_params);
-			if (request) {
-				return this.get_result(request);
-			} else {
-				return null;
-			}
-	
-		} catch(E) {
-			alert('1: ' + E); 
-		}
-	},
-
-	'_request' : function (app,name,params,f,override_params,_params) {
-		var obj = this;
-		try {
-			var sparams = js2JSON(params);
-			obj.error.sdump('D_SES','_request '+app+' '+name+' '+obj.error.pretty_print(sparams.slice(1,sparams.length-1))+
-				'\noverride_params = ' + override_params + '\n_params = ' + _params +
-				'\nResult #' + (++obj.link_id) + ( f ? ' asynced' : ' synced' ) );
+  return result;
+ },
+
+ 'request' : function (app,name,params,f,override_params,_params) {
+
+  var obj = this;
+  
+  //var sparams = js2JSON(params);
+  //obj.error.sdump('D_SES','request '+ app + ' ' + name +' '+obj.error.pretty_print(sparams.slice(1,sparams.length-1))+
+  // '\noverride_params = ' + override_params + '\n_params = ' + _params + '\n');
+
+  try { 
+
+   var request =  this._request(app,name,params,f,override_params,_params);
+   if (request) {
+    return this.get_result(request);
+   } else {
+    return null;
+   }
+ 
+  } catch(E) {
+   alert('1: ' + E); 
+  }
+ },
+
+ '_request' : function (app,name,params,f,override_params,_params) {
+  var obj = this;
+  try {
+   var sparams = js2JSON(params);
+   obj.error.sdump('D_SES','_request '+app+' '+name+' '+obj.error.pretty_print(sparams.slice(1,sparams.length-1))+
+    '\noverride_params = ' + override_params + '\n_params = ' + _params +
+    '\nResult #' + (++obj.link_id) + ( f ? ' asynced' : ' synced' ) );
 
             if (document.getElementById('network_progress')) {
                 if (g && g.menu && g.menu.network_meter && typeof g.menu.network_meter.inc == 'function') g.menu.network_meter.inc(app,name);
@@ -95,21 +95,21 @@ util.network.prototype = {
                 if (xulG && xulG.network_meter && typeof xulG.network_meter.inc == 'function') xulG.network_meter.inc(app,name);
             }
 
-			var request = new RemoteRequest( app, name );
-			if (_params && _params.secure) {
-				request.setSecure(true);
-			} else {
-				request.setSecure(false);
-			}
-			for(var index in params) {
-				request.addParam(params[index]);
-			}
-
-            var start_timer = (new Date).getTime();	
-			if (f)  {
-				request.setCompleteCallback(
-					function(req) {
-						try {
+   var request = new RemoteRequest( app, name );
+   if (_params && _params.secure) {
+    request.setSecure(true);
+   } else {
+    request.setSecure(false);
+   }
+   for(var index in params) {
+    request.addParam(params[index]);
+   }
+
+            var start_timer = (new Date).getTime(); 
+   if (f)  {
+    request.setCompleteCallback(
+     function(req) {
+      try {
                             var duration = ( (new Date).getTime() - start_timer )/1000;
                             if ( obj.get_result(req) == null && duration > obj.network_timeout ) req.cancelled = true;
 
@@ -119,38 +119,38 @@ util.network.prototype = {
                                 if (xulG && xulG.network_meter && typeof xulG.network_meter.dec == 'function') xulG.network_meter.dec(app,name);
                             }
 
-							var json_string = js2JSON(obj.get_result(req));
-							obj.error.sdump('D_SES_RESULT','asynced result #' 
-								+ obj.link_id + '\n\n' 
-								+ (json_string.length > 80 ? obj.error.pretty_print(json_string) : json_string) 
-								+ '\n\nOriginal Request:\n\n' 
-								+ 'request '+app+' '+name+' '+ sparams.slice(1,sparams.length-1));
-							req = obj.rerequest_on_session_timeout(app,name,params,req,override_params,_params);
-							req = obj.rerequest_on_perm_failure(app,name,params,req,override_params,_params);
-							if (override_params) {
-								req = obj.rerequest_on_override(app,name,params,req,override_params,_params);
-							}
-							req = obj.check_for_offline(app,name,params,req,override_params,_params);
-							f(req);
-							obj.NETWORK_FAILURE = null;
-						} catch(E) {
-							try {
-								E.ilsevent = -2;
-								E.textcode = offlineStrings.getString('network.server_or_method.error');
-							} catch(F) {}
-							f( { 'getResultObject' : function() { return E; } } );
-						}
-					}
-				);
-				try {
-					request.send(false);
-				} catch(E) {
-					throw(E);
-				}
-				return null;
-			} else {
-				try {
-					request.send(true);
+       var json_string = js2JSON(obj.get_result(req));
+       obj.error.sdump('D_SES_RESULT','asynced result #' 
+        + obj.link_id + '\n\n' 
+        + (json_string.length > 80 ? obj.error.pretty_print(json_string) : json_string) 
+        + '\n\nOriginal Request:\n\n' 
+        + 'request '+app+' '+name+' '+ sparams.slice(1,sparams.length-1));
+       req = obj.rerequest_on_session_timeout(app,name,params,req,override_params,_params);
+       req = obj.rerequest_on_perm_failure(app,name,params,req,override_params,_params);
+       if (override_params) {
+        req = obj.rerequest_on_override(app,name,params,req,override_params,_params);
+       }
+       req = obj.check_for_offline(app,name,params,req,override_params,_params);
+       f(req);
+       obj.NETWORK_FAILURE = null;
+      } catch(E) {
+       try {
+        E.ilsevent = -2;
+        E.textcode = offlineStrings.getString('network.server_or_method.error');
+       } catch(F) {}
+       f( { 'getResultObject' : function() { return E; } } );
+      }
+     }
+    );
+    try {
+     request.send(false);
+    } catch(E) {
+     throw(E);
+    }
+    return null;
+   } else {
+    try {
+     request.send(true);
                     var duration = ( (new Date).getTime() - start_timer )/1000;
                     if ( obj.get_result(request) == null && duration > obj.network_timeout ) request.cancelled = true;
 
@@ -160,35 +160,35 @@ util.network.prototype = {
                         if (xulG && xulG.network_meter && typeof xulG.network_meter.dec == 'function') xulG.network_meter.dec(app,name);
                     }
 
-				} catch(E) {
-					throw(E);
-				}
-				var result = obj.get_result(request);
-				var json_string = js2JSON(result);
-				this.error.sdump('D_SES_RESULT','synced result #' 
-					+ obj.link_id + '\n\n' + ( json_string.length > 80 ? obj.error.pretty_print(json_string) : json_string ) 
-					+ '\n\nOriginal Request:\n\n' 
-					+ 'request '+app+' '+name+' '+ sparams.slice(1,sparams.length-1));
-				request = obj.rerequest_on_session_timeout(app,name,params,request,override_params,_params);
-				request = obj.rerequest_on_perm_failure(app,name,params,request,override_params,_params);
-				if (override_params) {
-					request = obj.rerequest_on_override(app,name,params,request,override_params,_params);
-				}
-				request = obj.check_for_offline(app,name,params,request,override_params,_params);
-				obj.NETWORK_FAILURE = null;
-				return request;
-			}
-
-		} catch(E) {
-			alert('2: ' + E);
-			if (instanceOf(E,perm_ex)) {
-				alert('in util.network, _request : permission exception: ' + js2JSON(E));
-			}
-			throw(E);
-		}
-	},
-
-	'check_for_offline' : function (app,name,params,req,override_params,_params) {
+    } catch(E) {
+     throw(E);
+    }
+    var result = obj.get_result(request);
+    var json_string = js2JSON(result);
+    this.error.sdump('D_SES_RESULT','synced result #' 
+     + obj.link_id + '\n\n' + ( json_string.length > 80 ? obj.error.pretty_print(json_string) : json_string ) 
+     + '\n\nOriginal Request:\n\n' 
+     + 'request '+app+' '+name+' '+ sparams.slice(1,sparams.length-1));
+    request = obj.rerequest_on_session_timeout(app,name,params,request,override_params,_params);
+    request = obj.rerequest_on_perm_failure(app,name,params,request,override_params,_params);
+    if (override_params) {
+     request = obj.rerequest_on_override(app,name,params,request,override_params,_params);
+    }
+    request = obj.check_for_offline(app,name,params,request,override_params,_params);
+    obj.NETWORK_FAILURE = null;
+    return request;
+   }
+
+  } catch(E) {
+   alert('2: ' + E);
+   if (instanceOf(E,perm_ex)) {
+    alert('in util.network, _request : permission exception: ' + js2JSON(E));
+   }
+   throw(E);
+  }
+ },
+
+ 'check_for_offline' : function (app,name,params,req,override_params,_params) {
         try {
             var obj = this;
             var result = obj.get_result(req);
@@ -262,64 +262,64 @@ util.network.prototype = {
                 }
             }
         } catch(E) {
-			alert('4: ' + E);
+   alert('4: ' + E);
             throw(E);
         }
-	},
-
-	'reset_titlebars' : function(data) {
-		var obj = this;
-		data.stash_retrieve();
-		try {
-			JSAN.use('util.window'); var win =  new util.window();
-			var windowManager = Components.classes["@mozilla.org/appshell/window-mediator;1"].getService();
-			var windowManagerInterface = windowManager.QueryInterface(Components.interfaces.nsIWindowMediator);
-			var enumerator = windowManagerInterface.getEnumerator(null);
-
-			var w; // set title on all appshell windows
-			while ( w = enumerator.getNext() ) {
-				if (w.document.title.match(/^\d/)) {
-					w.document.title = 
-						win.appshell_name_increment() 
-						+ ': ' + data.list.au[0].usrname() 
-						+ '@' + data.ws_name;
-						+ '.' + data.server_unadorned 
-				}
-			}
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert(offlineStrings.getString('network.window_title.error'),E);
-		}
-	},
-
-	'get_new_session' : function(name,xulG,text) {
-		var obj = this;
-		try {
-
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
-		var url = urls.XUL_AUTH_SIMPLE;
-		if (typeof xulG != 'undefined' && typeof xulG.url_prefix == 'function') url = xulG.url_prefix( url );
-		JSAN.use('util.window'); var win = new util.window();
-		var my_xulG = win.open(
-			url,
-			//+ '?login_type=staff'
-			//+ '&desc_brief=' + window.escape( text ? 'Session Expired' : 'Operator Change' )
-			//+ '&desc_full=' + window.escape( text ? 'Please enter the credentials for a new login session.' : 'Please enter the credentials for the new login session.  Note that the previous session is still active.'),
-			//'simple_auth' + (new Date()).toString(),
-			offlineStrings.getString('network.new_session.authorize'),
-			'chrome,resizable,modal,width=700,height=500',
-			{
-				'login_type' : 'staff',
-				'desc_brief' : text ? offlineStrings.getString('network.new_session.expired') : offlineStrings.getString('network.new_session.operator_change'),
-				'desc_full' : text ? offlineStrings.getString('network.new_session.expired.prompt') : offlineStrings.getString('network.new_session.operator_change.prompt')
-				//'simple_auth' : (new Date()).toString(),
-			}
-		);
-		JSAN.use('OpenILS.data');
-		var data = new OpenILS.data(); data.init({'via':'stash'});
-		if (typeof data.temporary_session != 'undefined' && data.temporary_session != '') {
-			data.session.key = data.temporary_session.key; 
-			data.session.authtime = data.temporary_session.authtime; 
-			data.stash('session');
+ },
+
+ 'reset_titlebars' : function(data) {
+  var obj = this;
+  data.stash_retrieve();
+  try {
+   JSAN.use('util.window'); var win =  new util.window();
+   var windowManager = Components.classes["@mozilla.org/appshell/window-mediator;1"].getService();
+   var windowManagerInterface = windowManager.QueryInterface(Components.interfaces.nsIWindowMediator);
+   var enumerator = windowManagerInterface.getEnumerator(null);
+
+   var w; // set title on all appshell windows
+   while ( w = enumerator.getNext() ) {
+    if (w.document.title.match(/^\d/)) {
+     w.document.title = 
+      win.appshell_name_increment() 
+      + ': ' + data.list.au[0].usrname() 
+      + '@' + data.ws_name;
+      + '.' + data.server_unadorned 
+    }
+   }
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert(offlineStrings.getString('network.window_title.error'),E);
+  }
+ },
+
+ 'get_new_session' : function(name,xulG,text) {
+  var obj = this;
+  try {
+
+  netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
+  var url = urls.XUL_AUTH_SIMPLE;
+  if (typeof xulG != 'undefined' && typeof xulG.url_prefix == 'function') url = xulG.url_prefix( url );
+  JSAN.use('util.window'); var win = new util.window();
+  var my_xulG = win.open(
+   url,
+   //+ '?login_type=staff'
+   //+ '&desc_brief=' + window.escape( text ? 'Session Expired' : 'Operator Change' )
+   //+ '&desc_full=' + window.escape( text ? 'Please enter the credentials for a new login session.' : 'Please enter the credentials for the new login session.  Note that the previous session is still active.'),
+   //'simple_auth' + (new Date()).toString(),
+   offlineStrings.getString('network.new_session.authorize'),
+   'chrome,resizable,modal,width=700,height=500',
+   {
+    'login_type' : 'staff',
+    'desc_brief' : text ? offlineStrings.getString('network.new_session.expired') : offlineStrings.getString('network.new_session.operator_change'),
+    'desc_full' : text ? offlineStrings.getString('network.new_session.expired.prompt') : offlineStrings.getString('network.new_session.operator_change.prompt')
+    //'simple_auth' : (new Date()).toString(),
+   }
+  );
+  JSAN.use('OpenILS.data');
+  var data = new OpenILS.data(); data.init({'via':'stash'});
+  if (typeof data.temporary_session != 'undefined' && data.temporary_session != '') {
+   data.session.key = data.temporary_session.key; 
+   data.session.authtime = data.temporary_session.authtime; 
+   data.stash('session');
             try {
                 var ios = Components.classes["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService);
                 var cookieUri = ios.newURI("http://" + data.server_unadorned, null, null);
@@ -332,165 +332,165 @@ util.network.prototype = {
             } catch(E) {
                 alert(offineStrings.getFormattedString('main.session_cookie.error', [E]));
             }
-			if (! data.list.au ) data.list.au = [];
-			data.list.au[0] = JSON2js( data.temporary_session.usr );
-			data.stash('list');
-			obj.reset_titlebars(data);
-			return true;
+   if (! data.list.au ) data.list.au = [];
+   data.list.au[0] = JSON2js( data.temporary_session.usr );
+   data.stash('list');
+   obj.reset_titlebars(data);
+   return true;
         } else {
             obj.error.sdump('D_TRACE','No new session key after simple_auth in util/network\n');
         }
-		return false;
-
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert('util.network.get_new_session',E);
-		}
-	},
-
-	'rerequest_on_session_timeout' : function(app,name,params,req,override_params,_params) {
-		try {
-			var obj = this;
-			var robj = obj.get_result(req);
-			if (robj != null && robj.ilsevent && robj.ilsevent == 1001) {
-
-				if (obj.get_new_session(name,undefined,true)) {
-					JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-					params[0] = data.session.key;
-					req = obj._request(app,name,params,null,override_params,_params);
-				}
-			}
-		} catch(E) {
-			this.error.standard_unexpected_error_alert('rerequest_on_session_timeout',E);
-		}
-		return req;
-	},
-	
-	'rerequest_on_perm_failure' : function(app,name,params,req,override_params,_params) {
-		try {
-			var obj = this;
-			var robj = obj.get_result(req);
-			if (robj != null && robj.ilsevent && robj.ilsevent == 5000) {
-				netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
-				if (location.href.match(/^chrome/)) {
-					//alert('Permission denied.');
-				} else {
-					JSAN.use('util.window'); var win = new util.window();
-					var my_xulG = win.open(
-						urls.XUL_AUTH_SIMPLE,
-						//+ '?login_type=temp'
-						//+ '&desc_brief=' + window.escape('Permission Denied: ' + robj.ilsperm)
-						//+ '&desc_full=' + window.escape('Another staff member with the above permission may authorize this specific action.  Please notify your library administrator if you need this permission.  If you feel you have received this exception in error, inform your friendly Evergreen developers of the above permission and this debug information: ' + name),
-						//'simple_auth' + (new Date()).toString(),
-						offlineStrings.getFormattedString('network.permission.authorize'),
-						'chrome,resizable,modal,width=700,height=500',
-						{
-							'login_type' : 'temp',
-							'desc_brief' : offlineStrings.getFormattedString('network.permission.description.brief', [robj.ilsperm]),
-							'desc_full' : offlineStrings.getFormattedString('network.permission.description.full', [name])
-							//'simple_auth' : (new Date()).toString(),
-						}
-					);
-					JSAN.use('OpenILS.data');
-					//var data = new OpenILS.data(); data.init({'via':'stash'});
-					if (typeof my_xulG.temporary_session != 'undefined' && my_xulG.temporary_session != '') {
-						params[0] = my_xulG.temporary_session.key;
-						req = obj._request(app,name,params,null,override_params,_params);
-					}
-				}
-			}
-		} catch(E) {
-			this.error.sdump('D_ERROR',E);
-		}
-		return req;
-	},
-
-	'rerequest_on_override' : function (app,name,params,req,override_params,_params) {
-		var obj = this;
-		try {
-			if (!override_params.text) override_params.text = {};
-			function override(r) {
-				try {
-					netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
-					obj.sound.bad();
-					var xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">' + 
-						'<groupbox><caption label="' + offlineStrings.getString('network.override.exceptions') + '"/>' + 
-						'<grid><columns><column/><column/></columns><rows>';
-					for (var i = 0; i < r.length; i++) {
-						var t1 = String(r[i].ilsevent).replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
-						var t2 = String(r[i].textcode).replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
-						var t3 = String((override_params.text[r[i].ilsevent] ? override_params.text[r[i].ilsevent](r[i]) : '')).replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
-						var t4 = String(r[i].desc).replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
-						xml += '<row>' + 
-							'<description style="color: red" tooltiptext="' + t1 + '">' + t2 + '</description>' + 
-							'<description>' + t3 + '</description>' + 
-							'</row><row>' + '<description>' + t4 + '</description>' + '</row>';
-					}
-					xml += '</rows></grid></groupbox><groupbox><caption label="' + offlineStrings.getString('network.override.override') +'"/><hbox>' + 
-						'<description>' + offlineStrings.getString('network.override.force.prompt') + '</description>' + 
-						'<button accesskey="' + offlineStrings.getString('common.no.accesskey') + '" label="' + offlineStrings.getString('common.no') + '" name="fancy_cancel"/>' + 
-						'<button id="override" accesskey="' + offlineStrings.getString('common.yes.accesskey') + '" label="' + offlineStrings.getString('common.yes') + '" name="fancy_submit" value="override"/></hbox></groupbox></vbox>';
-					//JSAN.use('OpenILS.data');
-					//var data = new OpenILS.data(); data.init({'via':'stash'});
-					//data.temp_override_xml = xml; data.stash('temp_override_xml');
-					JSAN.use('util.window'); var win = new util.window();
-					var fancy_prompt_data = win.open(
-						urls.XUL_FANCY_PROMPT,
-						//+ '?xml_in_stash=temp_override_xml'
-						//+ '&title=' + window.escape(override_params.title),
-						'fancy_prompt', 'chrome,resizable,modal,width=700,height=500',
-						{ 'xml' : xml, 'title' : override_params.title }
-					);
-					if (fancy_prompt_data.fancy_status == 'complete') {
-						req = obj._request(app,name + '.override',params);
-					}
-					return req;
-				} catch(E) {
-					alert('in util.network, rerequest_on_override, override:' + E);
-				}
-			}
-
-			var result = obj.get_result(req);
-			if (!result) return req;
-
-			if ( (typeof result.ilsevent != 'undefined') && (override_params.overridable_events.indexOf( result.ilsevent == null ? null : Number(result.ilsevent) ) != -1) ) {
-				req = override([result]);
-			} else {
-				var found_good = false; var found_bad = false;
-				for (var i = 0; i < result.length; i++) {
-					if ( (result[i].ilsevent != 'undefined') && (override_params.overridable_events.indexOf( result[i].ilsevent == null ? null : Number(result[i].ilsevent) ) != -1) ) {
-						found_good = true;
-					} else {
-						found_bad = true;
-					}
-				}
-				if (found_good && (!found_bad)) req = override(result);
-			}
-
-			return req;
-		} catch(E) {
-			throw(E);
-		}
-	},
+  return false;
+
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert('util.network.get_new_session',E);
+  }
+ },
+
+ 'rerequest_on_session_timeout' : function(app,name,params,req,override_params,_params) {
+  try {
+   var obj = this;
+   var robj = obj.get_result(req);
+   if (robj != null && robj.ilsevent && robj.ilsevent == 1001) {
+
+    if (obj.get_new_session(name,undefined,true)) {
+     JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+     params[0] = data.session.key;
+     req = obj._request(app,name,params,null,override_params,_params);
+    }
+   }
+  } catch(E) {
+   this.error.standard_unexpected_error_alert('rerequest_on_session_timeout',E);
+  }
+  return req;
+ },
+ 
+ 'rerequest_on_perm_failure' : function(app,name,params,req,override_params,_params) {
+  try {
+   var obj = this;
+   var robj = obj.get_result(req);
+   if (robj != null && robj.ilsevent && robj.ilsevent == 5000) {
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
+    if (location.href.match(/^chrome/)) {
+     //alert('Permission denied.');
+    } else {
+     JSAN.use('util.window'); var win = new util.window();
+     var my_xulG = win.open(
+      urls.XUL_AUTH_SIMPLE,
+      //+ '?login_type=temp'
+      //+ '&desc_brief=' + window.escape('Permission Denied: ' + robj.ilsperm)
+      //+ '&desc_full=' + window.escape('Another staff member with the above permission may authorize this specific action.  Please notify your library administrator if you need this permission.  If you feel you have received this exception in error, inform your friendly Evergreen developers of the above permission and this debug information: ' + name),
+      //'simple_auth' + (new Date()).toString(),
+      offlineStrings.getFormattedString('network.permission.authorize'),
+      'chrome,resizable,modal,width=700,height=500',
+      {
+       'login_type' : 'temp',
+       'desc_brief' : offlineStrings.getFormattedString('network.permission.description.brief', [robj.ilsperm]),
+       'desc_full' : offlineStrings.getFormattedString('network.permission.description.full', [name])
+       //'simple_auth' : (new Date()).toString(),
+      }
+     );
+     JSAN.use('OpenILS.data');
+     //var data = new OpenILS.data(); data.init({'via':'stash'});
+     if (typeof my_xulG.temporary_session != 'undefined' && my_xulG.temporary_session != '') {
+      params[0] = my_xulG.temporary_session.key;
+      req = obj._request(app,name,params,null,override_params,_params);
+     }
+    }
+   }
+  } catch(E) {
+   this.error.sdump('D_ERROR',E);
+  }
+  return req;
+ },
+
+ 'rerequest_on_override' : function (app,name,params,req,override_params,_params) {
+  var obj = this;
+  try {
+   if (!override_params.text) override_params.text = {};
+   function override(r) {
+    try {
+     netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
+     obj.sound.bad();
+     var xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">' + 
+      '<groupbox><caption label="' + offlineStrings.getString('network.override.exceptions') + '"/>' + 
+      '<grid><columns><column/><column/></columns><rows>';
+     for (var i = 0; i < r.length; i++) {
+      var t1 = String(r[i].ilsevent).replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
+      var t2 = String(r[i].textcode).replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
+      var t3 = String((override_params.text[r[i].ilsevent] ? override_params.text[r[i].ilsevent](r[i]) : '')).replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
+      var t4 = String(r[i].desc).replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
+      xml += '<row>' + 
+       '<description style="color: red" tooltiptext="' + t1 + '">' + t2 + '</description>' + 
+       '<description>' + t3 + '</description>' + 
+       '</row><row>' + '<description>' + t4 + '</description>' + '</row>';
+     }
+     xml += '</rows></grid></groupbox><groupbox><caption label="' + offlineStrings.getString('network.override.override') +'"/><hbox>' + 
+      '<description>' + offlineStrings.getString('network.override.force.prompt') + '</description>' + 
+      '<button accesskey="' + offlineStrings.getString('common.no.accesskey') + '" label="' + offlineStrings.getString('common.no') + '" name="fancy_cancel"/>' + 
+      '<button id="override" accesskey="' + offlineStrings.getString('common.yes.accesskey') + '" label="' + offlineStrings.getString('common.yes') + '" name="fancy_submit" value="override"/></hbox></groupbox></vbox>';
+     //JSAN.use('OpenILS.data');
+     //var data = new OpenILS.data(); data.init({'via':'stash'});
+     //data.temp_override_xml = xml; data.stash('temp_override_xml');
+     JSAN.use('util.window'); var win = new util.window();
+     var fancy_prompt_data = win.open(
+      urls.XUL_FANCY_PROMPT,
+      //+ '?xml_in_stash=temp_override_xml'
+      //+ '&title=' + window.escape(override_params.title),
+      'fancy_prompt', 'chrome,resizable,modal,width=700,height=500',
+      { 'xml' : xml, 'title' : override_params.title }
+     );
+     if (fancy_prompt_data.fancy_status == 'complete') {
+      req = obj._request(app,name + '.override',params);
+     }
+     return req;
+    } catch(E) {
+     alert('in util.network, rerequest_on_override, override:' + E);
+    }
+   }
+
+   var result = obj.get_result(req);
+   if (!result) return req;
+
+   if ( (typeof result.ilsevent != 'undefined') && (override_params.overridable_events.indexOf( result.ilsevent == null ? null : Number(result.ilsevent) ) != -1) ) {
+    req = override([result]);
+   } else {
+    var found_good = false; var found_bad = false;
+    for (var i = 0; i < result.length; i++) {
+     if ( (result[i].ilsevent != 'undefined') && (override_params.overridable_events.indexOf( result[i].ilsevent == null ? null : Number(result[i].ilsevent) ) != -1) ) {
+      found_good = true;
+     } else {
+      found_bad = true;
+     }
+    }
+    if (found_good && (!found_bad)) req = override(result);
+   }
+
+   return req;
+  } catch(E) {
+   throw(E);
+  }
+ },
 
     'ping' : function() {
         try {
             JSAN.use('util.file'); JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-			var file = new util.file('ping.bat');
+   var file = new util.file('ping.bat');
             var path = file._file.path;
-			file.write_content('truncate+exec',
+   file.write_content('truncate+exec',
                 '#!/bin/sh\n' +
                 'ping -n 15 ' + data.server_unadorned + ' > "' + path + '.txt"\n' + /* windows */
                 'ping -c 15 ' + data.server_unadorned + ' >> "' + path + '.txt"\n'  /* unix */
             );
             file.close();
-			file = new util.file('ping.bat');
+   file = new util.file('ping.bat');
 
-			var process = Components.classes["@mozilla.org/process/util;1"].createInstance(Components.interfaces.nsIProcess);
-			process.init(file._file);
+   var process = Components.classes["@mozilla.org/process/util;1"].createInstance(Components.interfaces.nsIProcess);
+   process.init(file._file);
 
-			var args = [];
+   var args = [];
 
-			dump('process.run = ' + process.run(true, args, args.length) + '\n');
+   dump('process.run = ' + process.run(true, args, args.length) + '\n');
 
             file.close();
 
@@ -507,7 +507,7 @@ util.network.prototype = {
 
 /*
 function sample_callback(request) {
-	var result = request.getResultObject();
+ var result = request.getResultObject();
 }
 */
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/print.js b/Open-ILS/xul/staff_client/chrome/content/util/print.js
index a00f3eeebf..7bc70cc300 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/print.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/print.js
@@ -3,456 +3,456 @@ dump('entering util/print.js\n');
 if (typeof util == 'undefined') util = {};
 util.print = function () {
 
-	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
-	JSAN.use('util.error'); this.error = new util.error();
-	JSAN.use('OpenILS.data'); this.data = new OpenILS.data(); this.data.init( { 'via':'stash' } );
-	JSAN.use('util.window'); this.win = new util.window();
-	JSAN.use('util.functional');
-	JSAN.use('util.file');
+ JSAN.use('util.error'); this.error = new util.error();
+ JSAN.use('OpenILS.data'); this.data = new OpenILS.data(); this.data.init( { 'via':'stash' } );
+ JSAN.use('util.window'); this.win = new util.window();
+ JSAN.use('util.functional');
+ JSAN.use('util.file');
 
-	return this;
+ return this;
 };
 
 util.print.prototype = {
 
-	'reprint_last' : function() {
-		try {
-			var obj = this; obj.data.init({'via':'stash'});
-			if (!obj.data.last_print) {
-				alert('Nothing to re-print');
-				return;
-			}
-			var msg = obj.data.last_print.msg;
-			var params = obj.data.last_print.params; params.no_prompt = false;
-			obj.simple( msg, params );
-		} catch(E) {
-			this.error.standard_unexpected_error_alert('util.print.reprint_last',E);
-		}
-	},
-
-	'simple' : function(msg,params) {
-		try {
-			if (!params) params = {};
-
-			var obj = this;
-
-			obj.data.last_print = { 'msg' : msg, 'params' : params}; obj.data.stash('last_print');
-
-			var silent = false;
-			if ( params && params.no_prompt && (params.no_prompt == true || params.no_prompt == 'true') ) {
-				silent = true;
-			}
-
-			var content_type;
-			if (params && params.content_type) {
-				content_type = params.content_type;
-			} else {
-				content_type = 'text/html';
-			}
-
-			var w;
-
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			obj.data.init({'via':'stash'});
-
-			if (params.print_strategy || obj.data.print_strategy) {
-
-				switch(params.print_strategy || obj.data.print_strategy) {
-					case 'dos.print':
-						/* FIXME - this it a kludge.. we're going to sidestep window-based html rendering for printing */
-						/* I'm using regexps to mangle the html receipt templates; it'd be nice to use xsl but the */
-						/* templates aren't guaranteed to be valid xml */
-						if (content_type=='text/html') {
-							w = msg.replace(/<br.*?>/gi,'\r\n').replace(/<table.*?>/gi,'\r\n').replace(/<tr.*?>/gi,'\r\n').replace(/<hr.*?>/gi,'\r\n').replace(/<p.*?>/gi,'\r\n').replace(/<block.*?>/gi,'\r\n').replace(/<li.*?>/gi,'\r\n * ').replace(/<.+?>/gi,'');
-						} else {
-							w = msg;
-						}
-						if (! params.no_form_feed) { w = w + '\r\n\r\n\r\n\r\n\r\n\r\n\f'; }
-						obj.NSPrint(w, silent, params);
-						return;
-					break;
-				}
-			}
-
-			switch(content_type) {
-				case 'text/html' :
-					var jsrc = 'data:text/javascript,' + window.escape('var params = { "data" : ' + js2JSON(params.data) + ', "list" : ' + js2JSON(params.list) + '}; function my_init() { if (typeof go_print == "function") { go_print(); } else { setTimeout( function() { if (typeof go_print == "function") { alert("Please tell the developers that the 2-second go_print workaround executed, and let them know whether this job printed successfully.  Thanks!"); go_print(); } else { alert("Please tell the developers that the 2-second go_print workaround did not work.  We will try to print one more time; there have been reports of wasted receipt paper at this point.  Please check the settings in the print dialog and/or prepare to power off your printer.  Thanks!"); window.print(); } }, 2000 ); } /* FIXME - mozilla bug#301560 - xpcom kills it too */ }');
-					w = obj.win.open('data:text/html,<html id="top"><head><script src="/xul/server/main/JSAN.js"></script><script src="' + window.escape(jsrc) + '"></script></head><body onload="try{my_init();}catch(E){alert(E);}">' + window.escape(msg) + '</body></html>','receipt_temp','chrome,resizable');
-					w.minimize();
-					w.go_print = function() { 
-						try {
-							obj.NSPrint(w, silent, params);
-						} catch(E) {
-							obj.error.standard_unexpected_error_alert("Print Error in util.print.simple.  After this dialog we'll try a second print attempt. content_type = " + content_type,E);
-							w.print();
-						}
-						w.minimize(); w.close();
-					}
-				break;
-				default:
-					w = obj.win.open('data:' + content_type + ',' + window.escape(msg),'receipt_temp','chrome,resizable');
-					w.minimize();
-					setTimeout(
-						function() {
-							try {
-								obj.NSPrint(w, silent, params);
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert("Print Error in util.print.simple.  After this dialog we'll try a second print attempt. content_type = " + content_type,E);
-								w.print();
-							}
-							w.minimize(); w.close();
-						}, 1000
-					);
-				break;
-			}
-
-		} catch(E) {
-			this.error.standard_unexpected_error_alert('util.print.simple',E);
-		}
-	},
-	
-	'tree_list' : function (params) { 
-		try {
-			dump('print.tree_list.params.list = \n' + this.error.pretty_print(js2JSON(params.list)) + '\n');
-		} catch(E) {
-			dump(E+'\n');
-		}
-		var cols = [];
-
-		var s = '';
-		if (params.header) s += this.template_sub( params.header, cols, params );
-		if (params.list) {
-			for (var i = 0; i < params.list.length; i++) {
-				params.row = params.list[i];
-				params.row_idx = i;
-				s += this.template_sub( params.line_item, cols, params );
-			}
-		}
-		if (params.footer) s += this.template_sub( params.footer, cols, params );
-
-		if (params.sample_frame) {
-			var jsrc = 'data:text/javascript,' + window.escape('var params = { "data" : ' + js2JSON(params.data) + ', "list" : ' + js2JSON(params.list) + '};');
-			params.sample_frame.setAttribute('src','data:text/html,<html id="top"><head><script src="' + window.escape(jsrc) + '"></script></head><body>' + window.escape(s) + '</body></html>');
-		} else {
-			this.simple(s,params);
-		}
-	},
-
-	'template_sub' : function( msg, cols, params ) {
-		if (!msg) { dump('template sub called with empty string\n'); return; }
-		JSAN.use('util.date');
-		var s = msg; var b;
-
-		try{b = s; s = s.replace(/%LINE_NO%/,Number(params.row_idx)+1);}
-			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
-
-		try{b = s; s = s.replace(/%patron_barcode%/,params.patron_barcode);}
-			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
-
-		try{b = s; s = s.replace(/%LIBRARY%/,params.lib.name());}
-			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
-		try{b = s; s = s.replace(/%PINES_CODE%/,params.lib.shortname());}
-			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
-		try{b = s; s = s.replace(/%SHORTNAME%/,params.lib.shortname());}
-			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
-		try{b = s; s = s.replace(/%STAFF_FIRSTNAME%/,params.staff.first_given_name());}
-			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
-		try{b = s; s = s.replace(/%STAFF_LASTNAME%/,params.staff.family_name());}
-			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
-		try{b = s; s = s.replace(/%STAFF_BARCODE%/,params.staff.barcode); }
-			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
-		try{b = s; s = s.replace(/%STAFF_PROFILE%/,obj.data.hash.pgt[ params.staff.profile() ].name() ); }
-			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
-		try{b = s; s = s.replace(/%PATRON_ALIAS_OR_FIRSTNAME%/,(params.patron.alias() == '' || params.patron.alias() == null) ? params.patron.first_given_name() : params.patron.alias());} 
-			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');} 
-		try{b = s; s = s.replace(/%PATRON_ALIAS%/,(params.patron.alias() == '' || params.patron.alias() == null) ? '' : params.patron.alias());} 
-			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');} 
-		try{b = s; s = s.replace(/%PATRON_FIRSTNAME%/,params.patron.first_given_name());}
-			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
-		try{b = s; s = s.replace(/%PATRON_LASTNAME%/,params.patron.family_name());}
-			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
-		try{b = s; s = s.replace(/%PATRON_BARCODE%/,typeof params.patron.card() == 'object' ? params.patron.card().barcode() : util.functional.find_id_object_in_list( params.patron.cards(), params.patron.card() ).barcode() ) ;}
-			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
-
-		try{b = s; s=s.replace(/%TODAY%/g,(new Date()));}
-			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
-		try{b = s; s=s.replace(/%TODAY_m%/g,(util.date.formatted_date(new Date(),'%m')));}
-			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
-		try{b = s; s=s.replace(/%TODAY_TRIM%/g,(util.date.formatted_date(new Date(),'')));}
-			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
-		try{b = s; s=s.replace(/%TODAY_d%/g,(util.date.formatted_date(new Date(),'%d')));}
-			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
-		try{b = s; s=s.replace(/%TODAY_Y%/g,(util.date.formatted_date(new Date(),'%Y')));}
-			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
-		try{b = s; s=s.replace(/%TODAY_H%/g,(util.date.formatted_date(new Date(),'%H')));}
-			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
-		try{b = s; s=s.replace(/%TODAY_I%/g,(util.date.formatted_date(new Date(),'%I')));}
-			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
-		try{b = s; s=s.replace(/%TODAY_M%/g,(util.date.formatted_date(new Date(),'%M')));}
-			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
-		try{b = s; s=s.replace(/%TODAY_D%/g,(util.date.formatted_date(new Date(),'%D')));}
-			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
-		try{b = s; s=s.replace(/%TODAY_F%/g,(util.date.formatted_date(new Date(),'%F')));}
-			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
-
-		try {
-			if (typeof params.row != 'undefined') {
-				if (params.row.length >= 0) {
-					alert('debug - please tell the developers that deprecated template code tried to execute');
-					for (var i = 0; i < cols.length; i++) {
-						var re = new RegExp(cols[i],"g");
-						try{b = s; s=s.replace(re, params.row[i]);}
-							catch(E){s = b; this.error.standard_unexpected_error_alert('string = <' + s + '> error = ' + js2JSON(E)+'\n',E);}
-					}
-				} else { 
-					/* for dump_with_keys */
-					for (var i in params.row) {
-						var re = new RegExp('%'+i+'%',"g");
-						try{b = s; s=s.replace(re, params.row[i]);}
-							catch(E){s = b; this.error.standard_unexpected_error_alert('string = <' + s + '> error = ' + js2JSON(E)+'\n',E);}
-					}
-				}
-			}
-
-			if (typeof params.data != 'undefined') {
-				for (var i in params.data) {
-					var re = new RegExp('%'+i+'%',"g");
-					try{b = s; s=s.replace(re, params.data[i]);}
-						catch(E){s = b; this.error.standard_unexpected_error_alert('string = <' + s + '> error = ' + js2JSON(E)+'\n',E);}
-				}
-			}
-		} catch(E) { dump(E+'\n'); }
-
-		return s;
-	},
-
-
-	'NSPrint' : function(w,silent,params) {
-		if (!w) w = window;
-		var obj = this;
-		try {
-			if (!params) params = {};
-
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			obj.data.init({'via':'stash'});
-
-			if (params.print_strategy || obj.data.print_strategy) {
-
-				switch(params.print_strategy || obj.data.print_strategy) {
-					case 'dos.print':
+ 'reprint_last' : function() {
+  try {
+   var obj = this; obj.data.init({'via':'stash'});
+   if (!obj.data.last_print) {
+    alert('Nothing to re-print');
+    return;
+   }
+   var msg = obj.data.last_print.msg;
+   var params = obj.data.last_print.params; params.no_prompt = false;
+   obj.simple( msg, params );
+  } catch(E) {
+   this.error.standard_unexpected_error_alert('util.print.reprint_last',E);
+  }
+ },
+
+ 'simple' : function(msg,params) {
+  try {
+   if (!params) params = {};
+
+   var obj = this;
+
+   obj.data.last_print = { 'msg' : msg, 'params' : params}; obj.data.stash('last_print');
+
+   var silent = false;
+   if ( params && params.no_prompt && (params.no_prompt == true || params.no_prompt == 'true') ) {
+    silent = true;
+   }
+
+   var content_type;
+   if (params && params.content_type) {
+    content_type = params.content_type;
+   } else {
+    content_type = 'text/html';
+   }
+
+   var w;
+
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   obj.data.init({'via':'stash'});
+
+   if (params.print_strategy || obj.data.print_strategy) {
+
+    switch(params.print_strategy || obj.data.print_strategy) {
+     case 'dos.print':
+      /* FIXME - this it a kludge.. we're going to sidestep window-based html rendering for printing */
+      /* I'm using regexps to mangle the html receipt templates; it'd be nice to use xsl but the */
+      /* templates aren't guaranteed to be valid xml */
+      if (content_type=='text/html') {
+       w = msg.replace(/<br.*?>/gi,'\r\n').replace(/<table.*?>/gi,'\r\n').replace(/<tr.*?>/gi,'\r\n').replace(/<hr.*?>/gi,'\r\n').replace(/<p.*?>/gi,'\r\n').replace(/<block.*?>/gi,'\r\n').replace(/<li.*?>/gi,'\r\n * ').replace(/<.+?>/gi,'');
+      } else {
+       w = msg;
+      }
+      if (! params.no_form_feed) { w = w + '\r\n\r\n\r\n\r\n\r\n\r\n\f'; }
+      obj.NSPrint(w, silent, params);
+      return;
+     break;
+    }
+   }
+
+   switch(content_type) {
+    case 'text/html' :
+     var jsrc = 'data:text/javascript,' + window.escape('var params = { "data" : ' + js2JSON(params.data) + ', "list" : ' + js2JSON(params.list) + '}; function my_init() { if (typeof go_print == "function") { go_print(); } else { setTimeout( function() { if (typeof go_print == "function") { alert("Please tell the developers that the 2-second go_print workaround executed, and let them know whether this job printed successfully.  Thanks!"); go_print(); } else { alert("Please tell the developers that the 2-second go_print workaround did not work.  We will try to print one more time; there have been reports of wasted receipt paper at this point.  Please check the settings in the print dialog and/or prepare to power off your printer.  Thanks!"); window.print(); } }, 2000 ); } /* FIXME - mozilla bug#301560 - xpcom kills it too */ }');
+     w = obj.win.open('data:text/html,<html id="top"><head><script src="/xul/server/main/JSAN.js"></script><script src="' + window.escape(jsrc) + '"></script></head><body onload="try{my_init();}catch(E){alert(E);}">' + window.escape(msg) + '</body></html>','receipt_temp','chrome,resizable');
+     w.minimize();
+     w.go_print = function() { 
+      try {
+       obj.NSPrint(w, silent, params);
+      } catch(E) {
+       obj.error.standard_unexpected_error_alert("Print Error in util.print.simple.  After this dialog we'll try a second print attempt. content_type = " + content_type,E);
+       w.print();
+      }
+      w.minimize(); w.close();
+     }
+    break;
+    default:
+     w = obj.win.open('data:' + content_type + ',' + window.escape(msg),'receipt_temp','chrome,resizable');
+     w.minimize();
+     setTimeout(
+      function() {
+       try {
+        obj.NSPrint(w, silent, params);
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert("Print Error in util.print.simple.  After this dialog we'll try a second print attempt. content_type = " + content_type,E);
+        w.print();
+       }
+       w.minimize(); w.close();
+      }, 1000
+     );
+    break;
+   }
+
+  } catch(E) {
+   this.error.standard_unexpected_error_alert('util.print.simple',E);
+  }
+ },
+ 
+ 'tree_list' : function (params) { 
+  try {
+   dump('print.tree_list.params.list = \n' + this.error.pretty_print(js2JSON(params.list)) + '\n');
+  } catch(E) {
+   dump(E+'\n');
+  }
+  var cols = [];
+
+  var s = '';
+  if (params.header) s += this.template_sub( params.header, cols, params );
+  if (params.list) {
+   for (var i = 0; i < params.list.length; i++) {
+    params.row = params.list[i];
+    params.row_idx = i;
+    s += this.template_sub( params.line_item, cols, params );
+   }
+  }
+  if (params.footer) s += this.template_sub( params.footer, cols, params );
+
+  if (params.sample_frame) {
+   var jsrc = 'data:text/javascript,' + window.escape('var params = { "data" : ' + js2JSON(params.data) + ', "list" : ' + js2JSON(params.list) + '};');
+   params.sample_frame.setAttribute('src','data:text/html,<html id="top"><head><script src="' + window.escape(jsrc) + '"></script></head><body>' + window.escape(s) + '</body></html>');
+  } else {
+   this.simple(s,params);
+  }
+ },
+
+ 'template_sub' : function( msg, cols, params ) {
+  if (!msg) { dump('template sub called with empty string\n'); return; }
+  JSAN.use('util.date');
+  var s = msg; var b;
+
+  try{b = s; s = s.replace(/%LINE_NO%/,Number(params.row_idx)+1);}
+   catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
+
+  try{b = s; s = s.replace(/%patron_barcode%/,params.patron_barcode);}
+   catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
+
+  try{b = s; s = s.replace(/%LIBRARY%/,params.lib.name());}
+   catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
+  try{b = s; s = s.replace(/%PINES_CODE%/,params.lib.shortname());}
+   catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
+  try{b = s; s = s.replace(/%SHORTNAME%/,params.lib.shortname());}
+   catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
+  try{b = s; s = s.replace(/%STAFF_FIRSTNAME%/,params.staff.first_given_name());}
+   catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
+  try{b = s; s = s.replace(/%STAFF_LASTNAME%/,params.staff.family_name());}
+   catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
+  try{b = s; s = s.replace(/%STAFF_BARCODE%/,params.staff.barcode); }
+   catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
+  try{b = s; s = s.replace(/%STAFF_PROFILE%/,obj.data.hash.pgt[ params.staff.profile() ].name() ); }
+   catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
+  try{b = s; s = s.replace(/%PATRON_ALIAS_OR_FIRSTNAME%/,(params.patron.alias() == '' || params.patron.alias() == null) ? params.patron.first_given_name() : params.patron.alias());} 
+   catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');} 
+  try{b = s; s = s.replace(/%PATRON_ALIAS%/,(params.patron.alias() == '' || params.patron.alias() == null) ? '' : params.patron.alias());} 
+   catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');} 
+  try{b = s; s = s.replace(/%PATRON_FIRSTNAME%/,params.patron.first_given_name());}
+   catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
+  try{b = s; s = s.replace(/%PATRON_LASTNAME%/,params.patron.family_name());}
+   catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
+  try{b = s; s = s.replace(/%PATRON_BARCODE%/,typeof params.patron.card() == 'object' ? params.patron.card().barcode() : util.functional.find_id_object_in_list( params.patron.cards(), params.patron.card() ).barcode() ) ;}
+   catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
+
+  try{b = s; s=s.replace(/%TODAY%/g,(new Date()));}
+   catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
+  try{b = s; s=s.replace(/%TODAY_m%/g,(util.date.formatted_date(new Date(),'%m')));}
+   catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
+  try{b = s; s=s.replace(/%TODAY_TRIM%/g,(util.date.formatted_date(new Date(),'')));}
+   catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
+  try{b = s; s=s.replace(/%TODAY_d%/g,(util.date.formatted_date(new Date(),'%d')));}
+   catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
+  try{b = s; s=s.replace(/%TODAY_Y%/g,(util.date.formatted_date(new Date(),'%Y')));}
+   catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
+  try{b = s; s=s.replace(/%TODAY_H%/g,(util.date.formatted_date(new Date(),'%H')));}
+   catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
+  try{b = s; s=s.replace(/%TODAY_I%/g,(util.date.formatted_date(new Date(),'%I')));}
+   catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
+  try{b = s; s=s.replace(/%TODAY_M%/g,(util.date.formatted_date(new Date(),'%M')));}
+   catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
+  try{b = s; s=s.replace(/%TODAY_D%/g,(util.date.formatted_date(new Date(),'%D')));}
+   catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
+  try{b = s; s=s.replace(/%TODAY_F%/g,(util.date.formatted_date(new Date(),'%F')));}
+   catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
+
+  try {
+   if (typeof params.row != 'undefined') {
+    if (params.row.length >= 0) {
+     alert('debug - please tell the developers that deprecated template code tried to execute');
+     for (var i = 0; i < cols.length; i++) {
+      var re = new RegExp(cols[i],"g");
+      try{b = s; s=s.replace(re, params.row[i]);}
+       catch(E){s = b; this.error.standard_unexpected_error_alert('string = <' + s + '> error = ' + js2JSON(E)+'\n',E);}
+     }
+    } else { 
+     /* for dump_with_keys */
+     for (var i in params.row) {
+      var re = new RegExp('%'+i+'%',"g");
+      try{b = s; s=s.replace(re, params.row[i]);}
+       catch(E){s = b; this.error.standard_unexpected_error_alert('string = <' + s + '> error = ' + js2JSON(E)+'\n',E);}
+     }
+    }
+   }
+
+   if (typeof params.data != 'undefined') {
+    for (var i in params.data) {
+     var re = new RegExp('%'+i+'%',"g");
+     try{b = s; s=s.replace(re, params.data[i]);}
+      catch(E){s = b; this.error.standard_unexpected_error_alert('string = <' + s + '> error = ' + js2JSON(E)+'\n',E);}
+    }
+   }
+  } catch(E) { dump(E+'\n'); }
+
+  return s;
+ },
+
+
+ 'NSPrint' : function(w,silent,params) {
+  if (!w) w = window;
+  var obj = this;
+  try {
+   if (!params) params = {};
+
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   obj.data.init({'via':'stash'});
+
+   if (params.print_strategy || obj.data.print_strategy) {
+
+    switch(params.print_strategy || obj.data.print_strategy) {
+     case 'dos.print':
                         if (typeof w != 'string') {
-			                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-                			w.getSelection().selectAllChildren(w.document.firstChild);
-                			w = w.getSelection().toString();
+                   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                   w.getSelection().selectAllChildren(w.document.firstChild);
+                   w = w.getSelection().toString();
                         }
-						obj._NSPrint_dos_print(w,silent,params);
-					break;	
-					case 'window.print':
-						w.print();
-					break;	
-					case 'webBrowserPrint':
-						obj._NSPrint_webBrowserPrint(w,silent,params);
-					break;	
-					default:
-						//w.print();
-						obj._NSPrint_webBrowserPrint(w,silent,params);
-					break;	
-				}
-
-			} else {
-				//w.print();
-				obj._NSPrint_webBrowserPrint(w,silent,params);
-			}
-
-		} catch (e) {
-			alert('Probably not printing: ' + e);
-			this.error.sdump('D_ERROR','PRINT EXCEPTION: ' + js2JSON(e) + '\n');
-		}
-
-	},
-
-	'_NSPrint_dos_print' : function(w,silent,params) {
-		var obj = this;
-		try {
-
-			/* OLD way: This is a kludge/workaround.  webBrowserPrint doesn't always work.  So we're going to let
-				the html window handle our receipt template rendering, and then force a selection of all
-				the text nodes and dump that to a file, for printing through a dos utility */
-
-			/* NEW way: we just pass in the text */
-
-			var text = w;
-
-			var file = new util.file('receipt.txt');
-			file.write_content('truncate',text); 
+      obj._NSPrint_dos_print(w,silent,params);
+     break; 
+     case 'window.print':
+      w.print();
+     break; 
+     case 'webBrowserPrint':
+      obj._NSPrint_webBrowserPrint(w,silent,params);
+     break; 
+     default:
+      //w.print();
+      obj._NSPrint_webBrowserPrint(w,silent,params);
+     break; 
+    }
+
+   } else {
+    //w.print();
+    obj._NSPrint_webBrowserPrint(w,silent,params);
+   }
+
+  } catch (e) {
+   alert('Probably not printing: ' + e);
+   this.error.sdump('D_ERROR','PRINT EXCEPTION: ' + js2JSON(e) + '\n');
+  }
+
+ },
+
+ '_NSPrint_dos_print' : function(w,silent,params) {
+  var obj = this;
+  try {
+
+   /* OLD way: This is a kludge/workaround.  webBrowserPrint doesn't always work.  So we're going to let
+    the html window handle our receipt template rendering, and then force a selection of all
+    the text nodes and dump that to a file, for printing through a dos utility */
+
+   /* NEW way: we just pass in the text */
+
+   var text = w;
+
+   var file = new util.file('receipt.txt');
+   file.write_content('truncate',text); 
             var path = file._file.path;
             file.close();
-			
-			file = new util.file('receipt.bat');
-			file.write_content('truncate+exec','#!/bin/sh\ncopy "' + path + '" lpt1 /b\nlpr ' + path + '\n');
+   
+   file = new util.file('receipt.bat');
+   file.write_content('truncate+exec','#!/bin/sh\ncopy "' + path + '" lpt1 /b\nlpr ' + path + '\n');
             file.close();
-			file = new util.file('receipt.bat');
+   file = new util.file('receipt.bat');
 
-			var process = Components.classes["@mozilla.org/process/util;1"].createInstance(Components.interfaces.nsIProcess);
-			process.init(file._file);
+   var process = Components.classes["@mozilla.org/process/util;1"].createInstance(Components.interfaces.nsIProcess);
+   process.init(file._file);
 
-			var args = [];
+   var args = [];
 
-			dump('process.run = ' + process.run(true, args, args.length) + '\n');
+   dump('process.run = ' + process.run(true, args, args.length) + '\n');
 
             file.close();
 
-		} catch (e) {
-			//alert('Probably not printing: ' + e);
-			this.error.sdump('D_ERROR','_NSPrint_dos_print PRINT EXCEPTION: ' + js2JSON(e) + '\n');
-		}
-	},
-
-	'_NSPrint_webBrowserPrint' : function(w,silent,params) {
-		var obj = this;
-		try {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			var webBrowserPrint = w
-				.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-				.getInterface(Components.interfaces.nsIWebBrowserPrint);
-			this.error.sdump('D_PRINT','webBrowserPrint = ' + webBrowserPrint);
-			if (webBrowserPrint) {
-				var gPrintSettings = obj.GetPrintSettings();
-				if (silent) gPrintSettings.printSilent = true;
-				else gPrintSettings.printSilent = false;
-				if (params) {
-					if (params.marginLeft) gPrintSettings.marginLeft = params.marginLeft;
-				}
-				webBrowserPrint.print(gPrintSettings, null);
-				this.error.sdump('D_PRINT','Should be printing\n');
-			} else {
-				this.error.sdump('D_ERROR','Should not be printing\n');
-			}
-		} catch (e) {
-			//alert('Probably not printing: ' + e);
-			// Pressing cancel is expressed as an NS_ERROR_ABORT return value,
-			// causing an exception to be thrown which we catch here.
-			// Unfortunately this will also consume helpful failures
-			this.error.sdump('D_ERROR','_NSPrint_webBrowserPrint PRINT EXCEPTION: ' + js2JSON(e) + '\n');
-		}
-	},
-
-	'GetPrintSettings' : function() {
-		try {
-			//alert('entering GetPrintSettings');
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			var pref = Components.classes["@mozilla.org/preferences-service;1"]
-				.getService(Components.interfaces.nsIPrefBranch);
-			//alert('pref = ' + pref);
-			if (pref) {
-				this.gPrintSettingsAreGlobal = pref.getBoolPref("print.use_global_printsettings", false);
-				this.gSavePrintSettings = pref.getBoolPref("print.save_print_settings", false);
-				//alert('gPrintSettingsAreGlobal = ' + this.gPrintSettingsAreGlobal + '  gSavePrintSettings = ' + this.gSavePrintSettings);
-			}
+  } catch (e) {
+   //alert('Probably not printing: ' + e);
+   this.error.sdump('D_ERROR','_NSPrint_dos_print PRINT EXCEPTION: ' + js2JSON(e) + '\n');
+  }
+ },
+
+ '_NSPrint_webBrowserPrint' : function(w,silent,params) {
+  var obj = this;
+  try {
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   var webBrowserPrint = w
+    .QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+    .getInterface(Components.interfaces.nsIWebBrowserPrint);
+   this.error.sdump('D_PRINT','webBrowserPrint = ' + webBrowserPrint);
+   if (webBrowserPrint) {
+    var gPrintSettings = obj.GetPrintSettings();
+    if (silent) gPrintSettings.printSilent = true;
+    else gPrintSettings.printSilent = false;
+    if (params) {
+     if (params.marginLeft) gPrintSettings.marginLeft = params.marginLeft;
+    }
+    webBrowserPrint.print(gPrintSettings, null);
+    this.error.sdump('D_PRINT','Should be printing\n');
+   } else {
+    this.error.sdump('D_ERROR','Should not be printing\n');
+   }
+  } catch (e) {
+   //alert('Probably not printing: ' + e);
+   // Pressing cancel is expressed as an NS_ERROR_ABORT return value,
+   // causing an exception to be thrown which we catch here.
+   // Unfortunately this will also consume helpful failures
+   this.error.sdump('D_ERROR','_NSPrint_webBrowserPrint PRINT EXCEPTION: ' + js2JSON(e) + '\n');
+  }
+ },
+
+ 'GetPrintSettings' : function() {
+  try {
+   //alert('entering GetPrintSettings');
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   var pref = Components.classes["@mozilla.org/preferences-service;1"]
+    .getService(Components.interfaces.nsIPrefBranch);
+   //alert('pref = ' + pref);
+   if (pref) {
+    this.gPrintSettingsAreGlobal = pref.getBoolPref("print.use_global_printsettings", false);
+    this.gSavePrintSettings = pref.getBoolPref("print.save_print_settings", false);
+    //alert('gPrintSettingsAreGlobal = ' + this.gPrintSettingsAreGlobal + '  gSavePrintSettings = ' + this.gSavePrintSettings);
+   }
  
-			var printService = Components.classes["@mozilla.org/gfx/printsettings-service;1"]
-				.getService(Components.interfaces.nsIPrintSettingsService);
-			if (this.gPrintSettingsAreGlobal) {
-				this.gPrintSettings = printService.globalPrintSettings;
-				//alert('called setPrinterDefaultsForSelectedPrinter');
-				this.setPrinterDefaultsForSelectedPrinter(printService);
-			} else {
-				this.gPrintSettings = printService.newPrintSettings;
-				//alert('used printService.newPrintSettings');
-			}
-		} catch (e) {
-			this.error.sdump('D_ERROR',"GetPrintSettings() "+e+"\n");
-			//alert("GetPrintSettings() "+e+"\n");
-		}
+   var printService = Components.classes["@mozilla.org/gfx/printsettings-service;1"]
+    .getService(Components.interfaces.nsIPrintSettingsService);
+   if (this.gPrintSettingsAreGlobal) {
+    this.gPrintSettings = printService.globalPrintSettings;
+    //alert('called setPrinterDefaultsForSelectedPrinter');
+    this.setPrinterDefaultsForSelectedPrinter(printService);
+   } else {
+    this.gPrintSettings = printService.newPrintSettings;
+    //alert('used printService.newPrintSettings');
+   }
+  } catch (e) {
+   this.error.sdump('D_ERROR',"GetPrintSettings() "+e+"\n");
+   //alert("GetPrintSettings() "+e+"\n");
+  }
  
-		return this.gPrintSettings;
-	},
-
-	'setPrinterDefaultsForSelectedPrinter' : function (aPrintService) {
-		try {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			if (this.gPrintSettings.printerName == "") {
-				this.gPrintSettings.printerName = aPrintService.defaultPrinterName;
-				//alert('used .defaultPrinterName');
-			}
-			//alert('printerName = ' + this.gPrintSettings.printerName);
-	 
-			// First get any defaults from the printer 
-			aPrintService.initPrintSettingsFromPrinter(this.gPrintSettings.printerName, this.gPrintSettings);
-	 
-			// now augment them with any values from last time
-			aPrintService.initPrintSettingsFromPrefs(this.gPrintSettings, true, this.gPrintSettings.kInitSaveAll);
-
-			// now augment from our own saved settings if they exist
-			this.load_settings();
-
-		} catch(E) {
-			this.error.sdump('D_ERROR',"setPrinterDefaultsForSelectedPrinter() "+E+"\n");
-		}
-	},
-
-	'page_settings' : function() {
-		try {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			this.GetPrintSettings();
-			var PO = Components.classes["@mozilla.org/gfx/printsettings-service;1"].getService(Components.interfaces.nsIPrintOptions);
-			PO.ShowPrintSetupDialog(this.gPrintSettings);
-		} catch(E) {
-			this.error.standard_unexpected_error_alert("page_settings()",E);
-		}
-	},
-
-	'load_settings' : function() {
-		try {
-			var error_msg = '';
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			var file = new util.file('gPrintSettings');
-			if (file._file.exists()) {
-				temp = file.get_object(); file.close();
-				for (var i in temp) {
-					try { this.gPrintSettings[i] = temp[i]; } catch(E) { error_msg += 'Error trying to set gPrintSettings.'+i+'='+temp[i]+' : ' + js2JSON(E) + '\n'; }
-				}
-			} else {
-				this.gPrintSettings.marginTop = 0;
-				this.gPrintSettings.marginLeft = 0;
-				this.gPrintSettings.marginBottom = 0;
-				this.gPrintSettings.marginRight = 0;
-				this.gPrintSettings.headerStrLeft = '';
-				this.gPrintSettings.headerStrCenter = '';
-				this.gPrintSettings.headerStrRight = '';
-				this.gPrintSettings.footerStrLeft = '';
-				this.gPrintSettings.footerStrCenter = '';
-				this.gPrintSettings.footerStrRight = '';
-			}
-			if (error_msg) {
-				this.error.sdump('D_PRINT',error_msg);
-				this.error.yns_alert(
-					document.getElementById('offlineStrings').getString('load_printer_settings_error_description'),
-					document.getElementById('offlineStrings').getString('load_printer_settings_error_title'),
-					document.getElementById('offlineStrings').getString('common.ok'),
-					null,
-					null,
-					null
-				);
-			}
-		} catch(E) {
-			this.error.standard_unexpected_error_alert("load_settings()",E);
-		}
-	},
-
-	'save_settings' : function() {
-		try {
-			var obj = this;
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			var file = new util.file('gPrintSettings');
-			if (typeof obj.gPrintSettings == 'undefined') obj.GetPrintSettings();
-			if (obj.gPrintSettings) file.set_object(obj.gPrintSettings); 
-			file.close();
-		} catch(E) {
-			this.error.standard_unexpected_error_alert("save_settings()",E);
-		}
-	}
+  return this.gPrintSettings;
+ },
+
+ 'setPrinterDefaultsForSelectedPrinter' : function (aPrintService) {
+  try {
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   if (this.gPrintSettings.printerName == "") {
+    this.gPrintSettings.printerName = aPrintService.defaultPrinterName;
+    //alert('used .defaultPrinterName');
+   }
+   //alert('printerName = ' + this.gPrintSettings.printerName);
+  
+   // First get any defaults from the printer 
+   aPrintService.initPrintSettingsFromPrinter(this.gPrintSettings.printerName, this.gPrintSettings);
+  
+   // now augment them with any values from last time
+   aPrintService.initPrintSettingsFromPrefs(this.gPrintSettings, true, this.gPrintSettings.kInitSaveAll);
+
+   // now augment from our own saved settings if they exist
+   this.load_settings();
+
+  } catch(E) {
+   this.error.sdump('D_ERROR',"setPrinterDefaultsForSelectedPrinter() "+E+"\n");
+  }
+ },
+
+ 'page_settings' : function() {
+  try {
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   this.GetPrintSettings();
+   var PO = Components.classes["@mozilla.org/gfx/printsettings-service;1"].getService(Components.interfaces.nsIPrintOptions);
+   PO.ShowPrintSetupDialog(this.gPrintSettings);
+  } catch(E) {
+   this.error.standard_unexpected_error_alert("page_settings()",E);
+  }
+ },
+
+ 'load_settings' : function() {
+  try {
+   var error_msg = '';
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   var file = new util.file('gPrintSettings');
+   if (file._file.exists()) {
+    temp = file.get_object(); file.close();
+    for (var i in temp) {
+     try { this.gPrintSettings[i] = temp[i]; } catch(E) { error_msg += 'Error trying to set gPrintSettings.'+i+'='+temp[i]+' : ' + js2JSON(E) + '\n'; }
+    }
+   } else {
+    this.gPrintSettings.marginTop = 0;
+    this.gPrintSettings.marginLeft = 0;
+    this.gPrintSettings.marginBottom = 0;
+    this.gPrintSettings.marginRight = 0;
+    this.gPrintSettings.headerStrLeft = '';
+    this.gPrintSettings.headerStrCenter = '';
+    this.gPrintSettings.headerStrRight = '';
+    this.gPrintSettings.footerStrLeft = '';
+    this.gPrintSettings.footerStrCenter = '';
+    this.gPrintSettings.footerStrRight = '';
+   }
+   if (error_msg) {
+    this.error.sdump('D_PRINT',error_msg);
+    this.error.yns_alert(
+     document.getElementById('offlineStrings').getString('load_printer_settings_error_description'),
+     document.getElementById('offlineStrings').getString('load_printer_settings_error_title'),
+     document.getElementById('offlineStrings').getString('common.ok'),
+     null,
+     null,
+     null
+    );
+   }
+  } catch(E) {
+   this.error.standard_unexpected_error_alert("load_settings()",E);
+  }
+ },
+
+ 'save_settings' : function() {
+  try {
+   var obj = this;
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   var file = new util.file('gPrintSettings');
+   if (typeof obj.gPrintSettings == 'undefined') obj.GetPrintSettings();
+   if (obj.gPrintSettings) file.set_object(obj.gPrintSettings); 
+   file.close();
+  } catch(E) {
+   this.error.standard_unexpected_error_alert("save_settings()",E);
+  }
+ }
 }
 
 dump('exiting util/print.js\n');
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/rbrowser.xul b/Open-ILS/xul/staff_client/chrome/content/util/rbrowser.xul
index 0062dde462..4c714e2475 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/rbrowser.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/util/rbrowser.xul
@@ -17,104 +17,104 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="util_browser_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-	</script>
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		                if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for util_browser.xul');
-
-				var name = xul_param('tab_name') || xul_param('name') || null;
-				var url; try { url = xul_param('url'); } catch(E) { dump(E + '\n'); };
-				if (!url) url = urls.browser;
-
-				if (!g.browser) {
-					JSAN.use('util.browser'); g.browser = new util.browser();
-				}
-
-				var push_xulG = true;
-				if (xul_param('no_xulG')) push_xulG = false;
-
-				var alt_print = false;
-				if (xul_param('alternate_print')) alt_print = true;
-
-				var p = { 
-					'url' : url,
-					'push_xulG' : push_xulG,
-					'alt_print' : alt_print,
-				} 
-				if (typeof window.xulG == 'object' && typeof window.xulG.passthru_content_params == 'object') {
-					p.passthru_content_params = window.xulG.passthru_content_params;
-				}
-				if (typeof window.xulG == 'object' && typeof window.xulG.on_url_load == 'function') {
-					p.on_url_load = window.xulG.on_url_load;
-				}
-
-				g.browser.init( p );
-
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					if (name) try { window.xulG.set_tab_name(name); } catch(E) { alert(E); }
-				}
-				if (xul_param('show_nav_buttons')) {
-					document.getElementById('back').hidden = false;
-					document.getElementById('forward').hidden = false;
-				}
-				if (xul_param('show_print_button')) {
-					document.getElementById('browser_print').hidden = false;
-				}
-
-				if (xul_param('title')) {
-					try { document.title = xul_param('title'); } catch(E) {}
-					try { window.title = xul_param('title'); } catch(E) {}
-				}
-
-			} catch(E) {
-				var err_msg = "!! This software has encountered an error.  Please tell your friendly " +
-					"system administrator or software developer the following:\n" + E + '\n';
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-	]]>
-	</script>
-
-	<commandset id="util_browser_cmds">
-		<command id="cmd_broken" />
-		<command id="cmd_print" />
-		<command id="cmd_back" />
-		<command id="cmd_forward" />
-	</commandset>
-
-	<vbox flex="1">
-		<hbox>
-			<button id="back" label="Go Back" command="cmd_back" accesskey="b" disabled="true" hidden="true"/>
-			<button id="forward" label="Go Forward" command="cmd_forward" accesskey="d" disabled="true" hidden="true"/>
-			<spacer flex="1"/>
-			<button id="browser_print" label="Print Page" oldcommand="cmd_print" hidden="true"
-				oncommand="netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect'); if (g.browser.alt_print) { JSAN.use('util.print'); var p = new util.print(); p.NSPrint(g.browser.get_content(),false,{}); } else { g.browser.get_content().print(); }"
-			/>
-
-		</hbox>
-		<browser id="browser_browser" flex="1" type="content"/>
-	</vbox>
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                  if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for util_browser.xul');
+
+    var name = xul_param('tab_name') || xul_param('name') || null;
+    var url; try { url = xul_param('url'); } catch(E) { dump(E + '\n'); };
+    if (!url) url = urls.browser;
+
+    if (!g.browser) {
+     JSAN.use('util.browser'); g.browser = new util.browser();
+    }
+
+    var push_xulG = true;
+    if (xul_param('no_xulG')) push_xulG = false;
+
+    var alt_print = false;
+    if (xul_param('alternate_print')) alt_print = true;
+
+    var p = { 
+     'url' : url,
+     'push_xulG' : push_xulG,
+     'alt_print' : alt_print,
+    } 
+    if (typeof window.xulG == 'object' && typeof window.xulG.passthru_content_params == 'object') {
+     p.passthru_content_params = window.xulG.passthru_content_params;
+    }
+    if (typeof window.xulG == 'object' && typeof window.xulG.on_url_load == 'function') {
+     p.on_url_load = window.xulG.on_url_load;
+    }
+
+    g.browser.init( p );
+
+    if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+     if (name) try { window.xulG.set_tab_name(name); } catch(E) { alert(E); }
+    }
+    if (xul_param('show_nav_buttons')) {
+     document.getElementById('back').hidden = false;
+     document.getElementById('forward').hidden = false;
+    }
+    if (xul_param('show_print_button')) {
+     document.getElementById('browser_print').hidden = false;
+    }
+
+    if (xul_param('title')) {
+     try { document.title = xul_param('title'); } catch(E) {}
+     try { window.title = xul_param('title'); } catch(E) {}
+    }
+
+   } catch(E) {
+    var err_msg = "!! This software has encountered an error.  Please tell your friendly " +
+     "system administrator or software developer the following:\n" + E + '\n';
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+
+ ]]>
+ </script>
+
+ <commandset id="util_browser_cmds">
+  <command id="cmd_broken" />
+  <command id="cmd_print" />
+  <command id="cmd_back" />
+  <command id="cmd_forward" />
+ </commandset>
+
+ <vbox flex="1">
+  <hbox>
+   <button id="back" label="Go Back" command="cmd_back" accesskey="b" disabled="true" hidden="true"/>
+   <button id="forward" label="Go Forward" command="cmd_forward" accesskey="d" disabled="true" hidden="true"/>
+   <spacer flex="1"/>
+   <button id="browser_print" label="Print Page" oldcommand="cmd_print" hidden="true"
+    oncommand="netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect'); if (g.browser.alt_print) { JSAN.use('util.print'); var p = new util.print(); p.NSPrint(g.browser.get_content(),false,{}); } else { g.browser.get_content().print(); }"
+   />
+
+  </hbox>
+  <browser id="browser_browser" flex="1" type="content"/>
+ </vbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/sound.js b/Open-ILS/xul/staff_client/chrome/content/util/sound.js
index 13f169a838..922274a114 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/sound.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/sound.js
@@ -3,73 +3,73 @@ dump('entering util/sound.js\n');
 if (typeof util == 'undefined') util = {};
 util.sound = function () {
 
-	try {
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		var SOUNDContractID = "@mozilla.org/sound;1";
-		var SOUNDIID        = Components.interfaces.nsISound;
-		this.SOUND          = Components.classes[SOUNDContractID].createInstance(SOUNDIID);
+ try {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  var SOUNDContractID = "@mozilla.org/sound;1";
+  var SOUNDIID        = Components.interfaces.nsISound;
+  this.SOUND          = Components.classes[SOUNDContractID].createInstance(SOUNDIID);
 
-	} catch(E) {
-		dump('util.sound constructor: ' + E + '\n');
-	}
+ } catch(E) {
+  dump('util.sound constructor: ' + E + '\n');
+ }
 
-	return this;
+ return this;
 };
 
 util.sound.prototype = {
 
-	'xp_url_init' : function (aURL) {
-		try {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			var URLContractID   = "@mozilla.org/network/standard-url;1";
-			var URLIID          = Components.classes[URLContractID].createInstance( );
-			var URL             = URLIID.QueryInterface(Components.interfaces.nsIURL);
-			if (aURL) {
-				URL.spec = aURL;
-			}
-			return URL;
-		} catch(E) {
-			alert('xp_url_init(): ' + E);
-		}
-	},
+ 'xp_url_init' : function (aURL) {
+  try {
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   var URLContractID   = "@mozilla.org/network/standard-url;1";
+   var URLIID          = Components.classes[URLContractID].createInstance( );
+   var URL             = URLIID.QueryInterface(Components.interfaces.nsIURL);
+   if (aURL) {
+    URL.spec = aURL;
+   }
+   return URL;
+  } catch(E) {
+   alert('xp_url_init(): ' + E);
+  }
+ },
 
-	'play_url' : function(url) {
+ 'play_url' : function(url) {
 
-		var obj = this;
-		try {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-			var url2 = obj.xp_url_init( data.server + url );
-			dump('url = ' + url2 + '\n');
-			if (typeof data.no_sound == 'undefined' || data.no_sound == false || data.no_sound == 'false') obj.SOUND.play( url2 );
-		} catch(E) {
-			try { if (data.no_sound == 'undefined' || data.no_sound == false || data.no_sound == 'false') obj.SOUND.beep(); } catch(F) { 
-				dump('beep(): ' + F + '\n');
-			}
-			dump('play_url(): ' + E + '\n');
-		}
+  var obj = this;
+  try {
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+   var url2 = obj.xp_url_init( data.server + url );
+   dump('url = ' + url2 + '\n');
+   if (typeof data.no_sound == 'undefined' || data.no_sound == false || data.no_sound == 'false') obj.SOUND.play( url2 );
+  } catch(E) {
+   try { if (data.no_sound == 'undefined' || data.no_sound == false || data.no_sound == 'false') obj.SOUND.beep(); } catch(F) { 
+    dump('beep(): ' + F + '\n');
+   }
+   dump('play_url(): ' + E + '\n');
+  }
 
-	},
+ },
 
-	'good' : function(e){
-		this.play_url( urls.AUDIO_GOOD_SOUND );
-	},
+ 'good' : function(e){
+  this.play_url( urls.AUDIO_GOOD_SOUND );
+ },
 
-	'bad' : function(e){
-		this.play_url( urls.AUDIO_BAD_SOUND );
-	},
+ 'bad' : function(e){
+  this.play_url( urls.AUDIO_BAD_SOUND );
+ },
 
-	'horrible' : function(e){
-		this.play_url( urls.AUDIO_HORRIBLE_SOUND );
-	},
+ 'horrible' : function(e){
+  this.play_url( urls.AUDIO_HORRIBLE_SOUND );
+ },
 
-	'circ_good' : function(e){
-		this.play_url( urls.AUDIO_CIRC_GOOD_SOUND );
-	},
+ 'circ_good' : function(e){
+  this.play_url( urls.AUDIO_CIRC_GOOD_SOUND );
+ },
 
-	'circ_bad' : function(e){
-		this.play_url( urls.AUDIO_CIRC_BAD_SOUND );
-	},
+ 'circ_bad' : function(e){
+  this.play_url( urls.AUDIO_CIRC_BAD_SOUND );
+ },
 }
 
 dump('exiting util/sound.js\n');
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/sprintf.js b/Open-ILS/xul/staff_client/chrome/content/util/sprintf.js
index 5a9894edb3..5d72c20fc0 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/sprintf.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/sprintf.js
@@ -19,53 +19,53 @@ String.prototype.sprintf = function () {
 
   var pad = function(str,ch,len) { var ps='';
       for(var i=0; i<Math.abs(len); i++) {
-		  ps+=ch;
-	  }
+    ps+=ch;
+   }
       return len>0?str+ps:ps+str;
   };
   var processFlags = function(flags,width,rs,arg) { 
       var pn = function(flags,arg,rs) {
           if(arg>=0) { 
               if(flags.indexOf(' ')>=0) {
-				  rs = ' ' + rs;
-			  } else if(flags.indexOf('+')>=0) {
-				  rs = '+' + rs;
-			  }
+      rs = ' ' + rs;
+     } else if(flags.indexOf('+')>=0) {
+      rs = '+' + rs;
+     }
           } else {
               rs = '-' + rs;
-		  }
+    }
           return rs;
       };
       var iWidth = parseInt(width,10);
       if(width.charAt(0) == '0') {
           var ec=0;
           if(flags.indexOf(' ')>=0 || flags.indexOf('+')>=0) {
-			  ec++;
-		  }
+     ec++;
+    }
           if(rs.length<(iWidth-ec)) {
-			  rs = pad(rs,'0',rs.length-(iWidth-ec));
-		  }
+     rs = pad(rs,'0',rs.length-(iWidth-ec));
+    }
           return pn(flags,arg,rs);
       }
       rs = pn(flags,arg,rs);
       if(rs.length<iWidth) {
           if(flags.indexOf('-')<0) {
-			  rs = pad(rs,' ',rs.length-iWidth);
-		  } else {
-			  rs = pad(rs,' ',iWidth - rs.length);
-		  }
+     rs = pad(rs,' ',rs.length-iWidth);
+    } else {
+     rs = pad(rs,' ',iWidth - rs.length);
+    }
       }    
       return rs;
   };
   var converters = [];
   converters.c = function(flags,width,precision,arg) { 
       if (typeof(arg) == 'number') {
-		  return String.fromCharCode(arg);
-	  } else if (typeof(arg) == 'string') {
-		  return arg.charAt(0);
-	  } else {
-		  return '';
-	  }
+    return String.fromCharCode(arg);
+   } else if (typeof(arg) == 'string') {
+    return arg.charAt(0);
+   } else {
+    return '';
+   }
   };
   converters.d = function(flags,width,precision,arg) { 
       return converters.i(flags,width,precision,arg); 
@@ -77,8 +77,8 @@ String.prototype.sprintf = function () {
       var iPrecision=parseInt(precision, 10);
       var rs = ((Math.abs(arg)).toString().split('.'))[0];
       if(rs.length<iPrecision) {
-		  rs=pad(rs,' ',iPrecision - rs.length);
-	  }
+    rs=pad(rs,' ',iPrecision - rs.length);
+   }
       return processFlags(flags,width,rs,arg); 
   };
   converters.E = function(flags,width,precision,arg) {
@@ -87,23 +87,23 @@ String.prototype.sprintf = function () {
   converters.e = function(flags,width,precision,arg) {
       iPrecision = parseInt(precision, 10);
       if(isNaN(iPrecision)) {
-		  iPrecision = 6;
-	  }
+    iPrecision = 6;
+   }
       rs = (Math.abs(arg)).toExponential(iPrecision);
       if(rs.indexOf('.')<0 && flags.indexOf('#')>=0) {
-		  rs = rs.replace(/^(.*)(e.*)$/,'$1.$2');
-	  }
+    rs = rs.replace(/^(.*)(e.*)$/,'$1.$2');
+   }
       return processFlags(flags,width,rs,arg);        
   };
   converters.f = function(flags,width,precision,arg) { 
       iPrecision = parseInt(precision, 10);
       if(isNaN(iPrecision)) {
-		  iPrecision = 6;
-	  }
+    iPrecision = 6;
+   }
       rs = (Math.abs(arg)).toFixed(iPrecision);
       if(rs.indexOf('.')<0 && flags.indexOf('#')>=0) {
-		  rs = rs + '.';
-	  }
+    rs = rs + '.';
+   }
       return processFlags(flags,width,rs,arg);
   };
   converters.G = function(flags,width,precision,arg) { 
@@ -121,11 +121,11 @@ String.prototype.sprintf = function () {
           rsf = rsfp.length < rsf.length ? rsfp : rsf;
       }
       if(rse.indexOf('.')<0 && flags.indexOf('#')>=0) {
-		  rse = rse.replace(/^(.*)(e.*)$/,'$1.$2');
-	  }
+    rse = rse.replace(/^(.*)(e.*)$/,'$1.$2');
+   }
       if(rsf.indexOf('.')<0 && flags.indexOf('#')>=0) {
-		  rsf = rsf + '.';
-	  }
+    rsf = rsf + '.';
+   }
       rs = rse.length<rsf.length ? rse : rsf;
       return processFlags(flags,width,rs,arg);        
   };  
@@ -133,11 +133,11 @@ String.prototype.sprintf = function () {
       var iPrecision=parseInt(precision, 10);
       var rs = Math.round(Math.abs(arg)).toString(8);
       if(rs.length<iPrecision) {
-		  rs=pad(rs,' ',iPrecision - rs.length);
-	  }
+    rs=pad(rs,' ',iPrecision - rs.length);
+   }
       if(flags.indexOf('#')>=0) {
-		  rs='0'+rs;
-	  }
+    rs='0'+rs;
+   }
       return processFlags(flags,width,rs,arg); 
   };
   converters.X = function(flags,width,precision,arg) { 
@@ -148,19 +148,19 @@ String.prototype.sprintf = function () {
       arg = Math.abs(arg);
       var rs = Math.round(arg).toString(16);
       if(rs.length<iPrecision) {
-		  rs=pad(rs,' ',iPrecision - rs.length);
-	  }
+    rs=pad(rs,' ',iPrecision - rs.length);
+   }
       if(flags.indexOf('#')>=0) {
-		  rs='0x'+rs;
-	  }
+    rs='0x'+rs;
+   }
       return processFlags(flags,width,rs,arg); 
   };
   converters.s = function(flags,width,precision,arg) { 
       var iPrecision=parseInt(precision, 10);
       var rs = arg;
       if(rs.length > iPrecision) {
-		  rs = rs.substring(0,iPrecision);
-	  }
+    rs = rs.substring(0,iPrecision);
+   }
       return processFlags(flags,width,rs,0);
   };
 
@@ -170,9 +170,9 @@ String.prototype.sprintf = function () {
   for(var i = 1; i<farr.length; i++) { 
       fps=fpRE.exec(farr[i]);
       if(!fps) {
-		  continue;
-	  }
-	  var my_i = fps[2] ? fps[2] : i;
+    continue;
+   }
+   var my_i = fps[2] ? fps[2] : i;
       if(arguments[my_i-1]) {
           retstr+=converters[fps[5]](fps[1],fps[3],fps[4],arguments[my_i-1]);
       }
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/text.js b/Open-ILS/xul/staff_client/chrome/content/util/text.js
index 4eceace4ee..0e14b1a0aa 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/text.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/text.js
@@ -3,36 +3,36 @@ dump('entering util/text.js\n');
 if (typeof util == 'undefined') var util = {};
 util.text = {};
 
-util.text.EXPORT_OK	= [ 
-	'wrap_on_space', 'preserve_string_in_html',
+util.text.EXPORT_OK = [ 
+ 'wrap_on_space', 'preserve_string_in_html',
 ];
-util.text.EXPORT_TAGS	= { ':all' : util.text.EXPORT_OK };
+util.text.EXPORT_TAGS = { ':all' : util.text.EXPORT_OK };
 
 util.text.wrap_on_space = function( text, length ) {
-	try {
+ try {
 
-		if (String(text).length <= length) return [ text, '' ];
+  if (String(text).length <= length) return [ text, '' ];
 
-		var truncated_text = String(text).substr(0,length);
+  var truncated_text = String(text).substr(0,length);
 
-		var pivot_pos = truncated_text.lastIndexOf(' ');
+  var pivot_pos = truncated_text.lastIndexOf(' ');
 
-		return [ text.substr(0,pivot_pos).replace(/\s*$/,''), String(text).substr(pivot_pos+1) ];
+  return [ text.substr(0,pivot_pos).replace(/\s*$/,''), String(text).substr(pivot_pos+1) ];
 
-	} catch(E) {
-		alert('FIXME: util.text.wrap_on_space( "' + text + '", ' + length + ")");
-		return [ String(text).substr(0,length), String(text).substr(length) ];
-	}
+ } catch(E) {
+  alert('FIXME: util.text.wrap_on_space( "' + text + '", ' + length + ")");
+  return [ String(text).substr(0,length), String(text).substr(length) ];
+ }
 }
 
 util.text.preserve_string_in_html = function( text ) {
-	text = text.replace(/&/g,'&amp;');
-	text = text.replace(/"/g,'&quot;');
-	text = text.replace(/'/g,'&#39;');
-	text = text.replace(/ /g,'&nbsp;');
-	text = text.replace(/</g,'&lt;');
-	text = text.replace(/>/g,'&gt;');
-	return text;
+ text = text.replace(/&/g,'&amp;');
+ text = text.replace(/"/g,'&quot;');
+ text = text.replace(/'/g,'&#39;');
+ text = text.replace(/ /g,'&nbsp;');
+ text = text.replace(/</g,'&lt;');
+ text = text.replace(/>/g,'&gt;');
+ return text;
 }
 
 dump('exiting util/text.js\n');
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/widgets.js b/Open-ILS/xul/staff_client/chrome/content/util/widgets.js
index 259add0084..1c1c8292ca 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/widgets.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/widgets.js
@@ -3,327 +3,327 @@ dump('entering util/widgets.js\n');
 if (typeof util == 'undefined') var util = {};
 util.widgets = {};
 
-util.widgets.EXPORT_OK	= [ 
-	'get',
-	'apply',
-	'save_xml',
-	'serialize_node',
-	'xul_from_string',
-	'store_disable',
-	'restore_disable',
-	'disable',
-	'get_list_from_tree_selection',
-	'disable_accesskeys_in_node_and_children', 
-	'enable_accesskeys_in_node_and_children', 
-	'remove_children',
-	'make_grid',
-	'make_menulist',
-	'insertAfter',
-	'apply_vertical_tab_on_enter_handler',
-	'vertical_tab',
-	'click',
-	'dispatch',
-	'stop_event',
-	'set_text',
-	'save_attributes',
-	'load_attributes',
+util.widgets.EXPORT_OK = [ 
+ 'get',
+ 'apply',
+ 'save_xml',
+ 'serialize_node',
+ 'xul_from_string',
+ 'store_disable',
+ 'restore_disable',
+ 'disable',
+ 'get_list_from_tree_selection',
+ 'disable_accesskeys_in_node_and_children', 
+ 'enable_accesskeys_in_node_and_children', 
+ 'remove_children',
+ 'make_grid',
+ 'make_menulist',
+ 'insertAfter',
+ 'apply_vertical_tab_on_enter_handler',
+ 'vertical_tab',
+ 'click',
+ 'dispatch',
+ 'stop_event',
+ 'set_text',
+ 'save_attributes',
+ 'load_attributes',
 ];
-util.widgets.EXPORT_TAGS	= { ':all' : util.widgets.EXPORT_OK };
+util.widgets.EXPORT_TAGS = { ':all' : util.widgets.EXPORT_OK };
 
 util.widgets.get = function(e) {
-	if (typeof e == 'object') {
-		return e;
-	} else {
-		return document.getElementById(e);
-	}
+ if (typeof e == 'object') {
+  return e;
+ } else {
+  return document.getElementById(e);
+ }
 }
 
 util.widgets.apply = function(e,attr,attr_value,f) {
-	var node = util.widgets.get(e);
-	var nl = node.getElementsByAttribute(attr,attr_value);
-	for (var i = 0; i < nl.length; i++) {
-		f( nl[i] );
-	}
+ var node = util.widgets.get(e);
+ var nl = node.getElementsByAttribute(attr,attr_value);
+ for (var i = 0; i < nl.length; i++) {
+  f( nl[i] );
+ }
 }
 
 util.widgets.save_xml = function (filename,node) {
-	try { 
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ try { 
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
-		JSAN.use('util.file'); var file = new util.file(filename);
+  JSAN.use('util.file'); var file = new util.file(filename);
 
-		node = util.widgets.get(node);
-		var xml = util.widgets.serialize_node(node);
+  node = util.widgets.get(node);
+  var xml = util.widgets.serialize_node(node);
 
-		file.write_content('truncate',xml);
-		file.close();
-	} catch(E) {
-		alert('Error in util.widgets.save_xml: ' + E);
-	}
+  file.write_content('truncate',xml);
+  file.close();
+ } catch(E) {
+  alert('Error in util.widgets.save_xml: ' + E);
+ }
 }
 
 util.widgets.serialize_node = function(node) {
-	var serializer = new XMLSerializer();
-	var xml = serializer.serializeToString(node);
-	return xml;
+ var serializer = new XMLSerializer();
+ var xml = serializer.serializeToString(node);
+ return xml;
 }
 
 util.widgets.xul_from_string = function(xml) {
-	var parser = new DOMParser(); 
-	var doc = parser.parseFromString(xml, "text/xml"); 
-	var node = doc.documentElement;
-	return node;
+ var parser = new DOMParser(); 
+ var doc = parser.parseFromString(xml, "text/xml"); 
+ var node = doc.documentElement;
+ return node;
 }
 
 util.widgets.store_disable = function() {
-	for (var i = 0; i < arguments.length; i++) {
-		var e = util.widgets.get( arguments[i] );
-		e.setAttribute('_disabled',e.getAttribute('disabled'));
-	}
+ for (var i = 0; i < arguments.length; i++) {
+  var e = util.widgets.get( arguments[i] );
+  e.setAttribute('_disabled',e.getAttribute('disabled'));
+ }
 }
 
 util.widgets.restore_disable = function() {
-	for (var i = 0; i < arguments.length; i++) {
-		var e = util.widgets.get( arguments[i] );
-		e.setAttribute('disabled',e.getAttribute('_disabled'));
-	}
+ for (var i = 0; i < arguments.length; i++) {
+  var e = util.widgets.get( arguments[i] );
+  e.setAttribute('disabled',e.getAttribute('_disabled'));
+ }
 }
 
 util.widgets.disable = function() {
-	for (var i = 0; i < arguments.length; i++) {
-		var e = util.widgets.get( arguments[i] );
-		e.setAttribute('disabled',true);
-	}
+ for (var i = 0; i < arguments.length; i++) {
+  var e = util.widgets.get( arguments[i] );
+  e.setAttribute('disabled',true);
+ }
 }
 
 util.widgets.click = function(e) {
-	var evt = document.createEvent("MouseEvent");
-	evt.initMouseEvent( "click", true, true, window, 0, 0, 0, 0, 0, false,false,false,false,0,null);
-	util.widgets.get(e).dispatchEvent(evt);
+ var evt = document.createEvent("MouseEvent");
+ evt.initMouseEvent( "click", true, true, window, 0, 0, 0, 0, 0, false,false,false,false,0,null);
+ util.widgets.get(e).dispatchEvent(evt);
 }
 
 util.widgets.dispatch = function(ev,el) {
-	var evt = document.createEvent("Events");
-	//var evt = document.createEvent();
-	evt.initEvent( ev, true, true );
-	util.widgets.get(el).dispatchEvent(evt);
+ var evt = document.createEvent("Events");
+ //var evt = document.createEvent();
+ evt.initEvent( ev, true, true );
+ util.widgets.get(el).dispatchEvent(evt);
 }
 
 util.widgets.make_menulist = function( items, dvalue ) {
-	var menulist = document.createElement('menulist');
-	var menupopup = document.createElement('menupopup'); menulist.appendChild(menupopup);
-	for (var i = 0; i < items.length; i++) {
-		var label = items[i][0]; var value = items[i][1]; var disabled = items[i][2]; var indent = items[i][3];
-		if (indent) {
-			for (var j = 0; j < Number(indent); j++) {
-				//label = ' ' + label;
-			}
-		}
-		var menuitem = document.createElement('menuitem'); menupopup.appendChild(menuitem);
-		menuitem.setAttribute('label',label);
-		menuitem.setAttribute('value',value);
-		if (indent) {
-			menuitem.setAttribute('style','font-family: monospace; padding-left: ' + indent + 'em;');
-		} else {
-			menuitem.setAttribute('style','font-family: monospace;');
-		}
-		if ( (disabled == true) || (disabled == "true") ) {
-			menuitem.disabled = true;
-			menuitem.setAttribute('disabled','true');
-		}
-	}
-	menulist.setAttribute('value',dvalue);
-	return menulist;
+ var menulist = document.createElement('menulist');
+ var menupopup = document.createElement('menupopup'); menulist.appendChild(menupopup);
+ for (var i = 0; i < items.length; i++) {
+  var label = items[i][0]; var value = items[i][1]; var disabled = items[i][2]; var indent = items[i][3];
+  if (indent) {
+   for (var j = 0; j < Number(indent); j++) {
+    //label = ' ' + label;
+   }
+  }
+  var menuitem = document.createElement('menuitem'); menupopup.appendChild(menuitem);
+  menuitem.setAttribute('label',label);
+  menuitem.setAttribute('value',value);
+  if (indent) {
+   menuitem.setAttribute('style','font-family: monospace; padding-left: ' + indent + 'em;');
+  } else {
+   menuitem.setAttribute('style','font-family: monospace;');
+  }
+  if ( (disabled == true) || (disabled == "true") ) {
+   menuitem.disabled = true;
+   menuitem.setAttribute('disabled','true');
+  }
+ }
+ menulist.setAttribute('value',dvalue);
+ return menulist;
 }
 
 util.widgets.make_grid = function( cols ) {
-	var grid = document.createElement('grid');
-	var columns = document.createElement('columns'); grid.appendChild(columns);
-	for (var i = 0; i < cols.length; i++) {
-		var column = document.createElement('column'); columns.appendChild(column);
-		for (var j in cols[i]) {
-			column.setAttribute(j,cols[i][j]);
-		}
-	}
-	var rows = document.createElement('rows'); grid.appendChild(rows);
-	return grid;
+ var grid = document.createElement('grid');
+ var columns = document.createElement('columns'); grid.appendChild(columns);
+ for (var i = 0; i < cols.length; i++) {
+  var column = document.createElement('column'); columns.appendChild(column);
+  for (var j in cols[i]) {
+   column.setAttribute(j,cols[i][j]);
+  }
+ }
+ var rows = document.createElement('rows'); grid.appendChild(rows);
+ return grid;
 }
 
 util.widgets.get_list_from_tree_selection = function(tree_w) {
-	var hitlist;
-	var tree = util.widgets.get(tree_w);
-	var list = [];
-	var start = new Object();
-	var end = new Object();
-	var numRanges = tree.view.selection.getRangeCount();
-	for (var t=0; t<numRanges; t++){
-		tree.view.selection.getRangeAt(t,start,end);
-		for (var v=start.value; v<=end.value; v++){
-			var i = tree.contentView.getItemAtIndex(v);
-			list.push( i );
-		}
-	}
-	return list;
+ var hitlist;
+ var tree = util.widgets.get(tree_w);
+ var list = [];
+ var start = new Object();
+ var end = new Object();
+ var numRanges = tree.view.selection.getRangeCount();
+ for (var t=0; t<numRanges; t++){
+  tree.view.selection.getRangeAt(t,start,end);
+  for (var v=start.value; v<=end.value; v++){
+   var i = tree.contentView.getItemAtIndex(v);
+   list.push( i );
+  }
+ }
+ return list;
 }
 
 util.widgets.remove_children = function() {
-	for (var i = 0; i < arguments.length; i++) {
-		var e = util.widgets.get( arguments[i] );
-		while(e.lastChild) e.removeChild( e.lastChild );
-	}
+ for (var i = 0; i < arguments.length; i++) {
+  var e = util.widgets.get( arguments[i] );
+  while(e.lastChild) e.removeChild( e.lastChild );
+ }
 }
 
 util.widgets.disable_accesskeys_in_node_and_children = function( node ) {
-	return; /* what was I doing here? */
-	if (node.getAttribute('accesskey')) {
-		node.setAttribute('oldaccesskey', node.getAttribute('accesskey'));
-		node.setAttribute('accesskey',''); node.accessKey = '';
-	}
-	for (var i = 0; i < node.childNodes.length; i++) {
-		util.widgets.disable_accesskeys_in_node_and_children( node.childNodes[i] );
-	}
-	dump('- node = <' + node.id + '> accesskey = <' + node.accessKey + '> accesskey = <' + node.getAttribute('accesskey') + '> oldaccesskey = <' + node.getAttribute('oldaccesskey') + '>\n');
+ return; /* what was I doing here? */
+ if (node.getAttribute('accesskey')) {
+  node.setAttribute('oldaccesskey', node.getAttribute('accesskey'));
+  node.setAttribute('accesskey',''); node.accessKey = '';
+ }
+ for (var i = 0; i < node.childNodes.length; i++) {
+  util.widgets.disable_accesskeys_in_node_and_children( node.childNodes[i] );
+ }
+ dump('- node = <' + node.id + '> accesskey = <' + node.accessKey + '> accesskey = <' + node.getAttribute('accesskey') + '> oldaccesskey = <' + node.getAttribute('oldaccesskey') + '>\n');
 }
 
 util.widgets.enable_accesskeys_in_node_and_children = function( node ) {
-	return; /* what was I doing here? */
-	if (node.getAttribute('oldaccesskey')) {
-		node.setAttribute('accesskey', node.getAttribute('oldaccesskey'));
-		node.accessKey = node.getAttribute('oldaccesskey'); 
-		node.setAttribute('oldaccesskey','');
-	}
-	for (var i = 0; i < node.childNodes.length; i++) {
-		util.widgets.enable_accesskeys_in_node_and_children( node.childNodes[i] );
-	}
-	dump('+ node = <' + node.id + '> accesskey = <' + node.accessKey + '> accesskey = <' + node.getAttribute('accesskey') + '> oldaccesskey = <' + node.getAttribute('oldaccesskey') + '>\n');
+ return; /* what was I doing here? */
+ if (node.getAttribute('oldaccesskey')) {
+  node.setAttribute('accesskey', node.getAttribute('oldaccesskey'));
+  node.accessKey = node.getAttribute('oldaccesskey'); 
+  node.setAttribute('oldaccesskey','');
+ }
+ for (var i = 0; i < node.childNodes.length; i++) {
+  util.widgets.enable_accesskeys_in_node_and_children( node.childNodes[i] );
+ }
+ dump('+ node = <' + node.id + '> accesskey = <' + node.accessKey + '> accesskey = <' + node.getAttribute('accesskey') + '> oldaccesskey = <' + node.getAttribute('oldaccesskey') + '>\n');
 }
 
 util.widgets.insertAfter = function(parent_node,new_node,sibling_node) {
-	sibling_node = sibling_node.nextSibling;
-	if (sibling_node) {
-		parent_node.insertBefore(new_node,sibling_node);
-	} else {
-		parent_node.appendChild(new_node);
-	}
+ sibling_node = sibling_node.nextSibling;
+ if (sibling_node) {
+  parent_node.insertBefore(new_node,sibling_node);
+ } else {
+  parent_node.appendChild(new_node);
+ }
 }
 
 util.widgets.apply_vertical_tab_on_enter_handler = function(node,onfailure) {
-	try {
-		node.addEventListener(
-			'keypress',
-			function(ev) {
-				dump('keypress: ev.target.tagName = ' + ev.target.tagName 
-					+ ' ev.target.nodeName = ' + ev.target.nodeName 
-					+ ' ev.keyCode = ' + ev.keyCode 
-					+ ' ev.charCode = ' + ev.charCode + '\n');
-				if (ev.keyCode == 13) {
-					dump('trying vertical tab\n');
-					if (util.widgets.vertical_tab(ev.target)) {
-						ev.preventDefault(); ev.stopPropagation();
-						return true;
-					} else {
-						if (typeof onfailure == 'function') return onfailure(ev);
-						return false;
-					}
-				}
-			},
-			false
-		);
-	} catch(E) {
-		alert(E);
-	}
+ try {
+  node.addEventListener(
+   'keypress',
+   function(ev) {
+    dump('keypress: ev.target.tagName = ' + ev.target.tagName 
+     + ' ev.target.nodeName = ' + ev.target.nodeName 
+     + ' ev.keyCode = ' + ev.keyCode 
+     + ' ev.charCode = ' + ev.charCode + '\n');
+    if (ev.keyCode == 13) {
+     dump('trying vertical tab\n');
+     if (util.widgets.vertical_tab(ev.target)) {
+      ev.preventDefault(); ev.stopPropagation();
+      return true;
+     } else {
+      if (typeof onfailure == 'function') return onfailure(ev);
+      return false;
+     }
+    }
+   },
+   false
+  );
+ } catch(E) {
+  alert(E);
+ }
 }
 
 util.widgets.vertical_tab = function(node) {
-	try {
-		var rel_vert_pos = node.getAttribute('rel_vert_pos') || 0;
-		dump('vertical_tab -> node = ' + node.nodeName + ' rel_vert_pos = ' + rel_vert_pos + '\n');
+ try {
+  var rel_vert_pos = node.getAttribute('rel_vert_pos') || 0;
+  dump('vertical_tab -> node = ' + node.nodeName + ' rel_vert_pos = ' + rel_vert_pos + '\n');
 
-		var nl = document.getElementsByTagName( node.nodeName );
+  var nl = document.getElementsByTagName( node.nodeName );
 
-		var found_self = false; var next_node; var max_rel_vert_pos = 0;
-		for (var i = 0; i < nl.length; i++) {
+  var found_self = false; var next_node; var max_rel_vert_pos = 0;
+  for (var i = 0; i < nl.length; i++) {
 
-			var candidate_node = nl[i];
-			var test_rel_vert_pos = candidate_node.getAttribute('rel_vert_pos') || 0;
+   var candidate_node = nl[i];
+   var test_rel_vert_pos = candidate_node.getAttribute('rel_vert_pos') || 0;
 
-			if (found_self && !next_node && (test_rel_vert_pos == rel_vert_pos) && !candidate_node.disabled) {
-			
-				next_node = candidate_node;
+   if (found_self && !next_node && (test_rel_vert_pos == rel_vert_pos) && !candidate_node.disabled) {
+   
+    next_node = candidate_node;
 
-			}
-			if (candidate_node == node) found_self = true;
+   }
+   if (candidate_node == node) found_self = true;
 
-			if (test_rel_vert_pos > max_rel_vert_pos) max_rel_vert_pos = test_rel_vert_pos;
-		}
+   if (test_rel_vert_pos > max_rel_vert_pos) max_rel_vert_pos = test_rel_vert_pos;
+  }
 
-		dump('intermediate: next_node = ' + next_node + ' max_rel_vert_pos = ' + max_rel_vert_pos + '\n');
+  dump('intermediate: next_node = ' + next_node + ' max_rel_vert_pos = ' + max_rel_vert_pos + '\n');
 
-		if (!next_node) {
+  if (!next_node) {
 
-			found_self = false;
-			for (var next_pos = rel_vert_pos; next_pos <= max_rel_vert_pos; next_pos++) {
+   found_self = false;
+   for (var next_pos = rel_vert_pos; next_pos <= max_rel_vert_pos; next_pos++) {
 
-				for (var i = 0; i < nl.length; i++) {
-					var candidate_node = nl[i];
-					var test_rel_vert_pos = candidate_node.getAttribute('rel_vert_pos') || 0;
+    for (var i = 0; i < nl.length; i++) {
+     var candidate_node = nl[i];
+     var test_rel_vert_pos = candidate_node.getAttribute('rel_vert_pos') || 0;
 
-					if (found_self && !next_node && (test_rel_vert_pos == next_pos) && !candidate_node.disabled ) {
-						next_node = candidate_node;
-					}
+     if (found_self && !next_node && (test_rel_vert_pos == next_pos) && !candidate_node.disabled ) {
+      next_node = candidate_node;
+     }
 
-					if (candidate_node == node) found_self = true;
-				}
+     if (candidate_node == node) found_self = true;
+    }
 
-			}
+   }
 
-		}
+  }
 
-		if (next_node) {
-			dump('focusing\n');
-			next_node.focus();
-		}
-		return next_node;
-	} catch(E) {
-		alert(E);
-	}
+  if (next_node) {
+   dump('focusing\n');
+   next_node.focus();
+  }
+  return next_node;
+ } catch(E) {
+  alert(E);
+ }
 }
 
 util.widgets.stop_event = function(ev) {
-	ev.preventDefault();
-	return false;
+ ev.preventDefault();
+ return false;
 }
 
 util.widgets.set_text = function(n,t) {
-	n = util.widgets.get(n);
-	switch(n.nodeName) {
-		case 'button' :
-		case 'caption' :
-			n.setAttribute('label',t);
-		break;
-		case 'label' : 
-			n.setAttribute('value',t); 
-		break;
-		case 'description' : 
-		case 'H1': case 'H2': case 'H3': case 'H4': case 'SPAN': case 'P': case 'BLOCKQUOTE':
-			util.widgets.remove_children(n); 
-			n.appendChild( document.createTextNode(t) );
-		break;
-		case 'textbox' :
-			n.value = t; n.setAttribute('value',t);
-		break;
-		default:
-			alert("FIXME: util.widgets.set_text doesn't know how to handle " + n.nodeName);
-		break;
-	}
+ n = util.widgets.get(n);
+ switch(n.nodeName) {
+  case 'button' :
+  case 'caption' :
+   n.setAttribute('label',t);
+  break;
+  case 'label' : 
+   n.setAttribute('value',t); 
+  break;
+  case 'description' : 
+  case 'H1': case 'H2': case 'H3': case 'H4': case 'SPAN': case 'P': case 'BLOCKQUOTE':
+   util.widgets.remove_children(n); 
+   n.appendChild( document.createTextNode(t) );
+  break;
+  case 'textbox' :
+   n.value = t; n.setAttribute('value',t);
+  break;
+  default:
+   alert("FIXME: util.widgets.set_text doesn't know how to handle " + n.nodeName);
+  break;
+ }
 }
 
 util.widgets.save_attributes = function (file,ids_attrs) {
-	try {
-		var blob = {};
-		for (var element_id in ids_attrs) {
-			var attribute_list = ids_attrs[ element_id ];
-			if (! blob[ element_id ] ) blob[ element_id ] =  {};
+ try {
+  var blob = {};
+  for (var element_id in ids_attrs) {
+   var attribute_list = ids_attrs[ element_id ];
+   if (! blob[ element_id ] ) blob[ element_id ] =  {};
             var x = document.getElementById( element_id );
             if (x) {
                 for (var j = 0; j < attribute_list.length; j++) {
@@ -333,52 +333,52 @@ util.widgets.save_attributes = function (file,ids_attrs) {
                 dump('Error in util.widgets.save_attributes('+file._file.path+','+js2JSON(ids_attrs)+'):\n');
                 dump('\telement_id = ' + element_id + '\n');
             }
-		}
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		//FIXME - WHY DOES THIS NOT WORK?// JSAN.use('util.file'); var file = new util.file(filename);
-		file.set_object(blob); file.close();
-	} catch(E) {
-		alert('Error saving preferences: ' + E);
-	}
+  }
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  //FIXME - WHY DOES THIS NOT WORK?// JSAN.use('util.file'); var file = new util.file(filename);
+  file.set_object(blob); file.close();
+ } catch(E) {
+  alert('Error saving preferences: ' + E);
+ }
 }
 
-util.widgets.load_attributes = function (file) {		
-	try {
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		//FIXME - WHY DOES THIS NOT WORK?// JSAN.use('util.file'); var file = new util.file(filename);
-		if (file._file.exists()) {
-			var blob = file.get_object(); file.close();
-			for (var element_id in blob) {
-				for (var attribute in blob[ element_id ]) {
-					var x = document.getElementById( element_id );
-					if (x) {
-						if (x.nodeName == 'menulist' && attribute == 'value') {
-							var popup = x.firstChild;
-							var children = popup.childNodes;
-							for (var i = 0; i < children.length; i++) {
-								if (children[i].getAttribute('value') == blob[ element_id ][ attribute ]) {
-									dump('setting ' + x.nodeName + ' ' + element_id + ' @value to ' + blob[ element_id ][ attribute ] + '\n' );
-									x.setAttribute(attribute, blob[ element_id ][ attribute ]);
-								}
-							}
-						} else {
-							dump('setting ' + x.nodeName + ' ' + element_id + ' @value to ' + blob[ element_id ][ attribute ] + '\n');
-							x.setAttribute(attribute, blob[ element_id ][ attribute ]);
-						}
-					} else {
-						dump('Error in util.widgets.load_attributes('+file._file.path+'):\n');
-						dump('\telement_id = ' + element_id + '\n');
-						dump('\tattribute = ' + attribute + '\n');
-						dump('\tblob[id][attr] = ' + blob[element_id][attribute] + '\n');
-					}
-				}
-			}
-			return blob;
-		}
-		return {};
-	} catch(E) {
-		alert('Error loading preferences: ' + E);
-	}
+util.widgets.load_attributes = function (file) {  
+ try {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  //FIXME - WHY DOES THIS NOT WORK?// JSAN.use('util.file'); var file = new util.file(filename);
+  if (file._file.exists()) {
+   var blob = file.get_object(); file.close();
+   for (var element_id in blob) {
+    for (var attribute in blob[ element_id ]) {
+     var x = document.getElementById( element_id );
+     if (x) {
+      if (x.nodeName == 'menulist' && attribute == 'value') {
+       var popup = x.firstChild;
+       var children = popup.childNodes;
+       for (var i = 0; i < children.length; i++) {
+        if (children[i].getAttribute('value') == blob[ element_id ][ attribute ]) {
+         dump('setting ' + x.nodeName + ' ' + element_id + ' @value to ' + blob[ element_id ][ attribute ] + '\n' );
+         x.setAttribute(attribute, blob[ element_id ][ attribute ]);
+        }
+       }
+      } else {
+       dump('setting ' + x.nodeName + ' ' + element_id + ' @value to ' + blob[ element_id ][ attribute ] + '\n');
+       x.setAttribute(attribute, blob[ element_id ][ attribute ]);
+      }
+     } else {
+      dump('Error in util.widgets.load_attributes('+file._file.path+'):\n');
+      dump('\telement_id = ' + element_id + '\n');
+      dump('\tattribute = ' + attribute + '\n');
+      dump('\tblob[id][attr] = ' + blob[element_id][attribute] + '\n');
+     }
+    }
+   }
+   return blob;
+  }
+  return {};
+ } catch(E) {
+  alert('Error loading preferences: ' + E);
+ }
 }
 
 dump('exiting util/widgets.js\n');
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/window.js b/Open-ILS/xul/staff_client/chrome/content/util/window.js
index 60c7090d5d..3fad80f43e 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/window.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/window.js
@@ -2,124 +2,124 @@ dump('entering util/window.js\n');
 
 if (typeof util == 'undefined') util = {};
 util.window = function () {
-	JSAN.use('util.error'); this.error = new util.error(); this.win = window;
-	return this;
+ JSAN.use('util.error'); this.error = new util.error(); this.win = window;
+ return this;
 };
 
 util.window.prototype = {
-	
-	// list of open window references, used for debugging in shell
-	'win_list' : [],	
+ 
+ // list of open window references, used for debugging in shell
+ 'win_list' : [], 
 
-	// list of Top Level menu interface window references
-	'appshell_list' : [],	
+ // list of Top Level menu interface window references
+ 'appshell_list' : [], 
 
-	// list of documents for debugging.  BROKEN
-	'doc_list' : [],	
+ // list of documents for debugging.  BROKEN
+ 'doc_list' : [], 
 
-	// Windows need unique names.  This number helps.
-	'window_name_increment' :  function() {
-		JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-		if (typeof data.window_name_increment == 'undefined') {
-			data.window_name_increment = 1;
-		} else {
-			data.window_name_increment++;
-		}
-		data.stash('window_name_increment');
-		return data.window_name_increment;
-	},
+ // Windows need unique names.  This number helps.
+ 'window_name_increment' :  function() {
+  JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+  if (typeof data.window_name_increment == 'undefined') {
+   data.window_name_increment = 1;
+  } else {
+   data.window_name_increment++;
+  }
+  data.stash('window_name_increment');
+  return data.window_name_increment;
+ },
 
-	// This number gets put into the title bar for Top Level menu interface windows
-	'appshell_name_increment' : function() {
-		JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-		if (typeof data.appshell_name_increment == 'undefined') {
-			data.appshell_name_increment = 1;
-		} else {
-			data.appshell_name_increment++;
-		}
-		data.stash('appshell_name_increment');
-		return data.appshell_name_increment;
-	},
+ // This number gets put into the title bar for Top Level menu interface windows
+ 'appshell_name_increment' : function() {
+  JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+  if (typeof data.appshell_name_increment == 'undefined') {
+   data.appshell_name_increment = 1;
+  } else {
+   data.appshell_name_increment++;
+  }
+  data.stash('appshell_name_increment');
+  return data.appshell_name_increment;
+ },
 
-	// From: Bryan White on netscape.public.mozilla.xpfe, Oct 13, 2004
-	// Message-ID: <ckjh7a$18q1@ripley.netscape.com>
-	// Modified by Jason for Evergreen
-	'SafeWindowOpen' : function (url,title,features) {
-		var w;
+ // From: Bryan White on netscape.public.mozilla.xpfe, Oct 13, 2004
+ // Message-ID: <ckjh7a$18q1@ripley.netscape.com>
+ // Modified by Jason for Evergreen
+ 'SafeWindowOpen' : function (url,title,features) {
+  var w;
 
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalPreferencesRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalPreferencesWrite");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserWrite");
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalPreferencesRead");
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalPreferencesWrite");
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserWrite");
 
-		const CI = Components.interfaces;
-		const PB = Components.classes["@mozilla.org/preferences-service;1"].getService(CI.nsIPrefBranch);
+  const CI = Components.interfaces;
+  const PB = Components.classes["@mozilla.org/preferences-service;1"].getService(CI.nsIPrefBranch);
 
-		var blocked = false;
-		try {
-			// pref 'dom.disable_open_during_load' is the main popup blocker preference
-			blocked = PB.getBoolPref("dom.disable_open_during_load");
-			if(blocked) PB.setBoolPref("dom.disable_open_during_load",false);
-			w = this.win.open(url,title,features);
-		} catch(E) {
-			this.error.sdump('D_ERROR','window.SafeWindowOpen: ' + E + '\n');
-			throw(E);
-		}
-		if(blocked) PB.setBoolPref("dom.disable_open_during_load",true);
+  var blocked = false;
+  try {
+   // pref 'dom.disable_open_during_load' is the main popup blocker preference
+   blocked = PB.getBoolPref("dom.disable_open_during_load");
+   if(blocked) PB.setBoolPref("dom.disable_open_during_load",false);
+   w = this.win.open(url,title,features);
+  } catch(E) {
+   this.error.sdump('D_ERROR','window.SafeWindowOpen: ' + E + '\n');
+   throw(E);
+  }
+  if(blocked) PB.setBoolPref("dom.disable_open_during_load",true);
 
-		return w;
-	},
+  return w;
+ },
 
-	'open' : function(url,title,features,my_xulG) {
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		var key;
-		if (!title) title = 'anon' + this.window_name_increment();
-		if (!features) features = 'chrome';
-		this.error.sdump('D_WIN', 'opening ' + url + ', ' + title + ', ' + features + ' from ' + this.win + '\n');
-		var data;
-		if (features.match(/modal/) && my_xulG) {
-			JSAN.use('OpenILS.data'); data = new OpenILS.data(); data.init({'via':'stash'});
-			if (typeof data.modal_xulG_stack == 'undefined') data.modal_xulG_stack = {}; 
-			/* FIXME - not a perfect key.. could imagine two top-level windows both opening modal windows */
-			key = url; 
-			if (typeof xulG == 'object') {
+ 'open' : function(url,title,features,my_xulG) {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  var key;
+  if (!title) title = 'anon' + this.window_name_increment();
+  if (!features) features = 'chrome';
+  this.error.sdump('D_WIN', 'opening ' + url + ', ' + title + ', ' + features + ' from ' + this.win + '\n');
+  var data;
+  if (features.match(/modal/) && my_xulG) {
+   JSAN.use('OpenILS.data'); data = new OpenILS.data(); data.init({'via':'stash'});
+   if (typeof data.modal_xulG_stack == 'undefined') data.modal_xulG_stack = {}; 
+   /* FIXME - not a perfect key.. could imagine two top-level windows both opening modal windows */
+   key = url; 
+   if (typeof xulG == 'object') {
                 if (typeof xulG.url_prefix == 'function') {
-				    key = key.replace( xulG.url_prefix('/'), '/' );	
-    			}
+        key = key.replace( xulG.url_prefix('/'), '/' ); 
+       }
             } else if (typeof url_prefix == 'function') {
-				    key = key.replace( url_prefix('/'), '/' );	
+        key = key.replace( url_prefix('/'), '/' ); 
             }
-			if (typeof data.modal_xulG_stack[key] == 'undefined') data.modal_xulG_stack[key] = [];
-			data.modal_xulG_stack[key].push( my_xulG );
-			data.stash('modal_xulG_stack');
-			this.error.sdump('D_WIN','modal key = ' + key);
-		}
-		var w = this.SafeWindowOpen(url,title,features);
-		if (features.match(/modal/) && my_xulG) { 
+   if (typeof data.modal_xulG_stack[key] == 'undefined') data.modal_xulG_stack[key] = [];
+   data.modal_xulG_stack[key].push( my_xulG );
+   data.stash('modal_xulG_stack');
+   this.error.sdump('D_WIN','modal key = ' + key);
+  }
+  var w = this.SafeWindowOpen(url,title,features);
+  if (features.match(/modal/) && my_xulG) { 
             data.init({'via':'stash'});
-			var x = data.modal_xulG_stack[key].pop();
-			data.stash('modal_xulG_stack');
-			return x;
-		} else {
-			if (my_xulG) {
-				if (get_contentWindow(w)) {
-					get_contentWindow(w).xulG = my_xulG;
-				} else {
-					w.xulG = my_xulG;
-				}
-			}
-		}
-		/*
-		setTimeout( 
-			function() { 
-				try { w.title = title; } catch(E) { dump('**'+E+'\n'); }
-				try { w.document.title = title; } catch(E) { dump('**'+E+'\n'); }
-			}, 0 
-		);
-		*/
-		return w;
-	}
+   var x = data.modal_xulG_stack[key].pop();
+   data.stash('modal_xulG_stack');
+   return x;
+  } else {
+   if (my_xulG) {
+    if (get_contentWindow(w)) {
+     get_contentWindow(w).xulG = my_xulG;
+    } else {
+     w.xulG = my_xulG;
+    }
+   }
+  }
+  /*
+  setTimeout( 
+   function() { 
+    try { w.title = title; } catch(E) { dump('**'+E+'\n'); }
+    try { w.document.title = title; } catch(E) { dump('**'+E+'\n'); }
+   }, 0 
+  );
+  */
+  return w;
+ }
 }
 
 dump('exiting util/window.js\n');
diff --git a/Open-ILS/xul/staff_client/chrome/skin/global.css b/Open-ILS/xul/staff_client/chrome/skin/global.css
index 2972bc9e8c..9cb1287595 100644
--- a/Open-ILS/xul/staff_client/chrome/skin/global.css
+++ b/Open-ILS/xul/staff_client/chrome/skin/global.css
@@ -50,12 +50,12 @@ messagecatalog { -moz-binding: url('chrome://open_ils_staff_client/content/main/
 .fixed_textbox { }
 .marc_buttons_box description { font-weight: bold; }
 .marc { 
-	-moz-appearance: none;
-	font-family: monospace;
-	font-size: x-large;
-	border: none;
-	padding: 0px; 
-	margin: 0px; 
+ -moz-appearance: none;
+ font-family: monospace;
+ font-size: x-large;
+ border: none;
+ padding: 0px; 
+ margin: 0px; 
 }
 .marc:hover { background-color: #DDDDDD; }
 .invalid { background-color: #FF8888; }
diff --git a/Open-ILS/xul/staff_client/components/nsOpenILS.js b/Open-ILS/xul/staff_client/components/nsOpenILS.js
index f8f2d9cf98..1555245f84 100644
--- a/Open-ILS/xul/staff_client/components/nsOpenILS.js
+++ b/Open-ILS/xul/staff_client/components/nsOpenILS.js
@@ -3,7 +3,7 @@ function OpenILS(){}
 OpenILS.prototype = {
 
     help: function () { 
-    	dump("Ah ha!  This xpcom isn't really 'xp'.  We make use of the .wrappedJSObject method to get a truly global place to stick data.\n"); 
+     dump("Ah ha!  This xpcom isn't really 'xp'.  We make use of the .wrappedJSObject method to get a truly global place to stick data.\n"); 
     },
 
     data: {},
diff --git a/Open-ILS/xul/staff_client/external/template.js b/Open-ILS/xul/staff_client/external/template.js
index 0e8cff07a7..3a39be0eb8 100644
--- a/Open-ILS/xul/staff_client/external/template.js
+++ b/Open-ILS/xul/staff_client/external/template.js
@@ -2,39 +2,39 @@ dump('entering example.template.js\n');
 
 if (typeof example == 'undefined') example = {};
 example.template = function (params) {
-	try {
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		JSAN.use('util.error'); this.error = new util.error();
-	} catch(E) {
-		dump('example.template: ' + E + '\n');
-	}
+ try {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  JSAN.use('util.error'); this.error = new util.error();
+ } catch(E) {
+  dump('example.template: ' + E + '\n');
+ }
 }
 
 example.template.prototype = {
 
-	'init' : function( params ) {
-
-		try {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-			var obj = this;
-
-			JSAN.use('util.controller'); obj.controller = new util.controller();
-			obj.controller.init(
-				{
-					control_map : {
-						'cmd_broken' : [
-							['command'],
-							function() { alert('Not Yet Implemented'); }
-						],
-					}
-				}
-			);
-
-		} catch(E) {
-			this.error.sdump('D_ERROR','example.template.init: ' + E + '\n');
-		}
-	},
+ 'init' : function( params ) {
+
+  try {
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
+   var obj = this;
+
+   JSAN.use('util.controller'); obj.controller = new util.controller();
+   obj.controller.init(
+    {
+     control_map : {
+      'cmd_broken' : [
+       ['command'],
+       function() { alert('Not Yet Implemented'); }
+      ],
+     }
+    }
+   );
+
+  } catch(E) {
+   this.error.sdump('D_ERROR','example.template.init: ' + E + '\n');
+  }
+ },
 }
 
 dump('exiting example.template.js\n');
diff --git a/Open-ILS/xul/staff_client/external/template.xul b/Open-ILS/xul/staff_client/external/template.xul
index 0980cadea5..a8b0446bda 100644
--- a/Open-ILS/xul/staff_client/external/template.xul
+++ b/Open-ILS/xul/staff_client/external/template.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/en-US/lang.dtd"-->
+ <!--#include virtual="/opac/locale/en-US/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,56 +19,56 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="example_template_win" 
-	onload="try { my_init(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+ </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		                if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for example_template.xul');
-
-				g.cgi = new CGI();
-				var session = g.cgi.param('session');
-
-				JSAN.use('example.template'); g.template = new example.template();
-
-				g.template.init( 
-					{ 
-						'session' : session,
-					} 
-				);
-
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					try { window.xulG.set_tab_name('Template'); } catch(E) { alert(E); }
-				}
-
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert('example/template.xul',E); } catch(F) { alert(E); }
-			}
-		}
-
-	]]>
-	</script>
-
-	<commandset id="example_template_cmds">
-		<command id="cmd_broken" />
-	</commandset>
-
-	<browser id="template_browser" flex="1"/>
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                  if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for example_template.xul');
+
+    g.cgi = new CGI();
+    var session = g.cgi.param('session');
+
+    JSAN.use('example.template'); g.template = new example.template();
+
+    g.template.init( 
+     { 
+      'session' : session,
+     } 
+    );
+
+    if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+     try { window.xulG.set_tab_name('Template'); } catch(E) { alert(E); }
+    }
+
+   } catch(E) {
+    try { g.error.standard_unexpected_error_alert('example/template.xul',E); } catch(F) { alert(E); }
+   }
+  }
+
+ ]]>
+ </script>
+
+ <commandset id="example_template_cmds">
+  <command id="cmd_broken" />
+ </commandset>
+
+ <browser id="template_browser" flex="1"/>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul b/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
index 91649f0091..30e6d19376 100644
--- a/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
@@ -5,20 +5,20 @@
 <overlay id="openils_util_overlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<scripts id="openils_util_scripts">
-		<script>dump('starting openils_util_overlay\n');</script>
-		<script type="text/javascript" src="/xul/server/main/constants.js" />
-		<script type="text/javascript" src="/xul/server/util/clipboard.js" />
-		<script type="text/javascript" src="/opac/common/js/utils.js" />
-		<script type="text/javascript" src="/opac/common/js/CGI.js" />
-		<script type="text/javascript" src="/opac/common/js/md5.js" />
-		<script type="text/javascript" src="/opac/common/js/JSON_v1.js" />
-		<script type="text/javascript" src="/opac/common/js/fmall.js" />
-		<script type="text/javascript" src="/opac/common/js/fmgen.js" />
-		<script type="text/javascript" src="/opac/common/js/RemoteRequest.js" />
-		<script type='text/javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js' />
-		<script type="text/javascript" src="/opac/common/js/org_utils.js" />   
-		<script type="text/javascript" src="global_util.js" />   
+ <scripts id="openils_util_scripts">
+  <script>dump('starting openils_util_overlay\n');</script>
+  <script type="text/javascript" src="/xul/server/main/constants.js" />
+  <script type="text/javascript" src="/xul/server/util/clipboard.js" />
+  <script type="text/javascript" src="/opac/common/js/utils.js" />
+  <script type="text/javascript" src="/opac/common/js/CGI.js" />
+  <script type="text/javascript" src="/opac/common/js/md5.js" />
+  <script type="text/javascript" src="/opac/common/js/JSON_v1.js" />
+  <script type="text/javascript" src="/opac/common/js/fmall.js" />
+  <script type="text/javascript" src="/opac/common/js/fmgen.js" />
+  <script type="text/javascript" src="/opac/common/js/RemoteRequest.js" />
+  <script type='text/javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js' />
+  <script type="text/javascript" src="/opac/common/js/org_utils.js" />   
+  <script type="text/javascript" src="global_util.js" />   
         <menupopup id="clipboard">
             <menuitem label="&common.textbox.cut;" oncommand="util.clipboard.cut()" />
             <menuitem label="&common.textbox.copy;" oncommand="util.clipboard.copy()" />
@@ -26,11 +26,11 @@
             <menuitem label="&common.textbox.delete;" oncommand="document.popupNode.value = ''" />
             <menuitem label="&common.textbox.select_all;" oncommand="document.popupNode.select()" />
         </menupopup>
-		<messagecatalog id="commonStrings" src='/xul/server/locale/<!--#echo var="locale"-->/common.properties'/>
-		<messagecatalog id="offlineStrings" src='/xul/server/locale/<!--#echo var="locale"-->/offline.properties'/>
-		<messagecatalog id="authStrings" src='/xul/server/locale/<!--#echo var="locale"-->/auth.properties'/>
-		<script>dump('finished openils_util_overlay\n');</script>
-	</scripts>
+  <messagecatalog id="commonStrings" src='/xul/server/locale/<!--#echo var="locale"-->/common.properties'/>
+  <messagecatalog id="offlineStrings" src='/xul/server/locale/<!--#echo var="locale"-->/offline.properties'/>
+  <messagecatalog id="authStrings" src='/xul/server/locale/<!--#echo var="locale"-->/auth.properties'/>
+  <script>dump('finished openils_util_overlay\n');</script>
+ </scripts>
 
 </overlay>
 
diff --git a/Open-ILS/xul/staff_client/server/admin/admin.css b/Open-ILS/xul/staff_client/server/admin/admin.css
index a35af6aa74..803202b1e3 100644
--- a/Open-ILS/xul/staff_client/server/admin/admin.css
+++ b/Open-ILS/xul/staff_client/server/admin/admin.css
@@ -28,28 +28,28 @@ input[type="text"]:disabled { color: #555555; }
 .tall { height:100%; }
 
 button {
-	color:#050;
-	font-family:'trebuchet ms',helvetica,sans-serif;
-	font-size:84%;
-	font-weight:bold;
-	background-color:#fed;
-	border:1px solid;
-	border-top-color:#696;
-	border-left-color:#696;
-	border-right-color:#363;
-	border-bottom-color:#363;
-	margin: 4px;
+ color:#050;
+ font-family:'trebuchet ms',helvetica,sans-serif;
+ font-size:84%;
+ font-weight:bold;
+ background-color:#fed;
+ border:1px solid;
+ border-top-color:#696;
+ border-left-color:#696;
+ border-right-color:#363;
+ border-bottom-color:#363;
+ margin: 4px;
 }
 
 button:disabled  { 
-	color: #808080; 
-	background: #E0E0E0; 
-	border: 1px solid #808080;
+ color: #808080; 
+ background: #E0E0E0; 
+ border: 1px solid #808080;
 }
 
 .cal_img {
-	cursor: pointer; 
-	border: 1px solid red; 
-	padding: 0px; margin: 0px; 
+ cursor: pointer; 
+ border: 1px solid red; 
+ padding: 0px; margin: 0px; 
 }
 .cal_img:hover { background: red ; }
diff --git a/Open-ILS/xul/staff_client/server/admin/adminlib.js b/Open-ILS/xul/staff_client/server/admin/adminlib.js
index e805115fd0..e32ca0e5d3 100644
--- a/Open-ILS/xul/staff_client/server/admin/adminlib.js
+++ b/Open-ILS/xul/staff_client/server/admin/adminlib.js
@@ -12,34 +12,34 @@ var FETCH_ORG_UNIT = "open-ils.actor:open-ils.actor.org_unit.retrieve";
 function debug(str) { try { dump(str + '\n'); } catch(e){} }
 
 function fetchUser(session) {
-	if(session == null ) {
-		cgi = new CGI();
-		session = cgi.param('ses');
-	}
-	if(!session) throw "User session is not defined";
-	SESSION = session;
-	var request = new Request(FETCH_SESSION, session, 1);
-	request.send(true);
-	var user = request.result();
-	if(checkILSEvent(user)) throw user;
-	USER = user;
-	return user;
+ if(session == null ) {
+  cgi = new CGI();
+  session = cgi.param('ses');
+ }
+ if(!session) throw "User session is not defined";
+ SESSION = session;
+ var request = new Request(FETCH_SESSION, session, 1);
+ request.send(true);
+ var user = request.result();
+ if(checkILSEvent(user)) throw user;
+ USER = user;
+ return user;
 }
 
 /* if defined, callback will get the user object asynchronously */
 function fetchFleshedUser(id, callback) {
-	if(id == null) return null;
-	var req = new Request(
-		'open-ils.actor:open-ils.actor.user.fleshed.retrieve', SESSION, id );
-
-	if( callback ) {
-		req.callback( function(r){callback(r.getResultObject());} );
-		req.send();
-
-	} else {
-		req.send(true);
-		return req.result();
-	}
+ if(id == null) return null;
+ var req = new Request(
+  'open-ils.actor:open-ils.actor.user.fleshed.retrieve', SESSION, id );
+
+ if( callback ) {
+  req.callback( function(r){callback(r.getResultObject());} );
+  req.send();
+
+ } else {
+  req.send(true);
+  return req.result();
+ }
 }
 
 /**
@@ -47,16 +47,16 @@ function fetchFleshedUser(id, callback) {
   * PERMS[ permName ].  It also returns the org list to the caller
   */
 function fetchHighestPermOrgs( session, userId, perms ) {
-	var req = new RemoteRequest(
-		'open-ils.actor',
-		'open-ils.actor.user.perm.highest_org.batch', 
-		session, userId, perms  );
-	req.send(true);
-	var orgs = req.getResultObject();
-	for( var i = 0; i != orgs.length; i++ ) 
-		PERMS[perms[i]] = orgs[i];
-		//PERMS[ perms[i] ] = ( orgs[i] != null ) ? orgs[i] : -1 ;
-	return orgs;
+ var req = new RemoteRequest(
+  'open-ils.actor',
+  'open-ils.actor.user.perm.highest_org.batch', 
+  session, userId, perms  );
+ req.send(true);
+ var orgs = req.getResultObject();
+ for( var i = 0; i != orgs.length; i++ ) 
+  PERMS[perms[i]] = orgs[i];
+  //PERMS[ perms[i] ] = ( orgs[i] != null ) ? orgs[i] : -1 ;
+ return orgs;
 }
 
 function fetchHighestWorkPermOrgs(session, userId, perms, onload) {
@@ -100,26 +100,26 @@ function findReleventRootOrg(permOrgList, contextOrgId) {
 
 
 /* offset is the depth of the highest org 
-	in the tree we're building 
+ in the tree we're building 
   */
 
 /* XXX Moved to opac_utils.js */
 
 /*
 function buildOrgSel(selector, org, offset) { 
-	insertSelectorVal( selector, -1, 
-		org.name(), org.id(), null, findOrgDepth(org) - offset );
-	for( var c in org.children() )
-		buildOrgSel( selector, org.children()[c], offset);
+ insertSelectorVal( selector, -1, 
+  org.name(), org.id(), null, findOrgDepth(org) - offset );
+ for( var c in org.children() )
+  buildOrgSel( selector, org.children()[c], offset);
 }
 */
 
 /** removes all child nodes in 'tbody' that have the attribute 'key' defined */
 function cleanTbody(tbody, key) {
-	for( var c  = 0; c < tbody.childNodes.length; c++ ) {
-		var child = tbody.childNodes[c];
-		if(child && child.getAttribute(key)) tbody.removeChild(child); 
-	}
+ for( var c  = 0; c < tbody.childNodes.length; c++ ) {
+  var child = tbody.childNodes[c];
+  if(child && child.getAttribute(key)) tbody.removeChild(child); 
+ }
 }
 
 
@@ -129,8 +129,8 @@ function cleanTbody(tbody, key) {
   * newRow is the new row to insert
   */
 function insRow( tbody, row, newRow ) {
-	if(row.nextSibling) tbody.insertBefore( newRow, row.nextSibling );
-	else{ tbody.appendChild(newRow); }
+ if(row.nextSibling) tbody.insertBefore( newRow, row.nextSibling );
+ else{ tbody.appendChild(newRow); }
 }
 
 
@@ -140,9 +140,9 @@ function insRow( tbody, row, newRow ) {
   * I.e. I can edit the context item because it's "below" me
   */
 function checkDisabled( node, itemOrg, perm ) {
-	var itemDepth = findOrgDepth(itemOrg);
-	var mydepth = findOrgDepth(PERMS[perm]);
-	if( mydepth != -1 && mydepth <= itemDepth ) node.disabled = false;
+ var itemDepth = findOrgDepth(itemOrg);
+ var mydepth = findOrgDepth(PERMS[perm]);
+ if( mydepth != -1 && mydepth <= itemDepth ) node.disabled = false;
 }
 
 /**
@@ -164,23 +164,23 @@ function checkPermOrgDisabled(node, itemOrg, perm) {
 
 function fetchOrgUnit(id, callback) {
 
-	if(ORG_CACHE[id]) return ORG_CACHE[id];
-	var req = new Request(FETCH_ORG_UNIT, SESSION, id);	
-
-	if(callback) {
-		req.callback(
-			function(r) { 
-				var org = r.getResultObject();
-				ORG_CACHE[id] = org;
-				callback(org); 
-			}
-		);
-		req.send();
-
-	} else {
-		req.send(true);
-		var org = req.result();
-		ORG_CACHE[id] = org;
-		return org;
-	}
+ if(ORG_CACHE[id]) return ORG_CACHE[id];
+ var req = new Request(FETCH_ORG_UNIT, SESSION, id); 
+
+ if(callback) {
+  req.callback(
+   function(r) { 
+    var org = r.getResultObject();
+    ORG_CACHE[id] = org;
+    callback(org); 
+   }
+  );
+  req.send();
+
+ } else {
+  req.send(true);
+  var org = req.result();
+  ORG_CACHE[id] = org;
+  return org;
+ }
 }
diff --git a/Open-ILS/xul/staff_client/server/admin/cash_reports.js b/Open-ILS/xul/staff_client/server/admin/cash_reports.js
index 32e4e1de5f..d62f059248 100644
--- a/Open-ILS/xul/staff_client/server/admin/cash_reports.js
+++ b/Open-ILS/xul/staff_client/server/admin/cash_reports.js
@@ -5,113 +5,113 @@ var myPerms = [ 'VIEW_TRANSACTION' ];
 var crBaseOrg;
 
 function crInit() {
-	fetchUser();
-	$('user').appendChild(text(USER.usrname()));
-
-	setTimeout( 
-		function() { 
-			fetchHighestPermOrgs( SESSION, USER.id(), myPerms );
-			crSetCals();
-			crBuildOrgs();
-			crDrawRange();
-		}, 
-		20 
-	);
+ fetchUser();
+ $('user').appendChild(text(USER.usrname()));
+
+ setTimeout( 
+  function() { 
+   fetchHighestPermOrgs( SESSION, USER.id(), myPerms );
+   crSetCals();
+   crBuildOrgs();
+   crDrawRange();
+  }, 
+  20 
+ );
 }
 
 function crSetCals() {
 
-	Calendar.setup({
-		inputField  : "cr_start",
-		ifFormat    : "%Y-%m-%d",
-		button      : "cr_start_trigger",
-		align       : "Tl",           
-		singleClick : true
-	});
-
-	Calendar.setup({
-		inputField  : "cr_end",
-		ifFormat    : "%Y-%m-%d",
-		button      : "cr_end_trigger",
-		align       : "Tl",           
-		singleClick : true
-	});
-
-	var d = new Date();
-	var y = d.getYear()+1900;
-	var m = ((d.getMonth()+1)+'').replace(/^(\d)$/,'0$1');
-	var da = (d.getDate()+'').replace(/^(\d)$/,'0$1');
-
-	var dat = y+'-'+m+'-'+da;
-	$('cr_start').value = dat;
-	$('cr_end').value = dat;
+ Calendar.setup({
+  inputField  : "cr_start",
+  ifFormat    : "%Y-%m-%d",
+  button      : "cr_start_trigger",
+  align       : "Tl",           
+  singleClick : true
+ });
+
+ Calendar.setup({
+  inputField  : "cr_end",
+  ifFormat    : "%Y-%m-%d",
+  button      : "cr_end_trigger",
+  align       : "Tl",           
+  singleClick : true
+ });
+
+ var d = new Date();
+ var y = d.getYear()+1900;
+ var m = ((d.getMonth()+1)+'').replace(/^(\d)$/,'0$1');
+ var da = (d.getDate()+'').replace(/^(\d)$/,'0$1');
+
+ var dat = y+'-'+m+'-'+da;
+ $('cr_start').value = dat;
+ $('cr_end').value = dat;
 }
 
 
 function crCurrentOrg() {
-	var selector = $('cr_orgs');
-	return getSelectorVal(selector);
+ var selector = $('cr_orgs');
+ return getSelectorVal(selector);
 }
 
 function crBuildOrgs() {
 
-	var org = findOrgUnit(PERMS['VIEW_TRANSACTION']);
+ var org = findOrgUnit(PERMS['VIEW_TRANSACTION']);
 
-	if(!org) {
-		$('cr_orgs').disabled = true;
-		return;
-	}
+ if(!org) {
+  $('cr_orgs').disabled = true;
+  return;
+ }
 
-	org = findOrgUnit(org);
-	var type = findOrgType(org.ou_type()) ;
+ org = findOrgUnit(org);
+ var type = findOrgType(org.ou_type()) ;
 
-	var selector = $('cr_orgs');
-	buildOrgSel(selector, org, type.depth());
+ var selector = $('cr_orgs');
+ buildOrgSel(selector, org, type.depth());
 
-	for( var i = 0; i < selector.options.length; i++ ) {
-		var opt = selector.options[i];
-		if( !isTrue(findOrgType( findOrgUnit(opt.value).ou_type() ).can_have_users()) )
-			opt.disabled = true;
-	}
+ for( var i = 0; i < selector.options.length; i++ ) {
+  var opt = selector.options[i];
+  if( !isTrue(findOrgType( findOrgUnit(opt.value).ou_type() ).can_have_users()) )
+   opt.disabled = true;
+ }
 
-	selector.onchange = crDrawRange;
+ selector.onchange = crDrawRange;
 
-	crBaseOrg = org;
+ crBaseOrg = org;
 
-	var gotoOrg = USER.ws_ou();
-	if( ! setSelector( selector, gotoOrg ) ) {
-		gotoOrg = USER.home_ou();
-		setSelector( selector, gotoOrg );
-	}
+ var gotoOrg = USER.ws_ou();
+ if( ! setSelector( selector, gotoOrg ) ) {
+  gotoOrg = USER.home_ou();
+  setSelector( selector, gotoOrg );
+ }
 
-	return gotoOrg;
+ return gotoOrg;
 }
 
 function crDrawRange() {
-	var org = crCurrentOrg();
-
-	removeChildren($('cr_desk_payments'));
-	removeChildren($('cr_user_payments'));
-
-	var req = new Request( FETCH_DESK_PAYMENTS, SESSION, 
-		org, $('cr_start').value, $('cr_end').value );
-	req.callback(
-		function(r) {
-			drawFMObjectTable( { dest : 'cr_desk_payments', obj : r.getResultObject(), moneySummaryRow : true });
-			sortables_init();
-		}
-	);
-	req.send();
-
-	var req = new Request( FETCH_USER_PAYMENTS, SESSION, 
-		org, $('cr_start').value, $('cr_end').value );
-	req.callback(
-		function(r) {
-			drawFMObjectTable( { dest : 'cr_user_payments', obj : r.getResultObject(), moneySummaryRow : true });
-			sortables_init();
-		}
-	);
-	req.send();
+ var org = crCurrentOrg();
+
+ removeChildren($('cr_desk_payments'));
+ removeChildren($('cr_user_payments'));
+
+ var req = new Request( FETCH_DESK_PAYMENTS, SESSION, 
+  org, $('cr_start').value, $('cr_end').value );
+ req.callback(
+  function(r) {
+   drawFMObjectTable( { dest : 'cr_desk_payments', obj : r.getResultObject(), moneySummaryRow : true });
+   sortables_init();
+  }
+ );
+ req.send();
+
+ var req = new Request( FETCH_USER_PAYMENTS, SESSION, 
+  org, $('cr_start').value, $('cr_end').value );
+ req.callback(
+  function(r) {
+   drawFMObjectTable( { dest : 'cr_user_payments', obj : r.getResultObject(), moneySummaryRow : true });
+   sortables_init();
+  }
+ );
+ req.send();
 }
 
 
diff --git a/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml b/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml
index 51633b339a..e378ec7711 100644
--- a/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml
@@ -1,96 +1,96 @@
 <?xml version='1.0' encoding="UTF-8"?>
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
 
-	<head>
-		<title>&staff.server.admin.cash.title;</title>
-		<script language='javascript' src='/opac/common/js/utils.js'> </script>
-		<script language='javascript' src='/opac/common/js//config.js'> </script>
-		<script language='javascript' src='/opac/common/js/CGI.js'> </script>
-		<script language='javascript' src='/opac/common/js/Cookie.js'> </script>
-	
-		<script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
-		<script language='javascript' src='/opac/common/js/fmall.js'> </script>
-		<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
-		<script language='javascript' src='/opac/common/js/Cookies.js'> </script>
-		<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
-		<script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
-		<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
-		<script language='javascript' src='/opac/common/js/init.js'> </script>
-		<script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
-		<script language='javascript' src='adminlib.js'> </script>
-		<script language='javascript' src='cash_reports.js'> </script>
-
-		<script language='javascript' src='/opac/common/js/sorttable.js'> </script>
-
-		<script language='javascript' src='/opac/common/js/fm_table.js'> </script>
-		<script language='javascript' src='/opac/common/js/fm_table_conf.js'> </script>
-
-		<link rel="stylesheet" type="text/css" media="all" 
-			href="/opac/common/js/jscalendar/calendar-brown.css" title="win2k-cold-1" />
-		<script type="text/javascript" src="/opac/common/js/jscalendar/calendar.js"></script>
-		<script type="text/javascript" src="/opac/common/js/jscalendar/lang/calendar-en.js"></script>
-		<script type="text/javascript" src="/opac/common/js/jscalendar/calendar-setup.js"></script>
-
-
-		<link type='text/css' rel='stylesheet' href='admin.css' />
-		<link type='text/css' rel='stylesheet' href="/opac/common/css/fm_table.css"/>
-	</head>
-
-	<body onload='crInit();'>
-
-		<div class='welcome_box'>
-			<span>&staff.server.admin.cash.welcome;</span><b><span id='user'/></b>
-		</div>
-
-		<center>
-
-			<span style='padding-left: 15px;'>&staff.server.admin.cash.start_date;</span>
-			<input type='text' id='cr_start' size='10' maxlength='10'> </input>
-			<button style='padding: 0px;' id='cr_start_trigger'>
-				<img src="/opac/common/js/jscalendar/img.gif" 
-					style="cursor: pointer; border: 1px solid red; padding: 0px; margin: -3px;" 
-					title="&staff.server.admin.cash.date.select;"
-					onmouseover="this.style.background='red';" 
-					onmouseout="this.style.background=''" />
-			</button>
-
-			<span style='padding-left: 15px;'>&staff.server.admin.cash.end_date;</span>
-			<input type='text' id='cr_end' size='10' maxlength='10'> </input>
-			<button style='padding: 0px;' id='cr_end_trigger'>
-				<img src="/opac/common/js/jscalendar/img.gif" 
-					style="cursor: pointer; border: 1px solid red; padding: 0px; margin: -3px;" 
-					title="&staff.server.admin.cash.date.select;"
-					onmouseover="this.style.background='red';" 
-					onmouseout="this.style.background=''" />
-			</button>
-
-			<div class='pad' style='padding-left: 10px; font-size: 8pt;'>&staff.server.admin.cash.date_format;</div>
-
-			<div>&staff.server.admin.cash.view; <select id='cr_orgs' style='width:auto;'/></div>
-			<div><button onclick='crDrawRange();'>&staff.server.admin.cash.submit;</button></div>
-
-
-			<div id='cr_desk_payments_div'>
-				<h2>&staff.server.admin.cash.desk;</h2>
-				<div id='cr_desk_payments'/>
-			</div>
-			
-			<br/><hr/><br/>
-
-			<div id='cr_user_payments_div'>
-				<h2>&staff.server.admin.cash.user;</h2>
-				<div id='cr_user_payments'/>
-			</div>
-
-		</center>
-	</body>
+ <head>
+  <title>&staff.server.admin.cash.title;</title>
+  <script language='javascript' src='/opac/common/js/utils.js'> </script>
+  <script language='javascript' src='/opac/common/js//config.js'> </script>
+  <script language='javascript' src='/opac/common/js/CGI.js'> </script>
+  <script language='javascript' src='/opac/common/js/Cookie.js'> </script>
+ 
+  <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
+  <script language='javascript' src='/opac/common/js/fmall.js'> </script>
+  <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
+  <script language='javascript' src='/opac/common/js/Cookies.js'> </script>
+  <script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
+  <script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
+  <script language='javascript' src='/opac/common/js/org_utils.js'> </script>
+  <script language='javascript' src='/opac/common/js/init.js'> </script>
+  <script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
+  <script language='javascript' src='adminlib.js'> </script>
+  <script language='javascript' src='cash_reports.js'> </script>
+
+  <script language='javascript' src='/opac/common/js/sorttable.js'> </script>
+
+  <script language='javascript' src='/opac/common/js/fm_table.js'> </script>
+  <script language='javascript' src='/opac/common/js/fm_table_conf.js'> </script>
+
+  <link rel="stylesheet" type="text/css" media="all" 
+   href="/opac/common/js/jscalendar/calendar-brown.css" title="win2k-cold-1" />
+  <script type="text/javascript" src="/opac/common/js/jscalendar/calendar.js"></script>
+  <script type="text/javascript" src="/opac/common/js/jscalendar/lang/calendar-en.js"></script>
+  <script type="text/javascript" src="/opac/common/js/jscalendar/calendar-setup.js"></script>
+
+
+  <link type='text/css' rel='stylesheet' href='admin.css' />
+  <link type='text/css' rel='stylesheet' href="/opac/common/css/fm_table.css"/>
+ </head>
+
+ <body onload='crInit();'>
+
+  <div class='welcome_box'>
+   <span>&staff.server.admin.cash.welcome;</span><b><span id='user'/></b>
+  </div>
+
+  <center>
+
+   <span style='padding-left: 15px;'>&staff.server.admin.cash.start_date;</span>
+   <input type='text' id='cr_start' size='10' maxlength='10'> </input>
+   <button style='padding: 0px;' id='cr_start_trigger'>
+    <img src="/opac/common/js/jscalendar/img.gif" 
+     style="cursor: pointer; border: 1px solid red; padding: 0px; margin: -3px;" 
+     title="&staff.server.admin.cash.date.select;"
+     onmouseover="this.style.background='red';" 
+     onmouseout="this.style.background=''" />
+   </button>
+
+   <span style='padding-left: 15px;'>&staff.server.admin.cash.end_date;</span>
+   <input type='text' id='cr_end' size='10' maxlength='10'> </input>
+   <button style='padding: 0px;' id='cr_end_trigger'>
+    <img src="/opac/common/js/jscalendar/img.gif" 
+     style="cursor: pointer; border: 1px solid red; padding: 0px; margin: -3px;" 
+     title="&staff.server.admin.cash.date.select;"
+     onmouseover="this.style.background='red';" 
+     onmouseout="this.style.background=''" />
+   </button>
+
+   <div class='pad' style='padding-left: 10px; font-size: 8pt;'>&staff.server.admin.cash.date_format;</div>
+
+   <div>&staff.server.admin.cash.view; <select id='cr_orgs' style='width:auto;'/></div>
+   <div><button onclick='crDrawRange();'>&staff.server.admin.cash.submit;</button></div>
+
+
+   <div id='cr_desk_payments_div'>
+    <h2>&staff.server.admin.cash.desk;</h2>
+    <div id='cr_desk_payments'/>
+   </div>
+   
+   <br/><hr/><br/>
+
+   <div id='cr_user_payments_div'>
+    <h2>&staff.server.admin.cash.user;</h2>
+    <div id='cr_user_payments'/>
+   </div>
+
+  </center>
+ </body>
 </html>
 
 
diff --git a/Open-ILS/xul/staff_client/server/admin/closed_dates.js b/Open-ILS/xul/staff_client/server/admin/closed_dates.js
index d87bcb35ee..5e313c0c27 100644
--- a/Open-ILS/xul/staff_client/server/admin/closed_dates.js
+++ b/Open-ILS/xul/staff_client/server/admin/closed_dates.js
@@ -1,7 +1,7 @@
-var FETCH_CLOSED_DATES	= 'open-ils.actor:open-ils.actor.org_unit.closed.retrieve.all';
-var FETCH_CLOSED_DATE	= 'open-ils.actor:open-ils.actor.org_unit.closed.retrieve';
-var CREATE_CLOSED_DATE	= 'open-ils.actor:open-ils.actor.org_unit.closed.create';
-var DELETE_CLOSED_DATE	= 'open-ils.actor:open-ils.actor.org_unit.closed.delete';
+var FETCH_CLOSED_DATES = 'open-ils.actor:open-ils.actor.org_unit.closed.retrieve.all';
+var FETCH_CLOSED_DATE = 'open-ils.actor:open-ils.actor.org_unit.closed.retrieve';
+var CREATE_CLOSED_DATE = 'open-ils.actor:open-ils.actor.org_unit.closed.create';
+var DELETE_CLOSED_DATE = 'open-ils.actor:open-ils.actor.org_unit.closed.delete';
 
 var cdRowTemplate;
 var cdAllDayTemplate;
@@ -17,403 +17,403 @@ var cdBaseOrg;
 
 
 var myPerms = [ 
-	'actor.org_unit.closed_date.delete',
-	'actor.org_unit.closed_date.create',
-	];
+ 'actor.org_unit.closed_date.delete',
+ 'actor.org_unit.closed_date.create',
+ ];
 
 function cdEditorInit() {
 
-	/* set the various template rows */
-	cdTbody = $('cd_tbody');
-	cdRowTemplate					= cdTbody.removeChild($('cd_row'));
-	cdAllDayTemplate				= cdTbody.removeChild($('cd_allday_row'));
-	cdAllMultiDayTemplate		= cdTbody.removeChild($('cd_allmultiday_row'));
-
-	cdInitCals();
-
-	fetchUser();
-	$('cd_user').appendChild(text(USER.usrname()));
-
-	setTimeout( 
-		function() { 
-			fetchHighestPermOrgs( SESSION, USER.id(), myPerms );
-			cdBuildOrgs();
-			cdDrawRange();
-		}, 
-		20 
-	);
+ /* set the various template rows */
+ cdTbody = $('cd_tbody');
+ cdRowTemplate     = cdTbody.removeChild($('cd_row'));
+ cdAllDayTemplate    = cdTbody.removeChild($('cd_allday_row'));
+ cdAllMultiDayTemplate  = cdTbody.removeChild($('cd_allmultiday_row'));
+
+ cdInitCals();
+
+ fetchUser();
+ $('cd_user').appendChild(text(USER.usrname()));
+
+ setTimeout( 
+  function() { 
+   fetchHighestPermOrgs( SESSION, USER.id(), myPerms );
+   cdBuildOrgs();
+   cdDrawRange();
+  }, 
+  20 
+ );
 }
 
 function cdCurrentOrg() {
-	var selector = $('cd_orgs');
-	return getSelectorVal(selector);
+ var selector = $('cd_orgs');
+ return getSelectorVal(selector);
 }
 
 function cdBuildOrgs() {
-	var org = findOrgUnit(PERMS['actor.org_unit.closed_date.create']);
-	if( !org || org == -1 ) org = findOrgUnit(USER.ws_ou());
-	var type = findOrgType(org.ou_type()) ;
+ var org = findOrgUnit(PERMS['actor.org_unit.closed_date.create']);
+ if( !org || org == -1 ) org = findOrgUnit(USER.ws_ou());
+ var type = findOrgType(org.ou_type()) ;
 
-	var selector = $('cd_orgs');
-	buildOrgSel(selector, org, type.depth());
-	if(!type.can_have_users()) selector.options[0].disabled = true;
+ var selector = $('cd_orgs');
+ buildOrgSel(selector, org, type.depth());
+ if(!type.can_have_users()) selector.options[0].disabled = true;
 
 
-	selector.onchange = function() { cdDrawRange(); };
+ selector.onchange = function() { cdDrawRange(); };
 
-	cdBaseOrg = org;
+ cdBaseOrg = org;
 
-	if( cdBaseOrg.children() && cdBaseOrg.children().length > 0 )
-		unHideMe($('cd_apply_all_div'));
+ if( cdBaseOrg.children() && cdBaseOrg.children().length > 0 )
+  unHideMe($('cd_apply_all_div'));
 
-	var gotoOrg = USER.ws_ou();
-	if( ! setSelector( selector, gotoOrg ) ) {
-		gotoOrg = USER.home_ou();
-		setSelector( selector, gotoOrg );
-	}
+ var gotoOrg = USER.ws_ou();
+ if( ! setSelector( selector, gotoOrg ) ) {
+  gotoOrg = USER.home_ou();
+  setSelector( selector, gotoOrg );
+ }
 
-	var neworg = findOrgUnit(PERMS['actor.org_unit.closed_date.create']);
-	if(!neworg || neworg == -1 || !orgIsMine(neworg, findOrgUnit(cdCurrentOrg()))) {
-		$('cd_new_allday').disabled = true;
-		$('cd_new_multiday').disabled = true;
-		$('cd_new').disabled = true;
-	}
+ var neworg = findOrgUnit(PERMS['actor.org_unit.closed_date.create']);
+ if(!neworg || neworg == -1 || !orgIsMine(neworg, findOrgUnit(cdCurrentOrg()))) {
+  $('cd_new_allday').disabled = true;
+  $('cd_new_multiday').disabled = true;
+  $('cd_new').disabled = true;
+ }
 
-	return gotoOrg;
+ return gotoOrg;
 }
 
 function cdInitCals() {
 
-	Calendar.setup({
-		inputField  : "cd_edit_allday_start_date",
-		ifFormat    : "%Y-%m-%d",
-		button      : "cd_edit_allday_start_date_img",
-		align       : "Tl",
-		singleClick : true
-	});
-
-	Calendar.setup({
-		inputField  : "cd_edit_allmultiday_start_date",
-		ifFormat    : "%Y-%m-%d",
-		button      : "cd_edit_allmultiday_start_date_img",
-		align       : "Tl",
-		singleClick : true
-	});
-
-	Calendar.setup({
-		inputField  : "cd_edit_allmultiday_end_date",
-		ifFormat    : "%Y-%m-%d",
-		button      : "cd_edit_allmultiday_end_date_img",
-		align       : "Tl",
-		singleClick : true
-	});
-
-	Calendar.setup({
-		inputField  : "cd_edit_end_date",
-		ifFormat    : "%Y-%m-%d",
-		button      : "cd_edit_end_date_img",
-		align       : "Tl",
-		singleClick : true
-	});
-
-	Calendar.setup({
-		inputField  : "cd_edit_start_date",
-		ifFormat    : "%Y-%m-%d",
-		button      : "cd_edit_start_date_img",
-		align       : "Tl",
-		singleClick : true
-	});
+ Calendar.setup({
+  inputField  : "cd_edit_allday_start_date",
+  ifFormat    : "%Y-%m-%d",
+  button      : "cd_edit_allday_start_date_img",
+  align       : "Tl",
+  singleClick : true
+ });
+
+ Calendar.setup({
+  inputField  : "cd_edit_allmultiday_start_date",
+  ifFormat    : "%Y-%m-%d",
+  button      : "cd_edit_allmultiday_start_date_img",
+  align       : "Tl",
+  singleClick : true
+ });
+
+ Calendar.setup({
+  inputField  : "cd_edit_allmultiday_end_date",
+  ifFormat    : "%Y-%m-%d",
+  button      : "cd_edit_allmultiday_end_date_img",
+  align       : "Tl",
+  singleClick : true
+ });
+
+ Calendar.setup({
+  inputField  : "cd_edit_end_date",
+  ifFormat    : "%Y-%m-%d",
+  button      : "cd_edit_end_date_img",
+  align       : "Tl",
+  singleClick : true
+ });
+
+ Calendar.setup({
+  inputField  : "cd_edit_start_date",
+  ifFormat    : "%Y-%m-%d",
+  button      : "cd_edit_start_date_img",
+  align       : "Tl",
+  singleClick : true
+ });
 
 
 }
 
 function cdDrawRange( start, end, alertSuccess ) {
-	start = (start) ? start : new Date().getYear() + 1899 + '-01-01'; /* include last year's closed info for comparison */
-	end = (end) ? end : '3001-01-01';
+ start = (start) ? start : new Date().getYear() + 1899 + '-01-01'; /* include last year's closed info for comparison */
+ end = (end) ? end : '3001-01-01';
 
     if(alertSuccess) alertId('cd_update_success');
 
-	selectedStart = start;
-	selectedEnd = end;
-
-	var req = new Request(
-		FETCH_CLOSED_DATES, SESSION, 
-		{
-			orgid			: cdCurrentOrg(),
-			start_date	: start,
-			end_date		: end,
-			idlist		: 0
-		}
-	);
-
-	req.callback( cdBuild );
-	req.send();  
+ selectedStart = start;
+ selectedEnd = end;
+
+ var req = new Request(
+  FETCH_CLOSED_DATES, SESSION, 
+  {
+   orgid   : cdCurrentOrg(),
+   start_date : start,
+   end_date  : end,
+   idlist  : 0
+  }
+ );
+
+ req.callback( cdBuild );
+ req.send();  
 }
 
 /* adds one row in the display table per date */
 function cdBuild(r) {
-	var dates = r.getResultObject();
-	removeChildren(cdTbody);
-	for( var d = 0; d < dates.length; d++ ) {
-		var date = dates[d];
-		var row = cdBuildRow( date );
-		cdTbody.appendChild(row);
-	}
+ var dates = r.getResultObject();
+ removeChildren(cdTbody);
+ for( var d = 0; d < dates.length; d++ ) {
+  var date = dates[d];
+  var row = cdBuildRow( date );
+  cdTbody.appendChild(row);
+ }
 }
 
 function cdDateToHours(date) {
-	var d = new Date.W3CDTF();
-	d.setW3CDTF(date.replace(/\.\d+/,'') + ":00");
+ var d = new Date.W3CDTF();
+ d.setW3CDTF(date.replace(/\.\d+/,'') + ":00");
 
-	var h = d.getHours() +'';
-	var m = d.getMinutes() +'';
-	var s = d.getSeconds() +'';
+ var h = d.getHours() +'';
+ var m = d.getMinutes() +'';
+ var s = d.getSeconds() +'';
 
-	if(h.length == 1) h = '0'+h;
-	if(m.length == 1) m = '0'+m;
-	if(s.length == 1) s = '0'+s;
+ if(h.length == 1) h = '0'+h;
+ if(m.length == 1) m = '0'+m;
+ if(s.length == 1) s = '0'+s;
 
-	return  h + ':' + m + ':' + s;
+ return  h + ':' + m + ':' + s;
 }
 
 function cdDateToDate(date) {
-	var d = new Date.W3CDTF();
-	d.setW3CDTF(date.replace(/\.\d+/,'') + ":00");
+ var d = new Date.W3CDTF();
+ d.setW3CDTF(date.replace(/\.\d+/,'') + ":00");
 
-	var y = d.getFullYear()+'';
-	var m = (d.getMonth() + 1)+'';
-	var d = d.getDate()+'';
+ var y = d.getFullYear()+'';
+ var m = (d.getMonth() + 1)+'';
+ var d = d.getDate()+'';
 
-	if(m.length == 1) m = '0'+m;
-	if(d.length == 1) d = '0'+d;
+ if(m.length == 1) m = '0'+m;
+ if(d.length == 1) d = '0'+d;
 
-	return  y + '-' + m + '-' + d;
+ return  y + '-' + m + '-' + d;
 }
 
 
 /* fleshes a single date */
 function cdBuildRow( date ) {
 
-	cdDateCache[date.id()] = date;
+ cdDateCache[date.id()] = date;
 
-	var sh = cdDateToHours(date.close_start());
-	var sd = cdDateToDate(date.close_start());
-	var eh = cdDateToHours(date.close_end());
-	var ed = cdDateToDate(date.close_end());
+ var sh = cdDateToHours(date.close_start());
+ var sd = cdDateToDate(date.close_start());
+ var eh = cdDateToHours(date.close_end());
+ var ed = cdDateToDate(date.close_end());
 
-	var row;
-	var flesh = false;
+ var row;
+ var flesh = false;
 
-	if( sh == '00:00:00' && eh == '23:59:59' ) {
+ if( sh == '00:00:00' && eh == '23:59:59' ) {
 
-		if( sd == ed ) {
-			row = cdAllDayTemplate.cloneNode(true);
-			$n(row, 'start_date').appendChild(text(sd));
+  if( sd == ed ) {
+   row = cdAllDayTemplate.cloneNode(true);
+   $n(row, 'start_date').appendChild(text(sd));
 
-		} else {
-			row = cdAllMultiDayTemplate.cloneNode(true);
-			$n(row, 'start_date').appendChild(text(sd));
-			$n(row, 'end_date').appendChild(text(ed));
-		}
+  } else {
+   row = cdAllMultiDayTemplate.cloneNode(true);
+   $n(row, 'start_date').appendChild(text(sd));
+   $n(row, 'end_date').appendChild(text(ed));
+  }
 
-	} else {
+ } else {
 
-		row = cdRowTemplate.cloneNode(true);	
-		cdEditFleshRow(row, date);
-	}
+  row = cdRowTemplate.cloneNode(true); 
+  cdEditFleshRow(row, date);
+ }
 
-	$n(row,'delete').onclick = function() { cdDelete(row, date); };
-	$n(row, 'note').appendChild(text(date.reason()));
+ $n(row,'delete').onclick = function() { cdDelete(row, date); };
+ $n(row, 'note').appendChild(text(date.reason()));
 
-	/* if we don't have delete perms for this location, disable the button */
-	var delorg = findOrgUnit(PERMS['actor.org_unit.closed_date.delete']);
-	if(!orgIsMine(delorg, findOrgUnit(cdCurrentOrg()))) $n(row,'delete').disabled = true;
+ /* if we don't have delete perms for this location, disable the button */
+ var delorg = findOrgUnit(PERMS['actor.org_unit.closed_date.delete']);
+ if(!orgIsMine(delorg, findOrgUnit(cdCurrentOrg()))) $n(row,'delete').disabled = true;
 
-	return row;
+ return row;
 }
 
 function cdEditFleshRow(row, date) {
-	$n(row, 'start_time').appendChild(text(cdDateToHours(date.close_start())));
-	$n(row, 'start_date').appendChild(text(cdDateToDate(date.close_start())));
-	$n(row, 'end_time').appendChild(text(cdDateToHours(date.close_end())));
-	$n(row, 'end_date').appendChild(text(cdDateToDate(date.close_end())));
+ $n(row, 'start_time').appendChild(text(cdDateToHours(date.close_start())));
+ $n(row, 'start_date').appendChild(text(cdDateToDate(date.close_start())));
+ $n(row, 'end_time').appendChild(text(cdDateToHours(date.close_end())));
+ $n(row, 'end_date').appendChild(text(cdDateToDate(date.close_end())));
 }
 
 
 function cdShowEditRow(id) {
-	cdCancelEdit();
-	unHideMe($(id));
-	unHideMe($('cd_edit_submit'));
-	unHideMe($('cd_edit_note_row'));
+ cdCancelEdit();
+ unHideMe($(id));
+ unHideMe($('cd_edit_submit'));
+ unHideMe($('cd_edit_note_row'));
 }
 
 function cdCancelEdit() {
-	hideMe($('cd_edit_row'));
-	hideMe($('cd_edit_allday_row'));
-	hideMe($('cd_edit_allmultiday_row'));
-	hideMe($('cd_edit_submit'));
-	hideMe($('cd_edit_note_row'));
+ hideMe($('cd_edit_row'));
+ hideMe($('cd_edit_allday_row'));
+ hideMe($('cd_edit_allmultiday_row'));
+ hideMe($('cd_edit_submit'));
+ hideMe($('cd_edit_note_row'));
 }
 
 
 
 
 function cdDelete(row, date) {
-	if(!confirmId('cd_confirm_delete')) return;
-	var req = new Request(DELETE_CLOSED_DATE, SESSION, date.id() );
-	req.callback(
-		function(r) {
-			var res = r.getResultObject();
-			if( checkILSEvent(res) ) alertILSEvent(res);
-			cdDrawRange(selectedStart, selectedEnd, true);
-		}
-	)
-	req.send();
+ if(!confirmId('cd_confirm_delete')) return;
+ var req = new Request(DELETE_CLOSED_DATE, SESSION, date.id() );
+ req.callback(
+  function(r) {
+   var res = r.getResultObject();
+   if( checkILSEvent(res) ) alertILSEvent(res);
+   cdDrawRange(selectedStart, selectedEnd, true);
+  }
+ )
+ req.send();
 }
 
 
 /* getW3CDTF */
 
 function cdVerifyDate(d) {
-	return d && d.match(/\d{4}-\d{2}-\d{2}/);
+ return d && d.match(/\d{4}-\d{2}-\d{2}/);
 }
 
 function cdVerifyTime(t) {
-	return t && t.match(/\d{2}:\d{2}:\d{2}/);
+ return t && t.match(/\d{2}:\d{2}:\d{2}/);
 }
 
 function cdDateStrToDate( str ) {
 
-	var date = new Date.W3CDTF();
-	var data = str.split(/ /);
+ var date = new Date.W3CDTF();
+ var data = str.split(/ /);
 
-	var year = data[0];
-	var time = data[1];
+ var year = data[0];
+ var time = data[1];
 
-	if(!cdVerifyDate(year)) return alertId('cd_invalid_date');
-	if(!cdVerifyTime(time)) return alertId('cd_invalid_time');
+ if(!cdVerifyDate(year)) return alertId('cd_invalid_date');
+ if(!cdVerifyTime(time)) return alertId('cd_invalid_time');
 
-	var yeardata = year.split(/-/);
-	var timedata = time.split(/:/);
+ var yeardata = year.split(/-/);
+ var timedata = time.split(/:/);
     
     /*  seed the date with day = 1, which is a valid day for any month.  
         this prevents automatic date correction by the date code for days that 
         fall outside of the current or target month */
     date.setDate(1);
 
-	date.setFullYear(new Number(yeardata[0]));
-	date.setMonth(new Number(yeardata[1]) - 1);
+ date.setFullYear(new Number(yeardata[0]));
+ date.setMonth(new Number(yeardata[1]) - 1);
     date.setDate(new Number(yeardata[2]));
 
-	date.setHours(new Number(timedata[0]));
-	date.setMinutes(new Number(timedata[1]));
-	date.setSeconds(new Number(timedata[2]));
+ date.setHours(new Number(timedata[0]));
+ date.setMinutes(new Number(timedata[1]));
+ date.setSeconds(new Number(timedata[2]));
 
-	return date;
+ return date;
 }
 
 function cdNew() {
 
-	var start;
-	var end;
+ var start;
+ var end;
 
-	if( ! $('cd_edit_allday_row').className.match(/hide_me/) ) {
+ if( ! $('cd_edit_allday_row').className.match(/hide_me/) ) {
 
-		var date = $('cd_edit_allday_start_date').value;
+  var date = $('cd_edit_allday_start_date').value;
 
-		start = cdDateStrToDate(date + ' 00:00:00');
-		end = cdDateStrToDate(date + ' 23:59:59');
+  start = cdDateStrToDate(date + ' 00:00:00');
+  end = cdDateStrToDate(date + ' 23:59:59');
 
-	} else if( ! $('cd_edit_allmultiday_row').className.match(/hide_me/) ) {
+ } else if( ! $('cd_edit_allmultiday_row').className.match(/hide_me/) ) {
 
-		var sdate = $('cd_edit_allmultiday_start_date').value;
-		var edate = $('cd_edit_allmultiday_end_date').value;
-		start = cdDateStrToDate(sdate + ' 00:00:00');
-		end = cdDateStrToDate(edate + ' 23:59:59');
+  var sdate = $('cd_edit_allmultiday_start_date').value;
+  var edate = $('cd_edit_allmultiday_end_date').value;
+  start = cdDateStrToDate(sdate + ' 00:00:00');
+  end = cdDateStrToDate(edate + ' 23:59:59');
 
-	} else {
+ } else {
 
-		var sdate = $('cd_edit_start_date').value;
-		var edate = $('cd_edit_end_date').value;
-		var stime;
-		var etime;
+  var sdate = $('cd_edit_start_date').value;
+  var edate = $('cd_edit_end_date').value;
+  var stime;
+  var etime;
 
-		if($('cd_edit_start_time_allday').checked) {
-			stime = '00:00';
-		} else {
-			stime = $('cd_edit_start_time').value;
-		}
+  if($('cd_edit_start_time_allday').checked) {
+   stime = '00:00';
+  } else {
+   stime = $('cd_edit_start_time').value;
+  }
 
-		stime += ':00';
+  stime += ':00';
 
-		if($('cd_edit_end_time_allday').checked) {
-			etime = '23:59:59';
-		} else {
-			etime = $('cd_edit_end_time').value;
-			etime += ':00';
-		}
+  if($('cd_edit_end_time_allday').checked) {
+   etime = '23:59:59';
+  } else {
+   etime = $('cd_edit_end_time').value;
+   etime += ':00';
+  }
 
-		start = cdDateStrToDate(sdate + ' ' + stime);
-		end = cdDateStrToDate(edate + ' ' + etime);
-	}
+  start = cdDateStrToDate(sdate + ' ' + stime);
+  end = cdDateStrToDate(edate + ' ' + etime);
+ }
 
-	cdCreate(start, end, $('cd_edit_note').value);
+ cdCreate(start, end, $('cd_edit_note').value);
 }
 
 function cdCreate(start, end, note) {
 
-	if( $('cd_apply_all').checked ) {
-		var list = cdGetOrgList();
-		for( var o = 0; o < list.length; o++ ) {
-			var id = list[o].id();
-			cdCreateOne( id, start, end, note, (id == cdCurrentOrg()) );
-		}
+ if( $('cd_apply_all').checked ) {
+  var list = cdGetOrgList();
+  for( var o = 0; o < list.length; o++ ) {
+   var id = list[o].id();
+   cdCreateOne( id, start, end, note, (id == cdCurrentOrg()) );
+  }
 
-	} else {
+ } else {
 
-		cdCreateOne( cdCurrentOrg(), start, end, note, true );
-	}
+  cdCreateOne( cdCurrentOrg(), start, end, note, true );
+ }
 }
 
 function cdGetOrgList(org) {
-	if(!org) org = cdBaseOrg;
-
-	var list = [];
-	var type = findOrgType(org.ou_type()) ;
-	if( type.can_have_users() ) list.push(org);
-
-	if( org.children() ) {
-		for( var i = 0; i < org.children().length; i++ ) {
-			var child = org.children()[i];
-			if( child ) {
-				var l = cdGetOrgList(child);
-				for( var j = 0; j < l.length; j++ )
-					list.push(l[j]);
-			}
-		}
-	}
-
-	return list;
+ if(!org) org = cdBaseOrg;
+
+ var list = [];
+ var type = findOrgType(org.ou_type()) ;
+ if( type.can_have_users() ) list.push(org);
+
+ if( org.children() ) {
+  for( var i = 0; i < org.children().length; i++ ) {
+   var child = org.children()[i];
+   if( child ) {
+    var l = cdGetOrgList(child);
+    for( var j = 0; j < l.length; j++ )
+     list.push(l[j]);
+   }
+  }
+ }
+
+ return list;
 }
 
 
 function cdCreateOne( org, start, end, note, refresh ) {
-	var date = new aoucd();
-
-	date.close_start(start.getW3CDTF());
-	date.close_end(end.getW3CDTF());
-	date.org_unit(org);
-	date.reason(note);
-
-	var req = new Request(CREATE_CLOSED_DATE, SESSION, date);
-	req.callback(
-		function(r) {
-			var res = r.getResultObject();
-			if( checkILSEvent(res) ) alertILSEvent(res);
-			if(refresh) cdDrawRange(selectedStart, selectedEnd, true);
-		}
-	);
-	req.send();
+ var date = new aoucd();
+
+ date.close_start(start.getW3CDTF());
+ date.close_end(end.getW3CDTF());
+ date.org_unit(org);
+ date.reason(note);
+
+ var req = new Request(CREATE_CLOSED_DATE, SESSION, date);
+ req.callback(
+  function(r) {
+   var res = r.getResultObject();
+   if( checkILSEvent(res) ) alertILSEvent(res);
+   if(refresh) cdDrawRange(selectedStart, selectedEnd, true);
+  }
+ );
+ req.send();
 }
 
 
diff --git a/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml b/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
index 78a13390d4..963fadc9e2 100644
--- a/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
@@ -1,233 +1,233 @@
 <?xml version='1.0' encoding="UTF-8"?>
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
 
-	<head>
-		<title>&staff.server.admin.closed_dates.title;</title>
-		<script type='text/javascript' src='/opac/common/js/utils.js'> </script>
-		<script type='text/javascript' src='/opac/common/js/config.js'> </script>
-		<script type='text/javascript' src='/opac/common/js/CGI.js'> </script>
-		<script type='text/javascript' src='/opac/common/js/JSON_v1.js'> </script>
-		<script type='text/javascript' src='/opac/common/js/fmall.js'> </script>
-		<script type='text/javascript' src='/opac/common/js/fmgen.js'> </script>
-		<script type='text/javascript' src='/opac/common/js/Cookies.js'> </script>
-		<script type='text/javascript' src='/opac/common/js/opac_utils.js'> </script>
-		<script type='text/javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
-		<script type='text/javascript' src='/opac/common/js/org_utils.js'> </script>
-		<script type='text/javascript' src='/opac/common/js/init.js'> </script>
-		<script type='text/javascript' src='/opac/common/js/RemoteRequest.js'> </script>
-		<script type='text/javascript' src='/opac/common/js/Date.W3CDTF.js'> </script>
-		<script type='text/javascript' src='adminlib.js'> </script>
-		<script type='text/javascript' src='closed_dates.js'> </script>
-
-		<link rel="stylesheet" type="text/css" media="all" 
-			href="/opac/common/js/jscalendar/calendar-brown.css" title="win2k-cold-1" />
-		<script type="text/javascript" src="/opac/common/js/jscalendar/calendar.js"></script>
-		<script type="text/javascript" src="/opac/common/js/jscalendar/lang/calendar-en.js"></script>
-		<script type="text/javascript" src="/opac/common/js/jscalendar/calendar-setup.js"></script>
-
-		<link type='text/css' rel='stylesheet' href='admin.css'/>
-
-		<style type='text/css'>
-			span { padding: 6px; }
-			b { padding: 6px; }
-		</style>
-	</head>
-
-	<body onload='try{cdEditorInit();}catch(e){alert(js2JSON(e));}'>
-
-		<div class='welcome_box'>
-			<span>&staff.server.admin.closed_dates.welcome;</span><b><span id='cd_user'/></b>
-		</div>
-
-		<center>
-			<div class='title'>&staff.server.admin.closed_dates.editor.title;</div>
-
-			<br/>
-			&staff.server.admin.closed_dates.editor.for;<select id='cd_orgs'  style='width:auto;'/>
-			<br/><br/>
-
-			<table class='data_grid data_grid_center' style='width: 80%; padding: 8px;'>
-				<thead>
-					<tr>
-						<td>&staff.server.admin.closed_dates.editor.duration;</td>
-						<td>&staff.server.admin.closed_dates.editor.reason;</td>
-						<td>&staff.server.admin.closed_dates.editor.delete;</td>
-					</tr>
-				</thead>
-				<tbody id='cd_tbody'>
-
-					<tr id='cd_row'>
-						<td align='left'>
-							From
-							<b name='start_date'/> at <b name='start_time'/>
-							<span> through </span>
-							<b name='end_date'/> at <b name='end_time'/>
-						</td>
-						<td><div name='note'/></td>
-						<td><button name='delete'>delete</button></td>
-					</tr>
-
-					<tr id='cd_allday_row'>
-						<td align='left'>
-							All Day <b name='start_date'/>
-						</td>
-						<td><div name='note'/></td>
-						<td><button name='delete'>delete</button></td>
-					</tr>
-
-
-					<tr id='cd_allmultiday_row'>
-						<td align='left'>
-							Every Day From <b name='start_date'/> through <b name='end_date'/>
-						</td>
-						<td><div name='note'/></td>
-						<td><button name='delete'>&staff.server.admin.closed_dates.editor.allmultiday.delete;</button></td>
-					</tr>
-
-				</tbody>
-			</table>
-
-			<br/>
-			<div style='width: 80%'>
-				&staff.server.admin.closed_dates.editor.allmultiday.format;
-			</div>
-
-			<br/>
-		
-			<table class='data_grid data_grid_center' style='width: 80%; padding: 8px;'>
-				<tr>
-					<td width='100%' align='center' style='border: 1px solid #F0E0F0;'>
-						<button id='cd_new_allday' 
-							onclick="cdShowEditRow('cd_edit_allday_row');">&staff.server.admin.closed_dates.add.allday;</button>
-						<button id='cd_new_multiday' 
-							onclick="cdShowEditRow('cd_edit_allmultiday_row');">&staff.server.admin.closed_dates.add.multiday;</button>
-						<button id='cd_new' 
-							onclick="cdShowEditRow('cd_edit_row');">&staff.server.admin.closed_dates.add.detailed;</button>
-					</td>
-				</tr>
-			</table>
-		
-			<table class='data_grid data_grid_center' style='width: 80%; padding: 8px;'>
-				<tbody id='cd_edit_tbody'>
-		
-					<tr id='cd_edit_row' class='hide_me'>
-						<td>
-						<table class='data_grid data_grid_center' style='width: 100%;'>
-							<thead>
-								<tr>
-									<td>&staff.server.admin.closed_dates.date.start;</td>
-									<td>&staff.server.admin.closed_dates.time.start;</td>
-									<td>&staff.server.admin.closed_dates.date.end;</td>
-									<td>&staff.server.admin.closed_dates.time.end;</td>
-								</tr>
-							</thead>
-							<tbody>
-								<tr>
-									<td>
-										<input id='cd_edit_start_date' type='text' size='10' maxlength='10'/>
-										<img src="/opac/common/js/jscalendar/img.gif"  
-											id='cd_edit_start_date_img' class='cal_img'/>
-									</td>
-
-									<td>
-										<table width='100%'><tbody><tr><td>
-											<input id='cd_edit_start_time' type='text' size='5' maxlength='5'/>
-										</td>
-										<td>
-											<div style='font-size: 80%;'>&staff.server.admin.closed_dates.allday.label;</div>
-											<input type='checkbox' id='cd_edit_start_time_allday'
-												onclick='
-													var input = $("cd_edit_start_time");
-													input.disabled = !input.disabled;'/>
-										</td></tr></tbody></table>
-									</td>
-
-									<td>
-										<input id='cd_edit_end_date' type='text' size='10' maxlength='10'/>
-										<img src="/opac/common/js/jscalendar/img.gif"  
-											id='cd_edit_end_date_img' class='cal_img'/>
-									</td>
-
-									<td>
-										<table width='100%'><tbody><tr><td>
-											<input id='cd_edit_end_time' type='text' size='5' maxlength='5'/>
-										</td>
-										<td>
-											<div style='font-size: 80%;'>&staff.server.admin.closed_dates.allday.label;</div>
-											<input type='checkbox' id='cd_edit_end_time_allday'
-												onclick='
-													var input = $("cd_edit_end_time");
-													input.disabled = !input.disabled;'/>
-										</td></tr></tbody></table>
-									</td>
-
-								</tr>
-							</tbody>
-						</table>
-						</td>
-					</tr>
-		
-					<tr id='cd_edit_allday_row' class='hide_me'>
-						<td>	
-							<span> &staff.server.admin.closed_dates.allday.label; </span>
-							<input id='cd_edit_allday_start_date' type='text' size='10' maxlength='10'/>
-							<img src="/opac/common/js/jscalendar/img.gif"  
-								id='cd_edit_allday_start_date_img' class='cal_img'/>
-						</td>
-					</tr>
-		
-					<tr id='cd_edit_allmultiday_row' class='hide_me'>
-						<td>	
-
-							<span> All Day From </span>
-							<input id='cd_edit_allmultiday_start_date' type='text' size='10' maxlength='10'/>
-							<img src="/opac/common/js/jscalendar/img.gif"  
-								id='cd_edit_allmultiday_start_date_img' class='cal_img'/>
-
-							<span> Through</span>
-
-							<input id='cd_edit_allmultiday_end_date' type='text' size='10' maxlength='10'/>
-							<img src="/opac/common/js/jscalendar/img.gif"  
-								id='cd_edit_allmultiday_end_date_img' class='cal_img'/>
-						</td>
-					</tr>
-
-					<tr id='cd_edit_note_row' class='hide_me' valign='middle'>
-						<td>
-							<div>&staff.server.admin.closed_dates.editor.reason.label;</div>
-							<textarea style='border: 1px solid blue; background: #E0F0E0; margin: 5px;' 
-								id='cd_edit_note' wrap='soft' cols='40' rows='3'/>
-							<div id='cd_apply_all_div' class='hide_me'>
-								&staff.server.admin.closed_dates.apply_all; <input type='checkbox' id='cd_apply_all'/>
-							</div>
-						</td>
-					</tr>
-
-					<tr id='cd_edit_submit' class='hide_me'>
-						<td>
-							<button onclick='cdNew();'>&staff.server.admin.closed_dates.save;</button>
-							<button onclick='cdCancelEdit();'>&staff.server.admin.closed_dates.cancel;</button>
-						</td>
-					</tr>
-
-		
-				</tbody>
-			</table>
-
-			<span class='hide_me' id='cd_all_day'>&staff.server.admin.closed_dates.allday.label;</span>
-			<span class='hide_me' id='cd_confirm_delete'>&staff.server.admin.closed_dates.confirm_delete;</span>
-			<span class='hide_me' id='cd_invalid_date'>&staff.server.admin.closed_dates.date.invalid;</span>
-			<span class='hide_me' id='cd_invalid_time'>&staff.server.admin.closed_dates.time.invalid;</span>
-			<span class='hide_me' id='cd_update_success'>&staff.server.admin.closed_dates.success;</span>
-		
-		</center>
-	</body>
+ <head>
+  <title>&staff.server.admin.closed_dates.title;</title>
+  <script type='text/javascript' src='/opac/common/js/utils.js'> </script>
+  <script type='text/javascript' src='/opac/common/js/config.js'> </script>
+  <script type='text/javascript' src='/opac/common/js/CGI.js'> </script>
+  <script type='text/javascript' src='/opac/common/js/JSON_v1.js'> </script>
+  <script type='text/javascript' src='/opac/common/js/fmall.js'> </script>
+  <script type='text/javascript' src='/opac/common/js/fmgen.js'> </script>
+  <script type='text/javascript' src='/opac/common/js/Cookies.js'> </script>
+  <script type='text/javascript' src='/opac/common/js/opac_utils.js'> </script>
+  <script type='text/javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
+  <script type='text/javascript' src='/opac/common/js/org_utils.js'> </script>
+  <script type='text/javascript' src='/opac/common/js/init.js'> </script>
+  <script type='text/javascript' src='/opac/common/js/RemoteRequest.js'> </script>
+  <script type='text/javascript' src='/opac/common/js/Date.W3CDTF.js'> </script>
+  <script type='text/javascript' src='adminlib.js'> </script>
+  <script type='text/javascript' src='closed_dates.js'> </script>
+
+  <link rel="stylesheet" type="text/css" media="all" 
+   href="/opac/common/js/jscalendar/calendar-brown.css" title="win2k-cold-1" />
+  <script type="text/javascript" src="/opac/common/js/jscalendar/calendar.js"></script>
+  <script type="text/javascript" src="/opac/common/js/jscalendar/lang/calendar-en.js"></script>
+  <script type="text/javascript" src="/opac/common/js/jscalendar/calendar-setup.js"></script>
+
+  <link type='text/css' rel='stylesheet' href='admin.css'/>
+
+  <style type='text/css'>
+   span { padding: 6px; }
+   b { padding: 6px; }
+  </style>
+ </head>
+
+ <body onload='try{cdEditorInit();}catch(e){alert(js2JSON(e));}'>
+
+  <div class='welcome_box'>
+   <span>&staff.server.admin.closed_dates.welcome;</span><b><span id='cd_user'/></b>
+  </div>
+
+  <center>
+   <div class='title'>&staff.server.admin.closed_dates.editor.title;</div>
+
+   <br/>
+   &staff.server.admin.closed_dates.editor.for;<select id='cd_orgs'  style='width:auto;'/>
+   <br/><br/>
+
+   <table class='data_grid data_grid_center' style='width: 80%; padding: 8px;'>
+    <thead>
+     <tr>
+      <td>&staff.server.admin.closed_dates.editor.duration;</td>
+      <td>&staff.server.admin.closed_dates.editor.reason;</td>
+      <td>&staff.server.admin.closed_dates.editor.delete;</td>
+     </tr>
+    </thead>
+    <tbody id='cd_tbody'>
+
+     <tr id='cd_row'>
+      <td align='left'>
+       From
+       <b name='start_date'/> at <b name='start_time'/>
+       <span> through </span>
+       <b name='end_date'/> at <b name='end_time'/>
+      </td>
+      <td><div name='note'/></td>
+      <td><button name='delete'>delete</button></td>
+     </tr>
+
+     <tr id='cd_allday_row'>
+      <td align='left'>
+       All Day <b name='start_date'/>
+      </td>
+      <td><div name='note'/></td>
+      <td><button name='delete'>delete</button></td>
+     </tr>
+
+
+     <tr id='cd_allmultiday_row'>
+      <td align='left'>
+       Every Day From <b name='start_date'/> through <b name='end_date'/>
+      </td>
+      <td><div name='note'/></td>
+      <td><button name='delete'>&staff.server.admin.closed_dates.editor.allmultiday.delete;</button></td>
+     </tr>
+
+    </tbody>
+   </table>
+
+   <br/>
+   <div style='width: 80%'>
+    &staff.server.admin.closed_dates.editor.allmultiday.format;
+   </div>
+
+   <br/>
+  
+   <table class='data_grid data_grid_center' style='width: 80%; padding: 8px;'>
+    <tr>
+     <td width='100%' align='center' style='border: 1px solid #F0E0F0;'>
+      <button id='cd_new_allday' 
+       onclick="cdShowEditRow('cd_edit_allday_row');">&staff.server.admin.closed_dates.add.allday;</button>
+      <button id='cd_new_multiday' 
+       onclick="cdShowEditRow('cd_edit_allmultiday_row');">&staff.server.admin.closed_dates.add.multiday;</button>
+      <button id='cd_new' 
+       onclick="cdShowEditRow('cd_edit_row');">&staff.server.admin.closed_dates.add.detailed;</button>
+     </td>
+    </tr>
+   </table>
+  
+   <table class='data_grid data_grid_center' style='width: 80%; padding: 8px;'>
+    <tbody id='cd_edit_tbody'>
+  
+     <tr id='cd_edit_row' class='hide_me'>
+      <td>
+      <table class='data_grid data_grid_center' style='width: 100%;'>
+       <thead>
+        <tr>
+         <td>&staff.server.admin.closed_dates.date.start;</td>
+         <td>&staff.server.admin.closed_dates.time.start;</td>
+         <td>&staff.server.admin.closed_dates.date.end;</td>
+         <td>&staff.server.admin.closed_dates.time.end;</td>
+        </tr>
+       </thead>
+       <tbody>
+        <tr>
+         <td>
+          <input id='cd_edit_start_date' type='text' size='10' maxlength='10'/>
+          <img src="/opac/common/js/jscalendar/img.gif"  
+           id='cd_edit_start_date_img' class='cal_img'/>
+         </td>
+
+         <td>
+          <table width='100%'><tbody><tr><td>
+           <input id='cd_edit_start_time' type='text' size='5' maxlength='5'/>
+          </td>
+          <td>
+           <div style='font-size: 80%;'>&staff.server.admin.closed_dates.allday.label;</div>
+           <input type='checkbox' id='cd_edit_start_time_allday'
+            onclick='
+             var input = $("cd_edit_start_time");
+             input.disabled = !input.disabled;'/>
+          </td></tr></tbody></table>
+         </td>
+
+         <td>
+          <input id='cd_edit_end_date' type='text' size='10' maxlength='10'/>
+          <img src="/opac/common/js/jscalendar/img.gif"  
+           id='cd_edit_end_date_img' class='cal_img'/>
+         </td>
+
+         <td>
+          <table width='100%'><tbody><tr><td>
+           <input id='cd_edit_end_time' type='text' size='5' maxlength='5'/>
+          </td>
+          <td>
+           <div style='font-size: 80%;'>&staff.server.admin.closed_dates.allday.label;</div>
+           <input type='checkbox' id='cd_edit_end_time_allday'
+            onclick='
+             var input = $("cd_edit_end_time");
+             input.disabled = !input.disabled;'/>
+          </td></tr></tbody></table>
+         </td>
+
+        </tr>
+       </tbody>
+      </table>
+      </td>
+     </tr>
+  
+     <tr id='cd_edit_allday_row' class='hide_me'>
+      <td> 
+       <span> &staff.server.admin.closed_dates.allday.label; </span>
+       <input id='cd_edit_allday_start_date' type='text' size='10' maxlength='10'/>
+       <img src="/opac/common/js/jscalendar/img.gif"  
+        id='cd_edit_allday_start_date_img' class='cal_img'/>
+      </td>
+     </tr>
+  
+     <tr id='cd_edit_allmultiday_row' class='hide_me'>
+      <td> 
+
+       <span> All Day From </span>
+       <input id='cd_edit_allmultiday_start_date' type='text' size='10' maxlength='10'/>
+       <img src="/opac/common/js/jscalendar/img.gif"  
+        id='cd_edit_allmultiday_start_date_img' class='cal_img'/>
+
+       <span> Through</span>
+
+       <input id='cd_edit_allmultiday_end_date' type='text' size='10' maxlength='10'/>
+       <img src="/opac/common/js/jscalendar/img.gif"  
+        id='cd_edit_allmultiday_end_date_img' class='cal_img'/>
+      </td>
+     </tr>
+
+     <tr id='cd_edit_note_row' class='hide_me' valign='middle'>
+      <td>
+       <div>&staff.server.admin.closed_dates.editor.reason.label;</div>
+       <textarea style='border: 1px solid blue; background: #E0F0E0; margin: 5px;' 
+        id='cd_edit_note' wrap='soft' cols='40' rows='3'/>
+       <div id='cd_apply_all_div' class='hide_me'>
+        &staff.server.admin.closed_dates.apply_all; <input type='checkbox' id='cd_apply_all'/>
+       </div>
+      </td>
+     </tr>
+
+     <tr id='cd_edit_submit' class='hide_me'>
+      <td>
+       <button onclick='cdNew();'>&staff.server.admin.closed_dates.save;</button>
+       <button onclick='cdCancelEdit();'>&staff.server.admin.closed_dates.cancel;</button>
+      </td>
+     </tr>
+
+  
+    </tbody>
+   </table>
+
+   <span class='hide_me' id='cd_all_day'>&staff.server.admin.closed_dates.allday.label;</span>
+   <span class='hide_me' id='cd_confirm_delete'>&staff.server.admin.closed_dates.confirm_delete;</span>
+   <span class='hide_me' id='cd_invalid_date'>&staff.server.admin.closed_dates.date.invalid;</span>
+   <span class='hide_me' id='cd_invalid_time'>&staff.server.admin.closed_dates.time.invalid;</span>
+   <span class='hide_me' id='cd_update_success'>&staff.server.admin.closed_dates.success;</span>
+  
+  </center>
+ </body>
 </html>
 
diff --git a/Open-ILS/xul/staff_client/server/admin/copy_locations.js b/Open-ILS/xul/staff_client/server/admin/copy_locations.js
index b236c9d3a5..edb74c9900 100644
--- a/Open-ILS/xul/staff_client/server/admin/copy_locations.js
+++ b/Open-ILS/xul/staff_client/server/admin/copy_locations.js
@@ -12,42 +12,42 @@ var locationSet;
 var focusOrg;
 
 var myPerms = [
-	'CREATE_COPY_LOCATION',
-	'UPDATE_COPY_LOCATION', 
-	'DELETE_COPY_LOCATION',
-	];
+ 'CREATE_COPY_LOCATION',
+ 'UPDATE_COPY_LOCATION', 
+ 'DELETE_COPY_LOCATION',
+ ];
 
 function clEditorInit() {
-	cgi = new CGI();
-	session = cgi.param('ses');
-	if(!session) throw "User session is not defined!";
-	fetchUser(session);
-	$('user').appendChild(text(USER.usrname()));
-	YES = $('yes').innerHTML;
-	NO = $('no').innerHTML;
+ cgi = new CGI();
+ session = cgi.param('ses');
+ if(!session) throw "User session is not defined!";
+ fetchUser(session);
+ $('user').appendChild(text(USER.usrname()));
+ YES = $('yes').innerHTML;
+ NO = $('no').innerHTML;
     _TRUE = $('true');
     _FALSE = $('false');
     locationSet = [];
 
-	setTimeout( 
-		function() { 
-			fetchHighestWorkPermOrgs( SESSION, USER.id(), myPerms ); 
-			$('cl_new_name').focus();
-			clBuildNew();
-			clGo(); 
-		}, 20 );
+ setTimeout( 
+  function() { 
+   fetchHighestWorkPermOrgs( SESSION, USER.id(), myPerms ); 
+   $('cl_new_name').focus();
+   clBuildNew();
+   clGo(); 
+  }, 20 );
 }
 
 
 function clHoldMsg() {
-	alert($('cl_hold_msg').innerHTML);
+ alert($('cl_hold_msg').innerHTML);
 }
 
-function clGo() {	
+function clGo() { 
     setTimeout(function(){clGo2();}, 500);
 }
 
-function clGo2() {	
+function clGo2() { 
     locationSet = {};
     var req = new Request(RETRIEVE_CL, focusOrg);
     req.request._last = true;
@@ -57,8 +57,8 @@ function clGo2() {
     /*  if we need to add view-all ability, can use this... 
     var org_list = OILS_WORK_PERMS['CREATE_COPY_LOCATION'];
     for(var i = 0; i < org_list.length; i++) {
-	    var req = new Request(RETRIEVE_CL, org_list[i]);
-	    req.callback(clAppendLocation);
+     var req = new Request(RETRIEVE_CL, org_list[i]);
+     req.callback(clAppendLocation);
         if(i == org_list.length - 1) 
             req.request._last = true;
         req.send();
@@ -68,7 +68,7 @@ function clGo2() {
 
 function clAppendLocation(r) {
     var cls = r.getResultObject();
-	if(checkILSEvent(cls)) throw cls;
+ if(checkILSEvent(cls)) throw cls;
     for(var i = 0; i < cls.length; i++) 
         locationSet[cls[i].id()] = cls[i];
     if(r._last) 
@@ -76,17 +76,17 @@ function clAppendLocation(r) {
 }
 
 function clBuildNew() {
-	org_list = OILS_WORK_PERMS['CREATE_COPY_LOCATION'];
+ org_list = OILS_WORK_PERMS['CREATE_COPY_LOCATION'];
     var org;
     if(org_list.length == 0)
         return;
-	var selector = $('cl_new_owner');
-	var fselector = $('cl_org_filter');
-	buildMergedOrgSel(selector, org_list, 0, 'shortname');
-	buildMergedOrgSel(fselector, org_list, 0, 'shortname');
+ var selector = $('cl_new_owner');
+ var fselector = $('cl_org_filter');
+ buildMergedOrgSel(selector, org_list, 0, 'shortname');
+ buildMergedOrgSel(fselector, org_list, 0, 'shortname');
     var org = findOrgUnit(org_list[0]);
     if(org_list.length > 1 || (org.children() &&  org.children()[0])) {
-		selector.disabled = false;
+  selector.disabled = false;
         fselector.disabled = false;
     }
 
@@ -101,26 +101,26 @@ function clBuildNew() {
     setSelector(fselector, focusOrg);
 
 
-	var sub = $('sc_new_submit');
-	sub.disabled = false;
-	sub.onclick = clCreateNew;
+ var sub = $('sc_new_submit');
+ sub.disabled = false;
+ sub.onclick = clCreateNew;
 }
 
 function clCreateNew() {
-	var cl = new acpl();
-	cl.name( $('cl_new_name').value );
-	cl.owning_lib( getSelectorVal( $('cl_new_owner')));
-	cl.holdable( ($('cl_new_hold_yes').checked) ? 1 : 0 );
-	cl.hold_verify( ($('cl_new_hold_verify_yes').checked) ? 1 : 0 );
-	cl.opac_visible( ($('cl_new_vis_yes').checked) ? 1 : 0 );
-	cl.circulate( ($('cl_new_circulate_yes').checked) ? 1 : 0 );
-
-	var req = new Request(CREATE_CL, SESSION, cl);
-	req.send(true);
-	var res = req.result();
-	if(checkILSEvent(res)) throw res;
-	alertId('cl_update_success');
-	clGo();
+ var cl = new acpl();
+ cl.name( $('cl_new_name').value );
+ cl.owning_lib( getSelectorVal( $('cl_new_owner')));
+ cl.holdable( ($('cl_new_hold_yes').checked) ? 1 : 0 );
+ cl.hold_verify( ($('cl_new_hold_verify_yes').checked) ? 1 : 0 );
+ cl.opac_visible( ($('cl_new_vis_yes').checked) ? 1 : 0 );
+ cl.circulate( ($('cl_new_circulate_yes').checked) ? 1 : 0 );
+
+ var req = new Request(CREATE_CL, SESSION, cl);
+ req.send(true);
+ var res = req.result();
+ if(checkILSEvent(res)) throw res;
+ alertId('cl_update_success');
+ clGo();
 }
 
 var rowTemplate;
@@ -130,120 +130,120 @@ function clDraw() {
     for(var x in locationSet)
         cls.push(locationSet[x]);
 
-	var tbody = $('cl_tbody');
-	if(!rowTemplate)
-		rowTemplate = tbody.removeChild($('cl_row'));
-	removeChildren(tbody);
+ var tbody = $('cl_tbody');
+ if(!rowTemplate)
+  rowTemplate = tbody.removeChild($('cl_row'));
+ removeChildren(tbody);
 
     for(var i = 0; i < cls.length; i++) /* force stringify */
         cls[i].name(new String(cls[i].name()));
 
-	cls = cls.sort( function(a,b) {
-			if( a.name().toLowerCase() > b.name().toLowerCase() ) return 1;
-			if( a.name().toLowerCase() < b.name().toLowerCase() ) return -1;
-			return 0;
-		});
-
-	for( var c in cls ) {
-		var cl = cls[c];
-		var row = rowTemplate.cloneNode(true);
-		clBuildRow( tbody, row, cl );
-		tbody.appendChild(row);
-	}
+ cls = cls.sort( function(a,b) {
+   if( a.name().toLowerCase() > b.name().toLowerCase() ) return 1;
+   if( a.name().toLowerCase() < b.name().toLowerCase() ) return -1;
+   return 0;
+  });
+
+ for( var c in cls ) {
+  var cl = cls[c];
+  var row = rowTemplate.cloneNode(true);
+  clBuildRow( tbody, row, cl );
+  tbody.appendChild(row);
+ }
 }
 
 function clBuildRow( tbody, row, cl ) {
-	$n( row, 'cl_name').appendChild(text(cl.name()));
-	$n( row, 'cl_owner').appendChild(text(findOrgUnit(cl.owning_lib()).shortname()));
+ $n( row, 'cl_name').appendChild(text(cl.name()));
+ $n( row, 'cl_owner').appendChild(text(findOrgUnit(cl.owning_lib()).shortname()));
 
-	appendClear($n( row, 'cl_holdable'), (isTrue(cl.holdable())) ? _TRUE.cloneNode(true) : _FALSE.cloneNode(true) );
-	appendClear($n( row, 'cl_hold_verify'), (isTrue(cl.hold_verify())) ? _TRUE.cloneNode(true) : _FALSE.cloneNode(true) );
-	appendClear($n( row, 'cl_visible'), (isTrue(cl.opac_visible())) ? _TRUE.cloneNode(true) : _FALSE.cloneNode(true) );
-	appendClear($n( row, 'cl_circulate'), (isTrue(cl.circulate())) ? _TRUE.cloneNode(true) : _FALSE.cloneNode(true) );
+ appendClear($n( row, 'cl_holdable'), (isTrue(cl.holdable())) ? _TRUE.cloneNode(true) : _FALSE.cloneNode(true) );
+ appendClear($n( row, 'cl_hold_verify'), (isTrue(cl.hold_verify())) ? _TRUE.cloneNode(true) : _FALSE.cloneNode(true) );
+ appendClear($n( row, 'cl_visible'), (isTrue(cl.opac_visible())) ? _TRUE.cloneNode(true) : _FALSE.cloneNode(true) );
+ appendClear($n( row, 'cl_circulate'), (isTrue(cl.circulate())) ? _TRUE.cloneNode(true) : _FALSE.cloneNode(true) );
 
-	var edit = $n( row, 'cl_edit');
-	edit.onclick = function() { clEdit( cl, tbody, row ); };
+ var edit = $n( row, 'cl_edit');
+ edit.onclick = function() { clEdit( cl, tbody, row ); };
     checkPermOrgDisabled(edit, cl.owning_lib(), 'UPDATE_COPY_LOCATION');
 
-	var del = $n( row, 'cl_delete' );
-	del.onclick = function() { clDelete( cl, tbody, row ); };
-	checkPermOrgDisabled(del, cl.owning_lib(), 'DELETE_COPY_LOCATION');
+ var del = $n( row, 'cl_delete' );
+ del.onclick = function() { clDelete( cl, tbody, row ); };
+ checkPermOrgDisabled(del, cl.owning_lib(), 'DELETE_COPY_LOCATION');
 }
 
 function clEdit( cl, tbody, row ) {
 
-	cleanTbody(tbody, 'edit');
-	var r = $('cl_edit').cloneNode(true);
-	r.setAttribute('edit','1');
-	
-	var name = $n(r, 'cl_edit_name');
-	name.setAttribute('size', cl.name().length + 3);
-	name.value = cl.name();
-
-	$n(r, 'cl_edit_owner').appendChild(text(findOrgUnit(cl.owning_lib()).shortname()));
-
-	var arr = _clOptions(r);
-	if(isTrue(cl.holdable())) arr[0].checked = true;
-	else arr[1].checked = true;
-	if(isTrue(cl.opac_visible())) arr[2].checked = true;
-	else arr[3].checked = true;
-	if(isTrue(cl.circulate())) arr[4].checked = true;
-	else arr[5].checked = true;
-	if(isTrue(cl.hold_verify())) arr[6].checked = true;
-	else arr[7].checked = true;
-
-	$n(r, 'cl_edit_cancel').onclick = function(){cleanTbody(tbody,'edit');}
-	$n(r, 'cl_edit_commit').onclick = function(){clEditCommit( tbody, r, cl ); }
-
-	insRow(tbody, row, r);
-	name.focus();
-	name.select();
+ cleanTbody(tbody, 'edit');
+ var r = $('cl_edit').cloneNode(true);
+ r.setAttribute('edit','1');
+ 
+ var name = $n(r, 'cl_edit_name');
+ name.setAttribute('size', cl.name().length + 3);
+ name.value = cl.name();
+
+ $n(r, 'cl_edit_owner').appendChild(text(findOrgUnit(cl.owning_lib()).shortname()));
+
+ var arr = _clOptions(r);
+ if(isTrue(cl.holdable())) arr[0].checked = true;
+ else arr[1].checked = true;
+ if(isTrue(cl.opac_visible())) arr[2].checked = true;
+ else arr[3].checked = true;
+ if(isTrue(cl.circulate())) arr[4].checked = true;
+ else arr[5].checked = true;
+ if(isTrue(cl.hold_verify())) arr[6].checked = true;
+ else arr[7].checked = true;
+
+ $n(r, 'cl_edit_cancel').onclick = function(){cleanTbody(tbody,'edit');}
+ $n(r, 'cl_edit_commit').onclick = function(){clEditCommit( tbody, r, cl ); }
+
+ insRow(tbody, row, r);
+ name.focus();
+ name.select();
 }
 
 function _clOptions(r) {
-	var arr = [];
-	arr[0] = $n( $n(r,'cl_edit_holdable_yes'), 'cl_edit_holdable');
-	arr[1] = $n( $n(r,'cl_edit_holdable_no'), 'cl_edit_holdable');
-	arr[2] = $n( $n(r,'cl_edit_visible_yes'), 'cl_edit_visible');
-	arr[3] = $n( $n(r,'cl_edit_visible_no'), 'cl_edit_visible');
-	arr[4] = $n( $n(r,'cl_edit_circulate_yes'), 'cl_edit_circulate');
-	arr[5] = $n( $n(r,'cl_edit_circulate_no'), 'cl_edit_circulate');
-	arr[6] = $n( $n(r,'cl_edit_hold_verify_yes'), 'cl_edit_hold_verify');
-	arr[7] = $n( $n(r,'cl_edit_hold_verify_no'), 'cl_edit_hold_verify');
-	return arr;
+ var arr = [];
+ arr[0] = $n( $n(r,'cl_edit_holdable_yes'), 'cl_edit_holdable');
+ arr[1] = $n( $n(r,'cl_edit_holdable_no'), 'cl_edit_holdable');
+ arr[2] = $n( $n(r,'cl_edit_visible_yes'), 'cl_edit_visible');
+ arr[3] = $n( $n(r,'cl_edit_visible_no'), 'cl_edit_visible');
+ arr[4] = $n( $n(r,'cl_edit_circulate_yes'), 'cl_edit_circulate');
+ arr[5] = $n( $n(r,'cl_edit_circulate_no'), 'cl_edit_circulate');
+ arr[6] = $n( $n(r,'cl_edit_hold_verify_yes'), 'cl_edit_hold_verify');
+ arr[7] = $n( $n(r,'cl_edit_hold_verify_no'), 'cl_edit_hold_verify');
+ return arr;
 }
 
 function clEditCommit( tbody, r, cl ) {
 
-	var arr = _clOptions(r);
-	if(arr[0].checked) cl.holdable(1);
-	else cl.holdable(0);
-	if(arr[2].checked) cl.opac_visible(1);
-	else cl.opac_visible(0);
-	if(arr[4].checked) cl.circulate(1);
-	else cl.circulate(0);
-	if(arr[6].checked) cl.hold_verify(1);
-	else cl.hold_verify(0);
-	cl.name($n(r, 'cl_edit_name').value);
-
-	var req = new Request( UPDATE_CL, SESSION, cl );
-	req.send(true);
-	var res = req.result();
-	if(checkILSEvent(res)) throw res;
-	alertId('cl_update_success');
-
-	clGo();
+ var arr = _clOptions(r);
+ if(arr[0].checked) cl.holdable(1);
+ else cl.holdable(0);
+ if(arr[2].checked) cl.opac_visible(1);
+ else cl.opac_visible(0);
+ if(arr[4].checked) cl.circulate(1);
+ else cl.circulate(0);
+ if(arr[6].checked) cl.hold_verify(1);
+ else cl.hold_verify(0);
+ cl.name($n(r, 'cl_edit_name').value);
+
+ var req = new Request( UPDATE_CL, SESSION, cl );
+ req.send(true);
+ var res = req.result();
+ if(checkILSEvent(res)) throw res;
+ alertId('cl_update_success');
+
+ clGo();
 }
 
 
 function clDelete( cl, tbody, row ) {
-	if(!confirm($('cl_delete_confirm').innerHTML)) return;
-	var req = new Request( DELETE_CL, SESSION, cl.id() );
-	req.send(true);
-	var res = req.result();
-	if(checkILSEvent(res)) throw res;
-	alertId('cl_update_success');
-	clGo();
+ if(!confirm($('cl_delete_confirm').innerHTML)) return;
+ var req = new Request( DELETE_CL, SESSION, cl.id() );
+ req.send(true);
+ var res = req.result();
+ if(checkILSEvent(res)) throw res;
+ alertId('cl_update_success');
+ clGo();
 }
 
 
diff --git a/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml b/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml
index c6cb676c58..b0bc01532f 100644
--- a/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml
@@ -1,201 +1,201 @@
 <?xml version='1.0' encoding="UTF-8"?>
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
 
-	<head>
-		<title>&staff.server.admin.copy_locations.title;</title>
-		<script language='javascript' src='/opac/common/js/utils.js'> </script>
-		<script language='javascript' src='/opac/common/js//config.js'> </script>
-		<script language='javascript' src='/opac/common/js/CGI.js'> </script>
-		<script language='javascript' src='/opac/common/js/Cookie.js'> </script>
-	
-		<script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
-		<script language='javascript' src='/opac/common/js/fmall.js'> </script>
-		<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
-		<script language='javascript' src='/opac/common/js/Cookies.js'> </script>
-		<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
-		<script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
-		<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
-		<script language='javascript' src='/opac/common/js/init.js'> </script>
-		<script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
-		<script language='javascript' src='adminlib.js'> </script>
-		<script language='javascript' src='copy_locations.js'> </script>
+ <head>
+  <title>&staff.server.admin.copy_locations.title;</title>
+  <script language='javascript' src='/opac/common/js/utils.js'> </script>
+  <script language='javascript' src='/opac/common/js//config.js'> </script>
+  <script language='javascript' src='/opac/common/js/CGI.js'> </script>
+  <script language='javascript' src='/opac/common/js/Cookie.js'> </script>
+ 
+  <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
+  <script language='javascript' src='/opac/common/js/fmall.js'> </script>
+  <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
+  <script language='javascript' src='/opac/common/js/Cookies.js'> </script>
+  <script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
+  <script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
+  <script language='javascript' src='/opac/common/js/org_utils.js'> </script>
+  <script language='javascript' src='/opac/common/js/init.js'> </script>
+  <script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
+  <script language='javascript' src='adminlib.js'> </script>
+  <script language='javascript' src='copy_locations.js'> </script>
 
-		<link type='text/css' rel='stylesheet' href='admin.css' />
-	</head>
+  <link type='text/css' rel='stylesheet' href='admin.css' />
+ </head>
 
-	<body onload='try{clEditorInit();}catch(e){alert(js2JSON(e));}'>
+ <body onload='try{clEditorInit();}catch(e){alert(js2JSON(e));}'>
 
-		<div class='welcome_box'>
-			<span>Welcome </span><b><span id='user'/></b>
-		</div>
+  <div class='welcome_box'>
+   <span>Welcome </span><b><span id='user'/></b>
+  </div>
 
-		<center>
-			<div class='title'>&staff.server.admin.copy_locations.editor;</div>
-			<br/>
+  <center>
+   <div class='title'>&staff.server.admin.copy_locations.editor;</div>
+   <br/>
 
-			<table class='data_grid data_grid_center' width='65%'>
-				<thead>
-					<tr><td colspan='4'>&staff.server.admin.copy_locations.editor.create;</td></tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td id='id'>&staff.server.admin.copy_locations.editor.name;</td>
-						<td>
-							<input id='cl_new_name' type='text' size='10'/>
-						</td>
-						<td>&staff.server.admin.copy_locations.editor.holdable.label;</td>
-						<td>
-							<span>&staff.server.admin.copy_locations.editor.yes;</span>
-							<input type='radio' name='cl_new_hold' id='cl_new_hold_yes'/>
-							<span>&staff.server.admin.copy_locations.editor.no;</span>
-							<input type='radio' name='cl_new_hold'  
-								id='cl_new_hold_no' checked='checked'> </input>
-						</td>
-					</tr>
+   <table class='data_grid data_grid_center' width='65%'>
+    <thead>
+     <tr><td colspan='4'>&staff.server.admin.copy_locations.editor.create;</td></tr>
+    </thead>
+    <tbody>
+     <tr>
+      <td id='id'>&staff.server.admin.copy_locations.editor.name;</td>
+      <td>
+       <input id='cl_new_name' type='text' size='10'/>
+      </td>
+      <td>&staff.server.admin.copy_locations.editor.holdable.label;</td>
+      <td>
+       <span>&staff.server.admin.copy_locations.editor.yes;</span>
+       <input type='radio' name='cl_new_hold' id='cl_new_hold_yes'/>
+       <span>&staff.server.admin.copy_locations.editor.no;</span>
+       <input type='radio' name='cl_new_hold'  
+        id='cl_new_hold_no' checked='checked'> </input>
+      </td>
+     </tr>
 
-					<tr>
-						<td>&staff.server.admin.copy_locations.editor.opac_visible.label;</td>
-						<td>
-							<span>&staff.server.admin.copy_locations.editor.yes;</span>
-							<input type='radio' name='cl_new_vis' id='cl_new_vis_yes' />
-							<span>&staff.server.admin.copy_locations.editor.no;</span>
-							<input type='radio' name='cl_new_vis'  id='cl_new_vis_no' checked='checked'> </input>
-						</td>
-						<td>&staff.server.admin.copy_locations.editor.circulate.label;</td>
-						<td>
-							<span>&staff.server.admin.copy_locations.editor.yes;</span>
-							<input type='radio' name='cl_new_circulate' id='cl_new_circulate_yes' />
-							<span>&staff.server.admin.copy_locations.editor.no;</span>
-							<input type='radio' name='cl_new_circulate'  
-								id='cl_new_circulate_no' checked='checked'> </input>
-						</td>
-					</tr>
-					<tr>
-						<td>&staff.server.admin.copy_locations.editor.hold_verify.label;</td>
-						<td>
-							<span>&staff.server.admin.copy_locations.editor.yes;</span>
-							<input type='radio' name='cl_new_hold_verify' id='cl_new_hold_verify_yes'/>
-							<span>&staff.server.admin.copy_locations.editor.no;</span>
-							<input type='radio' name='cl_new_hold_verify'  
-								id='cl_new_hold_verify_no' checked='checked'> </input>
-						</td>
-						<td>&staff.server.admin.copy_locations.editor.library;</td>
-						<td>
-							<select id='cl_new_owner' disabled='disabled' style='width:auto;'> </select>
-						</td>
-					</tr>
+     <tr>
+      <td>&staff.server.admin.copy_locations.editor.opac_visible.label;</td>
+      <td>
+       <span>&staff.server.admin.copy_locations.editor.yes;</span>
+       <input type='radio' name='cl_new_vis' id='cl_new_vis_yes' />
+       <span>&staff.server.admin.copy_locations.editor.no;</span>
+       <input type='radio' name='cl_new_vis'  id='cl_new_vis_no' checked='checked'> </input>
+      </td>
+      <td>&staff.server.admin.copy_locations.editor.circulate.label;</td>
+      <td>
+       <span>&staff.server.admin.copy_locations.editor.yes;</span>
+       <input type='radio' name='cl_new_circulate' id='cl_new_circulate_yes' />
+       <span>&staff.server.admin.copy_locations.editor.no;</span>
+       <input type='radio' name='cl_new_circulate'  
+        id='cl_new_circulate_no' checked='checked'> </input>
+      </td>
+     </tr>
+     <tr>
+      <td>&staff.server.admin.copy_locations.editor.hold_verify.label;</td>
+      <td>
+       <span>&staff.server.admin.copy_locations.editor.yes;</span>
+       <input type='radio' name='cl_new_hold_verify' id='cl_new_hold_verify_yes'/>
+       <span>&staff.server.admin.copy_locations.editor.no;</span>
+       <input type='radio' name='cl_new_hold_verify'  
+        id='cl_new_hold_verify_no' checked='checked'> </input>
+      </td>
+      <td>&staff.server.admin.copy_locations.editor.library;</td>
+      <td>
+       <select id='cl_new_owner' disabled='disabled' style='width:auto;'> </select>
+      </td>
+     </tr>
                     <tr>
-						<td colspan='4'><input id='sc_new_submit' type='submit' value='Create' disabled='disabled'/></td>
+      <td colspan='4'><input id='sc_new_submit' type='submit' value='Create' disabled='disabled'/></td>
                     </tr>
-				</tbody>
-			</table>
+    </tbody>
+   </table>
 
-			<br/><hr/><br/>
+   <br/><hr/><br/>
 
 
             &staff.server.admin.copy_locations.editor.library.filter; <select disabled='disabled' id='cl_org_filter' style='width:auto;'> </select>
             <br/><br/>
 
-			<table class='data_grid data_grid_center' style='width: 95%'>
-				<thead>
-					<tr>
-						<td width=''>&staff.server.admin.copy_locations.editor.name;</td>
-						<td width=''>&staff.server.admin.copy_locations.editor.library;</td>
-						<td width=''>&staff.server.admin.copy_locations.editor.holdable;</td>
-						<td width=''>&staff.server.admin.copy_locations.editor.hold_verify;</td>
-						<td width=''>&staff.server.admin.copy_locations.editor.opac_visible;</td>
-						<td width=''>&staff.server.admin.copy_locations.editor.circulate;</td>
-						<td width=''>&staff.server.admin.copy_locations.editor.edit;</td>
-						<td width=''>&staff.server.admin.copy_locations.editor.delete;</td>
-					</tr>
-				</thead>
-				<tbody id='cl_tbody'>
-					<tr id='cl_row'>
-						<td name='cl_name'> </td>
-						<td name='cl_owner'> </td>
-						<td name='cl_holdable'> </td>
-						<td name='cl_hold_verify'> </td>
-						<td name='cl_visible'> </td>
-						<td name='cl_circulate'> </td>
-						<td><input type='submit' value='Edit' name='cl_edit' disabled='disabled'> </input></td>
-						<td><input type='submit' value='Delete' name='cl_delete' disabled='disabled'> </input></td>
-					</tr>
-				</tbody>
-			</table>
-		 </center>
+   <table class='data_grid data_grid_center' style='width: 95%'>
+    <thead>
+     <tr>
+      <td width=''>&staff.server.admin.copy_locations.editor.name;</td>
+      <td width=''>&staff.server.admin.copy_locations.editor.library;</td>
+      <td width=''>&staff.server.admin.copy_locations.editor.holdable;</td>
+      <td width=''>&staff.server.admin.copy_locations.editor.hold_verify;</td>
+      <td width=''>&staff.server.admin.copy_locations.editor.opac_visible;</td>
+      <td width=''>&staff.server.admin.copy_locations.editor.circulate;</td>
+      <td width=''>&staff.server.admin.copy_locations.editor.edit;</td>
+      <td width=''>&staff.server.admin.copy_locations.editor.delete;</td>
+     </tr>
+    </thead>
+    <tbody id='cl_tbody'>
+     <tr id='cl_row'>
+      <td name='cl_name'> </td>
+      <td name='cl_owner'> </td>
+      <td name='cl_holdable'> </td>
+      <td name='cl_hold_verify'> </td>
+      <td name='cl_visible'> </td>
+      <td name='cl_circulate'> </td>
+      <td><input type='submit' value='Edit' name='cl_edit' disabled='disabled'> </input></td>
+      <td><input type='submit' value='Delete' name='cl_delete' disabled='disabled'> </input></td>
+     </tr>
+    </tbody>
+   </table>
+   </center>
 
-		 <div class='hide_me'>
+   <div class='hide_me'>
             <span id='true' style='color:green;'>&#x2713;</span>
             <span id='false' style='color:red;'>&#x2717;</span>
-			<span id='yes'>&staff.server.admin.copy_locations.editor.yes;</span>
-			<span id='no'>&staff.server.admin.copy_locations.editor.no;</span>
-			<span id='cl_hold_msg'>
-				&staff.server.admin.copy_locations.editor.help.holdable;
-			</span>
-			<span id='cl_delete_confirm'>
-				&staff.server.admin.copy_locations.editor.delete.confirm;
-			</span>
-			<table>
+   <span id='yes'>&staff.server.admin.copy_locations.editor.yes;</span>
+   <span id='no'>&staff.server.admin.copy_locations.editor.no;</span>
+   <span id='cl_hold_msg'>
+    &staff.server.admin.copy_locations.editor.help.holdable;
+   </span>
+   <span id='cl_delete_confirm'>
+    &staff.server.admin.copy_locations.editor.delete.confirm;
+   </span>
+   <table>
                 <tbody> 
                     <tr id='cl_edit' class='insert_row'>
-						<td><input name='cl_edit_name' type='text'> </input></td>
-						<td name='cl_edit_owner'></td>
-						<td>
-							<span>&staff.server.admin.copy_locations.editor.yes;</span>
-							<span name='cl_edit_holdable_yes'>
-								<input type='radio' name='cl_edit_holdable'/>
-							</span>
-							<span>&staff.server.admin.copy_locations.editor.no;</span>
-							<span name='cl_edit_holdable_no'>
-								<input type='radio' name='cl_edit_holdable'/>
-							</span>
-						</td>
-						<td>
-							<span>&staff.server.admin.copy_locations.editor.yes;</span>
-							<span name='cl_edit_hold_verify_yes'>
-								<input type='radio' name='cl_edit_hold_verify'/>
-							</span>
-							<span>&staff.server.admin.copy_locations.editor.no;</span>
-							<span name='cl_edit_hold_verify_no'>
-								<input type='radio' name='cl_edit_hold_verify'/>
-							</span>
-						</td>
-						<td>
-							<span>&staff.server.admin.copy_locations.editor.yes;</span>
-							<span name='cl_edit_visible_yes'>
-								<input type='radio' name='cl_edit_visible'/>
-							</span>
-							<span>&staff.server.admin.copy_locations.editor.no;</span>
-							<span name='cl_edit_visible_no'>
-								<input type='radio' name='cl_edit_visible'/>
-							</span>
-						</td>
-						<td>
-							<span>&staff.server.admin.copy_locations.editor.yes;</span>
-							<span name='cl_edit_circulate_yes'>
-								<input type='radio' name='cl_edit_circulate'/>
-							</span>
-							<span>&staff.server.admin.copy_locations.editor.no;</span>
-							<span name='cl_edit_circulate_no'>
-								<input type='radio' name='cl_edit_circulate'/>
-							</span>
-						</td>
-						<td><input type='submit' name='cl_edit_commit' value='&staff.server.admin.copy_locations.submit;'/></td>
-						<td><input type='submit' name='cl_edit_cancel' value='&staff.server.admin.copy_locations.cancel;'/></td>
-					</tr>
-				</tbody>
-			</table>
-		</div>
-	</body>
-	<span class='hide_me' id='cl_update_success'>
-		&staff.server.admin.copy_locations.update_success;
-	</span>
+      <td><input name='cl_edit_name' type='text'> </input></td>
+      <td name='cl_edit_owner'></td>
+      <td>
+       <span>&staff.server.admin.copy_locations.editor.yes;</span>
+       <span name='cl_edit_holdable_yes'>
+        <input type='radio' name='cl_edit_holdable'/>
+       </span>
+       <span>&staff.server.admin.copy_locations.editor.no;</span>
+       <span name='cl_edit_holdable_no'>
+        <input type='radio' name='cl_edit_holdable'/>
+       </span>
+      </td>
+      <td>
+       <span>&staff.server.admin.copy_locations.editor.yes;</span>
+       <span name='cl_edit_hold_verify_yes'>
+        <input type='radio' name='cl_edit_hold_verify'/>
+       </span>
+       <span>&staff.server.admin.copy_locations.editor.no;</span>
+       <span name='cl_edit_hold_verify_no'>
+        <input type='radio' name='cl_edit_hold_verify'/>
+       </span>
+      </td>
+      <td>
+       <span>&staff.server.admin.copy_locations.editor.yes;</span>
+       <span name='cl_edit_visible_yes'>
+        <input type='radio' name='cl_edit_visible'/>
+       </span>
+       <span>&staff.server.admin.copy_locations.editor.no;</span>
+       <span name='cl_edit_visible_no'>
+        <input type='radio' name='cl_edit_visible'/>
+       </span>
+      </td>
+      <td>
+       <span>&staff.server.admin.copy_locations.editor.yes;</span>
+       <span name='cl_edit_circulate_yes'>
+        <input type='radio' name='cl_edit_circulate'/>
+       </span>
+       <span>&staff.server.admin.copy_locations.editor.no;</span>
+       <span name='cl_edit_circulate_no'>
+        <input type='radio' name='cl_edit_circulate'/>
+       </span>
+      </td>
+      <td><input type='submit' name='cl_edit_commit' value='&staff.server.admin.copy_locations.submit;'/></td>
+      <td><input type='submit' name='cl_edit_cancel' value='&staff.server.admin.copy_locations.cancel;'/></td>
+     </tr>
+    </tbody>
+   </table>
+  </div>
+ </body>
+ <span class='hide_me' id='cl_update_success'>
+  &staff.server.admin.copy_locations.update_success;
+ </span>
 </html>
 
diff --git a/Open-ILS/xul/staff_client/server/admin/font_settings.xul b/Open-ILS/xul/staff_client/server/admin/font_settings.xul
index 86530614fe..02053cf15c 100644
--- a/Open-ILS/xul/staff_client/server/admin/font_settings.xul
+++ b/Open-ILS/xul/staff_client/server/admin/font_settings.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,163 +19,163 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="font_settings_win" 
-	onload="try { my_init(); } catch(E) { alert(E); }" style="background: white;"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); } catch(E) { alert(E); }" style="background: white;"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
     <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+ </script>
     <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
-
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for font_settings.xul');
-
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.stash_retrieve();
-				document.getElementById('sound').checked = typeof g.data.no_sound == 'undefined' || g.data.no_sound == 'false' || g.data.no_sound == false ? false : true;
-
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert('admin/font_settings.xul',E); } catch(F) { alert(E); }
-			}
-		}
-
-		function save() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-				JSAN.use('util.file'); var file = new util.file('global_font_adjust');
-				file.set_object(g.data.global_font_adjust);
-				file.close();
-				alert(document.getElementById("adminStrings").getString('staff.admin.font_settings.save'));
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert('saving in admin/font_settings.xul',E); } catch(F) { alert(E); }
-			}
-		}
-
-		function adjust(my_class) {
-			var status_msg = {
-				'ALL_FONTS_SMALLER': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_SMALLER'),
-				'ALL_FONTS_DEFAULT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_DEFAULT'),
-				'ALL_FONTS_LARGER': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_LARGER'),
-				'ALL_FONTS_XX_SMALL': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_XX_SMALL'),
-				'ALL_FONTS_X_SMALL': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_X_SMALL'),
-				'ALL_FONTS_SMALL': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_SMALL'),
-				'ALL_FONTS_MEDIUM': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_MEDIUM'),
-				'ALL_FONTS_LARGE': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_LARGE'),
-				'ALL_FONTS_X_LARGE': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_X_LARGE'),
-				'ALL_FONTS_XX_LARGE': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_XX_LARGE'),
-				'ALL_FONTS_5PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_5PT'),
-				'ALL_FONTS_6PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_6PT'),
-				'ALL_FONTS_7PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_7PT'),
-				'ALL_FONTS_8PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_8PT'),
-				'ALL_FONTS_9PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_9PT'),
-				'ALL_FONTS_10PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_10PT'),
-				'ALL_FONTS_11PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_11PT'),
-				'ALL_FONTS_12PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_12PT'),
-				'ALL_FONTS_13PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_13PT'),
-				'ALL_FONTS_14PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_14PT'),
-				'ALL_FONTS_15PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_15PT'),
-				'ALL_FONTS_16PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_16PT'),
-				'ALL_FONTS_17PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_17PT'),
-				'ALL_FONTS_18PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_18PT')
-			};
-
-			try {
-				g.data.global_font_adjust = my_class; g.data.stash('global_font_adjust');
-				alert(status_msg[my_class]);
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert('setting font in admin/font_settings.xul',E); } catch(F) { alert(E); }
-			}
-		}
-
-		function toggle_sound() {
-			try {
-				var bool = document.getElementById('sound').checked;
-				g.data.no_sound = bool; g.data.stash('no_sound');
-				if (bool) {
-					alert(document.getElementById("adminStrings").getString('staff.admin.font_settings.sound.disabled'));
-				} else {
-					alert(document.getElementById("adminStrings").getString('staff.admin.font_settings.sound.enabled'));
-				}
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert('setting sound in admin/font_settings.xul',E); } catch(F) { alert(E); }
-			}
-		}
-
-		function save_sound() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-				JSAN.use('util.file'); var file = new util.file('no_sound');
-				file.write_content( 'truncate', String( document.getElementById('sound').checked ) );
-				file.close();
-				alert(document.getElementById("adminStrings").getString('staff.admin.font_settings.sound'));
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert('saving in admin/font_settings.xul',E); } catch(F) { alert(E); }
-			}
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="adminStrings" src='/xul/server/locale/<!--#echo var="locale"-->/admin.properties'/>
-
-	<groupbox orient="vertical">
-		<caption label="&staff.server.admin.font.sound.caption;"/>
-		<hbox>
-			<checkbox id="sound" label="&staff.server.admin.font.sound.checkbox;" oncommand="toggle_sound();"/>
-			<button label="&staff.server.admin.save_disk;" oncommand="save_sound();"/>
-		</hbox>
-	</groupbox>
-
-	<groupbox>
-		<caption label="&staff.server.admin.font.global.caption;"/>
-		<hbox>
-			<vbox>
-				<button class="ALL_FONTS_SMALLER" label="&staff.server.admin.font.smaller;" oncommand="adjust('ALL_FONTS_SMALLER');"/>
-				<button class="ALL_FONTS_DEFAULT" label="&staff.server.admin.font.default;" oncommand="adjust('ALL_FONTS_DEFAULT');"/>
-				<button class="ALL_FONTS_LARGER" label="&staff.server.admin.font.larger;" oncommand="adjust('ALL_FONTS_LARGER');"/>
-			</vbox>
-			<vbox>
-				<button class="ALL_FONTS_XX_SMALL" label="&staff.server.admin.font.xxsmall;" oncommand="adjust('ALL_FONTS_XX_SMALL');"/>
-				<button class="ALL_FONTS_X_SMALL" label="&staff.server.admin.font.xsmall;" oncommand="adjust('ALL_FONTS_X_SMALL');"/>
-				<button class="ALL_FONTS_SMALL" label="&staff.server.admin.font.small;" oncommand="adjust('ALL_FONTS_SMALL');"/>
-				<button class="ALL_FONTS_MEDIUM" label="&staff.server.admin.font.medium;" oncommand="adjust('ALL_FONTS_MEDIUM');"/>
-				<button class="ALL_FONTS_LARGE" label="&staff.server.admin.font.large;" oncommand="adjust('ALL_FONTS_LARGE');"/>
-				<button class="ALL_FONTS_X_LARGE" label="&staff.server.admin.font.xlarge;" oncommand="adjust('ALL_FONTS_X_LARGE');"/>
-				<button class="ALL_FONTS_XX_LARGE" label="&staff.server.admin.font.xxlarge;" oncommand="adjust('ALL_FONTS_XX_LARGE');"/>
-			</vbox>
-			<vbox>
-				<button class="ALL_FONTS_5PT" label="&staff.server.admin.font.5pt;" oncommand="adjust('ALL_FONTS_5PT');"/>
-				<button class="ALL_FONTS_6PT" label="&staff.server.admin.font.6pt;" oncommand="adjust('ALL_FONTS_6PT');"/>
-				<button class="ALL_FONTS_7PT" label="&staff.server.admin.font.7pt;" oncommand="adjust('ALL_FONTS_7PT');"/>
-				<button class="ALL_FONTS_8PT" label="&staff.server.admin.font.8pt;" oncommand="adjust('ALL_FONTS_8PT');"/>
-				<button class="ALL_FONTS_9PT" label="&staff.server.admin.font.9pt;" oncommand="adjust('ALL_FONTS_9PT');"/>
-				<button class="ALL_FONTS_10PT" label="&staff.server.admin.font.10pt;" oncommand="adjust('ALL_FONTS_10PT');"/>
-				<button class="ALL_FONTS_11PT" label="&staff.server.admin.font.11pt;" oncommand="adjust('ALL_FONTS_11PT');"/>
-				<button class="ALL_FONTS_12PT" label="&staff.server.admin.font.12pt;" oncommand="adjust('ALL_FONTS_12PT');"/>
-				<button class="ALL_FONTS_13PT" label="&staff.server.admin.font.13pt;" oncommand="adjust('ALL_FONTS_13PT');"/>
-				<button class="ALL_FONTS_14PT" label="&staff.server.admin.font.14pt;" oncommand="adjust('ALL_FONTS_14PT');"/>
-				<button class="ALL_FONTS_15PT" label="&staff.server.admin.font.15pt;" oncommand="adjust('ALL_FONTS_15PT');"/>
-				<button class="ALL_FONTS_16PT" label="&staff.server.admin.font.16pt;" oncommand="adjust('ALL_FONTS_16PT');"/>
-				<button class="ALL_FONTS_17PT" label="&staff.server.admin.font.17pt;" oncommand="adjust('ALL_FONTS_17PT');"/>
-				<button class="ALL_FONTS_18PT" label="&staff.server.admin.font.18pt;" oncommand="adjust('ALL_FONTS_18PT');"/>
-			</vbox>
-			<vbox>
-				<button label="&staff.server.admin.font.restore;" flex="1" oncommand="adjust('ALL_FONTS_DEFAULT');"/>
-				<button label="&staff.server.admin.save_disk;" flex="1" oncommand="save();"/>
-			</vbox>
-		</hbox>
-	</groupbox>
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
+
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for font_settings.xul');
+
+    JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.stash_retrieve();
+    document.getElementById('sound').checked = typeof g.data.no_sound == 'undefined' || g.data.no_sound == 'false' || g.data.no_sound == false ? false : true;
+
+   } catch(E) {
+    try { g.error.standard_unexpected_error_alert('admin/font_settings.xul',E); } catch(F) { alert(E); }
+   }
+  }
+
+  function save() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+    JSAN.use('util.file'); var file = new util.file('global_font_adjust');
+    file.set_object(g.data.global_font_adjust);
+    file.close();
+    alert(document.getElementById("adminStrings").getString('staff.admin.font_settings.save'));
+   } catch(E) {
+    try { g.error.standard_unexpected_error_alert('saving in admin/font_settings.xul',E); } catch(F) { alert(E); }
+   }
+  }
+
+  function adjust(my_class) {
+   var status_msg = {
+    'ALL_FONTS_SMALLER': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_SMALLER'),
+    'ALL_FONTS_DEFAULT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_DEFAULT'),
+    'ALL_FONTS_LARGER': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_LARGER'),
+    'ALL_FONTS_XX_SMALL': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_XX_SMALL'),
+    'ALL_FONTS_X_SMALL': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_X_SMALL'),
+    'ALL_FONTS_SMALL': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_SMALL'),
+    'ALL_FONTS_MEDIUM': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_MEDIUM'),
+    'ALL_FONTS_LARGE': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_LARGE'),
+    'ALL_FONTS_X_LARGE': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_X_LARGE'),
+    'ALL_FONTS_XX_LARGE': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_XX_LARGE'),
+    'ALL_FONTS_5PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_5PT'),
+    'ALL_FONTS_6PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_6PT'),
+    'ALL_FONTS_7PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_7PT'),
+    'ALL_FONTS_8PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_8PT'),
+    'ALL_FONTS_9PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_9PT'),
+    'ALL_FONTS_10PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_10PT'),
+    'ALL_FONTS_11PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_11PT'),
+    'ALL_FONTS_12PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_12PT'),
+    'ALL_FONTS_13PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_13PT'),
+    'ALL_FONTS_14PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_14PT'),
+    'ALL_FONTS_15PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_15PT'),
+    'ALL_FONTS_16PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_16PT'),
+    'ALL_FONTS_17PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_17PT'),
+    'ALL_FONTS_18PT': document.getElementById("adminStrings").getString('staff.admin.font_settings.status_msg.ALL_FONTS_18PT')
+   };
+
+   try {
+    g.data.global_font_adjust = my_class; g.data.stash('global_font_adjust');
+    alert(status_msg[my_class]);
+   } catch(E) {
+    try { g.error.standard_unexpected_error_alert('setting font in admin/font_settings.xul',E); } catch(F) { alert(E); }
+   }
+  }
+
+  function toggle_sound() {
+   try {
+    var bool = document.getElementById('sound').checked;
+    g.data.no_sound = bool; g.data.stash('no_sound');
+    if (bool) {
+     alert(document.getElementById("adminStrings").getString('staff.admin.font_settings.sound.disabled'));
+    } else {
+     alert(document.getElementById("adminStrings").getString('staff.admin.font_settings.sound.enabled'));
+    }
+   } catch(E) {
+    try { g.error.standard_unexpected_error_alert('setting sound in admin/font_settings.xul',E); } catch(F) { alert(E); }
+   }
+  }
+
+  function save_sound() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+    JSAN.use('util.file'); var file = new util.file('no_sound');
+    file.write_content( 'truncate', String( document.getElementById('sound').checked ) );
+    file.close();
+    alert(document.getElementById("adminStrings").getString('staff.admin.font_settings.sound'));
+   } catch(E) {
+    try { g.error.standard_unexpected_error_alert('saving in admin/font_settings.xul',E); } catch(F) { alert(E); }
+   }
+  }
+
+ ]]>
+ </script>
+
+ <messagecatalog id="adminStrings" src='/xul/server/locale/<!--#echo var="locale"-->/admin.properties'/>
+
+ <groupbox orient="vertical">
+  <caption label="&staff.server.admin.font.sound.caption;"/>
+  <hbox>
+   <checkbox id="sound" label="&staff.server.admin.font.sound.checkbox;" oncommand="toggle_sound();"/>
+   <button label="&staff.server.admin.save_disk;" oncommand="save_sound();"/>
+  </hbox>
+ </groupbox>
+
+ <groupbox>
+  <caption label="&staff.server.admin.font.global.caption;"/>
+  <hbox>
+   <vbox>
+    <button class="ALL_FONTS_SMALLER" label="&staff.server.admin.font.smaller;" oncommand="adjust('ALL_FONTS_SMALLER');"/>
+    <button class="ALL_FONTS_DEFAULT" label="&staff.server.admin.font.default;" oncommand="adjust('ALL_FONTS_DEFAULT');"/>
+    <button class="ALL_FONTS_LARGER" label="&staff.server.admin.font.larger;" oncommand="adjust('ALL_FONTS_LARGER');"/>
+   </vbox>
+   <vbox>
+    <button class="ALL_FONTS_XX_SMALL" label="&staff.server.admin.font.xxsmall;" oncommand="adjust('ALL_FONTS_XX_SMALL');"/>
+    <button class="ALL_FONTS_X_SMALL" label="&staff.server.admin.font.xsmall;" oncommand="adjust('ALL_FONTS_X_SMALL');"/>
+    <button class="ALL_FONTS_SMALL" label="&staff.server.admin.font.small;" oncommand="adjust('ALL_FONTS_SMALL');"/>
+    <button class="ALL_FONTS_MEDIUM" label="&staff.server.admin.font.medium;" oncommand="adjust('ALL_FONTS_MEDIUM');"/>
+    <button class="ALL_FONTS_LARGE" label="&staff.server.admin.font.large;" oncommand="adjust('ALL_FONTS_LARGE');"/>
+    <button class="ALL_FONTS_X_LARGE" label="&staff.server.admin.font.xlarge;" oncommand="adjust('ALL_FONTS_X_LARGE');"/>
+    <button class="ALL_FONTS_XX_LARGE" label="&staff.server.admin.font.xxlarge;" oncommand="adjust('ALL_FONTS_XX_LARGE');"/>
+   </vbox>
+   <vbox>
+    <button class="ALL_FONTS_5PT" label="&staff.server.admin.font.5pt;" oncommand="adjust('ALL_FONTS_5PT');"/>
+    <button class="ALL_FONTS_6PT" label="&staff.server.admin.font.6pt;" oncommand="adjust('ALL_FONTS_6PT');"/>
+    <button class="ALL_FONTS_7PT" label="&staff.server.admin.font.7pt;" oncommand="adjust('ALL_FONTS_7PT');"/>
+    <button class="ALL_FONTS_8PT" label="&staff.server.admin.font.8pt;" oncommand="adjust('ALL_FONTS_8PT');"/>
+    <button class="ALL_FONTS_9PT" label="&staff.server.admin.font.9pt;" oncommand="adjust('ALL_FONTS_9PT');"/>
+    <button class="ALL_FONTS_10PT" label="&staff.server.admin.font.10pt;" oncommand="adjust('ALL_FONTS_10PT');"/>
+    <button class="ALL_FONTS_11PT" label="&staff.server.admin.font.11pt;" oncommand="adjust('ALL_FONTS_11PT');"/>
+    <button class="ALL_FONTS_12PT" label="&staff.server.admin.font.12pt;" oncommand="adjust('ALL_FONTS_12PT');"/>
+    <button class="ALL_FONTS_13PT" label="&staff.server.admin.font.13pt;" oncommand="adjust('ALL_FONTS_13PT');"/>
+    <button class="ALL_FONTS_14PT" label="&staff.server.admin.font.14pt;" oncommand="adjust('ALL_FONTS_14PT');"/>
+    <button class="ALL_FONTS_15PT" label="&staff.server.admin.font.15pt;" oncommand="adjust('ALL_FONTS_15PT');"/>
+    <button class="ALL_FONTS_16PT" label="&staff.server.admin.font.16pt;" oncommand="adjust('ALL_FONTS_16PT');"/>
+    <button class="ALL_FONTS_17PT" label="&staff.server.admin.font.17pt;" oncommand="adjust('ALL_FONTS_17PT');"/>
+    <button class="ALL_FONTS_18PT" label="&staff.server.admin.font.18pt;" oncommand="adjust('ALL_FONTS_18PT');"/>
+   </vbox>
+   <vbox>
+    <button label="&staff.server.admin.font.restore;" flex="1" oncommand="adjust('ALL_FONTS_DEFAULT');"/>
+    <button label="&staff.server.admin.save_disk;" flex="1" oncommand="save();"/>
+   </vbox>
+  </hbox>
+ </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/admin/hold_pull_list.js b/Open-ILS/xul/staff_client/server/admin/hold_pull_list.js
index 0567d5b4fa..3e1aadfc6e 100644
--- a/Open-ILS/xul/staff_client/server/admin/hold_pull_list.js
+++ b/Open-ILS/xul/staff_client/server/admin/hold_pull_list.js
@@ -1,114 +1,114 @@
 
-var FETCH_HOLD_LIST			= 'open-ils.circ:open-ils.circ.hold_pull_list.retrieve';
-var FETCH_COPY					= 'open-ils.search:open-ils.search.asset.copy.fleshed.custom';
-var FETCH_USER					= 'open-ils.actor:open-ils.actor.user.fleshed.retrieve';
-var FETCH_VOLUME				= 'open-ils.search:open-ils.search.callnumber.retrieve';
+var FETCH_HOLD_LIST   = 'open-ils.circ:open-ils.circ.hold_pull_list.retrieve';
+var FETCH_COPY     = 'open-ils.search:open-ils.search.asset.copy.fleshed.custom';
+var FETCH_USER     = 'open-ils.actor:open-ils.actor.user.fleshed.retrieve';
+var FETCH_VOLUME    = 'open-ils.search:open-ils.search.callnumber.retrieve';
 
-var myPerms				= [ 'VIEW_HOLD' ];
-var HOLD_LIST_LIMIT	= 100;
-var numHolds			= 0;
+var myPerms    = [ 'VIEW_HOLD' ];
+var HOLD_LIST_LIMIT = 100;
+var numHolds   = 0;
 
-var listOffset			= 0;
+var listOffset   = 0;
 
 function pullListInit() {
-	fetchUser();
-	$('pl_user').appendChild(text(USER.usrname()));
-	$('pl_org').appendChild(text(findOrgUnit(USER.ws_ou()).name()));
-	setTimeout( function() { 
-		fetchHighestPermOrgs( SESSION, USER.id(), myPerms );
-		pullListFetchHolds();
-	}, 20 );
+ fetchUser();
+ $('pl_user').appendChild(text(USER.usrname()));
+ $('pl_org').appendChild(text(findOrgUnit(USER.ws_ou()).name()));
+ setTimeout( function() { 
+  fetchHighestPermOrgs( SESSION, USER.id(), myPerms );
+  pullListFetchHolds();
+ }, 20 );
 }
 
 function pullListFetchHolds() {
-	var req = new Request(FETCH_HOLD_LIST, SESSION, HOLD_LIST_LIMIT, listOffset );
-	req.callback(pullListDrawHolds);
-	req.send();
+ var req = new Request(FETCH_HOLD_LIST, SESSION, HOLD_LIST_LIMIT, listOffset );
+ req.callback(pullListDrawHolds);
+ req.send();
 }
 
 var holdRowTemplate;
 function pullListDrawHolds(r) {
-	var holds = r.getResultObject();
+ var holds = r.getResultObject();
 
-	var tbody = $('pull_list_tbody');
-	if(!holdRowTemplate) 
-		holdRowTemplate = tbody.removeChild($('pull_list_row'));
-	numHolds = holds.length;
+ var tbody = $('pull_list_tbody');
+ if(!holdRowTemplate) 
+  holdRowTemplate = tbody.removeChild($('pull_list_row'));
+ numHolds = holds.length;
 
-	for( var h in holds ) {
-		var hold = holds[h];
-		var row = holdRowTemplate.cloneNode(true);
-		tbody.appendChild(row);
-		pullListDrawHold( tbody, row, hold, h );
-	}
+ for( var h in holds ) {
+  var hold = holds[h];
+  var row = holdRowTemplate.cloneNode(true);
+  tbody.appendChild(row);
+  pullListDrawHold( tbody, row, hold, h );
+ }
 
 }
 
 function pullListDrawHold( tbody, row, hold, idx ) {
 
-	$n(row, 'date').appendChild(text(hold.request_time().replace(/\ .*/, "")));
-
-	switch( hold.hold_type() ) {
-		case 'C' : unHideMe($n(row, 'copy_hold')); break;
-		case 'V' : unHideMe($n(row, 'volume_hold')); break;
-		case 'T' : unHideMe($n(row, 'title_hold')); break;
-		case 'M' : unHideMe($n(row, 'mr_hold')); break;
-	}
-	
-	var treq = new Request( FETCH_MODS_FROM_COPY, hold.current_copy() );
-	treq.callback(
-		function(r) {
-			pullListDrawTitle( tbody, row, hold, idx, r.getResultObject() );	});
-	treq.send();
-
-	var creq = new Request( FETCH_COPY, hold.current_copy(), ['location'] );
-	creq.callback(
-		function(r) {
-			pullListDrawCopy( tbody, row, hold, idx, r.getResultObject() ); });
-	creq.send();
-
-	var ureq = new Request( FETCH_USER, SESSION, hold.usr(), ['card'] );
-	ureq.callback(
-		function(r) {
-			pullListDrawUser( tbody, row, hold, idx, r.getResultObject() ); });
-	ureq.send();
+ $n(row, 'date').appendChild(text(hold.request_time().replace(/\ .*/, "")));
+
+ switch( hold.hold_type() ) {
+  case 'C' : unHideMe($n(row, 'copy_hold')); break;
+  case 'V' : unHideMe($n(row, 'volume_hold')); break;
+  case 'T' : unHideMe($n(row, 'title_hold')); break;
+  case 'M' : unHideMe($n(row, 'mr_hold')); break;
+ }
+ 
+ var treq = new Request( FETCH_MODS_FROM_COPY, hold.current_copy() );
+ treq.callback(
+  function(r) {
+   pullListDrawTitle( tbody, row, hold, idx, r.getResultObject() ); });
+ treq.send();
+
+ var creq = new Request( FETCH_COPY, hold.current_copy(), ['location'] );
+ creq.callback(
+  function(r) {
+   pullListDrawCopy( tbody, row, hold, idx, r.getResultObject() ); });
+ creq.send();
+
+ var ureq = new Request( FETCH_USER, SESSION, hold.usr(), ['card'] );
+ ureq.callback(
+  function(r) {
+   pullListDrawUser( tbody, row, hold, idx, r.getResultObject() ); });
+ ureq.send();
 
 }
 
 
 function pullListDrawTitle( tbody, row, hold, idx, record ) {
-	$n(row, 'title').appendChild(text(record.title()));
-	$n(row, 'author').appendChild(text(record.author()));
+ $n(row, 'title').appendChild(text(record.title()));
+ $n(row, 'author').appendChild(text(record.author()));
 
-	var type = modsFormatToMARC(record.types_of_resource()[0]);
-	unHideMe($n(row, 'format_' + type));
+ var type = modsFormatToMARC(record.types_of_resource()[0]);
+ unHideMe($n(row, 'format_' + type));
 }
 
 
 function pullListDrawCopy( tbody, row, hold, idx, copy ) {
 
-	$n(row, 'barcode').appendChild(text(copy.barcode()));
-	$n(row, 'copy_location').appendChild(text(copy.location().name()));
-	$n(row, 'copy_number').appendChild(text(copy.copy_number()));
+ $n(row, 'barcode').appendChild(text(copy.barcode()));
+ $n(row, 'copy_location').appendChild(text(copy.location().name()));
+ $n(row, 'copy_number').appendChild(text(copy.copy_number()));
 
-	var vreq = new Request(FETCH_VOLUME, copy.call_number());
-	vreq.callback(
-		function(r) { pullListDrawVolume( tbody, row, hold, idx, r.getResultObject() ); } );
-	vreq.send();
+ var vreq = new Request(FETCH_VOLUME, copy.call_number());
+ vreq.callback(
+  function(r) { pullListDrawVolume( tbody, row, hold, idx, r.getResultObject() ); } );
+ vreq.send();
 }
 
 
 function pullListDrawUser( tbody, row, hold, idx, user ) {
-	$n(row, 'patron').appendChild(text(user.card().barcode()));
+ $n(row, 'patron').appendChild(text(user.card().barcode()));
 }
 
 var callNumbers = [];
 function pullListDrawVolume( tbody, row, hold, idx, volume ) {
-	$n(row, 'call_number').appendChild(text(volume.label()));
-	callNumbers.push(volume.label());
+ $n(row, 'call_number').appendChild(text(volume.label()));
+ callNumbers.push(volume.label());
 
-	if( (parseInt(idx) +1) == numHolds )
-		ts_resortTable($('pl_callnumber').getElementsByTagName('a')[0]);
+ if( (parseInt(idx) +1) == numHolds )
+  ts_resortTable($('pl_callnumber').getElementsByTagName('a')[0]);
 }
 
 
diff --git a/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml b/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml
index 78f81afc91..5936cc538f 100644
--- a/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml
@@ -1,96 +1,96 @@
 <?xml version='1.0' encoding="UTF-8"?>
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
-	<!ENTITY nbsp " "> <!-- calendar needs this entity -->
+ "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!ENTITY nbsp " "> <!-- calendar needs this entity -->
 ]>
 
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
 
-	<head>
-		<title>&staff.server.admin.hold_pull.title;</title>
-		<script language='javascript' src='/opac/common/js/utils.js'> </script>
-		<script language='javascript' src='/opac/common/js//config.js'> </script> 
-		<script language='javascript' src='/opac/common/js/CGI.js'> </script>
-		<script language='javascript' src='/opac/common/js/Cookie.js'> </script>
-	
-		<script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
-		<script language='javascript' src='/opac/common/js/fmall.js'> </script>
-		<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
-		<script language='javascript' src='/opac/common/js/Cookies.js'> </script>
-		<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
-		<script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
-		<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
-		<script language='javascript' src='/opac/common/js/init.js'> </script>
-		<script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
-		<script language='javascript' src='/opac/common/js/sorttable.js'> </script>
-		<script language='javascript' src='adminlib.js'> </script>
-		<script language='javascript' src='hold_pull_list.js'> </script>
-		<link type='text/css' rel='stylesheet' href='admin.css'/>
+ <head>
+  <title>&staff.server.admin.hold_pull.title;</title>
+  <script language='javascript' src='/opac/common/js/utils.js'> </script>
+  <script language='javascript' src='/opac/common/js//config.js'> </script> 
+  <script language='javascript' src='/opac/common/js/CGI.js'> </script>
+  <script language='javascript' src='/opac/common/js/Cookie.js'> </script>
+ 
+  <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
+  <script language='javascript' src='/opac/common/js/fmall.js'> </script>
+  <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
+  <script language='javascript' src='/opac/common/js/Cookies.js'> </script>
+  <script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
+  <script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
+  <script language='javascript' src='/opac/common/js/org_utils.js'> </script>
+  <script language='javascript' src='/opac/common/js/init.js'> </script>
+  <script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
+  <script language='javascript' src='/opac/common/js/sorttable.js'> </script>
+  <script language='javascript' src='adminlib.js'> </script>
+  <script language='javascript' src='hold_pull_list.js'> </script>
+  <link type='text/css' rel='stylesheet' href='admin.css'/>
   
-		<style type='text/css'>
-			a { color: black; text-decoration: none; }
-		</style>
-	</head>
+  <style type='text/css'>
+   a { color: black; text-decoration: none; }
+  </style>
+ </head>
 
-	<body onload='try{pullListInit();}catch(e){alert(js2JSON(e));}'>
+ <body onload='try{pullListInit();}catch(e){alert(js2JSON(e));}'>
 
-		<center>
-			<h2>&staff.server.admin.hold_pull.header;<span id='pl_org'/></h2>
+  <center>
+   <h2>&staff.server.admin.hold_pull.header;<span id='pl_org'/></h2>
 
-			<div style='position:absolute; top: 5px; right: 5px;'>
-				<span>&staff.server.admin.hold_pull.greeting;</span><b><span id='pl_user'/></b>
-			</div>
-		
-			<hr/><br/>
+   <div style='position:absolute; top: 5px; right: 5px;'>
+    <span>&staff.server.admin.hold_pull.greeting;</span><b><span id='pl_user'/></b>
+   </div>
+  
+   <hr/><br/>
 
-			<span>&staff.server.admin.hold_pull.sort.note;</span>
+   <span>&staff.server.admin.hold_pull.sort.note;</span>
 
-			<table width='100%' class='data_grid sortable' id='pl_table'>
-				<thead>
-					<tr>
-						<td>&staff.server.admin.hold_pull.title.label;</td>
-						<td>&staff.server.admin.hold_pull.author;</td>
-						<td>&staff.server.admin.hold_pull.copy_location;</td>
-						<td id='pl_callnumber'>&staff.server.admin.hold_pull.call_number;</td>
-						<td>&staff.server.admin.hold_pull.item_barcode;</td>
-						<td>&staff.server.admin.hold_pull.copy;</td>
-						<td>&staff.server.admin.hold_pull.format;</td>
-						<td>&staff.server.admin.hold_pull.patron_barcode;</td>
-						<td>&staff.server.admin.hold_pull.hold_date;</td>
-						<td>&staff.server.admin.hold_pull.hold_type;</td>
-					</tr>
-				</thead>
-				<tbody id='pull_list_tbody'>
-					<tr id='pull_list_row'>
-						<td name='title'/>
-						<td name='author'/>
-						<td name='copy_location'/>
-						<td name='call_number'/>
-						<td name='barcode'/>
-						<td name='copy_number'/>
-						<td>
-							<span name='format_at'		class='hide_me'>&staff.server.admin.hold_pull.book;</span>
-							<span name='format_at-d'	class='hide_me'>&staff.server.admin.hold_pull.large_book;</span>
-							<span name='format_i'		class='hide_me'>&staff.server.admin.hold_pull.audiobook;</span>
-							<span name='format_g'		class='hide_me'>&staff.server.admin.hold_pull.video;</span>
-							<span name='format_j'		class='hide_me'>&staff.server.admin.hold_pull.music;</span>
-							<span name='format_m'		class='hide_me'>&staff.server.admin.hold_pull.eresource;</span>
-						</td>
-						<td name='patron'/>
-						<td name='date'/>
-						<td>
-							<span name='copy_hold' class='hide_me'>&staff.server.admin.hold_pull.copy_hold;</span>
-							<span name='volume_hold' class='hide_me'>&staff.server.admin.hold_pull.volume_hold;</span>
-							<span name='title_hold' class='hide_me'>&staff.server.admin.hold_pull.title_hold;</span>
-							<span name='mr_hold' class='hide_me'>&staff.server.admin.hold_pull.metarecord_hold;</span>
-						</td>
-					</tr>
-				</tbody>
-			</table>
-		</center>
-	</body>
+   <table width='100%' class='data_grid sortable' id='pl_table'>
+    <thead>
+     <tr>
+      <td>&staff.server.admin.hold_pull.title.label;</td>
+      <td>&staff.server.admin.hold_pull.author;</td>
+      <td>&staff.server.admin.hold_pull.copy_location;</td>
+      <td id='pl_callnumber'>&staff.server.admin.hold_pull.call_number;</td>
+      <td>&staff.server.admin.hold_pull.item_barcode;</td>
+      <td>&staff.server.admin.hold_pull.copy;</td>
+      <td>&staff.server.admin.hold_pull.format;</td>
+      <td>&staff.server.admin.hold_pull.patron_barcode;</td>
+      <td>&staff.server.admin.hold_pull.hold_date;</td>
+      <td>&staff.server.admin.hold_pull.hold_type;</td>
+     </tr>
+    </thead>
+    <tbody id='pull_list_tbody'>
+     <tr id='pull_list_row'>
+      <td name='title'/>
+      <td name='author'/>
+      <td name='copy_location'/>
+      <td name='call_number'/>
+      <td name='barcode'/>
+      <td name='copy_number'/>
+      <td>
+       <span name='format_at'  class='hide_me'>&staff.server.admin.hold_pull.book;</span>
+       <span name='format_at-d' class='hide_me'>&staff.server.admin.hold_pull.large_book;</span>
+       <span name='format_i'  class='hide_me'>&staff.server.admin.hold_pull.audiobook;</span>
+       <span name='format_g'  class='hide_me'>&staff.server.admin.hold_pull.video;</span>
+       <span name='format_j'  class='hide_me'>&staff.server.admin.hold_pull.music;</span>
+       <span name='format_m'  class='hide_me'>&staff.server.admin.hold_pull.eresource;</span>
+      </td>
+      <td name='patron'/>
+      <td name='date'/>
+      <td>
+       <span name='copy_hold' class='hide_me'>&staff.server.admin.hold_pull.copy_hold;</span>
+       <span name='volume_hold' class='hide_me'>&staff.server.admin.hold_pull.volume_hold;</span>
+       <span name='title_hold' class='hide_me'>&staff.server.admin.hold_pull.title_hold;</span>
+       <span name='mr_hold' class='hide_me'>&staff.server.admin.hold_pull.metarecord_hold;</span>
+      </td>
+     </tr>
+    </tbody>
+   </table>
+  </center>
+ </body>
 </html>
diff --git a/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.js b/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.js
index 94683f7e6b..8a38af7be1 100644
--- a/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.js
+++ b/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.js
@@ -1,240 +1,240 @@
 var g = {};
 
-var FETCH_HOLD_LIST			= 'open-ils.circ:open-ils.circ.hold_pull_list.retrieve';
-var FETCH_COPY					= 'open-ils.search:open-ils.search.asset.copy.fleshed.custom';
-var FETCH_USER					= 'open-ils.actor:open-ils.actor.user.fleshed.retrieve';
-var FETCH_VOLUME				= 'open-ils.search:open-ils.search.callnumber.retrieve';
+var FETCH_HOLD_LIST   = 'open-ils.circ:open-ils.circ.hold_pull_list.retrieve';
+var FETCH_COPY     = 'open-ils.search:open-ils.search.asset.copy.fleshed.custom';
+var FETCH_USER     = 'open-ils.actor:open-ils.actor.user.fleshed.retrieve';
+var FETCH_VOLUME    = 'open-ils.search:open-ils.search.callnumber.retrieve';
 
-var myPerms				= [ 'VIEW_HOLD' ];
-var HOLD_LIST_LIMIT	= 100;
-var numHolds			= 0;
+var myPerms    = [ 'VIEW_HOLD' ];
+var HOLD_LIST_LIMIT = 100;
+var numHolds   = 0;
 
-var listOffset			= 0;
+var listOffset   = 0;
 
 function pullListInit() {
-	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-	if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
-	JSAN.errorLevel = "die"; // none, warn, or die
-	JSAN.addRepository('/xul/server/');
-	JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.stash_retrieve();
-
-	fetchUser();
-	$('pl_user').appendChild(text(USER.usrname()));
-	$('pl_org').appendChild(text(findOrgUnit(USER.ws_ou()).name()));
-	setTimeout( function() { 
-		fetchHighestPermOrgs( SESSION, USER.id(), myPerms );
-		pullListFetchHolds();
-	}, 20 );
+ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
+ JSAN.errorLevel = "die"; // none, warn, or die
+ JSAN.addRepository('/xul/server/');
+ JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.stash_retrieve();
+
+ fetchUser();
+ $('pl_user').appendChild(text(USER.usrname()));
+ $('pl_org').appendChild(text(findOrgUnit(USER.ws_ou()).name()));
+ setTimeout( function() { 
+  fetchHighestPermOrgs( SESSION, USER.id(), myPerms );
+  pullListFetchHolds();
+ }, 20 );
 }
 
 function pullListFetchHolds() {
-	var req = new Request(FETCH_HOLD_LIST, SESSION, HOLD_LIST_LIMIT, listOffset );
-	req.callback(pullListDrawHolds);
-	req.send();
+ var req = new Request(FETCH_HOLD_LIST, SESSION, HOLD_LIST_LIMIT, listOffset );
+ req.callback(pullListDrawHolds);
+ req.send();
 }
 
 var holdRowTemplate;
 function pullListDrawHolds(r) {
-	var holds = r.getResultObject();
+ var holds = r.getResultObject();
 
-	var tbody = $('pull_list_tbody');
-	if(!holdRowTemplate) 
-		holdRowTemplate = tbody.removeChild($('pull_list_row'));
-	numHolds = holds.length;
+ var tbody = $('pull_list_tbody');
+ if(!holdRowTemplate) 
+  holdRowTemplate = tbody.removeChild($('pull_list_row'));
+ numHolds = holds.length;
 
-	for( var h in holds ) {
-		var hold = holds[h];
-		var row = holdRowTemplate.cloneNode(true);
-		tbody.appendChild(row);
-		pullListDrawHold( tbody, row, hold, h );
-	}
+ for( var h in holds ) {
+  var hold = holds[h];
+  var row = holdRowTemplate.cloneNode(true);
+  tbody.appendChild(row);
+  pullListDrawHold( tbody, row, hold, h );
+ }
 
 }
 
 function pullListDrawHold( tbody, row, hold, idx ) {
 
-	$n(row, 'date').appendChild(text(hold.request_time().replace(/\ .*/, "")));
-	var pl = typeof hold.pickup_lib() == 'object' ? hold.pickup_lib().shortname() : g.data.hash.aou[ hold.pickup_lib() ].shortname();
-	$n(row, 'pickup').appendChild(text(pl));
-
-	switch( hold.hold_type() ) {
-		case 'C' : unHideMe($n(row, 'copy_hold')); break;
-		case 'V' : unHideMe($n(row, 'volume_hold')); break;
-		case 'T' : unHideMe($n(row, 'title_hold')); break;
-		case 'M' : unHideMe($n(row, 'mr_hold')); break;
-	}
-	
-	var treq = new Request( FETCH_MODS_FROM_COPY, hold.current_copy() );
-	treq.callback(
-		function(r) {
-			pullListDrawTitle( tbody, row, hold, idx, r.getResultObject() );	});
-	treq.send();
-
-	var creq = new Request( FETCH_COPY, hold.current_copy(), ['location'] );
-	creq.callback(
-		function(r) {
-			pullListDrawCopy( tbody, row, hold, idx, r.getResultObject() ); });
-	creq.send();
-
-	var ureq = new Request( FETCH_USER, SESSION, hold.usr(), ['card'] );
-	ureq.callback(
-		function(r) {
-			pullListDrawUser( tbody, row, hold, idx, r.getResultObject() ); });
-	ureq.send();
+ $n(row, 'date').appendChild(text(hold.request_time().replace(/\ .*/, "")));
+ var pl = typeof hold.pickup_lib() == 'object' ? hold.pickup_lib().shortname() : g.data.hash.aou[ hold.pickup_lib() ].shortname();
+ $n(row, 'pickup').appendChild(text(pl));
+
+ switch( hold.hold_type() ) {
+  case 'C' : unHideMe($n(row, 'copy_hold')); break;
+  case 'V' : unHideMe($n(row, 'volume_hold')); break;
+  case 'T' : unHideMe($n(row, 'title_hold')); break;
+  case 'M' : unHideMe($n(row, 'mr_hold')); break;
+ }
+ 
+ var treq = new Request( FETCH_MODS_FROM_COPY, hold.current_copy() );
+ treq.callback(
+  function(r) {
+   pullListDrawTitle( tbody, row, hold, idx, r.getResultObject() ); });
+ treq.send();
+
+ var creq = new Request( FETCH_COPY, hold.current_copy(), ['location'] );
+ creq.callback(
+  function(r) {
+   pullListDrawCopy( tbody, row, hold, idx, r.getResultObject() ); });
+ creq.send();
+
+ var ureq = new Request( FETCH_USER, SESSION, hold.usr(), ['card'] );
+ ureq.callback(
+  function(r) {
+   pullListDrawUser( tbody, row, hold, idx, r.getResultObject() ); });
+ ureq.send();
 
 }
 
 
 function pullListDrawTitle( tbody, row, hold, idx, record ) {
-	$n(row, 'title').appendChild(text(record.title()));
-	$n(row, 'author').appendChild(text(record.author()));
+ $n(row, 'title').appendChild(text(record.title()));
+ $n(row, 'author').appendChild(text(record.author()));
 
-	var type = modsFormatToMARC(record.types_of_resource()[0]);
-	unHideMe($n(row, 'format_' + type));
-	if( (parseInt(idx) +1) == numHolds ) update_ready('title');
+ var type = modsFormatToMARC(record.types_of_resource()[0]);
+ unHideMe($n(row, 'format_' + type));
+ if( (parseInt(idx) +1) == numHolds ) update_ready('title');
 }
 
 
 function pullListDrawCopy( tbody, row, hold, idx, copy ) {
 
-	$n(row, 'barcode').appendChild(text(copy.barcode()));
-	$n(row, 'copy_location').appendChild(text(copy.location().name()));
-	$n(row, 'copy_number').appendChild(text(copy.copy_number()));
-	try {
-		if (copy.age_protect()) {
-			$n(row, 'age_protect').appendChild(text( (copy.age_protect() == null ? '<Unset>' : ( typeof copy.age_protect() == 'object' ? copy.age_protect().name() : g.data.hash.crahp[ copy.age_protect() ].name() )) + ' (' + copy.create_date().substr(0,10) + ')' ));	
-			unHideMe($n(row, 'age_protect_span'));
-		}
-	} catch(E) { alert(E); }
-
-	var vreq = new Request(FETCH_VOLUME, copy.call_number());
-	vreq.callback(
-		function(r) { pullListDrawVolume( tbody, row, hold, idx, r.getResultObject() ); } );
-	vreq.send();
+ $n(row, 'barcode').appendChild(text(copy.barcode()));
+ $n(row, 'copy_location').appendChild(text(copy.location().name()));
+ $n(row, 'copy_number').appendChild(text(copy.copy_number()));
+ try {
+  if (copy.age_protect()) {
+   $n(row, 'age_protect').appendChild(text( (copy.age_protect() == null ? '<Unset>' : ( typeof copy.age_protect() == 'object' ? copy.age_protect().name() : g.data.hash.crahp[ copy.age_protect() ].name() )) + ' (' + copy.create_date().substr(0,10) + ')' )); 
+   unHideMe($n(row, 'age_protect_span'));
+  }
+ } catch(E) { alert(E); }
+
+ var vreq = new Request(FETCH_VOLUME, copy.call_number());
+ vreq.callback(
+  function(r) { pullListDrawVolume( tbody, row, hold, idx, r.getResultObject() ); } );
+ vreq.send();
 }
 
 
 function pullListDrawUser( tbody, row, hold, idx, user ) {
-	$n(row, 'patron').appendChild(text(user.card().barcode()));
-	if( (parseInt(idx) +1) == numHolds ) update_ready('patron');
+ $n(row, 'patron').appendChild(text(user.card().barcode()));
+ if( (parseInt(idx) +1) == numHolds ) update_ready('patron');
 }
 
 var callNumbers = [];
 function pullListDrawVolume( tbody, row, hold, idx, volume ) {
-	$n(row, 'call_number').appendChild(text(volume.label()));
-	callNumbers.push(volume.label());
+ $n(row, 'call_number').appendChild(text(volume.label()));
+ callNumbers.push(volume.label());
 
-	if( (parseInt(idx) +1) == numHolds ) update_ready('call_number');
+ if( (parseInt(idx) +1) == numHolds ) update_ready('call_number');
 }
 
 
 function ts_getInnerText(el) {
-	try {
-		if (el == null) { alert('null'); return ''; }
-		if (typeof el == "string") return el;
-		if (typeof el == "undefined") { return el };
-		if (el.innerText) return el.innerText;  //Not needed but it is faster
-		var str = "";
-	
-		var cs = el.childNodes;
-		var l = cs.length;
-		for (var i = 0; i < l; i++) {
-			switch (cs[i].nodeType) {
-				case 1: //ELEMENT_NODE
-	                str += ts_getInnerText(cs[i]);
-				break;
-				case 3: //TEXT_NODE
-					str += cs[i].nodeValue;
-				break;
-			}
-		}
-		return str;
-	} catch(E) {
-		try { 
-			alert('el = ' + el + '\nel.nodeName = ' + el.nodeName + '  el.nodeType = ' + el.nodeType + '\nE = ' + E);
-		} catch(F) {
-			alert('el = ' + el + '\nF = ' + F + '\nE = ' + E);
-		}
-	}
+ try {
+  if (el == null) { alert('null'); return ''; }
+  if (typeof el == "string") return el;
+  if (typeof el == "undefined") { return el };
+  if (el.innerText) return el.innerText;  //Not needed but it is faster
+  var str = "";
+ 
+  var cs = el.childNodes;
+  var l = cs.length;
+  for (var i = 0; i < l; i++) {
+   switch (cs[i].nodeType) {
+    case 1: //ELEMENT_NODE
+                 str += ts_getInnerText(cs[i]);
+    break;
+    case 3: //TEXT_NODE
+     str += cs[i].nodeValue;
+    break;
+   }
+  }
+  return str;
+ } catch(E) {
+  try { 
+   alert('el = ' + el + '\nel.nodeName = ' + el.nodeName + '  el.nodeType = ' + el.nodeType + '\nE = ' + E);
+  } catch(F) {
+   alert('el = ' + el + '\nF = ' + F + '\nE = ' + E);
+  }
+ }
 }
 
 function get_unhidden_span(node) {
-	var nl = node.childNodes;
-	var s = '';
-	for (var i = 0; i < nl.length; i++) {
-		if (nl[i].nodeName != 'span') continue;
-		if (nl[i].getAttribute('class') != 'hide_me') s += ts_getInnerText(nl[i]);
-	}
-	return s;
+ var nl = node.childNodes;
+ var s = '';
+ for (var i = 0; i < nl.length; i++) {
+  if (nl[i].nodeName != 'span') continue;
+  if (nl[i].getAttribute('class') != 'hide_me') s += ts_getInnerText(nl[i]);
+ }
+ return s;
 }
 
 function $f(parent,name) {
-	var nl = parent.childNodes;
-	for (var i = 0; i < nl.length; i++) {
-		if (typeof nl[i].getAttribute != 'undefined' && nl[i].getAttribute('name') == name) {
-			return nl[i];
-		}
-	}
+ var nl = parent.childNodes;
+ for (var i = 0; i < nl.length; i++) {
+  if (typeof nl[i].getAttribute != 'undefined' && nl[i].getAttribute('name') == name) {
+   return nl[i];
+  }
+ }
 }
 
 function update_ready(which_update) {
-	g[which_update] = true;
-	if (typeof g.title != 'undefined' && typeof g.patron != 'undefined' && typeof g.call_number != 'undefined') {
-		setTimeout( function() { update_ready_do_it(); }, 1000);
-	}
+ g[which_update] = true;
+ if (typeof g.title != 'undefined' && typeof g.patron != 'undefined' && typeof g.call_number != 'undefined') {
+  setTimeout( function() { update_ready_do_it(); }, 1000);
+ }
 }
 
 function update_ready_do_it() {
-	unHideMe($('pull_list_tbody')); hideMe($('inprogress'));
-	var rows = [];
-	var div = $('pull_list_tbody');
-	var div_children = div.childNodes;
-	for (var i = 0; i < div_children.length; i++) {
-		var pre = div_children[i];
-		if (pre.nodeName != 'pre') continue;
-		value = ( 
-			{ 
-				'call_number' : ts_getInnerText($f(pre,'call_number')), 
-				'title' : ts_getInnerText($f(pre,'title')),
-				'author' : ts_getInnerText($f(pre,'author')),
-				'location' : ts_getInnerText($f(pre,'copy_location')),
-				'copy_number' : ts_getInnerText($f(pre,'copy_number')),
-				'item_type' : get_unhidden_span($f(pre,'item_type')),
-				'node' : pre 
-			} 
-		);
-		rows.push( value );
-	}
-	rows = rows.sort( function(a,b) { 
-		function inner_sort(sort_type,a,b) {
-			switch(sort_type) {
-				case 'number' :
-					a = Number(a); b = Number(b);
-				break;
-				case 'title' : /* special case for "a" and "the".  doesn't use marc 245 indicator */
-					a = String( a ).toUpperCase().replace( /^\s*(THE|A|AN)\s+/, '' );
-					b = String( b ).toUpperCase().replace( /^\s*(THE|A|AN)\s+/, '' );
-				break;
-				default:
-					a = String( a ).toUpperCase();
-					b = String( b ).toUpperCase();
-				break;
-			}
-				
-			if (a < b) return -1; 
-			if (a > b) return 1; 
-			return 0; 
-		}
-		var value = inner_sort('string',a.call_number,b.call_number);
-		if (value == 0) value = inner_sort('title',a.title,b.title);
-		if (value == 0) value = inner_sort('string',a.author,b.author);
-		if (value == 0) value = inner_sort('string',a.location,b.location);
-		if (value == 0) value = inner_sort('number',a.copy_number,b.copy_number);
-		if (value == 0) value = inner_sort('string',a.item_type,b.item_type);
-		return value;
-	} );
-	while(div.lastChild) div.removeChild( div.lastChild );
-	for (var i = 0; i < rows.length; i++) {
-		div.appendChild( rows[i].node );
-	}
+ unHideMe($('pull_list_tbody')); hideMe($('inprogress'));
+ var rows = [];
+ var div = $('pull_list_tbody');
+ var div_children = div.childNodes;
+ for (var i = 0; i < div_children.length; i++) {
+  var pre = div_children[i];
+  if (pre.nodeName != 'pre') continue;
+  value = ( 
+   { 
+    'call_number' : ts_getInnerText($f(pre,'call_number')), 
+    'title' : ts_getInnerText($f(pre,'title')),
+    'author' : ts_getInnerText($f(pre,'author')),
+    'location' : ts_getInnerText($f(pre,'copy_location')),
+    'copy_number' : ts_getInnerText($f(pre,'copy_number')),
+    'item_type' : get_unhidden_span($f(pre,'item_type')),
+    'node' : pre 
+   } 
+  );
+  rows.push( value );
+ }
+ rows = rows.sort( function(a,b) { 
+  function inner_sort(sort_type,a,b) {
+   switch(sort_type) {
+    case 'number' :
+     a = Number(a); b = Number(b);
+    break;
+    case 'title' : /* special case for "a" and "the".  doesn't use marc 245 indicator */
+     a = String( a ).toUpperCase().replace( /^\s*(THE|A|AN)\s+/, '' );
+     b = String( b ).toUpperCase().replace( /^\s*(THE|A|AN)\s+/, '' );
+    break;
+    default:
+     a = String( a ).toUpperCase();
+     b = String( b ).toUpperCase();
+    break;
+   }
+    
+   if (a < b) return -1; 
+   if (a > b) return 1; 
+   return 0; 
+  }
+  var value = inner_sort('string',a.call_number,b.call_number);
+  if (value == 0) value = inner_sort('title',a.title,b.title);
+  if (value == 0) value = inner_sort('string',a.author,b.author);
+  if (value == 0) value = inner_sort('string',a.location,b.location);
+  if (value == 0) value = inner_sort('number',a.copy_number,b.copy_number);
+  if (value == 0) value = inner_sort('string',a.item_type,b.item_type);
+  return value;
+ } );
+ while(div.lastChild) div.removeChild( div.lastChild );
+ for (var i = 0; i < rows.length; i++) {
+  div.appendChild( rows[i].node );
+ }
 }
diff --git a/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml b/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml
index 3e76c1fde6..c979cd19cc 100644
--- a/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml
@@ -1,55 +1,55 @@
 <?xml version='1.0'?>
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!ENTITY nbsp " "> <!-- calendar needs this entity -->
+ "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+ <!ENTITY nbsp " "> <!-- calendar needs this entity -->
 ]>
 
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
 
-	<head>
-		<title>Evergreen Holds Pull List</title>
-		<script language='javascript' src='/opac/common/js/utils.js'> </script>
-		<script language='javascript' src='/opac/common/js//config.js'> </script> 
-		<script language='javascript' src='/opac/common/js/CGI.js'> </script>
-		<script language='javascript' src='/opac/common/js/Cookie.js'> </script>
-	
-		<script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
-		<script language='javascript' src='/opac/common/js/fmall.js'> </script>
-		<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
-		<script language='javascript' src='/opac/common/js/Cookies.js'> </script>
-		<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
-		<script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
-		<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
-		<script language='javascript' src='/opac/common/js/init.js'> </script>
-		<script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
-		<!--
-		<script language='javascript' src='/opac/common/js/sorttable.js'> </script>
-		-->
-		<script language='javascript' src='adminlib.js'> </script>
-		<script language='javascript' src='/xul/server/main/constants.js'> </script>
-		<script language='javascript' src='/xul/server/main/JSAN.js'> </script>
-		<script language='javascript' src='hold_pull_list_classic.js'> </script>
-		<link type='text/css' rel='stylesheet' href='admin.css'/>
+ <head>
+  <title>Evergreen Holds Pull List</title>
+  <script language='javascript' src='/opac/common/js/utils.js'> </script>
+  <script language='javascript' src='/opac/common/js//config.js'> </script> 
+  <script language='javascript' src='/opac/common/js/CGI.js'> </script>
+  <script language='javascript' src='/opac/common/js/Cookie.js'> </script>
+ 
+  <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
+  <script language='javascript' src='/opac/common/js/fmall.js'> </script>
+  <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
+  <script language='javascript' src='/opac/common/js/Cookies.js'> </script>
+  <script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
+  <script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
+  <script language='javascript' src='/opac/common/js/org_utils.js'> </script>
+  <script language='javascript' src='/opac/common/js/init.js'> </script>
+  <script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
+  <!--
+  <script language='javascript' src='/opac/common/js/sorttable.js'> </script>
+  -->
+  <script language='javascript' src='adminlib.js'> </script>
+  <script language='javascript' src='/xul/server/main/constants.js'> </script>
+  <script language='javascript' src='/xul/server/main/JSAN.js'> </script>
+  <script language='javascript' src='hold_pull_list_classic.js'> </script>
+  <link type='text/css' rel='stylesheet' href='admin.css'/>
   
-		<style type='text/css'>
-			a { color: black; text-decoration: none; }
-		</style>
-	</head>
+  <style type='text/css'>
+   a { color: black; text-decoration: none; }
+  </style>
+ </head>
 
-	<body onload='try{pullListInit();}catch(e){alert(js2JSON(e));}'>
+ <body onload='try{pullListInit();}catch(e){alert(js2JSON(e));}'>
 
-		<center>
-			<h2>Evergreen Holds Pull List : <span id='pl_org'/></h2>
+  <center>
+   <h2>Evergreen Holds Pull List : <span id='pl_org'/></h2>
 
-			<div style='position:absolute; top: 5px; right: 5px;'>
-				<span>Welcome </span><b><span id='pl_user'/></b>
-			</div>
-			<hr/><br/>
-			<div id='inprogress'><blink><span>Retrieving and sorting pull list...</span></blink></div>
-		</center>
+   <div style='position:absolute; top: 5px; right: 5px;'>
+    <span>Welcome </span><b><span id='pl_user'/></b>
+   </div>
+   <hr/><br/>
+   <div id='inprogress'><blink><span>Retrieving and sorting pull list...</span></blink></div>
+  </center>
 <div id='pull_list_tbody' align="left" class='hide_me'>
 <pre id='pull_list_row'>
 <span name='call_number'/>
@@ -61,5 +61,5 @@
 <b>Pickup:</b> <span name='pickup'/>            <span name="age_protect_span" class='hide_me'><b>Hold Protection:</b> <span name="age_protect"/></span>
 </pre>
 </div>
-	</body>
+ </body>
 </html>
diff --git a/Open-ILS/xul/staff_client/server/admin/index.xhtml b/Open-ILS/xul/staff_client/server/admin/index.xhtml
index f2ecc05c1b..7a046ff8c6 100644
--- a/Open-ILS/xul/staff_client/server/admin/index.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/index.xhtml
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding="UTF-8"?>
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<title>&staff.server.admin.index.title;</title>
-		<script>
-			function _l(l,p) { 
+ <head>
+  <title>&staff.server.admin.index.title;</title>
+  <script>
+   function _l(l,p) { 
                 var url = l + location.search;
                 if (p) {
                     if (location.search) { url += '&amp;'; } else { url += '?'; }
@@ -20,74 +20,74 @@
                 location.href = url;
             }
             function getBuildId() { return location.href.match(/\/xul\/(.+?)\/server\//)[1]; }
-		</script>
-		<style type='text/css'>
-			body { background-color: white; }
-		</style>
-	</head>
-	<body>
-		<center>
-			<div style='height: 40px; margin-top: 20px; font-weight: bold; font-size: 14pt;'>
-				&staff.server.admin.index.title;
-			</div>
-			<img src='../skin/media/images/tools.png'/>
-			<style>
-				td { text-align: center; }
-			</style>
-			<br/> <br/>
-			<table width='100%'>
-				<thead>
-					<tr>
-						<th width='30%'>&staff.server.admin.index.workstation_configuration;</th>
-						<th width='30%'>&staff.server.admin.index.library_configuration;</th>
-						<th width='30%'>&staff.server.admin.index.maintenance_reports;</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr valign="top">
-						<td>
-							<div style='padding: 8px;'>
-								<a href='javascript:_l("font_settings.xul");'>&staff.server.admin.index.fonts_and_sounds;</a>
-							</div>
-							<div style='padding: 8px;'>
-								<a href='javascript:_l("printer_settings.html");'>&staff.server.admin.index.printer;</a>
-							</div>
-						</td><td>
-							<div style='padding: 8px;'>
-								<a href='javascript:_l("closed_dates.xhtml");'>&staff.server.admin.index.closed_dates;</a>
-							</div>
-							<div style='padding: 8px;'>
-								<a href='javascript:_l("copy_locations.xhtml");'>&staff.server.admin.index.copy_locations;</a>
-							</div>
-							<div style='padding: 8px;'>
-								<a href='javascript:_l("org_unit_settings.xhtml");'>&staff.server.admin.index.library_settings;</a>
-							</div>
-							<div style='padding: 8px;'>
-								<a href='javascript:_l("non_cat_types.xhtml");'>&staff.server.admin.index.non_cataloged_types;</a>
-							</div>
-							<div style='padding: 8px;'>
-								<a href='javascript:_l("stat_cat_editor.xhtml");'>&staff.server.admin.index.statistical_categories;</a>
-							</div>
-						</td><td>
-							<div style='padding: 8px;'>
-								<a href='javascript:window.xulG.new_tab("/xul/server/patron/holds.xul",{"tab_name":"&staff.server.admin.index.hold_pull_list;"},{});'>&staff.server.admin.index.hold_pull_list;</a> <span style="color: red">&staff.server.admin.index.testing;</span>
-							</div>
-							<div style='padding: 8px;'>
-								<a href='javascript:_l("hold_pull_list_classic.xhtml");'>&staff.server.admin.index.hold_pull_list_classic;</a> <span style="color: red">&staff.server.admin.index.testing;</span>
-							</div>
-							<div style='padding: 8px;'>
-								<a href='javascript:_l( "/reports/oils_rpt.xhtml","build_id=" + getBuildId() );'>&staff.server.admin.index.reports;</a>
-							</div>
-							<div style='padding: 8px;'>
-								<a href='javascript:_l("cash_reports.xhtml");'>&staff.server.admin.index.cash_reports;</a>
-							</div>
-							<div style='padding: 8px;'>
-								<a href='javascript:window.xulG.new_tab("/xul/server/admin/transit_list.xul",{"tab_name":"&staff.server.admin.index.transits;"},{});'>&staff.server.admin.index.transit_list;</a>
-							</div>
-						</td>
-					</tr>
-				</tbody>
-			</table>
-		</center>
-	</body>
+  </script>
+  <style type='text/css'>
+   body { background-color: white; }
+  </style>
+ </head>
+ <body>
+  <center>
+   <div style='height: 40px; margin-top: 20px; font-weight: bold; font-size: 14pt;'>
+    &staff.server.admin.index.title;
+   </div>
+   <img src='../skin/media/images/tools.png'/>
+   <style>
+    td { text-align: center; }
+   </style>
+   <br/> <br/>
+   <table width='100%'>
+    <thead>
+     <tr>
+      <th width='30%'>&staff.server.admin.index.workstation_configuration;</th>
+      <th width='30%'>&staff.server.admin.index.library_configuration;</th>
+      <th width='30%'>&staff.server.admin.index.maintenance_reports;</th>
+     </tr>
+    </thead>
+    <tbody>
+     <tr valign="top">
+      <td>
+       <div style='padding: 8px;'>
+        <a href='javascript:_l("font_settings.xul");'>&staff.server.admin.index.fonts_and_sounds;</a>
+       </div>
+       <div style='padding: 8px;'>
+        <a href='javascript:_l("printer_settings.html");'>&staff.server.admin.index.printer;</a>
+       </div>
+      </td><td>
+       <div style='padding: 8px;'>
+        <a href='javascript:_l("closed_dates.xhtml");'>&staff.server.admin.index.closed_dates;</a>
+       </div>
+       <div style='padding: 8px;'>
+        <a href='javascript:_l("copy_locations.xhtml");'>&staff.server.admin.index.copy_locations;</a>
+       </div>
+       <div style='padding: 8px;'>
+        <a href='javascript:_l("org_unit_settings.xhtml");'>&staff.server.admin.index.library_settings;</a>
+       </div>
+       <div style='padding: 8px;'>
+        <a href='javascript:_l("non_cat_types.xhtml");'>&staff.server.admin.index.non_cataloged_types;</a>
+       </div>
+       <div style='padding: 8px;'>
+        <a href='javascript:_l("stat_cat_editor.xhtml");'>&staff.server.admin.index.statistical_categories;</a>
+       </div>
+      </td><td>
+       <div style='padding: 8px;'>
+        <a href='javascript:window.xulG.new_tab("/xul/server/patron/holds.xul",{"tab_name":"&staff.server.admin.index.hold_pull_list;"},{});'>&staff.server.admin.index.hold_pull_list;</a> <span style="color: red">&staff.server.admin.index.testing;</span>
+       </div>
+       <div style='padding: 8px;'>
+        <a href='javascript:_l("hold_pull_list_classic.xhtml");'>&staff.server.admin.index.hold_pull_list_classic;</a> <span style="color: red">&staff.server.admin.index.testing;</span>
+       </div>
+       <div style='padding: 8px;'>
+        <a href='javascript:_l( "/reports/oils_rpt.xhtml","build_id=" + getBuildId() );'>&staff.server.admin.index.reports;</a>
+       </div>
+       <div style='padding: 8px;'>
+        <a href='javascript:_l("cash_reports.xhtml");'>&staff.server.admin.index.cash_reports;</a>
+       </div>
+       <div style='padding: 8px;'>
+        <a href='javascript:window.xulG.new_tab("/xul/server/admin/transit_list.xul",{"tab_name":"&staff.server.admin.index.transits;"},{});'>&staff.server.admin.index.transit_list;</a>
+       </div>
+      </td>
+     </tr>
+    </tbody>
+   </table>
+  </center>
+ </body>
 </html>
diff --git a/Open-ILS/xul/staff_client/server/admin/non_cat_types.js b/Open-ILS/xul/staff_client/server/admin/non_cat_types.js
index cfa0b8f798..af018a6264 100644
--- a/Open-ILS/xul/staff_client/server/admin/non_cat_types.js
+++ b/Open-ILS/xul/staff_client/server/admin/non_cat_types.js
@@ -3,34 +3,34 @@ var CREATE_NON_CAT_TYPE = "open-ils.circ:open-ils.circ.non_cat_type.create";
 var UPDATE_NON_CAT_TYPE = "open-ils.circ:open-ils.circ.non_cat_type.update";
 var DELETE_NON_CAT_TYPE = 'open-ils.circ:open-ils.circ.non_cataloged_type.delete';
 var myPerms = [ 
-	'CREATE_NON_CAT_TYPE', 
-	'UPDATE_NON_CAT_TYPE',
-	'DELETE_NON_CAT_TYPE' ];
+ 'CREATE_NON_CAT_TYPE', 
+ 'UPDATE_NON_CAT_TYPE',
+ 'DELETE_NON_CAT_TYPE' ];
 
 var focusOrg;
 
 function ncEditorInit() {
-	fetchUser();
-	$('nc_user').appendChild(text(USER.usrname()));
-	setTimeout( 
+ fetchUser();
+ $('nc_user').appendChild(text(USER.usrname()));
+ setTimeout( 
         function() { 
             fetchHighestWorkPermOrgs(SESSION, USER.id(), myPerms,
                 function() {
                     ncSetupFocus();
-		            ncBuildNew();
-		            ncFetchTypes();
+              ncBuildNew();
+              ncFetchTypes();
                 }
             ); 
         }, 20 );
 }
 
 function ncSetupFocus() {
-	var fselector = $('nc_org_filter');
+ var fselector = $('nc_org_filter');
     var org_list = OILS_WORK_PERMS.UPDATE_NON_CAT_TYPE;
     if(org_list.length == 0) 
         return;
-	fselector.disabled = false;
-	buildMergedOrgSel(fselector, org_list, 0, 'shortname');
+ fselector.disabled = false;
+ buildMergedOrgSel(fselector, org_list, 0, 'shortname');
     fselector.onchange = function() {
         focusOrg = getSelectorVal(fselector);
         ncBuildNew();
@@ -45,182 +45,182 @@ function ncSetupFocus() {
 
 function ncBuildNew() {
 
-	var name = $('nc_new_name');
-	name.focus();
+ var name = $('nc_new_name');
+ name.focus();
 
     var org_list = OILS_WORK_PERMS.CREATE_NON_CAT_TYPE;
     if(org_list.length == 0) return;
 
-	var selector = $('nc_new_owner');
-	buildMergedOrgSel(selector, org_list, 0, 'shortname');
-	selector.disabled = false;
+ var selector = $('nc_new_owner');
+ buildMergedOrgSel(selector, org_list, 0, 'shortname');
+ selector.disabled = false;
 
-	$('nc_new_submit').disabled = false;
-	$('nc_new_submit').onclick = ncCreateNew;
+ $('nc_new_submit').disabled = false;
+ $('nc_new_submit').onclick = ncCreateNew;
 }
 
 
 function ncFetchTypes() {
-	var req = new Request( FETCH_NON_CAT_TYPES, focusOrg );	
-	req.callback(ncDisplayTypes);
-	setTimeout(function(){req.send();}, 500);
+ var req = new Request( FETCH_NON_CAT_TYPES, focusOrg ); 
+ req.callback(ncDisplayTypes);
+ setTimeout(function(){req.send();}, 500);
 }
 
 function ncCreateNew() {
-	var name = $('nc_new_name').value;
-	if(!name) return;
-	var org = getSelectorVal($('nc_new_owner'));
-	var time = $('nc_new_interval_count').value;
-	var type = getSelectorVal($('nc_new_interval_type'));
-	var inh = $('nc_new_inhouse').checked ? 1 : null;
-
-	var req = new Request(CREATE_NON_CAT_TYPE, SESSION, name, org, time + ' ' + type, inh );
-	req.request.alertEvent = false;
-	req.send(true);
-	var res = req.result();
-
-	if(checkILSEvent(res)) {
-		if( res.textcode == 'NON_CAT_TYPE_EXISTS' )
-			return alertId('nc_type_exists');
-		alert(js2JSON(res));
-	}
-
-	alertId('nc_update_success');
-	ncFetchTypes();
+ var name = $('nc_new_name').value;
+ if(!name) return;
+ var org = getSelectorVal($('nc_new_owner'));
+ var time = $('nc_new_interval_count').value;
+ var type = getSelectorVal($('nc_new_interval_type'));
+ var inh = $('nc_new_inhouse').checked ? 1 : null;
+
+ var req = new Request(CREATE_NON_CAT_TYPE, SESSION, name, org, time + ' ' + type, inh );
+ req.request.alertEvent = false;
+ req.send(true);
+ var res = req.result();
+
+ if(checkILSEvent(res)) {
+  if( res.textcode == 'NON_CAT_TYPE_EXISTS' )
+   return alertId('nc_type_exists');
+  alert(js2JSON(res));
+ }
+
+ alertId('nc_update_success');
+ ncFetchTypes();
 }
 
 
 var rowTemplate;
 function ncDisplayTypes(r) {
 
-	var types = r.getResultObject();
-	var tbody = $('nc_tbody');
-	if(!rowTemplate) 
-		rowTemplate = tbody.removeChild($('nc_row_template'));
+ var types = r.getResultObject();
+ var tbody = $('nc_tbody');
+ if(!rowTemplate) 
+  rowTemplate = tbody.removeChild($('nc_row_template'));
 
-	removeChildren(tbody);
-	types = types.sort( 
-		function(a,b) {
-			try {
-				if( a.name()+''.toLowerCase() > b.name()+''.toLowerCase() ) return 1;	
-				if( a.name()+''.toLowerCase() < b.name()+''.toLowerCase() ) return -1;	
-			} catch(e) {}
-			return 0;
-		});
+ removeChildren(tbody);
+ types = types.sort( 
+  function(a,b) {
+   try {
+    if( a.name()+''.toLowerCase() > b.name()+''.toLowerCase() ) return 1; 
+    if( a.name()+''.toLowerCase() < b.name()+''.toLowerCase() ) return -1; 
+   } catch(e) {}
+   return 0;
+  });
 
-	for( var idx = 0; idx != types.length; idx++ ) {
+ for( var idx = 0; idx != types.length; idx++ ) {
 
-		var type = types[idx];
-		var org = findOrgUnit( type.owning_lib() );
-		var row = rowTemplate.cloneNode(true);
+  var type = types[idx];
+  var org = findOrgUnit( type.owning_lib() );
+  var row = rowTemplate.cloneNode(true);
 
 
-		row.id = 'nc_row_' + type.id();
-		$n(row, 'nc_name').appendChild(text(type.name()));
-		$n(row, 'nc_owner').appendChild(text(org.name()));
-		$n(row, 'nc_inhouse').checked = isTrue(type.in_house());
+  row.id = 'nc_row_' + type.id();
+  $n(row, 'nc_name').appendChild(text(type.name()));
+  $n(row, 'nc_owner').appendChild(text(org.name()));
+  $n(row, 'nc_inhouse').checked = isTrue(type.in_house());
 
-		var idata = _splitInterval(type.circ_duration());
-		$n(row, 'nc_interval_count').value = idata[0];
-		setSelector( $n(row, 'nc_interval_type'), idata[1]);
+  var idata = _splitInterval(type.circ_duration());
+  $n(row, 'nc_interval_count').value = idata[0];
+  setSelector( $n(row, 'nc_interval_type'), idata[1]);
 
-		ncSetRowCallbacks( type, org, tbody, row );
-		tbody.appendChild(row);
-	}
+  ncSetRowCallbacks( type, org, tbody, row );
+  tbody.appendChild(row);
+ }
 }
 
 /* this is a kind of brittle, but works with the data we create */
 function _splitInterval( interval ) {
-	interval = interval.split(/ /);
-	var time = interval[0];
-	var type = interval[1];
-	 
-	if( time.match(/:/) ) {
-		var d = time.split(/:/);
-		if(d[0] == '00') return [ d[1], 'minutes' ];
-		if(d[0] != '00' && d[1] != '00')
-			return [ parseInt(d[1]) + (d[0]*60), 'minutes' ];
-		return [ d[0], 'hours' ]
-	}
-
-	if( type.match(/mi/i) ) return [ time, 'minutes' ];
-	if( type.match(/h/i) ) return [ time, 'hours' ];
-	if( type.match(/d/i) ) return [ time, 'days' ];
-	if( type.match(/w/i) ) return [ time, 'weeks' ];
-	if( type.match(/mo/i) ) return [ time, 'months' ];
+ interval = interval.split(/ /);
+ var time = interval[0];
+ var type = interval[1];
+  
+ if( time.match(/:/) ) {
+  var d = time.split(/:/);
+  if(d[0] == '00') return [ d[1], 'minutes' ];
+  if(d[0] != '00' && d[1] != '00')
+   return [ parseInt(d[1]) + (d[0]*60), 'minutes' ];
+  return [ d[0], 'hours' ]
+ }
+
+ if( type.match(/mi/i) ) return [ time, 'minutes' ];
+ if( type.match(/h/i) ) return [ time, 'hours' ];
+ if( type.match(/d/i) ) return [ time, 'days' ];
+ if( type.match(/w/i) ) return [ time, 'weeks' ];
+ if( type.match(/mo/i) ) return [ time, 'months' ];
 }
 
 function ncSetRowCallbacks( type, owner, tbody, row ) {
 
-	checkPermOrgDisabled($n(row, 'nc_edit'), owner, 'UPDATE_NON_CAT_TYPE');
+ checkPermOrgDisabled($n(row, 'nc_edit'), owner, 'UPDATE_NON_CAT_TYPE');
 
-	checkPermOrgDisabled($n(row, 'nc_delete'), owner, 'DELETE_NON_CAT_TYPE');
+ checkPermOrgDisabled($n(row, 'nc_delete'), owner, 'DELETE_NON_CAT_TYPE');
 
-	$n(row, 'nc_edit').onclick = 
-		function() { ncEditType( tbody, row, type ); };
+ $n(row, 'nc_edit').onclick = 
+  function() { ncEditType( tbody, row, type ); };
 
-	$n(row, 'nc_delete').onclick = 
-		function() { ncDeleteType( tbody, row, type ); };
+ $n(row, 'nc_delete').onclick = 
+  function() { ncDeleteType( tbody, row, type ); };
 }
 
 function ncEditType( tbody, row, type ) {
-	cleanTbody(row.parentNode, 'edit');
-	var row = $('nc_edit_row_template').cloneNode(true);
+ cleanTbody(row.parentNode, 'edit');
+ var row = $('nc_edit_row_template').cloneNode(true);
 
-	var name = $n(row, 'nc_edit_name');
-	name.value = type.name();
+ var name = $n(row, 'nc_edit_name');
+ name.value = type.name();
 
-	var idata = _splitInterval(type.circ_duration());
-	$n(row, 'nc_edit_interval_count').value = idata[0];
-	setSelector( $n(row, 'nc_edit_interval_type'), idata[1]);
+ var idata = _splitInterval(type.circ_duration());
+ $n(row, 'nc_edit_interval_count').value = idata[0];
+ setSelector( $n(row, 'nc_edit_interval_type'), idata[1]);
 
-	$n(row, 'nc_edit_inhouse').checked = isTrue(type.in_house());
-	$n(row, 'nc_edit_owner').appendChild(text( findOrgUnit(type.owning_lib()).name() ));
+ $n(row, 'nc_edit_inhouse').checked = isTrue(type.in_house());
+ $n(row, 'nc_edit_owner').appendChild(text( findOrgUnit(type.owning_lib()).name() ));
 
-	$n(row, 'nc_edit_submit').onclick = function() { 
-		var name = $n(row, 'nc_edit_name').value;
-		var time = $n(row, 'nc_edit_interval_count').value;
-		var tp = getSelectorVal($n(row, 'nc_edit_interval_type'));
-		var inh = $n(row, 'nc_edit_inhouse').checked ? 't' : 'f';
-		ncEditSubmit( type, name, time + ' ' + tp, inh );
-	};
+ $n(row, 'nc_edit_submit').onclick = function() { 
+  var name = $n(row, 'nc_edit_name').value;
+  var time = $n(row, 'nc_edit_interval_count').value;
+  var tp = getSelectorVal($n(row, 'nc_edit_interval_type'));
+  var inh = $n(row, 'nc_edit_inhouse').checked ? 't' : 'f';
+  ncEditSubmit( type, name, time + ' ' + tp, inh );
+ };
 
-	$n(row, 'nc_edit_cancel').onclick = 
-		function(){cleanTbody(row.parentNode, 'edit'); }
+ $n(row, 'nc_edit_cancel').onclick = 
+  function(){cleanTbody(row.parentNode, 'edit'); }
 
-	var r = $('nc_row_' + type.id());
-	if(r.nextSibling) tbody.insertBefore( row, r.nextSibling );
-	else{ tbody.appendChild(row); }
+ var r = $('nc_row_' + type.id());
+ if(r.nextSibling) tbody.insertBefore( row, r.nextSibling );
+ else{ tbody.appendChild(row); }
 
-	name.focus();
-	name.select();
+ name.focus();
+ name.select();
 }
 
 function ncEditSubmit( type, name, interval, inhouse ) {
-	if(!name) return;
-	type.name(name);
-	type.circ_duration(interval);
-	type.in_house(inhouse);
-	var req = new Request( UPDATE_NON_CAT_TYPE, SESSION, type );
-	req.send(true);
-	var res = req.result();
-	if(checkILSEvent(res)) throw res;
-	alertId('nc_update_success');
-	ncFetchTypes();
+ if(!name) return;
+ type.name(name);
+ type.circ_duration(interval);
+ type.in_house(inhouse);
+ var req = new Request( UPDATE_NON_CAT_TYPE, SESSION, type );
+ req.send(true);
+ var res = req.result();
+ if(checkILSEvent(res)) throw res;
+ alertId('nc_update_success');
+ ncFetchTypes();
 }
 
 function ncDeleteType( tbody, row, type ) {
-	if( ! confirm($('nc_delete_confirm').innerHTML) ) return;
-	var req = new Request(DELETE_NON_CAT_TYPE, SESSION, type.id());
-	req.callback( 
-		function(r) {
-			var res = r.getResultObject();
-			if(checkILSEvent(res)) alertILSEvent(res);
-			alertId('nc_update_success');
-			ncFetchTypes();
-		}
-	);
-	req.send();
+ if( ! confirm($('nc_delete_confirm').innerHTML) ) return;
+ var req = new Request(DELETE_NON_CAT_TYPE, SESSION, type.id());
+ req.callback( 
+  function(r) {
+   var res = r.getResultObject();
+   if(checkILSEvent(res)) alertILSEvent(res);
+   alertId('nc_update_success');
+   ncFetchTypes();
+  }
+ );
+ req.send();
 }
 
 
diff --git a/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml b/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml
index 15bf4c8b07..80bdf07d03 100644
--- a/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml
@@ -1,166 +1,166 @@
 <?xml version='1.0' encoding="UTF-8"?>
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
 
-	<head>
-		<title>&staff.server.admin.non_cat_types.title;</title>
-		<script language='javascript' src='/opac/common/js/utils.js'> </script>
-		<script language='javascript' src='/opac/common/js//config.js'> </script>
-		<script language='javascript' src='/opac/common/js/CGI.js'> </script>
-		<script language='javascript' src='/opac/common/js/Cookie.js'> </script>
-	
-		<script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
-		<script language='javascript' src='/opac/common/js/fmall.js'> </script>
-		<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
-		<script language='javascript' src='/opac/common/js/Cookies.js'> </script>
-		<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
-		<script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
-		<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
-		<script language='javascript' src='/opac/common/js/init.js'> </script>
-		<script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
-		<script language='javascript' src='adminlib.js'> </script>
-		<script language='javascript' src='non_cat_types.js'> </script>
-
-		<link type='text/css' rel='stylesheet' href='admin.css'/>
-	</head>
-
-	<body onload='try{ncEditorInit();}catch(e){alert(js2JSON(e));}'>
-
-		<div class='welcome_box'>
-			<span>&staff.server.admin.non_cat_types.greeting;</span><b><span id='nc_user'/></b>
-		</div>
-
-		<center>
-			<div class='title'>&staff.server.admin.non_cat_types.editor.title;</div>
-
-			<br/>
-
-			<table class='data_grid data_grid_center' width='85%'>
-				<thead>
-					<tr><td colspan='5'>&staff.server.admin.non_cat_types.editor.header;</td></tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td><input id='nc_new_name'> </input></td>
-						<td>
-							<input id='nc_new_interval_count' type='text' size='3' maxlength='3' value='14'/>
-							<select id='nc_new_interval_type' style='width: 6em;'>
-								<option value='minutes'>&staff.server.admin.non_cat_types.editor.minutes;</option>
-								<option value='hours'>&staff.server.admin.non_cat_types.editor.hours;</option>
-								<option value='days' selected='selected'>&staff.server.admin.non_cat_types.editor.days;</option>
-								<option value='weeks'>&staff.server.admin.non_cat_types.editor.weeks;</option>
-								<option value='months'>&staff.server.admin.non_cat_types.editor.months;</option>
-							</select>
-						</td>
-						<td>&staff.server.admin.non_cat_types.in_house_circ;
-						    <input id='nc_new_inhouse' type='checkbox'/>
-						</td>
-						<td><select class='select_big' id='nc_new_owner' disabled='disabled'> </select></td>
-						<td><input id='nc_new_submit' type='submit' value='&staff.server.admin.non_cat_types.editor.create;' disabled='disabled'> </input></td>
-					</tr>
-				</tbody>
-			</table>
-
-			<br/> <hr/> <br/>
+ <head>
+  <title>&staff.server.admin.non_cat_types.title;</title>
+  <script language='javascript' src='/opac/common/js/utils.js'> </script>
+  <script language='javascript' src='/opac/common/js//config.js'> </script>
+  <script language='javascript' src='/opac/common/js/CGI.js'> </script>
+  <script language='javascript' src='/opac/common/js/Cookie.js'> </script>
+ 
+  <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
+  <script language='javascript' src='/opac/common/js/fmall.js'> </script>
+  <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
+  <script language='javascript' src='/opac/common/js/Cookies.js'> </script>
+  <script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
+  <script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
+  <script language='javascript' src='/opac/common/js/org_utils.js'> </script>
+  <script language='javascript' src='/opac/common/js/init.js'> </script>
+  <script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
+  <script language='javascript' src='adminlib.js'> </script>
+  <script language='javascript' src='non_cat_types.js'> </script>
+
+  <link type='text/css' rel='stylesheet' href='admin.css'/>
+ </head>
+
+ <body onload='try{ncEditorInit();}catch(e){alert(js2JSON(e));}'>
+
+  <div class='welcome_box'>
+   <span>&staff.server.admin.non_cat_types.greeting;</span><b><span id='nc_user'/></b>
+  </div>
+
+  <center>
+   <div class='title'>&staff.server.admin.non_cat_types.editor.title;</div>
+
+   <br/>
+
+   <table class='data_grid data_grid_center' width='85%'>
+    <thead>
+     <tr><td colspan='5'>&staff.server.admin.non_cat_types.editor.header;</td></tr>
+    </thead>
+    <tbody>
+     <tr>
+      <td><input id='nc_new_name'> </input></td>
+      <td>
+       <input id='nc_new_interval_count' type='text' size='3' maxlength='3' value='14'/>
+       <select id='nc_new_interval_type' style='width: 6em;'>
+        <option value='minutes'>&staff.server.admin.non_cat_types.editor.minutes;</option>
+        <option value='hours'>&staff.server.admin.non_cat_types.editor.hours;</option>
+        <option value='days' selected='selected'>&staff.server.admin.non_cat_types.editor.days;</option>
+        <option value='weeks'>&staff.server.admin.non_cat_types.editor.weeks;</option>
+        <option value='months'>&staff.server.admin.non_cat_types.editor.months;</option>
+       </select>
+      </td>
+      <td>&staff.server.admin.non_cat_types.in_house_circ;
+          <input id='nc_new_inhouse' type='checkbox'/>
+      </td>
+      <td><select class='select_big' id='nc_new_owner' disabled='disabled'> </select></td>
+      <td><input id='nc_new_submit' type='submit' value='&staff.server.admin.non_cat_types.editor.create;' disabled='disabled'> </input></td>
+     </tr>
+    </tbody>
+   </table>
+
+   <br/> <hr/> <br/>
 
             &staff.server.admin.copy_locations.editor.library.filter; <select disabled='disabled' id='nc_org_filter'> </select>
             <br/><br/>
 
-			<table id='nc_table' class='data_grid' width='85%'>
-				<thead>
-					<tr>
-						<td>&staff.server.admin.non_cat_types.name;</td>
-						<td>&staff.server.admin.non_cat_types.owning_location;</td>
-						<td>&staff.server.admin.non_cat_types.duration;</td>
-						<td>&staff.server.admin.non_cat_types.in_house.circulate;</td>
-						<td>&staff.server.admin.non_cat_types.edit;</td>
-						<td>&staff.server.admin.non_cat_types.delete;</td>
-					</tr>
-				</thead>
-				<tbody id='nc_tbody'>
-					<tr id='nc_row_template'>
-						<td><b name='nc_name'> </b></td>
-						<td name='nc_owner'/>
-						<td>
-							<input name='nc_interval_count' type='text' size='3' maxlength='3' disabled='disabled'/>
-							<select name='nc_interval_type' style='width: 6em;' disabled='disabled'>
-								<option value='minutes'>&staff.server.admin.non_cat_types.editor.minutes;</option>
-								<option value='hours'>&staff.server.admin.non_cat_types.editor.hours;</option>
-								<option value='days'>&staff.server.admin.non_cat_types.editor.days;</option>
-								<option value='weeks'>&staff.server.admin.non_cat_types.editor.weeks;</option>
-								<option value='months'>&staff.server.admin.non_cat_types.editor.months;</option>
-							</select>
-						</td>
-						<td>
-							<input name='nc_inhouse' type='checkbox' disabled='disabled'/>
-						</td>
-						<td><input name='nc_edit' type='submit' value='&staff.server.admin.non_cat_types.edit;' disabled='disabled'/></td>
-						<td><input name='nc_delete' type='submit' value='&staff.server.admin.non_cat_types.delete;' disabled='disabled'/></td>
-					</tr>
-				</tbody>
-			</table>
-		</center>
-
-		<table class='hide_me'> <!-- repository for template rows -->
-			<tbody>
-				<tr id='nc_edit_row_template' class='insert_row' edit='1'>
-					<td align='center'>
-						<span class='padded'>
-							<input name='nc_edit_name' type='text'> </input>
-						</span>
-					</td>
-					<td name='nc_edit_owner'/>
-					<td>
-						<span>
-							<input name='nc_edit_interval_count' type='text' size='3' maxlength='3'/>
-							<select name='nc_edit_interval_type' style='width: 6em;'>
-								<option value='minutes'>&staff.server.admin.non_cat_types.editor.minutes;</option>
-								<option value='hours'>&staff.server.admin.non_cat_types.editor.hours;</option>
-								<option value='days'>&staff.server.admin.non_cat_types.editor.days;</option>
-								<option value='weeks'>&staff.server.admin.non_cat_types.editor.weeks;</option>
-								<option value='months'>&staff.server.admin.non_cat_types.editor.months;</option>
-							</select>
-						</span>
-					</td>
-
-					<td><input name='nc_edit_inhouse' type='checkbox'/></td>
-
-					<td>
-						<span class='padded'>
-							<input name='nc_edit_submit' type='submit' value='&staff.server.admin.non_cat_types.submit;'> </input>
-						</span>
-					</td>
-					<td>
-						<span class='padded'>
-							<input name='nc_edit_cancel' type='submit' value='&staff.server.admin.non_cat_types.cancel;'> </input>
-						</span>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-	</body>
-
-	<span class='hide_me' id='nc_delete_confirm'>
-		&staff.server.admin.non_cat_types.delete.confirm;
-	</span>
-
-	<span class='hide_me' id='cd_in_house_exp'>
-		&staff.server.admin.non_cat_types.in_house.help;
-	</span>
-
-	<span class='hide_me' id='nc_update_success'>
-		&staff.server.admin.non_cat_types.update.success;
-	</span>
-
-	<span class='hide_me' id='nc_type_exists'>
-		&staff.server.admin.non_cat_types.name_exists;
-	</span>
+   <table id='nc_table' class='data_grid' width='85%'>
+    <thead>
+     <tr>
+      <td>&staff.server.admin.non_cat_types.name;</td>
+      <td>&staff.server.admin.non_cat_types.owning_location;</td>
+      <td>&staff.server.admin.non_cat_types.duration;</td>
+      <td>&staff.server.admin.non_cat_types.in_house.circulate;</td>
+      <td>&staff.server.admin.non_cat_types.edit;</td>
+      <td>&staff.server.admin.non_cat_types.delete;</td>
+     </tr>
+    </thead>
+    <tbody id='nc_tbody'>
+     <tr id='nc_row_template'>
+      <td><b name='nc_name'> </b></td>
+      <td name='nc_owner'/>
+      <td>
+       <input name='nc_interval_count' type='text' size='3' maxlength='3' disabled='disabled'/>
+       <select name='nc_interval_type' style='width: 6em;' disabled='disabled'>
+        <option value='minutes'>&staff.server.admin.non_cat_types.editor.minutes;</option>
+        <option value='hours'>&staff.server.admin.non_cat_types.editor.hours;</option>
+        <option value='days'>&staff.server.admin.non_cat_types.editor.days;</option>
+        <option value='weeks'>&staff.server.admin.non_cat_types.editor.weeks;</option>
+        <option value='months'>&staff.server.admin.non_cat_types.editor.months;</option>
+       </select>
+      </td>
+      <td>
+       <input name='nc_inhouse' type='checkbox' disabled='disabled'/>
+      </td>
+      <td><input name='nc_edit' type='submit' value='&staff.server.admin.non_cat_types.edit;' disabled='disabled'/></td>
+      <td><input name='nc_delete' type='submit' value='&staff.server.admin.non_cat_types.delete;' disabled='disabled'/></td>
+     </tr>
+    </tbody>
+   </table>
+  </center>
+
+  <table class='hide_me'> <!-- repository for template rows -->
+   <tbody>
+    <tr id='nc_edit_row_template' class='insert_row' edit='1'>
+     <td align='center'>
+      <span class='padded'>
+       <input name='nc_edit_name' type='text'> </input>
+      </span>
+     </td>
+     <td name='nc_edit_owner'/>
+     <td>
+      <span>
+       <input name='nc_edit_interval_count' type='text' size='3' maxlength='3'/>
+       <select name='nc_edit_interval_type' style='width: 6em;'>
+        <option value='minutes'>&staff.server.admin.non_cat_types.editor.minutes;</option>
+        <option value='hours'>&staff.server.admin.non_cat_types.editor.hours;</option>
+        <option value='days'>&staff.server.admin.non_cat_types.editor.days;</option>
+        <option value='weeks'>&staff.server.admin.non_cat_types.editor.weeks;</option>
+        <option value='months'>&staff.server.admin.non_cat_types.editor.months;</option>
+       </select>
+      </span>
+     </td>
+
+     <td><input name='nc_edit_inhouse' type='checkbox'/></td>
+
+     <td>
+      <span class='padded'>
+       <input name='nc_edit_submit' type='submit' value='&staff.server.admin.non_cat_types.submit;'> </input>
+      </span>
+     </td>
+     <td>
+      <span class='padded'>
+       <input name='nc_edit_cancel' type='submit' value='&staff.server.admin.non_cat_types.cancel;'> </input>
+      </span>
+     </td>
+    </tr>
+   </tbody>
+  </table>
+ </body>
+
+ <span class='hide_me' id='nc_delete_confirm'>
+  &staff.server.admin.non_cat_types.delete.confirm;
+ </span>
+
+ <span class='hide_me' id='cd_in_house_exp'>
+  &staff.server.admin.non_cat_types.in_house.help;
+ </span>
+
+ <span class='hide_me' id='nc_update_success'>
+  &staff.server.admin.non_cat_types.update.success;
+ </span>
+
+ <span class='hide_me' id='nc_type_exists'>
+  &staff.server.admin.non_cat_types.name_exists;
+ </span>
 
 
 </html>
diff --git a/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.js b/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.js
index 8bc0e3ed84..e9e352232e 100644
--- a/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.js
+++ b/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.js
@@ -6,899 +6,899 @@ dump('entering admin/offline_manage_xacts.js\n');
 if (typeof admin == 'undefined') admin = {};
 admin.offline_manage_xacts = function (params) {
 
-	JSAN.use('util.error'); this.error = new util.error();
-	JSAN.use('util.network'); this.network = new util.network();
+ JSAN.use('util.error'); this.error = new util.error();
+ JSAN.use('util.network'); this.network = new util.network();
 }
 
 admin.offline_manage_xacts.prototype = {
 
-	'sel_list' : [],
-	'seslist' : [],
-	'sel_errors' : [],
-
-	'init' : function( params ) {
-
-		var obj = this;
-
-		JSAN.use('OpenILS.data'); obj.data = new OpenILS.data(); obj.data.init({'via':'stash'});
-
-		obj.init_list(); obj.init_script_list(); obj.init_error_list();
-
-		obj.retrieve_seslist(); obj.render_seslist();
-
-		var x = document.getElementById('create');
-		if (obj.check_perm(['OFFLINE_UPLOAD'])) {
-			x.disabled = false;
-			x.addEventListener('command',function() { try{obj.create_ses();}catch(E){alert(E);} },false);
-		}
-
-		x = obj.$('upload');
-		x.addEventListener('command',function() { try{obj.upload();}catch(E){alert(E);} },false);
-
-		x = obj.$('refresh');
-		x.addEventListener('command',function() { try{$('deck').selectedIndex=0;obj.retrieve_seslist();obj.render_seslist();}catch(E){alert(E);} },false);
-
-		x = obj.$('execute');
-		x.addEventListener('command',function() { try{obj.execute_ses();}catch(E){alert(E);} },false);
-
-		x = obj.$('retrieve_item');
-		x.addEventListener('command',function() { try{obj.retrieve_item();}catch(E){alert(E);} },false);
-
-		x = obj.$('retrieve_patron');
-		x.addEventListener('command',function() { try{obj.retrieve_patron();}catch(E){alert(E);} },false);
-
-		x = obj.$('retrieve_details');
-		x.addEventListener('command',function() { try{obj.retrieve_details();}catch(E){alert(E);} },false);
-
-		obj.$('deck').selectedIndex = 0;
-	},
-
-	'$' : function(id) { return document.getElementById(id); },
-
-	'init_list' : function() {
-		var obj = this; JSAN.use('util.list'); JSAN.use('util.date'); JSAN.use('patron.util');
-		obj.list = new util.list('session_tree');
-		obj.list.init( {
-			'columns' : [
-				{
-					'id' : 'org', 'hidden' : 'true', 'flex' : '1',
-					'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_list.organization'),
-					'render' : function(my) { return obj.data.hash.aou[ my.org ].shortname(); }
-				},
-				{ 
-					'id' : 'description', 'flex' : '2',
-					'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_list.description'),
-					'render' : function(my) { return my.description; }
-				},
-				{
-					'id' : 'create_time', 'flex' : '1',
-					'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_list.date_created'),
-					'render' : function(my) { if (my.create_time) { var x = new Date(); x.setTime(my.create_time+"000"); return util.date.formatted_date(x,"%F %H:%M"); } else { return ""; }; }
-				},
-				{
-					'id' : 'creator', 'flex' : '1', 'hidden' : 'true',
-					'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_list.created_by'),
-					'render' : function(my) { var staff_obj = patron.util.retrieve_name_via_id( ses(), my.creator ); return staff_obj[0] + " @ " + obj.data.hash.aou[ staff_obj[3] ].shortname(); }
-				},
-				{ 
-					'id' : 'count', 'flex' : '1',
-					'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_list.upload_count'), 
-					'render' : function(my) { return my.scripts.length; }
-				},
-				{ 
-					'id' : 'num_complete', 'flex' : '1', 
-					'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_list.transactions_processed'), 
-					'render' : function(my) { return my.num_complete; }
-				},
-				{ 
-					'id' : 'in_process', 'flex' : '1',
-					'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_list.processing'),
-					'render' : function(my) {
-						if (my.end_time) {
-							return $('adminStrings').getString('staff.admin.offline_manage_xacts.completed')
-						} else {
-							return get_bool(my.in_process) ? $('adminStrings').getString('staff.admin.offline_manage_xacts.yes') : $('adminStrings').getString('staff.admin.offline_manage_xacts.no')
-						};
-					}
-				},
-				{
-					'id' : 'start_time', 'flex' : '1', 'hidden' : 'true',
-					'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_list.date_started'),
-					'render' : function(my) { if (my.start_time) {var x = new Date(); x.setTime(my.start_time+"000"); return util.date.formatted_date(x,"%F %H:%M");} else { return ""; }; }
-				},
-				{
-					'id' : 'end_time', 'flex' : '1',
-					'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_list.date_completed'),
-					'render' : function(my) { if (my.end_time) {var x = new Date(); x.setTime(my.end_time+"000"); return util.date.formatted_date(x,"%F %H:%M");} else { return ""; }; }
-				},
-				{ 
-					'id' : 'key', 'hidden' : 'true', 'flex' : '1', 
-					'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_list.session'),
-					'render' : function(my) { return my.key; }
-				},
-			],
-			'map_row_to_columns' : patron.util.std_map_row_to_columns(),
-			'on_select' : function(ev) {
-				try {
-					$('deck').selectedIndex = 0;
-					$('execute').disabled = true;
-					$('upload').disabled = true;
-					setTimeout(
-						function() {
-							try {
-								JSAN.use('util.functional');
-								var sel = obj.list.retrieve_selection();
-								obj.sel_list = util.functional.map_list(
-									sel,
-									function(o) { return o.getAttribute('retrieve_id'); }
-								);
-								if (obj.sel_list.length == 0) return;
-								{	
-									var upload = true; var process = true;
-
-									if (obj.sel_list.length > 1) upload = false;
-
-									if (obj.seslist[ obj.sel_list[0] ].end_time) {
-										upload = false; process = false;
-									}
-									if (obj.seslist[ obj.sel_list[0] ].in_process == 1) {
-										upload = false; process = false;
-									}
-
-									/* should we really have this next restriction? */
-									for (var i = 0; i < obj.seslist[ obj.sel_list[0] ].scripts.length; i++) {
-										if (obj.seslist[ obj.sel_list[0] ].scripts[i].workstation ==
-											obj.data.ws_name ) upload = false;
-									}
-
-									if (upload) {
-										if (obj.check_perm(['OFFLINE_UPLOAD'])) {
-											document.getElementById('upload').disabled = false;
-										}
-									} else {
-										document.getElementById('upload').disabled = true;
-									}
-									if (process) {
-										if (obj.check_perm(['OFFLINE_EXECUTE'])) {
-											document.getElementById('execute').disabled = false;	
-										}
-									} else {
-										document.getElementById('execute').disabled = true;	
-									}
-								}
-								var complete = false;
-								for (var i = 0; i < obj.sel_list.length; i++) { 
-									if (obj.seslist[ obj.sel_list[i] ].end_time) { complete = true; }
-								}
-								if (complete) {
-									obj.render_errorlist();
-								} else {
-									if (obj.seslist[ obj.sel_list[0] ].in_process == 1) {
-										obj.render_status();
-									} else {
-										obj.render_scriptlist();
-									}
-								}
-							} catch(E) {
-								alert('on_select: ' + E);
-							}
-						}, 0
-					);
-				} catch(E) {
-					alert('on_select:\nobj.seslist.length = ' + obj.seslist.length + '  obj.sel_list.length = ' + obj.sel_list.length + '\nerror: ' + E);
-				}
-			}
-		} );
-
-
-	},
-
-	'init_script_list' : function() {
-		var obj = this; JSAN.use('util.list'); JSAN.use('util.date'); JSAN.use('patron.util');
-		obj.script_list = new util.list('script_tree');
-		obj.script_list.init( {
-			'columns' : [
-				{
-					'id' : 'create_time', 'flex' : '1',
-					'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_script_list.date_uploaded'),
-					'render' : function(my) { if (my.create_time) { var x = new Date(); x.setTime(my.create_time+"000"); return util.date.formatted_date(x,"%F %H:%M"); } else { return ""; }; }
-				},
-				{
-					'id' : 'requestor', 'flex' : '1', 'hidden' : 'true',
-					'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_script_list.uploaded_by'),
-					'render' : function(my) { var staff_obj = patron.util.retrieve_name_via_id( ses(), my.requestor ); return staff_obj[0] + " @ " + obj.data.hash.aou[ staff_obj[3] ].shortname(); }
-				},
-				{ 
-					'id' : 'time_delta', 'hidden' : 'true', 'flex' : '1', 
-					'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_script_list.time_delta'),
-					'render' : function(my) { return my.time_delta; }
-				},
-				{ 
-					'id' : 'workstation', 'flex' : '1', 
-					'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_script_list.workstation'),
-					'render' : function(my) { return my.workstation; }
-				},
-			],
-			'map_row_to_columns' : patron.util.std_map_row_to_columns()
-		} );
-
-
-	},
-
-	'init_error_list' : function() {
-		var obj = this; JSAN.use('util.list');  JSAN.use('util.date'); JSAN.use('patron.util'); JSAN.use('util.functional');
-		obj.error_list = new util.list('error_tree');
-		obj.error_list.init( {
-			'columns' : [
-				{
-					'id' : 'workstation', 'flex' : '1',
-					'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_error_list.workstation'),
-					'render' : function(my) { return my.command._workstation ? my.command._workstation : my.command._worksation; }
-				},
-				{
-					'id' : 'timestamp', 'flex' : '1',
-					'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_error_list.timestamp'),
-					'render' : function(my) { if (my.command.timestamp) { var x = new Date(); x.setTime(my.command.timestamp+"000"); return util.date.formatted_date(x,"%F %H:%M"); } else { return my.command._realtime; }; }
-				},
-				{
-					'id' : 'type', 'flex' : '1',
-					'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_error_list.type'),
-					'render' : function(my) { return my.command.type; }
-				},
-				{ 
-					'id' : 'ilsevent', 'hidden' : 'true', 'flex' : '1', 
-					'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_error_list.event_code'),
-					'render' : function(my) { return my.event.ilsevent; }
-				},
-				{ 
-					'id' : 'textcode', 'flex' : '1', 
-					'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_error_list.event_name'),
-					'render' : function(my) { return typeof my.event.textcode != 'undefined' ? my.event.textcode : util.functional.map_list( my.event, function(o) { return o.textcode; }).join('/'); }
-				},
-				{
-					'id' : 'desc', 'flex' : '1', 'hidden' : 'true',
-					'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_error_list.event_description'),
-					'render' : function(my) { return my.event.desc; }
-				},
-				{
-					'id' : 'i_barcode', 'flex' : '1',
-					'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_error_list.item_barcode'),
-					'render' : function(my) { return my.command.barcode ? my.command.barcode : ""; }
-				},
-				{
-					'id' : 'p_barcode', 'flex' : '1',
-					'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_error_list.patron_barcode'),
-					'render' : function(my) { if (my.command.patron_barcode) { return my.command.patron_barcode; } else { if (my.command.user.card.barcode) { return my.command.user.card.barcode; } else { return ""; } }; }
-				},
-				{
-					'id' : 'duedate', 'flex' : '1', 'hidden' : 'true',
-					'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_error_list.due_date'),
-					'render' : function(my) { return my.command.due_date || ""; }
-				},
-				{
-					'id' : 'backdate', 'flex' : '1', 'hidden' : 'true',
-					'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_error_list.backdate'),
-					'render' : function(my) { return my.command.backdate || ""; }
-				},
-				{
-					'id' : 'count', 'flex' : '1', 'hidden' : 'true',
-					'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_error_list.count'),
-					'render' : function(my) { return my.command.count || ""; }
-				},
-				{
-					'id' : 'noncat', 'flex' : '1', 'hidden' : 'true',
-					'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_error_list.noncat'),
-					'render' : function(my) { return get_bool(my.command.noncat) ? $('adminStrings').getString('staff.admin.offline_manage_xacts.yes') : $('adminStrings').getString('staff.admin.offline_manage_xacts.no'); }
-				},
-				{
-					'id' : 'noncat_type', 'flex' : '1', 'hidden' : 'true',
-					'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_error_list.noncat_type'),
-					'render' : function(my) { return data.hash.cnct[ my.command.noncat_type ] ? obj.data.hash.cnct[ my.command.noncat_type ].name() : ""; }
-				},
-				{
-					'id' : 'noncat_count', 'flex' : '1', 'hidden' : 'true',
-					'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_error_list.noncat_count'),
-					'render' : function(my) { return my.command.noncat_count || ""; }
-				},
-			],
-			'map_row_to_columns' : patron.util.std_map_row_to_columns(),
-			'on_select' : function(ev) {
-				try {
-					var sel = obj.error_list.retrieve_selection();
-					obj.sel_errors = util.functional.map_list(
-						sel,
-						function(o) { return o.getAttribute('retrieve_id'); }
-					);
-					if (obj.sel_errors.length > 0) {
-						obj.$('retrieve_item').disabled = false;
-						obj.$('retrieve_patron').disabled = false;
-						obj.$('retrieve_details').disabled = false;
-					} else {
-						obj.$('retrieve_item').disabled = true;
-						obj.$('retrieve_patron').disabled = true;
-						obj.$('retrieve_details').disabled = true;
-					}
-				} catch(E) {
-					alert(E);
-				}
-			}
-		} );
-
-		var export_button = document.getElementById('export_btn');
-		if (export_button) export_button.addEventListener(
-			'command',
-			function(ev) {
-				try {
-					obj.error_list.dump_csv_to_clipboard();
-				} catch(E) {
-					obj.error.standard_unexpected_error_alert('export',E); 
-				}
-			},
-			false
-		);
-		
-		var print_export_button = document.getElementById('print_export_btn');
-		if (print_export_button) print_export_button.addEventListener(
-			'command',
-			function(ev) {
-				try {
-					obj.error_list.on_all_fleshed =
-						function() {
-							try {
-								dump( obj.error_list.dump_csv() + '\n' );
-								//copy_to_clipboard(obj.error_list.dump_csv());
-								JSAN.use('util.print'); var p = new util.print();
-								p.simple( obj.error_list.dump_csv(), { 'content_type' : 'text/plain' } );
-								setTimeout(function(){ obj.error_list.on_all_fleshed = null; },0);
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert('export',E); 
-							}
-						}
-					obj.error_list.full_retrieve();
-				} catch(E) {
-					obj.error.standard_unexpected_error_alert('print export',E); 
-				}
-			},
-			false
-		);
-
-	},
-
-	'check_perm' : function(perms) {
-		var obj = this;
-		try {
-			var robj = obj.network.simple_request('PERM_CHECK',[ses(),obj.data.list.au[0].id(),obj.data.list.au[0].ws_ou(),perms]);
-			if (typeof robj.ilsevent != 'undefined') {
-				obj.error.standard_unexpected_error_alert('check permission',E);
-				return false;
-			}
-			return robj.length == 0 ? true : false;
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert($('adminStrings').getString('staff.admin.offline_manage_xacts.error.check_perm'),E);
-		}
-	},
-
-	'execute_ses' : function() {
-		var obj = this;
-
-		try {
-
-		clear_the_cache();
-		obj.data.stash_retrieve();
-
-		for (var i = 0; i < obj.sel_list.length; i++) {
-
-			var url  = xulG.url_prefix(urls.XUL_OFFLINE_MANAGE_XACTS_CGI)
-				+ "?ses=" + window.escape(ses())
-				+ "&action=execute" 
-				+ "&seskey=" + window.escape(obj.seslist[obj.sel_list[i]].key)
-				+ "&ws=" + window.escape(obj.data.ws_name);
-			var x = new XMLHttpRequest();
-			x.open("GET",url,false);
-			x.send(null);
-
-			dump(url + ' = ' + x.responseText + '\n' );
-			if (!x.responseText) {
-				throw($('adminStrings').getString('staff.admin.offline_manage_xacts.error.bad_cgi_response'));
-			}
-			var robj = JSON2js(x.responseText);
-
-			if (robj.ilsevent != 0) { alert($('adminStrings').getString('staff.admin.offline_manage_xacts.error.execute_error') + ' ' + x.responseText); }
-
-			obj.retrieve_seslist(); obj.render_seslist();
-		}
-
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert($('adminStrings').getString('staff.admin.offline_manage_xacts.error.session_execute_error'),E);
-		}
-	},
-
-	'ses_errors' : function() {
-		var obj = this;
-
-		try {
-
-		clear_the_cache();
-		obj.data.stash_retrieve();
-
-		var url  = xulG.url_prefix(urls.XUL_OFFLINE_MANAGE_XACTS_CGI)
-			+ "?ses=" + window.escape(ses())
-			+ "&action=status" 
-			+ "&seskey=" + window.escape(obj.seslist[ obj.sel_list[0] ].key)
-			+ "&ws=" + window.escape(obj.data.ws_name)
-			+ '&status_type=exceptions';
-		var x = new XMLHttpRequest();
-		x.open("GET",url,false);
-		x.send(null);
-
-		dump(url + ' = ' + x.responseText + '\n' );
-		if (!x.responseText) {
-			throw($('adminStrings').getString('staff.admin.offline_manage_xacts.error.bad_cgi_response'));
-		}
-		var robj = JSON2js(x.responseText);
-
-		return { 'errors' : robj, 'description' : obj.seslist[ obj.sel_list[0] ].description };
-
-		} catch(E) {
-			throw($('adminStrings').getString('staff.admin.offline_manage_xacts.error.session_retrieval') + ' ' + E);
-		}
-
-	},
-
-	'rename_file' : function() {
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		var obj = this;
-
-		try {
-
-		JSAN.use('util.file'); 
-		var pending = new util.file('pending_xacts');
-		if ( !pending._file.exists() ) {
-			throw($('adminStrings').getString('staff.admin.offline_manage_xacts.error.non_existent_file'));
-		}
-		obj.transition_filename = 'pending_xacts_' + new Date().getTime();
-		var count = 0;
-		var file = new util.file(obj.transition_filename);
-		while (file._file.exists()) {
-			obj.transition_filename = 'pending_xacts_' + new Date().getTime();
-			file = new util.file(obj.transition_filename);
-			if (count++>100) {
-				throw($('adminStrings').getString('staff.admin.offline_manage_xacts.error.unique_file'));
-			}
-		}
-		pending._file.moveTo(null,obj.transition_filename);
-
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert($('adminStrings').getString('staff.admin.offline_manage_xacts.error.renaming_file'),E);
-		}
-	},
-
-	'revert_file' : function() {
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		var obj = this;
-
-		try {
-
-		JSAN.use('util.file');
-		var pending = new util.file('pending_xacts');
-		if (pending._file.exists()) { 
-			obj.error.yns_alert(
-					$('adminStrings').getFormattedString('staff.admin.offline_manage_xacts.error.transaction_conflicts', [obj.transition_filename]),
-					$('adminStrings').getString('staff.admin.offline_manage_xacts.error.transaction_conflicts.title'),
-					$('adminStrings').getString('staff.admin.offline_manage_xacts.error.transaction_conflicts.ok'),
-					null,
-					null,
-					$('adminStrings').getString('staff.admin.offline_manage_xacts.error.transaction_conflicts.confirm')
-			);
-			return;
-		}
-		var file = new util.file(obj.transition_filename);
-		file._file.moveTo(null,'pending_xacts');
-
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert($('adminStrings').getString('staff.admin.offline_manage_xacts.error.reverting_file'),E);
-		}
-	},
-
-	'archive_file' : function() {
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		var obj = this;
-
-		try {
-
-		JSAN.use('util.file');
-		var file = new util.file(obj.transition_filename);
-		if (file._file.exists()) file._file.moveTo(null,obj.transition_filename + '.complete');
-
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert($('adminStrings').getString('staff.admin.offline_manage_xacts.error.archiving_file'),E);
-		}
-	},
-
-	'upload' : function() {
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		var obj = this;
-
-		try {
-
-		if (obj.sel_list.length == 0) { 
-			alert($('adminStrings').getString('staff.admin.offline_manage_xacts.session_upload'));
-			return;
-		}
-		if (obj.sel_list.length > 1) {
-			alert($('adminStrings').getString('staff.admin.offline_manage_xacts.single_session_upload'));
-			return;
-		}
-
-		JSAN.use('util.file');
-
-		var file = new util.file('pending_xacts');
-		if (!file._file.exists()) {
-			alert($('adminStrings').getString('staff.admin.offline_manage_xacts.no_transactions'));
-			return;
-		}
-
-		obj.rename_file();
-
-		obj.data.stash_retrieve();
-		var seskey = obj.seslist[ obj.sel_list[0] ].key;
-		JSAN.use('util.widgets');
-		var xx = document.getElementById('iframe_placeholder'); util.widgets.remove_children(xx);
-		var x = document.createElement('iframe'); xx.appendChild(x); x.flex = 1;
-		x.setAttribute(
-			'src',
-			window.xulG.url_prefix( urls.XUL_REMOTE_BROWSER )
-			/*
-			+ '?url=' + window.escape(
-				urls.XUL_OFFLINE_UPLOAD_XACTS
-				+ '?ses=' + window.escape(ses())
-				+ '&seskey=' + window.escape(seskey)
-				+ '&ws=' + window.escape(obj.data.ws_name)
-				+ '&delta=' + window.escape('0')
-				+ '&filename=' + window.escape( obj.transition_filename )
-			)
-			*/
-		);
-		var newG = { 
-			'url' : urls.XUL_OFFLINE_UPLOAD_XACTS,
-			'url_prefix' : window.xulG.url_prefix, 
-			'passthru_content_params' : {
-				'ses' : ses(),
-				'seskey' : seskey,
-				'ws' : obj.data.ws_name,
-				'delta' : 0,
-				'filename' : obj.transition_filename,
-				'url_prefix' : window.xulG.url_prefix,
-				'handle_event' : function(robj){
-					netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-					try {
-						dump('robj = ' + js2JSON(robj) + '\n');
-						if ( robj.ilsevent != 0 ) {
-							obj.revert_file();
-							alert($('adminStrings').getFormattedString('staff.admin.offline_manage_xacts.error.uploading_file') + '\n' + js2JSON(robj));
-						} else {
-							obj.archive_file();
-						}
-						obj.retrieve_seslist(); obj.render_seslist();
-						setTimeout(
-							function() {
-								JSAN.use('util.widgets');
-								util.widgets.remove_children('iframe_placeholder');
-							},0
-						);
-					} catch(E) {
-						alert('handle_event error: ' + E);
-					}
-				} 
-			}
-		};
-		get_contentWindow(x).xulG = newG;
-
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert($('adminStrings').getString('staff.admin.offline_manage_xacts.error.uploading_transactions'),E);
-		}
-	},
-
-	'ses_status' : function() {
-		var obj = this;
-
-		try {
-
-		clear_the_cache();
-		obj.data.stash_retrieve();
-
-		var url  = xulG.url_prefix(urls.XUL_OFFLINE_MANAGE_XACTS_CGI)
-			+ "?ses=" + window.escape(ses())
-			+ "&action=status" 
-			+ "&seskey=" + window.escape(obj.seslist[obj.sel_list[0]].key)
-			+ "&ws=" + window.escape(obj.data.ws_name)
-			+ "&status_type=scripts";
-		var x = new XMLHttpRequest();
-		x.open("GET",url,false);
-		x.send(null);
-
-		dump(url + ' = ' + x.responseText + '\n' );
-		if (!x.responseText) {
-			throw($('adminStrings').getString('staff.admin.offline_manage_xacts.error.bad_cgi_response'));
-		}
-		var robj = JSON2js(x.responseText);
-
-		return robj;
-
-		} catch(E) {
-
-			obj.error.standard_unexpected_error_alert($('adminStrings').getString('staff.admin.offline_manage_xacts.error.retrieving_session'),E);
-			return { 'ilsevent' : -2 };	
-
-		}
-	},
-
-	'create_ses' : function() {
-
-		var obj = this;
-
-		try {
-
-		var desc = window.prompt(
-				$('adminStrings').getString('staff.admin.offline_manage_xacts.create_session.prompt'),
-				'',
-				$('adminStrings').getString('staff.admin.offline_manage_xacts.create_session')
-		);
-		if (desc=='' || desc==null) { return; }
-
-		clear_the_cache();
-		obj.data.stash_retrieve();
-
-		var url  = xulG.url_prefix(urls.XUL_OFFLINE_MANAGE_XACTS_CGI)
-			+ "?ses=" + window.escape(ses())
-			+ "&action=create" 
-			+ "&desc=" + window.escape(desc)
-			+ "&ws=" + window.escape(obj.data.ws_name);
-		var x = new XMLHttpRequest();
-		x.open("GET",url,false);
-		x.send(null);
-
-		dump(url + ' = ' + x.responseText + '\n' );
-		if (!x.responseText) {
-			throw($('adminStrings').getString('staff.admin.offline_manage_xacts.error.bad_cgi_response'));
-		}
-		var robj = JSON2js(x.responseText);
-		if (robj.ilsevent == 0) {
-			obj.retrieve_seslist(); obj.render_seslist();
-		} else {
-			alert($('adminStrings').getFormattedString('staff.admin.offline_manage_xacts.error.create_session.alert', [x.responseText]));
-		}
-
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert($('adminStrings').getString('staff.admin.offline_manage_xacts.error.create_session'), E);
-		}
-
-	},
-
-	'retrieve_seslist' : function() {
-
-		var obj = this;
-
-		try {
-
-			clear_the_cache();
-			obj.data.stash_retrieve();
-
-			var url = xulG.url_prefix(urls.XUL_OFFLINE_MANAGE_XACTS_CGI) 
-				+ "?ses=" + window.escape(ses())
-				+ "&action=status"
-				+ "&org=" + window.escape(obj.data.list.au[0].ws_ou())
-				+ "&status_type=sessions";
-			var x = new XMLHttpRequest();
-			x.open("GET",url,false);
-			x.send(null);
+ 'sel_list' : [],
+ 'seslist' : [],
+ 'sel_errors' : [],
+
+ 'init' : function( params ) {
+
+  var obj = this;
+
+  JSAN.use('OpenILS.data'); obj.data = new OpenILS.data(); obj.data.init({'via':'stash'});
+
+  obj.init_list(); obj.init_script_list(); obj.init_error_list();
+
+  obj.retrieve_seslist(); obj.render_seslist();
+
+  var x = document.getElementById('create');
+  if (obj.check_perm(['OFFLINE_UPLOAD'])) {
+   x.disabled = false;
+   x.addEventListener('command',function() { try{obj.create_ses();}catch(E){alert(E);} },false);
+  }
+
+  x = obj.$('upload');
+  x.addEventListener('command',function() { try{obj.upload();}catch(E){alert(E);} },false);
+
+  x = obj.$('refresh');
+  x.addEventListener('command',function() { try{$('deck').selectedIndex=0;obj.retrieve_seslist();obj.render_seslist();}catch(E){alert(E);} },false);
+
+  x = obj.$('execute');
+  x.addEventListener('command',function() { try{obj.execute_ses();}catch(E){alert(E);} },false);
+
+  x = obj.$('retrieve_item');
+  x.addEventListener('command',function() { try{obj.retrieve_item();}catch(E){alert(E);} },false);
+
+  x = obj.$('retrieve_patron');
+  x.addEventListener('command',function() { try{obj.retrieve_patron();}catch(E){alert(E);} },false);
+
+  x = obj.$('retrieve_details');
+  x.addEventListener('command',function() { try{obj.retrieve_details();}catch(E){alert(E);} },false);
+
+  obj.$('deck').selectedIndex = 0;
+ },
+
+ '$' : function(id) { return document.getElementById(id); },
+
+ 'init_list' : function() {
+  var obj = this; JSAN.use('util.list'); JSAN.use('util.date'); JSAN.use('patron.util');
+  obj.list = new util.list('session_tree');
+  obj.list.init( {
+   'columns' : [
+    {
+     'id' : 'org', 'hidden' : 'true', 'flex' : '1',
+     'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_list.organization'),
+     'render' : function(my) { return obj.data.hash.aou[ my.org ].shortname(); }
+    },
+    { 
+     'id' : 'description', 'flex' : '2',
+     'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_list.description'),
+     'render' : function(my) { return my.description; }
+    },
+    {
+     'id' : 'create_time', 'flex' : '1',
+     'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_list.date_created'),
+     'render' : function(my) { if (my.create_time) { var x = new Date(); x.setTime(my.create_time+"000"); return util.date.formatted_date(x,"%F %H:%M"); } else { return ""; }; }
+    },
+    {
+     'id' : 'creator', 'flex' : '1', 'hidden' : 'true',
+     'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_list.created_by'),
+     'render' : function(my) { var staff_obj = patron.util.retrieve_name_via_id( ses(), my.creator ); return staff_obj[0] + " @ " + obj.data.hash.aou[ staff_obj[3] ].shortname(); }
+    },
+    { 
+     'id' : 'count', 'flex' : '1',
+     'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_list.upload_count'), 
+     'render' : function(my) { return my.scripts.length; }
+    },
+    { 
+     'id' : 'num_complete', 'flex' : '1', 
+     'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_list.transactions_processed'), 
+     'render' : function(my) { return my.num_complete; }
+    },
+    { 
+     'id' : 'in_process', 'flex' : '1',
+     'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_list.processing'),
+     'render' : function(my) {
+      if (my.end_time) {
+       return $('adminStrings').getString('staff.admin.offline_manage_xacts.completed')
+      } else {
+       return get_bool(my.in_process) ? $('adminStrings').getString('staff.admin.offline_manage_xacts.yes') : $('adminStrings').getString('staff.admin.offline_manage_xacts.no')
+      };
+     }
+    },
+    {
+     'id' : 'start_time', 'flex' : '1', 'hidden' : 'true',
+     'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_list.date_started'),
+     'render' : function(my) { if (my.start_time) {var x = new Date(); x.setTime(my.start_time+"000"); return util.date.formatted_date(x,"%F %H:%M");} else { return ""; }; }
+    },
+    {
+     'id' : 'end_time', 'flex' : '1',
+     'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_list.date_completed'),
+     'render' : function(my) { if (my.end_time) {var x = new Date(); x.setTime(my.end_time+"000"); return util.date.formatted_date(x,"%F %H:%M");} else { return ""; }; }
+    },
+    { 
+     'id' : 'key', 'hidden' : 'true', 'flex' : '1', 
+     'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_list.session'),
+     'render' : function(my) { return my.key; }
+    },
+   ],
+   'map_row_to_columns' : patron.util.std_map_row_to_columns(),
+   'on_select' : function(ev) {
+    try {
+     $('deck').selectedIndex = 0;
+     $('execute').disabled = true;
+     $('upload').disabled = true;
+     setTimeout(
+      function() {
+       try {
+        JSAN.use('util.functional');
+        var sel = obj.list.retrieve_selection();
+        obj.sel_list = util.functional.map_list(
+         sel,
+         function(o) { return o.getAttribute('retrieve_id'); }
+        );
+        if (obj.sel_list.length == 0) return;
+        { 
+         var upload = true; var process = true;
+
+         if (obj.sel_list.length > 1) upload = false;
+
+         if (obj.seslist[ obj.sel_list[0] ].end_time) {
+          upload = false; process = false;
+         }
+         if (obj.seslist[ obj.sel_list[0] ].in_process == 1) {
+          upload = false; process = false;
+         }
+
+         /* should we really have this next restriction? */
+         for (var i = 0; i < obj.seslist[ obj.sel_list[0] ].scripts.length; i++) {
+          if (obj.seslist[ obj.sel_list[0] ].scripts[i].workstation ==
+           obj.data.ws_name ) upload = false;
+         }
+
+         if (upload) {
+          if (obj.check_perm(['OFFLINE_UPLOAD'])) {
+           document.getElementById('upload').disabled = false;
+          }
+         } else {
+          document.getElementById('upload').disabled = true;
+         }
+         if (process) {
+          if (obj.check_perm(['OFFLINE_EXECUTE'])) {
+           document.getElementById('execute').disabled = false; 
+          }
+         } else {
+          document.getElementById('execute').disabled = true; 
+         }
+        }
+        var complete = false;
+        for (var i = 0; i < obj.sel_list.length; i++) { 
+         if (obj.seslist[ obj.sel_list[i] ].end_time) { complete = true; }
+        }
+        if (complete) {
+         obj.render_errorlist();
+        } else {
+         if (obj.seslist[ obj.sel_list[0] ].in_process == 1) {
+          obj.render_status();
+         } else {
+          obj.render_scriptlist();
+         }
+        }
+       } catch(E) {
+        alert('on_select: ' + E);
+       }
+      }, 0
+     );
+    } catch(E) {
+     alert('on_select:\nobj.seslist.length = ' + obj.seslist.length + '  obj.sel_list.length = ' + obj.sel_list.length + '\nerror: ' + E);
+    }
+   }
+  } );
+
+
+ },
+
+ 'init_script_list' : function() {
+  var obj = this; JSAN.use('util.list'); JSAN.use('util.date'); JSAN.use('patron.util');
+  obj.script_list = new util.list('script_tree');
+  obj.script_list.init( {
+   'columns' : [
+    {
+     'id' : 'create_time', 'flex' : '1',
+     'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_script_list.date_uploaded'),
+     'render' : function(my) { if (my.create_time) { var x = new Date(); x.setTime(my.create_time+"000"); return util.date.formatted_date(x,"%F %H:%M"); } else { return ""; }; }
+    },
+    {
+     'id' : 'requestor', 'flex' : '1', 'hidden' : 'true',
+     'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_script_list.uploaded_by'),
+     'render' : function(my) { var staff_obj = patron.util.retrieve_name_via_id( ses(), my.requestor ); return staff_obj[0] + " @ " + obj.data.hash.aou[ staff_obj[3] ].shortname(); }
+    },
+    { 
+     'id' : 'time_delta', 'hidden' : 'true', 'flex' : '1', 
+     'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_script_list.time_delta'),
+     'render' : function(my) { return my.time_delta; }
+    },
+    { 
+     'id' : 'workstation', 'flex' : '1', 
+     'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_script_list.workstation'),
+     'render' : function(my) { return my.workstation; }
+    },
+   ],
+   'map_row_to_columns' : patron.util.std_map_row_to_columns()
+  } );
+
+
+ },
+
+ 'init_error_list' : function() {
+  var obj = this; JSAN.use('util.list');  JSAN.use('util.date'); JSAN.use('patron.util'); JSAN.use('util.functional');
+  obj.error_list = new util.list('error_tree');
+  obj.error_list.init( {
+   'columns' : [
+    {
+     'id' : 'workstation', 'flex' : '1',
+     'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_error_list.workstation'),
+     'render' : function(my) { return my.command._workstation ? my.command._workstation : my.command._worksation; }
+    },
+    {
+     'id' : 'timestamp', 'flex' : '1',
+     'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_error_list.timestamp'),
+     'render' : function(my) { if (my.command.timestamp) { var x = new Date(); x.setTime(my.command.timestamp+"000"); return util.date.formatted_date(x,"%F %H:%M"); } else { return my.command._realtime; }; }
+    },
+    {
+     'id' : 'type', 'flex' : '1',
+     'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_error_list.type'),
+     'render' : function(my) { return my.command.type; }
+    },
+    { 
+     'id' : 'ilsevent', 'hidden' : 'true', 'flex' : '1', 
+     'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_error_list.event_code'),
+     'render' : function(my) { return my.event.ilsevent; }
+    },
+    { 
+     'id' : 'textcode', 'flex' : '1', 
+     'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_error_list.event_name'),
+     'render' : function(my) { return typeof my.event.textcode != 'undefined' ? my.event.textcode : util.functional.map_list( my.event, function(o) { return o.textcode; }).join('/'); }
+    },
+    {
+     'id' : 'desc', 'flex' : '1', 'hidden' : 'true',
+     'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_error_list.event_description'),
+     'render' : function(my) { return my.event.desc; }
+    },
+    {
+     'id' : 'i_barcode', 'flex' : '1',
+     'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_error_list.item_barcode'),
+     'render' : function(my) { return my.command.barcode ? my.command.barcode : ""; }
+    },
+    {
+     'id' : 'p_barcode', 'flex' : '1',
+     'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_error_list.patron_barcode'),
+     'render' : function(my) { if (my.command.patron_barcode) { return my.command.patron_barcode; } else { if (my.command.user.card.barcode) { return my.command.user.card.barcode; } else { return ""; } }; }
+    },
+    {
+     'id' : 'duedate', 'flex' : '1', 'hidden' : 'true',
+     'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_error_list.due_date'),
+     'render' : function(my) { return my.command.due_date || ""; }
+    },
+    {
+     'id' : 'backdate', 'flex' : '1', 'hidden' : 'true',
+     'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_error_list.backdate'),
+     'render' : function(my) { return my.command.backdate || ""; }
+    },
+    {
+     'id' : 'count', 'flex' : '1', 'hidden' : 'true',
+     'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_error_list.count'),
+     'render' : function(my) { return my.command.count || ""; }
+    },
+    {
+     'id' : 'noncat', 'flex' : '1', 'hidden' : 'true',
+     'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_error_list.noncat'),
+     'render' : function(my) { return get_bool(my.command.noncat) ? $('adminStrings').getString('staff.admin.offline_manage_xacts.yes') : $('adminStrings').getString('staff.admin.offline_manage_xacts.no'); }
+    },
+    {
+     'id' : 'noncat_type', 'flex' : '1', 'hidden' : 'true',
+     'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_error_list.noncat_type'),
+     'render' : function(my) { return data.hash.cnct[ my.command.noncat_type ] ? obj.data.hash.cnct[ my.command.noncat_type ].name() : ""; }
+    },
+    {
+     'id' : 'noncat_count', 'flex' : '1', 'hidden' : 'true',
+     'label' : $('adminStrings').getString('staff.admin.offline_manage_xacts.init_error_list.noncat_count'),
+     'render' : function(my) { return my.command.noncat_count || ""; }
+    },
+   ],
+   'map_row_to_columns' : patron.util.std_map_row_to_columns(),
+   'on_select' : function(ev) {
+    try {
+     var sel = obj.error_list.retrieve_selection();
+     obj.sel_errors = util.functional.map_list(
+      sel,
+      function(o) { return o.getAttribute('retrieve_id'); }
+     );
+     if (obj.sel_errors.length > 0) {
+      obj.$('retrieve_item').disabled = false;
+      obj.$('retrieve_patron').disabled = false;
+      obj.$('retrieve_details').disabled = false;
+     } else {
+      obj.$('retrieve_item').disabled = true;
+      obj.$('retrieve_patron').disabled = true;
+      obj.$('retrieve_details').disabled = true;
+     }
+    } catch(E) {
+     alert(E);
+    }
+   }
+  } );
+
+  var export_button = document.getElementById('export_btn');
+  if (export_button) export_button.addEventListener(
+   'command',
+   function(ev) {
+    try {
+     obj.error_list.dump_csv_to_clipboard();
+    } catch(E) {
+     obj.error.standard_unexpected_error_alert('export',E); 
+    }
+   },
+   false
+  );
+  
+  var print_export_button = document.getElementById('print_export_btn');
+  if (print_export_button) print_export_button.addEventListener(
+   'command',
+   function(ev) {
+    try {
+     obj.error_list.on_all_fleshed =
+      function() {
+       try {
+        dump( obj.error_list.dump_csv() + '\n' );
+        //copy_to_clipboard(obj.error_list.dump_csv());
+        JSAN.use('util.print'); var p = new util.print();
+        p.simple( obj.error_list.dump_csv(), { 'content_type' : 'text/plain' } );
+        setTimeout(function(){ obj.error_list.on_all_fleshed = null; },0);
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert('export',E); 
+       }
+      }
+     obj.error_list.full_retrieve();
+    } catch(E) {
+     obj.error.standard_unexpected_error_alert('print export',E); 
+    }
+   },
+   false
+  );
+
+ },
+
+ 'check_perm' : function(perms) {
+  var obj = this;
+  try {
+   var robj = obj.network.simple_request('PERM_CHECK',[ses(),obj.data.list.au[0].id(),obj.data.list.au[0].ws_ou(),perms]);
+   if (typeof robj.ilsevent != 'undefined') {
+    obj.error.standard_unexpected_error_alert('check permission',E);
+    return false;
+   }
+   return robj.length == 0 ? true : false;
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert($('adminStrings').getString('staff.admin.offline_manage_xacts.error.check_perm'),E);
+  }
+ },
+
+ 'execute_ses' : function() {
+  var obj = this;
+
+  try {
+
+  clear_the_cache();
+  obj.data.stash_retrieve();
+
+  for (var i = 0; i < obj.sel_list.length; i++) {
+
+   var url  = xulG.url_prefix(urls.XUL_OFFLINE_MANAGE_XACTS_CGI)
+    + "?ses=" + window.escape(ses())
+    + "&action=execute" 
+    + "&seskey=" + window.escape(obj.seslist[obj.sel_list[i]].key)
+    + "&ws=" + window.escape(obj.data.ws_name);
+   var x = new XMLHttpRequest();
+   x.open("GET",url,false);
+   x.send(null);
+
+   dump(url + ' = ' + x.responseText + '\n' );
+   if (!x.responseText) {
+    throw($('adminStrings').getString('staff.admin.offline_manage_xacts.error.bad_cgi_response'));
+   }
+   var robj = JSON2js(x.responseText);
+
+   if (robj.ilsevent != 0) { alert($('adminStrings').getString('staff.admin.offline_manage_xacts.error.execute_error') + ' ' + x.responseText); }
+
+   obj.retrieve_seslist(); obj.render_seslist();
+  }
+
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert($('adminStrings').getString('staff.admin.offline_manage_xacts.error.session_execute_error'),E);
+  }
+ },
+
+ 'ses_errors' : function() {
+  var obj = this;
+
+  try {
+
+  clear_the_cache();
+  obj.data.stash_retrieve();
+
+  var url  = xulG.url_prefix(urls.XUL_OFFLINE_MANAGE_XACTS_CGI)
+   + "?ses=" + window.escape(ses())
+   + "&action=status" 
+   + "&seskey=" + window.escape(obj.seslist[ obj.sel_list[0] ].key)
+   + "&ws=" + window.escape(obj.data.ws_name)
+   + '&status_type=exceptions';
+  var x = new XMLHttpRequest();
+  x.open("GET",url,false);
+  x.send(null);
+
+  dump(url + ' = ' + x.responseText + '\n' );
+  if (!x.responseText) {
+   throw($('adminStrings').getString('staff.admin.offline_manage_xacts.error.bad_cgi_response'));
+  }
+  var robj = JSON2js(x.responseText);
+
+  return { 'errors' : robj, 'description' : obj.seslist[ obj.sel_list[0] ].description };
+
+  } catch(E) {
+   throw($('adminStrings').getString('staff.admin.offline_manage_xacts.error.session_retrieval') + ' ' + E);
+  }
+
+ },
+
+ 'rename_file' : function() {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  var obj = this;
+
+  try {
+
+  JSAN.use('util.file'); 
+  var pending = new util.file('pending_xacts');
+  if ( !pending._file.exists() ) {
+   throw($('adminStrings').getString('staff.admin.offline_manage_xacts.error.non_existent_file'));
+  }
+  obj.transition_filename = 'pending_xacts_' + new Date().getTime();
+  var count = 0;
+  var file = new util.file(obj.transition_filename);
+  while (file._file.exists()) {
+   obj.transition_filename = 'pending_xacts_' + new Date().getTime();
+   file = new util.file(obj.transition_filename);
+   if (count++>100) {
+    throw($('adminStrings').getString('staff.admin.offline_manage_xacts.error.unique_file'));
+   }
+  }
+  pending._file.moveTo(null,obj.transition_filename);
+
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert($('adminStrings').getString('staff.admin.offline_manage_xacts.error.renaming_file'),E);
+  }
+ },
+
+ 'revert_file' : function() {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  var obj = this;
+
+  try {
+
+  JSAN.use('util.file');
+  var pending = new util.file('pending_xacts');
+  if (pending._file.exists()) { 
+   obj.error.yns_alert(
+     $('adminStrings').getFormattedString('staff.admin.offline_manage_xacts.error.transaction_conflicts', [obj.transition_filename]),
+     $('adminStrings').getString('staff.admin.offline_manage_xacts.error.transaction_conflicts.title'),
+     $('adminStrings').getString('staff.admin.offline_manage_xacts.error.transaction_conflicts.ok'),
+     null,
+     null,
+     $('adminStrings').getString('staff.admin.offline_manage_xacts.error.transaction_conflicts.confirm')
+   );
+   return;
+  }
+  var file = new util.file(obj.transition_filename);
+  file._file.moveTo(null,'pending_xacts');
+
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert($('adminStrings').getString('staff.admin.offline_manage_xacts.error.reverting_file'),E);
+  }
+ },
+
+ 'archive_file' : function() {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  var obj = this;
+
+  try {
+
+  JSAN.use('util.file');
+  var file = new util.file(obj.transition_filename);
+  if (file._file.exists()) file._file.moveTo(null,obj.transition_filename + '.complete');
+
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert($('adminStrings').getString('staff.admin.offline_manage_xacts.error.archiving_file'),E);
+  }
+ },
+
+ 'upload' : function() {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  var obj = this;
+
+  try {
+
+  if (obj.sel_list.length == 0) { 
+   alert($('adminStrings').getString('staff.admin.offline_manage_xacts.session_upload'));
+   return;
+  }
+  if (obj.sel_list.length > 1) {
+   alert($('adminStrings').getString('staff.admin.offline_manage_xacts.single_session_upload'));
+   return;
+  }
+
+  JSAN.use('util.file');
+
+  var file = new util.file('pending_xacts');
+  if (!file._file.exists()) {
+   alert($('adminStrings').getString('staff.admin.offline_manage_xacts.no_transactions'));
+   return;
+  }
+
+  obj.rename_file();
+
+  obj.data.stash_retrieve();
+  var seskey = obj.seslist[ obj.sel_list[0] ].key;
+  JSAN.use('util.widgets');
+  var xx = document.getElementById('iframe_placeholder'); util.widgets.remove_children(xx);
+  var x = document.createElement('iframe'); xx.appendChild(x); x.flex = 1;
+  x.setAttribute(
+   'src',
+   window.xulG.url_prefix( urls.XUL_REMOTE_BROWSER )
+   /*
+   + '?url=' + window.escape(
+    urls.XUL_OFFLINE_UPLOAD_XACTS
+    + '?ses=' + window.escape(ses())
+    + '&seskey=' + window.escape(seskey)
+    + '&ws=' + window.escape(obj.data.ws_name)
+    + '&delta=' + window.escape('0')
+    + '&filename=' + window.escape( obj.transition_filename )
+   )
+   */
+  );
+  var newG = { 
+   'url' : urls.XUL_OFFLINE_UPLOAD_XACTS,
+   'url_prefix' : window.xulG.url_prefix, 
+   'passthru_content_params' : {
+    'ses' : ses(),
+    'seskey' : seskey,
+    'ws' : obj.data.ws_name,
+    'delta' : 0,
+    'filename' : obj.transition_filename,
+    'url_prefix' : window.xulG.url_prefix,
+    'handle_event' : function(robj){
+     netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+     try {
+      dump('robj = ' + js2JSON(robj) + '\n');
+      if ( robj.ilsevent != 0 ) {
+       obj.revert_file();
+       alert($('adminStrings').getFormattedString('staff.admin.offline_manage_xacts.error.uploading_file') + '\n' + js2JSON(robj));
+      } else {
+       obj.archive_file();
+      }
+      obj.retrieve_seslist(); obj.render_seslist();
+      setTimeout(
+       function() {
+        JSAN.use('util.widgets');
+        util.widgets.remove_children('iframe_placeholder');
+       },0
+      );
+     } catch(E) {
+      alert('handle_event error: ' + E);
+     }
+    } 
+   }
+  };
+  get_contentWindow(x).xulG = newG;
+
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert($('adminStrings').getString('staff.admin.offline_manage_xacts.error.uploading_transactions'),E);
+  }
+ },
+
+ 'ses_status' : function() {
+  var obj = this;
+
+  try {
+
+  clear_the_cache();
+  obj.data.stash_retrieve();
+
+  var url  = xulG.url_prefix(urls.XUL_OFFLINE_MANAGE_XACTS_CGI)
+   + "?ses=" + window.escape(ses())
+   + "&action=status" 
+   + "&seskey=" + window.escape(obj.seslist[obj.sel_list[0]].key)
+   + "&ws=" + window.escape(obj.data.ws_name)
+   + "&status_type=scripts";
+  var x = new XMLHttpRequest();
+  x.open("GET",url,false);
+  x.send(null);
+
+  dump(url + ' = ' + x.responseText + '\n' );
+  if (!x.responseText) {
+   throw($('adminStrings').getString('staff.admin.offline_manage_xacts.error.bad_cgi_response'));
+  }
+  var robj = JSON2js(x.responseText);
+
+  return robj;
+
+  } catch(E) {
+
+   obj.error.standard_unexpected_error_alert($('adminStrings').getString('staff.admin.offline_manage_xacts.error.retrieving_session'),E);
+   return { 'ilsevent' : -2 }; 
+
+  }
+ },
+
+ 'create_ses' : function() {
+
+  var obj = this;
+
+  try {
+
+  var desc = window.prompt(
+    $('adminStrings').getString('staff.admin.offline_manage_xacts.create_session.prompt'),
+    '',
+    $('adminStrings').getString('staff.admin.offline_manage_xacts.create_session')
+  );
+  if (desc=='' || desc==null) { return; }
+
+  clear_the_cache();
+  obj.data.stash_retrieve();
+
+  var url  = xulG.url_prefix(urls.XUL_OFFLINE_MANAGE_XACTS_CGI)
+   + "?ses=" + window.escape(ses())
+   + "&action=create" 
+   + "&desc=" + window.escape(desc)
+   + "&ws=" + window.escape(obj.data.ws_name);
+  var x = new XMLHttpRequest();
+  x.open("GET",url,false);
+  x.send(null);
+
+  dump(url + ' = ' + x.responseText + '\n' );
+  if (!x.responseText) {
+   throw($('adminStrings').getString('staff.admin.offline_manage_xacts.error.bad_cgi_response'));
+  }
+  var robj = JSON2js(x.responseText);
+  if (robj.ilsevent == 0) {
+   obj.retrieve_seslist(); obj.render_seslist();
+  } else {
+   alert($('adminStrings').getFormattedString('staff.admin.offline_manage_xacts.error.create_session.alert', [x.responseText]));
+  }
+
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert($('adminStrings').getString('staff.admin.offline_manage_xacts.error.create_session'), E);
+  }
+
+ },
+
+ 'retrieve_seslist' : function() {
+
+  var obj = this;
+
+  try {
+
+   clear_the_cache();
+   obj.data.stash_retrieve();
+
+   var url = xulG.url_prefix(urls.XUL_OFFLINE_MANAGE_XACTS_CGI) 
+    + "?ses=" + window.escape(ses())
+    + "&action=status"
+    + "&org=" + window.escape(obj.data.list.au[0].ws_ou())
+    + "&status_type=sessions";
+   var x = new XMLHttpRequest();
+   x.open("GET",url,false);
+   x.send(null);
 
-			dump(url + ' = ' + typeof(x.responseText) + '\n' );
+   dump(url + ' = ' + typeof(x.responseText) + '\n' );
 
-			if (!x.responseText) {
-				throw($('adminStrings').getString('staff.admin.offline_manage_xacts.error.bad_cgi_response'));
-			}
+   if (!x.responseText) {
+    throw($('adminStrings').getString('staff.admin.offline_manage_xacts.error.bad_cgi_response'));
+   }
 
-			var robj = JSON2js( x.responseText );
-			if (typeof robj.ilsevent != 'undefined') throw(robj);
+   var robj = JSON2js( x.responseText );
+   if (typeof robj.ilsevent != 'undefined') throw(robj);
 
-			if (!robj) throw(robj);
+   if (!robj) throw(robj);
 
-			obj.seslist = robj.sort(
-				function(a,b) {
-					return b.create_time - a.create_time;
-				}
-			);
+   obj.seslist = robj.sort(
+    function(a,b) {
+     return b.create_time - a.create_time;
+    }
+   );
 
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert($('adminStrings').getString('staff.admin.offline_manage_xacts.error.retrieving_sessions'),E);
-		}
-	},
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert($('adminStrings').getString('staff.admin.offline_manage_xacts.error.retrieving_sessions'),E);
+  }
+ },
 
-	'render_seslist' : function() {
+ 'render_seslist' : function() {
 
-		var obj = this;
+  var obj = this;
 
-		try {
+  try {
 
-		var old_idx = obj.list.node.currentIndex;
-		if (old_idx < 0) old_idx = 0;
+  var old_idx = obj.list.node.currentIndex;
+  if (old_idx < 0) old_idx = 0;
 
-		obj.list.clear();
+  obj.list.clear();
 
-		var funcs = [];
-		for (var i = 0; i < obj.seslist.length; i++) {
-			funcs.push( 
-				function(idx,row){ 
-					return function(){
-						obj.list.append( { 'retrieve_id' : idx, 'row' : row, 'no_auto_select' : true, 'to_bottom' : true } );
-						//if (idx == old_idx) obj.list.node.view.selection.select(idx);
-					};
-				}(i,{ 'my' : obj.seslist[i] }) 
-			);
-		}
-
-		JSAN.use('util.exec'); var exec = new util.exec();
-		exec.chain( funcs );
-
-		document.getElementById('execute').disabled = true;
-		document.getElementById('upload').disabled = true;
-
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert($('adminStrings').getString('staff.admin.offline_manage_xacts.error.rendering_session'),E);
-		}
-	},
-
-	'render_scriptlist' : function() {
-
-		dump('render_scriptlist\n');
-
-		var obj = this;
-
-		try { 
-
-		document.getElementById('deck').selectedIndex = 1;
-
-		obj.script_list.clear();
-
-		var status = obj.ses_status();
-		$('status_caption').setAttribute('label', $('adminStrings').getFormattedString('staff.admin.offline_manage_xacts.upload_status', [status.description]));
-
-		var scripts = status.scripts;
-
-		var funcs = [];
-		for (var i = 0; i < scripts.length; i++) {
-			funcs.push( 
-				function(row){ 
-					return function(){
-						obj.script_list.append( { 'row' : row, 'no_auto_select' : true  } );
-					};
-				}({ 'my' : scripts[i] }) 
-			);
-		}
-		JSAN.use('util.exec'); var exec = new util.exec();
-		exec.chain( funcs );
-
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert($('adminStrings').getString('staff.admin.offline_manage_xacts.error.rendering_script'),E);
-		}
-	},
-	
-	'render_errorlist' : function() {
-
-		dump('render_errorlist\n');
-
-		var obj = this;
-
-		try {
-
-		document.getElementById('deck').selectedIndex = 2;
-
-		obj.error_list.clear();
-
-		var error_meta = obj.ses_errors();
-		$('errors_caption').setAttribute('label',$('adminStrings').getFormattedString('staff.admin.offline_manage_xacts.error.rendering_errors', [error_meta.description]));
-
-		obj.errors = error_meta.errors;
-
-		var funcs = [];
-		for (var i = 0; i < obj.errors.length; i++) {
-			funcs.push( 
-				function(idx,row){ 
-					return function(){
-						obj.error_list.append( { 'retrieve_id' : idx, 'row' : row, 'no_auto_select' : true  } );
-					};
-				}(i,{ 'my' : obj.errors[i] }) 
-			);
-		}
-		JSAN.use('util.exec'); var exec = new util.exec();
-		exec.chain( funcs );
-
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert($('adminStrings').getString('staff.admin.offline_manage_xacts.error.rendering_error_list'),E);
-		}
-	},
-
-	'render_status' : function() {
-	
-		dump('render_status\n');
-
-		document.getElementById('deck').selectedIndex = 3;
-
-	},
-
-	'retrieve_item' : function() {
-		var obj = this;
-		try {
-			var barcodes = [];
-			for (var i = 0; i < obj.sel_errors.length; i++) {
-				var error = obj.errors[ obj.sel_errors[i] ];
-				if ( ! error.command.barcode ) continue; 
-				if ( [ '', ' ', '???' ].indexOf( error.command.barcode ) != -1 ) continue;
-				barcodes.push( error.command.barcode );
-			}
-			if (typeof window.xulG == 'object' && typeof window.xulG.new_tab == 'function') {
-				try {
-					var url = urls.XUL_COPY_STATUS;
-						//+ '?barcodes=' + window.escape( js2JSON(barcodes) );
-					window.xulG.new_tab(
-						url, {}, { 'barcodes' : barcodes }
-					);
-				} catch(E) {
-					alert(E);
-				}
-			}
-		} catch(E) {
-			alert(E);
-		}
-	},
-
-	'retrieve_patron' : function() {
-		var obj = this;
-		var patrons = {};
-		try {
-			for (var i = 0; i < obj.sel_errors.length; i++) {
-				var error = obj.errors[ obj.sel_errors[i] ];
-				if ( ! error.command.patron_barcode ) continue; 
-				if ( [ '', ' ', '???' ].indexOf( error.command.patron_barcode ) != -1 ) continue;
-				patrons[ error.command.patron_barcode ] = true;
-			}
-			for (var barcode in patrons) {
-				if (typeof window.xulG == 'object' && typeof window.xulG.new_tab == 'function') {
-					try {
-						window.xulG.new_patron_tab(
-							{}, { 'barcode' : barcode }
-						);
-					} catch(E) {
-						alert(E);
-					}
-				}
-
-			}
-		} catch(E) {
-			alert(E);
-		}
-	},
-
-	'retrieve_details' : function() {
-		var obj = this;
-		JSAN.use('util.window'); var win = new util.window();
-		try {
-			for (var i = 0; i < obj.sel_errors.length; i++) {
-				var error = obj.errors[ obj.sel_errors[i] ];
-				win.open(
-					'data:text/plain,' + window.escape(
-						'Details:\n' + obj.error.pretty_print(js2JSON(error))
-					),
-					'offline_error_details',
-					'height=780,width=580,scrollbars=yes,chrome,resizable,modal'
-				);
-			}
-		} catch(E) {
-			alert(E);
-		}
-
-	}
+  var funcs = [];
+  for (var i = 0; i < obj.seslist.length; i++) {
+   funcs.push( 
+    function(idx,row){ 
+     return function(){
+      obj.list.append( { 'retrieve_id' : idx, 'row' : row, 'no_auto_select' : true, 'to_bottom' : true } );
+      //if (idx == old_idx) obj.list.node.view.selection.select(idx);
+     };
+    }(i,{ 'my' : obj.seslist[i] }) 
+   );
+  }
+
+  JSAN.use('util.exec'); var exec = new util.exec();
+  exec.chain( funcs );
+
+  document.getElementById('execute').disabled = true;
+  document.getElementById('upload').disabled = true;
+
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert($('adminStrings').getString('staff.admin.offline_manage_xacts.error.rendering_session'),E);
+  }
+ },
+
+ 'render_scriptlist' : function() {
+
+  dump('render_scriptlist\n');
+
+  var obj = this;
+
+  try { 
+
+  document.getElementById('deck').selectedIndex = 1;
+
+  obj.script_list.clear();
+
+  var status = obj.ses_status();
+  $('status_caption').setAttribute('label', $('adminStrings').getFormattedString('staff.admin.offline_manage_xacts.upload_status', [status.description]));
+
+  var scripts = status.scripts;
+
+  var funcs = [];
+  for (var i = 0; i < scripts.length; i++) {
+   funcs.push( 
+    function(row){ 
+     return function(){
+      obj.script_list.append( { 'row' : row, 'no_auto_select' : true  } );
+     };
+    }({ 'my' : scripts[i] }) 
+   );
+  }
+  JSAN.use('util.exec'); var exec = new util.exec();
+  exec.chain( funcs );
+
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert($('adminStrings').getString('staff.admin.offline_manage_xacts.error.rendering_script'),E);
+  }
+ },
+ 
+ 'render_errorlist' : function() {
+
+  dump('render_errorlist\n');
+
+  var obj = this;
+
+  try {
+
+  document.getElementById('deck').selectedIndex = 2;
+
+  obj.error_list.clear();
+
+  var error_meta = obj.ses_errors();
+  $('errors_caption').setAttribute('label',$('adminStrings').getFormattedString('staff.admin.offline_manage_xacts.error.rendering_errors', [error_meta.description]));
+
+  obj.errors = error_meta.errors;
+
+  var funcs = [];
+  for (var i = 0; i < obj.errors.length; i++) {
+   funcs.push( 
+    function(idx,row){ 
+     return function(){
+      obj.error_list.append( { 'retrieve_id' : idx, 'row' : row, 'no_auto_select' : true  } );
+     };
+    }(i,{ 'my' : obj.errors[i] }) 
+   );
+  }
+  JSAN.use('util.exec'); var exec = new util.exec();
+  exec.chain( funcs );
+
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert($('adminStrings').getString('staff.admin.offline_manage_xacts.error.rendering_error_list'),E);
+  }
+ },
+
+ 'render_status' : function() {
+ 
+  dump('render_status\n');
+
+  document.getElementById('deck').selectedIndex = 3;
+
+ },
+
+ 'retrieve_item' : function() {
+  var obj = this;
+  try {
+   var barcodes = [];
+   for (var i = 0; i < obj.sel_errors.length; i++) {
+    var error = obj.errors[ obj.sel_errors[i] ];
+    if ( ! error.command.barcode ) continue; 
+    if ( [ '', ' ', '???' ].indexOf( error.command.barcode ) != -1 ) continue;
+    barcodes.push( error.command.barcode );
+   }
+   if (typeof window.xulG == 'object' && typeof window.xulG.new_tab == 'function') {
+    try {
+     var url = urls.XUL_COPY_STATUS;
+      //+ '?barcodes=' + window.escape( js2JSON(barcodes) );
+     window.xulG.new_tab(
+      url, {}, { 'barcodes' : barcodes }
+     );
+    } catch(E) {
+     alert(E);
+    }
+   }
+  } catch(E) {
+   alert(E);
+  }
+ },
+
+ 'retrieve_patron' : function() {
+  var obj = this;
+  var patrons = {};
+  try {
+   for (var i = 0; i < obj.sel_errors.length; i++) {
+    var error = obj.errors[ obj.sel_errors[i] ];
+    if ( ! error.command.patron_barcode ) continue; 
+    if ( [ '', ' ', '???' ].indexOf( error.command.patron_barcode ) != -1 ) continue;
+    patrons[ error.command.patron_barcode ] = true;
+   }
+   for (var barcode in patrons) {
+    if (typeof window.xulG == 'object' && typeof window.xulG.new_tab == 'function') {
+     try {
+      window.xulG.new_patron_tab(
+       {}, { 'barcode' : barcode }
+      );
+     } catch(E) {
+      alert(E);
+     }
+    }
+
+   }
+  } catch(E) {
+   alert(E);
+  }
+ },
+
+ 'retrieve_details' : function() {
+  var obj = this;
+  JSAN.use('util.window'); var win = new util.window();
+  try {
+   for (var i = 0; i < obj.sel_errors.length; i++) {
+    var error = obj.errors[ obj.sel_errors[i] ];
+    win.open(
+     'data:text/plain,' + window.escape(
+      'Details:\n' + obj.error.pretty_print(js2JSON(error))
+     ),
+     'offline_error_details',
+     'height=780,width=580,scrollbars=yes,chrome,resizable,modal'
+    );
+   }
+  } catch(E) {
+   alert(E);
+  }
+
+ }
 }
 
 dump('exiting admin/offline_manage_xacts.js\n');
diff --git a/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul b/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul
index 11f438d92e..65cc14c3d7 100644
--- a/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul
+++ b/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,87 +20,87 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="admin_offline_manage_xacts_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for admin_offline_manage_xacts.xul');
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for admin_offline_manage_xacts.xul');
 
-				JSAN.use('admin.offline_manage_xacts'); g.admin = new admin.offline_manage_xacts();
-				g.admin.init({});
+    JSAN.use('admin.offline_manage_xacts'); g.admin = new admin.offline_manage_xacts();
+    g.admin.init({});
 
-			} catch(E) {
-				var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['admin/offline_manage_xacts.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
+   } catch(E) {
+    var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['admin/offline_manage_xacts.xul', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
 
-	]]>
-	</script>
-	<messagecatalog id="adminStrings" src="/xul/server/locale/<!--#echo var='locale'-->/admin.properties"/>
+ ]]>
+ </script>
+ <messagecatalog id="adminStrings" src="/xul/server/locale/<!--#echo var='locale'-->/admin.properties"/>
 
-	<vbox id="admin_offline_manage_xacts_main" flex="1">
+ <vbox id="admin_offline_manage_xacts_main" flex="1">
 
-		<groupbox flex="1">
-			<caption label="&staff.server.admin.offline.xacts.caption;"/>
-			<hbox>
-				<button id="refresh" label="&common.refresh;" accesskey="&staff.server.admin.offline.xacts.refresh.accesskey;"/>
-				<button id="create" label="&staff.server.admin.offline.xacts.create.label;" disabled="true"/>
-				<button id="execute" label="&staff.server.admin.offline.xacts.execute.label;" disabled="true"/>
-				<spacer flex="1"/>
-				<button id="upload" label="&staff.server.admin.offline.xacts.upload.label;" disabled="true"/>
-			</hbox>
-			<tree id="session_tree" enableColumnDrag="true" seltype="single" flex="1"/>
-		</groupbox>
-			<splitter><grippy/></splitter>
-		<deck flex="1" id="deck">
-			<label value=" "/>
-			<groupbox flex="1">
-				<caption id="status_caption" label="&staff.server.admin.offline.xacts.status.label;"/>
-				<description style="background-color: lightgreen">
+  <groupbox flex="1">
+   <caption label="&staff.server.admin.offline.xacts.caption;"/>
+   <hbox>
+    <button id="refresh" label="&common.refresh;" accesskey="&staff.server.admin.offline.xacts.refresh.accesskey;"/>
+    <button id="create" label="&staff.server.admin.offline.xacts.create.label;" disabled="true"/>
+    <button id="execute" label="&staff.server.admin.offline.xacts.execute.label;" disabled="true"/>
+    <spacer flex="1"/>
+    <button id="upload" label="&staff.server.admin.offline.xacts.upload.label;" disabled="true"/>
+   </hbox>
+   <tree id="session_tree" enableColumnDrag="true" seltype="single" flex="1"/>
+  </groupbox>
+   <splitter><grippy/></splitter>
+  <deck flex="1" id="deck">
+   <label value=" "/>
+   <groupbox flex="1">
+    <caption id="status_caption" label="&staff.server.admin.offline.xacts.status.label;"/>
+    <description style="background-color: lightgreen">
                 &staff.server.admin.offline.xacts.status.desc;
-				</description>
-				<tree id="script_tree" enableColumnDrag="true" seltype="single" flex="1"/>
-			</groupbox>
-			<groupbox flex="1">
-				<caption id="errors_caption" label="&staff.server.admin.offline.xacts.errors.label;"/>
-				<description style="background-color: orange">
+    </description>
+    <tree id="script_tree" enableColumnDrag="true" seltype="single" flex="1"/>
+   </groupbox>
+   <groupbox flex="1">
+    <caption id="errors_caption" label="&staff.server.admin.offline.xacts.errors.label;"/>
+    <description style="background-color: orange">
                 &staff.server.admin.offline.xacts.errors.desc;
-				</description>
-				<vbox flex="1">
-					<hbox>
-						<button id='export_btn' label="&staff.server.admin.offline.xacts.export.label;" />
-						<button id='print_export_btn' label="&staff.server.admin.offline.xacts.print.label;" />
-						<spacer flex="1"/>
-						<button id='retrieve_item' label="&staff.server.admin.offline.xacts.get_item.label;" disabled="true"/>
-						<button id='retrieve_patron' label="&staff.server.admin.offline.xacts.get_patron.label;" disabled="true"/>
-						<button id='retrieve_details' label="&staff.server.admin.offline.xacts.get_details.label;" disabled="true"/>
-					</hbox>
-					<tree id="error_tree" enableColumnDrag="true" seltype="multiple" flex="1"/>
-				</vbox>
-			</groupbox>
-			<groupbox flex="1">
-				<caption id="errors_caption" label="&staff.server.admin.offline.xacts.errors.caption;"/>
-			</groupbox>
-		</deck>
-		<hbox id="iframe_placeholder" hidden="false" flex="0"/>
+    </description>
+    <vbox flex="1">
+     <hbox>
+      <button id='export_btn' label="&staff.server.admin.offline.xacts.export.label;" />
+      <button id='print_export_btn' label="&staff.server.admin.offline.xacts.print.label;" />
+      <spacer flex="1"/>
+      <button id='retrieve_item' label="&staff.server.admin.offline.xacts.get_item.label;" disabled="true"/>
+      <button id='retrieve_patron' label="&staff.server.admin.offline.xacts.get_patron.label;" disabled="true"/>
+      <button id='retrieve_details' label="&staff.server.admin.offline.xacts.get_details.label;" disabled="true"/>
+     </hbox>
+     <tree id="error_tree" enableColumnDrag="true" seltype="multiple" flex="1"/>
+    </vbox>
+   </groupbox>
+   <groupbox flex="1">
+    <caption id="errors_caption" label="&staff.server.admin.offline.xacts.errors.caption;"/>
+   </groupbox>
+  </deck>
+  <hbox id="iframe_placeholder" hidden="false" flex="0"/>
 
-	</vbox>
+ </vbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml b/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
index abfe28261b..b9f178a189 100644
--- a/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
@@ -14,9 +14,9 @@
 -->
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <html xmlns='http://www.w3.org/1999/xhtml'>
diff --git a/Open-ILS/xul/staff_client/server/admin/printer_settings.html b/Open-ILS/xul/staff_client/server/admin/printer_settings.html
index e9a2b02268..1c160e2c33 100644
--- a/Open-ILS/xul/staff_client/server/admin/printer_settings.html
+++ b/Open-ILS/xul/staff_client/server/admin/printer_settings.html
@@ -1,29 +1,29 @@
 <html><head>
 
-	<script type="text/javascript" src="/opac/common/js/utils.js"></script>
-	<script type="text/javascript" src="/opac/common/js/CGI.js"></script>
-	<script type="text/javascript" src="/opac/common/js/md5.js"></script>
-	<script type="text/javascript" src="/opac/common/js/JSON_v1.js"></script>
-	<script type="text/javascript" src="/opac/common/js/fmall.js"></script>
-	<script type="text/javascript" src="/opac/common/js/fmgen.js"></script>
-	<script type="text/javascript" src="/opac/common/js/RemoteRequest.js"></script>
-	<script type='text/javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'></script>
-	<script type="text/javascript" src="/opac/common/js/org_utils.js"></script>
+ <script type="text/javascript" src="/opac/common/js/utils.js"></script>
+ <script type="text/javascript" src="/opac/common/js/CGI.js"></script>
+ <script type="text/javascript" src="/opac/common/js/md5.js"></script>
+ <script type="text/javascript" src="/opac/common/js/JSON_v1.js"></script>
+ <script type="text/javascript" src="/opac/common/js/fmall.js"></script>
+ <script type="text/javascript" src="/opac/common/js/fmgen.js"></script>
+ <script type="text/javascript" src="/opac/common/js/RemoteRequest.js"></script>
+ <script type='text/javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'></script>
+ <script type="text/javascript" src="/opac/common/js/org_utils.js"></script>
 
-	<script type="text/javascript" src="/xul/server/OpenILS/global_util.js"></script>
-	<script type="text/javascript" src="/xul/server/main/constants.js"></script>
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"></script>
-	<script type="text/javascript" src="printer_settings.js"></script>
+ <script type="text/javascript" src="/xul/server/OpenILS/global_util.js"></script>
+ <script type="text/javascript" src="/xul/server/main/constants.js"></script>
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"></script>
+ <script type="text/javascript" src="printer_settings.js"></script>
 </head><body onload="try { my_init(); } catch(E) { alert(E); }" style="background: white;">
-	<h1>Normal Settings</h1>
-	<iframe id="sample" src="printer_settings.txt"></iframe><br />
-	<button onclick="try { g.printer_settings(); } catch(E) { alert(E); }">Set Default Printer and Print Test Page</button>
-	<button onclick="try { g.page_settings(); } catch(E) { alert(E); }">Page Settings</button><br />
-	<h1>Advanced Settings</h1>
-	<button onclick="try { g.set_print_strategy('webBrowserPrint'); } catch(E) { alert(E); }">Use default print strategy (Mozilla Print)</button>
-	<button onclick="try { g.set_print_strategy('dos.print'); } catch(E) { alert(E); }">Use alternate print strategy (DOS LPT1 Print)</button>
-	<p>
-		<b>Warning:</b> The alternate (DOS LPT1) print strategy will ignore the printer settings made in the "Normal Settings" section.  In Windows, you must map your printer to the LPT1 port, under Start Menu -&gt; Printers and Faxes -&gt; your printer -&gt; right-click, Properties -&gt; Ports.  Also, HTML styling such as different font weights and sizes will be lost when using the DOS LPT1 print.  Data is sent to the printer as simple text in this case.
-	</p>
+ <h1>Normal Settings</h1>
+ <iframe id="sample" src="printer_settings.txt"></iframe><br />
+ <button onclick="try { g.printer_settings(); } catch(E) { alert(E); }">Set Default Printer and Print Test Page</button>
+ <button onclick="try { g.page_settings(); } catch(E) { alert(E); }">Page Settings</button><br />
+ <h1>Advanced Settings</h1>
+ <button onclick="try { g.set_print_strategy('webBrowserPrint'); } catch(E) { alert(E); }">Use default print strategy (Mozilla Print)</button>
+ <button onclick="try { g.set_print_strategy('dos.print'); } catch(E) { alert(E); }">Use alternate print strategy (DOS LPT1 Print)</button>
+ <p>
+  <b>Warning:</b> The alternate (DOS LPT1) print strategy will ignore the printer settings made in the "Normal Settings" section.  In Windows, you must map your printer to the LPT1 port, under Start Menu -&gt; Printers and Faxes -&gt; your printer -&gt; right-click, Properties -&gt; Ports.  Also, HTML styling such as different font weights and sizes will be lost when using the DOS LPT1 print.  Data is sent to the printer as simple text in this case.
+ </p>
 </body></html>
 
diff --git a/Open-ILS/xul/staff_client/server/admin/printer_settings.js b/Open-ILS/xul/staff_client/server/admin/printer_settings.js
index fc60b49368..58075cc3e6 100644
--- a/Open-ILS/xul/staff_client/server/admin/printer_settings.js
+++ b/Open-ILS/xul/staff_client/server/admin/printer_settings.js
@@ -1,50 +1,50 @@
 var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
 
 function my_init() {
-	try {
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
-		JSAN.errorLevel = "die"; // none, warn, or die
-		JSAN.addRepository('/xul/server/');
-		JSAN.use('util.error'); g.error = new util.error();
-		g.error.sdump('D_TRACE','my_init() for printer_settings.xul');
-
-		JSAN.use('util.print'); g.print = new util.print();
-
-		/*
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		g.PSSVC = Components.classes["@mozilla.org/gfx/printsettings-service;1"].getService(Components.interfaces.nsIPrintSettingsService);
-		g.PO = Components.classes["@mozilla.org/gfx/printsettings-service;1"].getService(Components.interfaces.nsIPrintOptions);
-		g.PPSVC = Components.classes["@mozilla.org/embedcomp/printingprompt-service;1"].getService(Components.interfaces.nsIPrintingPromptService);
-		g.settings = g.PSSVC.globalPrintSettings;
-		*/
-
-	} catch(E) {
-		try { g.error.standard_unexpected_error_dialog('admin/printer_settings.xul',E); } catch(F) { alert(E); }
-	}
+ try {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
+  JSAN.errorLevel = "die"; // none, warn, or die
+  JSAN.addRepository('/xul/server/');
+  JSAN.use('util.error'); g.error = new util.error();
+  g.error.sdump('D_TRACE','my_init() for printer_settings.xul');
+
+  JSAN.use('util.print'); g.print = new util.print();
+
+  /*
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  g.PSSVC = Components.classes["@mozilla.org/gfx/printsettings-service;1"].getService(Components.interfaces.nsIPrintSettingsService);
+  g.PO = Components.classes["@mozilla.org/gfx/printsettings-service;1"].getService(Components.interfaces.nsIPrintOptions);
+  g.PPSVC = Components.classes["@mozilla.org/embedcomp/printingprompt-service;1"].getService(Components.interfaces.nsIPrintingPromptService);
+  g.settings = g.PSSVC.globalPrintSettings;
+  */
+
+ } catch(E) {
+  try { g.error.standard_unexpected_error_dialog('admin/printer_settings.xul',E); } catch(F) { alert(E); }
+ }
 }
 
 g.page_settings = function() {
-	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-	g.print.page_settings();
-	g.print.save_settings();
+ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ g.print.page_settings();
+ g.print.save_settings();
 }
 
 g.printer_settings = function() {
-	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-	var w = get_contentWindow(document.getElementById('sample'));
-	g.print.NSPrint(w ? w : window, false, {});
-	g.print.save_settings();
+ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ var w = get_contentWindow(document.getElementById('sample'));
+ g.print.NSPrint(w ? w : window, false, {});
+ g.print.save_settings();
 }
 
 g.set_print_strategy = function(which) {
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-	JSAN.use('util.file'); var file = new util.file('print_strategy');
-	file.write_content( 'truncate', String( which ) );
-	file.close();
-	JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-	data.print_strategy = which; data.stash('print_strategy');
-	alert('Print strategy (' + which + ') saved to file system.');
+ netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+ JSAN.use('util.file'); var file = new util.file('print_strategy');
+ file.write_content( 'truncate', String( which ) );
+ file.close();
+ JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+ data.print_strategy = which; data.stash('print_strategy');
+ alert('Print strategy (' + which + ') saved to file system.');
 }
 
 g.save_settings = function() { g.print.save_settings(); }
diff --git a/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.js b/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.js
index b67326cec5..77ff36a9ec 100644
--- a/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.js
+++ b/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.js
@@ -1,27 +1,27 @@
-var SC_FETCH_ALL		= 'open-ils.circ:open-ils.circ.stat_cat.TYPE.retrieve.all';
-var SC_CREATE			= 'open-ils.circ:open-ils.circ.stat_cat.TYPE.create';
-var SC_UPDATE			= 'open-ils.circ:open-ils.circ.stat_cat.TYPE.update';
-var SC_DELETE			= 'open-ils.circ:open-ils.circ.stat_cat.TYPE.delete';
-var SC_ENTRY_CREATE	= 'open-ils.circ:open-ils.circ.stat_cat.TYPE.entry.create';
-var SC_ENTRY_UPDATE	= 'open-ils.circ:open-ils.circ.stat_cat.TYPE.entry.update';
-var SC_ENTRY_DELETE	= 'open-ils.circ:open-ils.circ.stat_cat.TYPE.entry.delete';
-
-var ACTOR				= 'actor';
-var ASSET				= 'asset';
-var session				= null;
-var user					= null;
-
-var scCache				= {};
-var PERMS				= {};
-PERMS[ACTOR]			= {};
-PERMS[ASSET]			= {};
+var SC_FETCH_ALL  = 'open-ils.circ:open-ils.circ.stat_cat.TYPE.retrieve.all';
+var SC_CREATE   = 'open-ils.circ:open-ils.circ.stat_cat.TYPE.create';
+var SC_UPDATE   = 'open-ils.circ:open-ils.circ.stat_cat.TYPE.update';
+var SC_DELETE   = 'open-ils.circ:open-ils.circ.stat_cat.TYPE.delete';
+var SC_ENTRY_CREATE = 'open-ils.circ:open-ils.circ.stat_cat.TYPE.entry.create';
+var SC_ENTRY_UPDATE = 'open-ils.circ:open-ils.circ.stat_cat.TYPE.entry.update';
+var SC_ENTRY_DELETE = 'open-ils.circ:open-ils.circ.stat_cat.TYPE.entry.delete';
+
+var ACTOR    = 'actor';
+var ASSET    = 'asset';
+var session    = null;
+var user     = null;
+
+var scCache    = {};
+var PERMS    = {};
+PERMS[ACTOR]   = {};
+PERMS[ASSET]   = {};
 
 var currentlyVisible;
-var opacVisible		= false;
+var opacVisible  = false;
 var cgi;
 var focusOrg;
 
-var myPerms = [	
+var myPerms = [ 
     'CREATE_PATRON_STAT_CAT',
     'UPDATE_PATRON_STAT_CAT',
     'DELETE_PATRON_STAT_CAT',
@@ -53,9 +53,9 @@ function scSetPerms() {
     PERMS[ASSET].delete_stat_cat_entry =  OILS_WORK_PERMS.DELETE_COPY_STAT_CAT_ENTRY;
 
     // set up the fitler select
-	var fselector = $('sc_org_filter');
+ var fselector = $('sc_org_filter');
     var org_list = PERMS[currentlyVisible].update_stat_cat;
-	buildMergedOrgSel(fselector, org_list, 0, 'shortname');
+ buildMergedOrgSel(fselector, org_list, 0, 'shortname');
     var org = findOrgUnit(org_list[0]);
     if(org_list.length > 1 || (org.children() &&  org.children()[0])) 
         fselector.disabled = false;
@@ -72,187 +72,187 @@ function scSetPerms() {
 }
 
 function scEditorInit() {
-	cgi = new CGI();
-	session = cgi.param('ses');
-	if(!session) throw "User session is not defined";
-	user = fetchUser(session);
+ cgi = new CGI();
+ session = cgi.param('ses');
+ if(!session) throw "User session is not defined";
+ user = fetchUser(session);
     $('sc_type_selector').onchange = scBuildNew;
-	setTimeout( 
+ setTimeout( 
         function() { 
-	        fetchHighestWorkPermOrgs(
+         fetchHighestWorkPermOrgs(
                 session, user.id(), myPerms, function(){scGo();});
         }, 20 );
 }
 
 
 function scGo() {
-	var show = cgi.param('show');
-	if(!show) currentlyVisible = ASSET;
+ var show = cgi.param('show');
+ if(!show) currentlyVisible = ASSET;
     scSetPerms();
-	scShow(currentlyVisible);
-	scBuildNew();
-	$('sc_user').appendChild(text(user.usrname()));
+ scShow(currentlyVisible);
+ scBuildNew();
+ $('sc_user').appendChild(text(user.usrname()));
 }
 
 function scFetchAll( session, type, orgid, callback, args ) {
-	var req = new Request( 
-		SC_FETCH_ALL.replace(/TYPE/, type) , session, orgid );
-	req.send(true);
-	return req.result();
+ var req = new Request( 
+  SC_FETCH_ALL.replace(/TYPE/, type) , session, orgid );
+ req.send(true);
+ return req.result();
 }
 
 function scShow(type) { 
-	setTimeout(function(){_scShow(type)}, 500);
+ setTimeout(function(){_scShow(type)}, 500);
 }
 
 function _scShow(type) { 
 
-	currentlyVisible = type;
+ currentlyVisible = type;
 
-	if( type == ASSET ) {
-		addCSSClass($('sc_show_copy'), 'has_color');
-		removeCSSClass($('sc_show_actor'), 'has_color');
+ if( type == ASSET ) {
+  addCSSClass($('sc_show_copy'), 'has_color');
+  removeCSSClass($('sc_show_actor'), 'has_color');
 
-	} else if( type == ACTOR ) {
-		addCSSClass($('sc_show_actor'), 'has_color');
-		removeCSSClass($('sc_show_copy'), 'has_color');
-	}
+ } else if( type == ACTOR ) {
+  addCSSClass($('sc_show_actor'), 'has_color');
+  removeCSSClass($('sc_show_copy'), 'has_color');
+ }
 
-	scCache[type] = scFetchAll(session, type, focusOrg);   /* XXX */
-	scDraw( type, scCache[type] );
+ scCache[type] = scFetchAll(session, type, focusOrg);   /* XXX */
+ scDraw( type, scCache[type] );
 }
 
 var scRow; var scCounter;
 function scDraw( type, cats ) {
 
-	hideMe($('loading'));
+ hideMe($('loading'));
 
-	var tbody = $('sc_tbody');
-	if(!scRow) scRow = tbody.removeChild($('sc_tr'));
-	removeChildren(tbody);
+ var tbody = $('sc_tbody');
+ if(!scRow) scRow = tbody.removeChild($('sc_tr'));
+ removeChildren(tbody);
 
-	if(!cats || cats.length == 0) {
-		hideMe($('sc_table'));
-		unHideMe($('sc_none'));
-		return;
-	}
+ if(!cats || cats.length == 0) {
+  hideMe($('sc_table'));
+  unHideMe($('sc_none'));
+  return;
+ }
 
-	hideMe($('sc_none'));
-	unHideMe($('sc_table'));
+ hideMe($('sc_none'));
+ unHideMe($('sc_table'));
 
-	scCounter = 0;
-	for( var c in cats ) scInsertCat( tbody, cats[c], type );
+ scCounter = 0;
+ for( var c in cats ) scInsertCat( tbody, cats[c], type );
 }
 
 
 var scEntryCounter;
 function scInsertCat( tbody, cat, type ) {
 
-	var row = scRow.cloneNode(true);
-	row.id = 'sc_tr_' + cat.id();
-	var name_td = $n(row, 'sc_name');
-	name_td.appendChild( text(cat.name()) );
-	if(scCounter++ % 2) addCSSClass(row, 'has_color');
+ var row = scRow.cloneNode(true);
+ row.id = 'sc_tr_' + cat.id();
+ var name_td = $n(row, 'sc_name');
+ name_td.appendChild( text(cat.name()) );
+ if(scCounter++ % 2) addCSSClass(row, 'has_color');
 
-	$n(row, 'sc_new_entry').onclick = function() { scNewEntry(type, cat, tbody); }
-	$n(row, 'sc_edit').onclick = function(){ scEdit(tbody, type, cat); };
-	$n(row, 'sc_owning_lib').appendChild( text( findOrgUnit(cat.owner()).name() ));
+ $n(row, 'sc_new_entry').onclick = function() { scNewEntry(type, cat, tbody); }
+ $n(row, 'sc_edit').onclick = function(){ scEdit(tbody, type, cat); };
+ $n(row, 'sc_owning_lib').appendChild( text( findOrgUnit(cat.owner()).name() ));
 
-	if( cat.opac_visible() != 0 && cat.opac_visible() != '0' ) unHideMe($n(row, 'sc_opac_visible'));
-	else unHideMe($n(row, 'sc_opac_invisible'));
+ if( cat.opac_visible() != 0 && cat.opac_visible() != '0' ) unHideMe($n(row, 'sc_opac_visible'));
+ else unHideMe($n(row, 'sc_opac_invisible'));
 
-	tbody.appendChild(row);
-	scEntryCounter = 0;
+ tbody.appendChild(row);
+ scEntryCounter = 0;
 
-	cat.entries().sort(  /* sort the entries by value */
-		function( a, b ) { 
+ cat.entries().sort(  /* sort the entries by value */
+  function( a, b ) { 
          a = new String(a.value()).toLowerCase();
          b = new String(b.value()).toLowerCase();
-			if( a > b ) return 1;
-			if( a < b ) return -1;
-			return 0;
-		}
-	);
-
-	for( var e in cat.entries() ) 
-		scInsertEntry( cat, cat.entries()[e], $n(row, 'sc_entries_selector'), tbody, type );
+   if( a > b ) return 1;
+   if( a < b ) return -1;
+   return 0;
+  }
+ );
+
+ for( var e in cat.entries() ) 
+  scInsertEntry( cat, cat.entries()[e], $n(row, 'sc_entries_selector'), tbody, type );
 }
 
 
 function scInsertEntry( cat, entry, selector, tbody, type ) {
-	setSelectorVal( selector, scEntryCounter++, entry.value(), entry.id(), 
-			function(){ scUpdateEntry( cat, entry, tbody, type );} );
+ setSelectorVal( selector, scEntryCounter++, entry.value(), entry.id(), 
+   function(){ scUpdateEntry( cat, entry, tbody, type );} );
 }
 
 
 
 function scDelete(type, id) {
-	if(!confirm($('sc_delete_confirm').innerHTML)) return;
-	var req = new Request( SC_DELETE.replace(/TYPE/,type), session, id );
-	req.send(true);
-	var res = req.result();
-	if(checkILSEvent(res)) throw res;
-	alertId('sc_update_success');
-	scShow(type);
+ if(!confirm($('sc_delete_confirm').innerHTML)) return;
+ var req = new Request( SC_DELETE.replace(/TYPE/,type), session, id );
+ req.send(true);
+ var res = req.result();
+ if(checkILSEvent(res)) throw res;
+ alertId('sc_update_success');
+ scShow(type);
 }
 
 function scCreateEntry( type, id, row ) {
-	var value = $n(row, 'sc_new_entry_name').value;
-	if(!value) return;
-	var entry;
-	if( type == ACTOR ) entry = new actsce();
-	if( type == ASSET ) entry = new asce();
-
-	entry.isnew(1);
-	entry.stat_cat(id);
-	entry.owner(getSelectorVal($n(row, 'sc_new_entry_lib')));
-	entry.value(value);
-
-	var req = new Request( SC_ENTRY_CREATE.replace(/TYPE/, type), session, entry );
-	req.send(true);
-	var res = req.result();
-	if(checkILSEvent(res)) throw res;
-	alertId('sc_update_success');
-	scShow(type);
+ var value = $n(row, 'sc_new_entry_name').value;
+ if(!value) return;
+ var entry;
+ if( type == ACTOR ) entry = new actsce();
+ if( type == ASSET ) entry = new asce();
+
+ entry.isnew(1);
+ entry.stat_cat(id);
+ entry.owner(getSelectorVal($n(row, 'sc_new_entry_lib')));
+ entry.value(value);
+
+ var req = new Request( SC_ENTRY_CREATE.replace(/TYPE/, type), session, entry );
+ req.send(true);
+ var res = req.result();
+ if(checkILSEvent(res)) throw res;
+ alertId('sc_update_success');
+ scShow(type);
 }
 
 function scNewEntry( type, cat, tbody ) {
-	cleanTbody(tbody, 'edit');
-	var row = $('sc_new_entry_row').cloneNode(true);
-	row.setAttribute('edit', '1');
+ cleanTbody(tbody, 'edit');
+ var row = $('sc_new_entry_row').cloneNode(true);
+ row.setAttribute('edit', '1');
 
-	var r = $('sc_tr_' + cat.id());
-	if(r.nextSibling) tbody.insertBefore( row, r.nextSibling );
-	else{ tbody.appendChild(row); }
+ var r = $('sc_tr_' + cat.id());
+ if(r.nextSibling) tbody.insertBefore( row, r.nextSibling );
+ else{ tbody.appendChild(row); }
 
-	$n(row, 'sc_new_entry_create').onclick = 
-		function() {
-			if( scCreateEntry( type, cat.id(), row ) )
-				tbody.removeChild(row); };
-	$n(row, 'sc_new_entry_cancel').onclick = function(){tbody.removeChild(row);}
+ $n(row, 'sc_new_entry_create').onclick = 
+  function() {
+   if( scCreateEntry( type, cat.id(), row ) )
+    tbody.removeChild(row); };
+ $n(row, 'sc_new_entry_cancel').onclick = function(){tbody.removeChild(row);}
 
     var org_list = PERMS[type].create_stat_cat_entry;
     if(org_list.length == 0) {
-		$n(row, 'sc_new_entry_create').disabled = true;
-		$n(row, 'sc_new_entry_lib').disabled = true;
-		return;
+  $n(row, 'sc_new_entry_create').disabled = true;
+  $n(row, 'sc_new_entry_lib').disabled = true;
+  return;
     }
 
     var rootOrg = findReleventRootOrg(org_list, cat.owner());
     if(!rootOrg) {
-		$n(row, 'sc_new_entry_create').disabled = true;
-		$n(row, 'sc_new_entry_lib').disabled = true;
-		return;
+  $n(row, 'sc_new_entry_create').disabled = true;
+  $n(row, 'sc_new_entry_lib').disabled = true;
+  return;
     }
     buildOrgSel($n(row, 'sc_new_entry_lib'), rootOrg, 0, 'shortname');
-	$n(row, 'sc_new_entry_name').focus();
+ $n(row, 'sc_new_entry_name').focus();
 }
 
 
 function scBuildNew() {
     var libSel = $('sc_owning_lib_selector');
     var typeSel = $('sc_type_selector');
-	var type = getSelectorVal(typeSel);
+ var type = getSelectorVal(typeSel);
     var org_list = PERMS[type].create_stat_cat;
     if(org_list.length == 0) { /* no create perms */
         $('sc_new').disabled = true;
@@ -260,180 +260,180 @@ function scBuildNew() {
         libSel.disabled = true;
         return;
     }
-	buildMergedOrgSel(libSel, org_list, 0, 'shortname');
+ buildMergedOrgSel(libSel, org_list, 0, 'shortname');
 }
 
 
 function scNew() {
 
-	var name = $('sc_new_name').value;
-	var type = getSelectorVal($('sc_type_selector'));
+ var name = $('sc_new_name').value;
+ var type = getSelectorVal($('sc_type_selector'));
 
-	var visible = 0;
-	if( $('sc_make_opac_visible').checked) visible = 1;
+ var visible = 0;
+ if( $('sc_make_opac_visible').checked) visible = 1;
 
-	var cat;
-	if( type == ACTOR ) cat = new actsc();
-	if( type == ASSET ) cat = new asc();
+ var cat;
+ if( type == ACTOR ) cat = new actsc();
+ if( type == ASSET ) cat = new asc();
 
-	cat.opac_visible(visible);
-	cat.name(name);
-	cat.owner(getSelectorVal($('sc_owning_lib_selector')));
-	cat.isnew(1);
+ cat.opac_visible(visible);
+ cat.name(name);
+ cat.owner(getSelectorVal($('sc_owning_lib_selector')));
+ cat.isnew(1);
 
-	var req = new Request( SC_CREATE.replace(/TYPE/, type), session, cat );
+ var req = new Request( SC_CREATE.replace(/TYPE/, type), session, cat );
 
-	req.send(true);
-	var res = req.result();
-	if(checkILSEvent(res)) throw res;
-	alertId('sc_update_success');
+ req.send(true);
+ var res = req.result();
+ if(checkILSEvent(res)) throw res;
+ alertId('sc_update_success');
 
-	scShow(type);
+ scShow(type);
 }
 
 function scEdit( tbody, type, cat ) {
 
-	cleanTbody(tbody, 'edit');
-	var row = $('sc_edit_row').cloneNode(true);
-	row.setAttribute('edit', '1');
+ cleanTbody(tbody, 'edit');
+ var row = $('sc_edit_row').cloneNode(true);
+ row.setAttribute('edit', '1');
 
-	var r = $('sc_tr_' + cat.id());
-	if(r.nextSibling) { tbody.insertBefore( row, r.nextSibling ); }
-	else{ tbody.appendChild(row); }
+ var r = $('sc_tr_' + cat.id());
+ if(r.nextSibling) { tbody.insertBefore( row, r.nextSibling ); }
+ else{ tbody.appendChild(row); }
 
-	$n(row, 'sc_edit_name').value = cat.name();
+ $n(row, 'sc_edit_name').value = cat.name();
 
-	var name = $n(row, 'sc_edit_cancel');
-	name.onclick = function() { tbody.removeChild(row); };
+ var name = $n(row, 'sc_edit_cancel');
+ name.onclick = function() { tbody.removeChild(row); };
 
-	var show = $n(row, 'sc_edit_show_owning_lib');
-	
-	var myorg = findOrgUnit(user.home_ou());
-	var ownerorg = findOrgUnit(cat.owner());
-	show.appendChild(text(ownerorg.name()));
+ var show = $n(row, 'sc_edit_show_owning_lib');
+ 
+ var myorg = findOrgUnit(user.home_ou());
+ var ownerorg = findOrgUnit(cat.owner());
+ show.appendChild(text(ownerorg.name()));
 
-	var selector = null;
-	if( myorg.children() && myorg.children().length > 0 ) {
-		selector = $n(row, 'sc_edit_owning_lib');
-		buildOrgSel( selector, myorg, findOrgDepth(myorg), 'shortname');
-		setSelector( selector, cat.owner() );
-		unHideMe(selector);
+ var selector = null;
+ if( myorg.children() && myorg.children().length > 0 ) {
+  selector = $n(row, 'sc_edit_owning_lib');
+  buildOrgSel( selector, myorg, findOrgDepth(myorg), 'shortname');
+  setSelector( selector, cat.owner() );
+  unHideMe(selector);
 
-	} else { unHideMe(show); }
+ } else { unHideMe(show); }
 
-	name.focus();
-	name.select();
+ name.focus();
+ name.select();
 
-	if( cat.opac_visible() != 0 && cat.opac_visible() != '0' ) {
-		$n( $n(row, 'sc_edit_opac_vis'), 
-			'sc_edit_opac_visibility').checked = true;
-	} else {
-		$n( $n(row, 'sc_edit_opac_invis'), 
-			'sc_edit_opac_visibility').checked = true;
+ if( cat.opac_visible() != 0 && cat.opac_visible() != '0' ) {
+  $n( $n(row, 'sc_edit_opac_vis'), 
+   'sc_edit_opac_visibility').checked = true;
+ } else {
+  $n( $n(row, 'sc_edit_opac_invis'), 
+   'sc_edit_opac_visibility').checked = true;
     }
 
-	$n(row, 'sc_edit_submit').onclick = 
-		function() { scEditGo( type, cat, row, selector ); };
+ $n(row, 'sc_edit_submit').onclick = 
+  function() { scEditGo( type, cat, row, selector ); };
 
-	$n(row, 'sc_edit_delete').onclick = 
-		function(){ scDelete(type, cat.id()); };
+ $n(row, 'sc_edit_delete').onclick = 
+  function(){ scDelete(type, cat.id()); };
 
     var rootEditOrg = findReleventRootOrg(PERMS[type].update_stat_cat, cat.owner());
     var rootDelOrg = findReleventRootOrg(PERMS[type].delete_stat_cat, cat.owner());
 
     if(!rootEditOrg || rootEditOrg.id() != cat.owner())
-		$n(row,'sc_edit_submit').disabled = true;
+  $n(row,'sc_edit_submit').disabled = true;
 
     if(!rootDelOrg || rootDelOrg.id() != cat.owner())
-		$n(row,'sc_edit_delete').disabled = true;
+  $n(row,'sc_edit_delete').disabled = true;
 }
 
 function scEditGo( type, cat, row, selector ) {
-	var name = $n(row, 'sc_edit_name').value;
-	var visible = 
-		$n( $n(row, 'sc_edit_opac_vis'), 'sc_edit_opac_visibility').checked;
+ var name = $n(row, 'sc_edit_name').value;
+ var visible = 
+  $n( $n(row, 'sc_edit_opac_vis'), 'sc_edit_opac_visibility').checked;
 
-	var newlib = cat.owner();
-	if(selector) newlib = getSelectorVal( selector );
+ var newlib = cat.owner();
+ if(selector) newlib = getSelectorVal( selector );
 
-	if(!name) return false;
+ if(!name) return false;
 
-	var isvisible = false;
-	if( cat.opac_visible() != 0 && cat.opac_visible() != '0' ) isvisible = true;
+ var isvisible = false;
+ if( cat.opac_visible() != 0 && cat.opac_visible() != '0' ) isvisible = true;
 
-	if( (name == cat.name()) && (visible == isvisible) 
-		&& (newlib == cat.owner()) ) { return true; }
+ if( (name == cat.name()) && (visible == isvisible) 
+  && (newlib == cat.owner()) ) { return true; }
 
-	cat.name( name );
-	cat.owner( newlib );
-	cat.entries(null);
-	cat.opac_visible(0);
-	if( visible ) cat.opac_visible(1);
+ cat.name( name );
+ cat.owner( newlib );
+ cat.entries(null);
+ cat.opac_visible(0);
+ if( visible ) cat.opac_visible(1);
 
-	var req = new Request( SC_UPDATE.replace(/TYPE/,type), session, cat );
-	req.send(true);
-	var res = req.result();
-	if(checkILSEvent(res)) throw res;
-	alertId('sc_update_success');
-	scShow(type);
+ var req = new Request( SC_UPDATE.replace(/TYPE/,type), session, cat );
+ req.send(true);
+ var res = req.result();
+ if(checkILSEvent(res)) throw res;
+ alertId('sc_update_success');
+ scShow(type);
 
-	return true;
+ return true;
 }
 
 function scUpdateEntry( cat, entry, tbody, type ) {
-	cleanTbody(tbody, 'edit');
-	var row = $('sc_edit_entry_row').cloneNode(true);
-	row.setAttribute('edit', '1');
+ cleanTbody(tbody, 'edit');
+ var row = $('sc_edit_entry_row').cloneNode(true);
+ row.setAttribute('edit', '1');
 
-	var r = $('sc_tr_' + cat.id());
-	if(r.nextSibling) tbody.insertBefore( row, r.nextSibling );
-	else{ tbody.appendChild(row); }
+ var r = $('sc_tr_' + cat.id());
+ if(r.nextSibling) tbody.insertBefore( row, r.nextSibling );
+ else{ tbody.appendChild(row); }
 
-	$n(row, 'sc_edit_entry_owner').appendChild(text(findOrgUnit(entry.owner()).name()));
+ $n(row, 'sc_edit_entry_owner').appendChild(text(findOrgUnit(entry.owner()).name()));
 
-	var name = $n(row, 'sc_edit_entry_name');
-	name.value = entry.value();
-	name.focus();
-	name.select();
+ var name = $n(row, 'sc_edit_entry_name');
+ name.value = entry.value();
+ name.focus();
+ name.select();
 
-	$n(row,'sc_edit_entry_name_submit').onclick = 
-		function(){
-			if( scEditEntry(cat, entry, name.value, type ) )
-				tbody.removeChild(row);
-			};
+ $n(row,'sc_edit_entry_name_submit').onclick = 
+  function(){
+   if( scEditEntry(cat, entry, name.value, type ) )
+    tbody.removeChild(row);
+   };
 
-	$n(row,'sc_edit_entry_cancel').onclick = function(){tbody.removeChild(row);};
-	$n(row,'sc_edit_entry_delete').onclick = 
-		function(){ scEntryDelete( cat, entry, type ); }
+ $n(row,'sc_edit_entry_cancel').onclick = function(){tbody.removeChild(row);};
+ $n(row,'sc_edit_entry_delete').onclick = 
+  function(){ scEntryDelete( cat, entry, type ); }
 
     var rootEditOrg = findReleventRootOrg(PERMS[type].update_stat_cat_entry, entry.owner());
     var rootDelOrg = findReleventRootOrg(PERMS[type].delete_stat_cat_entry, entry.owner());
 
     if(!rootEditOrg || rootEditOrg.id() != entry.owner())
-		$n(row,'sc_edit_submit').disabled = true;
+  $n(row,'sc_edit_submit').disabled = true;
 
     if(!rootDelOrg || rootDelOrg.id() != entry.owner())
-		$n(row,'sc_edit_delete').disabled = true;
+  $n(row,'sc_edit_delete').disabled = true;
 }
 
 function scEntryDelete( cat, entry, type ) {
-	if(!confirm($('sc_entry_delete_confirm').innerHTML)) return;
-	var req = new Request( SC_ENTRY_DELETE.replace(/TYPE/,type), session, entry.id() );
-	req.send(true);
-	var res = req.result();
-	if(checkILSEvent(res)) throw res;
-	alertId('sc_update_success');
-	scShow(type);
+ if(!confirm($('sc_entry_delete_confirm').innerHTML)) return;
+ var req = new Request( SC_ENTRY_DELETE.replace(/TYPE/,type), session, entry.id() );
+ req.send(true);
+ var res = req.result();
+ if(checkILSEvent(res)) throw res;
+ alertId('sc_update_success');
+ scShow(type);
 }
 
 function scEditEntry( cat, entry, newvalue, type ) {
-	if(entry.value() == newvalue) return;
-	entry.value( newvalue );
-	var req = new Request( 
-		SC_ENTRY_UPDATE.replace(/TYPE/, type), session, entry );
-	req.send(true);
-	var res = req.result();
-	if(checkILSEvent(res)) throw res;
-	scShow(type);
+ if(entry.value() == newvalue) return;
+ entry.value( newvalue );
+ var req = new Request( 
+  SC_ENTRY_UPDATE.replace(/TYPE/, type), session, entry );
+ req.send(true);
+ var res = req.result();
+ if(checkILSEvent(res)) throw res;
+ scShow(type);
 }
 
diff --git a/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml b/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml
index bfa76d69d1..ca928cd43b 100644
--- a/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml
@@ -1,254 +1,254 @@
 <?xml version='1.0' encoding="UTF-8"?>
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
 
-	<head>
-		<title>&staff.server.admin.stat_cat.title;</title>
-		<script language='javascript' src='/opac/common/js/utils.js'> </script>
-		<script language='javascript' src='/opac/common/js//config.js'> </script> 
-		<script language='javascript' src='/opac/common/js/CGI.js'> </script>
-		<script language='javascript' src='/opac/common/js/Cookie.js'> </script>
-	
-		<script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
-		<script language='javascript' src='/opac/common/js/fmall.js'> </script>
-		<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
-		<script language='javascript' src='/opac/common/js/Cookies.js'> </script>
-		<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
-		<script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
-		<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
-		<script language='javascript' src='/opac/common/js/init.js'> </script>
-		<script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
-		<script language='javascript' src='adminlib.js'> </script>
-		<script language='javascript' src='stat_cat_editor.js'> </script>
-		<link type='text/css' rel='stylesheet' href='admin.css'/>
-	</head>
-
-	<body onload='try{scEditorInit();}catch(e){alert(js2JSON(e));}'>
-
-
-		<div style='position:absolute; top: 5px; right: 5px;'>
-			<span>&staff.server.admin.stat_cat.greeting;</span><b><span id='sc_user'/></b>
-		</div>
-
-		<center>
-			<div style='font-weight: bold; font-size: 12pt;'>&staff.server.admin.stat_cat.heading;</div>
-		</center>
-
-		<hr/> 
-
-
-		<center>
-			<br/>
-
-
-			<table class='data_grid data_grid_center' width='80%'>
-				<thead>
-					<tr>
-						<td colspan='4'>&staff.server.admin.stat_cat.create;</td>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>&staff.server.admin.stat_cat.name;</td>
-						<td>
-							<input type='text' id='sc_new_name'> </input>
-							<script>$('sc_new_name').focus();</script>
-						</td>
-						<td>&staff.server.admin.stat_cat.owning_library;</td>
-						<td>
-							<select id='sc_owning_lib_selector'>
-							</select>
-						</td>
-					</tr>
-					<tr>
-						<td>&staff.server.admin.stat_cat.opac_visibility;</td>
-						<td>	
-							<span>&staff.server.admin.stat_cat.on;</span>
-							<input type='radio' name='opac_visibility' id='sc_make_opac_visible'> </input>
-							<span>&staff.server.admin.stat_cat.off;</span>
-							<input type='radio' name='opac_visibility' checked='checked'> </input>
-						</td>
-						<td>&staff.server.admin.stat_cat.type;</td>
-						<td>
-							<select id='sc_type_selector'>
-								<option value='asset' selected='selected'>&staff.server.admin.stat_cat.copy;</option>
-								<option value='actor'>&staff.server.admin.stat_cat.patron;</option>
-							</select>
-						</td>
-					</tr>
-					<tr>
-						<td colspan='4'>
-							<input type='submit' value='&staff.server.admin.stat_cat.create.submit;' onclick='scNew();' id='sc_new'/>
-						</td>
-					</tr>
-				</tbody>
-			</table>
-
-			<br/>
-			<hr/>
-			<br/>
+ <head>
+  <title>&staff.server.admin.stat_cat.title;</title>
+  <script language='javascript' src='/opac/common/js/utils.js'> </script>
+  <script language='javascript' src='/opac/common/js//config.js'> </script> 
+  <script language='javascript' src='/opac/common/js/CGI.js'> </script>
+  <script language='javascript' src='/opac/common/js/Cookie.js'> </script>
+ 
+  <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
+  <script language='javascript' src='/opac/common/js/fmall.js'> </script>
+  <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
+  <script language='javascript' src='/opac/common/js/Cookies.js'> </script>
+  <script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
+  <script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
+  <script language='javascript' src='/opac/common/js/org_utils.js'> </script>
+  <script language='javascript' src='/opac/common/js/init.js'> </script>
+  <script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
+  <script language='javascript' src='adminlib.js'> </script>
+  <script language='javascript' src='stat_cat_editor.js'> </script>
+  <link type='text/css' rel='stylesheet' href='admin.css'/>
+ </head>
+
+ <body onload='try{scEditorInit();}catch(e){alert(js2JSON(e));}'>
+
+
+  <div style='position:absolute; top: 5px; right: 5px;'>
+   <span>&staff.server.admin.stat_cat.greeting;</span><b><span id='sc_user'/></b>
+  </div>
+
+  <center>
+   <div style='font-weight: bold; font-size: 12pt;'>&staff.server.admin.stat_cat.heading;</div>
+  </center>
+
+  <hr/> 
+
+
+  <center>
+   <br/>
+
+
+   <table class='data_grid data_grid_center' width='80%'>
+    <thead>
+     <tr>
+      <td colspan='4'>&staff.server.admin.stat_cat.create;</td>
+     </tr>
+    </thead>
+    <tbody>
+     <tr>
+      <td>&staff.server.admin.stat_cat.name;</td>
+      <td>
+       <input type='text' id='sc_new_name'> </input>
+       <script>$('sc_new_name').focus();</script>
+      </td>
+      <td>&staff.server.admin.stat_cat.owning_library;</td>
+      <td>
+       <select id='sc_owning_lib_selector'>
+       </select>
+      </td>
+     </tr>
+     <tr>
+      <td>&staff.server.admin.stat_cat.opac_visibility;</td>
+      <td> 
+       <span>&staff.server.admin.stat_cat.on;</span>
+       <input type='radio' name='opac_visibility' id='sc_make_opac_visible'> </input>
+       <span>&staff.server.admin.stat_cat.off;</span>
+       <input type='radio' name='opac_visibility' checked='checked'> </input>
+      </td>
+      <td>&staff.server.admin.stat_cat.type;</td>
+      <td>
+       <select id='sc_type_selector'>
+        <option value='asset' selected='selected'>&staff.server.admin.stat_cat.copy;</option>
+        <option value='actor'>&staff.server.admin.stat_cat.patron;</option>
+       </select>
+      </td>
+     </tr>
+     <tr>
+      <td colspan='4'>
+       <input type='submit' value='&staff.server.admin.stat_cat.create.submit;' onclick='scNew();' id='sc_new'/>
+      </td>
+     </tr>
+    </tbody>
+   </table>
+
+   <br/>
+   <hr/>
+   <br/>
 
             &staff.server.admin.copy_locations.editor.library.filter; <select disabled='disabled' id='sc_org_filter'> </select>
             <br/><br/>
 
-			<div id='loading' class='has_color'><h2>&staff.server.admin.stat_cat.loading_status;</h2></div>
-
-			<table width='98%'>
-				<tbody>
-					<tr>
-						<td width='20%'> </td>
-						<td id='sc_show_copy' width='30%' class='has_color'
-							align='center'><a href='javascript:scShow("asset");'>&staff.server.admin.stat_cat.copy_stat_cats;</a></td>
-						<td id='sc_show_actor' width='30%' 
-							align='center'><a href='javascript:scShow("actor");'>&staff.server.admin.stat_cat.patron_stat_cats;</a></td>
-						<td width='20%'> </td>
-					</tr>
-				</tbody>
-			</table>
-
-
-
-			<br/>
-			<div>&staff.server.admin.stat_cat.info_prompt;</div>
-			<br/>
-
-			<div style='padding: 20px;' id='sc_none' class='hide_me'><b>&staff.server.admin.stat_cat.none_defined;</b></div>
-
-			<!--
-			<div style='overflow: auto; max-height: 200px;'>
-			-->
-				<table width='95%' class='hide_me data_grid data_grid_center' id='sc_table'>
-					<thead>
-						<tr>
-							<td>&staff.server.admin.stat_cat.name.label;</td>
-							<td>&staff.server.admin.stat_cat.owning_library.label;</td>
-							<td>&staff.server.admin.stat_cat.opac_visibility.label;</td>
-							<td>&staff.server.admin.stat_cat.entries.label;</td>
-							<td>&staff.server.admin.stat_cat.add_entry;</td>
-							<td>&staff.server.admin.stat_cat.edit;</td>
-						</tr>
-					</thead>
-	
-					<tbody id='sc_tbody'>
-						<tr id='sc_tr'>
-							<td><b name='sc_name'> </b></td>
-							<td name='sc_owning_lib'> </td>
-	
-							<td>
-								<span class='hide_me' name='sc_opac_visible'>&staff.server.admin.stat_cat.on;</span> 
-								<span class='hide_me' name='sc_opac_invisible'>&staff.server.admin.stat_cat.off;</span> 
-							</td>
-	
-							<td>
+   <div id='loading' class='has_color'><h2>&staff.server.admin.stat_cat.loading_status;</h2></div>
+
+   <table width='98%'>
+    <tbody>
+     <tr>
+      <td width='20%'> </td>
+      <td id='sc_show_copy' width='30%' class='has_color'
+       align='center'><a href='javascript:scShow("asset");'>&staff.server.admin.stat_cat.copy_stat_cats;</a></td>
+      <td id='sc_show_actor' width='30%' 
+       align='center'><a href='javascript:scShow("actor");'>&staff.server.admin.stat_cat.patron_stat_cats;</a></td>
+      <td width='20%'> </td>
+     </tr>
+    </tbody>
+   </table>
+
+
+
+   <br/>
+   <div>&staff.server.admin.stat_cat.info_prompt;</div>
+   <br/>
+
+   <div style='padding: 20px;' id='sc_none' class='hide_me'><b>&staff.server.admin.stat_cat.none_defined;</b></div>
+
+   <!--
+   <div style='overflow: auto; max-height: 200px;'>
+   -->
+    <table width='95%' class='hide_me data_grid data_grid_center' id='sc_table'>
+     <thead>
+      <tr>
+       <td>&staff.server.admin.stat_cat.name.label;</td>
+       <td>&staff.server.admin.stat_cat.owning_library.label;</td>
+       <td>&staff.server.admin.stat_cat.opac_visibility.label;</td>
+       <td>&staff.server.admin.stat_cat.entries.label;</td>
+       <td>&staff.server.admin.stat_cat.add_entry;</td>
+       <td>&staff.server.admin.stat_cat.edit;</td>
+      </tr>
+     </thead>
+ 
+     <tbody id='sc_tbody'>
+      <tr id='sc_tr'>
+       <td><b name='sc_name'> </b></td>
+       <td name='sc_owning_lib'> </td>
+ 
+       <td>
+        <span class='hide_me' name='sc_opac_visible'>&staff.server.admin.stat_cat.on;</span> 
+        <span class='hide_me' name='sc_opac_invisible'>&staff.server.admin.stat_cat.off;</span> 
+       </td>
+ 
+       <td>
                                 <select class='selector' name='sc_entries_selector'>
                                     <option>&staff.server.admin.stat_cat.none;</option>
                                 </select>
                             </td>
-							<td><a href='javascript:void(0);' name='sc_new_entry'>&staff.server.admin.stat_cat.add.label;</a></td>
-							<td><a href='javascript:void(0);' name='sc_edit'>&staff.server.admin.stat_cat.edit;</a></td>
-						</tr>
-					</tbody>
-				</table>
-			<!--
-			</div>
-			-->
-	
-		
-
-			
-		</center>
-
-
-		<!-- Text spans  / template +++++++++++++++++++++++++++++++++++++  -->
-		<span class='hide_me' id='sc_new_entry_text'>&staff.server.admin.stat_cat.add.prompt;</span>
-
-		<span class='hide_me' id='sc_delete_confirm'>
-			&staff.server.admin.stat_cat.delete.confirm;
-		</span>
-
-		<span class='hide_me' id='sc_entry_delete_confirm'>
-			&staff.server.admin.stat_cat.entry_delete.confirm;
-		</span>
-
-		<table class='hide_me'>
-			<tr class='insert_row' id='sc_edit_row'>
-				<td><input name='sc_edit_name'> </input></td>
-				<td>
-					<span class='hide_me' name='sc_edit_show_owning_lib'> </span>
-					<select class='hide_me' name='sc_edit_owning_lib'> </select>
-				</td>
-
-				<td>
-					<span>&staff.server.admin.stat_cat.on;</span>
-					<span name='sc_edit_opac_vis'>
-						<input type='radio' name='sc_edit_opac_visibility'> </input>
-					</span>
-					<span>&staff.server.admin.stat_cat.off;</span>
-					<span name='sc_edit_opac_invis'>
-						<input type='radio' name='sc_edit_opac_visibility'> </input>
-					</span>
-				</td>
-				<td colspan='4'>
-					<span class='padded'>
-						<input  type='submit' value='&staff.server.admin.stat_cat.edit_submit;' name='sc_edit_submit'/>
-					</span>
-					<span class='padded'>
-						<input  type='submit' value='&staff.server.admin.stat_cat.edit_delete;' name='sc_edit_delete'/>
-					</span>
-					<input type='submit' name='sc_edit_cancel' value='&staff.server.admin.stat_cat.cancel;'/>
-				</td>
-			</tr>
-
-			<tr class='insert_row' id='sc_edit_entry_row'>
-				<td colspan='7'>
-					<span class='padded'>
-						<span>&staff.server.admin.stat_cat.edit_entry_owner;</span><b name='sc_edit_entry_owner'/>
-					</span>
-					<span class='padded'>
-						<input type='text' name='sc_edit_entry_name' class='padded'/>
-					</span>
-					<span class='padded'>
-						<input type='submit' name='sc_edit_entry_name_submit' value='&staff.server.admin.stat_cat.edit_entry_name_submit;' class='padded'/>
-					</span>
-					<span class='padded'>
-						<input type='submit' name='sc_edit_entry_delete' value='&staff.server.admin.stat_cat.edit_entry_delete;' class='padded'/>
-					</span>
-					<span class='padded'>
-						<input type='submit' name='sc_edit_entry_cancel' value='&staff.server.admin.stat_cat.cancel;'/>
-					</span>
-				</td>
-			</tr>
-
-			<tr class='insert_row' id='sc_new_entry_row'>
-				<td colspan='7'> 
-					<span>&staff.server.admin.stat_cat.new_entry_name;</span>
-					<span class='padded'>
-						<input type='text' name='sc_new_entry_name'/>
-					</span>
-					<span class='padded'>
-						<select name='sc_new_entry_lib'> </select>
-					</span>
-					<span class='padded'>
-						<input type='submit' name='sc_new_entry_create' value='&staff.server.admin.stat_cat.new_entry_create;'/>
-					</span>
-					<span class='padded'>
-						<input type='submit' name='sc_new_entry_cancel' value='&staff.server.admin.stat_cat.cancel;'/>
-					</span>
-				</td>
-			</tr>
-		</table>
-
-	</body>
-
-	<span class='hide_me' id='sc_update_success'>
-		&staff.server.admin.stat_cat.update_success;
-	</span>
+       <td><a href='javascript:void(0);' name='sc_new_entry'>&staff.server.admin.stat_cat.add.label;</a></td>
+       <td><a href='javascript:void(0);' name='sc_edit'>&staff.server.admin.stat_cat.edit;</a></td>
+      </tr>
+     </tbody>
+    </table>
+   <!--
+   </div>
+   -->
+ 
+  
+
+   
+  </center>
+
+
+  <!-- Text spans  / template +++++++++++++++++++++++++++++++++++++  -->
+  <span class='hide_me' id='sc_new_entry_text'>&staff.server.admin.stat_cat.add.prompt;</span>
+
+  <span class='hide_me' id='sc_delete_confirm'>
+   &staff.server.admin.stat_cat.delete.confirm;
+  </span>
+
+  <span class='hide_me' id='sc_entry_delete_confirm'>
+   &staff.server.admin.stat_cat.entry_delete.confirm;
+  </span>
+
+  <table class='hide_me'>
+   <tr class='insert_row' id='sc_edit_row'>
+    <td><input name='sc_edit_name'> </input></td>
+    <td>
+     <span class='hide_me' name='sc_edit_show_owning_lib'> </span>
+     <select class='hide_me' name='sc_edit_owning_lib'> </select>
+    </td>
+
+    <td>
+     <span>&staff.server.admin.stat_cat.on;</span>
+     <span name='sc_edit_opac_vis'>
+      <input type='radio' name='sc_edit_opac_visibility'> </input>
+     </span>
+     <span>&staff.server.admin.stat_cat.off;</span>
+     <span name='sc_edit_opac_invis'>
+      <input type='radio' name='sc_edit_opac_visibility'> </input>
+     </span>
+    </td>
+    <td colspan='4'>
+     <span class='padded'>
+      <input  type='submit' value='&staff.server.admin.stat_cat.edit_submit;' name='sc_edit_submit'/>
+     </span>
+     <span class='padded'>
+      <input  type='submit' value='&staff.server.admin.stat_cat.edit_delete;' name='sc_edit_delete'/>
+     </span>
+     <input type='submit' name='sc_edit_cancel' value='&staff.server.admin.stat_cat.cancel;'/>
+    </td>
+   </tr>
+
+   <tr class='insert_row' id='sc_edit_entry_row'>
+    <td colspan='7'>
+     <span class='padded'>
+      <span>&staff.server.admin.stat_cat.edit_entry_owner;</span><b name='sc_edit_entry_owner'/>
+     </span>
+     <span class='padded'>
+      <input type='text' name='sc_edit_entry_name' class='padded'/>
+     </span>
+     <span class='padded'>
+      <input type='submit' name='sc_edit_entry_name_submit' value='&staff.server.admin.stat_cat.edit_entry_name_submit;' class='padded'/>
+     </span>
+     <span class='padded'>
+      <input type='submit' name='sc_edit_entry_delete' value='&staff.server.admin.stat_cat.edit_entry_delete;' class='padded'/>
+     </span>
+     <span class='padded'>
+      <input type='submit' name='sc_edit_entry_cancel' value='&staff.server.admin.stat_cat.cancel;'/>
+     </span>
+    </td>
+   </tr>
+
+   <tr class='insert_row' id='sc_new_entry_row'>
+    <td colspan='7'> 
+     <span>&staff.server.admin.stat_cat.new_entry_name;</span>
+     <span class='padded'>
+      <input type='text' name='sc_new_entry_name'/>
+     </span>
+     <span class='padded'>
+      <select name='sc_new_entry_lib'> </select>
+     </span>
+     <span class='padded'>
+      <input type='submit' name='sc_new_entry_create' value='&staff.server.admin.stat_cat.new_entry_create;'/>
+     </span>
+     <span class='padded'>
+      <input type='submit' name='sc_new_entry_cancel' value='&staff.server.admin.stat_cat.cancel;'/>
+     </span>
+    </td>
+   </tr>
+  </table>
+
+ </body>
+
+ <span class='hide_me' id='sc_update_success'>
+  &staff.server.admin.stat_cat.update_success;
+ </span>
 
 </html>
 
diff --git a/Open-ILS/xul/staff_client/server/admin/transit_list.js b/Open-ILS/xul/staff_client/server/admin/transit_list.js
index 8e27ffbbdb..f21b55df73 100644
--- a/Open-ILS/xul/staff_client/server/admin/transit_list.js
+++ b/Open-ILS/xul/staff_client/server/admin/transit_list.js
@@ -3,452 +3,452 @@ dump('entering admin.transit_list.js\n');
 if (typeof admin == 'undefined') admin = {};
 admin.transit_list = function (params) {
 
-	JSAN.use('util.error'); this.error = new util.error();
-	JSAN.use('util.network'); this.network = new util.network(); JSAN.use('util.file');
-	JSAN.use('util.date'); JSAN.use('util.widgets'); JSAN.use('util.fm_utils'); JSAN.use('util.functional');
-	JSAN.use('OpenILS.data'); this.data = new OpenILS.data(); this.data.init({'via':'stash'});
+ JSAN.use('util.error'); this.error = new util.error();
+ JSAN.use('util.network'); this.network = new util.network(); JSAN.use('util.file');
+ JSAN.use('util.date'); JSAN.use('util.widgets'); JSAN.use('util.fm_utils'); JSAN.use('util.functional');
+ JSAN.use('OpenILS.data'); this.data = new OpenILS.data(); this.data.init({'via':'stash'});
 }
 
 admin.transit_list.prototype = {
 
-	'init' : function( params ) {
-
-		var obj = this;
-
-		var x = document.getElementById('libmenu_placeholder');
-		util.widgets.remove_children( x );
-
-		var file; var list_data; var ml; 
-
-		file = new util.file('offline_ou_list'); 
-		if (file._file.exists()) {
-			list_data = file.get_object(); file.close();
-			ml = util.widgets.make_menulist( list_data[0], list_data[1] );
-			ml.setAttribute('id','libmenu'); document.getElementById('libmenu_placeholder').appendChild(ml);
-			ml.addEventListener(
-				'command',
-				function(ev) {
-					var file = new util.file('transit_list_prefs.'+obj.data.server_unadorned);
-					util.widgets.save_attributes(file, { 'libmenu' : [ 'value' ] });
-				},
-				false
-			);
-		} else {
-			throw(document.getElementById('adminStrings').getString('staff.admin.transit_list.missing_list') + '\n');
-		}
-
-		file = new util.file('transit_list_prefs.'+obj.data.server_unadorned);
-		util.widgets.load_attributes(file);
-		ml.value = ml.getAttribute('value');
-		if (! ml.value) {
-			ml.value = obj.data.list.au[0].ws_ou();
-			ml.setAttribute('value',ml.value);
-		}
-
-		x.appendChild( ml );
-
-		obj.list_init();
-		obj.controller_init();
-		//obj.kick_off();
-
-	},
-
-	'sdate' : null,
-	'edate' : null,
-
-	'handle_date' : function(value,end_of_day) {
-		try {
-			var _date = null;
-
-			/* The Beginning */
-			if (value.match(/The Beginning/)) {
-				_date = new Date(); _date.setTime( 0 );
-			}
-
-			/* Today */
-			if (value.match(/^Today$/i)) {
-				_date = new Date(); _date = util.date.buildDate( _date.getFullYear(), _date.getMonth()+1, _date.getDate(), 0, 0, 0); // morning
-			}
-
-			/* handle YYYY-MM-DD */
-			var _string = value.match(/(\d\d\d\d)[\-\/](\d\d?)[\-\/](\d\d?)/);
-			if (_string) {
-				if (util.date.check('YYYY-MM-DD',_string[1]+'-'+_string[2]+'-'+_string[3])) {
-					_date = util.date.buildDate( _string[1], _string[2], _string[3], 0, 0, 0);
-				} else {
-					alert(document.getElementById('adminStrings').getFormattedString('staff.admin.transit_list.invalid_date', [_string])); 
-					_date = new Date(); _date = util.date.buildDate( _date.getFullYear(), _date.getMonth()+1, _date.getDate(), 0, 0, 0); // morning
-				}
-			}
-
-			/* handle relative dates */
-			var interval = value.match(/Today \- (.+)/);
-			if (interval) {
-				_date = new Date(); _date = util.date.buildDate( _date.getFullYear(), _date.getMonth()+1, _date.getDate(), 0, 0, 0); // morning
-				_date.setTime( _date.getTime() - util.date.interval_to_seconds(interval[1])*1000 );
-			}
-
-			if (! util.date.check('YYYY-MM-DD',util.date.formatted_date(_date,"%F")) ) { 
-				alert(document.getElementById('adminStrings').getFormattedString('staff.admin.transit_list.invalid_date', [_date, util.date.formatted_date(_date,"%F")])); 
-				_date = new Date(); _date = util.date.buildDate( _date.getFullYear(), _date.getMonth()+1, _date.getDate(), 0, 0, 0); // morning
-			}
-				
-			if (end_of_day) { // This just handles calendar days.. if we wanted to support (Today-1 month,Today-1 month), I'll need a better library, or a query to postgres
-				_date.setTime( _date.getTime() + util.date.interval_to_seconds('1 day')*1000 - util.date.interval_to_seconds('1 second')*1000 );
-			}
-
-			return util.date.formatted_date(_date,'%{iso8601}');
-		} catch(E) {
-			try { obj.error.standard_unexpected_error_alert(document.getElementById('adminStrings').getString('staff.admin.transit_list.date_processing.error'),E); } catch(F) { alert(E); }
-			_date = new Date(); _date = util.date.buildDate( _date.getFullYear(), _date.getMonth()+1, _date.getDate(), 0, 0, 0); // morning
-			return util.date.formatted_date(_date,'%{iso8601}');
-		}
-	},
-
-	'kick_off' : function() {
-		var obj = this;
-		try {
-			obj.list.clear();
-			obj.sdate = obj.handle_date( document.getElementById('sdate').value, false );
-			obj.edate = obj.handle_date( document.getElementById('edate').value, true );
-			var sdate; var edate;
-			if (obj.sdate < obj.edate) {
-				sdate = obj.sdate; edate = obj.edate;
-			} else {
-				sdate = obj.edate; edate = obj.sdate;
-			}
-			obj.network.simple_request('FM_ATC_RETRIEVE_VIA_AOU',[ ses(), /*obj.data.list.au[ 0 ].ws_ou()*/ document.getElementById('libmenu').value, sdate, edate ], 
-				function(req) {
-					try {
-						var robj = req.getResultObject();
-						if (typeof robj.ilsevent != 'undefined') throw(robj);
-
-						JSAN.use('util.exec'); 
-						var exec = new util.exec(2);
-						var exec2 = new util.exec(2);
-
-						function gen_list_append(id,which_list) {
-							return function() {
-								switch(which_list) {
-									case 0: obj.list.append( { 'row' : { 'my' : { 'transit_id' : id } }, 'no_auto_select' : true } ); break;
-									case 1: obj.list.append( { 'row' : { 'my' : { 'transit_id' : id } }, 'no_auto_select' : true } ); break;
-								}
-							};
-						}
-
-						var rows = []; 
-
-						if (document.getElementById('transit_direction').value=='transit_from') for (var i = 0; i < robj.from.length; i++) {
-							//get_transit(robj.from[i], 0);
-							rows.push( gen_list_append(robj.from[i],0) );
-						}
-
-						if (document.getElementById('transit_direction').value=='transit_to') for (var i = 0; i < robj.to.length; i++) {
-							//get_transit(robj.to[i], 1);
-							rows.push( gen_list_append(robj.to[i],1) );
-						}
-				
-						if (rows.length > 0) {
-							exec.chain( rows );
-						} else {
-							alert(document.getElementById('adminStrings').getString('staff.admin.transit_list.no_match'));
-						}
-
-					} catch(E) {
-						try { obj.error.standard_unexpected_error_alert(document.getElementById('adminStrings').getString('staff.admin.transit_list.retrieving_transit.error'),E); } catch(F) { alert(E); }
-					}
-				}
-			);
-		} catch(E) {
-			try { obj.error.standard_unexpected_error_alert(document.getElementById('adminStrings').getString('staff.admin.transit_list.preretrieving_transit.error'),E); } catch(F) { alert(E); }
-		}
-	},
-
-	'list_init' : function() {
-
-		var obj = this;
-
-		obj.selection_list = [];
-
-		JSAN.use('circ.util'); 
-		var columns = circ.util.transit_columns(
-			{
-				'transit_source' : { 'hidden' : false },
-				'transit_source_send_time' : { 'hidden' : false },
-				'transit_dest_lib' : { 'hidden' : false },
-				'transit_item_barcode' : { 'hidden' : false },
-				'transit_item_title' : { 'hidden' : false },
-			},
-			{
-				'just_these' : [
-					'transit_id',
-					'transit_source',
-					'transit_source_send_time',
-					'transit_dest_lib',
-					'transit_item_barcode',
-					'transit_item_title',
-					'transit_item_author',
-					'transit_item_callnumber',
-					'transit_target_copy',
-				]
-			}
-		).concat( 
-			circ.util.hold_columns(
-				{
-					'request_time' : { 'hidden' : false },
-				},
-				{
-					'just_these' : [
-						'request_timestamp',
-						'request_time',
-						'capture_timestamp',
-						'capture_time',
-						'hold_type',
-						'expire_time',
-						'patron_first_given_name',
-						'patron_family_name',
-						'patron_barcode',
-					],
-				}
-			) 
-		);
-
-		JSAN.use('util.list'); 
-		obj.list = new util.list('transit_list');
-		obj.list.init( 
-			{ 
-				'columns' : columns, 
-				'map_row_to_columns' : circ.util.std_map_row_to_columns(), 
-				'retrieve_row' : function(params) {
-					var row = params.row;
-					try {
-						obj.get_transit_and_hold_and_run_func(
-							row.my.transit_id,
-							function(transit,hold) { return obj.get_rest_of_row_given_transit_and_hold(params,transit,hold); }
-						);
-					} catch(E) {
-						try { obj.error.standard_unexpected_error_alert(document.getElementById('adminStrings').getString('staff.admin.transit_list.retrieving_row.error'),E); } catch(F) { alert(E); }
-					}
-				},
-				'on_select' : function(ev) {
-					try {
-						JSAN.use('util.functional');
-						var sel = obj.list.retrieve_selection();
-						obj.selection_list = util.functional.map_list(
-							sel,
-							function(o) { return JSON2js(o.getAttribute('retrieve_id')); }
-						);
-						obj.error.sdump('D_TRACE','admin.transit_list: selection list = ' + js2JSON(obj.selection_list) );
-						if (obj.selection_list.length == 0) {
-							obj.controller.view.sel_edit.setAttribute('disabled','true');
-							obj.controller.view.sel_opac.setAttribute('disabled','true');
-							obj.controller.view.sel_bucket.setAttribute('disabled','true');
-							obj.controller.view.sel_copy_details.setAttribute('disabled','true');
-							obj.controller.view.sel_patron.setAttribute('disabled','true');
-							obj.controller.view.sel_transit_abort.setAttribute('disabled','true');
-							obj.controller.view.sel_clip.setAttribute('disabled','true');
-						} else {
-							obj.controller.view.sel_edit.setAttribute('disabled','false');
-							obj.controller.view.sel_opac.setAttribute('disabled','false');
-							obj.controller.view.sel_patron.setAttribute('disabled','false');
-							obj.controller.view.sel_bucket.setAttribute('disabled','false');
-							obj.controller.view.sel_copy_details.setAttribute('disabled','false');
-							obj.controller.view.sel_transit_abort.setAttribute('disabled','false');
-							obj.controller.view.sel_clip.setAttribute('disabled','false');
-						}
-					} catch(E) {
-						alert('FIXME: ' + E);
-					}
-				},
-			}
-		);
-	},
-
-	'get_transit_and_hold_and_run_func' : function (transit_id,do_this) {
-		var obj = this;
-		obj.network.simple_request('FM_ATC_RETRIEVE', [ ses(), transit_id ],
-			function(req2) {
-				try {
-					var r_atc = req2.getResultObject();
-					if (typeof r_atc.ilsevent != 'undefined') throw(r_atc);
-
-					if (instanceOf(r_atc,atc)) {
-						do_this(r_atc,null);
-					} else if (instanceOf(r_atc,ahtc)) {
-						obj.network.simple_request('FM_AHR_RETRIEVE', [ ses(), r_atc.hold() ],
-							function(req3) {
-								try {
-									var r_ahr = req3.getResultObject();
-									if (typeof r_ahr.ilsevent != 'undefined') throw(r_ahr);
-									if (r_ahr.length == 0) {
-										try { obj.error.standard_unexpected_error_alert(document.getElementById('adminStrings').getString('staff.admin.transit_list.empty_array.error') + document.getElementById('adminStrings').getFormattedString('staff.admin.transit_list.empty_array.error', [r_atc.hold(), transit_id]),E); } catch(F) { alert(E); }
-										do_this(r_atc,null);
-									} else {
-										if (instanceOf(r_ahr[0],ahr)) {
-											do_this(r_atc,r_ahr[0]);
-										} else {
-											throw(r_ahr);
-										}
-									}
-								} catch(E) {
-									try { obj.error.standard_unexpected_error_alert(document.getElementById('adminStrings').getFormattedString('staff.admin.transit_list.empty_array.error', [r_atc.hold(), transit_id]),E); } catch(F) { alert(E); }
-									do_this(r_atc,null);
-								}
-							}
-						);
-					} else {
-						throw(r_atc);
-					}
-
-				} catch(E) {
-					try { obj.error.standard_unexpected_error_alert(document.getElementById('adminStrings').getFormattedString('staff.admin.transit_list.transit_id.error', [transit_id]),E); } catch(F) { alert(E); }
-				}
-			}
-		);
-	},
-
-	'get_rest_of_row_given_transit_and_hold' : function(params,transit,hold) {
-		var obj = this;
-		var row = params.row;
-
-		row.my.atc = transit;
-		if (hold) row.my.ahr = hold;
-
-		obj.network.simple_request(
-			'FM_ACP_RETRIEVE',
-			[ row.my.atc.target_copy() ],
-			function(req) {
-				try { 
-					var r_acp = req.getResultObject();
-					if (typeof r_acp.ilsevent != 'undefined') throw(r_acp);
-					row.my.acp = r_acp;
-
-					obj.network.simple_request(
-						'FM_ACN_RETRIEVE.authoritative',
-						[ r_acp.call_number() ],
-						function(req2) {
-							try {
-								var r_acn = req2.getResultObject();
-								if (typeof r_acn.ilsevent != 'undefined') throw(r_acn);
-								row.my.acn = r_acn;
-
-								if (row.my.acn.record() > 0) {
-									obj.network.simple_request(
-										'MODS_SLIM_RECORD_RETRIEVE.authoritative',
-										[ r_acn.record() ],
-										function(req3) {
-											try {
-												var r_mvr = req3.getResultObject();
-												if (typeof r_mvr.ilsevent != 'undefined') throw(r_mvr);
-												row.my.mvr = r_mvr;
-
-												params.row_node.setAttribute(
-													'retrieve_id', js2JSON( { 
-														'copy_id' : row.my.acp ? row.my.acp.id() : null, 
-														'doc_id' : row.my.mvr ? row.my.mvr.doc_id() : null,  
-														'barcode' : row.my.acp ? row.my.acp.barcode() : null, 
-														'acp_id' : row.my.acp ? row.my.acp.id() : null, 
-														'acn_id' : row.my.acn ? row.my.acn.id() : null,  
-														'atc_id' : row.my.atc ? row.my.atc.id() : null,  
-														'ahr_id' : row.my.ahr ? row.my.ahr.id() : null,  
-													} )
-												);
-												if (typeof params.on_retrieve == 'function') {
-													params.on_retrieve(row);
-												}
-											} catch(E) {
-												try { obj.error.standard_unexpected_error_alert('retrieving mvr',E); } catch(F) { alert(E); }
-											}
-										}
-									);
-								} else {
-									params.row_node.setAttribute(
-										'retrieve_id', js2JSON( { 
-											'copy_id' : row.my.acp ? row.my.acp.id() : null, 
-											'doc_id' : row.my.mvr ? row.my.mvr.doc_id() : null,  
-											'barcode' : row.my.acp ? row.my.acp.barcode() : null, 
-											'acp_id' : row.my.acp ? row.my.acp.id() : null, 
-											'acn_id' : row.my.acn ? row.my.acn.id() : null,  
-											'atc_id' : row.my.atc ? row.my.atc.id() : null,  
-											'ahr_id' : row.my.ahr ? row.my.ahr.id() : null,  
-										} )
-									);
-									if (typeof params.on_retrieve == 'function') {
-										params.on_retrieve(row);
-									}
-								}
-					
-							} catch(E) {
-								try { obj.error.standard_unexpected_error_alert('retrieving acn',E); } catch(F) { alert(E); }
-							}
-						}
-					);
-
-
-				} catch(E) {
-					try { obj.error.standard_unexpected_error_alert('retrieving acp',E); } catch(F) { alert(E); }
-				}
-			}
-		);
-	},
-
-	'controller_init' : function() {
-		var obj = this;
-
-		JSAN.use('util.controller'); obj.controller = new util.controller();
-		obj.controller.init(
-			{
-				'control_map' : {
-					'save_columns' : [ [ 'command' ], function() { obj.list.save_columns(); } ],
-					'sel_clip' : [ ['command'], function() { obj.list.clipboard(); } ],
-					'sel_edit' : [ ['command'], function() { try { obj.spawn_copy_editor(0); } catch(E) { alert(E); } } ],
-					'sel_opac' : [ ['command'], function() { JSAN.use('cat.util'); cat.util.show_in_opac(obj.selection_list); } ],
-					'sel_transit_abort' : [ ['command'], function() { JSAN.use('circ.util'); circ.util.abort_transits(obj.selection_list); } ],
-					'sel_patron' : [ ['command'], function() { JSAN.use('circ.util'); circ.util.show_last_few_circs(obj.selection_list); } ],
-					'sel_copy_details' : [ ['command'], function() { JSAN.use('circ.util'); for (var i = 0; i < obj.selection_list.length; i++) { circ.util.show_copy_details( obj.selection_list[i].copy_id ); } } ],
-					'sel_bucket' : [ ['command'], function() { JSAN.use('cat.util'); cat.util.add_copies_to_bucket(obj.selection_list); } ],
-					'cmd_print_list' : [ ['command'], function() { obj.print_list(0); } ],
-					'cmd_kick_off' : [ ['command'], function(ev) { ev.target.disabled = true; obj.kick_off(); } ],
-					'sdate' : [ ['change'], function(ev) { ev.target.value = obj.handle_date(ev.target.value,false); obj.sdate = ev.target.value; /*alert('obj.sdate='+obj.sdate);*/ } ],
-					'edate' : [ ['change'], function(ev) { ev.target.value = obj.handle_date(ev.target.value,true); obj.edate = ev.target.value; /*alert('obj.edate='+obj.edate);*/ } ],
-				}
-			}
-		);
-		this.controller.render();
-
-	},
-
-	'print_list' : function(which_list) {
-		var obj = this;
-		try {
-			var list = which_list == 0 ? obj.list : obj.list2;
+ 'init' : function( params ) {
+
+  var obj = this;
+
+  var x = document.getElementById('libmenu_placeholder');
+  util.widgets.remove_children( x );
+
+  var file; var list_data; var ml; 
+
+  file = new util.file('offline_ou_list'); 
+  if (file._file.exists()) {
+   list_data = file.get_object(); file.close();
+   ml = util.widgets.make_menulist( list_data[0], list_data[1] );
+   ml.setAttribute('id','libmenu'); document.getElementById('libmenu_placeholder').appendChild(ml);
+   ml.addEventListener(
+    'command',
+    function(ev) {
+     var file = new util.file('transit_list_prefs.'+obj.data.server_unadorned);
+     util.widgets.save_attributes(file, { 'libmenu' : [ 'value' ] });
+    },
+    false
+   );
+  } else {
+   throw(document.getElementById('adminStrings').getString('staff.admin.transit_list.missing_list') + '\n');
+  }
+
+  file = new util.file('transit_list_prefs.'+obj.data.server_unadorned);
+  util.widgets.load_attributes(file);
+  ml.value = ml.getAttribute('value');
+  if (! ml.value) {
+   ml.value = obj.data.list.au[0].ws_ou();
+   ml.setAttribute('value',ml.value);
+  }
+
+  x.appendChild( ml );
+
+  obj.list_init();
+  obj.controller_init();
+  //obj.kick_off();
+
+ },
+
+ 'sdate' : null,
+ 'edate' : null,
+
+ 'handle_date' : function(value,end_of_day) {
+  try {
+   var _date = null;
+
+   /* The Beginning */
+   if (value.match(/The Beginning/)) {
+    _date = new Date(); _date.setTime( 0 );
+   }
+
+   /* Today */
+   if (value.match(/^Today$/i)) {
+    _date = new Date(); _date = util.date.buildDate( _date.getFullYear(), _date.getMonth()+1, _date.getDate(), 0, 0, 0); // morning
+   }
+
+   /* handle YYYY-MM-DD */
+   var _string = value.match(/(\d\d\d\d)[\-\/](\d\d?)[\-\/](\d\d?)/);
+   if (_string) {
+    if (util.date.check('YYYY-MM-DD',_string[1]+'-'+_string[2]+'-'+_string[3])) {
+     _date = util.date.buildDate( _string[1], _string[2], _string[3], 0, 0, 0);
+    } else {
+     alert(document.getElementById('adminStrings').getFormattedString('staff.admin.transit_list.invalid_date', [_string])); 
+     _date = new Date(); _date = util.date.buildDate( _date.getFullYear(), _date.getMonth()+1, _date.getDate(), 0, 0, 0); // morning
+    }
+   }
+
+   /* handle relative dates */
+   var interval = value.match(/Today \- (.+)/);
+   if (interval) {
+    _date = new Date(); _date = util.date.buildDate( _date.getFullYear(), _date.getMonth()+1, _date.getDate(), 0, 0, 0); // morning
+    _date.setTime( _date.getTime() - util.date.interval_to_seconds(interval[1])*1000 );
+   }
+
+   if (! util.date.check('YYYY-MM-DD',util.date.formatted_date(_date,"%F")) ) { 
+    alert(document.getElementById('adminStrings').getFormattedString('staff.admin.transit_list.invalid_date', [_date, util.date.formatted_date(_date,"%F")])); 
+    _date = new Date(); _date = util.date.buildDate( _date.getFullYear(), _date.getMonth()+1, _date.getDate(), 0, 0, 0); // morning
+   }
+    
+   if (end_of_day) { // This just handles calendar days.. if we wanted to support (Today-1 month,Today-1 month), I'll need a better library, or a query to postgres
+    _date.setTime( _date.getTime() + util.date.interval_to_seconds('1 day')*1000 - util.date.interval_to_seconds('1 second')*1000 );
+   }
+
+   return util.date.formatted_date(_date,'%{iso8601}');
+  } catch(E) {
+   try { obj.error.standard_unexpected_error_alert(document.getElementById('adminStrings').getString('staff.admin.transit_list.date_processing.error'),E); } catch(F) { alert(E); }
+   _date = new Date(); _date = util.date.buildDate( _date.getFullYear(), _date.getMonth()+1, _date.getDate(), 0, 0, 0); // morning
+   return util.date.formatted_date(_date,'%{iso8601}');
+  }
+ },
+
+ 'kick_off' : function() {
+  var obj = this;
+  try {
+   obj.list.clear();
+   obj.sdate = obj.handle_date( document.getElementById('sdate').value, false );
+   obj.edate = obj.handle_date( document.getElementById('edate').value, true );
+   var sdate; var edate;
+   if (obj.sdate < obj.edate) {
+    sdate = obj.sdate; edate = obj.edate;
+   } else {
+    sdate = obj.edate; edate = obj.sdate;
+   }
+   obj.network.simple_request('FM_ATC_RETRIEVE_VIA_AOU',[ ses(), /*obj.data.list.au[ 0 ].ws_ou()*/ document.getElementById('libmenu').value, sdate, edate ], 
+    function(req) {
+     try {
+      var robj = req.getResultObject();
+      if (typeof robj.ilsevent != 'undefined') throw(robj);
+
+      JSAN.use('util.exec'); 
+      var exec = new util.exec(2);
+      var exec2 = new util.exec(2);
+
+      function gen_list_append(id,which_list) {
+       return function() {
+        switch(which_list) {
+         case 0: obj.list.append( { 'row' : { 'my' : { 'transit_id' : id } }, 'no_auto_select' : true } ); break;
+         case 1: obj.list.append( { 'row' : { 'my' : { 'transit_id' : id } }, 'no_auto_select' : true } ); break;
+        }
+       };
+      }
+
+      var rows = []; 
+
+      if (document.getElementById('transit_direction').value=='transit_from') for (var i = 0; i < robj.from.length; i++) {
+       //get_transit(robj.from[i], 0);
+       rows.push( gen_list_append(robj.from[i],0) );
+      }
+
+      if (document.getElementById('transit_direction').value=='transit_to') for (var i = 0; i < robj.to.length; i++) {
+       //get_transit(robj.to[i], 1);
+       rows.push( gen_list_append(robj.to[i],1) );
+      }
+    
+      if (rows.length > 0) {
+       exec.chain( rows );
+      } else {
+       alert(document.getElementById('adminStrings').getString('staff.admin.transit_list.no_match'));
+      }
+
+     } catch(E) {
+      try { obj.error.standard_unexpected_error_alert(document.getElementById('adminStrings').getString('staff.admin.transit_list.retrieving_transit.error'),E); } catch(F) { alert(E); }
+     }
+    }
+   );
+  } catch(E) {
+   try { obj.error.standard_unexpected_error_alert(document.getElementById('adminStrings').getString('staff.admin.transit_list.preretrieving_transit.error'),E); } catch(F) { alert(E); }
+  }
+ },
+
+ 'list_init' : function() {
+
+  var obj = this;
+
+  obj.selection_list = [];
+
+  JSAN.use('circ.util'); 
+  var columns = circ.util.transit_columns(
+   {
+    'transit_source' : { 'hidden' : false },
+    'transit_source_send_time' : { 'hidden' : false },
+    'transit_dest_lib' : { 'hidden' : false },
+    'transit_item_barcode' : { 'hidden' : false },
+    'transit_item_title' : { 'hidden' : false },
+   },
+   {
+    'just_these' : [
+     'transit_id',
+     'transit_source',
+     'transit_source_send_time',
+     'transit_dest_lib',
+     'transit_item_barcode',
+     'transit_item_title',
+     'transit_item_author',
+     'transit_item_callnumber',
+     'transit_target_copy',
+    ]
+   }
+  ).concat( 
+   circ.util.hold_columns(
+    {
+     'request_time' : { 'hidden' : false },
+    },
+    {
+     'just_these' : [
+      'request_timestamp',
+      'request_time',
+      'capture_timestamp',
+      'capture_time',
+      'hold_type',
+      'expire_time',
+      'patron_first_given_name',
+      'patron_family_name',
+      'patron_barcode',
+     ],
+    }
+   ) 
+  );
+
+  JSAN.use('util.list'); 
+  obj.list = new util.list('transit_list');
+  obj.list.init( 
+   { 
+    'columns' : columns, 
+    'map_row_to_columns' : circ.util.std_map_row_to_columns(), 
+    'retrieve_row' : function(params) {
+     var row = params.row;
+     try {
+      obj.get_transit_and_hold_and_run_func(
+       row.my.transit_id,
+       function(transit,hold) { return obj.get_rest_of_row_given_transit_and_hold(params,transit,hold); }
+      );
+     } catch(E) {
+      try { obj.error.standard_unexpected_error_alert(document.getElementById('adminStrings').getString('staff.admin.transit_list.retrieving_row.error'),E); } catch(F) { alert(E); }
+     }
+    },
+    'on_select' : function(ev) {
+     try {
+      JSAN.use('util.functional');
+      var sel = obj.list.retrieve_selection();
+      obj.selection_list = util.functional.map_list(
+       sel,
+       function(o) { return JSON2js(o.getAttribute('retrieve_id')); }
+      );
+      obj.error.sdump('D_TRACE','admin.transit_list: selection list = ' + js2JSON(obj.selection_list) );
+      if (obj.selection_list.length == 0) {
+       obj.controller.view.sel_edit.setAttribute('disabled','true');
+       obj.controller.view.sel_opac.setAttribute('disabled','true');
+       obj.controller.view.sel_bucket.setAttribute('disabled','true');
+       obj.controller.view.sel_copy_details.setAttribute('disabled','true');
+       obj.controller.view.sel_patron.setAttribute('disabled','true');
+       obj.controller.view.sel_transit_abort.setAttribute('disabled','true');
+       obj.controller.view.sel_clip.setAttribute('disabled','true');
+      } else {
+       obj.controller.view.sel_edit.setAttribute('disabled','false');
+       obj.controller.view.sel_opac.setAttribute('disabled','false');
+       obj.controller.view.sel_patron.setAttribute('disabled','false');
+       obj.controller.view.sel_bucket.setAttribute('disabled','false');
+       obj.controller.view.sel_copy_details.setAttribute('disabled','false');
+       obj.controller.view.sel_transit_abort.setAttribute('disabled','false');
+       obj.controller.view.sel_clip.setAttribute('disabled','false');
+      }
+     } catch(E) {
+      alert('FIXME: ' + E);
+     }
+    },
+   }
+  );
+ },
+
+ 'get_transit_and_hold_and_run_func' : function (transit_id,do_this) {
+  var obj = this;
+  obj.network.simple_request('FM_ATC_RETRIEVE', [ ses(), transit_id ],
+   function(req2) {
+    try {
+     var r_atc = req2.getResultObject();
+     if (typeof r_atc.ilsevent != 'undefined') throw(r_atc);
+
+     if (instanceOf(r_atc,atc)) {
+      do_this(r_atc,null);
+     } else if (instanceOf(r_atc,ahtc)) {
+      obj.network.simple_request('FM_AHR_RETRIEVE', [ ses(), r_atc.hold() ],
+       function(req3) {
+        try {
+         var r_ahr = req3.getResultObject();
+         if (typeof r_ahr.ilsevent != 'undefined') throw(r_ahr);
+         if (r_ahr.length == 0) {
+          try { obj.error.standard_unexpected_error_alert(document.getElementById('adminStrings').getString('staff.admin.transit_list.empty_array.error') + document.getElementById('adminStrings').getFormattedString('staff.admin.transit_list.empty_array.error', [r_atc.hold(), transit_id]),E); } catch(F) { alert(E); }
+          do_this(r_atc,null);
+         } else {
+          if (instanceOf(r_ahr[0],ahr)) {
+           do_this(r_atc,r_ahr[0]);
+          } else {
+           throw(r_ahr);
+          }
+         }
+        } catch(E) {
+         try { obj.error.standard_unexpected_error_alert(document.getElementById('adminStrings').getFormattedString('staff.admin.transit_list.empty_array.error', [r_atc.hold(), transit_id]),E); } catch(F) { alert(E); }
+         do_this(r_atc,null);
+        }
+       }
+      );
+     } else {
+      throw(r_atc);
+     }
+
+    } catch(E) {
+     try { obj.error.standard_unexpected_error_alert(document.getElementById('adminStrings').getFormattedString('staff.admin.transit_list.transit_id.error', [transit_id]),E); } catch(F) { alert(E); }
+    }
+   }
+  );
+ },
+
+ 'get_rest_of_row_given_transit_and_hold' : function(params,transit,hold) {
+  var obj = this;
+  var row = params.row;
+
+  row.my.atc = transit;
+  if (hold) row.my.ahr = hold;
+
+  obj.network.simple_request(
+   'FM_ACP_RETRIEVE',
+   [ row.my.atc.target_copy() ],
+   function(req) {
+    try { 
+     var r_acp = req.getResultObject();
+     if (typeof r_acp.ilsevent != 'undefined') throw(r_acp);
+     row.my.acp = r_acp;
+
+     obj.network.simple_request(
+      'FM_ACN_RETRIEVE.authoritative',
+      [ r_acp.call_number() ],
+      function(req2) {
+       try {
+        var r_acn = req2.getResultObject();
+        if (typeof r_acn.ilsevent != 'undefined') throw(r_acn);
+        row.my.acn = r_acn;
+
+        if (row.my.acn.record() > 0) {
+         obj.network.simple_request(
+          'MODS_SLIM_RECORD_RETRIEVE.authoritative',
+          [ r_acn.record() ],
+          function(req3) {
+           try {
+            var r_mvr = req3.getResultObject();
+            if (typeof r_mvr.ilsevent != 'undefined') throw(r_mvr);
+            row.my.mvr = r_mvr;
+
+            params.row_node.setAttribute(
+             'retrieve_id', js2JSON( { 
+              'copy_id' : row.my.acp ? row.my.acp.id() : null, 
+              'doc_id' : row.my.mvr ? row.my.mvr.doc_id() : null,  
+              'barcode' : row.my.acp ? row.my.acp.barcode() : null, 
+              'acp_id' : row.my.acp ? row.my.acp.id() : null, 
+              'acn_id' : row.my.acn ? row.my.acn.id() : null,  
+              'atc_id' : row.my.atc ? row.my.atc.id() : null,  
+              'ahr_id' : row.my.ahr ? row.my.ahr.id() : null,  
+             } )
+            );
+            if (typeof params.on_retrieve == 'function') {
+             params.on_retrieve(row);
+            }
+           } catch(E) {
+            try { obj.error.standard_unexpected_error_alert('retrieving mvr',E); } catch(F) { alert(E); }
+           }
+          }
+         );
+        } else {
+         params.row_node.setAttribute(
+          'retrieve_id', js2JSON( { 
+           'copy_id' : row.my.acp ? row.my.acp.id() : null, 
+           'doc_id' : row.my.mvr ? row.my.mvr.doc_id() : null,  
+           'barcode' : row.my.acp ? row.my.acp.barcode() : null, 
+           'acp_id' : row.my.acp ? row.my.acp.id() : null, 
+           'acn_id' : row.my.acn ? row.my.acn.id() : null,  
+           'atc_id' : row.my.atc ? row.my.atc.id() : null,  
+           'ahr_id' : row.my.ahr ? row.my.ahr.id() : null,  
+          } )
+         );
+         if (typeof params.on_retrieve == 'function') {
+          params.on_retrieve(row);
+         }
+        }
+     
+       } catch(E) {
+        try { obj.error.standard_unexpected_error_alert('retrieving acn',E); } catch(F) { alert(E); }
+       }
+      }
+     );
+
+
+    } catch(E) {
+     try { obj.error.standard_unexpected_error_alert('retrieving acp',E); } catch(F) { alert(E); }
+    }
+   }
+  );
+ },
+
+ 'controller_init' : function() {
+  var obj = this;
+
+  JSAN.use('util.controller'); obj.controller = new util.controller();
+  obj.controller.init(
+   {
+    'control_map' : {
+     'save_columns' : [ [ 'command' ], function() { obj.list.save_columns(); } ],
+     'sel_clip' : [ ['command'], function() { obj.list.clipboard(); } ],
+     'sel_edit' : [ ['command'], function() { try { obj.spawn_copy_editor(0); } catch(E) { alert(E); } } ],
+     'sel_opac' : [ ['command'], function() { JSAN.use('cat.util'); cat.util.show_in_opac(obj.selection_list); } ],
+     'sel_transit_abort' : [ ['command'], function() { JSAN.use('circ.util'); circ.util.abort_transits(obj.selection_list); } ],
+     'sel_patron' : [ ['command'], function() { JSAN.use('circ.util'); circ.util.show_last_few_circs(obj.selection_list); } ],
+     'sel_copy_details' : [ ['command'], function() { JSAN.use('circ.util'); for (var i = 0; i < obj.selection_list.length; i++) { circ.util.show_copy_details( obj.selection_list[i].copy_id ); } } ],
+     'sel_bucket' : [ ['command'], function() { JSAN.use('cat.util'); cat.util.add_copies_to_bucket(obj.selection_list); } ],
+     'cmd_print_list' : [ ['command'], function() { obj.print_list(0); } ],
+     'cmd_kick_off' : [ ['command'], function(ev) { ev.target.disabled = true; obj.kick_off(); } ],
+     'sdate' : [ ['change'], function(ev) { ev.target.value = obj.handle_date(ev.target.value,false); obj.sdate = ev.target.value; /*alert('obj.sdate='+obj.sdate);*/ } ],
+     'edate' : [ ['change'], function(ev) { ev.target.value = obj.handle_date(ev.target.value,true); obj.edate = ev.target.value; /*alert('obj.edate='+obj.edate);*/ } ],
+    }
+   }
+  );
+  this.controller.render();
+
+ },
+
+ 'print_list' : function(which_list) {
+  var obj = this;
+  try {
+   var list = which_list == 0 ? obj.list : obj.list2;
             var p = { 
                 'template' : 'transit_list'
             };
-			list.print(p);
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert('print',E); 
-		}
-	},
-	
-	'spawn_copy_editor' : function(which_list) {
+   list.print(p);
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert('print',E); 
+  }
+ },
+ 
+ 'spawn_copy_editor' : function(which_list) {
 
-		var obj = this;
+  var obj = this;
 
-		JSAN.use('util.functional');
+  JSAN.use('util.functional');
 
-		var list = which_list == 0 ? obj.selection_list : obj.selection_list2;
+  var list = which_list == 0 ? obj.selection_list : obj.selection_list2;
 
-		list = util.functional.map_list(
-			list,
-			function (o) {
-				return o.copy_id;
-			}
-		);
+  list = util.functional.map_list(
+   list,
+   function (o) {
+    return o.copy_id;
+   }
+  );
 
-		JSAN.use('cat.util'); cat.util.spawn_copy_editor( { 'copy_ids' : list, 'edit' : 1 } );
+  JSAN.use('cat.util'); cat.util.spawn_copy_editor( { 'copy_ids' : list, 'edit' : 1 } );
 
-	},
+ },
 
 }
 
diff --git a/Open-ILS/xul/staff_client/server/admin/transit_list.xul b/Open-ILS/xul/staff_client/server/admin/transit_list.xul
index 463751c243..263fa9fc93 100644
--- a/Open-ILS/xul/staff_client/server/admin/transit_list.xul
+++ b/Open-ILS/xul/staff_client/server/admin/transit_list.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,139 +19,139 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="admin_transit_list_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+ </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for admin_transit_list.xul');
-
-				JSAN.use('admin.transit_list');
-				g.transit_list = new admin.transit_list();
-				g.transit_list.init();
-
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert('admin/transit_list.xul',E); } catch(F) { alert(E); }
-			}
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="adminStrings" src='/xul/server/locale/<!--#echo var="locale"-->/admin.properties'/>
-	<messagecatalog id="circStrings" src='/xul/server/locale/<!--#echo var="locale"-->/circ.properties'/>
-	<messagecatalog id="catStrings" src='/xul/server/locale/<!--#echo var="locale"-->/cat.properties'/>
-
-	<vbox flex="1" class="my_overflow">
-		<hbox>
-			<groupbox id="lib_hbox" orient="horizontal">
-				<caption label="&staff.server.admin.transit.filter.caption;" class="shrinkable_groupbox"/> 
-				<vbox>
-					<label value="&staff.server.admin.transit.library.label;" class="header"/>
-					<hbox>
-						<menulist id="transit_direction">
-							<menupopup>
-								<menuitem label="&staff.server.admin.transit.to.label;" value="transit_to" selected="true"/>
-								<menuitem label="&staff.server.admin.transit.from.label;" value="transit_from" />
-							</menupopup>
-						</menulist>
-						<hbox id="libmenu_placeholder"/>
-					</hbox>
-					<label value="&staff.server.admin.transit.date.label;" class="header"/> 
-					<hbox>
-						<menulist id="sdate" editable="true">
-							<menupopup>
-								<menuitem label="&staff.server.admin.transit.date.today;" selected="true"/>
-								<menuitem label="&staff.server.admin.transit.date.week;" />
-								<menuitem label="&staff.server.admin.transit.date.2weeks;" />
-								<menuitem label="&staff.server.admin.transit.date.3weeks;" />
-								<menuitem label="&staff.server.admin.transit.date.30days;" />
-								<menuitem label="&staff.server.admin.transit.date.start;" />
-							</menupopup>
-						</menulist>
-						<menulist id="edate" editable="true">
-							<menupopup>
-								<menuitem label="&staff.server.admin.transit.date.today;" selected="true"/>
-								<menuitem label="&staff.server.admin.transit.date.week;" />
-								<menuitem label="&staff.server.admin.transit.date.2weeks;" />
-								<menuitem label="&staff.server.admin.transit.date.3weeks;" />
-								<menuitem label="&staff.server.admin.transit.date.30days;" />
-							</menupopup>
-						</menulist>
-					</hbox>
-				</vbox>
-				<button label="&staff.server.admin.transit.retrieve.label;" accesskey="&staff.server.admin.transit.retrieve.accesskey;" command="cmd_kick_off"/>
-			</groupbox>
-		</hbox>
-
-		<groupbox flex="1">
-			<caption label="&staff.server.admin.transit.list.label;" />
-			<hbox>
-				<button label="&staff.server.admin.transit.list.print;" command="cmd_print_list" />
-				<spacer flex="1"/>
-				<menubar>
-					<menu label="&staff.server.admin.transit.list.actions;" accesskey="&staff.server.admin.transit.list.actions.accesskey;">
-						<menupopup>
-							<menuitem command="sel_clip" label="&staff.server.admin.transit.list.copy.label;" accesskey="&staff.server.admin.transit.list.copy.accesskey;" />
-							<menuitem command="sel_bucket" label="&staff.server.admin.transit.list.add.label;" accesskey="&staff.server.admin.transit.list.add.accesskey;"/>
-							<menuitem command="sel_opac" label="&staff.server.admin.transit.list.show.label;" accesskey="&staff.server.admin.transit.list.show.accesskey;" />
-							<menuitem command="sel_copy_details" label="&staff.server.admin.transit.list.details.label;" accesskey="&staff.server.admin.transit.list.details.accesskey;" />
-							<menuitem command="sel_patron" label="&staff.server.admin.transit.list.circs.label;" accesskey="&staff.server.admin.transit.list.circs.accesskey;"/>
-							<menuseparator />
-							<menuitem command="sel_edit" label="&staff.server.admin.transit.list.edit.label;" accesskey="&staff.server.admin.transit.list.edit.accesskey;" />
-							<menuitem command="sel_transit_abort" label="&staff.server.admin.transit.list.abort.label;" />
-							<menuseparator />
-							<menuitem command="save_columns" label="&staff.server.admin.transit.list.save.label;"/>
-						</menupopup>
-					</menu>
-				</menubar>
-			</hbox>
-			<tree id="transit_list" flex="1" enableColumnDrag="true" context="transit_list_actions"/>
-		</groupbox>
-	</vbox>
-
-	<popupset id="transit_list_popupset">
-		<popup id="transit_list_actions" position="at_pointer"> 
-			<menuitem command="sel_clip" label="&staff.server.admin.transit.list.copy.label;" accesskey="&staff.server.admin.transit.list.copy.accesskey;" />
-			<menuitem command="sel_bucket" label="&staff.server.admin.transit.list.add.label;" accesskey="&staff.server.admin.transit.list.add.accesskey;"/>
-			<menuitem command="sel_opac" label="&staff.server.admin.transit.list.show.label;" accesskey="&staff.server.admin.transit.list.show.accesskey;" />
-			<menuitem command="sel_copy_details" label="&staff.server.admin.transit.list.details.label;" accesskey="&staff.server.admin.transit.list.details.accesskey;" />
-			<menuitem command="sel_patron" label="&staff.server.admin.transit.list.circs.label;" accesskey="&staff.server.admin.transit.list.circs.accesskey;"/>
-			<menuseparator />
-			<menuitem command="sel_edit" label="&staff.server.admin.transit.list.edit.label;" accesskey="&staff.server.admin.transit.list.edit.accesskey;" />
-			<menuitem command="sel_transit_abort" label="&staff.server.admin.transit.list.abort.label;" />
-			<menuseparator />
-			<menuitem command="save_columns" label="&staff.server.admin.transit.list.save.label;"/>
-		</popup>
-	</popupset>
-
-	<commandset id="transit_list_cmds">
-		<command id="cmd_print_list" />
-		<command id="save_columns" />
-		<command id="sel_copy_details" disabled="true"/>
-		<command id="sel_patron" disabled="true"/>
-		<command id="sel_edit" disabled="true"/>
-		<command id="sel_opac" disabled="true"/>
-		<command id="sel_bucket" disabled="true"/>
-		<command id="sel_transit_abort" disabled="true"/>
-		<command id="sel_clip" disabled="true"/>
-		<command id="cmd_kick_off"/>
-	</commandset>
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for admin_transit_list.xul');
+
+    JSAN.use('admin.transit_list');
+    g.transit_list = new admin.transit_list();
+    g.transit_list.init();
+
+   } catch(E) {
+    try { g.error.standard_unexpected_error_alert('admin/transit_list.xul',E); } catch(F) { alert(E); }
+   }
+  }
+
+ ]]>
+ </script>
+
+ <messagecatalog id="adminStrings" src='/xul/server/locale/<!--#echo var="locale"-->/admin.properties'/>
+ <messagecatalog id="circStrings" src='/xul/server/locale/<!--#echo var="locale"-->/circ.properties'/>
+ <messagecatalog id="catStrings" src='/xul/server/locale/<!--#echo var="locale"-->/cat.properties'/>
+
+ <vbox flex="1" class="my_overflow">
+  <hbox>
+   <groupbox id="lib_hbox" orient="horizontal">
+    <caption label="&staff.server.admin.transit.filter.caption;" class="shrinkable_groupbox"/> 
+    <vbox>
+     <label value="&staff.server.admin.transit.library.label;" class="header"/>
+     <hbox>
+      <menulist id="transit_direction">
+       <menupopup>
+        <menuitem label="&staff.server.admin.transit.to.label;" value="transit_to" selected="true"/>
+        <menuitem label="&staff.server.admin.transit.from.label;" value="transit_from" />
+       </menupopup>
+      </menulist>
+      <hbox id="libmenu_placeholder"/>
+     </hbox>
+     <label value="&staff.server.admin.transit.date.label;" class="header"/> 
+     <hbox>
+      <menulist id="sdate" editable="true">
+       <menupopup>
+        <menuitem label="&staff.server.admin.transit.date.today;" selected="true"/>
+        <menuitem label="&staff.server.admin.transit.date.week;" />
+        <menuitem label="&staff.server.admin.transit.date.2weeks;" />
+        <menuitem label="&staff.server.admin.transit.date.3weeks;" />
+        <menuitem label="&staff.server.admin.transit.date.30days;" />
+        <menuitem label="&staff.server.admin.transit.date.start;" />
+       </menupopup>
+      </menulist>
+      <menulist id="edate" editable="true">
+       <menupopup>
+        <menuitem label="&staff.server.admin.transit.date.today;" selected="true"/>
+        <menuitem label="&staff.server.admin.transit.date.week;" />
+        <menuitem label="&staff.server.admin.transit.date.2weeks;" />
+        <menuitem label="&staff.server.admin.transit.date.3weeks;" />
+        <menuitem label="&staff.server.admin.transit.date.30days;" />
+       </menupopup>
+      </menulist>
+     </hbox>
+    </vbox>
+    <button label="&staff.server.admin.transit.retrieve.label;" accesskey="&staff.server.admin.transit.retrieve.accesskey;" command="cmd_kick_off"/>
+   </groupbox>
+  </hbox>
+
+  <groupbox flex="1">
+   <caption label="&staff.server.admin.transit.list.label;" />
+   <hbox>
+    <button label="&staff.server.admin.transit.list.print;" command="cmd_print_list" />
+    <spacer flex="1"/>
+    <menubar>
+     <menu label="&staff.server.admin.transit.list.actions;" accesskey="&staff.server.admin.transit.list.actions.accesskey;">
+      <menupopup>
+       <menuitem command="sel_clip" label="&staff.server.admin.transit.list.copy.label;" accesskey="&staff.server.admin.transit.list.copy.accesskey;" />
+       <menuitem command="sel_bucket" label="&staff.server.admin.transit.list.add.label;" accesskey="&staff.server.admin.transit.list.add.accesskey;"/>
+       <menuitem command="sel_opac" label="&staff.server.admin.transit.list.show.label;" accesskey="&staff.server.admin.transit.list.show.accesskey;" />
+       <menuitem command="sel_copy_details" label="&staff.server.admin.transit.list.details.label;" accesskey="&staff.server.admin.transit.list.details.accesskey;" />
+       <menuitem command="sel_patron" label="&staff.server.admin.transit.list.circs.label;" accesskey="&staff.server.admin.transit.list.circs.accesskey;"/>
+       <menuseparator />
+       <menuitem command="sel_edit" label="&staff.server.admin.transit.list.edit.label;" accesskey="&staff.server.admin.transit.list.edit.accesskey;" />
+       <menuitem command="sel_transit_abort" label="&staff.server.admin.transit.list.abort.label;" />
+       <menuseparator />
+       <menuitem command="save_columns" label="&staff.server.admin.transit.list.save.label;"/>
+      </menupopup>
+     </menu>
+    </menubar>
+   </hbox>
+   <tree id="transit_list" flex="1" enableColumnDrag="true" context="transit_list_actions"/>
+  </groupbox>
+ </vbox>
+
+ <popupset id="transit_list_popupset">
+  <popup id="transit_list_actions" position="at_pointer"> 
+   <menuitem command="sel_clip" label="&staff.server.admin.transit.list.copy.label;" accesskey="&staff.server.admin.transit.list.copy.accesskey;" />
+   <menuitem command="sel_bucket" label="&staff.server.admin.transit.list.add.label;" accesskey="&staff.server.admin.transit.list.add.accesskey;"/>
+   <menuitem command="sel_opac" label="&staff.server.admin.transit.list.show.label;" accesskey="&staff.server.admin.transit.list.show.accesskey;" />
+   <menuitem command="sel_copy_details" label="&staff.server.admin.transit.list.details.label;" accesskey="&staff.server.admin.transit.list.details.accesskey;" />
+   <menuitem command="sel_patron" label="&staff.server.admin.transit.list.circs.label;" accesskey="&staff.server.admin.transit.list.circs.accesskey;"/>
+   <menuseparator />
+   <menuitem command="sel_edit" label="&staff.server.admin.transit.list.edit.label;" accesskey="&staff.server.admin.transit.list.edit.accesskey;" />
+   <menuitem command="sel_transit_abort" label="&staff.server.admin.transit.list.abort.label;" />
+   <menuseparator />
+   <menuitem command="save_columns" label="&staff.server.admin.transit.list.save.label;"/>
+  </popup>
+ </popupset>
+
+ <commandset id="transit_list_cmds">
+  <command id="cmd_print_list" />
+  <command id="save_columns" />
+  <command id="sel_copy_details" disabled="true"/>
+  <command id="sel_patron" disabled="true"/>
+  <command id="sel_edit" disabled="true"/>
+  <command id="sel_opac" disabled="true"/>
+  <command id="sel_bucket" disabled="true"/>
+  <command id="sel_transit_abort" disabled="true"/>
+  <command id="sel_clip" disabled="true"/>
+  <command id="cmd_kick_off"/>
+ </commandset>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/admin/upload_xacts.js b/Open-ILS/xul/staff_client/server/admin/upload_xacts.js
index 12dec910d5..8fe0772566 100644
--- a/Open-ILS/xul/staff_client/server/admin/upload_xacts.js
+++ b/Open-ILS/xul/staff_client/server/admin/upload_xacts.js
@@ -1,52 +1,52 @@
 var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
 
 function $(id) {
-	return document.getElementById(id);
+ return document.getElementById(id);
 }
 
 function my_init() {
-	try {
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalFileRead");
-		if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
-		JSAN.errorLevel = "die"; // none, warn, or die
-		JSAN.addRepository('..');
-		JSAN.use('util.error'); g.error = new util.error();
-		g.error.sdump('D_TRACE','my_init() for upload_xacts.html');
-
-		if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-			try { window.xulG.set_tab_name('Upload Offline Transactions'); } catch(E) { alert(E); }
-		}
-
-		JSAN.use('util.file'); g.file = new util.file( xul_param('filename') );
-
-		if (g.file._file.exists()) {
-			$('submit').disabled = false;
-			$('file').value = g.file._file.path;
-		} else {
-			alert('No transactions to upload.');
-			return;
-		}
-
-		$( 'ws' ).setAttribute('value', xul_param('ws'));
-		$( 'ses' ).setAttribute('value', xul_param('ses'));
-		$( 'seskey' ).setAttribute('value', xul_param('seskey'));
-		$( 'delta' ).setAttribute('value', xul_param('delta'));
-
-		$( 'form' ).setAttribute('action', xulG.url_prefix(urls.XUL_OFFLINE_MANAGE_XACTS_CGI));
-
-		setTimeout(
-			function() {
-				JSAN.use('util.widgets');
-				util.widgets.click('submit');
-			}, 0
-		);
-
-	} catch(E) {
-		var err_msg = "!! This software has encountered an error.  Please tell your friendly " +
-			"system administrator or software developer the following:\nmain/upload_xacts.xhtml\n" + E + '\n';
-		try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-		alert(err_msg);
-	}
+ try {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalFileRead");
+  if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
+  JSAN.errorLevel = "die"; // none, warn, or die
+  JSAN.addRepository('..');
+  JSAN.use('util.error'); g.error = new util.error();
+  g.error.sdump('D_TRACE','my_init() for upload_xacts.html');
+
+  if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+   try { window.xulG.set_tab_name('Upload Offline Transactions'); } catch(E) { alert(E); }
+  }
+
+  JSAN.use('util.file'); g.file = new util.file( xul_param('filename') );
+
+  if (g.file._file.exists()) {
+   $('submit').disabled = false;
+   $('file').value = g.file._file.path;
+  } else {
+   alert('No transactions to upload.');
+   return;
+  }
+
+  $( 'ws' ).setAttribute('value', xul_param('ws'));
+  $( 'ses' ).setAttribute('value', xul_param('ses'));
+  $( 'seskey' ).setAttribute('value', xul_param('seskey'));
+  $( 'delta' ).setAttribute('value', xul_param('delta'));
+
+  $( 'form' ).setAttribute('action', xulG.url_prefix(urls.XUL_OFFLINE_MANAGE_XACTS_CGI));
+
+  setTimeout(
+   function() {
+    JSAN.use('util.widgets');
+    util.widgets.click('submit');
+   }, 0
+  );
+
+ } catch(E) {
+  var err_msg = "!! This software has encountered an error.  Please tell your friendly " +
+   "system administrator or software developer the following:\nmain/upload_xacts.xhtml\n" + E + '\n';
+  try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+  alert(err_msg);
+ }
 }
 
 
diff --git a/Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml b/Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml
index 16c3e347dd..22d27b8f97 100644
--- a/Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml
@@ -1,42 +1,42 @@
 <?xml version='1.0' encoding="UTF-8"?>
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
-	<!ENTITY nbsp " "> <!-- calendar needs this entity -->
+ "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!ENTITY nbsp " "> <!-- calendar needs this entity -->
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <head>
-	<title>&staff.server.admin.upload_xacts.title;</title>
-	<link rel="stylesheet" type="text/css" media="all" href="chrome://global/skin/" title="chrome_skin" />
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"></script>
-	<script type="text/javascript" src="/xul/server/main/constants.js" />
-	<script type="text/javascript" src="/xul/server/OpenILS/global_util.js" />
+ <title>&staff.server.admin.upload_xacts.title;</title>
+ <link rel="stylesheet" type="text/css" media="all" href="chrome://global/skin/" title="chrome_skin" />
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"></script>
+ <script type="text/javascript" src="/xul/server/main/constants.js" />
+ <script type="text/javascript" src="/xul/server/OpenILS/global_util.js" />
 
-	<script type="text/javascript" src="/opac/common/js/utils.js" />
-	<script type="text/javascript" src="/opac/common/js/CGI.js" />
-	<script type="text/javascript" src="/opac/common/js/md5.js" />
-	<script type="text/javascript" src="/opac/common/js/JSON_v1.js" />
-	<script type="text/javascript" src="/opac/common/js/fmall.js" />
-	<script type="text/javascript" src="/opac/common/js/fmgen.js" />
-	<script type="text/javascript" src="/opac/common/js/RemoteRequest.js" />
+ <script type="text/javascript" src="/opac/common/js/utils.js" />
+ <script type="text/javascript" src="/opac/common/js/CGI.js" />
+ <script type="text/javascript" src="/opac/common/js/md5.js" />
+ <script type="text/javascript" src="/opac/common/js/JSON_v1.js" />
+ <script type="text/javascript" src="/opac/common/js/fmall.js" />
+ <script type="text/javascript" src="/opac/common/js/fmgen.js" />
+ <script type="text/javascript" src="/opac/common/js/RemoteRequest.js" />
 
-	<script type="text/javascript" src="upload_xacts.js" />
+ <script type="text/javascript" src="upload_xacts.js" />
 </head>
 <body onload="try{my_init();}catch(E){alert(E);}">
-	<h3>&staff.server.admin.upload_xacts.header;</h3>
-	<form id="form" method='post' enctype='multipart/form-data' style="display: none">
-		action:<input type='text' id="action" name='action' value='load'></input>
-		ws:<input type='text' id="ws" name='ws' value=''></input>
-		delta:<input type='text' id="delta" name='delta' value='0'> </input>
-		ses:<input type='text' id="ses" name='ses' value=''> </input>
-		seskey:<input type='text' id="seskey" name='seskey' value=''> </input>
-		file:<input type='file' id="file" name='file'> </input> 
-		html:<input type='text' id="html" name='html' value='1'> </input> 
-		<input type='submit' id="submit" name='Submit' value='&staff.server.admin.upload_xacts.upload;' disabled="true"> </input>
-	</form>
+ <h3>&staff.server.admin.upload_xacts.header;</h3>
+ <form id="form" method='post' enctype='multipart/form-data' style="display: none">
+  action:<input type='text' id="action" name='action' value='load'></input>
+  ws:<input type='text' id="ws" name='ws' value=''></input>
+  delta:<input type='text' id="delta" name='delta' value='0'> </input>
+  ses:<input type='text' id="ses" name='ses' value=''> </input>
+  seskey:<input type='text' id="seskey" name='seskey' value=''> </input>
+  file:<input type='file' id="file" name='file'> </input> 
+  html:<input type='text' id="html" name='html' value='1'> </input> 
+  <input type='submit' id="submit" name='Submit' value='&staff.server.admin.upload_xacts.upload;' disabled="true"> </input>
+ </form>
 </body>
 </html>
diff --git a/Open-ILS/xul/staff_client/server/cat/bib_brief.xul b/Open-ILS/xul/staff_client/server/cat/bib_brief.xul
index f5ab1222d0..44275abe99 100644
--- a/Open-ILS/xul/staff_client/server/cat/bib_brief.xul
+++ b/Open-ILS/xul/staff_client/server/cat/bib_brief.xul
@@ -14,7 +14,7 @@ vim: noet:sw=4:ts=4:
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -22,227 +22,227 @@ vim: noet:sw=4:ts=4:
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="cat_bib_brief_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns:html="http://www.w3.org/1999/xhtml"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+ xmlns:html="http://www.w3.org/1999/xhtml"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+ </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-
-		var docid;
-
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for cat_bib_brief.xul');
-
-				JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-
-				docid = xul_param('docid');
-
-				var key = location.pathname + location.search + location.hash;
-				if (!docid && typeof data.modal_xulG_stack != 'undefined' && typeof data.modal_xulG_stack[key] != 'undefined') {
-					var xulG = data.modal_xulG_stack[key][ data.modal_xulG_stack[key].length - 1 ];
-					if (typeof xulG == 'object') {
-						docid = xulG.docid;
-					}
-				}
-
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('util.date');
-
-				document.getElementById('caption').setAttribute('tooltiptext',document.getElementById('catStrings').getFormattedString('staff.cat.bib_brief.record_id', [docid]));
-
-				if (docid > -1) {
-
-					data.last_record = docid; data.stash('last_record');
-
-					g.network.simple_request(
-						'MODS_SLIM_RECORD_RETRIEVE.authoritative',
-						[ docid ],
-						function (req) {
-							var mods = req.getResultObject();
-							
-							if (mods.title()) document.getElementById('title').appendChild(
-								document.createTextNode(String(mods.title()).substr(0,50))
-							);
-							if (mods.author()) document.getElementById('author').appendChild(
-								document.createTextNode(mods.author())
-							);
-							if (mods.edition()) document.getElementById('edition').appendChild(
-								document.createTextNode(mods.edition())
-							);
-							if (mods.pubdate()) document.getElementById('pubdate').appendChild(
-								document.createTextNode(mods.pubdate())
-							);
-							if (mods.tcn()) document.getElementById('tcn').appendChild(
-								document.createTextNode(mods.tcn())
-							);
-	
-							if (window.xulG && typeof window.xulG.set_tab_name == 'function') {
-								try {
-									window.xulG.set_tab_name(mods.tcn());
-								} catch(E) {
-									g.error.sdump('D_ERROR','bib_brief.xul, set_tab: ' + E);
-								}
-							}
-	
-							g.network.simple_request(
-								'FM_BRE_RETRIEVE_VIA_ID.authoritative',
-								[ ses(), [ docid ] ],
-								function (req) {
-									try {
-										var meta = req.getResultObject();
-										if (typeof meta.ilsevent != 'undefined') throw(meta);
-										meta = meta[0];
-										document.getElementById('tcn_source').appendChild(
-											document.createTextNode(meta.tcn_source())
-										);
-										g.network.simple_request('FM_AU_FLESHED_RETRIEVE_VIA_ID',[ses(),meta.creator().id()],
-											function(rreq) {
-												var creator_au = rreq.getResultObject();
-												document.getElementById('creator_bc').appendChild(
-													document.createTextNode(creator_au.card().barcode())
-												);
-											}
-										);
-										g.network.simple_request('FM_AU_FLESHED_RETRIEVE_VIA_ID',[ses(),meta.editor().id()],
-											function(rreq) {
-												var editor_au = rreq.getResultObject();
-												document.getElementById('editor_bc').appendChild(
-													document.createTextNode(editor_au.card().barcode())
-												);
-											}
-										);
-										document.getElementById('creator').appendChild(
-											document.createTextNode('('+data.hash.aou[meta.creator().home_ou()].shortname()+') ')
-										);
-										document.getElementById('creator_bc').setAttribute('au_id',meta.creator().id());
-										document.getElementById('editor').appendChild(
-											document.createTextNode('('+data.hash.aou[meta.editor().home_ou()].shortname()+') ')
-										);
-										document.getElementById('editor_bc').setAttribute('au_id',meta.editor().id());
-										document.getElementById('edit_date').appendChild(
-											document.createTextNode(
-												util.date.formatted_date(meta.edit_date(),"%D")
-											)
-										);
-										var t = document.getElementById('caption').getAttribute('label');
-										if (get_bool( meta.deleted() )) { 
-											t += ' ' + document.getElementById('catStrings').getString('staff.cat.bib_brief.deleted') + ' '; 
-											document.getElementById('caption').setAttribute('style','background: red; color: white;');
-										}
-										if ( ! get_bool( meta.active() ) ) { 
-											t += ' ' + document.getElementById('catStrings').getString('staff.cat.bib_brief.inactive') + ' '; 
-											document.getElementById('caption').setAttribute('style','background: red; color: white;');
-										}
-										document.getElementById('caption').setAttribute('label',t);
-									} catch(E) {
-										g.error.standard_unexpected_error_alert('meta retrieve',E);
-									}
-								}
-							);
-						}
-					);
-
-				} else {
-					var t = document.getElementById('caption').getAttribute('label');
-					t += ' ' + document.getElementById('catStrings').getString('staff.cat.bib_brief.noncat') + ' '; 
-					document.getElementById('caption').setAttribute('style','background: red; color: white;');
-					document.getElementById('caption').setAttribute('label',t);
-				}
-
-			} catch(E) {
-				var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['cat/bib_brief.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function view_marc() {
-			try {
-				JSAN.use('util.window'); var win = new util.window();
-				if (docid < 0) {
-					alert(document.getElementById("catStrings").getString('staff.cat.bib_brief.noncat.alert'));
-				} else {
-					netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-					//win.open( urls.XUL_MARC_VIEW + '?noprint=1&docid=' + docid, 'marc_view', 'chrome,resizable,modal,width=400,height=400');
-					win.open( urls.XUL_MARC_VIEW, 'marc_view', 'chrome,resizable,modal,width=400,height=400',{'noprint':1,'docid':docid});
-				}
-			} catch(E) {
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+
+  var docid;
+
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for cat_bib_brief.xul');
+
+    JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+
+    docid = xul_param('docid');
+
+    var key = location.pathname + location.search + location.hash;
+    if (!docid && typeof data.modal_xulG_stack != 'undefined' && typeof data.modal_xulG_stack[key] != 'undefined') {
+     var xulG = data.modal_xulG_stack[key][ data.modal_xulG_stack[key].length - 1 ];
+     if (typeof xulG == 'object') {
+      docid = xulG.docid;
+     }
+    }
+
+    JSAN.use('util.network'); g.network = new util.network();
+    JSAN.use('util.date');
+
+    document.getElementById('caption').setAttribute('tooltiptext',document.getElementById('catStrings').getFormattedString('staff.cat.bib_brief.record_id', [docid]));
+
+    if (docid > -1) {
+
+     data.last_record = docid; data.stash('last_record');
+
+     g.network.simple_request(
+      'MODS_SLIM_RECORD_RETRIEVE.authoritative',
+      [ docid ],
+      function (req) {
+       var mods = req.getResultObject();
+       
+       if (mods.title()) document.getElementById('title').appendChild(
+        document.createTextNode(String(mods.title()).substr(0,50))
+       );
+       if (mods.author()) document.getElementById('author').appendChild(
+        document.createTextNode(mods.author())
+       );
+       if (mods.edition()) document.getElementById('edition').appendChild(
+        document.createTextNode(mods.edition())
+       );
+       if (mods.pubdate()) document.getElementById('pubdate').appendChild(
+        document.createTextNode(mods.pubdate())
+       );
+       if (mods.tcn()) document.getElementById('tcn').appendChild(
+        document.createTextNode(mods.tcn())
+       );
+ 
+       if (window.xulG && typeof window.xulG.set_tab_name == 'function') {
+        try {
+         window.xulG.set_tab_name(mods.tcn());
+        } catch(E) {
+         g.error.sdump('D_ERROR','bib_brief.xul, set_tab: ' + E);
+        }
+       }
+ 
+       g.network.simple_request(
+        'FM_BRE_RETRIEVE_VIA_ID.authoritative',
+        [ ses(), [ docid ] ],
+        function (req) {
+         try {
+          var meta = req.getResultObject();
+          if (typeof meta.ilsevent != 'undefined') throw(meta);
+          meta = meta[0];
+          document.getElementById('tcn_source').appendChild(
+           document.createTextNode(meta.tcn_source())
+          );
+          g.network.simple_request('FM_AU_FLESHED_RETRIEVE_VIA_ID',[ses(),meta.creator().id()],
+           function(rreq) {
+            var creator_au = rreq.getResultObject();
+            document.getElementById('creator_bc').appendChild(
+             document.createTextNode(creator_au.card().barcode())
+            );
+           }
+          );
+          g.network.simple_request('FM_AU_FLESHED_RETRIEVE_VIA_ID',[ses(),meta.editor().id()],
+           function(rreq) {
+            var editor_au = rreq.getResultObject();
+            document.getElementById('editor_bc').appendChild(
+             document.createTextNode(editor_au.card().barcode())
+            );
+           }
+          );
+          document.getElementById('creator').appendChild(
+           document.createTextNode('('+data.hash.aou[meta.creator().home_ou()].shortname()+') ')
+          );
+          document.getElementById('creator_bc').setAttribute('au_id',meta.creator().id());
+          document.getElementById('editor').appendChild(
+           document.createTextNode('('+data.hash.aou[meta.editor().home_ou()].shortname()+') ')
+          );
+          document.getElementById('editor_bc').setAttribute('au_id',meta.editor().id());
+          document.getElementById('edit_date').appendChild(
+           document.createTextNode(
+            util.date.formatted_date(meta.edit_date(),"%D")
+           )
+          );
+          var t = document.getElementById('caption').getAttribute('label');
+          if (get_bool( meta.deleted() )) { 
+           t += ' ' + document.getElementById('catStrings').getString('staff.cat.bib_brief.deleted') + ' '; 
+           document.getElementById('caption').setAttribute('style','background: red; color: white;');
+          }
+          if ( ! get_bool( meta.active() ) ) { 
+           t += ' ' + document.getElementById('catStrings').getString('staff.cat.bib_brief.inactive') + ' '; 
+           document.getElementById('caption').setAttribute('style','background: red; color: white;');
+          }
+          document.getElementById('caption').setAttribute('label',t);
+         } catch(E) {
+          g.error.standard_unexpected_error_alert('meta retrieve',E);
+         }
+        }
+       );
+      }
+     );
+
+    } else {
+     var t = document.getElementById('caption').getAttribute('label');
+     t += ' ' + document.getElementById('catStrings').getString('staff.cat.bib_brief.noncat') + ' '; 
+     document.getElementById('caption').setAttribute('style','background: red; color: white;');
+     document.getElementById('caption').setAttribute('label',t);
+    }
+
+   } catch(E) {
+    var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['cat/bib_brief.xul', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+
+  function view_marc() {
+   try {
+    JSAN.use('util.window'); var win = new util.window();
+    if (docid < 0) {
+     alert(document.getElementById("catStrings").getString('staff.cat.bib_brief.noncat.alert'));
+    } else {
+     netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+     //win.open( urls.XUL_MARC_VIEW + '?noprint=1&docid=' + docid, 'marc_view', 'chrome,resizable,modal,width=400,height=400');
+     win.open( urls.XUL_MARC_VIEW, 'marc_view', 'chrome,resizable,modal,width=400,height=400',{'noprint':1,'docid':docid});
+    }
+   } catch(E) {
                 g.error.standard_unexpected_error_alert('spawning marc display',E);
-			}
-		}
+   }
+  }
 
-		function spawn_patron(span) {
+  function spawn_patron(span) {
             try {
                 if (typeof window.xulG == 'object' && typeof window.xulG.set_patron_tab == 'function') {
                     window.xulG.set_patron_tab( {}, { 'id' : span.getAttribute('au_id') } );
                 } else {
-					copy_to_clipboard( span.textContent );
-				}
+     copy_to_clipboard( span.textContent );
+    }
             } catch(E) {
                 g.error.standard_unexpected_error_alert('spawning patron display',E);
             }
-		}
+  }
 
-	]]>
-	</script>
+ ]]>
+ </script>
 
     <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
 
-	<groupbox id="groupbox" flex="1" style="overflow: auto; min-height: 100px;">
-		<caption label="&staff.cat.bib_brief.record_summary;" id="caption"/>
-			<html:table width="90%">
-				<html:tr valign="top">
-					<html:td colspan="3">
-						<html:span style="font-weight: bold;">&staff.cat.bib_brief.title; </html:span><html:span id="title" />
-					</html:td>
-					<html:td>
-						(<html:a href="javascript:view_marc();" style="text-decoration: underline; color: blue;">&staff.cat.bib_brief.view_marc;</html:a>)
-					</html:td>
-				</html:tr>
-				<html:tr valign="top">
-					<html:td colspan="2">
-						<html:span style="font-weight: bold;">&staff.cat.bib_brief.author; </html:span><html:span id="author" />
-					</html:td>
-					<html:td>
-						<html:span style="font-weight: bold;">&staff.cat.bib_brief.edition; </html:span><html:span id="edition" />
-					</html:td>
-					<html:td>
-						<html:span style="font-weight: bold;">&staff.cat.bib_brief.pub_date; </html:span><html:span id="pubdate" />
-					</html:td>
-				</html:tr>
-				<html:tr valign="top">
-					<html:td>
-						<html:span style="font-weight: bold;">&staff.cat.bib_brief.title_control_number; (</html:span><html:span id="tcn_source"/><html:span style="font-weight: bold;">) </html:span><html:span id="tcn" style="text-decoration: underline; color: blue;" onclick="copy_to_clipboard(event)"/>
-					</html:td>
-					<html:td>
-						<html:span style="font-weight: bold;">&staff.cat.bib_brief.created_by; </html:span><html:span id="creator" />
-						<html:span id="creator_bc" style="text-decoration: underline; color: blue;" onclick="try{spawn_patron(this);}catch(E){alert(E);}"/>
-					</html:td>
-					<html:td>
-						<html:span style="font-weight: bold;">&staff.cat.bib_brief.last_edited_by; </html:span><html:span id="editor" />
-						<html:span id="editor_bc" style="text-decoration: underline; color: blue;" onclick="try{spawn_patron(this);}catch(E){alert(E);}"/>
-					</html:td>
-					<html:td>
-						<html:span style="font-weight: bold;">&staff.cat.bib_brief.last_edited_on; </html:span><html:span id="edit_date" />
-					</html:td>
-				</html:tr>
-			</html:table>
-	</groupbox>
+ <groupbox id="groupbox" flex="1" style="overflow: auto; min-height: 100px;">
+  <caption label="&staff.cat.bib_brief.record_summary;" id="caption"/>
+   <html:table width="90%">
+    <html:tr valign="top">
+     <html:td colspan="3">
+      <html:span style="font-weight: bold;">&staff.cat.bib_brief.title; </html:span><html:span id="title" />
+     </html:td>
+     <html:td>
+      (<html:a href="javascript:view_marc();" style="text-decoration: underline; color: blue;">&staff.cat.bib_brief.view_marc;</html:a>)
+     </html:td>
+    </html:tr>
+    <html:tr valign="top">
+     <html:td colspan="2">
+      <html:span style="font-weight: bold;">&staff.cat.bib_brief.author; </html:span><html:span id="author" />
+     </html:td>
+     <html:td>
+      <html:span style="font-weight: bold;">&staff.cat.bib_brief.edition; </html:span><html:span id="edition" />
+     </html:td>
+     <html:td>
+      <html:span style="font-weight: bold;">&staff.cat.bib_brief.pub_date; </html:span><html:span id="pubdate" />
+     </html:td>
+    </html:tr>
+    <html:tr valign="top">
+     <html:td>
+      <html:span style="font-weight: bold;">&staff.cat.bib_brief.title_control_number; (</html:span><html:span id="tcn_source"/><html:span style="font-weight: bold;">) </html:span><html:span id="tcn" style="text-decoration: underline; color: blue;" onclick="copy_to_clipboard(event)"/>
+     </html:td>
+     <html:td>
+      <html:span style="font-weight: bold;">&staff.cat.bib_brief.created_by; </html:span><html:span id="creator" />
+      <html:span id="creator_bc" style="text-decoration: underline; color: blue;" onclick="try{spawn_patron(this);}catch(E){alert(E);}"/>
+     </html:td>
+     <html:td>
+      <html:span style="font-weight: bold;">&staff.cat.bib_brief.last_edited_by; </html:span><html:span id="editor" />
+      <html:span id="editor_bc" style="text-decoration: underline; color: blue;" onclick="try{spawn_patron(this);}catch(E){alert(E);}"/>
+     </html:td>
+     <html:td>
+      <html:span style="font-weight: bold;">&staff.cat.bib_brief.last_edited_on; </html:span><html:span id="edit_date" />
+     </html:td>
+    </html:tr>
+   </html:table>
+ </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_browser.js b/Open-ILS/xul/staff_client/server/cat/copy_browser.js
index 9e4155c6c1..7c61f2c446 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_browser.js
+++ b/Open-ILS/xul/staff_client/server/cat/copy_browser.js
@@ -3,572 +3,572 @@ dump('entering cat.copy_browser.js\n');
 
 if (typeof cat == 'undefined') cat = {};
 cat.copy_browser = function (params) {
-	try {
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		JSAN.use('util.error'); this.error = new util.error();
-	} catch(E) {
-		dump('cat.copy_browser: ' + E + '\n');
-	}
+ try {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  JSAN.use('util.error'); this.error = new util.error();
+ } catch(E) {
+  dump('cat.copy_browser: ' + E + '\n');
+ }
 }
 
 cat.copy_browser.prototype = {
 
-	'map_tree' : {},
-	'map_acn' : {},
-	'map_acp' : {},
-	'sel_list' : [],
+ 'map_tree' : {},
+ 'map_acn' : {},
+ 'map_acp' : {},
+ 'sel_list' : [],
     'funcs' : [],
 
-	'init' : function( params ) {
-
-		try {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			var obj = this;
-
-			obj.docid = params.docid;
-
-			JSAN.use('util.network'); obj.network = new util.network();
-			JSAN.use('OpenILS.data'); obj.data = new OpenILS.data(); obj.data.init({'via':'stash'});
-			JSAN.use('util.controller'); obj.controller = new util.controller();
-			obj.controller.init(
-				{
-					control_map : {
-						'save_columns' : [ [ 'command' ], function() { obj.list.save_columns(); } ],
-						'sel_clip' : [
-							['command'],
-							function() { obj.list.clipboard(); }
-						],
-						'cmd_broken' : [
-							['command'],
-							function() { 
-								alert(document.getElementById('commonStrings').getString('common.unimplemented'));
-							}
-						],
-						'cmd_show_my_libs' : [
-							['command'],
-							function() { 
-								obj.show_my_libs(); 
-							}
-						],
-						'cmd_show_all_libs' : [
-							['command'],
-							function() {
-								obj.show_all_libs();
-							}
-						],
-						'cmd_show_libs_with_copies' : [
-							['command'],
-							function() {
-								obj.show_libs_with_copies();
-							}
-						],
-						'cmd_clear' : [
-							['command'],
-							function() {
-								obj.map_tree = {};
-								obj.list.clear();
-							}
-						],
-						'sel_mark_items_damaged' : [
-							['command'],
-							function() {
-								JSAN.use('cat.util'); JSAN.use('util.functional');
-
-								var list = util.functional.filter_list( obj.sel_list, function (o) { return o.split(/_/)[0] == 'acp'; });
-
-								list = util.functional.map_list( list, function (o) { return o.split(/_/)[1]; });
-
-								cat.util.mark_item_damaged( list );
-
-								obj.refresh_list();
-							}
-						],
-						'sel_mark_items_missing' : [
-							['command'],
-							function() {
-								JSAN.use('cat.util'); JSAN.use('util.functional');
-
-								var list = util.functional.filter_list( obj.sel_list, function (o) { return o.split(/_/)[0] == 'acp'; });
-
-								list = util.functional.map_list( list, function (o) { return o.split(/_/)[1]; });
-
-								cat.util.mark_item_missing( list );
-
-								obj.refresh_list();
-							}
-						],
-						'sel_patron' : [
-							['command'],
-							function() {
-								JSAN.use('util.functional');
-
-								var list = util.functional.filter_list(
-									obj.sel_list,
-									function (o) {
-										return o.split(/_/)[0] == 'acp';
-									}
-								);
-
-								list = util.functional.map_list(
-									list,
-									function (o) {
-										return { 'copy_id' : o.split(/_/)[1] };
-									}
-								);
-								
-								JSAN.use('circ.util');
-								circ.util.show_last_few_circs(list);
-							}
-						],
-						'sel_copy_details' : [
-							['command'],
-							function() {
-								JSAN.use('util.functional');
-
-								var list = util.functional.filter_list(
-									obj.sel_list,
-									function (o) {
-										return o.split(/_/)[0] == 'acp';
-									}
-								);
-
-								list = util.functional.map_list(
-									list,
-									function (o) {
-										return o.split(/_/)[1];
-									}
-								);
-	
-								JSAN.use('circ.util');
-								for (var i = 0; i < list.length; i++) {
-									circ.util.show_copy_details( list[i] );
-								}
-							}
-						],
-						'cmd_add_items' : [
-							['command'],
-							function() {
-								try {
-									JSAN.use('util.functional');
-									var list = util.functional.map_list(
-										util.functional.filter_list(
-											obj.sel_list,
-											function (o) {
-												return o.split(/_/)[0] == 'acn';
-											}
-										),
-										function (o) {
-											return o.split(/_/)[1];
-										}
-									);
-									if (list.length == 0) return;
-
-									var copy_shortcut = {};
-									list = util.functional.map_list(
-										list,
-										function (o) {
-											var ou_id = obj.map_acn['acn_' + o].owning_lib();
-											var volume_id = o;
-											var label = obj.map_acn['acn_' + o].label();
-											if (!copy_shortcut[ou_id]) copy_shortcut[ou_id] = {};
-											copy_shortcut[ou_id][ label ] = volume_id;
-
-											return ou_id;
-										}
-									);
-									/* quick fix */  /* what was this fixing? */
-									list = []; for (var i in copy_shortcut) { list.push( i ); }
-
-									var edit = 0;
-									try {
-										edit = obj.network.request(
-											api.PERM_MULTI_ORG_CHECK.app,
-											api.PERM_MULTI_ORG_CHECK.method,
-											[ 
-												ses(), 
-												obj.data.list.au[0].id(), 
-												list,
-												[ 'CREATE_COPY' ]
-											]
-										).length == 0 ? 1 : 0;
-									} catch(E) {
-										obj.error.sdump('D_ERROR','batch permission check: ' + E);
-									}
-
-									if (edit==0) return; // no read-only view for this interface
-
-									var title = document.getElementById('catStrings').getString('staff.cat.copy_browser.add_item.title');
-
-									JSAN.use('util.window'); var win = new util.window();
-									var w = win.open(
-										window.xulG.url_prefix(urls.XUL_VOLUME_COPY_CREATOR),
-											//+'?doc_id=' + window.escape(obj.docid)
-											//+'&ou_ids=' + window.escape( js2JSON(list) )
-											//+'&copy_shortcut=' + window.escape( js2JSON(copy_shortcut) ),
-										title,
-										'chrome,resizable'
-									);
-									w.refresh = function() { obj.refresh_list(); }
-									w.xulG = { 'doc_id':obj.docid, 'ou_ids' : list, 'copy_shortcut' : copy_shortcut };
-								} catch(E) {
-									obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.add_item.error'),E);
-								}
-							}
-						],
-						'cmd_add_items_to_buckets' : [
-							['command'],
-							function() {
-								try {
-									JSAN.use('util.functional');
-
-									var list = util.functional.filter_list(
-										obj.sel_list,
-										function (o) {
-											return o.split(/_/)[0] == 'acp';
-										}
-									);
-
-									list = util.functional.map_list(
-										list,
-										function (o) {
-											return o.split(/_/)[1];
-										}
-									);
-								
-									JSAN.use('cat.util');
-									cat.util.add_copies_to_bucket( list );
-
-								} catch(E) {
-									obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.add_items_bucket.error'),E);
-								}
-							}
-						],
-						'cmd_replace_barcode' : [
-							['command'],
-							function() {
-								try {
-									JSAN.use('util.functional');
-
-									var list = util.functional.filter_list(
-										obj.sel_list,
-										function (o) {
-											return o.split(/_/)[0] == 'acp';
-										}
-									);
-
-									list = util.functional.map_list(
-										list,
-										function (o) {
-											return obj.map_acp[ o ].barcode();
-										}
-									);
-
-									JSAN.use('cat.util');
-									for (var i = 0; i < list.length; i++) {
-										try {
-											cat.util.replace_barcode(list[i]);
-										} catch(E) {
-											obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getFormattedString('staff.cat.copy_browser.replace_barcode.failed', [list[i]]),E);
-										}
-									}
-									obj.refresh_list();
-
-								} catch(E) {
-									obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.replace_barcode.error'),E);
-									obj.refresh_list();
-								}
-							}
-						],
-						'cmd_edit_items' : [
-							['command'],
-							function() {
-								try {
-									JSAN.use('util.functional');
-
-									var list = util.functional.filter_list(
-										obj.sel_list,
-										function (o) {
-											return o.split(/_/)[0] == 'acp';
-										}
-									);
-
-									list = util.functional.map_list(
-										list,
-										function (o) {
-											return o.split(/_/)[1];
-										}
-									);
-
-									JSAN.use('cat.util'); cat.util.spawn_copy_editor( { 'copy_ids' : list, 'edit' : 1 } );
-									obj.refresh_list();
-
-								} catch(E) {
-									obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.edit_items.error'),E);
-								}
-							}
-						],
-						'cmd_delete_items' : [
-							['command'],
-							function() {
-								try {
-									JSAN.use('util.functional');
-
-									var list = util.functional.filter_list(
-										obj.sel_list,
-										function (o) {
-											return o.split(/_/)[0] == 'acp';
-										}
-									);
-
-									list = util.functional.map_list(
-										list,
-										function (o) {
-											return JSON2js( js2JSON( obj.map_acp[ 'acp_' + o.split(/_/)[1] ] ) );
-										}
-									);
-
-									var delete_msg;
-									if (list.length != 1) {
-										delete_msg = document.getElementById('catStrings').getFormattedString('staff.cat.copy_browser.delete_items.confirm.plural', [list.length]);
-									} else {
-										delete_msg = document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_items.confirm');
-									}
-									var r = obj.error.yns_alert(
-											delete_msg,
-											document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_items.title'),
-											document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_items.delete'),
-											document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_items.cancel'),
-											null,
-											document.getElementById('commonStrings').getString('common.confirm')
-									);
-
-									if (r == 0) {
-										var acn_hash = {}; var acn_list = [];
-										for (var i = 0; i < list.length; i++) {
-											list[i].isdeleted('1');
-											var acn_id = list[i].call_number();
-											if ( ! acn_hash[ acn_id ] ) {
-												acn_hash[ acn_id ] = obj.map_acn[ 'acn_' + acn_id ];
-												acn_hash[ acn_id ].copies( [] );
-											}
-											var temp = acn_hash[ acn_id ].copies();
-											temp.push( list[i] );
-											acn_hash[ acn_id ].copies( temp );
-										}
-										for (var i in acn_hash) acn_list.push( acn_hash[i] );
-										var robj = obj.network.simple_request(
-											'FM_ACN_TREE_UPDATE', 
-											[ ses(), acn_list, true ],
-											null,
-											{
-												'title' : document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_items.override'),
-												'overridable_events' : [
-													1208 /* TITLE_LAST_COPY */,
-													1227 /* COPY_DELETE_WARNING */,
-												]
-											}
-										);
-										if (robj == null) throw(robj);
-										if (typeof robj.ilsevent != 'undefined') {
-											if ( (robj.ilsevent != 0) && (robj.ilsevent != 1227 /* COPY_DELETE_WARNING */) && (robj.ilsevent != 1208 /* TITLE_LAST_COPY */) ) throw(robj);
-										}
-										obj.refresh_list();
-									}
-
-									
-								} catch(E) {
-									obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_items.error'),E);
-									obj.refresh_list();
-								}
-							}
-						],
-						'cmd_print_spine_labels' : [
-							['command'],
-							function() {
-								try {
-									JSAN.use('util.functional');
-									
-									var list = util.functional.filter_list(
-										obj.sel_list,
-										function (o) {
-											return o.split(/_/)[0] == 'acp';
-										}
-									);
-
-									list = util.functional.map_list(
-										list,
-										function (o) {
-											return obj.map_acp[ o ];
-										}
-									);
-
-									obj.data.temp_barcodes_for_labels = util.functional.map_list( list, function(o){return o.barcode();}) ; 
-									obj.data.stash('temp_barcodes_for_labels');
-									xulG.new_tab(
-										xulG.url_prefix( urls.XUL_SPINE_LABEL ),
-										{ 'tab_name' : document.getElementById('catStrings').getString('staff.cat.copy_browser.print_spine.tab') },
-										{}
-									);
-								} catch(E) {
-									obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.print_spine.error'),E);
-								}
-							}
-						],
-						'cmd_add_volumes' : [
-							['command'],
-							function() {
-								try {
-									JSAN.use('util.functional');
-									var list = util.functional.filter_list(
-										obj.sel_list,
-										function (o) {
-											return o.split(/_/)[0] == 'aou';
-										}
-									);
-									list = util.functional.map_list(
-										list,
-										function (o) {
-											return o.split(/_/)[1];
-										}
-									);		
-									var edit = 0;
-									try {
-										edit = obj.network.request(
-											api.PERM_MULTI_ORG_CHECK.app,
-											api.PERM_MULTI_ORG_CHECK.method,
-											[ 
-												ses(), 
-												obj.data.list.au[0].id(), 
-												list,
-												[ 'CREATE_VOLUME', 'CREATE_COPY' ]
-											]
-										).length == 0 ? 1 : 0;
-									} catch(E) {
-										obj.error.sdump('D_ERROR','batch permission check: ' + E);
-									}
-
-									if (edit==0) {
-										alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.add_volume.permission_error'));
-										return; // no read-only view for this interface
-									}
-
-									var title = document.getElementById('catStrings').getString('staff.cat.copy_browser.add_volume.title');
-
-									JSAN.use('util.window'); var win = new util.window();
-									var w = win.open(
-										window.xulG.url_prefix(urls.XUL_VOLUME_COPY_CREATOR),
-											//+'?doc_id=' + window.escape(obj.docid)
-											//+'&ou_ids=' + window.escape( js2JSON(list) ),
-										title,
-										'chrome,resizable'
-									);
-
-									w.refresh = function() { obj.refresh_list() };
-									w.xulG = { 'doc_id' : obj.docid, 'ou_ids' : list };
-								} catch(E) {
-									obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.add_volume.error'),E);
-								}
-							}
-						],
-						'cmd_edit_volumes' : [
-							['command'],
-							function() {
-								try {
-									JSAN.use('util.functional');
-									var list = util.functional.map_list(
-										util.functional.filter_list(
-											obj.sel_list,
-											function (o) {
-												return o.split(/_/)[0] == 'acn';
-											}
-										),
-										function (o) {
-											return o.split(/_/)[1];
-										}
-									);
-									if (list.length == 0) return;
-
-									var edit = 0;
-									try {
-										edit = obj.network.request(
-											api.PERM_MULTI_ORG_CHECK.app,
-											api.PERM_MULTI_ORG_CHECK.method,
-											[ 
-												ses(), 
-												obj.data.list.au[0].id(), 
-												util.functional.map_list(
-													list,
-													function (o) {
-														return obj.map_acn[ 'acn_' + o ].owning_lib();
-													}
-												),
-												[ 'UPDATE_VOLUME' ]
-											]
-										).length == 0 ? 1 : 0;
-									} catch(E) {
-										obj.error.sdump('D_ERROR','batch permission check: ' + E);
-									}
-
-									if (edit==0) {
-										alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.edit_volume.permission_error'));
-										return; // no read-only view for this interface
-									}
-
-									list = util.functional.map_list(
-										list,
-										function (o) {
-											var my_acn = obj.map_acn['acn_' + o];
-											return function(r){return r;}(my_acn);
-										}
-									);
-
-									var title;
-									if (list.length == 1) {
-										title = document.getElementById('catStrings').getString('staff.cat.copy_browser.edit_volume.title');
-									} else {
-										title = document.getElementById('catStrings').getString('staff.cat.copy_browser.edit_volume.title.plural');
-									}
-
-									JSAN.use('util.window'); var win = new util.window();
-									//obj.data.volumes_temp = js2JSON( list );
-									//obj.data.stash('volumes_temp');
-									var my_xulG = win.open(
-										window.xulG.url_prefix(urls.XUL_VOLUME_EDITOR),
-										title,
-										'chrome,modal,resizable',
-										{ 'volumes' : JSON2js(js2JSON(list)) }
-									);
-
-									/* FIXME -- need to unique the temp space, and not rely on modalness of window */
-									//obj.data.stash_retrieve();
+ 'init' : function( params ) {
+
+  try {
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   var obj = this;
+
+   obj.docid = params.docid;
+
+   JSAN.use('util.network'); obj.network = new util.network();
+   JSAN.use('OpenILS.data'); obj.data = new OpenILS.data(); obj.data.init({'via':'stash'});
+   JSAN.use('util.controller'); obj.controller = new util.controller();
+   obj.controller.init(
+    {
+     control_map : {
+      'save_columns' : [ [ 'command' ], function() { obj.list.save_columns(); } ],
+      'sel_clip' : [
+       ['command'],
+       function() { obj.list.clipboard(); }
+      ],
+      'cmd_broken' : [
+       ['command'],
+       function() { 
+        alert(document.getElementById('commonStrings').getString('common.unimplemented'));
+       }
+      ],
+      'cmd_show_my_libs' : [
+       ['command'],
+       function() { 
+        obj.show_my_libs(); 
+       }
+      ],
+      'cmd_show_all_libs' : [
+       ['command'],
+       function() {
+        obj.show_all_libs();
+       }
+      ],
+      'cmd_show_libs_with_copies' : [
+       ['command'],
+       function() {
+        obj.show_libs_with_copies();
+       }
+      ],
+      'cmd_clear' : [
+       ['command'],
+       function() {
+        obj.map_tree = {};
+        obj.list.clear();
+       }
+      ],
+      'sel_mark_items_damaged' : [
+       ['command'],
+       function() {
+        JSAN.use('cat.util'); JSAN.use('util.functional');
+
+        var list = util.functional.filter_list( obj.sel_list, function (o) { return o.split(/_/)[0] == 'acp'; });
+
+        list = util.functional.map_list( list, function (o) { return o.split(/_/)[1]; });
+
+        cat.util.mark_item_damaged( list );
+
+        obj.refresh_list();
+       }
+      ],
+      'sel_mark_items_missing' : [
+       ['command'],
+       function() {
+        JSAN.use('cat.util'); JSAN.use('util.functional');
+
+        var list = util.functional.filter_list( obj.sel_list, function (o) { return o.split(/_/)[0] == 'acp'; });
+
+        list = util.functional.map_list( list, function (o) { return o.split(/_/)[1]; });
+
+        cat.util.mark_item_missing( list );
+
+        obj.refresh_list();
+       }
+      ],
+      'sel_patron' : [
+       ['command'],
+       function() {
+        JSAN.use('util.functional');
+
+        var list = util.functional.filter_list(
+         obj.sel_list,
+         function (o) {
+          return o.split(/_/)[0] == 'acp';
+         }
+        );
+
+        list = util.functional.map_list(
+         list,
+         function (o) {
+          return { 'copy_id' : o.split(/_/)[1] };
+         }
+        );
+        
+        JSAN.use('circ.util');
+        circ.util.show_last_few_circs(list);
+       }
+      ],
+      'sel_copy_details' : [
+       ['command'],
+       function() {
+        JSAN.use('util.functional');
+
+        var list = util.functional.filter_list(
+         obj.sel_list,
+         function (o) {
+          return o.split(/_/)[0] == 'acp';
+         }
+        );
+
+        list = util.functional.map_list(
+         list,
+         function (o) {
+          return o.split(/_/)[1];
+         }
+        );
+ 
+        JSAN.use('circ.util');
+        for (var i = 0; i < list.length; i++) {
+         circ.util.show_copy_details( list[i] );
+        }
+       }
+      ],
+      'cmd_add_items' : [
+       ['command'],
+       function() {
+        try {
+         JSAN.use('util.functional');
+         var list = util.functional.map_list(
+          util.functional.filter_list(
+           obj.sel_list,
+           function (o) {
+            return o.split(/_/)[0] == 'acn';
+           }
+          ),
+          function (o) {
+           return o.split(/_/)[1];
+          }
+         );
+         if (list.length == 0) return;
+
+         var copy_shortcut = {};
+         list = util.functional.map_list(
+          list,
+          function (o) {
+           var ou_id = obj.map_acn['acn_' + o].owning_lib();
+           var volume_id = o;
+           var label = obj.map_acn['acn_' + o].label();
+           if (!copy_shortcut[ou_id]) copy_shortcut[ou_id] = {};
+           copy_shortcut[ou_id][ label ] = volume_id;
+
+           return ou_id;
+          }
+         );
+         /* quick fix */  /* what was this fixing? */
+         list = []; for (var i in copy_shortcut) { list.push( i ); }
+
+         var edit = 0;
+         try {
+          edit = obj.network.request(
+           api.PERM_MULTI_ORG_CHECK.app,
+           api.PERM_MULTI_ORG_CHECK.method,
+           [ 
+            ses(), 
+            obj.data.list.au[0].id(), 
+            list,
+            [ 'CREATE_COPY' ]
+           ]
+          ).length == 0 ? 1 : 0;
+         } catch(E) {
+          obj.error.sdump('D_ERROR','batch permission check: ' + E);
+         }
+
+         if (edit==0) return; // no read-only view for this interface
+
+         var title = document.getElementById('catStrings').getString('staff.cat.copy_browser.add_item.title');
+
+         JSAN.use('util.window'); var win = new util.window();
+         var w = win.open(
+          window.xulG.url_prefix(urls.XUL_VOLUME_COPY_CREATOR),
+           //+'?doc_id=' + window.escape(obj.docid)
+           //+'&ou_ids=' + window.escape( js2JSON(list) )
+           //+'&copy_shortcut=' + window.escape( js2JSON(copy_shortcut) ),
+          title,
+          'chrome,resizable'
+         );
+         w.refresh = function() { obj.refresh_list(); }
+         w.xulG = { 'doc_id':obj.docid, 'ou_ids' : list, 'copy_shortcut' : copy_shortcut };
+        } catch(E) {
+         obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.add_item.error'),E);
+        }
+       }
+      ],
+      'cmd_add_items_to_buckets' : [
+       ['command'],
+       function() {
+        try {
+         JSAN.use('util.functional');
+
+         var list = util.functional.filter_list(
+          obj.sel_list,
+          function (o) {
+           return o.split(/_/)[0] == 'acp';
+          }
+         );
+
+         list = util.functional.map_list(
+          list,
+          function (o) {
+           return o.split(/_/)[1];
+          }
+         );
+        
+         JSAN.use('cat.util');
+         cat.util.add_copies_to_bucket( list );
+
+        } catch(E) {
+         obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.add_items_bucket.error'),E);
+        }
+       }
+      ],
+      'cmd_replace_barcode' : [
+       ['command'],
+       function() {
+        try {
+         JSAN.use('util.functional');
+
+         var list = util.functional.filter_list(
+          obj.sel_list,
+          function (o) {
+           return o.split(/_/)[0] == 'acp';
+          }
+         );
+
+         list = util.functional.map_list(
+          list,
+          function (o) {
+           return obj.map_acp[ o ].barcode();
+          }
+         );
+
+         JSAN.use('cat.util');
+         for (var i = 0; i < list.length; i++) {
+          try {
+           cat.util.replace_barcode(list[i]);
+          } catch(E) {
+           obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getFormattedString('staff.cat.copy_browser.replace_barcode.failed', [list[i]]),E);
+          }
+         }
+         obj.refresh_list();
+
+        } catch(E) {
+         obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.replace_barcode.error'),E);
+         obj.refresh_list();
+        }
+       }
+      ],
+      'cmd_edit_items' : [
+       ['command'],
+       function() {
+        try {
+         JSAN.use('util.functional');
+
+         var list = util.functional.filter_list(
+          obj.sel_list,
+          function (o) {
+           return o.split(/_/)[0] == 'acp';
+          }
+         );
+
+         list = util.functional.map_list(
+          list,
+          function (o) {
+           return o.split(/_/)[1];
+          }
+         );
+
+         JSAN.use('cat.util'); cat.util.spawn_copy_editor( { 'copy_ids' : list, 'edit' : 1 } );
+         obj.refresh_list();
+
+        } catch(E) {
+         obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.edit_items.error'),E);
+        }
+       }
+      ],
+      'cmd_delete_items' : [
+       ['command'],
+       function() {
+        try {
+         JSAN.use('util.functional');
+
+         var list = util.functional.filter_list(
+          obj.sel_list,
+          function (o) {
+           return o.split(/_/)[0] == 'acp';
+          }
+         );
+
+         list = util.functional.map_list(
+          list,
+          function (o) {
+           return JSON2js( js2JSON( obj.map_acp[ 'acp_' + o.split(/_/)[1] ] ) );
+          }
+         );
+
+         var delete_msg;
+         if (list.length != 1) {
+          delete_msg = document.getElementById('catStrings').getFormattedString('staff.cat.copy_browser.delete_items.confirm.plural', [list.length]);
+         } else {
+          delete_msg = document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_items.confirm');
+         }
+         var r = obj.error.yns_alert(
+           delete_msg,
+           document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_items.title'),
+           document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_items.delete'),
+           document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_items.cancel'),
+           null,
+           document.getElementById('commonStrings').getString('common.confirm')
+         );
+
+         if (r == 0) {
+          var acn_hash = {}; var acn_list = [];
+          for (var i = 0; i < list.length; i++) {
+           list[i].isdeleted('1');
+           var acn_id = list[i].call_number();
+           if ( ! acn_hash[ acn_id ] ) {
+            acn_hash[ acn_id ] = obj.map_acn[ 'acn_' + acn_id ];
+            acn_hash[ acn_id ].copies( [] );
+           }
+           var temp = acn_hash[ acn_id ].copies();
+           temp.push( list[i] );
+           acn_hash[ acn_id ].copies( temp );
+          }
+          for (var i in acn_hash) acn_list.push( acn_hash[i] );
+          var robj = obj.network.simple_request(
+           'FM_ACN_TREE_UPDATE', 
+           [ ses(), acn_list, true ],
+           null,
+           {
+            'title' : document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_items.override'),
+            'overridable_events' : [
+             1208 /* TITLE_LAST_COPY */,
+             1227 /* COPY_DELETE_WARNING */,
+            ]
+           }
+          );
+          if (robj == null) throw(robj);
+          if (typeof robj.ilsevent != 'undefined') {
+           if ( (robj.ilsevent != 0) && (robj.ilsevent != 1227 /* COPY_DELETE_WARNING */) && (robj.ilsevent != 1208 /* TITLE_LAST_COPY */) ) throw(robj);
+          }
+          obj.refresh_list();
+         }
+
+         
+        } catch(E) {
+         obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_items.error'),E);
+         obj.refresh_list();
+        }
+       }
+      ],
+      'cmd_print_spine_labels' : [
+       ['command'],
+       function() {
+        try {
+         JSAN.use('util.functional');
+         
+         var list = util.functional.filter_list(
+          obj.sel_list,
+          function (o) {
+           return o.split(/_/)[0] == 'acp';
+          }
+         );
+
+         list = util.functional.map_list(
+          list,
+          function (o) {
+           return obj.map_acp[ o ];
+          }
+         );
+
+         obj.data.temp_barcodes_for_labels = util.functional.map_list( list, function(o){return o.barcode();}) ; 
+         obj.data.stash('temp_barcodes_for_labels');
+         xulG.new_tab(
+          xulG.url_prefix( urls.XUL_SPINE_LABEL ),
+          { 'tab_name' : document.getElementById('catStrings').getString('staff.cat.copy_browser.print_spine.tab') },
+          {}
+         );
+        } catch(E) {
+         obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.print_spine.error'),E);
+        }
+       }
+      ],
+      'cmd_add_volumes' : [
+       ['command'],
+       function() {
+        try {
+         JSAN.use('util.functional');
+         var list = util.functional.filter_list(
+          obj.sel_list,
+          function (o) {
+           return o.split(/_/)[0] == 'aou';
+          }
+         );
+         list = util.functional.map_list(
+          list,
+          function (o) {
+           return o.split(/_/)[1];
+          }
+         );  
+         var edit = 0;
+         try {
+          edit = obj.network.request(
+           api.PERM_MULTI_ORG_CHECK.app,
+           api.PERM_MULTI_ORG_CHECK.method,
+           [ 
+            ses(), 
+            obj.data.list.au[0].id(), 
+            list,
+            [ 'CREATE_VOLUME', 'CREATE_COPY' ]
+           ]
+          ).length == 0 ? 1 : 0;
+         } catch(E) {
+          obj.error.sdump('D_ERROR','batch permission check: ' + E);
+         }
+
+         if (edit==0) {
+          alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.add_volume.permission_error'));
+          return; // no read-only view for this interface
+         }
+
+         var title = document.getElementById('catStrings').getString('staff.cat.copy_browser.add_volume.title');
+
+         JSAN.use('util.window'); var win = new util.window();
+         var w = win.open(
+          window.xulG.url_prefix(urls.XUL_VOLUME_COPY_CREATOR),
+           //+'?doc_id=' + window.escape(obj.docid)
+           //+'&ou_ids=' + window.escape( js2JSON(list) ),
+          title,
+          'chrome,resizable'
+         );
+
+         w.refresh = function() { obj.refresh_list() };
+         w.xulG = { 'doc_id' : obj.docid, 'ou_ids' : list };
+        } catch(E) {
+         obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.add_volume.error'),E);
+        }
+       }
+      ],
+      'cmd_edit_volumes' : [
+       ['command'],
+       function() {
+        try {
+         JSAN.use('util.functional');
+         var list = util.functional.map_list(
+          util.functional.filter_list(
+           obj.sel_list,
+           function (o) {
+            return o.split(/_/)[0] == 'acn';
+           }
+          ),
+          function (o) {
+           return o.split(/_/)[1];
+          }
+         );
+         if (list.length == 0) return;
+
+         var edit = 0;
+         try {
+          edit = obj.network.request(
+           api.PERM_MULTI_ORG_CHECK.app,
+           api.PERM_MULTI_ORG_CHECK.method,
+           [ 
+            ses(), 
+            obj.data.list.au[0].id(), 
+            util.functional.map_list(
+             list,
+             function (o) {
+              return obj.map_acn[ 'acn_' + o ].owning_lib();
+             }
+            ),
+            [ 'UPDATE_VOLUME' ]
+           ]
+          ).length == 0 ? 1 : 0;
+         } catch(E) {
+          obj.error.sdump('D_ERROR','batch permission check: ' + E);
+         }
+
+         if (edit==0) {
+          alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.edit_volume.permission_error'));
+          return; // no read-only view for this interface
+         }
+
+         list = util.functional.map_list(
+          list,
+          function (o) {
+           var my_acn = obj.map_acn['acn_' + o];
+           return function(r){return r;}(my_acn);
+          }
+         );
+
+         var title;
+         if (list.length == 1) {
+          title = document.getElementById('catStrings').getString('staff.cat.copy_browser.edit_volume.title');
+         } else {
+          title = document.getElementById('catStrings').getString('staff.cat.copy_browser.edit_volume.title.plural');
+         }
+
+         JSAN.use('util.window'); var win = new util.window();
+         //obj.data.volumes_temp = js2JSON( list );
+         //obj.data.stash('volumes_temp');
+         var my_xulG = win.open(
+          window.xulG.url_prefix(urls.XUL_VOLUME_EDITOR),
+          title,
+          'chrome,modal,resizable',
+          { 'volumes' : JSON2js(js2JSON(list)) }
+         );
+
+         /* FIXME -- need to unique the temp space, and not rely on modalness of window */
+         //obj.data.stash_retrieve();
                                     if (typeof my_xulG.update_these_volumes == 'undefined') { return; }
-									var volumes = my_xulG.volumes;
-									if (!volumes) return;
-								
-									volumes = util.functional.filter_list(
-										volumes,
-										function (o) {
-											return o.ischanged() == '1';
-										}
-									);
-
-									volumes = util.functional.map_list(
-										volumes,
-										function (o) {
-											o.record( obj.docid ); // staff client 2 did not do this.  Does it matter?
-											return o;
-										}
-									);
-
-									if (volumes.length == 0) return;
-
-									try {
-										var r = obj.network.request(
-											api.FM_ACN_TREE_UPDATE.app,
-											api.FM_ACN_TREE_UPDATE.method,
-											[ ses(), volumes, true ]
-										);
-										if (typeof r.ilsevent != 'undefined') {
+         var volumes = my_xulG.volumes;
+         if (!volumes) return;
+        
+         volumes = util.functional.filter_list(
+          volumes,
+          function (o) {
+           return o.ischanged() == '1';
+          }
+         );
+
+         volumes = util.functional.map_list(
+          volumes,
+          function (o) {
+           o.record( obj.docid ); // staff client 2 did not do this.  Does it matter?
+           return o;
+          }
+         );
+
+         if (volumes.length == 0) return;
+
+         try {
+          var r = obj.network.request(
+           api.FM_ACN_TREE_UPDATE.app,
+           api.FM_ACN_TREE_UPDATE.method,
+           [ ses(), volumes, true ]
+          );
+          if (typeof r.ilsevent != 'undefined') {
                                             switch(Number(r.ilsevent)) {
                                                 case 1705 /* VOLUME_LABEL_EXISTS */ :
                                                     alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.edit_volume.failed'));
@@ -576,1098 +576,1098 @@ cat.copy_browser.prototype = {
                                                 default: throw(r);
                                             }
                                         } else {
-    										alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.edit_volume.success'));
+              alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.edit_volume.success'));
                                         }
-									} catch(E) {
-										obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.edit_volume.error'),E);
-									}
-									obj.refresh_list();
-
-								} catch(E) {
-									obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.edit_volume.exception'),E);
-								}
-							}
-						],
-						'cmd_delete_volumes' : [
-							['command'],
-							function() {
-								try {
-									JSAN.use('util.functional');
-
-									var list = util.functional.filter_list(
-										obj.sel_list,
-										function (o) {
-											return o.split(/_/)[0] == 'acn';
-										}
-									);
-
-									list = util.functional.map_list(
-										list,
-										function (o) {
-											return JSON2js( js2JSON( obj.map_acn[ 'acn_' + o.split(/_/)[1] ] ) );
-										}
-									);
-
-									var del_prompt;
-									if (list.length == 1) {
-										del_prompt = document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_volume.prompt');
-									} else {
-										del_prompt = document.getElementById('catStrings').getFormattedString('staff.cat.copy_browser.delete_volume.prompt.plural', [list.length]);
-									}
-
-									var r = obj.error.yns_alert(
-											del_prompt,
-											document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_volume.title'),
-											document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_volume.delete'),
-											document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_volume.cancel'),
-											null,
-											document.getElementById('commonStrings').getString('common.confirm')
-									);
-
-									if (r == 0) {
-										for (var i = 0; i < list.length; i++) {
-											list[i].isdeleted('1');
-										}
-										var robj = obj.network.simple_request(
-											'FM_ACN_TREE_UPDATE', 
-											[ ses(), list, true ],
-											null,
-											{
-												'title' : document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_volume.override'),
-												'overridable_events' : [
-												]
-											}
-										);
-										if (robj == null) throw(robj);
-										if (typeof robj.ilsevent != 'undefined') {
-											if (robj.ilsevent == 1206 /* VOLUME_NOT_EMPTY */) {
-												alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_volume.copies_remain'));
-												return;
-											}
-											if (robj.ilsevent != 0) throw(robj);
-										}
-										alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_volume.success'));
-										obj.refresh_list();
-									}
-								} catch(E) {
-									obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_volume.exception'),E);
-									obj.refresh_list();
-								}
-
-							}
-						],
-						'cmd_mark_library' : [
-							['command'],
-							function() {
-								try {
-									var list = util.functional.filter_list(
-										obj.sel_list,
-										function (o) {
-											return o.split(/_/)[0] == 'aou';
-										}
-									);
-
-									list = util.functional.map_list(
-										list,
-										function (o) {
-											return o.split(/_/)[1];
-										}
-									);
-
-									if (list.length == 1) {
-										obj.data.marked_library = { 'lib' : list[0], 'docid' : obj.docid };
-										obj.data.stash('marked_library');
-										alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.mark_library.alert'));
-									} else {
-										obj.error.yns_alert(
-												document.getElementById('catStrings').getString('staff.cat.copy_browser.mark_library.prompt'),
-												document.getElementById('catStrings').getString('staff.cat.copy_browser.mark_library.title'),
-												document.getElementById('commonStrings').getString('common.ok'),
-												null,
-												null,
-												document.getElementById('commonStrings').getString('common.confirm')
-												);
-									}
-								} catch(E) {
-									obj.error.standard_unexpected_error_alert('copy browser -> mark library',E);
-								}
-							}
-						],
-
-						'cmd_mark_volume' : [
-							['command'],
-							function() {
-								try {
-									var list = util.functional.filter_list(
-										obj.sel_list,
-										function (o) {
-											return o.split(/_/)[0] == 'acn';
-										}
-									);
-
-									list = util.functional.map_list(
-										list,
-										function (o) {
-											return o.split(/_/)[1];
-										}
-									);
-
-									if (list.length == 1) {
-										obj.data.marked_volume = list[0];
-										obj.data.stash('marked_volume');
-										alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.mark_volume.alert'));
-									} else {
-										obj.error.yns_alert(
-												document.getElementById('catStrings').getString('staff.cat.copy_browser.mark_volume.prompt'),
-												document.getElementById('catStrings').getString('staff.cat.copy_browser.mark_volume.title'),
-												document.getElementById('commonStrings').getString('common.ok'),
-												null,
-												null,
-												document.getElementById('commonStrings').getString('common.confirm')
-												);
-									}
-								} catch(E) {
-									obj.error.standard_unexpected_error_alert('copy browser -> mark volume',E);
-								}
-							}
-						],
-						'cmd_refresh_list' : [
-							['command'],
-							function() {
-								obj.refresh_list();
-							}
-						],
-						'cmd_transfer_volume' : [
-							['command'],
-							function() {
-								try {
-									obj.data.stash_retrieve();
-									if (!obj.data.marked_library) {
-										alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.transfer_volume.alert'));
-										return;
-									}
-									
-									JSAN.use('util.functional');
-
-									var list = util.functional.filter_list(
-										obj.sel_list,
-										function (o) {
-											return o.split(/_/)[0] == 'acn';
-										}
-									);
-
-									list = util.functional.map_list(
-										list,
-										function (o) {
-											return o.split(/_/)[1];
-										}
-									);
-
-									netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
-
-									var acn_list = util.functional.map_list(
-										list,
-										function (o) {
-											return obj.map_acn[ 'acn_' + o ].label();
-										}
-									).join(document.getElementById('commonStrings').getString('common.grouping_string'));
-
-									var xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: auto">';
-									xml += '<description>';
-									xml += document.getElementById('catStrings').getFormattedString('staff.cat.copy_browser.transfer.prompt', [acn_list, obj.data.hash.aou[ obj.data.marked_library.lib ].shortname()]);
-									xml += '</description>';
-									xml += '<hbox><button label="' + document.getElementById('catStrings').getString('staff.cat.copy_browser.transfer.submit.label') + '" name="fancy_submit"/>';
-									xml += '<button label="' 
-										+ document.getElementById('catStrings').getString('staff.cat.copy_browser.transfer.cancel.label') 
-										+ '" accesskey="' 
-										+ document.getElementById('catStrings').getString('staff.cat.copy_browser.transfer.cancel.accesskey') 
-										+ '" name="fancy_cancel"/></hbox>';
-									xml += '<iframe style="overflow: scroll" flex="1" src="' + urls.XUL_BIB_BRIEF + '?docid=' + obj.data.marked_library.docid + '"/>';
-									xml += '</vbox>';
-									JSAN.use('OpenILS.data');
-									var data = new OpenILS.data(); data.init({'via':'stash'});
-									//data.temp_transfer = xml; data.stash('temp_transfer');
-									JSAN.use('util.window'); var win = new util.window();
-									var fancy_prompt_data = win.open(
-										urls.XUL_FANCY_PROMPT,
-										//+ '?xml_in_stash=temp_transfer'
-										//+ '&title=' + window.escape('Volume Transfer'),
-										'fancy_prompt', 'chrome,resizable,modal,width=500,height=300',
-										{
-											'xml' : xml,
-											'title' : document.getElementById('catStrings').getString('staff.cat.copy_browser.transfer.title')
-										}
-									);
-
-									if (fancy_prompt_data.fancy_status == 'incomplete') {
-										alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.transfer.incomplete'));
-										return;
-									}
-
-									var robj = obj.network.simple_request(
-										'FM_ACN_TRANSFER', 
-										[ ses(), { 'docid' : obj.data.marked_library.docid, 'lib' : obj.data.marked_library.lib, 'volumes' : list } ],
-										null,
-										{
-											'title' : document.getElementById('catStrings').getString('staff.cat.copy_browser.transfer.override.failure'),
-											'overridable_events' : [
-												1208 /* TITLE_LAST_COPY */,
-												1219 /* COPY_REMOTE_CIRC_LIB */,
-											],
-										}
-									);
-
-									if (typeof robj.ilsevent != 'undefined') {
-										if (robj.ilsevent == 1221 /* ORG_CANNOT_HAVE_VOLS */) {
-											alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.transfer.ineligible_destination'));
-										} else {
-											throw(robj);
-										}
-									} else {
-										alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.transfer.success'));
-									}
-
-								} catch(E) {
-									obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.transfer.unexpected_error'),E);
-								}
-								obj.refresh_list();
-							}
-						],
-
-						'cmd_transfer_items' : [
-							['command'],
-							function() {
-								try {
-									obj.data.stash_retrieve();
-									if (!obj.data.marked_volume) {
-										alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.transfer_items.missing_volume'));
-										return;
-									}
-									
-									JSAN.use('util.functional');
-
-									var list = util.functional.filter_list(
-										obj.sel_list,
-										function (o) {
-											return o.split(/_/)[0] == 'acp';
-										}
-									);
-
-									list = util.functional.map_list(
-										list,
-										function (o) {
-											return o.split(/_/)[1];
-										}
-									);
-
-									var volume = obj.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ obj.data.marked_volume ]);
-
-									JSAN.use('cat.util'); cat.util.transfer_copies( { 
-										'copy_ids' : list, 
-										'docid' : volume.record(),
-										'volume_label' : volume.label(),
-										'owning_lib' : volume.owning_lib(),
-									} );
-
-								} catch(E) {
-									obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.transfer_items.unexpected_error'),E);
-								}
-								obj.refresh_list();
-							}
-						],
-					}
-				}
-			);
-
-			obj.list_init(params);
-
-			obj.org_ids = obj.network.simple_request('FM_AOU_IDS_RETRIEVE_VIA_RECORD_ID.authoritative',[ obj.docid ]);
-			if (typeof obj.org_ids.ilsevent != 'undefined') throw(obj.org_ids);
+         } catch(E) {
+          obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.edit_volume.error'),E);
+         }
+         obj.refresh_list();
+
+        } catch(E) {
+         obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.edit_volume.exception'),E);
+        }
+       }
+      ],
+      'cmd_delete_volumes' : [
+       ['command'],
+       function() {
+        try {
+         JSAN.use('util.functional');
+
+         var list = util.functional.filter_list(
+          obj.sel_list,
+          function (o) {
+           return o.split(/_/)[0] == 'acn';
+          }
+         );
+
+         list = util.functional.map_list(
+          list,
+          function (o) {
+           return JSON2js( js2JSON( obj.map_acn[ 'acn_' + o.split(/_/)[1] ] ) );
+          }
+         );
+
+         var del_prompt;
+         if (list.length == 1) {
+          del_prompt = document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_volume.prompt');
+         } else {
+          del_prompt = document.getElementById('catStrings').getFormattedString('staff.cat.copy_browser.delete_volume.prompt.plural', [list.length]);
+         }
+
+         var r = obj.error.yns_alert(
+           del_prompt,
+           document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_volume.title'),
+           document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_volume.delete'),
+           document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_volume.cancel'),
+           null,
+           document.getElementById('commonStrings').getString('common.confirm')
+         );
+
+         if (r == 0) {
+          for (var i = 0; i < list.length; i++) {
+           list[i].isdeleted('1');
+          }
+          var robj = obj.network.simple_request(
+           'FM_ACN_TREE_UPDATE', 
+           [ ses(), list, true ],
+           null,
+           {
+            'title' : document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_volume.override'),
+            'overridable_events' : [
+            ]
+           }
+          );
+          if (robj == null) throw(robj);
+          if (typeof robj.ilsevent != 'undefined') {
+           if (robj.ilsevent == 1206 /* VOLUME_NOT_EMPTY */) {
+            alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_volume.copies_remain'));
+            return;
+           }
+           if (robj.ilsevent != 0) throw(robj);
+          }
+          alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_volume.success'));
+          obj.refresh_list();
+         }
+        } catch(E) {
+         obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_volume.exception'),E);
+         obj.refresh_list();
+        }
+
+       }
+      ],
+      'cmd_mark_library' : [
+       ['command'],
+       function() {
+        try {
+         var list = util.functional.filter_list(
+          obj.sel_list,
+          function (o) {
+           return o.split(/_/)[0] == 'aou';
+          }
+         );
+
+         list = util.functional.map_list(
+          list,
+          function (o) {
+           return o.split(/_/)[1];
+          }
+         );
+
+         if (list.length == 1) {
+          obj.data.marked_library = { 'lib' : list[0], 'docid' : obj.docid };
+          obj.data.stash('marked_library');
+          alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.mark_library.alert'));
+         } else {
+          obj.error.yns_alert(
+            document.getElementById('catStrings').getString('staff.cat.copy_browser.mark_library.prompt'),
+            document.getElementById('catStrings').getString('staff.cat.copy_browser.mark_library.title'),
+            document.getElementById('commonStrings').getString('common.ok'),
+            null,
+            null,
+            document.getElementById('commonStrings').getString('common.confirm')
+            );
+         }
+        } catch(E) {
+         obj.error.standard_unexpected_error_alert('copy browser -> mark library',E);
+        }
+       }
+      ],
+
+      'cmd_mark_volume' : [
+       ['command'],
+       function() {
+        try {
+         var list = util.functional.filter_list(
+          obj.sel_list,
+          function (o) {
+           return o.split(/_/)[0] == 'acn';
+          }
+         );
+
+         list = util.functional.map_list(
+          list,
+          function (o) {
+           return o.split(/_/)[1];
+          }
+         );
+
+         if (list.length == 1) {
+          obj.data.marked_volume = list[0];
+          obj.data.stash('marked_volume');
+          alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.mark_volume.alert'));
+         } else {
+          obj.error.yns_alert(
+            document.getElementById('catStrings').getString('staff.cat.copy_browser.mark_volume.prompt'),
+            document.getElementById('catStrings').getString('staff.cat.copy_browser.mark_volume.title'),
+            document.getElementById('commonStrings').getString('common.ok'),
+            null,
+            null,
+            document.getElementById('commonStrings').getString('common.confirm')
+            );
+         }
+        } catch(E) {
+         obj.error.standard_unexpected_error_alert('copy browser -> mark volume',E);
+        }
+       }
+      ],
+      'cmd_refresh_list' : [
+       ['command'],
+       function() {
+        obj.refresh_list();
+       }
+      ],
+      'cmd_transfer_volume' : [
+       ['command'],
+       function() {
+        try {
+         obj.data.stash_retrieve();
+         if (!obj.data.marked_library) {
+          alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.transfer_volume.alert'));
+          return;
+         }
+         
+         JSAN.use('util.functional');
+
+         var list = util.functional.filter_list(
+          obj.sel_list,
+          function (o) {
+           return o.split(/_/)[0] == 'acn';
+          }
+         );
+
+         list = util.functional.map_list(
+          list,
+          function (o) {
+           return o.split(/_/)[1];
+          }
+         );
+
+         netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
+
+         var acn_list = util.functional.map_list(
+          list,
+          function (o) {
+           return obj.map_acn[ 'acn_' + o ].label();
+          }
+         ).join(document.getElementById('commonStrings').getString('common.grouping_string'));
+
+         var xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: auto">';
+         xml += '<description>';
+         xml += document.getElementById('catStrings').getFormattedString('staff.cat.copy_browser.transfer.prompt', [acn_list, obj.data.hash.aou[ obj.data.marked_library.lib ].shortname()]);
+         xml += '</description>';
+         xml += '<hbox><button label="' + document.getElementById('catStrings').getString('staff.cat.copy_browser.transfer.submit.label') + '" name="fancy_submit"/>';
+         xml += '<button label="' 
+          + document.getElementById('catStrings').getString('staff.cat.copy_browser.transfer.cancel.label') 
+          + '" accesskey="' 
+          + document.getElementById('catStrings').getString('staff.cat.copy_browser.transfer.cancel.accesskey') 
+          + '" name="fancy_cancel"/></hbox>';
+         xml += '<iframe style="overflow: scroll" flex="1" src="' + urls.XUL_BIB_BRIEF + '?docid=' + obj.data.marked_library.docid + '"/>';
+         xml += '</vbox>';
+         JSAN.use('OpenILS.data');
+         var data = new OpenILS.data(); data.init({'via':'stash'});
+         //data.temp_transfer = xml; data.stash('temp_transfer');
+         JSAN.use('util.window'); var win = new util.window();
+         var fancy_prompt_data = win.open(
+          urls.XUL_FANCY_PROMPT,
+          //+ '?xml_in_stash=temp_transfer'
+          //+ '&title=' + window.escape('Volume Transfer'),
+          'fancy_prompt', 'chrome,resizable,modal,width=500,height=300',
+          {
+           'xml' : xml,
+           'title' : document.getElementById('catStrings').getString('staff.cat.copy_browser.transfer.title')
+          }
+         );
+
+         if (fancy_prompt_data.fancy_status == 'incomplete') {
+          alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.transfer.incomplete'));
+          return;
+         }
+
+         var robj = obj.network.simple_request(
+          'FM_ACN_TRANSFER', 
+          [ ses(), { 'docid' : obj.data.marked_library.docid, 'lib' : obj.data.marked_library.lib, 'volumes' : list } ],
+          null,
+          {
+           'title' : document.getElementById('catStrings').getString('staff.cat.copy_browser.transfer.override.failure'),
+           'overridable_events' : [
+            1208 /* TITLE_LAST_COPY */,
+            1219 /* COPY_REMOTE_CIRC_LIB */,
+           ],
+          }
+         );
+
+         if (typeof robj.ilsevent != 'undefined') {
+          if (robj.ilsevent == 1221 /* ORG_CANNOT_HAVE_VOLS */) {
+           alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.transfer.ineligible_destination'));
+          } else {
+           throw(robj);
+          }
+         } else {
+          alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.transfer.success'));
+         }
+
+        } catch(E) {
+         obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.transfer.unexpected_error'),E);
+        }
+        obj.refresh_list();
+       }
+      ],
+
+      'cmd_transfer_items' : [
+       ['command'],
+       function() {
+        try {
+         obj.data.stash_retrieve();
+         if (!obj.data.marked_volume) {
+          alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.transfer_items.missing_volume'));
+          return;
+         }
+         
+         JSAN.use('util.functional');
+
+         var list = util.functional.filter_list(
+          obj.sel_list,
+          function (o) {
+           return o.split(/_/)[0] == 'acp';
+          }
+         );
+
+         list = util.functional.map_list(
+          list,
+          function (o) {
+           return o.split(/_/)[1];
+          }
+         );
+
+         var volume = obj.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ obj.data.marked_volume ]);
+
+         JSAN.use('cat.util'); cat.util.transfer_copies( { 
+          'copy_ids' : list, 
+          'docid' : volume.record(),
+          'volume_label' : volume.label(),
+          'owning_lib' : volume.owning_lib(),
+         } );
+
+        } catch(E) {
+         obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.transfer_items.unexpected_error'),E);
+        }
+        obj.refresh_list();
+       }
+      ],
+     }
+    }
+   );
+
+   obj.list_init(params);
+
+   obj.org_ids = obj.network.simple_request('FM_AOU_IDS_RETRIEVE_VIA_RECORD_ID.authoritative',[ obj.docid ]);
+   if (typeof obj.org_ids.ilsevent != 'undefined') throw(obj.org_ids);
             JSAN.use('util.functional'); 
             obj.org_ids = util.functional.map_list( obj.org_ids, function (o) { return Number(o); });
 
-			var org = obj.data.hash.aou[ obj.data.list.au[0].ws_ou() ];
-			//obj.show_libs( org );
-
-			//obj.show_my_libs();
-
-			JSAN.use('util.file'); JSAN.use('util.widgets');
-
-			var file; var list_data; var ml; 
-
-			file = new util.file('offline_ou_list'); 
-			if (file._file.exists()) {
-				list_data = file.get_object(); file.close();
-				ml = util.widgets.make_menulist( list_data[0], list_data[1] );
-				ml.setAttribute('id','lib_menu'); document.getElementById('x_lib_menu').appendChild(ml);
-				for (var i = 0; i < obj.org_ids.length; i++) {
-					ml.getElementsByAttribute('value',obj.org_ids[i])[0].setAttribute('class','has_copies');
-				}
-				ml.firstChild.addEventListener(
-					'popupshown',
-					function(ev) {
-						document.getElementById('legend').setAttribute('hidden','false');
-					},
-					false
-				);
-				ml.firstChild.addEventListener(
-					'popuphidden',
-					function(ev) {
-						document.getElementById('legend').setAttribute('hidden','true');
-					},
-					false
-				);
-				ml.addEventListener(
-					'command',
-					function(ev) {
-						//obj.show_my_libs(ev.target.value);
-						//alert('lib picker, command caught - ml = ' + ml + '\nml.value = ' + ml.value + '\n');
-						if (document.getElementById('refresh_button')) document.getElementById('refresh_button').focus(); 
-						JSAN.use('util.file'); var file = new util.file('copy_browser_prefs.'+obj.data.server_unadorned);
-						util.widgets.save_attributes(file, { 'lib_menu' : [ 'value' ], 'show_acns' : [ 'checked' ], 'show_acps' : [ 'checked' ] });
-						obj.refresh_list();
-					},
-					false
-				);
-			} else {
-				throw(document.getElementById('catStrings').getString('staff.cat.copy_browser.missing_library') + '\n');
-			}
-
-			JSAN.use('util.widgets'); 
-		
-			file = new util.file('copy_browser_prefs.'+obj.data.server_unadorned);
-			util.widgets.load_attributes(file);
-			ml.value = ml.getAttribute('value');
-			if (! ml.value) {
-				ml.value = org.id();
-				ml.setAttribute('value',ml.value);
-			}
-
-			document.getElementById('show_acns').addEventListener(
-				'command',
-				function(ev) {
-					JSAN.use('util.file'); var file = new util.file('copy_browser_prefs.'+obj.data.server_unadorned);
-					util.widgets.save_attributes(file, { 'lib_menu' : [ 'value' ], 'show_acns' : [ 'checked' ], 'show_acps' : [ 'checked' ] });
-				},
-				false
-			);
-
-			document.getElementById('show_acps').addEventListener(
-				'command',
-				function(ev) {
-					JSAN.use('util.file'); var file = new util.file('copy_browser_prefs.'+obj.data.server_unadorned);
-					util.widgets.save_attributes(file, { 'lib_menu' : [ 'value' ], 'show_acns' : [ 'checked' ], 'show_acps' : [ 'checked' ] });
-				},
-				false
-			);
-
-			obj.show_my_libs( ml.value );
+   var org = obj.data.hash.aou[ obj.data.list.au[0].ws_ou() ];
+   //obj.show_libs( org );
+
+   //obj.show_my_libs();
+
+   JSAN.use('util.file'); JSAN.use('util.widgets');
+
+   var file; var list_data; var ml; 
+
+   file = new util.file('offline_ou_list'); 
+   if (file._file.exists()) {
+    list_data = file.get_object(); file.close();
+    ml = util.widgets.make_menulist( list_data[0], list_data[1] );
+    ml.setAttribute('id','lib_menu'); document.getElementById('x_lib_menu').appendChild(ml);
+    for (var i = 0; i < obj.org_ids.length; i++) {
+     ml.getElementsByAttribute('value',obj.org_ids[i])[0].setAttribute('class','has_copies');
+    }
+    ml.firstChild.addEventListener(
+     'popupshown',
+     function(ev) {
+      document.getElementById('legend').setAttribute('hidden','false');
+     },
+     false
+    );
+    ml.firstChild.addEventListener(
+     'popuphidden',
+     function(ev) {
+      document.getElementById('legend').setAttribute('hidden','true');
+     },
+     false
+    );
+    ml.addEventListener(
+     'command',
+     function(ev) {
+      //obj.show_my_libs(ev.target.value);
+      //alert('lib picker, command caught - ml = ' + ml + '\nml.value = ' + ml.value + '\n');
+      if (document.getElementById('refresh_button')) document.getElementById('refresh_button').focus(); 
+      JSAN.use('util.file'); var file = new util.file('copy_browser_prefs.'+obj.data.server_unadorned);
+      util.widgets.save_attributes(file, { 'lib_menu' : [ 'value' ], 'show_acns' : [ 'checked' ], 'show_acps' : [ 'checked' ] });
+      obj.refresh_list();
+     },
+     false
+    );
+   } else {
+    throw(document.getElementById('catStrings').getString('staff.cat.copy_browser.missing_library') + '\n');
+   }
+
+   JSAN.use('util.widgets'); 
+  
+   file = new util.file('copy_browser_prefs.'+obj.data.server_unadorned);
+   util.widgets.load_attributes(file);
+   ml.value = ml.getAttribute('value');
+   if (! ml.value) {
+    ml.value = org.id();
+    ml.setAttribute('value',ml.value);
+   }
+
+   document.getElementById('show_acns').addEventListener(
+    'command',
+    function(ev) {
+     JSAN.use('util.file'); var file = new util.file('copy_browser_prefs.'+obj.data.server_unadorned);
+     util.widgets.save_attributes(file, { 'lib_menu' : [ 'value' ], 'show_acns' : [ 'checked' ], 'show_acps' : [ 'checked' ] });
+    },
+    false
+   );
+
+   document.getElementById('show_acps').addEventListener(
+    'command',
+    function(ev) {
+     JSAN.use('util.file'); var file = new util.file('copy_browser_prefs.'+obj.data.server_unadorned);
+     util.widgets.save_attributes(file, { 'lib_menu' : [ 'value' ], 'show_acns' : [ 'checked' ], 'show_acps' : [ 'checked' ] });
+    },
+    false
+   );
+
+   obj.show_my_libs( ml.value );
 
             JSAN.use('util.exec'); var exec = new util.exec(20); exec.timer(obj.funcs,100);
 
-			obj.show_consortial_count();
-
-		} catch(E) {
-			this.error.standard_unexpected_error_alert('cat.copy_browser.init: ',E);
-		}
-	},
-
-	'show_consortial_count' : function() {
-		var obj = this;
-		try {
-			obj.network.simple_request('FM_ACP_COUNT.authoritative',[ obj.data.tree.aou.id(), obj.docid ],function(req){ 
-				try {
-					var robj = req.getResultObject();
-					var x = document.getElementById('consortial_total');
-					if (x) x.setAttribute('value',robj[0].count);
-					x = document.getElementById('consortial_available');
-					if (x) x.setAttribute('value',robj[0].available);
-				} catch(E) {
-					obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.consortial_copy_count.error'),E);
-				}
-			});
-		} catch(E) {
-			this.error.standard_unexpected_error_alert('cat.copy_browser.show_consortial_count: ',E);
-		}
-	},
-
-	'show_my_libs' : function(org) {
-		var obj = this;
-		try {
-			if (!org) {
-				org = obj.data.hash.aou[ obj.data.list.au[0].ws_ou() ];
-			} else {
-				if (typeof org != 'object') org = obj.data.hash.aou[ org ];
-			}
-			obj.show_libs( org, false );
-		
-			var p_org = obj.data.hash.aou[ org.parent_ou() ];
-			if (p_org) {
-				obj.funcs.push( function() { 
-					document.getElementById('cmd_refresh_list').setAttribute('disabled','true'); 
-					document.getElementById('cmd_show_libs_with_copies').setAttribute('disabled','true'); 
-					document.getElementById('lib_menu').setAttribute('disabled','true'); 
-				} );
-				for (var i = 0; i < p_org.children().length; i++) {
-					obj.funcs.push(
-						function(o) {
-							return function() {
-								obj.show_libs( o, false );
-							}
-						}( p_org.children()[i] )
-					);
-				}
-				obj.funcs.push( function() { 
-					document.getElementById('cmd_refresh_list').setAttribute('disabled','false'); 
-					document.getElementById('cmd_show_libs_with_copies').setAttribute('disabled','false'); 
-					document.getElementById('lib_menu').setAttribute('disabled','false'); 
-				} );
-			}
-		} catch(E) {
-			alert(E);
-		}
-	},
-
-	'show_all_libs' : function() {
-		var obj = this;
-		try {
-			obj.show_my_libs();
-
-			obj.show_libs( obj.data.tree.aou );
-
-			obj.funcs.push( function() { 
-				document.getElementById('cmd_refresh_list').setAttribute('disabled','true'); 
-				document.getElementById('cmd_show_libs_with_copies').setAttribute('disabled','true'); 
-				document.getElementById('lib_menu').setAttribute('disabled','true'); 
-			} );
-
-			for (var i = 0; i < obj.data.tree.aou.children().length; i++) {
-				obj.funcs.push(
-					function(o) {
-						return function() {
-							obj.show_libs( o );
-						}
-					}( obj.data.tree.aou.children()[i] )
-				);
-			}
-			obj.funcs.push( function() { 
-				document.getElementById('cmd_refresh_list').setAttribute('disabled','false'); 
-				document.getElementById('cmd_show_libs_with_copies').setAttribute('disabled','false'); 
-				document.getElementById('lib_menu').setAttribute('disabled','false'); 
-			} );
-
-		} catch(E) {
-			alert(E);
-		}
-	},
-
-	'show_libs_with_copies' : function() {
-		var obj = this;
-		try {
-			JSAN.use('util.functional');
-
-			var orgs = util.functional.map_list(
-				obj.org_ids,
-				function(id) { return obj.data.hash.aou[id]; }
-			).sort(
-				function( a, b ) {
-					if (a.shortname() < b.shortname()) return -1;
-					if (a.shortname() > b.shortname()) return 1;
-					return 0;
-				}
-			);
-			obj.funcs.push( function() { 
-				document.getElementById('cmd_refresh_list').setAttribute('disabled','true'); 
-				document.getElementById('cmd_show_libs_with_copies').setAttribute('disabled','true'); 
-				document.getElementById('lib_menu').setAttribute('disabled','true'); 
-			} );
-
-			for (var i = 0; i < orgs.length; i++) {
-				obj.funcs.push(
-					function(o) {
-						return function() {
-							obj.show_libs(o,false);
-						}
-					}( orgs[i] )
-				);
-			}
-			obj.funcs.push( function() { 
-				document.getElementById('cmd_refresh_list').setAttribute('disabled','false'); 
-				document.getElementById('cmd_show_libs_with_copies').setAttribute('disabled','false'); 
-				document.getElementById('lib_menu').setAttribute('disabled','false'); 
-			} );
-
-		} catch(E) {
-			alert(E);
-		}
-	},
-
-	'show_libs' : function(start_aou,show_open) {
-		var obj = this;
-		try {
-			if (!start_aou) throw('show_libs: Need a start_aou');
-			JSAN.use('OpenILS.data'); obj.data = new OpenILS.data(); obj.data.init({'via':'stash'});
-			JSAN.use('util.functional'); 
-
-			var parents = [];
-			var temp_aou = start_aou;
-			while ( temp_aou.parent_ou() ) {
-				temp_aou = obj.data.hash.aou[ temp_aou.parent_ou() ];
-				parents.push( temp_aou );
-			}
-			parents.reverse();
-
-			for (var i = 0; i < parents.length; i++) {
-				obj.funcs.push(
-					function(o,p) {
-						return function() { 
+   obj.show_consortial_count();
+
+  } catch(E) {
+   this.error.standard_unexpected_error_alert('cat.copy_browser.init: ',E);
+  }
+ },
+
+ 'show_consortial_count' : function() {
+  var obj = this;
+  try {
+   obj.network.simple_request('FM_ACP_COUNT.authoritative',[ obj.data.tree.aou.id(), obj.docid ],function(req){ 
+    try {
+     var robj = req.getResultObject();
+     var x = document.getElementById('consortial_total');
+     if (x) x.setAttribute('value',robj[0].count);
+     x = document.getElementById('consortial_available');
+     if (x) x.setAttribute('value',robj[0].available);
+    } catch(E) {
+     obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.consortial_copy_count.error'),E);
+    }
+   });
+  } catch(E) {
+   this.error.standard_unexpected_error_alert('cat.copy_browser.show_consortial_count: ',E);
+  }
+ },
+
+ 'show_my_libs' : function(org) {
+  var obj = this;
+  try {
+   if (!org) {
+    org = obj.data.hash.aou[ obj.data.list.au[0].ws_ou() ];
+   } else {
+    if (typeof org != 'object') org = obj.data.hash.aou[ org ];
+   }
+   obj.show_libs( org, false );
+  
+   var p_org = obj.data.hash.aou[ org.parent_ou() ];
+   if (p_org) {
+    obj.funcs.push( function() { 
+     document.getElementById('cmd_refresh_list').setAttribute('disabled','true'); 
+     document.getElementById('cmd_show_libs_with_copies').setAttribute('disabled','true'); 
+     document.getElementById('lib_menu').setAttribute('disabled','true'); 
+    } );
+    for (var i = 0; i < p_org.children().length; i++) {
+     obj.funcs.push(
+      function(o) {
+       return function() {
+        obj.show_libs( o, false );
+       }
+      }( p_org.children()[i] )
+     );
+    }
+    obj.funcs.push( function() { 
+     document.getElementById('cmd_refresh_list').setAttribute('disabled','false'); 
+     document.getElementById('cmd_show_libs_with_copies').setAttribute('disabled','false'); 
+     document.getElementById('lib_menu').setAttribute('disabled','false'); 
+    } );
+   }
+  } catch(E) {
+   alert(E);
+  }
+ },
+
+ 'show_all_libs' : function() {
+  var obj = this;
+  try {
+   obj.show_my_libs();
+
+   obj.show_libs( obj.data.tree.aou );
+
+   obj.funcs.push( function() { 
+    document.getElementById('cmd_refresh_list').setAttribute('disabled','true'); 
+    document.getElementById('cmd_show_libs_with_copies').setAttribute('disabled','true'); 
+    document.getElementById('lib_menu').setAttribute('disabled','true'); 
+   } );
+
+   for (var i = 0; i < obj.data.tree.aou.children().length; i++) {
+    obj.funcs.push(
+     function(o) {
+      return function() {
+       obj.show_libs( o );
+      }
+     }( obj.data.tree.aou.children()[i] )
+    );
+   }
+   obj.funcs.push( function() { 
+    document.getElementById('cmd_refresh_list').setAttribute('disabled','false'); 
+    document.getElementById('cmd_show_libs_with_copies').setAttribute('disabled','false'); 
+    document.getElementById('lib_menu').setAttribute('disabled','false'); 
+   } );
+
+  } catch(E) {
+   alert(E);
+  }
+ },
+
+ 'show_libs_with_copies' : function() {
+  var obj = this;
+  try {
+   JSAN.use('util.functional');
+
+   var orgs = util.functional.map_list(
+    obj.org_ids,
+    function(id) { return obj.data.hash.aou[id]; }
+   ).sort(
+    function( a, b ) {
+     if (a.shortname() < b.shortname()) return -1;
+     if (a.shortname() > b.shortname()) return 1;
+     return 0;
+    }
+   );
+   obj.funcs.push( function() { 
+    document.getElementById('cmd_refresh_list').setAttribute('disabled','true'); 
+    document.getElementById('cmd_show_libs_with_copies').setAttribute('disabled','true'); 
+    document.getElementById('lib_menu').setAttribute('disabled','true'); 
+   } );
+
+   for (var i = 0; i < orgs.length; i++) {
+    obj.funcs.push(
+     function(o) {
+      return function() {
+       obj.show_libs(o,false);
+      }
+     }( orgs[i] )
+    );
+   }
+   obj.funcs.push( function() { 
+    document.getElementById('cmd_refresh_list').setAttribute('disabled','false'); 
+    document.getElementById('cmd_show_libs_with_copies').setAttribute('disabled','false'); 
+    document.getElementById('lib_menu').setAttribute('disabled','false'); 
+   } );
+
+  } catch(E) {
+   alert(E);
+  }
+ },
+
+ 'show_libs' : function(start_aou,show_open) {
+  var obj = this;
+  try {
+   if (!start_aou) throw('show_libs: Need a start_aou');
+   JSAN.use('OpenILS.data'); obj.data = new OpenILS.data(); obj.data.init({'via':'stash'});
+   JSAN.use('util.functional'); 
+
+   var parents = [];
+   var temp_aou = start_aou;
+   while ( temp_aou.parent_ou() ) {
+    temp_aou = obj.data.hash.aou[ temp_aou.parent_ou() ];
+    parents.push( temp_aou );
+   }
+   parents.reverse();
+
+   for (var i = 0; i < parents.length; i++) {
+    obj.funcs.push(
+     function(o,p) {
+      return function() { 
                             obj.append_org(o,p,{'container':'true','open':'true'}); 
-						};
-					}(parents[i], obj.data.hash.aou[ parents[i].parent_ou() ])
-				);
-			}
-
-			obj.funcs.push(
-				function(o,p) {
-					return function() { obj.append_org(o,p); };
-				}(start_aou,obj.data.hash.aou[ start_aou.parent_ou() ])
-			);
-
-			obj.funcs.push(
-				function() {
-					if (start_aou.children()) {
-						var x = obj.map_tree[ 'aou_' + start_aou.id() ];
-						x.setAttribute('container','true');
-						if (show_open) x.setAttribute('open','true');
-						for (var i = 0; i < start_aou.children().length; i++) {
-							obj.funcs.push(
-								function(o,p) {
-									return function() { obj.append_org(o,p); };
-								}( start_aou.children()[i], start_aou )
-							);
-						}
-					}
-				}
-			);
-
-		} catch(E) {
-			alert(E);
-		}
-	},
-
-	'on_select' : function(list,twisty) {
-		var obj = this;
-		for (var i = 0; i < list.length; i++) {
-			var node = obj.map_tree[ list[i] ];
-			//if (node.lastChild.nodeName == 'treechildren') { continue; } else { alert(node.lastChild.nodeName); }
-			var row_type = list[i].split('_')[0];
-			var id = list[i].split('_')[1];
-			switch(row_type) {
-				case 'aou' : obj.on_select_org(id,twisty); break;
-				case 'acn' : obj.on_select_acn(id,twisty); break;
-				default: break;
-			}
-		}
-	},
-
-	'on_select_acn' : function(acn_id,twisty) {
-		var obj = this;
-		try {
-			var acn_tree = obj.map_acp[ 'acn_' + acn_id ];
-			obj.funcs.push( function() { 
-				document.getElementById('cmd_refresh_list').setAttribute('disabled','true'); 
-				document.getElementById('cmd_show_libs_with_copies').setAttribute('disabled','true'); 
-				document.getElementById('lib_menu').setAttribute('disabled','true'); 
-			} );
-			if (acn_tree.copies()) {
-				for (var i = 0; i < acn_tree.copies().length; i++) {
-					obj.funcs.push(
-						function(c,a) {
-							return function() {
-								obj.append_acp(c,a);
-							}
-						}( acn_tree.copies()[i], acn_tree )
-					)
-				}
-			}
-			obj.funcs.push( function() { 
-				document.getElementById('cmd_refresh_list').setAttribute('disabled','false'); 
-				document.getElementById('cmd_show_libs_with_copies').setAttribute('disabled','false'); 
-				document.getElementById('lib_menu').setAttribute('disabled','false'); 
-			} );
-		} catch(E) {
-			alert(E);
-		}
-	},
-
-	'on_select_org' : function(org_id,twisty) {
-		var obj = this;
-		var org = obj.data.hash.aou[ org_id ];
+      };
+     }(parents[i], obj.data.hash.aou[ parents[i].parent_ou() ])
+    );
+   }
+
+   obj.funcs.push(
+    function(o,p) {
+     return function() { obj.append_org(o,p); };
+    }(start_aou,obj.data.hash.aou[ start_aou.parent_ou() ])
+   );
+
+   obj.funcs.push(
+    function() {
+     if (start_aou.children()) {
+      var x = obj.map_tree[ 'aou_' + start_aou.id() ];
+      x.setAttribute('container','true');
+      if (show_open) x.setAttribute('open','true');
+      for (var i = 0; i < start_aou.children().length; i++) {
+       obj.funcs.push(
+        function(o,p) {
+         return function() { obj.append_org(o,p); };
+        }( start_aou.children()[i], start_aou )
+       );
+      }
+     }
+    }
+   );
+
+  } catch(E) {
+   alert(E);
+  }
+ },
+
+ 'on_select' : function(list,twisty) {
+  var obj = this;
+  for (var i = 0; i < list.length; i++) {
+   var node = obj.map_tree[ list[i] ];
+   //if (node.lastChild.nodeName == 'treechildren') { continue; } else { alert(node.lastChild.nodeName); }
+   var row_type = list[i].split('_')[0];
+   var id = list[i].split('_')[1];
+   switch(row_type) {
+    case 'aou' : obj.on_select_org(id,twisty); break;
+    case 'acn' : obj.on_select_acn(id,twisty); break;
+    default: break;
+   }
+  }
+ },
+
+ 'on_select_acn' : function(acn_id,twisty) {
+  var obj = this;
+  try {
+   var acn_tree = obj.map_acp[ 'acn_' + acn_id ];
+   obj.funcs.push( function() { 
+    document.getElementById('cmd_refresh_list').setAttribute('disabled','true'); 
+    document.getElementById('cmd_show_libs_with_copies').setAttribute('disabled','true'); 
+    document.getElementById('lib_menu').setAttribute('disabled','true'); 
+   } );
+   if (acn_tree.copies()) {
+    for (var i = 0; i < acn_tree.copies().length; i++) {
+     obj.funcs.push(
+      function(c,a) {
+       return function() {
+        obj.append_acp(c,a);
+       }
+      }( acn_tree.copies()[i], acn_tree )
+     )
+    }
+   }
+   obj.funcs.push( function() { 
+    document.getElementById('cmd_refresh_list').setAttribute('disabled','false'); 
+    document.getElementById('cmd_show_libs_with_copies').setAttribute('disabled','false'); 
+    document.getElementById('lib_menu').setAttribute('disabled','false'); 
+   } );
+  } catch(E) {
+   alert(E);
+  }
+ },
+
+ 'on_select_org' : function(org_id,twisty) {
+  var obj = this;
+  var org = obj.data.hash.aou[ org_id ];
         if (obj.data.hash.aout[ org.ou_type() ].depth() == 0 && ! get_bool( obj.data.hash.aout[ org.ou_type() ].can_have_vols() ) ) return;
-		obj.funcs.push( function() { 
-			document.getElementById('cmd_refresh_list').setAttribute('disabled','true'); 
-			document.getElementById('cmd_show_libs_with_copies').setAttribute('disabled','true'); 
-			document.getElementById('lib_menu').setAttribute('disabled','true'); 
-		} );
-		if (org.children()) {
-			for (var i = 0; i < org.children().length; i++) {
-				obj.funcs.push(
-					function(o,p) {
-						return function() {
-							obj.append_org(o,p)
-						}
-					}(org.children()[i],org)
-				);
-			}
-		} 
-		if (obj.map_acn[ 'aou_' + org_id ]) {
-			for (var i = 0; i < obj.map_acn[ 'aou_' + org_id ].length; i++) {
-				obj.funcs.push(
-					function(o,a) {
-						return function() {
-							obj.append_acn(o,a);
-						}
-					}( org, obj.map_acn[ 'aou_' + org_id ][i] )
-				);
-			}
-		}
-		obj.funcs.push( function() { 
-			document.getElementById('cmd_refresh_list').setAttribute('disabled','false'); 
-			document.getElementById('cmd_show_libs_with_copies').setAttribute('disabled','false'); 
-			document.getElementById('lib_menu').setAttribute('disabled','false'); 
-		} );
-	},
-
-	'append_org' : function (org,parent_org,params) {
-		var obj = this;
-		try {
-			if (obj.map_tree[ 'aou_' + org.id() ]) {
-				var x = obj.map_tree[ 'aou_' + org.id() ];
-				if (params) {
-					for (var i in params) {
-						x.setAttribute(i,params[i]);
-					}
-				}
-				return x;
-			}
-
-			var data = {
-				'row' : {
-					'my' : {
-						'aou' : org,
-					}
-				},
-				'skip_all_columns_except' : [0,1,2],
-				'retrieve_id' : 'aou_' + org.id(),
-				'to_bottom' : true,
-				'no_auto_select' : true,
-			};
-		
-			var acn_tree_list;
-			if ( obj.org_ids.indexOf( Number( org.id() ) ) == -1 ) {
-				if ( get_bool( obj.data.hash.aout[ org.ou_type() ].can_have_vols() ) ) {
-					data.row.my.volume_count = '0';
-					data.row.my.copy_count = '<0>';
-				} else {
-					data.row.my.volume_count = '';
-					data.row.my.copy_count = '';
-				}
-			} else {
-				var v_count = 0; var c_count = 0;
-				acn_tree_list = obj.network.simple_request(
-					'FM_ACN_TREE_LIST_RETRIEVE_VIA_RECORD_ID_AND_ORG_IDS.authoritative',
-					[ ses(), obj.docid, [ org.id() ] ]
-				);
-				for (var i = 0; i < acn_tree_list.length; i++) {
-					v_count++;
-					obj.map_acn[ 'acn_' + acn_tree_list[i].id() ] = function(r){return r;}(acn_tree_list[i]);
-					var copies = acn_tree_list[i].copies(); if (copies) c_count += copies.length;
-					for (var j = 0; j < copies.length; j++) {
-						obj.map_acp[ 'acp_' + copies[j].id() ] = function(r){return r;}(copies[j]);
-					}
-				}
-				data.row.my.volume_count = v_count;
-				data.row.my.copy_count = '<' + c_count + '>';
-			}
-			if (parent_org) {
-				data.node = obj.map_tree[ 'aou_' + parent_org.id() ];
-			}
-			var nparams = obj.list.append(data);
-			var node = nparams.my_node;
-			if (params) {
-				for (var i in params) {
-					node.setAttribute(i,params[i]);
-				}
-			}
-			obj.map_tree[ 'aou_' + org.id() ] = node;
-
-			if (org.children()) {
-				node.setAttribute('container','true');
-			}
-
-			if (parent_org) {
-				if ( obj.data.hash.aou[ obj.data.list.au[0].ws_ou() ].parent_ou() == parent_org.id() ) {
-					data.node.setAttribute('open','true');
-				}
-			} else {
-				obj.map_tree[ 'aou_' + org.id() ].setAttribute('open','true');
-			}
-
-			if (acn_tree_list) {
-				obj.map_acn[ 'aou_' + org.id() ] = acn_tree_list;
-				node.setAttribute('container','true');
-			}
-
-			if (document.getElementById('show_acns').checked) {
+  obj.funcs.push( function() { 
+   document.getElementById('cmd_refresh_list').setAttribute('disabled','true'); 
+   document.getElementById('cmd_show_libs_with_copies').setAttribute('disabled','true'); 
+   document.getElementById('lib_menu').setAttribute('disabled','true'); 
+  } );
+  if (org.children()) {
+   for (var i = 0; i < org.children().length; i++) {
+    obj.funcs.push(
+     function(o,p) {
+      return function() {
+       obj.append_org(o,p)
+      }
+     }(org.children()[i],org)
+    );
+   }
+  } 
+  if (obj.map_acn[ 'aou_' + org_id ]) {
+   for (var i = 0; i < obj.map_acn[ 'aou_' + org_id ].length; i++) {
+    obj.funcs.push(
+     function(o,a) {
+      return function() {
+       obj.append_acn(o,a);
+      }
+     }( org, obj.map_acn[ 'aou_' + org_id ][i] )
+    );
+   }
+  }
+  obj.funcs.push( function() { 
+   document.getElementById('cmd_refresh_list').setAttribute('disabled','false'); 
+   document.getElementById('cmd_show_libs_with_copies').setAttribute('disabled','false'); 
+   document.getElementById('lib_menu').setAttribute('disabled','false'); 
+  } );
+ },
+
+ 'append_org' : function (org,parent_org,params) {
+  var obj = this;
+  try {
+   if (obj.map_tree[ 'aou_' + org.id() ]) {
+    var x = obj.map_tree[ 'aou_' + org.id() ];
+    if (params) {
+     for (var i in params) {
+      x.setAttribute(i,params[i]);
+     }
+    }
+    return x;
+   }
+
+   var data = {
+    'row' : {
+     'my' : {
+      'aou' : org,
+     }
+    },
+    'skip_all_columns_except' : [0,1,2],
+    'retrieve_id' : 'aou_' + org.id(),
+    'to_bottom' : true,
+    'no_auto_select' : true,
+   };
+  
+   var acn_tree_list;
+   if ( obj.org_ids.indexOf( Number( org.id() ) ) == -1 ) {
+    if ( get_bool( obj.data.hash.aout[ org.ou_type() ].can_have_vols() ) ) {
+     data.row.my.volume_count = '0';
+     data.row.my.copy_count = '<0>';
+    } else {
+     data.row.my.volume_count = '';
+     data.row.my.copy_count = '';
+    }
+   } else {
+    var v_count = 0; var c_count = 0;
+    acn_tree_list = obj.network.simple_request(
+     'FM_ACN_TREE_LIST_RETRIEVE_VIA_RECORD_ID_AND_ORG_IDS.authoritative',
+     [ ses(), obj.docid, [ org.id() ] ]
+    );
+    for (var i = 0; i < acn_tree_list.length; i++) {
+     v_count++;
+     obj.map_acn[ 'acn_' + acn_tree_list[i].id() ] = function(r){return r;}(acn_tree_list[i]);
+     var copies = acn_tree_list[i].copies(); if (copies) c_count += copies.length;
+     for (var j = 0; j < copies.length; j++) {
+      obj.map_acp[ 'acp_' + copies[j].id() ] = function(r){return r;}(copies[j]);
+     }
+    }
+    data.row.my.volume_count = v_count;
+    data.row.my.copy_count = '<' + c_count + '>';
+   }
+   if (parent_org) {
+    data.node = obj.map_tree[ 'aou_' + parent_org.id() ];
+   }
+   var nparams = obj.list.append(data);
+   var node = nparams.my_node;
+   if (params) {
+    for (var i in params) {
+     node.setAttribute(i,params[i]);
+    }
+   }
+   obj.map_tree[ 'aou_' + org.id() ] = node;
+
+   if (org.children()) {
+    node.setAttribute('container','true');
+   }
+
+   if (parent_org) {
+    if ( obj.data.hash.aou[ obj.data.list.au[0].ws_ou() ].parent_ou() == parent_org.id() ) {
+     data.node.setAttribute('open','true');
+    }
+   } else {
+    obj.map_tree[ 'aou_' + org.id() ].setAttribute('open','true');
+   }
+
+   if (acn_tree_list) {
+    obj.map_acn[ 'aou_' + org.id() ] = acn_tree_list;
+    node.setAttribute('container','true');
+   }
+
+   if (document.getElementById('show_acns').checked) {
                 if (! ( obj.data.hash.aout[ org.ou_type() ].depth() == 0 && ! get_bool( obj.data.hash.aout[ org.ou_type() ].can_have_vols() ) )) {
-					node.setAttribute('open','true');
-					obj.funcs.push( function() { obj.on_select_org( org.id() ); } );
-				}
-			}
-
-		} catch(E) {
-			dump(E+'\n');
-			alert(E);
-		}
-	},
-
-	'append_acn' : function( org, acn_tree, params ) {
-		var obj = this;
-		try {
-			if (obj.map_tree[ 'acn_' + acn_tree.id() ]) {
-				var x = obj.map_tree[ 'acn_' + acn_tree.id() ];
-				if (params) {
-					for (var i in params) {
-						x.setAttribute(i,params[i]);
-					}
-				}
-				return x;
-			}
-
-			var parent_node = obj.map_tree[ 'aou_' + org.id() ];
-			var data = {
-				'row' : {
-					'my' : {
-						'aou' : org,
-						'acn' : acn_tree,
-						'volume_count' : '',
-						'copy_count' : acn_tree.copies() ? acn_tree.copies().length : '0',
-					}
-				},
-				'skip_all_columns_except' : [0,1,2],
-				'retrieve_id' : 'acn_' + acn_tree.id(),
-				'node' : parent_node,
-				'to_bottom' : true,
-				'no_auto_select' : true,
-			};
-			var nparams = obj.list.append(data);
-			var node = nparams.my_node;
-			obj.map_tree[ 'acn_' + acn_tree.id() ] =  node;
-			if (params) {
-				for (var i in params) {
-					node.setAttribute(i,params[i]);
-				}
-			}
-			if (acn_tree.copies()) {
-				obj.map_acp[ 'acn_' + acn_tree.id() ] = acn_tree;
-				node.setAttribute('container','true');
-			}
-			if (document.getElementById('show_acps').checked) {
-				node.setAttribute('open','true');
-				obj.funcs.push( function() { obj.on_select_acn( acn_tree.id() ); } );
-			}
-
-		} catch(E) {
-			dump(E+'\n');
-			alert(E);
-		}
-	},
-
-	'append_acp' : function( acp_item, acn_tree, params ) {
-		var obj = this;
-		try {
-			if (obj.map_tree[ 'acp_' + acp_item.id() ]) {
-				var x = obj.map_tree[ 'acp_' + acp_item.id() ];
-				if (params) {
-					for (var i in params) {
-						x.setAttribute(i,params[i]);
-					}
-				}
-				return x;
-			}
-
-			var parent_node = obj.map_tree[ 'acn_' + acn_tree.id() ];
-			var data = {
-				'row' : {
-					'my' : {
-						'aou' : obj.data.hash.aou[ acn_tree.owning_lib() ],
-						'acn' : acn_tree,
-						'acp' : acp_item,
-						'volume_count' : '',
-						'copy_count' : '',
-					}
-				},
-				'retrieve_id' : 'acp_' + acp_item.id(),
-				'node' : parent_node,
-				'to_bottom' : true,
-				'no_auto_select' : true,
-			};
-			var nparams = obj.list.append(data);
-			var node = nparams.my_node;
-			obj.map_tree[ 'acp_' + acp_item.id() ] =  node;
-			if (params) {
-				for (var i in params) {
-					node.setAttribute(i,params[i]);
-				}
-			}
-
-		} catch(E) {
-			dump(E+'\n');
-			alert(E);
-		}
-	},
-
-	'list_init' : function( params ) {
-
-		try {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			var obj = this;
-			
-			JSAN.use('circ.util');
-			var columns = [
-				{
-					'id' : 'tree_location',
-					'label' : document.getElementById('catStrings').getString('staff.cat.copy_browser.list_init.tree_location'),
-					'flex' : 1, 'primary' : true, 'hidden' : false, 
-					'render' : function(my) { return my.acp ? my.acp.barcode() : my.acn ? my.acn.label() : my.aou ? my.aou.shortname() + " : " + my.aou.name() : "???"; },
-				},
-				{
-					'id' : 'volume_count',
-					'label' : document.getElementById('catStrings').getString('staff.cat.copy_browser.list_init.volume_count'),
-					'flex' : 0, 'primary' : false, 'hidden' : false, 
-					'render' : function(my) { return my.volume_count; },
-				},
-				{
-					'id' : 'copy_count',
-					'label' : document.getElementById('catStrings').getString('staff.cat.copy_browser.list_init.copy_count'),
-					'flex' : 0,
-					'primary' : false, 'hidden' : false, 
-					'render' : function(my) { return my.copy_count; },
-				},
-			].concat(
-				circ.util.columns( 
-					{ 
-						'location' : { 'hidden' : false },
-						'circ_lib' : { 'hidden' : false },
-						'owning_lib' : { 'hidden' : false },
-						'call_number' : { 'hidden' : false },
-						'due_date' : { 'hidden' : false },
-						'status' : { 'hidden' : false },
-					},
-					{
-						'just_these' : [
-							'due_date',
-							'owning_lib',
-							'circ_lib',
-							'call_number',
-							'copy_number',
-							'location',
-							'barcode',
-							'loan_duration',
-							'fine_level',
-							'circulate',
-							'holdable',
-							'opac_visible',
-							'ref',
-							'deposit',
-							'deposit_amount',
-							'price',
-							'circ_as_type',
-							'circ_modifier',
-							'status',
-							'alert_message',
-							'acp_id',
-						]
-					}
-				)
-			);
-			JSAN.use('util.list'); obj.list = new util.list('copy_tree');
-			obj.list.init(
-				{
-					'no_auto_select' : true,
-					'columns' : columns,
-					'map_row_to_columns' : circ.util.std_map_row_to_columns(' '),
-					'retrieve_row' : function(params) {
-
-						var row = params.row;
-
-					/*	
-						if (!row.my.mvr) obj.funcs.push(
-							function() {
-
-								row.my.mvr = obj.network.request(
-									api.MODS_SLIM_RECORD_RETRIEVE_VIA_COPY.app,
-									api.MODS_SLIM_RECORD_RETRIEVE_VIA_COPY.method,
-									[ row.my.circ.target_copy() ]
-								);
-
-							}
-						);
-						if (!row.my.acp) {
-							obj.funcs.push(	
-								function() {
-
-									row.my.acp = obj.network.request(
-										api.FM_ACP_RETRIEVE.app,
-										api.FM_ACP_RETRIEVE.method,
-										[ row.my.circ.target_copy() ]
-									);
-
-									params.row_node.setAttribute( 'retrieve_id',row.my.acp.barcode() );
-
-								}
-							);
-						} else {
-							params.row_node.setAttribute( 'retrieve_id',row.my.acp.barcode() );
-						}
-					*/
-						obj.funcs.push(
-							function() {
-
-								if (typeof params.on_retrieve == 'function') {
-									params.on_retrieve(row);
-								}
-
-							}
-						);
-
-						return row;
-					},
-					'on_click' : function(ev) {
-						netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserRead');
-						var row = {}; var col = {}; var nobj = {};
-						obj.list.node.treeBoxObject.getCellAt(ev.clientX,ev.clientY,row,col,nobj); 
-						if ((row.value == -1)||(nobj.value != 'twisty')) { return; }
-						var node = obj.list.node.contentView.getItemAtIndex(row.value);
-						var list = [ node.getAttribute('retrieve_id') ];
-						if (typeof obj.on_select == 'function') {
-							obj.on_select(list,true);
-						}
-						if (typeof window.xulG == 'object' && typeof window.xulG.on_select == 'function') {
-							window.xulG.on_select(list);
-						}
-					},
-					'on_select' : function(ev) {
-						JSAN.use('util.functional');
-						var sel = obj.list.retrieve_selection();
-						obj.controller.view.sel_clip.disabled = sel.length < 1;
-						obj.sel_list = util.functional.map_list(
-							sel,
-							function(o) { return o.getAttribute('retrieve_id'); }
-						);
-						obj.toggle_actions();
-						if (typeof obj.on_select == 'function') {
-							obj.on_select(obj.sel_list);
-						}
-						if (typeof window.xulG == 'object' && typeof window.xulG.on_select == 'function') {
-							window.xulG.on_select(obj.sel_list);
-						}
-					},
-				}
-			);
-
-			obj.controller.render();
-
-		} catch(E) {
-			this.error.sdump('D_ERROR','cat.copy_browser.list_init: ' + E + '\n');
-			alert(E);
-		}
-	},
-
-	'toggle_actions' : function() {
-		var obj = this;
-		try {
-			var found_aou = false; var found_acn = false; var found_acp = false;
-			var found_aou_with_can_have_vols = false;
-			for (var i = 0; i < obj.sel_list.length; i++) {
-				var type = obj.sel_list[i].split(/_/)[0];
-				switch(type) {
-					case 'aou' : 
-						found_aou = true; 
-						var org = obj.data.hash.aou[ obj.sel_list[i].split(/_/)[1] ];
-						if ( get_bool( obj.data.hash.aout[ org.ou_type() ].can_have_vols() ) ) found_aou_with_can_have_vols = true;
-					break;
-					case 'acn' : found_acn = true; break;
-					case 'acp' : found_acp = true; break;
-				}
-			}
-			obj.controller.view.cmd_add_items.setAttribute('disabled','true');
-			obj.controller.view.cmd_add_items_to_buckets.setAttribute('disabled','true');
-			obj.controller.view.cmd_edit_items.setAttribute('disabled','true');
-			obj.controller.view.cmd_replace_barcode.setAttribute('disabled','true');
-			obj.controller.view.cmd_delete_items.setAttribute('disabled','true');
-			obj.controller.view.cmd_print_spine_labels.setAttribute('disabled','true');
-			obj.controller.view.cmd_add_volumes.setAttribute('disabled','true');
-			obj.controller.view.cmd_mark_library.setAttribute('disabled','true');
-			obj.controller.view.cmd_edit_volumes.setAttribute('disabled','true');
-			obj.controller.view.cmd_delete_volumes.setAttribute('disabled','true');
-			obj.controller.view.cmd_mark_volume.setAttribute('disabled','true');
-			obj.controller.view.cmd_transfer_volume.setAttribute('disabled','true');
-			obj.controller.view.cmd_transfer_items.setAttribute('disabled','true');
-			obj.controller.view.sel_copy_details.setAttribute('disabled','true');
-			obj.controller.view.sel_patron.setAttribute('disabled','true');
-			obj.controller.view.sel_mark_items_damaged.setAttribute('disabled','true');
-			obj.controller.view.sel_mark_items_missing.setAttribute('disabled','true');
-			if (found_aou && found_aou_with_can_have_vols) {
-				obj.controller.view.cmd_add_volumes.setAttribute('disabled','false');
-				obj.controller.view.cmd_mark_library.setAttribute('disabled','false');
-			}
-			if (found_acn) {
-				obj.controller.view.cmd_edit_volumes.setAttribute('disabled','false');
-				obj.controller.view.cmd_delete_volumes.setAttribute('disabled','false');
-				obj.controller.view.cmd_mark_volume.setAttribute('disabled','false');
-				obj.controller.view.cmd_add_items.setAttribute('disabled','false');
-				obj.controller.view.cmd_transfer_volume.setAttribute('disabled','false');
-			}
-			if (found_acp) {
-				obj.controller.view.sel_mark_items_damaged.setAttribute('disabled','false');
-				obj.controller.view.sel_mark_items_missing.setAttribute('disabled','false');
-				obj.controller.view.cmd_add_items_to_buckets.setAttribute('disabled','false');
-				obj.controller.view.cmd_edit_items.setAttribute('disabled','false');
-				obj.controller.view.cmd_replace_barcode.setAttribute('disabled','false');
-				obj.controller.view.cmd_delete_items.setAttribute('disabled','false');
-				obj.controller.view.cmd_print_spine_labels.setAttribute('disabled','false');
-				obj.controller.view.cmd_transfer_items.setAttribute('disabled','false');
-				obj.controller.view.sel_copy_details.setAttribute('disabled','false');
-				obj.controller.view.sel_patron.setAttribute('disabled','false');
-			}
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.actions.error'),E);
-		}
-	},
-
-	'refresh_list' : function() { 
-		try {
-			var obj = this;
-			obj.list.clear();
-			obj.map_tree = {};
-			obj.map_acn = {};
-			obj.map_acp = {};
-			obj.org_ids = obj.network.simple_request('FM_AOU_IDS_RETRIEVE_VIA_RECORD_ID.authoritative',[ obj.docid ]);
-			if (typeof obj.org_ids.ilsevent != 'undefined') throw(obj.org_ids);
+     node.setAttribute('open','true');
+     obj.funcs.push( function() { obj.on_select_org( org.id() ); } );
+    }
+   }
+
+  } catch(E) {
+   dump(E+'\n');
+   alert(E);
+  }
+ },
+
+ 'append_acn' : function( org, acn_tree, params ) {
+  var obj = this;
+  try {
+   if (obj.map_tree[ 'acn_' + acn_tree.id() ]) {
+    var x = obj.map_tree[ 'acn_' + acn_tree.id() ];
+    if (params) {
+     for (var i in params) {
+      x.setAttribute(i,params[i]);
+     }
+    }
+    return x;
+   }
+
+   var parent_node = obj.map_tree[ 'aou_' + org.id() ];
+   var data = {
+    'row' : {
+     'my' : {
+      'aou' : org,
+      'acn' : acn_tree,
+      'volume_count' : '',
+      'copy_count' : acn_tree.copies() ? acn_tree.copies().length : '0',
+     }
+    },
+    'skip_all_columns_except' : [0,1,2],
+    'retrieve_id' : 'acn_' + acn_tree.id(),
+    'node' : parent_node,
+    'to_bottom' : true,
+    'no_auto_select' : true,
+   };
+   var nparams = obj.list.append(data);
+   var node = nparams.my_node;
+   obj.map_tree[ 'acn_' + acn_tree.id() ] =  node;
+   if (params) {
+    for (var i in params) {
+     node.setAttribute(i,params[i]);
+    }
+   }
+   if (acn_tree.copies()) {
+    obj.map_acp[ 'acn_' + acn_tree.id() ] = acn_tree;
+    node.setAttribute('container','true');
+   }
+   if (document.getElementById('show_acps').checked) {
+    node.setAttribute('open','true');
+    obj.funcs.push( function() { obj.on_select_acn( acn_tree.id() ); } );
+   }
+
+  } catch(E) {
+   dump(E+'\n');
+   alert(E);
+  }
+ },
+
+ 'append_acp' : function( acp_item, acn_tree, params ) {
+  var obj = this;
+  try {
+   if (obj.map_tree[ 'acp_' + acp_item.id() ]) {
+    var x = obj.map_tree[ 'acp_' + acp_item.id() ];
+    if (params) {
+     for (var i in params) {
+      x.setAttribute(i,params[i]);
+     }
+    }
+    return x;
+   }
+
+   var parent_node = obj.map_tree[ 'acn_' + acn_tree.id() ];
+   var data = {
+    'row' : {
+     'my' : {
+      'aou' : obj.data.hash.aou[ acn_tree.owning_lib() ],
+      'acn' : acn_tree,
+      'acp' : acp_item,
+      'volume_count' : '',
+      'copy_count' : '',
+     }
+    },
+    'retrieve_id' : 'acp_' + acp_item.id(),
+    'node' : parent_node,
+    'to_bottom' : true,
+    'no_auto_select' : true,
+   };
+   var nparams = obj.list.append(data);
+   var node = nparams.my_node;
+   obj.map_tree[ 'acp_' + acp_item.id() ] =  node;
+   if (params) {
+    for (var i in params) {
+     node.setAttribute(i,params[i]);
+    }
+   }
+
+  } catch(E) {
+   dump(E+'\n');
+   alert(E);
+  }
+ },
+
+ 'list_init' : function( params ) {
+
+  try {
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   var obj = this;
+   
+   JSAN.use('circ.util');
+   var columns = [
+    {
+     'id' : 'tree_location',
+     'label' : document.getElementById('catStrings').getString('staff.cat.copy_browser.list_init.tree_location'),
+     'flex' : 1, 'primary' : true, 'hidden' : false, 
+     'render' : function(my) { return my.acp ? my.acp.barcode() : my.acn ? my.acn.label() : my.aou ? my.aou.shortname() + " : " + my.aou.name() : "???"; },
+    },
+    {
+     'id' : 'volume_count',
+     'label' : document.getElementById('catStrings').getString('staff.cat.copy_browser.list_init.volume_count'),
+     'flex' : 0, 'primary' : false, 'hidden' : false, 
+     'render' : function(my) { return my.volume_count; },
+    },
+    {
+     'id' : 'copy_count',
+     'label' : document.getElementById('catStrings').getString('staff.cat.copy_browser.list_init.copy_count'),
+     'flex' : 0,
+     'primary' : false, 'hidden' : false, 
+     'render' : function(my) { return my.copy_count; },
+    },
+   ].concat(
+    circ.util.columns( 
+     { 
+      'location' : { 'hidden' : false },
+      'circ_lib' : { 'hidden' : false },
+      'owning_lib' : { 'hidden' : false },
+      'call_number' : { 'hidden' : false },
+      'due_date' : { 'hidden' : false },
+      'status' : { 'hidden' : false },
+     },
+     {
+      'just_these' : [
+       'due_date',
+       'owning_lib',
+       'circ_lib',
+       'call_number',
+       'copy_number',
+       'location',
+       'barcode',
+       'loan_duration',
+       'fine_level',
+       'circulate',
+       'holdable',
+       'opac_visible',
+       'ref',
+       'deposit',
+       'deposit_amount',
+       'price',
+       'circ_as_type',
+       'circ_modifier',
+       'status',
+       'alert_message',
+       'acp_id',
+      ]
+     }
+    )
+   );
+   JSAN.use('util.list'); obj.list = new util.list('copy_tree');
+   obj.list.init(
+    {
+     'no_auto_select' : true,
+     'columns' : columns,
+     'map_row_to_columns' : circ.util.std_map_row_to_columns(' '),
+     'retrieve_row' : function(params) {
+
+      var row = params.row;
+
+     /* 
+      if (!row.my.mvr) obj.funcs.push(
+       function() {
+
+        row.my.mvr = obj.network.request(
+         api.MODS_SLIM_RECORD_RETRIEVE_VIA_COPY.app,
+         api.MODS_SLIM_RECORD_RETRIEVE_VIA_COPY.method,
+         [ row.my.circ.target_copy() ]
+        );
+
+       }
+      );
+      if (!row.my.acp) {
+       obj.funcs.push( 
+        function() {
+
+         row.my.acp = obj.network.request(
+          api.FM_ACP_RETRIEVE.app,
+          api.FM_ACP_RETRIEVE.method,
+          [ row.my.circ.target_copy() ]
+         );
+
+         params.row_node.setAttribute( 'retrieve_id',row.my.acp.barcode() );
+
+        }
+       );
+      } else {
+       params.row_node.setAttribute( 'retrieve_id',row.my.acp.barcode() );
+      }
+     */
+      obj.funcs.push(
+       function() {
+
+        if (typeof params.on_retrieve == 'function') {
+         params.on_retrieve(row);
+        }
+
+       }
+      );
+
+      return row;
+     },
+     'on_click' : function(ev) {
+      netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserRead');
+      var row = {}; var col = {}; var nobj = {};
+      obj.list.node.treeBoxObject.getCellAt(ev.clientX,ev.clientY,row,col,nobj); 
+      if ((row.value == -1)||(nobj.value != 'twisty')) { return; }
+      var node = obj.list.node.contentView.getItemAtIndex(row.value);
+      var list = [ node.getAttribute('retrieve_id') ];
+      if (typeof obj.on_select == 'function') {
+       obj.on_select(list,true);
+      }
+      if (typeof window.xulG == 'object' && typeof window.xulG.on_select == 'function') {
+       window.xulG.on_select(list);
+      }
+     },
+     'on_select' : function(ev) {
+      JSAN.use('util.functional');
+      var sel = obj.list.retrieve_selection();
+      obj.controller.view.sel_clip.disabled = sel.length < 1;
+      obj.sel_list = util.functional.map_list(
+       sel,
+       function(o) { return o.getAttribute('retrieve_id'); }
+      );
+      obj.toggle_actions();
+      if (typeof obj.on_select == 'function') {
+       obj.on_select(obj.sel_list);
+      }
+      if (typeof window.xulG == 'object' && typeof window.xulG.on_select == 'function') {
+       window.xulG.on_select(obj.sel_list);
+      }
+     },
+    }
+   );
+
+   obj.controller.render();
+
+  } catch(E) {
+   this.error.sdump('D_ERROR','cat.copy_browser.list_init: ' + E + '\n');
+   alert(E);
+  }
+ },
+
+ 'toggle_actions' : function() {
+  var obj = this;
+  try {
+   var found_aou = false; var found_acn = false; var found_acp = false;
+   var found_aou_with_can_have_vols = false;
+   for (var i = 0; i < obj.sel_list.length; i++) {
+    var type = obj.sel_list[i].split(/_/)[0];
+    switch(type) {
+     case 'aou' : 
+      found_aou = true; 
+      var org = obj.data.hash.aou[ obj.sel_list[i].split(/_/)[1] ];
+      if ( get_bool( obj.data.hash.aout[ org.ou_type() ].can_have_vols() ) ) found_aou_with_can_have_vols = true;
+     break;
+     case 'acn' : found_acn = true; break;
+     case 'acp' : found_acp = true; break;
+    }
+   }
+   obj.controller.view.cmd_add_items.setAttribute('disabled','true');
+   obj.controller.view.cmd_add_items_to_buckets.setAttribute('disabled','true');
+   obj.controller.view.cmd_edit_items.setAttribute('disabled','true');
+   obj.controller.view.cmd_replace_barcode.setAttribute('disabled','true');
+   obj.controller.view.cmd_delete_items.setAttribute('disabled','true');
+   obj.controller.view.cmd_print_spine_labels.setAttribute('disabled','true');
+   obj.controller.view.cmd_add_volumes.setAttribute('disabled','true');
+   obj.controller.view.cmd_mark_library.setAttribute('disabled','true');
+   obj.controller.view.cmd_edit_volumes.setAttribute('disabled','true');
+   obj.controller.view.cmd_delete_volumes.setAttribute('disabled','true');
+   obj.controller.view.cmd_mark_volume.setAttribute('disabled','true');
+   obj.controller.view.cmd_transfer_volume.setAttribute('disabled','true');
+   obj.controller.view.cmd_transfer_items.setAttribute('disabled','true');
+   obj.controller.view.sel_copy_details.setAttribute('disabled','true');
+   obj.controller.view.sel_patron.setAttribute('disabled','true');
+   obj.controller.view.sel_mark_items_damaged.setAttribute('disabled','true');
+   obj.controller.view.sel_mark_items_missing.setAttribute('disabled','true');
+   if (found_aou && found_aou_with_can_have_vols) {
+    obj.controller.view.cmd_add_volumes.setAttribute('disabled','false');
+    obj.controller.view.cmd_mark_library.setAttribute('disabled','false');
+   }
+   if (found_acn) {
+    obj.controller.view.cmd_edit_volumes.setAttribute('disabled','false');
+    obj.controller.view.cmd_delete_volumes.setAttribute('disabled','false');
+    obj.controller.view.cmd_mark_volume.setAttribute('disabled','false');
+    obj.controller.view.cmd_add_items.setAttribute('disabled','false');
+    obj.controller.view.cmd_transfer_volume.setAttribute('disabled','false');
+   }
+   if (found_acp) {
+    obj.controller.view.sel_mark_items_damaged.setAttribute('disabled','false');
+    obj.controller.view.sel_mark_items_missing.setAttribute('disabled','false');
+    obj.controller.view.cmd_add_items_to_buckets.setAttribute('disabled','false');
+    obj.controller.view.cmd_edit_items.setAttribute('disabled','false');
+    obj.controller.view.cmd_replace_barcode.setAttribute('disabled','false');
+    obj.controller.view.cmd_delete_items.setAttribute('disabled','false');
+    obj.controller.view.cmd_print_spine_labels.setAttribute('disabled','false');
+    obj.controller.view.cmd_transfer_items.setAttribute('disabled','false');
+    obj.controller.view.sel_copy_details.setAttribute('disabled','false');
+    obj.controller.view.sel_patron.setAttribute('disabled','false');
+   }
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.actions.error'),E);
+  }
+ },
+
+ 'refresh_list' : function() { 
+  try {
+   var obj = this;
+   obj.list.clear();
+   obj.map_tree = {};
+   obj.map_acn = {};
+   obj.map_acp = {};
+   obj.org_ids = obj.network.simple_request('FM_AOU_IDS_RETRIEVE_VIA_RECORD_ID.authoritative',[ obj.docid ]);
+   if (typeof obj.org_ids.ilsevent != 'undefined') throw(obj.org_ids);
             JSAN.use('util.functional'); 
             obj.org_ids = util.functional.map_list( obj.org_ids, function (o) { return Number(o); });
-			/*
-			var org = obj.data.hash.aou[ obj.data.list.au[0].ws_ou() ];
-			obj.show_libs( org );
-			*/
-			obj.show_my_libs( document.getElementById('lib_menu').value );
-			// FIXME - we get a null from the copy_count call if we call it too quickly here
-			setTimeout( function() { obj.show_consortial_count(); }, 2000 );
-		} catch(E) {
-			this.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.refresh_list.error'),E);
-		}
-	},
+   /*
+   var org = obj.data.hash.aou[ obj.data.list.au[0].ws_ou() ];
+   obj.show_libs( org );
+   */
+   obj.show_my_libs( document.getElementById('lib_menu').value );
+   // FIXME - we get a null from the copy_count call if we call it too quickly here
+   setTimeout( function() { obj.show_consortial_count(); }, 2000 );
+  } catch(E) {
+   this.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.refresh_list.error'),E);
+  }
+ },
 }
 
 dump('exiting cat.copy_browser.js\n');
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_browser.xul b/Open-ILS/xul/staff_client/server/cat/copy_browser.xul
index 5f358d86af..1b8cf44bd1 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_browser.xul
+++ b/Open-ILS/xul/staff_client/server/cat/copy_browser.xul
@@ -23,166 +23,166 @@ vim:noet:sw=4:ts=4:
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="cat_copy_browser" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
-	<scripts id="openils_util_scripts"/>
-
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="/xul/server/cat/copy_browser.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { 
-					throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
-				}
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for cat_copy_browser.xul');
-
-				JSAN.use('cat.copy_browser'); g.copy_browser = new cat.copy_browser();
-
-				g.copy_browser.init( { 'docid' : xul_param('docid') } );
-
-				//if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-				//	try { window.xulG.set_tab_name('Holdings Maintenance'); } catch(E) { alert(E); }
-				//}
-
-			} catch(E) {
-				var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['cat/copy_browser.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-
-	<commandset id="cat_copy_browser">
-		<command id="save_columns" />
-		<command id="cmd_broken" />
-		<command id="sel_copy_details"/>
-		<command id="sel_patron"/>
-		<command id="sel_clip" />
-		<command id="cmd_clear" />
-		<command id="cmd_show_my_libs" />
-		<command id="cmd_show_all_libs" />
-		<command id="cmd_show_libs_with_copies" />
-
-		<command id="sel_mark_items_damaged" />
-		<command id="sel_mark_items_missing" />
-		<command id="cmd_add_items"/>
-		<command id="cmd_add_items_to_buckets"/>
-		<command id="cmd_edit_items"/>
-		<command id="cmd_replace_barcode"/>
-		<command id="cmd_delete_items"/>
-		<command id="cmd_transfer_items"/>
-		<command id="cmd_print_spine_labels"/>
-		<command id="cmd_add_volumes"/>
-		<command id="cmd_edit_volumes"/>
-		<command id="cmd_delete_volumes"/>
-		<command id="cmd_mark_volume"/>
-		<command id="cmd_mark_library"/>
-		<command id="cmd_transfer_volume"/>
-		<command id="cmd_refresh_list"/>
-	</commandset>
-
-	<popupset>
-		<popup id="copy_browser_actions">
-			<menuitem command="sel_clip" label="&staff.cat.copy_browser.actions.sel_clip.label;" accesskey="&staff.cat.copy_browser.actions.sel_clip.accesskey;"/>
-			<menuitem command="cmd_add_items_to_buckets" label="&staff.cat.copy_browser.actions.cmd_add_items_to_buckets.label;" accesskey="&staff.cat.copy_browser.actions.cmd_add_items_to_buckets.accesskey;"/>
-			<menuitem command="sel_copy_details" label="&staff.cat.copy_browser.actions.sel_copy_details.label;" accesskey="&staff.cat.copy_browser.actions.sel_copy_details.label;" />
-			<menuitem command="sel_patron" label="&staff.cat.copy_browser.actions.sel_patron.label;" accesskey="&staff.cat.copy_browser.actions.sel_patron.accesskey;"/>
-			<menuseparator/>
-			<menuitem command="cmd_edit_items" label="&staff.cat.copy_browser.actions.cmd_edit_items.label;" accesskey="&staff.cat.copy_browser.actions.cmd_edit_items.accesskey;"/>
-			<menuitem command="cmd_transfer_items" label="&staff.cat.copy_browser.actions.cmd_transfer_items.label;" accesskey="&staff.cat.copy_browser.actions.cmd_transfer_items.accesskey;"/>
-			<menuseparator/>
-			<menuitem command="cmd_add_volumes" label="&staff.cat.copy_browser.actions.cmd_add_volumes.label;" accesskey="&staff.cat.copy_browser.actions.cmd_add_volumes.accesskey;"/>
-			<menuitem command="cmd_mark_library" label="&staff.cat.copy_browser.actions.cmd_mark_library.label;" accesskey="&staff.cat.copy_browser.actions.cmd_mark_library.accesskey;"/>
-			<menuseparator/>
-			<menuitem command="cmd_add_items" label="&staff.cat.copy_browser.actions.cmd_add_items.label;" accesskey="&staff.cat.copy_browser.actions.cmd_add_items.accesskey;"/>
-			<menuitem command="cmd_edit_volumes" label="&staff.cat.copy_browser.actions.cmd_edit_volumes.label;" accesskey="&staff.cat.copy_browser.actions.cmd_edit_volumes.accesskey;"/>
-			<menuitem command="cmd_mark_volume" label="&staff.cat.copy_browser.actions.cmd_mark_volume.label;" accesskey="&staff.cat.copy_browser.actions.cmd_mark_volume.accesskey;"/>
-			<menuitem command="cmd_transfer_volume" label="&staff.cat.copy_browser.actions.cmd_transfer_volume.label;" accesskey="&staff.cat.copy_browser.actions.cmd_transfer_volume.accesskey;"/>
-			<menuseparator/>
-			<menuitem command="cmd_delete_items" label="&staff.cat.copy_browser.actions.cmd_delete_items.label;" accesskey=""/>
-			<menuitem command="cmd_delete_volumes" label="&staff.cat.copy_browser.actions.cmd_delete_volumes.label;" accesskey=""/>
-			<menuseparator/>
-			<menuitem command="sel_mark_items_damaged" label="&staff.cat.copy_browser.actions.sel_mark_items_damaged.label;" accesskey="&staff.cat.copy_browser.actions.sel_mark_items_damaged.accesskey;"/>
-			<menuitem command="sel_mark_items_missing" label="&staff.cat.copy_browser.actions.sel_mark_items_missing.label;" accesskey="&staff.cat.copy_browser.actions.sel_mark_items_missing.accesskey;"/>
-			<menuseparator/>
-			<menuitem command="cmd_print_spine_labels" label="&staff.cat.copy_browser.actions.cmd_print_spine_labels.label;" accesskey="&staff.cat.copy_browser.actions.cmd_print_spine_labels.accesskey;"/>
-			<menuitem command="cmd_replace_barcode" label="&staff.cat.copy_browser.actions.cmd_replace_barcode.label;" accesskey=""/>
-			<menuitem command="save_columns" label="&staff.cat.copy_browser.actions.save_columns.label;"/>
-			<menuitem command="cmd_refresh_list" label="&staff.cat.copy_browser.actions.cmd_refresh_list.label;" accesskey="&staff.cat.copy_browser.actions.cmd_refresh_list.accesskey;"/>
-		</popup>
-	</popupset>
-
-	<groupbox flex="1" class="my_overflow">
-		<caption label="&staff.cat.copy_browser.holdings_maintenance.caption;"/>
-		<hbox><label id="legend" style="font-size: large" class="has_copies" value="&staff.cat.copy_browser.holdings_maintenance.legend;" hidden="true"/></hbox>
-		<hbox>
-			<hbox id="x_lib_menu"/>
-			<spacer flex="1"/>
-			<label value="&staff.cat.copy_browser.holdings_maintenance.consortial_total;"/><label id="consortial_total"/>
-			<label value="&staff.cat.copy_browser.holdings_maintenance.consortial_available;"/><label id="consortial_available"/>
-		</hbox>
-		<hbox>
-			<checkbox id="show_acns" label="&staff.cat.copy_browser.holdings_maintenance.show_acns;" />
-			<checkbox id="show_acps" label="&staff.cat.copy_browser.holdings_maintenance.show_acps;" />
-			<button id="refresh_button" label="&staff.cat.copy_browser.holdings_maintenance.refresh_button.label;" command="cmd_refresh_list" />
-			<button label="&staff.cat.copy_browser.holdings_maintenance.show_libs.label;" command="cmd_show_libs_with_copies" accesskey="&staff.cat.copy_browser.holdings_maintenance.show_libs.accesskey;"/>
-			<!-- <button label="Show My Libs" command="cmd_show_my_libs" accesskey="M"/>-->
-			<!--
-			<button label="Show All Libs" command="cmd_show_all_libs" accesskey=""/>
-			-->
-			<spacer flex="1"/>
-			<menubar>
-				<menu label="&staff.cat.copy_browser.holdings_maintenance.actions.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.actions.accesskey;">
-					<menupopup>
-						<menuitem command="sel_clip" label="&staff.cat.copy_browser.holdings_maintenance.sel_clip.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.sel_clip.accesskey;"/>
-						<menuitem command="cmd_add_items_to_buckets" label="&staff.cat.copy_browser.holdings_maintenance.add_items_to_bucket.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.add_items_to_bucket.accesskey;"/>
-						<menuitem command="sel_copy_details" label="&staff.cat.copy_browser.holdings_maintenance.sel_copy_details.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.sel_copy_details.accesskey;" />
-						<menuitem command="sel_patron" label="&staff.cat.copy_browser.holdings_maintenance.sel_patron.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.sel_patron.accesskey;"/>
-						<menuseparator/>
-						<menuitem command="cmd_edit_items" label="&staff.cat.copy_browser.holdings_maintenance.cmd_edit_items.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_edit_items.accesskey;"/>
-						<menuitem command="cmd_transfer_items" label="&staff.cat.copy_browser.holdings_maintenance.cmd_transfer_items.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_transfer_items.accesskey;"/>
-						<menuseparator/>
-						<menuitem command="cmd_add_volumes" label="&staff.cat.copy_browser.holdings_maintenance.cmd_add_volumes.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_add_volumes.accesskey;"/>
-						<menuitem command="cmd_mark_library" label="&staff.cat.copy_browser.holdings_maintenance.cmd_mark_library.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_mark_library.accesskey;"/>
-						<menuseparator/>
-						<menuitem command="cmd_add_items" label="&staff.cat.copy_browser.holdings_maintenance.cmd_add_items.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_add_items.accesskey;"/>
-						<menuitem command="cmd_edit_volumes" label="&staff.cat.copy_browser.holdings_maintenance.cmd_edit_volumes.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_edit_volumes.accesskey;"/>
-						<menuitem command="cmd_mark_volume" label="&staff.cat.copy_browser.holdings_maintenance.cmd_mark_volume.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_mark_volume.accesskey;"/>
-						<menuitem command="cmd_transfer_volume" label="&staff.cat.copy_browser.holdings_maintenance.cmd_transfer_volume.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_transfer_volume.accesskey;"/>
-						<menuseparator/>
-						<menuitem command="cmd_delete_items" label="&staff.cat.copy_browser.holdings_maintenance.cmd_delete_items.label;" accesskey=""/>
-						<menuitem command="cmd_delete_volumes" label="&staff.cat.copy_browser.holdings_maintenance.cmd_delete_volumes.label;" accesskey=""/>
-						<menuseparator/>
-						<menuitem command="sel_mark_items_damaged" label="&staff.cat.copy_browser.holdings_maintenance.sel_mark_items_damaged.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.sel_mark_items_damaged.accesskey;"/>
-						<menuitem command="sel_mark_items_missing" label="&staff.cat.copy_browser.holdings_maintenance.sel_mark_items_missing.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.sel_mark_items_missing.accesskey;"/>
-						<menuseparator/>
-						<menuitem command="cmd_print_spine_labels" label="&staff.cat.copy_browser.holdings_maintenance.cmd_print_spine_labels.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_print_spine_labels.accesskey;"/>
-						<menuitem command="cmd_replace_barcode" label="&staff.cat.copy_browser.holdings_maintenance.cmd_replace_barcode.label;" accesskey=""/>
-						<menuitem command="save_columns" label="&staff.cat.copy_browser.holdings_maintenance.save_columns.label;"/>
-						<menuitem command="cmd_refresh_list" label="&staff.cat.copy_browser.holdings_maintenance.cmd_refresh_list.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_refresh_list.accesskey;"/>
-					</menupopup>
-				</menu>
-			</menubar>
-		</hbox>
-		<tree id="copy_tree" flex="1" enableColumnDrag="true" context="copy_browser_actions"/>
-	</groupbox>
+ onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
+ <script type="text/javascript">
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+ </script>
+ <scripts id="openils_util_scripts"/>
+
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script type="text/javascript" src="/xul/server/cat/copy_browser.js"/>
+ <script>
+ <![CDATA[
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { 
+     throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
+    }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for cat_copy_browser.xul');
+
+    JSAN.use('cat.copy_browser'); g.copy_browser = new cat.copy_browser();
+
+    g.copy_browser.init( { 'docid' : xul_param('docid') } );
+
+    //if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+    // try { window.xulG.set_tab_name('Holdings Maintenance'); } catch(E) { alert(E); }
+    //}
+
+   } catch(E) {
+    var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['cat/copy_browser.xul', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+
+ ]]>
+ </script>
+
+ <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+ <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+
+ <commandset id="cat_copy_browser">
+  <command id="save_columns" />
+  <command id="cmd_broken" />
+  <command id="sel_copy_details"/>
+  <command id="sel_patron"/>
+  <command id="sel_clip" />
+  <command id="cmd_clear" />
+  <command id="cmd_show_my_libs" />
+  <command id="cmd_show_all_libs" />
+  <command id="cmd_show_libs_with_copies" />
+
+  <command id="sel_mark_items_damaged" />
+  <command id="sel_mark_items_missing" />
+  <command id="cmd_add_items"/>
+  <command id="cmd_add_items_to_buckets"/>
+  <command id="cmd_edit_items"/>
+  <command id="cmd_replace_barcode"/>
+  <command id="cmd_delete_items"/>
+  <command id="cmd_transfer_items"/>
+  <command id="cmd_print_spine_labels"/>
+  <command id="cmd_add_volumes"/>
+  <command id="cmd_edit_volumes"/>
+  <command id="cmd_delete_volumes"/>
+  <command id="cmd_mark_volume"/>
+  <command id="cmd_mark_library"/>
+  <command id="cmd_transfer_volume"/>
+  <command id="cmd_refresh_list"/>
+ </commandset>
+
+ <popupset>
+  <popup id="copy_browser_actions">
+   <menuitem command="sel_clip" label="&staff.cat.copy_browser.actions.sel_clip.label;" accesskey="&staff.cat.copy_browser.actions.sel_clip.accesskey;"/>
+   <menuitem command="cmd_add_items_to_buckets" label="&staff.cat.copy_browser.actions.cmd_add_items_to_buckets.label;" accesskey="&staff.cat.copy_browser.actions.cmd_add_items_to_buckets.accesskey;"/>
+   <menuitem command="sel_copy_details" label="&staff.cat.copy_browser.actions.sel_copy_details.label;" accesskey="&staff.cat.copy_browser.actions.sel_copy_details.label;" />
+   <menuitem command="sel_patron" label="&staff.cat.copy_browser.actions.sel_patron.label;" accesskey="&staff.cat.copy_browser.actions.sel_patron.accesskey;"/>
+   <menuseparator/>
+   <menuitem command="cmd_edit_items" label="&staff.cat.copy_browser.actions.cmd_edit_items.label;" accesskey="&staff.cat.copy_browser.actions.cmd_edit_items.accesskey;"/>
+   <menuitem command="cmd_transfer_items" label="&staff.cat.copy_browser.actions.cmd_transfer_items.label;" accesskey="&staff.cat.copy_browser.actions.cmd_transfer_items.accesskey;"/>
+   <menuseparator/>
+   <menuitem command="cmd_add_volumes" label="&staff.cat.copy_browser.actions.cmd_add_volumes.label;" accesskey="&staff.cat.copy_browser.actions.cmd_add_volumes.accesskey;"/>
+   <menuitem command="cmd_mark_library" label="&staff.cat.copy_browser.actions.cmd_mark_library.label;" accesskey="&staff.cat.copy_browser.actions.cmd_mark_library.accesskey;"/>
+   <menuseparator/>
+   <menuitem command="cmd_add_items" label="&staff.cat.copy_browser.actions.cmd_add_items.label;" accesskey="&staff.cat.copy_browser.actions.cmd_add_items.accesskey;"/>
+   <menuitem command="cmd_edit_volumes" label="&staff.cat.copy_browser.actions.cmd_edit_volumes.label;" accesskey="&staff.cat.copy_browser.actions.cmd_edit_volumes.accesskey;"/>
+   <menuitem command="cmd_mark_volume" label="&staff.cat.copy_browser.actions.cmd_mark_volume.label;" accesskey="&staff.cat.copy_browser.actions.cmd_mark_volume.accesskey;"/>
+   <menuitem command="cmd_transfer_volume" label="&staff.cat.copy_browser.actions.cmd_transfer_volume.label;" accesskey="&staff.cat.copy_browser.actions.cmd_transfer_volume.accesskey;"/>
+   <menuseparator/>
+   <menuitem command="cmd_delete_items" label="&staff.cat.copy_browser.actions.cmd_delete_items.label;" accesskey=""/>
+   <menuitem command="cmd_delete_volumes" label="&staff.cat.copy_browser.actions.cmd_delete_volumes.label;" accesskey=""/>
+   <menuseparator/>
+   <menuitem command="sel_mark_items_damaged" label="&staff.cat.copy_browser.actions.sel_mark_items_damaged.label;" accesskey="&staff.cat.copy_browser.actions.sel_mark_items_damaged.accesskey;"/>
+   <menuitem command="sel_mark_items_missing" label="&staff.cat.copy_browser.actions.sel_mark_items_missing.label;" accesskey="&staff.cat.copy_browser.actions.sel_mark_items_missing.accesskey;"/>
+   <menuseparator/>
+   <menuitem command="cmd_print_spine_labels" label="&staff.cat.copy_browser.actions.cmd_print_spine_labels.label;" accesskey="&staff.cat.copy_browser.actions.cmd_print_spine_labels.accesskey;"/>
+   <menuitem command="cmd_replace_barcode" label="&staff.cat.copy_browser.actions.cmd_replace_barcode.label;" accesskey=""/>
+   <menuitem command="save_columns" label="&staff.cat.copy_browser.actions.save_columns.label;"/>
+   <menuitem command="cmd_refresh_list" label="&staff.cat.copy_browser.actions.cmd_refresh_list.label;" accesskey="&staff.cat.copy_browser.actions.cmd_refresh_list.accesskey;"/>
+  </popup>
+ </popupset>
+
+ <groupbox flex="1" class="my_overflow">
+  <caption label="&staff.cat.copy_browser.holdings_maintenance.caption;"/>
+  <hbox><label id="legend" style="font-size: large" class="has_copies" value="&staff.cat.copy_browser.holdings_maintenance.legend;" hidden="true"/></hbox>
+  <hbox>
+   <hbox id="x_lib_menu"/>
+   <spacer flex="1"/>
+   <label value="&staff.cat.copy_browser.holdings_maintenance.consortial_total;"/><label id="consortial_total"/>
+   <label value="&staff.cat.copy_browser.holdings_maintenance.consortial_available;"/><label id="consortial_available"/>
+  </hbox>
+  <hbox>
+   <checkbox id="show_acns" label="&staff.cat.copy_browser.holdings_maintenance.show_acns;" />
+   <checkbox id="show_acps" label="&staff.cat.copy_browser.holdings_maintenance.show_acps;" />
+   <button id="refresh_button" label="&staff.cat.copy_browser.holdings_maintenance.refresh_button.label;" command="cmd_refresh_list" />
+   <button label="&staff.cat.copy_browser.holdings_maintenance.show_libs.label;" command="cmd_show_libs_with_copies" accesskey="&staff.cat.copy_browser.holdings_maintenance.show_libs.accesskey;"/>
+   <!-- <button label="Show My Libs" command="cmd_show_my_libs" accesskey="M"/>-->
+   <!--
+   <button label="Show All Libs" command="cmd_show_all_libs" accesskey=""/>
+   -->
+   <spacer flex="1"/>
+   <menubar>
+    <menu label="&staff.cat.copy_browser.holdings_maintenance.actions.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.actions.accesskey;">
+     <menupopup>
+      <menuitem command="sel_clip" label="&staff.cat.copy_browser.holdings_maintenance.sel_clip.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.sel_clip.accesskey;"/>
+      <menuitem command="cmd_add_items_to_buckets" label="&staff.cat.copy_browser.holdings_maintenance.add_items_to_bucket.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.add_items_to_bucket.accesskey;"/>
+      <menuitem command="sel_copy_details" label="&staff.cat.copy_browser.holdings_maintenance.sel_copy_details.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.sel_copy_details.accesskey;" />
+      <menuitem command="sel_patron" label="&staff.cat.copy_browser.holdings_maintenance.sel_patron.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.sel_patron.accesskey;"/>
+      <menuseparator/>
+      <menuitem command="cmd_edit_items" label="&staff.cat.copy_browser.holdings_maintenance.cmd_edit_items.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_edit_items.accesskey;"/>
+      <menuitem command="cmd_transfer_items" label="&staff.cat.copy_browser.holdings_maintenance.cmd_transfer_items.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_transfer_items.accesskey;"/>
+      <menuseparator/>
+      <menuitem command="cmd_add_volumes" label="&staff.cat.copy_browser.holdings_maintenance.cmd_add_volumes.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_add_volumes.accesskey;"/>
+      <menuitem command="cmd_mark_library" label="&staff.cat.copy_browser.holdings_maintenance.cmd_mark_library.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_mark_library.accesskey;"/>
+      <menuseparator/>
+      <menuitem command="cmd_add_items" label="&staff.cat.copy_browser.holdings_maintenance.cmd_add_items.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_add_items.accesskey;"/>
+      <menuitem command="cmd_edit_volumes" label="&staff.cat.copy_browser.holdings_maintenance.cmd_edit_volumes.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_edit_volumes.accesskey;"/>
+      <menuitem command="cmd_mark_volume" label="&staff.cat.copy_browser.holdings_maintenance.cmd_mark_volume.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_mark_volume.accesskey;"/>
+      <menuitem command="cmd_transfer_volume" label="&staff.cat.copy_browser.holdings_maintenance.cmd_transfer_volume.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_transfer_volume.accesskey;"/>
+      <menuseparator/>
+      <menuitem command="cmd_delete_items" label="&staff.cat.copy_browser.holdings_maintenance.cmd_delete_items.label;" accesskey=""/>
+      <menuitem command="cmd_delete_volumes" label="&staff.cat.copy_browser.holdings_maintenance.cmd_delete_volumes.label;" accesskey=""/>
+      <menuseparator/>
+      <menuitem command="sel_mark_items_damaged" label="&staff.cat.copy_browser.holdings_maintenance.sel_mark_items_damaged.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.sel_mark_items_damaged.accesskey;"/>
+      <menuitem command="sel_mark_items_missing" label="&staff.cat.copy_browser.holdings_maintenance.sel_mark_items_missing.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.sel_mark_items_missing.accesskey;"/>
+      <menuseparator/>
+      <menuitem command="cmd_print_spine_labels" label="&staff.cat.copy_browser.holdings_maintenance.cmd_print_spine_labels.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_print_spine_labels.accesskey;"/>
+      <menuitem command="cmd_replace_barcode" label="&staff.cat.copy_browser.holdings_maintenance.cmd_replace_barcode.label;" accesskey=""/>
+      <menuitem command="save_columns" label="&staff.cat.copy_browser.holdings_maintenance.save_columns.label;"/>
+      <menuitem command="cmd_refresh_list" label="&staff.cat.copy_browser.holdings_maintenance.cmd_refresh_list.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_refresh_list.accesskey;"/>
+     </menupopup>
+    </menu>
+   </menubar>
+  </hbox>
+  <tree id="copy_tree" flex="1" enableColumnDrag="true" context="copy_browser_actions"/>
+ </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_buckets.js b/Open-ILS/xul/staff_client/server/cat/copy_buckets.js
index d171527835..f2b4c7bde7 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_buckets.js
+++ b/Open-ILS/xul/staff_client/server/cat/copy_buckets.js
@@ -4,46 +4,46 @@ dump('entering cat.copy_buckets.js\n');
 if (typeof cat == 'undefined') cat = {};
 cat.copy_buckets = function (params) {
 
-	JSAN.use('util.error'); this.error = new util.error();
-	JSAN.use('util.network'); this.network = new util.network();
-	JSAN.use('util.date');
-	JSAN.use('OpenILS.data'); this.data = new OpenILS.data(); this.data.init({'via':'stash'});
+ JSAN.use('util.error'); this.error = new util.error();
+ JSAN.use('util.network'); this.network = new util.network();
+ JSAN.use('util.date');
+ JSAN.use('OpenILS.data'); this.data = new OpenILS.data(); this.data.init({'via':'stash'});
 }
 
 cat.copy_buckets.prototype = {
-	'selection_list1' : [],
-	'selection_list2' : [],
-	'bucket_id_name_map' : {},
+ 'selection_list1' : [],
+ 'selection_list2' : [],
+ 'bucket_id_name_map' : {},
     'copy_hash' : {},
 
-	'render_pending_copies' : function() {
-		var obj = this;
-		obj.list1.clear();
-		for (var i = 0; i < obj.copy_ids.length; i++) {
-			var item = obj.prep_item_for_list( obj.copy_ids[i] );
-			if (item) obj.list1.append( item );
-		}
-	},
+ 'render_pending_copies' : function() {
+  var obj = this;
+  obj.list1.clear();
+  for (var i = 0; i < obj.copy_ids.length; i++) {
+   var item = obj.prep_item_for_list( obj.copy_ids[i] );
+   if (item) obj.list1.append( item );
+  }
+ },
 
-	'init' : function( params ) {
+ 'init' : function( params ) {
 
-		var obj = this;
+  var obj = this;
 
-		obj.copy_ids = params['copy_ids'] || [];
+  obj.copy_ids = params['copy_ids'] || [];
 
-		JSAN.use('circ.util');
-		var columns = circ.util.columns( 
-			{ 
-				'barcode' : { 'hidden' : false },
-				'title' : { 'hidden' : false },
-				'location' : { 'hidden' : false },
-				'call_number' : { 'hidden' : false },
-				'status' : { 'hidden' : false },
-				'deleted' : { 'hidden' : false },
-			} 
-		);
+  JSAN.use('circ.util');
+  var columns = circ.util.columns( 
+   { 
+    'barcode' : { 'hidden' : false },
+    'title' : { 'hidden' : false },
+    'location' : { 'hidden' : false },
+    'call_number' : { 'hidden' : false },
+    'status' : { 'hidden' : false },
+    'deleted' : { 'hidden' : false },
+   } 
+  );
 
-		JSAN.use('util.list'); 
+  JSAN.use('util.list'); 
 
         function retrieve_row(params) {
             var row = params.row;
@@ -75,73 +75,73 @@ cat.copy_buckets.prototype = {
             return row;
         }
 
-		obj.list1 = new util.list('pending_copies_list');
-		obj.list1.init(
-			{
-				'columns' : columns,
-				'map_row_to_columns' : circ.util.std_map_row_to_columns(),
+  obj.list1 = new util.list('pending_copies_list');
+  obj.list1.init(
+   {
+    'columns' : columns,
+    'map_row_to_columns' : circ.util.std_map_row_to_columns(),
                 'retrieve_row' : retrieve_row,
-				'on_select' : function(ev) {
-					try {
-						JSAN.use('util.functional');
-						var sel = obj.list1.retrieve_selection();
-						obj.selection_list1 = util.functional.map_list(
-							sel,
-							function(o) { return JSON2js(o.getAttribute('retrieve_id')); }
-						);
-						obj.error.sdump('D_TRACE','circ/copy_buckets: selection list 1 = ' + js2JSON(obj.selection_list1) );
-						if (obj.selection_list1.length == 0) {
-							obj.controller.view.copy_buckets_sel_add.disabled = true;
-						} else {
-							obj.controller.view.copy_buckets_sel_add.disabled = false;
-						}
-					} catch(E) {
-						alert('FIXME: ' + E);
-					}
-				},
-
-			}
-		);
-
-		obj.render_pending_copies();
-	
-		obj.list2 = new util.list('copies_in_bucket_list');
-		obj.list2.init(
-			{
-				'columns' : columns,
-				'map_row_to_columns' : circ.util.std_map_row_to_columns(),
+    'on_select' : function(ev) {
+     try {
+      JSAN.use('util.functional');
+      var sel = obj.list1.retrieve_selection();
+      obj.selection_list1 = util.functional.map_list(
+       sel,
+       function(o) { return JSON2js(o.getAttribute('retrieve_id')); }
+      );
+      obj.error.sdump('D_TRACE','circ/copy_buckets: selection list 1 = ' + js2JSON(obj.selection_list1) );
+      if (obj.selection_list1.length == 0) {
+       obj.controller.view.copy_buckets_sel_add.disabled = true;
+      } else {
+       obj.controller.view.copy_buckets_sel_add.disabled = false;
+      }
+     } catch(E) {
+      alert('FIXME: ' + E);
+     }
+    },
+
+   }
+  );
+
+  obj.render_pending_copies();
+ 
+  obj.list2 = new util.list('copies_in_bucket_list');
+  obj.list2.init(
+   {
+    'columns' : columns,
+    'map_row_to_columns' : circ.util.std_map_row_to_columns(),
                 'retrieve_row' : retrieve_row,
-				'on_select' : function(ev) {
-					try {
-						JSAN.use('util.functional');
-						var sel = obj.list2.retrieve_selection();
-						obj.selection_list2 = util.functional.map_list(
-							sel,
-							function(o) { return JSON2js(o.getAttribute('retrieve_id')); }
-						);
-						obj.error.sdump('D_TRACE','circ/copy_buckets: selection list 2 = ' + js2JSON(obj.selection_list2) );
-						if (obj.selection_list2.length == 0) {
-							obj.controller.view.copy_buckets_delete_item.disabled = true;
-							obj.controller.view.copy_buckets_delete_item.setAttribute('disabled','true');
-							obj.controller.view.copy_buckets_export.disabled = true;
-							obj.controller.view.copy_buckets_export.setAttribute('disabled','true');
-						} else {
-							obj.controller.view.copy_buckets_delete_item.disabled = false;
-							obj.controller.view.copy_buckets_delete_item.setAttribute('disabled','false');
-							obj.controller.view.copy_buckets_export.disabled = false;
-							obj.controller.view.copy_buckets_export.setAttribute('disabled','false');
-						}
-					} catch(E) {
-						alert('FIXME: ' + E);
-					}
-				},
-			}
-		);
-		
-		JSAN.use('util.controller'); obj.controller = new util.controller();
-		obj.controller.init(
-			{
-				'control_map' : {
+    'on_select' : function(ev) {
+     try {
+      JSAN.use('util.functional');
+      var sel = obj.list2.retrieve_selection();
+      obj.selection_list2 = util.functional.map_list(
+       sel,
+       function(o) { return JSON2js(o.getAttribute('retrieve_id')); }
+      );
+      obj.error.sdump('D_TRACE','circ/copy_buckets: selection list 2 = ' + js2JSON(obj.selection_list2) );
+      if (obj.selection_list2.length == 0) {
+       obj.controller.view.copy_buckets_delete_item.disabled = true;
+       obj.controller.view.copy_buckets_delete_item.setAttribute('disabled','true');
+       obj.controller.view.copy_buckets_export.disabled = true;
+       obj.controller.view.copy_buckets_export.setAttribute('disabled','true');
+      } else {
+       obj.controller.view.copy_buckets_delete_item.disabled = false;
+       obj.controller.view.copy_buckets_delete_item.setAttribute('disabled','false');
+       obj.controller.view.copy_buckets_export.disabled = false;
+       obj.controller.view.copy_buckets_export.setAttribute('disabled','false');
+      }
+     } catch(E) {
+      alert('FIXME: ' + E);
+     }
+    },
+   }
+  );
+  
+  JSAN.use('util.controller'); obj.controller = new util.controller();
+  obj.controller.init(
+   {
+    'control_map' : {
                     'list_actions1' : [
                         ['render'],
                         function(e) {
@@ -168,117 +168,117 @@ cat.copy_buckets.prototype = {
                             };
                         }
                     ],
-					'copy_bucket_barcode_entry_textbox' : [
-						['keypress'],
-						function(ev) {
-							if (ev.keyCode && ev.keyCode == 13) {
-								obj.scan_barcode();
-							}
-						}
-					],
+     'copy_bucket_barcode_entry_textbox' : [
+      ['keypress'],
+      function(ev) {
+       if (ev.keyCode && ev.keyCode == 13) {
+        obj.scan_barcode();
+       }
+      }
+     ],
                     'cmd_copy_bucket_submit_barcode' : [
                         ['command'],
                         function() {
                             obj.scan_barcode();
                         }
                     ],
-					'copy_buckets_menulist_placeholder' : [
-						['render'],
-						function(e) {
-							return function() {
-								JSAN.use('util.widgets'); JSAN.use('util.functional');
-								var items = [
-									[$('catStrings').getString('staff.cat.copy_buckets.menulist.render.choose_bucket'),''],
-									[$('catStrings').getString('staff.cat.copy_buckets.menulist.render.retrieve_bucket'),-1]
-								].concat(
-									util.functional.map_list(
-										obj.network.simple_request(
-											'BUCKET_RETRIEVE_VIA_USER',
-											[ ses(), obj.data.list.au[0].id() ]
-										).copy,
-										function(o) {
-											obj.bucket_id_name_map[ o.id() ] = o.name();
-											return [ o.name(), o.id() ];
-										}
-									).sort( 
-				                        function( a, b ) {
-				                            if (a[0] < b[0]) return -1;
-				                            if (a[0] > b[0]) return 1;
-				                            return 0;
-				                        }
-									)
-								);
-								obj.error.sdump('D_TRACE','items = ' + js2JSON(items));
-								util.widgets.remove_children( e );
-								var ml = util.widgets.make_menulist(
-									items
-								);
-								e.appendChild( ml );
-								ml.setAttribute('id','bucket_menulist');
-								ml.setAttribute('accesskey','');
-
-								function change_bucket(ev) {
-									var bucket_id = ev.target.value;
-									if (bucket_id < 0 ) {
-										bucket_id = window.prompt($('catStrings').getString('staff.cat.copy_buckets.menulist.change_bucket.prompt'));
-										ev.target.value = bucket_id;
-										ev.target.setAttribute('value',bucket_id);
-									}
-									if (!bucket_id) return;
-									var bucket = obj.network.simple_request(
-										'BUCKET_FLESH',
-										[ ses(), 'copy', bucket_id ]
-									);
-									if (typeof bucket.ilsevent != 'undefined') {
-										if (bucket.ilsevent == 1506 /* CONTAINER_NOT_FOUND */) {
-											alert($('catStrings').getFormattedString('staff.cat.copy_buckets.menulist.change_bucket.undefined', [bucket_id]));
-										} else {
-											obj.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_buckets.menulist.change_bucket.error'),bucket);
-										}
-										return;
-									}
-									try {
-										var x = document.getElementById('info_box');
-										x.setAttribute('hidden','false');
-										x = document.getElementById('bucket_number');
-										x.setAttribute('value',bucket.id());
-										x = document.getElementById('bucket_name');
-										x.setAttribute('value',bucket.name());
-										x = document.getElementById('bucket_owner');
-										var s = bucket.owner(); JSAN.use('patron.util');
-										if (s && typeof s != "object") s = patron.util.retrieve_fleshed_au_via_id(ses(),s); 
-										x.setAttribute('value',s.card().barcode() + " @ " + obj.data.hash.aou[ s.home_ou() ].shortname());
-
-									} catch(E) {
-										alert(E);
-									}
-									var items = bucket.items() || [];
-									obj.list2.clear();
-									for (var i = 0; i < items.length; i++) {
-										var item = obj.prep_item_for_list( 
-											items[i].target_copy(),
-											items[i].id()
-										);
-										if (item) obj.list2.append( item );
-									}
-								}
-
-								ml.addEventListener( 'change_bucket', change_bucket , false);
-								ml.addEventListener( 'command', function() {
-									JSAN.use('util.widgets'); util.widgets.dispatch('change_bucket',ml);
-								}, false);
-								obj.controller.view.bucket_menulist = ml;
-								JSAN.use('util.widgets'); util.widgets.dispatch('change_bucket',ml);
-								document.getElementById('refresh').addEventListener( 'command', function() {
-									JSAN.use('util.widgets'); util.widgets.dispatch('change_bucket',ml);
-								}, false);
-							};
-						},
-					],
-
-					'copy_buckets_add' : [
-						['command'],
-						function() {
+     'copy_buckets_menulist_placeholder' : [
+      ['render'],
+      function(e) {
+       return function() {
+        JSAN.use('util.widgets'); JSAN.use('util.functional');
+        var items = [
+         [$('catStrings').getString('staff.cat.copy_buckets.menulist.render.choose_bucket'),''],
+         [$('catStrings').getString('staff.cat.copy_buckets.menulist.render.retrieve_bucket'),-1]
+        ].concat(
+         util.functional.map_list(
+          obj.network.simple_request(
+           'BUCKET_RETRIEVE_VIA_USER',
+           [ ses(), obj.data.list.au[0].id() ]
+          ).copy,
+          function(o) {
+           obj.bucket_id_name_map[ o.id() ] = o.name();
+           return [ o.name(), o.id() ];
+          }
+         ).sort( 
+                            function( a, b ) {
+                                if (a[0] < b[0]) return -1;
+                                if (a[0] > b[0]) return 1;
+                                return 0;
+                            }
+         )
+        );
+        obj.error.sdump('D_TRACE','items = ' + js2JSON(items));
+        util.widgets.remove_children( e );
+        var ml = util.widgets.make_menulist(
+         items
+        );
+        e.appendChild( ml );
+        ml.setAttribute('id','bucket_menulist');
+        ml.setAttribute('accesskey','');
+
+        function change_bucket(ev) {
+         var bucket_id = ev.target.value;
+         if (bucket_id < 0 ) {
+          bucket_id = window.prompt($('catStrings').getString('staff.cat.copy_buckets.menulist.change_bucket.prompt'));
+          ev.target.value = bucket_id;
+          ev.target.setAttribute('value',bucket_id);
+         }
+         if (!bucket_id) return;
+         var bucket = obj.network.simple_request(
+          'BUCKET_FLESH',
+          [ ses(), 'copy', bucket_id ]
+         );
+         if (typeof bucket.ilsevent != 'undefined') {
+          if (bucket.ilsevent == 1506 /* CONTAINER_NOT_FOUND */) {
+           alert($('catStrings').getFormattedString('staff.cat.copy_buckets.menulist.change_bucket.undefined', [bucket_id]));
+          } else {
+           obj.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_buckets.menulist.change_bucket.error'),bucket);
+          }
+          return;
+         }
+         try {
+          var x = document.getElementById('info_box');
+          x.setAttribute('hidden','false');
+          x = document.getElementById('bucket_number');
+          x.setAttribute('value',bucket.id());
+          x = document.getElementById('bucket_name');
+          x.setAttribute('value',bucket.name());
+          x = document.getElementById('bucket_owner');
+          var s = bucket.owner(); JSAN.use('patron.util');
+          if (s && typeof s != "object") s = patron.util.retrieve_fleshed_au_via_id(ses(),s); 
+          x.setAttribute('value',s.card().barcode() + " @ " + obj.data.hash.aou[ s.home_ou() ].shortname());
+
+         } catch(E) {
+          alert(E);
+         }
+         var items = bucket.items() || [];
+         obj.list2.clear();
+         for (var i = 0; i < items.length; i++) {
+          var item = obj.prep_item_for_list( 
+           items[i].target_copy(),
+           items[i].id()
+          );
+          if (item) obj.list2.append( item );
+         }
+        }
+
+        ml.addEventListener( 'change_bucket', change_bucket , false);
+        ml.addEventListener( 'command', function() {
+         JSAN.use('util.widgets'); util.widgets.dispatch('change_bucket',ml);
+        }, false);
+        obj.controller.view.bucket_menulist = ml;
+        JSAN.use('util.widgets'); util.widgets.dispatch('change_bucket',ml);
+        document.getElementById('refresh').addEventListener( 'command', function() {
+         JSAN.use('util.widgets'); util.widgets.dispatch('change_bucket',ml);
+        }, false);
+       };
+      },
+     ],
+
+     'copy_buckets_add' : [
+      ['command'],
+      function() {
                             try {
                                 var bucket_id = obj.controller.view.bucket_menulist.value;
                                 if (!bucket_id) return;
@@ -304,321 +304,321 @@ cat.copy_buckets.prototype = {
                             } catch(E) {
                                 alert(E);
                             }
-						}
-					],
-					'copy_buckets_sel_add' : [
-						['command'],
-						function() {                                                        
-							var bucket_id = obj.controller.view.bucket_menulist.value;
-							if (!bucket_id) return;
-							for (var i = 0; i < obj.selection_list1.length; i++) {
+      }
+     ],
+     'copy_buckets_sel_add' : [
+      ['command'],
+      function() {                                                        
+       var bucket_id = obj.controller.view.bucket_menulist.value;
+       if (!bucket_id) return;
+       for (var i = 0; i < obj.selection_list1.length; i++) {
                                 var acp_id = obj.selection_list1[i][0];
-								//var barcode = obj.selection_list1[i][1];
-								var bucket_item = new ccbi();
-								bucket_item.isnew('1');
-								bucket_item.bucket(bucket_id);
-								bucket_item.target_copy( acp_id );
-								try {
-									var robj = obj.network.simple_request('BUCKET_ITEM_CREATE',
-										[ ses(), 'copy', bucket_item ]);
-
-									if (typeof robj == 'object') throw robj;
-
-									var item = obj.prep_item_for_list( acp_id, robj );
-									if (!item) continue;
-
-									obj.list2.append( item );
-								} catch(E) {
-									obj.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_buckets.copy_buckets_sel_add.error'), E);
-								}
-							}
-
-						}
-					],
-					'copy_buckets_export' : [
-						['command'],
-						function() {                                                        
-							for (var i = 0; i < obj.selection_list2.length; i++) {
-								var acp_id = obj.selection_list2[i][0];
-								//var barcode = obj.selection_list1[i][1];
-								//var bucket_item_id = obj.selection_list1[i][2];
-								var item = obj.prep_item_for_list( acp_id );
-								if (item) {
-									obj.list1.append( item );
-									obj.copy_ids.push( acp_id );
-								}
-							}
-						}
-					],
-
-					'copy_buckets_delete_item' : [
-						['command'],
-						function() {
-							for (var i = 0; i < obj.selection_list2.length; i++) {
-								try {
-									//var acp_id = obj.selection_list2[i][0];
-									//var barcode = obj.selection_list2[i][1];
-									var bucket_item_id = obj.selection_list2[i][2];
-									var robj = obj.network.simple_request('BUCKET_ITEM_DELETE',
-										[ ses(), 'copy', bucket_item_id ]);
-									if (typeof robj == 'object') throw robj;
-								} catch(E) {
-									obj.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_buckets.copy_buckets_delete_item.error'), E);
-								}
-							}
-							setTimeout(
-								function() {
-									JSAN.use('util.widgets'); 
-									util.widgets.dispatch('change_bucket',obj.controller.view.bucket_menulist);
-								}, 0
-							);
-						}
-					],
-					'copy_buckets_delete_bucket' : [
-						['command'],
-						function() {
-							try {
-								var bucket = obj.controller.view.bucket_menulist.value;
-								var name = obj.bucket_id_name_map[ bucket ];
-								var conf = window.confirm($('catStrings').getFormattedString('staff.cat.copy_buckets.copy_buckets_delete_bucket.confirm', [name]));
-								if (!conf) return;
-								obj.list2.clear();
-								var robj = obj.network.simple_request('BUCKET_DELETE',[ses(),'copy',bucket]);
-								if (typeof robj == 'object') throw robj;
-								obj.controller.render('copy_buckets_menulist_placeholder');
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_buckets.copy_buckets_delete_bucket.error'),E);
-							}
-						}
-					],
-					'copy_buckets_new_bucket' : [
-						['command'],
-						function() {
-							try {
-								var name = prompt(
-									$('catStrings').getString('staff.cat.copy_buckets.copy_buckets_new_bucket.prompt'),
-									'',
-									$('catStrings').getString('staff.cat.copy_buckets.copy_buckets_new_bucket.title')
-								);
-
-								if (name) {
-									var bucket = new ccb();
-									bucket.btype('staff_client');
-									bucket.owner( obj.data.list.au[0].id() );
-									bucket.name( name );
-
-									var robj = obj.network.simple_request('BUCKET_CREATE',[ses(),'copy',bucket]);
-
-									if (typeof robj == 'object') {
-										if (robj.ilsevent == 1710 /* CONTAINER_EXISTS */) {
-											alert($('catStrings').getString('staff.cat.copy_buckets.copy_buckets_new_bucket.container_exists'));
-											return;
-										}
-										throw robj;
-									}
-
-									obj.controller.render('copy_buckets_menulist_placeholder');
-									obj.controller.view.bucket_menulist.value = robj;
-									setTimeout(
-										function() {
-											JSAN.use('util.widgets'); 
-											util.widgets.dispatch('change_bucket',obj.controller.view.bucket_menulist);
-										}, 0
-									);
-								}
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_buckets.copy_buckets_new_bucket.error'),E);
-							}
-						}
-					],
-					'copy_buckets_batch_copy_edit' : [
-						['command'],
-						function() {
-							try {
-
-								obj.list2.select_all();
-							
-								JSAN.use('util.widgets'); JSAN.use('util.functional');
-
-								var list = util.functional.map_list(
-									obj.list2.dump_retrieve_ids(),
-									function (o) {
-										return JSON2js(o)[0]; // acp_id
-									}
-								);
-
-								JSAN.use('cat.util'); cat.util.spawn_copy_editor( { 'copy_ids' : list, 'edit' : 1 } );
-
-								obj.render_pending_copies(); // FIXME -- need a generic refresh for lists
-								setTimeout(
-									function() {
-										util.widgets.dispatch('change_bucket',obj.controller.view.bucket_menulist);
-									}, 0
-								);
-							} catch(E) {
-								alert( js2JSON(E) );
-							}
-						}
-					],
-					'copy_buckets_batch_copy_delete' : [
-						['command'],
-						function() {
-							try {
-							
-								obj.list2.select_all();
-
-								JSAN.use('util.widgets'); JSAN.use('util.functional');
-
-								var list = util.functional.map_list(
-									obj.list2.dump_retrieve_ids(),
-									function (o) {
-										return JSON2js(o)[0]; // acp_id
-									}
-								);
-
-								var copies = util.functional.map_list(
-									list,
-									function (acp_id) {
-										return obj.network.simple_request('FM_ACP_RETRIEVE',[acp_id]);
-									}
-								);
-
-								for (var i = 0; i < copies.length; i++) {
-									copies[i].ischanged(1);
-									copies[i].isdeleted(1);
-								}
-
-								var robj = obj.network.simple_request('FM_ACP_FLESHED_BATCH_UPDATE',[ ses(), copies, true]);
-								if (typeof robj.ilsevent != 'undefined') {
-									switch(Number(robj.ilsevent)) {
-										case 1227 /* COPY_DELETE_WARNING */ : 
-											var copy;
-											for (var i = 0; i < copies.length; i++) { if (copies[i].id()==robj.payload) copy = function(a){return a;}(copies[i]); }
-											/* The copy in question is not in an ideal status for deleting */
-											var err = '*** ' + robj.desc + ' ***\n';
-											/* The barcode for the item is {1} */
-											err += $('catStrings').getFormattedString('cat.barcode_for_item',[ copy.barcode() ]) + '\n';
-											/* The whole batch operation failed */
-											err += $('catStrings').getString('cat.batch_operation_failed') + '\n';
-											alert(err);
-										break;
-										default:
-											obj.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_buckets.batch.error'), robj);
-									}
-								}
-
-								obj.render_pending_copies(); // FIXME -- need a generic refresh for lists
-								setTimeout(
-									function() {
-										JSAN.use('util.widgets'); 
-										util.widgets.dispatch('change_bucket',obj.controller.view.bucket_menulist);
-									}, 0
-								);
-							} catch(E) {
-								alert( js2JSON(E) );
-							}
-						}
-					],
-
-					'copy_buckets_transfer_to_volume' : [
-						['command'],
-						function() {
-							try {
-								obj.list2.select_all();
-
-								obj.data.stash_retrieve();
-								if (!obj.data.marked_volume) {
-									alert($('catStrings').getString('staff.cat.copy_buckets.copy_buckets_transfer_to_volume.no_volume'));
-									return;
-								}
-
-								var copy_ids = util.functional.map_list(
-									obj.list2.dump_retrieve_ids(),
-									function (o) {
-										return JSON2js(o)[0]; // acp_id
-									}
-								)
-
-								var volume = obj.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ obj.data.marked_volume ]);
-
-								var msg = $('catStrings').getFormattedString(
-									'staff.cat.copy_buckets.copy_buckets_transfer_to_volume.confirm',
-									[
-										obj.controller.view.bucket_menulist.getAttribute('label'),
-										volume.label(),
-										obj.data.hash.aou[ volume.owning_lib() ].shortname()
-									]
-								);
-
-								JSAN.use('cat.util'); cat.util.transfer_copies( { 
-									'copy_ids' : copy_ids, 
-									'message' : msg, 
-									'docid' : volume.record(),
-									'volume_label' : volume.label(),
-									'owning_lib' : volume.owning_lib(),
-								} );
-
-								obj.render_pending_copies(); // FIXME -- need a generic refresh for lists
-								setTimeout(
-									function() {
-										JSAN.use('util.widgets'); 
-										util.widgets.dispatch('change_bucket',obj.controller.view.bucket_menulist);
-									}, 0
-								);
-								
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_buckets.copy_buckets_transfer_to_volume.error'), E);
-							}
-						}
-					],
-					'cmd_broken' : [
-						['command'],
-						function() { alert($('commonStrings').getString('common.unimplemented')); }
-					],
-					'cmd_copy_buckets_print' : [
-						['command'],
-						function() {
-							JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-							obj.list2.on_all_fleshed = function() {
-								try {
-									dump( js2JSON( obj.list2.dump_with_keys() ) + '\n' );
-									data.stash_retrieve();
-									var lib = data.hash.aou[ data.list.au[0].ws_ou() ];
-									lib.children(null);
-									var p = { 
-										'lib' : lib,
-										'staff' : data.list.au[0],
-										'header' : data.print_list_templates.item_status.header,
-										'line_item' : data.print_list_templates.item_status.line_item,
-										'footer' : data.print_list_templates.item_status.footer,
-										'type' : data.print_list_templates.item_status.type,
-										'list' : obj.list2.dump_with_keys(),
-									};
-									JSAN.use('util.print'); var print = new util.print();
-									print.tree_list( p );
-									setTimeout(function(){obj.list2.on_all_fleshed = null;},0);
-								} catch(E) {
-									alert(E); 
-								}
-							}
-							obj.list2.full_retrieve();
-						}
-					],
-					'cmd_copy_buckets_export' : [
-						['command'],
-						function() {
-							obj.list2.dump_csv_to_clipboard();
-						}
-					],
-					'cmd_copy_buckets_reprint' : [
-						['command'],
-						function() {
-						}
-					],
-					'cmd_export_to_copy_status' : [
-						['command'],
-						function() {
-							try {
+        //var barcode = obj.selection_list1[i][1];
+        var bucket_item = new ccbi();
+        bucket_item.isnew('1');
+        bucket_item.bucket(bucket_id);
+        bucket_item.target_copy( acp_id );
+        try {
+         var robj = obj.network.simple_request('BUCKET_ITEM_CREATE',
+          [ ses(), 'copy', bucket_item ]);
+
+         if (typeof robj == 'object') throw robj;
+
+         var item = obj.prep_item_for_list( acp_id, robj );
+         if (!item) continue;
+
+         obj.list2.append( item );
+        } catch(E) {
+         obj.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_buckets.copy_buckets_sel_add.error'), E);
+        }
+       }
+
+      }
+     ],
+     'copy_buckets_export' : [
+      ['command'],
+      function() {                                                        
+       for (var i = 0; i < obj.selection_list2.length; i++) {
+        var acp_id = obj.selection_list2[i][0];
+        //var barcode = obj.selection_list1[i][1];
+        //var bucket_item_id = obj.selection_list1[i][2];
+        var item = obj.prep_item_for_list( acp_id );
+        if (item) {
+         obj.list1.append( item );
+         obj.copy_ids.push( acp_id );
+        }
+       }
+      }
+     ],
+
+     'copy_buckets_delete_item' : [
+      ['command'],
+      function() {
+       for (var i = 0; i < obj.selection_list2.length; i++) {
+        try {
+         //var acp_id = obj.selection_list2[i][0];
+         //var barcode = obj.selection_list2[i][1];
+         var bucket_item_id = obj.selection_list2[i][2];
+         var robj = obj.network.simple_request('BUCKET_ITEM_DELETE',
+          [ ses(), 'copy', bucket_item_id ]);
+         if (typeof robj == 'object') throw robj;
+        } catch(E) {
+         obj.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_buckets.copy_buckets_delete_item.error'), E);
+        }
+       }
+       setTimeout(
+        function() {
+         JSAN.use('util.widgets'); 
+         util.widgets.dispatch('change_bucket',obj.controller.view.bucket_menulist);
+        }, 0
+       );
+      }
+     ],
+     'copy_buckets_delete_bucket' : [
+      ['command'],
+      function() {
+       try {
+        var bucket = obj.controller.view.bucket_menulist.value;
+        var name = obj.bucket_id_name_map[ bucket ];
+        var conf = window.confirm($('catStrings').getFormattedString('staff.cat.copy_buckets.copy_buckets_delete_bucket.confirm', [name]));
+        if (!conf) return;
+        obj.list2.clear();
+        var robj = obj.network.simple_request('BUCKET_DELETE',[ses(),'copy',bucket]);
+        if (typeof robj == 'object') throw robj;
+        obj.controller.render('copy_buckets_menulist_placeholder');
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_buckets.copy_buckets_delete_bucket.error'),E);
+       }
+      }
+     ],
+     'copy_buckets_new_bucket' : [
+      ['command'],
+      function() {
+       try {
+        var name = prompt(
+         $('catStrings').getString('staff.cat.copy_buckets.copy_buckets_new_bucket.prompt'),
+         '',
+         $('catStrings').getString('staff.cat.copy_buckets.copy_buckets_new_bucket.title')
+        );
+
+        if (name) {
+         var bucket = new ccb();
+         bucket.btype('staff_client');
+         bucket.owner( obj.data.list.au[0].id() );
+         bucket.name( name );
+
+         var robj = obj.network.simple_request('BUCKET_CREATE',[ses(),'copy',bucket]);
+
+         if (typeof robj == 'object') {
+          if (robj.ilsevent == 1710 /* CONTAINER_EXISTS */) {
+           alert($('catStrings').getString('staff.cat.copy_buckets.copy_buckets_new_bucket.container_exists'));
+           return;
+          }
+          throw robj;
+         }
+
+         obj.controller.render('copy_buckets_menulist_placeholder');
+         obj.controller.view.bucket_menulist.value = robj;
+         setTimeout(
+          function() {
+           JSAN.use('util.widgets'); 
+           util.widgets.dispatch('change_bucket',obj.controller.view.bucket_menulist);
+          }, 0
+         );
+        }
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_buckets.copy_buckets_new_bucket.error'),E);
+       }
+      }
+     ],
+     'copy_buckets_batch_copy_edit' : [
+      ['command'],
+      function() {
+       try {
+
+        obj.list2.select_all();
+       
+        JSAN.use('util.widgets'); JSAN.use('util.functional');
+
+        var list = util.functional.map_list(
+         obj.list2.dump_retrieve_ids(),
+         function (o) {
+          return JSON2js(o)[0]; // acp_id
+         }
+        );
+
+        JSAN.use('cat.util'); cat.util.spawn_copy_editor( { 'copy_ids' : list, 'edit' : 1 } );
+
+        obj.render_pending_copies(); // FIXME -- need a generic refresh for lists
+        setTimeout(
+         function() {
+          util.widgets.dispatch('change_bucket',obj.controller.view.bucket_menulist);
+         }, 0
+        );
+       } catch(E) {
+        alert( js2JSON(E) );
+       }
+      }
+     ],
+     'copy_buckets_batch_copy_delete' : [
+      ['command'],
+      function() {
+       try {
+       
+        obj.list2.select_all();
+
+        JSAN.use('util.widgets'); JSAN.use('util.functional');
+
+        var list = util.functional.map_list(
+         obj.list2.dump_retrieve_ids(),
+         function (o) {
+          return JSON2js(o)[0]; // acp_id
+         }
+        );
+
+        var copies = util.functional.map_list(
+         list,
+         function (acp_id) {
+          return obj.network.simple_request('FM_ACP_RETRIEVE',[acp_id]);
+         }
+        );
+
+        for (var i = 0; i < copies.length; i++) {
+         copies[i].ischanged(1);
+         copies[i].isdeleted(1);
+        }
+
+        var robj = obj.network.simple_request('FM_ACP_FLESHED_BATCH_UPDATE',[ ses(), copies, true]);
+        if (typeof robj.ilsevent != 'undefined') {
+         switch(Number(robj.ilsevent)) {
+          case 1227 /* COPY_DELETE_WARNING */ : 
+           var copy;
+           for (var i = 0; i < copies.length; i++) { if (copies[i].id()==robj.payload) copy = function(a){return a;}(copies[i]); }
+           /* The copy in question is not in an ideal status for deleting */
+           var err = '*** ' + robj.desc + ' ***\n';
+           /* The barcode for the item is {1} */
+           err += $('catStrings').getFormattedString('cat.barcode_for_item',[ copy.barcode() ]) + '\n';
+           /* The whole batch operation failed */
+           err += $('catStrings').getString('cat.batch_operation_failed') + '\n';
+           alert(err);
+          break;
+          default:
+           obj.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_buckets.batch.error'), robj);
+         }
+        }
+
+        obj.render_pending_copies(); // FIXME -- need a generic refresh for lists
+        setTimeout(
+         function() {
+          JSAN.use('util.widgets'); 
+          util.widgets.dispatch('change_bucket',obj.controller.view.bucket_menulist);
+         }, 0
+        );
+       } catch(E) {
+        alert( js2JSON(E) );
+       }
+      }
+     ],
+
+     'copy_buckets_transfer_to_volume' : [
+      ['command'],
+      function() {
+       try {
+        obj.list2.select_all();
+
+        obj.data.stash_retrieve();
+        if (!obj.data.marked_volume) {
+         alert($('catStrings').getString('staff.cat.copy_buckets.copy_buckets_transfer_to_volume.no_volume'));
+         return;
+        }
+
+        var copy_ids = util.functional.map_list(
+         obj.list2.dump_retrieve_ids(),
+         function (o) {
+          return JSON2js(o)[0]; // acp_id
+         }
+        )
+
+        var volume = obj.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ obj.data.marked_volume ]);
+
+        var msg = $('catStrings').getFormattedString(
+         'staff.cat.copy_buckets.copy_buckets_transfer_to_volume.confirm',
+         [
+          obj.controller.view.bucket_menulist.getAttribute('label'),
+          volume.label(),
+          obj.data.hash.aou[ volume.owning_lib() ].shortname()
+         ]
+        );
+
+        JSAN.use('cat.util'); cat.util.transfer_copies( { 
+         'copy_ids' : copy_ids, 
+         'message' : msg, 
+         'docid' : volume.record(),
+         'volume_label' : volume.label(),
+         'owning_lib' : volume.owning_lib(),
+        } );
+
+        obj.render_pending_copies(); // FIXME -- need a generic refresh for lists
+        setTimeout(
+         function() {
+          JSAN.use('util.widgets'); 
+          util.widgets.dispatch('change_bucket',obj.controller.view.bucket_menulist);
+         }, 0
+        );
+        
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_buckets.copy_buckets_transfer_to_volume.error'), E);
+       }
+      }
+     ],
+     'cmd_broken' : [
+      ['command'],
+      function() { alert($('commonStrings').getString('common.unimplemented')); }
+     ],
+     'cmd_copy_buckets_print' : [
+      ['command'],
+      function() {
+       JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+       obj.list2.on_all_fleshed = function() {
+        try {
+         dump( js2JSON( obj.list2.dump_with_keys() ) + '\n' );
+         data.stash_retrieve();
+         var lib = data.hash.aou[ data.list.au[0].ws_ou() ];
+         lib.children(null);
+         var p = { 
+          'lib' : lib,
+          'staff' : data.list.au[0],
+          'header' : data.print_list_templates.item_status.header,
+          'line_item' : data.print_list_templates.item_status.line_item,
+          'footer' : data.print_list_templates.item_status.footer,
+          'type' : data.print_list_templates.item_status.type,
+          'list' : obj.list2.dump_with_keys(),
+         };
+         JSAN.use('util.print'); var print = new util.print();
+         print.tree_list( p );
+         setTimeout(function(){obj.list2.on_all_fleshed = null;},0);
+        } catch(E) {
+         alert(E); 
+        }
+       }
+       obj.list2.full_retrieve();
+      }
+     ],
+     'cmd_copy_buckets_export' : [
+      ['command'],
+      function() {
+       obj.list2.dump_csv_to_clipboard();
+      }
+     ],
+     'cmd_copy_buckets_reprint' : [
+      ['command'],
+      function() {
+      }
+     ],
+     'cmd_export_to_copy_status' : [
+      ['command'],
+      function() {
+       try {
                                 obj.list2.on_all_fleshed =
                                     function() {
                                         try {
@@ -630,32 +630,32 @@ cat.copy_buckets.prototype = {
                                             );
                                             var url = urls.XUL_COPY_STATUS;
                                             xulG.new_tab( url, {}, { 'barcodes' : barcodes });
-									        setTimeout(function(){obj.list2.on_all_fleshed = null;},0);
+                 setTimeout(function(){obj.list2.on_all_fleshed = null;},0);
                                         } catch(E) {
                                             obj.error.standard_unexpected_error_alert('export to copy status',E);
                                         }
                                     }
                                 obj.list2.full_retrieve();
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_buckets.cmd_export_to_copy_status.error'), E);
-							}
-						}
-					],
-				}
-			}
-		);
-		this.controller.render();
-
-		if (typeof xulG == 'undefined') {
-			obj.controller.view.cmd_export_to_copy_status.disabled = true;
-			obj.controller.view.cmd_export_to_copy_status.setAttribute('disabled',true);
-		}
-	
-	},
-
-	'prep_item_for_list' : function(acp_id,bucket_item_id) {
-		var obj = this;
-		try {
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_buckets.cmd_export_to_copy_status.error'), E);
+       }
+      }
+     ],
+    }
+   }
+  );
+  this.controller.render();
+
+  if (typeof xulG == 'undefined') {
+   obj.controller.view.cmd_export_to_copy_status.disabled = true;
+   obj.controller.view.cmd_export_to_copy_status.setAttribute('disabled',true);
+  }
+ 
+ },
+
+ 'prep_item_for_list' : function(acp_id,bucket_item_id) {
+  var obj = this;
+  try {
             var item = {
                 'retrieve_id' : js2JSON( [ acp_id, null, bucket_item_id ] ),
                 'row' : {
@@ -667,12 +667,12 @@ cat.copy_buckets.prototype = {
                 }
             };
             return item;
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_buckets.prep_item_for_list.error'), E);
-			return null;
-		}
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_buckets.prep_item_for_list.error'), E);
+   return null;
+  }
 
-	},
+ },
 
     'scan_barcode' : function() {
         var obj = this;
@@ -720,7 +720,7 @@ cat.copy_buckets.prototype = {
             obj.controller.view.copy_bucket_barcode_entry_textbox.focus();
             alert(E);
         }
-    }	
+    } 
 }
 
 dump('exiting cat.copy_buckets.js\n');
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_buckets.xul b/Open-ILS/xul/staff_client/server/cat/copy_buckets.xul
index 555edcb016..f293ff6d21 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_buckets.xul
+++ b/Open-ILS/xul/staff_client/server/cat/copy_buckets.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -21,77 +21,77 @@
 <?xul-overlay href="/xul/server/cat/copy_buckets_overlay.xul"?>
 
 <window id="copy_buckets_win" title="&staff.cat.copy_buckets.window_title;"
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }" height="600" width="800" oils_persist="height width"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }" height="600" width="800" oils_persist="height width"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for copy_buckets.xul');
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for copy_buckets.xul');
+    JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
 
-				var copy_ids = xul_param(
-					'copy_ids',{
-						'concat' : true,
-						'JSON2js_if_cgi' : true,
-						'JSON2js_if_xpcom' : true,
-						'stash_name':'cb_temp_copy_ids',
-						'clear_xpcom' : true,
-					}
-				);
+    var copy_ids = xul_param(
+     'copy_ids',{
+      'concat' : true,
+      'JSON2js_if_cgi' : true,
+      'JSON2js_if_xpcom' : true,
+      'stash_name':'cb_temp_copy_ids',
+      'clear_xpcom' : true,
+     }
+    );
 
-				JSAN.use('cat.copy_buckets'); g.copy_buckets = new cat.copy_buckets();
-				g.copy_buckets.init( 
-					{ 
-						'copy_ids' : copy_ids,
-					} 
-				);
-	
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					try { window.xulG.set_tab_name(document.getElementById("catStrings").getString('cat.copy_buckets.tab')); } catch(E) { alert(E); }
-				}
+    JSAN.use('cat.copy_buckets'); g.copy_buckets = new cat.copy_buckets();
+    g.copy_buckets.init( 
+     { 
+      'copy_ids' : copy_ids,
+     } 
+    );
+ 
+    if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+     try { window.xulG.set_tab_name(document.getElementById("catStrings").getString('cat.copy_buckets.tab')); } catch(E) { alert(E); }
+    }
 
-			} catch(E) {
-				var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ["cat/copy_buckets.xul", E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
+   } catch(E) {
+    var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ["cat/copy_buckets.xul", E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
 
-		function default_focus() { try { setTimeout( function() { document.getElementById('copy_bucket_barcode_entry_textbox').focus(); }, 0); } catch(E) {} }
-	]]>
-	</script>
+  function default_focus() { try { setTimeout( function() { document.getElementById('copy_bucket_barcode_entry_textbox').focus(); }, 0); } catch(E) {} }
+ ]]>
+ </script>
 
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
+ <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
+ <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
 
-	<commandset id="copy_buckets_cmds">
-		<command id="cmd_copy_bucket_submit_barcode" />
-		<command id="cmd_export_to_copy_status" />
-		<command id="copy_buckets_new_bucket" />
-		<command id="copy_buckets_delete_bucket" />
-		<command id="copy_buckets_delete_item" />
-		<command id="copy_buckets_add" />
-		<command id="copy_buckets_sel_add" />
-		<command id="copy_buckets_export" />
-		<command id="copy_buckets_transfer_to_volume" />
-		<command id="copy_buckets_batch_copy_edit" />
-		<command id="copy_buckets_batch_copy_delete" />
-	</commandset>
+ <commandset id="copy_buckets_cmds">
+  <command id="cmd_copy_bucket_submit_barcode" />
+  <command id="cmd_export_to_copy_status" />
+  <command id="copy_buckets_new_bucket" />
+  <command id="copy_buckets_delete_bucket" />
+  <command id="copy_buckets_delete_item" />
+  <command id="copy_buckets_add" />
+  <command id="copy_buckets_sel_add" />
+  <command id="copy_buckets_export" />
+  <command id="copy_buckets_transfer_to_volume" />
+  <command id="copy_buckets_batch_copy_edit" />
+  <command id="copy_buckets_batch_copy_delete" />
+ </commandset>
 
-	<box id="copy_buckets_main" />
+ <box id="copy_buckets_main" />
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_buckets_overlay.xul b/Open-ILS/xul/staff_client/server/cat/copy_buckets_overlay.xul
index 1c357d016b..e9049ba922 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_buckets_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/cat/copy_buckets_overlay.xul
@@ -1,82 +1,82 @@
 <?xml version="1.0"?>
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 <overlay id="copy_buckets_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading copy_buckets_overlay.xul\n');</script>
 
 <commandset id="copy_buckets_cmds" />
 
 <box id="copy_buckets_main" flex="1" orient="vertical" class="my_overflow">
-	<vbox id="cmvb1" flex="1"/>
+ <vbox id="cmvb1" flex="1"/>
 </box>
 
 <vbox id="cmvb1" flex="1">
-	<groupbox flex="1">
-		<caption label="&staff.cat.copy_buckets_overlay.pending_copies;" />
-		<hbox id="pending_buckets_top_ui" />
-		<tree id="pending_copies_list" flex="1" enableColumnDrag="true"/>
-		<hbox id="pending_buckets_bottom_ui" />
-	</groupbox>
-	<splitter><grippy /></splitter>
-	<groupbox flex="2">
-		<caption label="&staff.cat.copy_buckets_overlay.bucket_view;" />
-		<hbox id="copy_buckets_top_ui" />
-		<hbox id="info_box"/>
-		<tree id="copies_in_bucket_list" flex="1" enableColumnDrag="true"/>
-		<hbox id="copy_buckets_bottom_ui" />
-	</groupbox>
+ <groupbox flex="1">
+  <caption label="&staff.cat.copy_buckets_overlay.pending_copies;" />
+  <hbox id="pending_buckets_top_ui" />
+  <tree id="pending_copies_list" flex="1" enableColumnDrag="true"/>
+  <hbox id="pending_buckets_bottom_ui" />
+ </groupbox>
+ <splitter><grippy /></splitter>
+ <groupbox flex="2">
+  <caption label="&staff.cat.copy_buckets_overlay.bucket_view;" />
+  <hbox id="copy_buckets_top_ui" />
+  <hbox id="info_box"/>
+  <tree id="copies_in_bucket_list" flex="1" enableColumnDrag="true"/>
+  <hbox id="copy_buckets_bottom_ui" />
+ </groupbox>
 </vbox>
 
 <hbox id="pending_buckets_top_ui">
-	<label id="copy_bucket_scan_barcode_label" 
-		value="&staff.circ.copy_status_overlay.copy_status_scan_barcode.label;"
-		accesskey="&staff.circ.copy_status_overlay.copy_status_scan_barcode.accesskey;"
-		control="copy_bucket_barcode_entry_textbox"/>
-	<textbox id="copy_bucket_barcode_entry_textbox" context="clipboard"/>
-	<button id="copy_bucket_submit_barcode_button" 
-		label="&staff.circ.copy_status_overlay.copy_status_submit_barcode.label;"
-		accesskey="&staff.circ.copy_status_overlay.copy_status_submit_barcode.accesskey;"
-		command="cmd_copy_bucket_submit_barcode"/>
+ <label id="copy_bucket_scan_barcode_label" 
+  value="&staff.circ.copy_status_overlay.copy_status_scan_barcode.label;"
+  accesskey="&staff.circ.copy_status_overlay.copy_status_scan_barcode.accesskey;"
+  control="copy_bucket_barcode_entry_textbox"/>
+ <textbox id="copy_bucket_barcode_entry_textbox" context="clipboard"/>
+ <button id="copy_bucket_submit_barcode_button" 
+  label="&staff.circ.copy_status_overlay.copy_status_submit_barcode.label;"
+  accesskey="&staff.circ.copy_status_overlay.copy_status_submit_barcode.accesskey;"
+  command="cmd_copy_bucket_submit_barcode"/>
 </hbox>
 
 <hbox id="pending_buckets_bottom_ui">
     <hbox id="list_actions1"/>
-	<spacer flex="1"/>
-	<button label="&staff.cat.copy_buckets_overlay.pending_buckets.copy_buckets_add.label;" command="copy_buckets_add" accesskey="&staff.cat.copy_buckets_overlay.pending_buckets.copy_buckets_add.accesskey;" image="/xul/server/skin/media/images/down_arrow.gif"/>
-	<button label="&staff.cat.copy_buckets_overlay.pending_buckets.copy_buckets_sel_add.label;" command="copy_buckets_sel_add" accesskey="" image="/xul/server/skin/media/images/down_arrow.gif"/>
+ <spacer flex="1"/>
+ <button label="&staff.cat.copy_buckets_overlay.pending_buckets.copy_buckets_add.label;" command="copy_buckets_add" accesskey="&staff.cat.copy_buckets_overlay.pending_buckets.copy_buckets_add.accesskey;" image="/xul/server/skin/media/images/down_arrow.gif"/>
+ <button label="&staff.cat.copy_buckets_overlay.pending_buckets.copy_buckets_sel_add.label;" command="copy_buckets_sel_add" accesskey="" image="/xul/server/skin/media/images/down_arrow.gif"/>
 </hbox>
 
 <hbox id="copy_buckets_top_ui">
-	<hbox id="copy_buckets_menulist_placeholder" />
-	<button command="copy_buckets_new_bucket" label="&staff.cat.copy_buckets_overlay.copy_buckets.copy_buckets_new_bucket.label;"/>
-	<button command="copy_buckets_delete_bucket" label="&staff.cat.copy_buckets_overlay.copy_buckets.copy_buckets_delete_bucket.label;"/>
-	<button id="refresh" label="&staff.cat.copy_buckets_overlay.copy_buckets.refresh.label;"/>
-	<spacer flex="1"/>
-	<button command="copy_buckets_delete_item" label="&staff.cat.copy_buckets_overlay.copy_buckets.delete_item.label;" disabled="true" image="/xul/server/skin/media/images/icon_delete.gif"/>
-	<button command="copy_buckets_export" label="&staff.cat.copy_buckets_overlay.copy_buckets.export.label;" disabled="true" image="/xul/server/skin/media/images/up_arrow.gif"/>
+ <hbox id="copy_buckets_menulist_placeholder" />
+ <button command="copy_buckets_new_bucket" label="&staff.cat.copy_buckets_overlay.copy_buckets.copy_buckets_new_bucket.label;"/>
+ <button command="copy_buckets_delete_bucket" label="&staff.cat.copy_buckets_overlay.copy_buckets.copy_buckets_delete_bucket.label;"/>
+ <button id="refresh" label="&staff.cat.copy_buckets_overlay.copy_buckets.refresh.label;"/>
+ <spacer flex="1"/>
+ <button command="copy_buckets_delete_item" label="&staff.cat.copy_buckets_overlay.copy_buckets.delete_item.label;" disabled="true" image="/xul/server/skin/media/images/icon_delete.gif"/>
+ <button command="copy_buckets_export" label="&staff.cat.copy_buckets_overlay.copy_buckets.export.label;" disabled="true" image="/xul/server/skin/media/images/up_arrow.gif"/>
 </hbox>
 
 <hbox id="info_box" hidden="true" style="font-size: large;">
-	<label value="&staff.cat.copy_buckets_overlay.info_box.bucket.label;"/>
-	<label id="bucket_number" style="color: blue; text-decoration: underline; -moz-user-focus: normal;" onclick="copy_to_clipboard(event)"/>
-	<label id="bucket_name" style="color: blue;"/>
-	<label value="&staff.cat.copy_buckets_overlay.info_box.owner.label;"/>
-	<label id="bucket_owner" style="color: blue;"/>
+ <label value="&staff.cat.copy_buckets_overlay.info_box.bucket.label;"/>
+ <label id="bucket_number" style="color: blue; text-decoration: underline; -moz-user-focus: normal;" onclick="copy_to_clipboard(event)"/>
+ <label id="bucket_name" style="color: blue;"/>
+ <label value="&staff.cat.copy_buckets_overlay.info_box.owner.label;"/>
+ <label id="bucket_owner" style="color: blue;"/>
 </hbox>
 
 <hbox id="copy_buckets_bottom_ui">
     <hbox id="list_actions2"/>
-	<spacer flex="1"/>
-	<hbox style="background: grey">
-		<vbox><spacer flex="1"/><label value="&staff.cat.copy_buckets_overlay.copy_buckets.batch.label;" style="font-weight: bold"/><spacer flex="1"/></vbox>
-		<button label="&staff.cat.copy_buckets_overlay.copy_buckets.cmd_export_to_copy_status.label;" command="cmd_export_to_copy_status"/>
-		<button command="copy_buckets_transfer_to_volume" label="&staff.cat.copy_buckets_overlay.copy_buckets.copy_buckets_transfer_to_volume.label;"/>
-		<button command="copy_buckets_batch_copy_edit" label="&staff.cat.copy_buckets_overlay.copy_buckets.copy_buckets_batch_copy_edit.label;" image="/xul/server/skin/media/images/grinder.gif"/>
-		<button command="copy_buckets_batch_copy_delete" label="&staff.cat.copy_buckets_overlay.copy_buckets.copy_buckets_batch_copy_delete.label;" />
-	</hbox>
+ <spacer flex="1"/>
+ <hbox style="background: grey">
+  <vbox><spacer flex="1"/><label value="&staff.cat.copy_buckets_overlay.copy_buckets.batch.label;" style="font-weight: bold"/><spacer flex="1"/></vbox>
+  <button label="&staff.cat.copy_buckets_overlay.copy_buckets.cmd_export_to_copy_status.label;" command="cmd_export_to_copy_status"/>
+  <button command="copy_buckets_transfer_to_volume" label="&staff.cat.copy_buckets_overlay.copy_buckets.copy_buckets_transfer_to_volume.label;"/>
+  <button command="copy_buckets_batch_copy_edit" label="&staff.cat.copy_buckets_overlay.copy_buckets.copy_buckets_batch_copy_edit.label;" image="/xul/server/skin/media/images/grinder.gif"/>
+  <button command="copy_buckets_batch_copy_delete" label="&staff.cat.copy_buckets_overlay.copy_buckets.copy_buckets_batch_copy_delete.label;" />
+ </hbox>
 </hbox>
 
 </overlay>
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_buckets_quick.xul b/Open-ILS/xul/staff_client/server/cat/copy_buckets_quick.xul
index 50d4717237..e4a48a426a 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_buckets_quick.xul
+++ b/Open-ILS/xul/staff_client/server/cat/copy_buckets_quick.xul
@@ -15,7 +15,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -23,154 +23,154 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="copy_buckets_win" title="&staff.cat.copy_buckets_quick.title;"
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }" oils_persist="height width"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
-	<scripts id="openils_util_scripts"/>
-
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-		function $c(n) { return document.createElement(n); }
-
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') {
-					throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
-				}
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for copy_buckets.xul');
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-
-				g.copy_ids = xul_param(
-					'copy_ids',{
-						'concat' : true,
-						'JSON2js_if_cgi' : true,
-						'JSON2js_if_xpcom' : true,
-						'stash_name':'cb_temp_copy_ids',
-						'clear_xpcom' : true,
-					}
-				);
-
-				$('desc').appendChild(
-					document.createTextNode( 
-						(g.copy_ids.length == 1 ?
-							$('catStrings').getString('staff.cat.copy_buckets_quick.bucket_prompt') :
-							$('catStrings').getFormattedString('staff.cat.copy_buckets_quick.bucket_prompt.plural', [g.copy_ids.length]) 
-						) 
-					)
-				);
-				var robj = g.network.simple_request('BUCKET_RETRIEVE_VIA_USER',[ ses(), g.data.list.au[0].id() ]);
-				if (typeof robj.ilsevent != 'undefined') throw(robj);
-
-				for (var i = 0; i < robj.copy.length; i++) {
-					var listitem = $c('listitem');
-					listitem.setAttribute('label', robj.copy[i].name());
-					listitem.setAttribute('id', robj.copy[i].id());
-					$('bucket_list').appendChild(listitem);
-				}
-
-				try { $('bucket_list').selectedIndex = 0; } catch(E) { }
-
-				$('bucket_list').focus();
-
-			} catch(E) {
-				try { 
-					g.error.standard_unexpected_error_alert('Trying to init copy_buckets_quick.xul',E); 
-				} catch(F) { 
-					alert(E); 
-				}
-			}
-		}
-
-		g.new_bucket = function() {
-			try {
-				var name = prompt(
-					$('catStrings').getString('staff.cat.copy_buckets_quick.copy_buckets_new_bucket.prompt'),
-					'',
-					$('catStrings').getString('staff.cat.copy_buckets_quick.copy_buckets_new_bucket.title')
-				);
-				if (name) {
-					var bucket = new ccb();
-					bucket.btype('staff_client');
-					bucket.owner( g.data.list.au[0].id() );
-					bucket.name( name );
-
-					var bucket_id = g.network.simple_request('BUCKET_CREATE',[ses(),'copy',bucket]);
-					if (typeof bucket_id == 'object') throw bucket_id;
-
-					g.add_to_bucket(bucket_id);
-				}
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_buckets_quick.copy_buckets_new_bucket.error'), E);
-			}
-		}
-
-		g.add_to_bucket = function(b) {
-			var bucket_id;
-			if (b) {
-				bucket_id = b;
-			} else {
-				try {
-					if ($('bucket_list').selectedItem) bucket_id = $('bucket_list').selectedItem.getAttribute('id');
-				} catch(E) {
-				}
-			}
-			if (!bucket_id) return;
-			for (var i = 0; i < g.copy_ids.length; i++) {
-				var bucket_item = new ccbi();
-				bucket_item.isnew('1');
-				bucket_item.bucket(bucket_id);
-				bucket_item.target_copy( g.copy_ids[i] );
-				try {
-					var robj = g.network.simple_request('BUCKET_ITEM_CREATE', [ ses(), 'copy', bucket_item ]);
-					if (typeof robj == 'object') throw robj;
-
-				} catch(E) {
-					g.error.standard_unexpected_error_alert($('catStrings').getFormattedString('staff.cat.copy_buckets_quick.addition.error', [bucket_id, g.copy_ids[i]]), E);
-				}
-			}
-			window.close();
-		}
-
-		g.advanced = function() {
-			JSAN.use('util.window'); var win = new util.window();
-			g.data.cb_temp_copy_ids = js2JSON( g.copy_ids ); g.data.stash('cb_temp_copy_ids');
-			win.open(urls.XUL_COPY_BUCKETS,'adv_copy_buckets','chrome,resizable,modal');
-			window.close();
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-
-	<vbox flex="1" style="overflow: auto">
-	<groupbox flex="1">
-		<caption label="&staff.cat.copy_buckets_quick.item_buckets.label;"/>
-		<description id="desc"/>
-		<listbox id="bucket_list" rows="5" flex="1" style="overflow: auto"/>
-		<hbox>
-			<button label="&staff.cat.copy_buckets_quick.item_buckets.add_to_bucket.label;" accesskey="&staff.cat.copy_buckets_quick.item_buckets.add_to_bucket.accesskey;" oncommand="g.add_to_bucket()"/>
-			<button label="&staff.cat.copy_buckets_quick.item_buckets.new_bucket.label;" accesskey="&staff.cat.copy_buckets_quick.item_buckets.new_bucket.accesskey;" oncommand="g.new_bucket()"/>
-		</hbox>
-		<hbox>
-			<!--
-			<button label="Advanced" accesskey="v" oncommand="g.advanced()"/>
-			-->
-			<button label="&staff.cat.copy_buckets_quick.item_buckets.cancel.label;" accesskey="&staff.cat.copy_buckets_quick.item_buckets.cancel.accesskey;" oncommand="window.close()"/>
-		</hbox>
-	</groupbox>
-	</vbox>
+ onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }" oils_persist="height width"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
+ <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
+ <scripts id="openils_util_scripts"/>
+
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  function $(id) { return document.getElementById(id); }
+  function $c(n) { return document.createElement(n); }
+
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') {
+     throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
+    }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for copy_buckets.xul');
+    JSAN.use('util.network'); g.network = new util.network();
+    JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+
+    g.copy_ids = xul_param(
+     'copy_ids',{
+      'concat' : true,
+      'JSON2js_if_cgi' : true,
+      'JSON2js_if_xpcom' : true,
+      'stash_name':'cb_temp_copy_ids',
+      'clear_xpcom' : true,
+     }
+    );
+
+    $('desc').appendChild(
+     document.createTextNode( 
+      (g.copy_ids.length == 1 ?
+       $('catStrings').getString('staff.cat.copy_buckets_quick.bucket_prompt') :
+       $('catStrings').getFormattedString('staff.cat.copy_buckets_quick.bucket_prompt.plural', [g.copy_ids.length]) 
+      ) 
+     )
+    );
+    var robj = g.network.simple_request('BUCKET_RETRIEVE_VIA_USER',[ ses(), g.data.list.au[0].id() ]);
+    if (typeof robj.ilsevent != 'undefined') throw(robj);
+
+    for (var i = 0; i < robj.copy.length; i++) {
+     var listitem = $c('listitem');
+     listitem.setAttribute('label', robj.copy[i].name());
+     listitem.setAttribute('id', robj.copy[i].id());
+     $('bucket_list').appendChild(listitem);
+    }
+
+    try { $('bucket_list').selectedIndex = 0; } catch(E) { }
+
+    $('bucket_list').focus();
+
+   } catch(E) {
+    try { 
+     g.error.standard_unexpected_error_alert('Trying to init copy_buckets_quick.xul',E); 
+    } catch(F) { 
+     alert(E); 
+    }
+   }
+  }
+
+  g.new_bucket = function() {
+   try {
+    var name = prompt(
+     $('catStrings').getString('staff.cat.copy_buckets_quick.copy_buckets_new_bucket.prompt'),
+     '',
+     $('catStrings').getString('staff.cat.copy_buckets_quick.copy_buckets_new_bucket.title')
+    );
+    if (name) {
+     var bucket = new ccb();
+     bucket.btype('staff_client');
+     bucket.owner( g.data.list.au[0].id() );
+     bucket.name( name );
+
+     var bucket_id = g.network.simple_request('BUCKET_CREATE',[ses(),'copy',bucket]);
+     if (typeof bucket_id == 'object') throw bucket_id;
+
+     g.add_to_bucket(bucket_id);
+    }
+   } catch(E) {
+    g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_buckets_quick.copy_buckets_new_bucket.error'), E);
+   }
+  }
+
+  g.add_to_bucket = function(b) {
+   var bucket_id;
+   if (b) {
+    bucket_id = b;
+   } else {
+    try {
+     if ($('bucket_list').selectedItem) bucket_id = $('bucket_list').selectedItem.getAttribute('id');
+    } catch(E) {
+    }
+   }
+   if (!bucket_id) return;
+   for (var i = 0; i < g.copy_ids.length; i++) {
+    var bucket_item = new ccbi();
+    bucket_item.isnew('1');
+    bucket_item.bucket(bucket_id);
+    bucket_item.target_copy( g.copy_ids[i] );
+    try {
+     var robj = g.network.simple_request('BUCKET_ITEM_CREATE', [ ses(), 'copy', bucket_item ]);
+     if (typeof robj == 'object') throw robj;
+
+    } catch(E) {
+     g.error.standard_unexpected_error_alert($('catStrings').getFormattedString('staff.cat.copy_buckets_quick.addition.error', [bucket_id, g.copy_ids[i]]), E);
+    }
+   }
+   window.close();
+  }
+
+  g.advanced = function() {
+   JSAN.use('util.window'); var win = new util.window();
+   g.data.cb_temp_copy_ids = js2JSON( g.copy_ids ); g.data.stash('cb_temp_copy_ids');
+   win.open(urls.XUL_COPY_BUCKETS,'adv_copy_buckets','chrome,resizable,modal');
+   window.close();
+  }
+
+ ]]>
+ </script>
+
+ <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+ <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+
+ <vbox flex="1" style="overflow: auto">
+ <groupbox flex="1">
+  <caption label="&staff.cat.copy_buckets_quick.item_buckets.label;"/>
+  <description id="desc"/>
+  <listbox id="bucket_list" rows="5" flex="1" style="overflow: auto"/>
+  <hbox>
+   <button label="&staff.cat.copy_buckets_quick.item_buckets.add_to_bucket.label;" accesskey="&staff.cat.copy_buckets_quick.item_buckets.add_to_bucket.accesskey;" oncommand="g.add_to_bucket()"/>
+   <button label="&staff.cat.copy_buckets_quick.item_buckets.new_bucket.label;" accesskey="&staff.cat.copy_buckets_quick.item_buckets.new_bucket.accesskey;" oncommand="g.new_bucket()"/>
+  </hbox>
+  <hbox>
+   <!--
+   <button label="Advanced" accesskey="v" oncommand="g.advanced()"/>
+   -->
+   <button label="&staff.cat.copy_buckets_quick.item_buckets.cancel.label;" accesskey="&staff.cat.copy_buckets_quick.item_buckets.cancel.accesskey;" oncommand="window.close()"/>
+  </hbox>
+ </groupbox>
+ </vbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_editor.js b/Open-ILS/xul/staff_client/server/cat/copy_editor.js
index 9564f7b293..9fd9c20a37 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_editor.js
+++ b/Open-ILS/xul/staff_client/server/cat/copy_editor.js
@@ -7,64 +7,64 @@ var xulG = {};
 function $(id) { return document.getElementById(id); }
 
 function my_init() {
-	try {
-		/******************************************************************************************************/
-		/* setup JSAN and some initial libraries */
+ try {
+  /******************************************************************************************************/
+  /* setup JSAN and some initial libraries */
 
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		if (typeof JSAN == 'undefined') {
-			throw( $('commonStrings').getString('common.jsan.missing') );
-		}
-		JSAN.errorLevel = "die"; // none, warn, or die
-		JSAN.addRepository('/xul/server/');
-		JSAN.use('util.error'); g.error = new util.error();
-		g.error.sdump('D_TRACE','my_init() for cat/copy_editor.xul');
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  if (typeof JSAN == 'undefined') {
+   throw( $('commonStrings').getString('common.jsan.missing') );
+  }
+  JSAN.errorLevel = "die"; // none, warn, or die
+  JSAN.addRepository('/xul/server/');
+  JSAN.use('util.error'); g.error = new util.error();
+  g.error.sdump('D_TRACE','my_init() for cat/copy_editor.xul');
 
-		JSAN.use('util.functional');
-		JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-		JSAN.use('util.network'); g.network = new util.network();
+  JSAN.use('util.functional');
+  JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+  JSAN.use('util.network'); g.network = new util.network();
 
-		g.docid = xul_param('docid',{'modal_xulG':true});
-		g.handle_update = xul_param('handle_update',{'modal_xulG':true});
+  g.docid = xul_param('docid',{'modal_xulG':true});
+  g.handle_update = xul_param('handle_update',{'modal_xulG':true});
 
-		/******************************************************************************************************/
-		/* Get the copy ids from various sources and flesh them */
+  /******************************************************************************************************/
+  /* Get the copy ids from various sources and flesh them */
 
-		var copy_ids = xul_param('copy_ids',{'concat':true,'JSON2js_if_cgi':true,'JSON2js_if_xulG':true,'JSON2js_if_xpcom':true,'stash_name':'temp_copy_ids','clear_xpcom':true,'modal_xulG':true});
-		if (!copy_ids) copy_ids = [];
+  var copy_ids = xul_param('copy_ids',{'concat':true,'JSON2js_if_cgi':true,'JSON2js_if_xulG':true,'JSON2js_if_xpcom':true,'stash_name':'temp_copy_ids','clear_xpcom':true,'modal_xulG':true});
+  if (!copy_ids) copy_ids = [];
 
-		if (copy_ids.length > 0) g.copies = g.network.simple_request(
-			'FM_ACP_FLESHED_BATCH_RETRIEVE.authoritative',
-			[ copy_ids ]
-		);
+  if (copy_ids.length > 0) g.copies = g.network.simple_request(
+   'FM_ACP_FLESHED_BATCH_RETRIEVE.authoritative',
+   [ copy_ids ]
+  );
 
-		/******************************************************************************************************/
-		/* And other fleshed copies if any */
+  /******************************************************************************************************/
+  /* And other fleshed copies if any */
 
-		if (!g.copies) g.copies = [];
-		var c = xul_param('copies',{'concat':true,'JSON2js_if_cgi':true,'JSON2js_if_xpcom':true,'stash_name':'temp_copies','clear_xpcom':true,'modal_xulG':true})
-		if (c) g.copies = g.copies.concat(c);
+  if (!g.copies) g.copies = [];
+  var c = xul_param('copies',{'concat':true,'JSON2js_if_cgi':true,'JSON2js_if_xpcom':true,'stash_name':'temp_copies','clear_xpcom':true,'modal_xulG':true})
+  if (c) g.copies = g.copies.concat(c);
 
-		/******************************************************************************************************/
-		/* We try to retrieve callnumbers for existing copies, but for new copies, we rely on this */
+  /******************************************************************************************************/
+  /* We try to retrieve callnumbers for existing copies, but for new copies, we rely on this */
 
-		g.callnumbers = xul_param('callnumbers',{'concat':true,'JSON2js_if_cgi':true,'JSON2js_if_xpcom':true,'stash_name':'temp_callnumbers','clear_xpcom':true,'modal_xulG':true});
+  g.callnumbers = xul_param('callnumbers',{'concat':true,'JSON2js_if_cgi':true,'JSON2js_if_xpcom':true,'stash_name':'temp_callnumbers','clear_xpcom':true,'modal_xulG':true});
 
 
-		/******************************************************************************************************/
-		/* Quick fix, this was defined inline in the global scope but now needs g.error and g.copies from my_init */
-		/* Quick fix, messagecatalog only usable during/after onload */
+  /******************************************************************************************************/
+  /* Quick fix, this was defined inline in the global scope but now needs g.error and g.copies from my_init */
+  /* Quick fix, messagecatalog only usable during/after onload */
 
         init_panes0();
         init_panes();
 
-		/******************************************************************************************************/
-		/* Is the interface an editor or a viewer, single or multi copy, existing copies or new copies? */
+  /******************************************************************************************************/
+  /* Is the interface an editor or a viewer, single or multi copy, existing copies or new copies? */
 
-		if (xul_param('edit',{'modal_xulG':true}) == '1') { 
+  if (xul_param('edit',{'modal_xulG':true}) == '1') { 
 
             // Editor desired, but let's check permissions
-			g.edit = false;
+   g.edit = false;
 
             try {
                 var check = g.network.simple_request(
@@ -103,278 +103,278 @@ function my_init() {
                 g.error.standard_unexpected_error_alert('batch permission check',E);
             }
 
-			if (g.edit) {
+   if (g.edit) {
                 $('caption').setAttribute('label', $('catStrings').getString('staff.cat.copy_editor.caption')); 
-    			$('save').setAttribute('hidden','false'); 
-    			g.retrieve_templates();
+       $('save').setAttribute('hidden','false'); 
+       g.retrieve_templates();
             } else {
-			    $('top_nav').setAttribute('hidden','true');
+       $('top_nav').setAttribute('hidden','true');
             }
-		} else {
-			$('top_nav').setAttribute('hidden','true');
-		}
-
-		if (g.copies.length > 0 && g.copies[0].id() < 0) {
-			document.getElementById('copy_notes').setAttribute('hidden','true');
-			g.apply("status",5 /* In Process */);
-			$('save').setAttribute('label', $('catStrings').getString('staff.cat.copy_editor.create_copies'));
-		} else {
-			g.panes_and_field_names.left_pane = 
-				[
-					[
-						$('catStrings').getString('staff.cat.copy_editor.status'),
-						{ 
-							render: 'typeof fm.status() == "object" ? fm.status().name() : g.data.hash.ccs[ fm.status() ].name()', 
-							input: g.safe_to_edit_copy_status() ? 'c = function(v){ g.apply("status",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( util.functional.map_list( g.data.list.ccs, function(obj) { return [ obj.name(), obj.id(), typeof my_constants.magical_statuses[obj.id()] != "undefined" ? true : false ]; } ).sort() ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);' : undefined,
-							//input: 'c = function(v){ g.apply("status",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( util.functional.map_list( util.functional.filter_list( g.data.list.ccs, function(obj) { return typeof my_constants.magical_statuses[obj.id()] == "undefined"; } ), function(obj) { return [ obj.name(), obj.id() ]; } ).sort() ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
-						}
-					]
-				].concat(g.panes_and_field_names.left_pane);
-		}
-
-		if (g.copies.length != 1) {
-			document.getElementById('copy_notes').setAttribute('hidden','true');
-		}
-
-		/******************************************************************************************************/
-		/* Show the Record Details? */
+  } else {
+   $('top_nav').setAttribute('hidden','true');
+  }
+
+  if (g.copies.length > 0 && g.copies[0].id() < 0) {
+   document.getElementById('copy_notes').setAttribute('hidden','true');
+   g.apply("status",5 /* In Process */);
+   $('save').setAttribute('label', $('catStrings').getString('staff.cat.copy_editor.create_copies'));
+  } else {
+   g.panes_and_field_names.left_pane = 
+    [
+     [
+      $('catStrings').getString('staff.cat.copy_editor.status'),
+      { 
+       render: 'typeof fm.status() == "object" ? fm.status().name() : g.data.hash.ccs[ fm.status() ].name()', 
+       input: g.safe_to_edit_copy_status() ? 'c = function(v){ g.apply("status",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( util.functional.map_list( g.data.list.ccs, function(obj) { return [ obj.name(), obj.id(), typeof my_constants.magical_statuses[obj.id()] != "undefined" ? true : false ]; } ).sort() ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);' : undefined,
+       //input: 'c = function(v){ g.apply("status",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( util.functional.map_list( util.functional.filter_list( g.data.list.ccs, function(obj) { return typeof my_constants.magical_statuses[obj.id()] == "undefined"; } ), function(obj) { return [ obj.name(), obj.id() ]; } ).sort() ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
+      }
+     ]
+    ].concat(g.panes_and_field_names.left_pane);
+  }
+
+  if (g.copies.length != 1) {
+   document.getElementById('copy_notes').setAttribute('hidden','true');
+  }
+
+  /******************************************************************************************************/
+  /* Show the Record Details? */
 
         var bdb = document.getElementById('brief_display_box'); while(bdb.firstChild) bdb.removeChild(bdb.lastChild);
-		if (g.docid) {
+  if (g.docid) {
             var brief_display = document.createElement('iframe'); bdb.appendChild(brief_display); 
-			brief_display.setAttribute( 'src', urls.XUL_BIB_BRIEF + '?docid=' + g.docid); // this is a modal window, so can't push in xulG
-			brief_display.setAttribute( 'flex','1' );
-		}
+   brief_display.setAttribute( 'src', urls.XUL_BIB_BRIEF + '?docid=' + g.docid); // this is a modal window, so can't push in xulG
+   brief_display.setAttribute( 'flex','1' );
+  }
 
-		/******************************************************************************************************/
-		/* Add stat cats to the panes_and_field_names.right_pane4 */
+  /******************************************************************************************************/
+  /* Add stat cats to the panes_and_field_names.right_pane4 */
 
         g.populate_stat_cats();
 
-		/******************************************************************************************************/
-		/* Backup copies :) */
+  /******************************************************************************************************/
+  /* Backup copies :) */
 
-		g.original_copies = js2JSON( g.copies );
+  g.original_copies = js2JSON( g.copies );
 
-		/******************************************************************************************************/
-		/* Do it */
+  /******************************************************************************************************/
+  /* Do it */
 
-		g.summarize( g.copies );
-		g.render();
+  g.summarize( g.copies );
+  g.render();
 
-	} catch(E) {
-		var err_msg = $("commonStrings").getFormattedString('common.exception', ['cat/copy_editor.js', E]);
-		try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); dump(js2JSON(E)); }
-		alert(err_msg);
-	}
+ } catch(E) {
+  var err_msg = $("commonStrings").getFormattedString('common.exception', ['cat/copy_editor.js', E]);
+  try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); dump(js2JSON(E)); }
+  alert(err_msg);
+ }
 }
 
 /******************************************************************************************************/
 /* Retrieve Templates */
 
 g.retrieve_templates = function() {
-	try {
-		JSAN.use('util.widgets'); JSAN.use('util.functional');
-		g.templates = {};
-		var robj = g.network.simple_request('FM_AUS_RETRIEVE',[ses(),g.data.list.au[0].id()]);
-		if (typeof robj['staff_client.copy_editor.templates'] != 'undefined') {
-			g.templates = robj['staff_client.copy_editor.templates'];
-		}
-		util.widgets.remove_children('template_placeholder');
-		var list = util.functional.map_object_to_list( g.templates, function(obj,i) { return [i, i]; } ).sort();
-
-		g.template_menu = util.widgets.make_menulist( list );
+ try {
+  JSAN.use('util.widgets'); JSAN.use('util.functional');
+  g.templates = {};
+  var robj = g.network.simple_request('FM_AUS_RETRIEVE',[ses(),g.data.list.au[0].id()]);
+  if (typeof robj['staff_client.copy_editor.templates'] != 'undefined') {
+   g.templates = robj['staff_client.copy_editor.templates'];
+  }
+  util.widgets.remove_children('template_placeholder');
+  var list = util.functional.map_object_to_list( g.templates, function(obj,i) { return [i, i]; } ).sort();
+
+  g.template_menu = util.widgets.make_menulist( list );
         g.template_menu.setAttribute('id','template_menu');
-		$('template_placeholder').appendChild(g.template_menu);
+  $('template_placeholder').appendChild(g.template_menu);
         g.template_menu.addEventListener(
             'command',
             function() { g.copy_editor_prefs[ 'template_menu' ] = { 'value' : g.template_menu.value }; g.save_attributes(); },
             false
         );
-	} catch(E) {
-		g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_editor.retrieve_templates.error'), E);
-	}
+ } catch(E) {
+  g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_editor.retrieve_templates.error'), E);
+ }
 }
 
 /******************************************************************************************************/
 /* Apply Template */
 
 g.apply_template = function() {
-	try {
-		var name = g.template_menu.value;
-		if (g.templates[ name ] != 'undefined') {
-			var template = g.templates[ name ];
-			for (var i in template) {
-				g.changed[ i ] = template[ i ];
-				switch( template[i].type ) {
-					case 'attribute' :
-						g.apply(template[i].field,template[i].value);
-					break;
-					case 'stat_cat' :
-						if (g.stat_cat_seen[ template[i].field ]) g.apply_stat_cat(template[i].field,template[i].value);
-					break;
-					case 'owning_lib' :
-						g.apply_owning_lib(template[i].value);
-					break;
-				}
-			}
-			g.summarize( g.copies );
-			g.render();
-		}
-	} catch(E) {
-		g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_editor.apply_templates.error'), E);
-	}
+ try {
+  var name = g.template_menu.value;
+  if (g.templates[ name ] != 'undefined') {
+   var template = g.templates[ name ];
+   for (var i in template) {
+    g.changed[ i ] = template[ i ];
+    switch( template[i].type ) {
+     case 'attribute' :
+      g.apply(template[i].field,template[i].value);
+     break;
+     case 'stat_cat' :
+      if (g.stat_cat_seen[ template[i].field ]) g.apply_stat_cat(template[i].field,template[i].value);
+     break;
+     case 'owning_lib' :
+      g.apply_owning_lib(template[i].value);
+     break;
+    }
+   }
+   g.summarize( g.copies );
+   g.render();
+  }
+ } catch(E) {
+  g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_editor.apply_templates.error'), E);
+ }
 }
 
 /******************************************************************************************************/
 /* Save as Template */
 
 g.save_template = function() {
-	try {
-		var name = window.prompt(
-			$('catStrings').getString('staff.cat.copy_editor.save_as_template.prompt'),
-			'',
-			$('catStrings').getString('staff.cat.copy_editor.save_as_template.title')
-		);
-		if (!name) return;
-		g.templates[name] = g.changed;
-		var robj = g.network.simple_request(
-			'FM_AUS_UPDATE',[ses(),g.data.list.au[0].id(), { 'staff_client.copy_editor.templates' : g.templates }]
-		);
-		if (typeof robj.ilsevent != 'undefined') {
-			throw(robj);
-		} else {
-			alert($('catStrings').getFormattedString('staff.cat.copy_editor.save_as_template.success', [name]));
-			setTimeout(
-				function() {
-					try {
-						g.retrieve_templates();
-					} catch(E) {
-						g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_editor.save_as_template.error'), E);
-					}
-				},0
-			);
-		}
-	} catch(E) {
-		g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_editor.save_as_template.error'), E);
-	}
+ try {
+  var name = window.prompt(
+   $('catStrings').getString('staff.cat.copy_editor.save_as_template.prompt'),
+   '',
+   $('catStrings').getString('staff.cat.copy_editor.save_as_template.title')
+  );
+  if (!name) return;
+  g.templates[name] = g.changed;
+  var robj = g.network.simple_request(
+   'FM_AUS_UPDATE',[ses(),g.data.list.au[0].id(), { 'staff_client.copy_editor.templates' : g.templates }]
+  );
+  if (typeof robj.ilsevent != 'undefined') {
+   throw(robj);
+  } else {
+   alert($('catStrings').getFormattedString('staff.cat.copy_editor.save_as_template.success', [name]));
+   setTimeout(
+    function() {
+     try {
+      g.retrieve_templates();
+     } catch(E) {
+      g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_editor.save_as_template.error'), E);
+     }
+    },0
+   );
+  }
+ } catch(E) {
+  g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_editor.save_as_template.error'), E);
+ }
 }
 
 /******************************************************************************************************/
 /* Delete Template */
 
 g.delete_template = function() {
-	try {
-		var name = g.template_menu.value;
-		if (!name) return;
-		if (! window.confirm($('catStrings').getFormattedString('staff.cat.copy_editor.delete_template.confirm', [name]))) return;
-		delete(g.templates[name]);
-		var robj = g.network.simple_request(
-			'FM_AUS_UPDATE',[ses(),g.data.list.au[0].id(), { 'staff_client.copy_editor.templates' : g.templates }]
-		);
-		if (typeof robj.ilsevent != 'undefined') {
-			throw(robj);
-		} else {
-			alert($('catStrings').getFormattedString('staff.cat.copy_editor.delete_template.confirm', [name]));
-			setTimeout(
-				function() {
-					try {
-						g.retrieve_templates();
-					} catch(E) {
-						g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_editor.delete_template.error'), E);
-					}
-				},0
-			);
-		}
-	} catch(E) {
-		g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_editor.delete_template.error'), E);
-	}
+ try {
+  var name = g.template_menu.value;
+  if (!name) return;
+  if (! window.confirm($('catStrings').getFormattedString('staff.cat.copy_editor.delete_template.confirm', [name]))) return;
+  delete(g.templates[name]);
+  var robj = g.network.simple_request(
+   'FM_AUS_UPDATE',[ses(),g.data.list.au[0].id(), { 'staff_client.copy_editor.templates' : g.templates }]
+  );
+  if (typeof robj.ilsevent != 'undefined') {
+   throw(robj);
+  } else {
+   alert($('catStrings').getFormattedString('staff.cat.copy_editor.delete_template.confirm', [name]));
+   setTimeout(
+    function() {
+     try {
+      g.retrieve_templates();
+     } catch(E) {
+      g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_editor.delete_template.error'), E);
+     }
+    },0
+   );
+  }
+ } catch(E) {
+  g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_editor.delete_template.error'), E);
+ }
 }
 
 /******************************************************************************************************/
 /* Export Templates */
 
 g.export_templates = function() {
-	try {
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		JSAN.use('util.file'); var f = new util.file('');
+ try {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  JSAN.use('util.file'); var f = new util.file('');
         f.export_file( { 'title' : $('catStrings').getString('staff.cat.copy_editor.export_templates.title'), 'data' : g.templates } );
-	} catch(E) {
-		g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_editor.export_templates.error'), E);
-	}
+ } catch(E) {
+  g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_editor.export_templates.error'), E);
+ }
 }
 
 /******************************************************************************************************/
 /* Import Templates */
 
 g.import_templates = function() {
-	try {
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		JSAN.use('util.file'); var f = new util.file('');
+ try {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  JSAN.use('util.file'); var f = new util.file('');
         var temp = f.import_file( { 'title' : $('catStrings').getString('staff.cat.copy_editor.import_templates.title') } );
-		if (temp) {
-			for (var i in temp) {
-
-				if (g.templates[i]) {
-
-					var r = g.error.yns_alert(
-						$('catStrings').getString('staff.cat.copy_editor.import_templates.replace.prompt') + '\n' + g.error.pretty_print( js2JSON( temp[i] ) ),
-						$('catStrings').getFormattedString('staff.cat.copy_editor.import_templates.replace.title', [i]),
-						$('catStrings').getString('staff.cat.copy_editor.import_templates.replace.yes'),
-						$('catStrings').getString('staff.cat.copy_editor.import_templates.replace.no'),
-						null,
-						$('catStrings').getString('staff.cat.copy_editor.import_templates.replace.click_here')
-					);
-
-					if (r == 0 /* Yes */) g.templates[i] = temp[i];
-
-				} else {
-
-					g.templates[i] = temp[i];
-
-				}
-
-			}
-
-			var r = g.error.yns_alert(
-				$('catStrings').getString('staff.cat.copy_editor.import_templates.save.prompt'),
-				$('catStrings').getFormattedString('staff.cat.copy_editor.import_templates.save.title'),
-				$('catStrings').getString('staff.cat.copy_editor.import_templates.save.yes'),
-				$('catStrings').getString('staff.cat.copy_editor.import_templates.save.no'),
-				null,
-				$('catStrings').getString('staff.cat.copy_editor.import_templates.save.click_here')
-			);
-
-			if (r == 0 /* Yes */) {
-				var robj = g.network.simple_request(
-					'FM_AUS_UPDATE',[ses(),g.data.list.au[0].id(), { 'staff_client.copy_editor.templates' : g.templates }]
-				);
-				if (typeof robj.ilsevent != 'undefined') {
-					throw(robj);
-				} else {
-					alert($('catStrings').getString('staff.cat.copy_editor.import_templates.save.success'));
-					setTimeout(
-						function() {
-							try {
-								g.retrieve_templates();
-							} catch(E) {
-								g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_editor.import_templates.save.error'), E);
-							}
-						},0
-					);
-				}
-			} else {
-				util.widgets.remove_children('template_placeholder');
-				var list = util.functional.map_object_to_list( g.templates, function(obj,i) { return [i, i]; } );
-				g.template_menu = util.widgets.make_menulist( list );
-				$('template_placeholder').appendChild(g.template_menu);
-				alert($('catStrings').getString('staff.cat.copy_editor.import_templates.note'));
-			}
-
-		}
-	} catch(E) {
-		g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_editor.import_templates.error'), E);
-	}
+  if (temp) {
+   for (var i in temp) {
+
+    if (g.templates[i]) {
+
+     var r = g.error.yns_alert(
+      $('catStrings').getString('staff.cat.copy_editor.import_templates.replace.prompt') + '\n' + g.error.pretty_print( js2JSON( temp[i] ) ),
+      $('catStrings').getFormattedString('staff.cat.copy_editor.import_templates.replace.title', [i]),
+      $('catStrings').getString('staff.cat.copy_editor.import_templates.replace.yes'),
+      $('catStrings').getString('staff.cat.copy_editor.import_templates.replace.no'),
+      null,
+      $('catStrings').getString('staff.cat.copy_editor.import_templates.replace.click_here')
+     );
+
+     if (r == 0 /* Yes */) g.templates[i] = temp[i];
+
+    } else {
+
+     g.templates[i] = temp[i];
+
+    }
+
+   }
+
+   var r = g.error.yns_alert(
+    $('catStrings').getString('staff.cat.copy_editor.import_templates.save.prompt'),
+    $('catStrings').getFormattedString('staff.cat.copy_editor.import_templates.save.title'),
+    $('catStrings').getString('staff.cat.copy_editor.import_templates.save.yes'),
+    $('catStrings').getString('staff.cat.copy_editor.import_templates.save.no'),
+    null,
+    $('catStrings').getString('staff.cat.copy_editor.import_templates.save.click_here')
+   );
+
+   if (r == 0 /* Yes */) {
+    var robj = g.network.simple_request(
+     'FM_AUS_UPDATE',[ses(),g.data.list.au[0].id(), { 'staff_client.copy_editor.templates' : g.templates }]
+    );
+    if (typeof robj.ilsevent != 'undefined') {
+     throw(robj);
+    } else {
+     alert($('catStrings').getString('staff.cat.copy_editor.import_templates.save.success'));
+     setTimeout(
+      function() {
+       try {
+        g.retrieve_templates();
+       } catch(E) {
+        g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_editor.import_templates.save.error'), E);
+       }
+      },0
+     );
+    }
+   } else {
+    util.widgets.remove_children('template_placeholder');
+    var list = util.functional.map_object_to_list( g.templates, function(obj,i) { return [i, i]; } );
+    g.template_menu = util.widgets.make_menulist( list );
+    $('template_placeholder').appendChild(g.template_menu);
+    alert($('catStrings').getString('staff.cat.copy_editor.import_templates.note'));
+   }
+
+  }
+ } catch(E) {
+  g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_editor.import_templates.error'), E);
+ }
 }
 
 
@@ -382,150 +382,150 @@ g.import_templates = function() {
 /* Restore backup copies */
 
 g.reset = function() {
-	g.changed = {};
-	g.copies = JSON2js( g.original_copies );
-	g.summarize( g.copies );
-	g.render();
+ g.changed = {};
+ g.copies = JSON2js( g.original_copies );
+ g.summarize( g.copies );
+ g.render();
 }
 
 /******************************************************************************************************/
 /* Apply a value to a specific field on all the copies being edited */
 
 g.apply = function(field,value) {
-	g.error.sdump('D_TRACE','applying field = <' + field + '>  value = <' + value + '>\n');
-	if (value == '<HACK:KLUDGE:NULL>') value = null;
-	if (field == 'alert_message') { value = value.replace(/^\W+$/g,''); }
-	if (field == 'price' || field == 'deposit_amount') {
-		if (value == '') { value = null; } else { JSAN.use('util.money'); value = util.money.sanitize( value ); }
-	}
-	for (var i = 0; i < g.copies.length; i++) {
-		var copy = g.copies[i];
-		try {
-			copy[field]( value ); copy.ischanged('1');
-		} catch(E) {
-			alert(E);
-		}
-	}
+ g.error.sdump('D_TRACE','applying field = <' + field + '>  value = <' + value + '>\n');
+ if (value == '<HACK:KLUDGE:NULL>') value = null;
+ if (field == 'alert_message') { value = value.replace(/^\W+$/g,''); }
+ if (field == 'price' || field == 'deposit_amount') {
+  if (value == '') { value = null; } else { JSAN.use('util.money'); value = util.money.sanitize( value ); }
+ }
+ for (var i = 0; i < g.copies.length; i++) {
+  var copy = g.copies[i];
+  try {
+   copy[field]( value ); copy.ischanged('1');
+  } catch(E) {
+   alert(E);
+  }
+ }
 }
 
 /******************************************************************************************************/
 /* Apply a stat cat entry to all the copies being edited.  An entry_id of < 0 signifies the stat cat is being removed. */
 
 g.apply_stat_cat = function(sc_id,entry_id) {
-	g.error.sdump('D_TRACE','sc_id = ' + sc_id + '  entry_id = ' + entry_id + '\n');
-	for (var i = 0; i < g.copies.length; i++) {
-		var copy = g.copies[i];
-		try {
-			copy.ischanged('1');
-			var temp = copy.stat_cat_entries();
-			if (!temp) temp = [];
-			temp = util.functional.filter_list(
-				temp,
-				function (obj) {
-					return (obj.stat_cat() != sc_id);
-				}
-			);
-			if (entry_id > -1) temp.push( 
-				util.functional.find_id_object_in_list( 
-					g.data.hash.asc[sc_id].entries(), 
-					entry_id
-				)
-			);
-			copy.stat_cat_entries( temp );
-
-		} catch(E) {
-			g.error.standard_unexpected_error_alert('apply_stat_cat',E);
-		}
-	}
+ g.error.sdump('D_TRACE','sc_id = ' + sc_id + '  entry_id = ' + entry_id + '\n');
+ for (var i = 0; i < g.copies.length; i++) {
+  var copy = g.copies[i];
+  try {
+   copy.ischanged('1');
+   var temp = copy.stat_cat_entries();
+   if (!temp) temp = [];
+   temp = util.functional.filter_list(
+    temp,
+    function (obj) {
+     return (obj.stat_cat() != sc_id);
+    }
+   );
+   if (entry_id > -1) temp.push( 
+    util.functional.find_id_object_in_list( 
+     g.data.hash.asc[sc_id].entries(), 
+     entry_id
+    )
+   );
+   copy.stat_cat_entries( temp );
+
+  } catch(E) {
+   g.error.standard_unexpected_error_alert('apply_stat_cat',E);
+  }
+ }
 }
 
 /******************************************************************************************************/
 /* Apply an "owning lib" to all the copies being edited.  That is, change and auto-vivicating volumes */
 
 g.apply_owning_lib = function(ou_id) {
-	g.error.sdump('D_TRACE','ou_id = ' + ou_id + '\n');
-	for (var i = 0; i < g.copies.length; i++) {
-		var copy = g.copies[i];
-		try {
-			if (!g.map_acn[copy.call_number()]) {
-				var volume = g.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ copy.call_number() ]);
-				if (typeof volume.ilsevent != 'undefined') {
-					g.error.standard_unexpected_error_alert($('catStrings').getFormattedString('staff.cat.copy_editor.apply_owning_lib.undefined_volume.error', [copy.barcode()]), volume);
-					continue;
-				}
-				g.map_acn[copy.call_number()] = volume;
-			}
-			var old_volume = g.map_acn[copy.call_number()];
-			var acn_id = g.network.simple_request(
-				'FM_ACN_FIND_OR_CREATE',
-				[ses(),old_volume.label(),old_volume.record(),ou_id]
-			);
-			if (typeof acn_id.ilsevent != 'undefined') {
-				g.error.standard_unexpected_error_alert($('catStrings').getFormattedString('staff.cat.copy_editor.apply_owning_lib.call_number.error', [copy.barcode()]), acn_id);
-				continue;
-			}
-			copy.call_number(acn_id);
-			copy.ischanged('1');
-		} catch(E) {
-			g.error.standard_unexpected_error_alert('apply_stat_cat',E);
-		}
-	}
+ g.error.sdump('D_TRACE','ou_id = ' + ou_id + '\n');
+ for (var i = 0; i < g.copies.length; i++) {
+  var copy = g.copies[i];
+  try {
+   if (!g.map_acn[copy.call_number()]) {
+    var volume = g.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ copy.call_number() ]);
+    if (typeof volume.ilsevent != 'undefined') {
+     g.error.standard_unexpected_error_alert($('catStrings').getFormattedString('staff.cat.copy_editor.apply_owning_lib.undefined_volume.error', [copy.barcode()]), volume);
+     continue;
+    }
+    g.map_acn[copy.call_number()] = volume;
+   }
+   var old_volume = g.map_acn[copy.call_number()];
+   var acn_id = g.network.simple_request(
+    'FM_ACN_FIND_OR_CREATE',
+    [ses(),old_volume.label(),old_volume.record(),ou_id]
+   );
+   if (typeof acn_id.ilsevent != 'undefined') {
+    g.error.standard_unexpected_error_alert($('catStrings').getFormattedString('staff.cat.copy_editor.apply_owning_lib.call_number.error', [copy.barcode()]), acn_id);
+    continue;
+   }
+   copy.call_number(acn_id);
+   copy.ischanged('1');
+  } catch(E) {
+   g.error.standard_unexpected_error_alert('apply_stat_cat',E);
+  }
+ }
 }
 
 /******************************************************************************************************/
 /* This returns true if none of the copies being edited are pre-cats */
 
 g.safe_to_change_owning_lib = function() {
-	try {
-		var safe = true;
-		for (var i = 0; i < g.copies.length; i++) {
-			var cn = g.copies[i].call_number();
-			if (typeof cn == 'object') { cn = cn.id(); }
-			if (cn == -1) { safe = false; }
-		}
-		return safe;
-	} catch(E) {
+ try {
+  var safe = true;
+  for (var i = 0; i < g.copies.length; i++) {
+   var cn = g.copies[i].call_number();
+   if (typeof cn == 'object') { cn = cn.id(); }
+   if (cn == -1) { safe = false; }
+  }
+  return safe;
+ } catch(E) {
         g.error.standard_unexpected_error_alert('safe_to_change_owning_lib?',E);
-		return false;
-	}
+  return false;
+ }
 }
 
 /******************************************************************************************************/
 /* This returns true if none of the copies being edited have a magical status found in my_constants.magical_statuses */
 
 g.safe_to_edit_copy_status = function() {
-	try {
-		var safe = true;
-		for (var i = 0; i < g.copies.length; i++) {
-			var status = g.copies[i].status(); if (typeof status == 'object') status = status.id();
-			if (typeof my_constants.magical_statuses[ status ] != 'undefined') safe = false;
-		}
-		return safe;
-	} catch(E) {
-		g.error.standard_unexpected_error_alert('safe_to_edit_copy_status?',E);
-		return false;
-	}
+ try {
+  var safe = true;
+  for (var i = 0; i < g.copies.length; i++) {
+   var status = g.copies[i].status(); if (typeof status == 'object') status = status.id();
+   if (typeof my_constants.magical_statuses[ status ] != 'undefined') safe = false;
+  }
+  return safe;
+ } catch(E) {
+  g.error.standard_unexpected_error_alert('safe_to_edit_copy_status?',E);
+  return false;
+ }
 }
 
 /******************************************************************************************************/
 /* This concats and uniques all the alert messages for use as the default value for a new alert message */
 
 g.populate_alert_message_input = function(tb) {
-	try {
-		var seen = {}; var s = '';
-		for (var i = 0; i < g.copies.length; i++) {
-			var msg = g.copies[i].alert_message(); 
-			if (msg) {
-				if (typeof seen[msg] == 'undefined') {
-					s += msg + '\n';
-					seen[msg] = true;
-				}
-			}
-		}
-		tb.setAttribute('value',s);
-	} catch(E) {
-		g.error.standard_unexpected_error_alert('populate_alert_message_input',E);
-	}
+ try {
+  var seen = {}; var s = '';
+  for (var i = 0; i < g.copies.length; i++) {
+   var msg = g.copies[i].alert_message(); 
+   if (msg) {
+    if (typeof seen[msg] == 'undefined') {
+     s += msg + '\n';
+     seen[msg] = true;
+    }
+   }
+  }
+  tb.setAttribute('value',s);
+ } catch(E) {
+  g.error.standard_unexpected_error_alert('populate_alert_message_input',E);
+ }
 }
 
 /***************************************************************************************************************/
@@ -559,46 +559,46 @@ g.get_acpl_list_for_lib = function(lib_id,but_only_these) {
 /* This returns a list of acpl's appropriate for the copies being edited */
 
 g.get_acpl_list = function() {
-	try {
+ try {
 
-		JSAN.use('util.functional');
+  JSAN.use('util.functional');
 
         var my_acpls = {};
 
         /**************************************/
         /* get owning libs from call numbers */
 
-		var owning_libs = {}; 
-		for (var i = 0; i < g.copies.length; i++) {
+  var owning_libs = {}; 
+  for (var i = 0; i < g.copies.length; i++) {
             var callnumber = g.copies[i].call_number();
             if (!callnumber) continue;
-			var cn_id = typeof callnumber == 'object' ? callnumber.id() : callnumber;
-			if (cn_id > 0) {
-				if (! g.map_acn[ cn_id ]) {
-					var req = g.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ cn_id ]);
+   var cn_id = typeof callnumber == 'object' ? callnumber.id() : callnumber;
+   if (cn_id > 0) {
+    if (! g.map_acn[ cn_id ]) {
+     var req = g.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ cn_id ]);
                     if (typeof req.ilsevent == 'undefined') {
-    					g.map_acn[ cn_id ] = req;
+         g.map_acn[ cn_id ] = req;
                     } else {
                         continue;
                     }
-				}
+    }
                 var consider_lib = g.map_acn[ cn_id ].owning_lib();
                 if (!consider_lib) continue;
                 owning_libs[ typeof consider_lib == 'object' ? consider_lib.id() : consider_lib ] = true;
-			}
-		}
-		if (g.callnumbers) {
-			for (var i in g.callnumbers) {
+   }
+  }
+  if (g.callnumbers) {
+   for (var i in g.callnumbers) {
                 var consider_lib = g.callnumbers[i].owning_lib;
                 if (!consider_lib) continue;
                 owning_libs[ typeof consider_lib == 'object' ? consider_lib.id() : consider_lib ] = true;
-			}
-		}
+   }
+  }
 
         /***************************************************************************************************/
         /* now find the first ancestor they all have in common, get the acpl's for it and higher ancestors */
 
-		JSAN.use('util.fm_utils');
+  JSAN.use('util.fm_utils');
         var libs = []; for (var i in owning_libs) libs.push(i);
         if (libs.length > 0) {
             var ancestor = util.fm_utils.find_common_aou_ancestor( libs );
@@ -631,12 +631,12 @@ g.get_acpl_list = function() {
 
         libs = []; for (var i in circ_libs) libs.push(i);
         if (libs.length > 0) {
-    		var ancestor = util.fm_utils.find_common_aou_ancestor( libs );
-    		if (typeof ancestor == 'object' && ancestor != null) ancestor = ancestor.id();
+      var ancestor = util.fm_utils.find_common_aou_ancestor( libs );
+      if (typeof ancestor == 'object' && ancestor != null) ancestor = ancestor.id();
 
-    		if (ancestor) {
-    		    var ancestors = util.fm_utils.find_common_aou_ancestors( libs );
-    			var acpl_list = g.get_acpl_list_for_lib(ancestor, ancestors);
+      if (ancestor) {
+          var ancestors = util.fm_utils.find_common_aou_ancestors( libs );
+       var acpl_list = g.get_acpl_list_for_lib(ancestor, ancestors);
                 if (acpl_list) for (var i = 0; i < acpl_list.length; i++) {
                     if (acpl_list[i] != null) {
                         my_acpls[ typeof acpl_list[i] == 'object' ? acpl_list[i].id() : acpl_list[i] ] = true;
@@ -655,11 +655,11 @@ g.get_acpl_list = function() {
                 return 0;
             }
         );
-	
-	} catch(E) {
-		g.error.standard_unexpected_error_alert('get_acpl_list',E);
-		return [];
-	}
+ 
+ } catch(E) {
+  g.error.standard_unexpected_error_alert('get_acpl_list',E);
+  return [];
+ }
 }
 
 
@@ -674,64 +674,64 @@ g.changed = {};
 function init_panes0() {
 g.special_exception = {};
 g.special_exception[$('catStrings').getString('staff.cat.copy_editor.field.owning_library.label')] = function(label,value) {
-		JSAN.use('util.widgets');
-		if (value>0) { /* an existing call number */
-			g.network.simple_request(
-				'FM_ACN_RETRIEVE.authoritative',
-				[ value ],
-				function(req) {
-					var cn = '??? id = ' + value;
-					try {
-						cn = req.getResultObject();
-					} catch(E) {
-						g.error.sdump('D_ERROR','callnumber retrieve: ' + E);
-					}
-					util.widgets.set_text(label,g.data.hash.aou[ cn.owning_lib() ].shortname() + ' : ' + cn.label());
-				}
-			);
-		} else { /* a yet to be created call number */
-			if (g.callnumbers) {
-				util.widgets.set_text(label,g.data.hash.aou[ g.callnumbers[value].owning_lib ].shortname() + ' : ' + g.callnumbers[value].label);
-			}
-		}
-	};
+  JSAN.use('util.widgets');
+  if (value>0) { /* an existing call number */
+   g.network.simple_request(
+    'FM_ACN_RETRIEVE.authoritative',
+    [ value ],
+    function(req) {
+     var cn = '??? id = ' + value;
+     try {
+      cn = req.getResultObject();
+     } catch(E) {
+      g.error.sdump('D_ERROR','callnumber retrieve: ' + E);
+     }
+     util.widgets.set_text(label,g.data.hash.aou[ cn.owning_lib() ].shortname() + ' : ' + cn.label());
+    }
+   );
+  } else { /* a yet to be created call number */
+   if (g.callnumbers) {
+    util.widgets.set_text(label,g.data.hash.aou[ g.callnumbers[value].owning_lib ].shortname() + ' : ' + g.callnumbers[value].label);
+   }
+  }
+ };
 g.special_exception[$('catStrings').getString('staff.cat.copy_editor.field.creator.label')] = function(label,value) {
-		if (!Number(value)) return;
-		g.network.simple_request(
-			'FM_AU_RETRIEVE_VIA_ID',
-			[ ses(), value ],
-			function(req) {
-				var p = '??? id = ' + value;
-				try {
-					p = req.getResultObject();
-					p = p.usrname();
-
-				} catch(E) {
-					g.error.sdump('D_ERROR','patron retrieve: ' + E);
-				}
-				JSAN.use('util.widgets');
-				util.widgets.set_text(label,p);
-			}
-		);
-	};
+  if (!Number(value)) return;
+  g.network.simple_request(
+   'FM_AU_RETRIEVE_VIA_ID',
+   [ ses(), value ],
+   function(req) {
+    var p = '??? id = ' + value;
+    try {
+     p = req.getResultObject();
+     p = p.usrname();
+
+    } catch(E) {
+     g.error.sdump('D_ERROR','patron retrieve: ' + E);
+    }
+    JSAN.use('util.widgets');
+    util.widgets.set_text(label,p);
+   }
+  );
+ };
 g.special_exception[$('catStrings').getString('staff.cat.copy_editor.field.last_editor.label')] = function(label,value) {
-		if (!Number(value)) return;
-		g.network.simple_request(
-			'FM_AU_RETRIEVE_VIA_ID',
-			[ ses(), value ],
-			function(req) {
-				var p = '??? id = ' + value;
-				try {
-					p = req.getResultObject();
-					p = p.usrname();
-
-				} catch(E) {
-					g.error.sdump('D_ERROR','patron retrieve: ' + E);
-				}
-				util.widgets.set_text(label,p);
-			}
-		);
-	};
+  if (!Number(value)) return;
+  g.network.simple_request(
+   'FM_AU_RETRIEVE_VIA_ID',
+   [ ses(), value ],
+   function(req) {
+    var p = '??? id = ' + value;
+    try {
+     p = req.getResultObject();
+     p = p.usrname();
+
+    } catch(E) {
+     g.error.sdump('D_ERROR','patron retrieve: ' + E);
+    }
+    util.widgets.set_text(label,p);
+   }
+  );
+ };
 }
 
 /******************************************************************************************************/
@@ -744,179 +744,179 @@ g.editable_stat_cat_names = [];
 function init_panes() {
 g.panes_and_field_names = {
 
-	'left_pane' :
+ 'left_pane' :
 [
-	[
-		$('catStrings').getString('staff.cat.copy_editor.field.barcode.label'),
-		{
-			render: 'fm.barcode();',
-		}
-	], 
-	[
-		$('catStrings').getString('staff.cat.copy_editor.field.creation_date.label'),
-		{ 
-			render: 'util.date.formatted_date( fm.create_date(), "%F");',
-		}
-	],
-	[
-		$('catStrings').getString('staff.cat.copy_editor.field.creator.label'),
-		{ 
-			render: 'fm.creator();',
-		}
-	],
-	[
-		$('catStrings').getString('staff.cat.copy_editor.field.last_edit_date.label'),
-		{ 
-			render: 'util.date.formatted_date( fm.edit_date(), "%F");',
-		}
-	],
-	[
-		$('catStrings').getString('staff.cat.copy_editor.field.last_editor.label'),
-		{
-			render: 'fm.editor();',
-		}
-	],
+ [
+  $('catStrings').getString('staff.cat.copy_editor.field.barcode.label'),
+  {
+   render: 'fm.barcode();',
+  }
+ ], 
+ [
+  $('catStrings').getString('staff.cat.copy_editor.field.creation_date.label'),
+  { 
+   render: 'util.date.formatted_date( fm.create_date(), "%F");',
+  }
+ ],
+ [
+  $('catStrings').getString('staff.cat.copy_editor.field.creator.label'),
+  { 
+   render: 'fm.creator();',
+  }
+ ],
+ [
+  $('catStrings').getString('staff.cat.copy_editor.field.last_edit_date.label'),
+  { 
+   render: 'util.date.formatted_date( fm.edit_date(), "%F");',
+  }
+ ],
+ [
+  $('catStrings').getString('staff.cat.copy_editor.field.last_editor.label'),
+  {
+   render: 'fm.editor();',
+  }
+ ],
 
 ],
 
 'right_pane' :
 [
-	[
-		$('catStrings').getString('staff.cat.copy_editor.field.location.label'),
-		{ 
-			render: 'typeof fm.location() == "object" ? fm.location().name() : g.data.lookup("acpl",fm.location()).name()', 
-			input: 'c = function(v){ g.apply("location",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( util.functional.map_list( g.get_acpl_list(), function(obj) { return [ g.data.hash.aou[ obj.owning_lib() ].shortname() + " : " + obj.name(), obj.id() ]; }).sort()); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
-
-		}
-	],
-	[
-		$('catStrings').getString('staff.cat.copy_editor.field.circulation_library.label'),
-		{ 	
-			render: 'typeof fm.circ_lib() == "object" ? fm.circ_lib().shortname() : g.data.hash.aou[ fm.circ_lib() ].shortname()',
-			//input: 'c = function(v){ g.apply("circ_lib",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( util.functional.map_list( util.functional.filter_list(g.data.list.my_aou, function(obj) { return g.data.hash.aout[ obj.ou_type() ].can_have_vols(); }), function(obj) { return [ obj.shortname(), obj.id() ]; }).sort() ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
-			input: 'c = function(v){ g.apply("circ_lib",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( util.functional.map_list( g.data.list.aou, function(obj) { var sname = obj.shortname(); for (i = sname.length; i < 20; i++) sname += " "; return [ obj.name() ? sname + " " + obj.name() : obj.shortname(), obj.id(), ( ! get_bool( g.data.hash.aout[ obj.ou_type() ].can_have_vols() ) ), ( g.data.hash.aout[ obj.ou_type() ].depth() * 2), ]; }), g.data.list.au[0].ws_ou()); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
-		} 
-	],
-	[
-		$('catStrings').getString('staff.cat.copy_editor.field.owning_library.label'),
-		{
-			render: 'fm.call_number();',
-			input: g.safe_to_change_owning_lib() ? 'c = function(v){ g.apply_owning_lib(v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( util.functional.map_list( g.data.list.aou, function(obj) { var sname = obj.shortname(); for (i = sname.length; i < 20; i++) sname += " "; return [ obj.name() ? sname + " " + obj.name() : obj.shortname(), obj.id(), ( ! get_bool( g.data.hash.aout[ obj.ou_type() ].can_have_vols() ) ), ( g.data.hash.aout[ obj.ou_type() ].depth() * 2), ]; }), g.data.list.au[0].ws_ou()); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);' : undefined,
-		}
-	],
-	[
-		$('catStrings').getString('staff.cat.copy_editor.field.copy_number.label'),
-		{ 
-			render: 'fm.copy_number() == null ? $("catStrings").getString("staff.cat.copy_editor.field.unset_or_null") : fm.copy_number()',
-			input: 'c = function(v){ g.apply("copy_number",v); if (typeof post_c == "function") post_c(v); }; x = document.createElement("textbox"); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
-		}
-	],
+ [
+  $('catStrings').getString('staff.cat.copy_editor.field.location.label'),
+  { 
+   render: 'typeof fm.location() == "object" ? fm.location().name() : g.data.lookup("acpl",fm.location()).name()', 
+   input: 'c = function(v){ g.apply("location",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( util.functional.map_list( g.get_acpl_list(), function(obj) { return [ g.data.hash.aou[ obj.owning_lib() ].shortname() + " : " + obj.name(), obj.id() ]; }).sort()); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
+
+  }
+ ],
+ [
+  $('catStrings').getString('staff.cat.copy_editor.field.circulation_library.label'),
+  {  
+   render: 'typeof fm.circ_lib() == "object" ? fm.circ_lib().shortname() : g.data.hash.aou[ fm.circ_lib() ].shortname()',
+   //input: 'c = function(v){ g.apply("circ_lib",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( util.functional.map_list( util.functional.filter_list(g.data.list.my_aou, function(obj) { return g.data.hash.aout[ obj.ou_type() ].can_have_vols(); }), function(obj) { return [ obj.shortname(), obj.id() ]; }).sort() ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
+   input: 'c = function(v){ g.apply("circ_lib",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( util.functional.map_list( g.data.list.aou, function(obj) { var sname = obj.shortname(); for (i = sname.length; i < 20; i++) sname += " "; return [ obj.name() ? sname + " " + obj.name() : obj.shortname(), obj.id(), ( ! get_bool( g.data.hash.aout[ obj.ou_type() ].can_have_vols() ) ), ( g.data.hash.aout[ obj.ou_type() ].depth() * 2), ]; }), g.data.list.au[0].ws_ou()); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
+  } 
+ ],
+ [
+  $('catStrings').getString('staff.cat.copy_editor.field.owning_library.label'),
+  {
+   render: 'fm.call_number();',
+   input: g.safe_to_change_owning_lib() ? 'c = function(v){ g.apply_owning_lib(v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( util.functional.map_list( g.data.list.aou, function(obj) { var sname = obj.shortname(); for (i = sname.length; i < 20; i++) sname += " "; return [ obj.name() ? sname + " " + obj.name() : obj.shortname(), obj.id(), ( ! get_bool( g.data.hash.aout[ obj.ou_type() ].can_have_vols() ) ), ( g.data.hash.aout[ obj.ou_type() ].depth() * 2), ]; }), g.data.list.au[0].ws_ou()); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);' : undefined,
+  }
+ ],
+ [
+  $('catStrings').getString('staff.cat.copy_editor.field.copy_number.label'),
+  { 
+   render: 'fm.copy_number() == null ? $("catStrings").getString("staff.cat.copy_editor.field.unset_or_null") : fm.copy_number()',
+   input: 'c = function(v){ g.apply("copy_number",v); if (typeof post_c == "function") post_c(v); }; x = document.createElement("textbox"); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
+  }
+ ],
 
 
 ],
 
 'right_pane2' :
 [
-	[
-		$('catStrings').getString('staff.cat.copy_editor.field.circulate.label'),
-		{ 	
-			render: 'fm.circulate() == null ? $("catStrings").getString("staff.cat.copy_editor.field.unset_or_null") : ( get_bool( fm.circulate() ) ? $("catStrings").getString("staff.cat.copy_editor.field.circulate.yes_or_true") : $("catStrings").getString("staff.cat.copy_editor.field.circulate.no_or_false") )',
-			input: 'c = function(v){ g.apply("circulate",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ [ $("catStrings").getString("staff.cat.copy_editor.field.circulate.yes_or_true"), get_db_true() ], [ $("catStrings").getString("staff.cat.copy_editor.field.circulate.no_or_false"), get_db_false() ] ] ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
-		}
-	],
-	[
-		$('catStrings').getString('staff.cat.copy_editor.field.holdable.label'),
-		{ 
-			render: 'fm.holdable() == null ? $("catStrings").getString("staff.cat.copy_editor.field.unset_or_null") : ( get_bool( fm.holdable() ) ? $("catStrings").getString("staff.cat.copy_editor.field.holdable.yes_or_true") : $("catStrings").getString("staff.cat.copy_editor.field.holdable.no_or_false") )',
-			input: 'c = function(v){ g.apply("holdable",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ [ $("catStrings").getString("staff.cat.copy_editor.field.holdable.yes_or_true"), get_db_true() ], [ $("catStrings").getString("staff.cat.copy_editor.field.holdable.no_or_false"), get_db_false() ] ] ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
-		}
-	],
-	[
-		$('catStrings').getString('staff.cat.copy_editor.field.age_based_hold_protection.label'),
-		{
-			render: 'fm.age_protect() == null ? $("catStrings").getString("staff.cat.copy_editor.field.unset_or_null") : ( typeof fm.age_protect() == "object" ? fm.age_protect().name() : g.data.hash.crahp[ fm.age_protect() ].name() )', 
-			input: 'c = function(v){ g.apply("age_protect",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ [ $("catStrings").getString("staff.cat.copy_editor.remove_age_based_hold_protection"), "<HACK:KLUDGE:NULL>" ] ].concat( util.functional.map_list( g.data.list.crahp, function(obj) { return [ obj.name(), obj.id() ]; }).sort() ) ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
-		}
-
-	],
-	[
-		$('catStrings').getString('staff.cat.copy_editor.field.loan_duration.label'),
-		{ 
-			render: 'switch(Number(fm.loan_duration())){ case 1: $("catStrings").getString("staff.cat.copy_editor.field.loan_duration.short"); break; case 2: $("catStrings").getString("staff.cat.copy_editor.field.loan_duration.normal"); break; case 3: $("catStrings").getString("staff.cat.copy_editor.field.loan_duration.extended"); break; }',
-			input: 'c = function(v){ g.apply("loan_duration",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ [ $("catStrings").getString("staff.cat.copy_editor.field.loan_duration.short"), "1" ], [ $("catStrings").getString("staff.cat.copy_editor.field.loan_duration.normal"), "2" ], [ $("catStrings").getString("staff.cat.copy_editor.field.loan_duration.extended"), "3" ] ] ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
-
-		}
-	],
-	[
-		$('catStrings').getString('staff.cat.copy_editor.field.fine_level.label'),
-		{
-			render: 'switch(Number(fm.fine_level())){ case 1: $("catStrings").getString("staff.cat.copy_editor.field.fine_level.low"); break; case 2: $("catStrings").getString("staff.cat.copy_editor.field.fine_level.normal"); break; case 3: $("catStrings").getString("staff.cat.copy_editor.field.fine_level.high"); break; }',
-			input: 'c = function(v){ g.apply("fine_level",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ [ $("catStrings").getString("staff.cat.copy_editor.field.fine_level.low"), "1" ], [ $("catStrings").getString("staff.cat.copy_editor.field.fine_level.normal"), "2" ], [ $("catStrings").getString("staff.cat.copy_editor.field.fine_level.high"), "3" ] ] ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
-		}
-	],
-
-	 [
-		$('catStrings').getString('staff.cat.copy_editor.field.circulate_as_type.label'),
-		{ 	
-			render: 'fm.circ_as_type() == null ? $("catStrings").getString("staff.cat.copy_editor.field.unset_or_null") : g.data.hash.citm[ fm.circ_as_type() ].value()',
-			input: 'c = function(v){ g.apply("circ_as_type",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ [ $("catStrings").getString("staff.cat.copy_editor.remove_circulate_as_type"), "<HACK:KLUDGE:NULL>" ] ].concat( util.functional.map_list( g.data.list.citm, function(n){return [ n.code() + " - " + n.value(), n.code()];} ).sort() ) ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
-		} 
-	],
-	[
-		$('catStrings').getString('staff.cat.copy_editor.field.circulation_modifier.label'),
-		{	
-			render: 'fm.circ_modifier() == null ? $("catStrings").getString("staff.cat.copy_editor.field.unset_or_null") : fm.circ_modifier()',
-			/*input: 'c = function(v){ g.apply("circ_modifier",v); if (typeof post_c == "function") post_c(v); }; x = document.createElement("textbox"); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',*/
-			input: 'c = function(v){ g.apply("circ_modifier",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( util.functional.map_list( g.data.list.circ_modifier, function(obj) { return [ obj, obj ]; } ).sort() ); x.setAttribute("editable","true"); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
-		}
-	],
+ [
+  $('catStrings').getString('staff.cat.copy_editor.field.circulate.label'),
+  {  
+   render: 'fm.circulate() == null ? $("catStrings").getString("staff.cat.copy_editor.field.unset_or_null") : ( get_bool( fm.circulate() ) ? $("catStrings").getString("staff.cat.copy_editor.field.circulate.yes_or_true") : $("catStrings").getString("staff.cat.copy_editor.field.circulate.no_or_false") )',
+   input: 'c = function(v){ g.apply("circulate",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ [ $("catStrings").getString("staff.cat.copy_editor.field.circulate.yes_or_true"), get_db_true() ], [ $("catStrings").getString("staff.cat.copy_editor.field.circulate.no_or_false"), get_db_false() ] ] ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
+  }
+ ],
+ [
+  $('catStrings').getString('staff.cat.copy_editor.field.holdable.label'),
+  { 
+   render: 'fm.holdable() == null ? $("catStrings").getString("staff.cat.copy_editor.field.unset_or_null") : ( get_bool( fm.holdable() ) ? $("catStrings").getString("staff.cat.copy_editor.field.holdable.yes_or_true") : $("catStrings").getString("staff.cat.copy_editor.field.holdable.no_or_false") )',
+   input: 'c = function(v){ g.apply("holdable",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ [ $("catStrings").getString("staff.cat.copy_editor.field.holdable.yes_or_true"), get_db_true() ], [ $("catStrings").getString("staff.cat.copy_editor.field.holdable.no_or_false"), get_db_false() ] ] ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
+  }
+ ],
+ [
+  $('catStrings').getString('staff.cat.copy_editor.field.age_based_hold_protection.label'),
+  {
+   render: 'fm.age_protect() == null ? $("catStrings").getString("staff.cat.copy_editor.field.unset_or_null") : ( typeof fm.age_protect() == "object" ? fm.age_protect().name() : g.data.hash.crahp[ fm.age_protect() ].name() )', 
+   input: 'c = function(v){ g.apply("age_protect",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ [ $("catStrings").getString("staff.cat.copy_editor.remove_age_based_hold_protection"), "<HACK:KLUDGE:NULL>" ] ].concat( util.functional.map_list( g.data.list.crahp, function(obj) { return [ obj.name(), obj.id() ]; }).sort() ) ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
+  }
+
+ ],
+ [
+  $('catStrings').getString('staff.cat.copy_editor.field.loan_duration.label'),
+  { 
+   render: 'switch(Number(fm.loan_duration())){ case 1: $("catStrings").getString("staff.cat.copy_editor.field.loan_duration.short"); break; case 2: $("catStrings").getString("staff.cat.copy_editor.field.loan_duration.normal"); break; case 3: $("catStrings").getString("staff.cat.copy_editor.field.loan_duration.extended"); break; }',
+   input: 'c = function(v){ g.apply("loan_duration",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ [ $("catStrings").getString("staff.cat.copy_editor.field.loan_duration.short"), "1" ], [ $("catStrings").getString("staff.cat.copy_editor.field.loan_duration.normal"), "2" ], [ $("catStrings").getString("staff.cat.copy_editor.field.loan_duration.extended"), "3" ] ] ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
+
+  }
+ ],
+ [
+  $('catStrings').getString('staff.cat.copy_editor.field.fine_level.label'),
+  {
+   render: 'switch(Number(fm.fine_level())){ case 1: $("catStrings").getString("staff.cat.copy_editor.field.fine_level.low"); break; case 2: $("catStrings").getString("staff.cat.copy_editor.field.fine_level.normal"); break; case 3: $("catStrings").getString("staff.cat.copy_editor.field.fine_level.high"); break; }',
+   input: 'c = function(v){ g.apply("fine_level",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ [ $("catStrings").getString("staff.cat.copy_editor.field.fine_level.low"), "1" ], [ $("catStrings").getString("staff.cat.copy_editor.field.fine_level.normal"), "2" ], [ $("catStrings").getString("staff.cat.copy_editor.field.fine_level.high"), "3" ] ] ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
+  }
+ ],
+
+  [
+  $('catStrings').getString('staff.cat.copy_editor.field.circulate_as_type.label'),
+  {  
+   render: 'fm.circ_as_type() == null ? $("catStrings").getString("staff.cat.copy_editor.field.unset_or_null") : g.data.hash.citm[ fm.circ_as_type() ].value()',
+   input: 'c = function(v){ g.apply("circ_as_type",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ [ $("catStrings").getString("staff.cat.copy_editor.remove_circulate_as_type"), "<HACK:KLUDGE:NULL>" ] ].concat( util.functional.map_list( g.data.list.citm, function(n){return [ n.code() + " - " + n.value(), n.code()];} ).sort() ) ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
+  } 
+ ],
+ [
+  $('catStrings').getString('staff.cat.copy_editor.field.circulation_modifier.label'),
+  { 
+   render: 'fm.circ_modifier() == null ? $("catStrings").getString("staff.cat.copy_editor.field.unset_or_null") : fm.circ_modifier()',
+   /*input: 'c = function(v){ g.apply("circ_modifier",v); if (typeof post_c == "function") post_c(v); }; x = document.createElement("textbox"); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',*/
+   input: 'c = function(v){ g.apply("circ_modifier",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( util.functional.map_list( g.data.list.circ_modifier, function(obj) { return [ obj, obj ]; } ).sort() ); x.setAttribute("editable","true"); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
+  }
+ ],
 ],
 
 'right_pane3' :
-[	[
-		$('catStrings').getString('staff.cat.copy_editor.field.alert_message.label'),
-		{
-			render: 'fm.alert_message() == null ? $("catStrings").getString("staff.cat.copy_editor.field.unset_or_null") : fm.alert_message()',
-			input: 'c = function(v){ g.apply("alert_message",v); if (typeof post_c == "function") post_c(v); }; x = document.createElement("textbox"); x.setAttribute("multiline",true); g.populate_alert_message_input(x); x.addEventListener("apply",function(f){ return function(ev) { f( ev.target.value ); } }(c), false);',
-		}
-	],
-
-	[
-		$('catStrings').getString('staff.cat.copy_editor.field.deposit.label'),
-		{ 
-			render: 'fm.deposit() == null ? $("catStrings").getString("staff.cat.copy_editor.field.unset_or_null") : ( get_bool( fm.deposit() ) ? $("catStrings").getString("staff.cat.copy_editor.field.deposit.yes_or_true") : $("catStrings").getString("staff.cat.copy_editor.field.deposit.no_or_false") )',
-			input: 'c = function(v){ g.apply("deposit",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ [ $("catStrings").getString("staff.cat.copy_editor.field.deposit.yes_or_true"), get_db_true() ], [ $("catStrings").getString("staff.cat.copy_editor.field.deposit.no_or_false"), get_db_false() ] ] ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
-		}
-	],
-	[
-		$('catStrings').getString('staff.cat.copy_editor.field.deposit_amount.label'),
-		{ 
-			render: 'if (fm.deposit_amount() == null) { $("catStrings").getString("staff.cat.copy_editor.field.unset_or_null"); } else { util.money.sanitize( fm.deposit_amount() ); }',
-			input: 'c = function(v){ g.apply("deposit_amount",v); if (typeof post_c == "function") post_c(v); }; x = document.createElement("textbox"); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
-		}
-	],
-	[
-		$('catStrings').getString('staff.cat.copy_editor.field.price.label'),
-		{ 
-			render: 'if (fm.price() == null) { $("catStrings").getString("staff.cat.copy_editor.field.unset_or_null"); } else { util.money.sanitize( fm.price() ); }', 
-			input: 'c = function(v){ g.apply("price",v); if (typeof post_c == "function") post_c(v); }; x = document.createElement("textbox"); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
-		}
-	],
-
-	[
-		$('catStrings').getString('staff.cat.copy_editor.field.opac_visible.label'),
-		{ 
-			render: 'fm.opac_visible() == null ? $("catStrings").getString("staff.cat.copy_editor.field.unset_or_null") : ( get_bool( fm.opac_visible() ) ? $("catStrings").getString("staff.cat.copy_editor.field.opac_visible.yes_or_true") : $("catStrings").getString("staff.cat.copy_editor.field.opac_visible.no_or_false") )', 
-			input: 'c = function(v){ g.apply("opac_visible",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ [ $("catStrings").getString("staff.cat.copy_editor.field.opac_visible.yes_or_true"), get_db_true() ], [ $("catStrings").getString("staff.cat.copy_editor.field.opac_visible.no_or_false"), get_db_false() ] ] ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
-		}
-	],
-	[
-		$('catStrings').getString('staff.cat.copy_editor.field.reference.label'),
-		{ 
-			render: 'fm.ref() == null ? $("catStrings").getString("staff.cat.copy_editor.field.unset_or_null") : ( get_bool( fm.ref() ) ? $("catStrings").getString("staff.cat.copy_editor.field.reference.yes_or_true") : $("catStrings").getString("staff.cat.copy_editor.field.reference.no_or_false") )', 
-			input: 'c = function(v){ g.apply("ref",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ [ $("catStrings").getString("staff.cat.copy_editor.field.reference.yes_or_true"), get_db_true() ], [ $("catStrings").getString("staff.cat.copy_editor.field.reference.no_or_false"), get_db_false() ] ] ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
-		}
-	],
+[ [
+  $('catStrings').getString('staff.cat.copy_editor.field.alert_message.label'),
+  {
+   render: 'fm.alert_message() == null ? $("catStrings").getString("staff.cat.copy_editor.field.unset_or_null") : fm.alert_message()',
+   input: 'c = function(v){ g.apply("alert_message",v); if (typeof post_c == "function") post_c(v); }; x = document.createElement("textbox"); x.setAttribute("multiline",true); g.populate_alert_message_input(x); x.addEventListener("apply",function(f){ return function(ev) { f( ev.target.value ); } }(c), false);',
+  }
+ ],
+
+ [
+  $('catStrings').getString('staff.cat.copy_editor.field.deposit.label'),
+  { 
+   render: 'fm.deposit() == null ? $("catStrings").getString("staff.cat.copy_editor.field.unset_or_null") : ( get_bool( fm.deposit() ) ? $("catStrings").getString("staff.cat.copy_editor.field.deposit.yes_or_true") : $("catStrings").getString("staff.cat.copy_editor.field.deposit.no_or_false") )',
+   input: 'c = function(v){ g.apply("deposit",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ [ $("catStrings").getString("staff.cat.copy_editor.field.deposit.yes_or_true"), get_db_true() ], [ $("catStrings").getString("staff.cat.copy_editor.field.deposit.no_or_false"), get_db_false() ] ] ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
+  }
+ ],
+ [
+  $('catStrings').getString('staff.cat.copy_editor.field.deposit_amount.label'),
+  { 
+   render: 'if (fm.deposit_amount() == null) { $("catStrings").getString("staff.cat.copy_editor.field.unset_or_null"); } else { util.money.sanitize( fm.deposit_amount() ); }',
+   input: 'c = function(v){ g.apply("deposit_amount",v); if (typeof post_c == "function") post_c(v); }; x = document.createElement("textbox"); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
+  }
+ ],
+ [
+  $('catStrings').getString('staff.cat.copy_editor.field.price.label'),
+  { 
+   render: 'if (fm.price() == null) { $("catStrings").getString("staff.cat.copy_editor.field.unset_or_null"); } else { util.money.sanitize( fm.price() ); }', 
+   input: 'c = function(v){ g.apply("price",v); if (typeof post_c == "function") post_c(v); }; x = document.createElement("textbox"); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
+  }
+ ],
+
+ [
+  $('catStrings').getString('staff.cat.copy_editor.field.opac_visible.label'),
+  { 
+   render: 'fm.opac_visible() == null ? $("catStrings").getString("staff.cat.copy_editor.field.unset_or_null") : ( get_bool( fm.opac_visible() ) ? $("catStrings").getString("staff.cat.copy_editor.field.opac_visible.yes_or_true") : $("catStrings").getString("staff.cat.copy_editor.field.opac_visible.no_or_false") )', 
+   input: 'c = function(v){ g.apply("opac_visible",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ [ $("catStrings").getString("staff.cat.copy_editor.field.opac_visible.yes_or_true"), get_db_true() ], [ $("catStrings").getString("staff.cat.copy_editor.field.opac_visible.no_or_false"), get_db_false() ] ] ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
+  }
+ ],
+ [
+  $('catStrings').getString('staff.cat.copy_editor.field.reference.label'),
+  { 
+   render: 'fm.ref() == null ? $("catStrings").getString("staff.cat.copy_editor.field.unset_or_null") : ( get_bool( fm.ref() ) ? $("catStrings").getString("staff.cat.copy_editor.field.reference.yes_or_true") : $("catStrings").getString("staff.cat.copy_editor.field.reference.no_or_false") )', 
+   input: 'c = function(v){ g.apply("ref",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ [ $("catStrings").getString("staff.cat.copy_editor.field.reference.yes_or_true"), get_db_true() ], [ $("catStrings").getString("staff.cat.copy_editor.field.reference.no_or_false"), get_db_false() ] ] ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
+  }
+ ],
 ],
 
 'right_pane4' : 
@@ -930,60 +930,60 @@ g.panes_and_field_names = {
 /* This loops through all our fieldnames and all the copies, tallying up counts for the different values */
 
 g.summarize = function( copies ) {
-	/******************************************************************************************************/
-	/* Setup */
+ /******************************************************************************************************/
+ /* Setup */
 
-	JSAN.use('util.date'); JSAN.use('util.money');
-	g.summary = {};
-	g.field_names = [];
-	for (var i in g.panes_and_field_names) {
-		g.field_names = g.field_names.concat( g.panes_and_field_names[i] );
-	}
-	g.field_names = g.field_names.concat( g.editable_stat_cat_names );
-	g.field_names = g.field_names.concat( g.readonly_stat_cat_names );
+ JSAN.use('util.date'); JSAN.use('util.money');
+ g.summary = {};
+ g.field_names = [];
+ for (var i in g.panes_and_field_names) {
+  g.field_names = g.field_names.concat( g.panes_and_field_names[i] );
+ }
+ g.field_names = g.field_names.concat( g.editable_stat_cat_names );
+ g.field_names = g.field_names.concat( g.readonly_stat_cat_names );
 
-	/******************************************************************************************************/
-	/* Loop through the field names */
+ /******************************************************************************************************/
+ /* Loop through the field names */
 
-	for (var i = 0; i < g.field_names.length; i++) {
+ for (var i = 0; i < g.field_names.length; i++) {
 
-		var field_name = g.field_names[i][0];
-		var render = g.field_names[i][1].render;
+  var field_name = g.field_names[i][0];
+  var render = g.field_names[i][1].render;
         var attr = g.field_names[i][1].attr;
-		g.summary[ field_name ] = {};
-
-		/******************************************************************************************************/
-		/* Loop through the copies */
-
-		for (var j = 0; j < copies.length; j++) {
-
-			var fm = copies[j];
-			var cmd = render || ('fm.' + field_name + '();');
-			var value = '???';
-
-			/**********************************************************************************************/
-			/* Try to retrieve the value for this field for this copy */
-
-			try { 
-				value = eval( cmd ); 
-			} catch(E) { 
-				g.error.sdump('D_ERROR','Attempted ' + cmd + '\n' +  E + '\n'); 
-			}
-			if (typeof value == 'object' && value != null) {
-				alert('FIXME: field_name = <' + field_name + '>  value = <' + js2JSON(value) + '>\n');
-			}
-
-			/**********************************************************************************************/
-			/* Tally the count */
-
-			if (g.summary[ field_name ][ value ]) {
-				g.summary[ field_name ][ value ]++;
-			} else {
-				g.summary[ field_name ][ value ] = 1;
-			}
-		}
-	}
-	g.error.sdump('D_TRACE','summary = ' + js2JSON(g.summary) + '\n');
+  g.summary[ field_name ] = {};
+
+  /******************************************************************************************************/
+  /* Loop through the copies */
+
+  for (var j = 0; j < copies.length; j++) {
+
+   var fm = copies[j];
+   var cmd = render || ('fm.' + field_name + '();');
+   var value = '???';
+
+   /**********************************************************************************************/
+   /* Try to retrieve the value for this field for this copy */
+
+   try { 
+    value = eval( cmd ); 
+   } catch(E) { 
+    g.error.sdump('D_ERROR','Attempted ' + cmd + '\n' +  E + '\n'); 
+   }
+   if (typeof value == 'object' && value != null) {
+    alert('FIXME: field_name = <' + field_name + '>  value = <' + js2JSON(value) + '>\n');
+   }
+
+   /**********************************************************************************************/
+   /* Tally the count */
+
+   if (g.summary[ field_name ][ value ]) {
+    g.summary[ field_name ][ value ]++;
+   } else {
+    g.summary[ field_name ][ value ] = 1;
+   }
+  }
+ }
+ g.error.sdump('D_TRACE','summary = ' + js2JSON(g.summary) + '\n');
 }
 
 /******************************************************************************************************/
@@ -991,18 +991,18 @@ g.summarize = function( copies ) {
 
 g.render = function() {
 
-	/******************************************************************************************************/
-	/* Library setup and clear any existing interface */
+ /******************************************************************************************************/
+ /* Library setup and clear any existing interface */
 
-	JSAN.use('util.widgets'); JSAN.use('util.date'); JSAN.use('util.money'); JSAN.use('util.functional');
+ JSAN.use('util.widgets'); JSAN.use('util.date'); JSAN.use('util.money'); JSAN.use('util.functional');
 
-	for (var i in g.panes_and_field_names) {
-		var p = document.getElementById(i);
-		if (p) util.widgets.remove_children(p);
-	}
+ for (var i in g.panes_and_field_names) {
+  var p = document.getElementById(i);
+  if (p) util.widgets.remove_children(p);
+ }
 
-	/******************************************************************************************************/
-	/* Populate the library filter menu for stat cats */
+ /******************************************************************************************************/
+ /* Populate the library filter menu for stat cats */
 
     var sc_libs = {};
     for (var i = 0; i < g.panes_and_field_names.right_pane4.length; i++) {
@@ -1024,80 +1024,80 @@ g.render = function() {
         x.appendChild(menuitem);
     }
 
-	/******************************************************************************************************/
-	/* Prepare the panes */
+ /******************************************************************************************************/
+ /* Prepare the panes */
 
-	var groupbox; var caption; var vbox; var grid; var rows;
-	
-	/******************************************************************************************************/
-	/* Loop through the field names */
+ var groupbox; var caption; var vbox; var grid; var rows;
+ 
+ /******************************************************************************************************/
+ /* Loop through the field names */
 
-	for (h in g.panes_and_field_names) {
-		if (!document.getElementById(h)) continue;
-		for (var i = 0; i < g.panes_and_field_names[h].length; i++) {
-			try {
-				var f = g.panes_and_field_names[h][i]; var fn = f[0]; var attr = f[1].attr;
-				groupbox = document.createElement('groupbox'); document.getElementById(h).appendChild(groupbox);
+ for (h in g.panes_and_field_names) {
+  if (!document.getElementById(h)) continue;
+  for (var i = 0; i < g.panes_and_field_names[h].length; i++) {
+   try {
+    var f = g.panes_and_field_names[h][i]; var fn = f[0]; var attr = f[1].attr;
+    groupbox = document.createElement('groupbox'); document.getElementById(h).appendChild(groupbox);
                 if (attr) {
                     for (var a in attr) {
                         groupbox.setAttribute(a,attr[a]);
                     }
                 }
-				if (typeof g.changed[fn] != 'undefined') groupbox.setAttribute('class','copy_editor_field_changed');
-				caption = document.createElement('caption'); groupbox.appendChild(caption);
-				caption.setAttribute('label',fn); caption.setAttribute('id','caption_'+fn);
-				vbox = document.createElement('vbox'); groupbox.appendChild(vbox);
-				grid = util.widgets.make_grid( [ { 'flex' : 1 }, {}, {} ] ); vbox.appendChild(grid);
-				grid.setAttribute('flex','1');
-				rows = grid.lastChild;
-				var row;
-				
-				/**************************************************************************************/
-				/* Loop through each value for the field */
-
-				for (var j in g.summary[fn]) {
-					var value = j; var count = g.summary[fn][j];
-					row = document.createElement('row'); rows.appendChild(row);
-					var label1 = document.createElement('description'); row.appendChild(label1);
-					if (g.special_exception[ fn ]) {
-						g.special_exception[ fn ]( label1, value );
-					} else {
-						label1.appendChild( document.createTextNode(value) );
-					}
-					var label2 = document.createElement('description'); row.appendChild(label2);
-					var copy_count;
-					if (count == 1) {
-						copy_count = $('catStrings').getString('staff.cat.copy_editor.copy_count');
-					} else {
-						copy_count = $('catStrings').getFormattedString('staff.cat.copy_editor.copy_count.plural', [count]);
-					}
-					label2.appendChild( document.createTextNode(copy_count) );
-				}
-				var hbox = document.createElement('hbox'); 
-				hbox.setAttribute('id',fn);
-				groupbox.appendChild(hbox);
-				var hbox2 = document.createElement('hbox');
-				groupbox.appendChild(hbox2);
-
-				/**************************************************************************************/
-				/* Render the input widget */
-
-				if (f[1].input && g.edit) {
-					g.render_input(hbox,f[1]);
-				}
-
-			} catch(E) {
-				g.error.sdump('D_ERROR','copy editor: ' + E + '\n');
-			}
-		}
-	}
+    if (typeof g.changed[fn] != 'undefined') groupbox.setAttribute('class','copy_editor_field_changed');
+    caption = document.createElement('caption'); groupbox.appendChild(caption);
+    caption.setAttribute('label',fn); caption.setAttribute('id','caption_'+fn);
+    vbox = document.createElement('vbox'); groupbox.appendChild(vbox);
+    grid = util.widgets.make_grid( [ { 'flex' : 1 }, {}, {} ] ); vbox.appendChild(grid);
+    grid.setAttribute('flex','1');
+    rows = grid.lastChild;
+    var row;
+    
+    /**************************************************************************************/
+    /* Loop through each value for the field */
+
+    for (var j in g.summary[fn]) {
+     var value = j; var count = g.summary[fn][j];
+     row = document.createElement('row'); rows.appendChild(row);
+     var label1 = document.createElement('description'); row.appendChild(label1);
+     if (g.special_exception[ fn ]) {
+      g.special_exception[ fn ]( label1, value );
+     } else {
+      label1.appendChild( document.createTextNode(value) );
+     }
+     var label2 = document.createElement('description'); row.appendChild(label2);
+     var copy_count;
+     if (count == 1) {
+      copy_count = $('catStrings').getString('staff.cat.copy_editor.copy_count');
+     } else {
+      copy_count = $('catStrings').getFormattedString('staff.cat.copy_editor.copy_count.plural', [count]);
+     }
+     label2.appendChild( document.createTextNode(copy_count) );
+    }
+    var hbox = document.createElement('hbox'); 
+    hbox.setAttribute('id',fn);
+    groupbox.appendChild(hbox);
+    var hbox2 = document.createElement('hbox');
+    groupbox.appendChild(hbox2);
+
+    /**************************************************************************************/
+    /* Render the input widget */
+
+    if (f[1].input && g.edit) {
+     g.render_input(hbox,f[1]);
+    }
+
+   } catch(E) {
+    g.error.sdump('D_ERROR','copy editor: ' + E + '\n');
+   }
+  }
+ }
     
     
-	/******************************************************************************************************/
-	/* Synchronize stat cat visibility with library filter menu, and default template selection */
+ /******************************************************************************************************/
+ /* Synchronize stat cat visibility with library filter menu, and default template selection */
     JSAN.use('util.file'); 
-	var file = new util.file('copy_editor_prefs.'+g.data.server_unadorned);
-	g.copy_editor_prefs = util.widgets.load_attributes(file);
+ var file = new util.file('copy_editor_prefs.'+g.data.server_unadorned);
+ g.copy_editor_prefs = util.widgets.load_attributes(file);
     for (var i in g.copy_editor_prefs) {
         if (i.match(/filter_/) && g.copy_editor_prefs[i].checked == '') {
             try { 
@@ -1112,148 +1112,148 @@ g.render = function() {
 /******************************************************************************************************/
 /* This actually draws the change button and input widget for a given field */
 g.render_input = function(node,blob) {
-	try {
-		// node = hbox ;    groupbox ->  hbox, hbox
+ try {
+  // node = hbox ;    groupbox ->  hbox, hbox
 
-		var groupbox = node.parentNode;
-		var caption = groupbox.firstChild;
-		var vbox = node.previousSibling;
-		var hbox = node;
-		var hbox2 = node.nextSibling;
+  var groupbox = node.parentNode;
+  var caption = groupbox.firstChild;
+  var vbox = node.previousSibling;
+  var hbox = node;
+  var hbox2 = node.nextSibling;
 
-		var input_cmd = blob.input;
-		var render_cmd = blob.render;
+  var input_cmd = blob.input;
+  var render_cmd = blob.render;
         var attr = blob.attr;
 
-		var block = false; var first = true;
-
-		function on_mouseover(ev) {
-			groupbox.setAttribute('style','background: white');
-		}
-
-		function on_mouseout(ev) {
-			groupbox.setAttribute('style','');
-		}
-
-		vbox.addEventListener('mouseover',on_mouseover,false);
-		vbox.addEventListener('mouseout',on_mouseout,false);
-		groupbox.addEventListener('mouseover',on_mouseover,false);
-		groupbox.addEventListener('mouseout',on_mouseout,false);
-		groupbox.firstChild.addEventListener('mouseover',on_mouseover,false);
-		groupbox.firstChild.addEventListener('mouseout',on_mouseout,false);
-
-		function on_click(ev){
-			try {
-				if (block) return; block = true;
-
-				function post_c(v) {
-					try {
-						/* FIXME - kludgy */
-						var t = input_cmd.match('apply_stat_cat') ? 'stat_cat' : ( input_cmd.match('apply_owning_lib') ? 'owning_lib' : 'attribute' );
-						var f;
-						switch(t) {
-							case 'attribute' :
-								f = input_cmd.match(/apply\("(.+?)",/)[1];
-							break;
-							case 'stat_cat' :
-								f = input_cmd.match(/apply_stat_cat\((.+?),/)[1];
-							break;
-							case 'owning_lib' :
-								f = null;
-							break;
-						}
-						g.changed[ hbox.id ] = { 'type' : t, 'field' : f, 'value' : v };
-						block = false;
-						setTimeout(
-							function() {
-								g.summarize( g.copies );
-								g.render();
-								document.getElementById(caption.id).focus();
-							}, 0
-						);
-					} catch(E) {
-						g.error.standard_unexpected_error_alert('post_c',E);
-					}
-				}
-				var x; var c; eval( input_cmd );
-				if (x) {
-					util.widgets.remove_children(vbox);
-					util.widgets.remove_children(hbox);
-					util.widgets.remove_children(hbox2);
-					hbox.appendChild(x);
-					var apply = document.createElement('button');
-					apply.setAttribute('label', $('catStrings').getString('staff.cat.copy_editor.apply.label'));
-					apply.setAttribute('accesskey', $('catStrings').getString('staff.cat.copy_editor.apply.accesskey'));
-					hbox2.appendChild(apply);
-					apply.addEventListener('command',function() { c(x.value); },false);
-					var cancel = document.createElement('button');
-					cancel.setAttribute('label', $('catStrings').getString('staff.cat.copy_editor.cancel.label'));
-					cancel.addEventListener('command',function() { setTimeout( function() { g.summarize( g.copies ); g.render(); document.getElementById(caption.id).focus(); }, 0); }, false);
-					hbox2.appendChild(cancel);
-					setTimeout( function() { x.focus(); }, 0 );
-				}
-			} catch(E) {
-				g.error.standard_unexpected_error_alert('render_input',E);
-			}
-		}
-		vbox.addEventListener('click',on_click, false);
-		hbox.addEventListener('click',on_click, false);
-		caption.addEventListener('click',on_click, false);
-		caption.addEventListener('keypress',function(ev) {
-			if (ev.keyCode == 13 /* enter */ || ev.keyCode == 77 /* mac enter */) on_click();
-		}, false);
-		caption.setAttribute('style','-moz-user-focus: normal');
-		caption.setAttribute('onfocus','this.setAttribute("class","outline_me")');
-		caption.setAttribute('onblur','this.setAttribute("class","")');
-
-	} catch(E) {
-		g.error.sdump('D_ERROR',E + '\n');
-	}
+  var block = false; var first = true;
+
+  function on_mouseover(ev) {
+   groupbox.setAttribute('style','background: white');
+  }
+
+  function on_mouseout(ev) {
+   groupbox.setAttribute('style','');
+  }
+
+  vbox.addEventListener('mouseover',on_mouseover,false);
+  vbox.addEventListener('mouseout',on_mouseout,false);
+  groupbox.addEventListener('mouseover',on_mouseover,false);
+  groupbox.addEventListener('mouseout',on_mouseout,false);
+  groupbox.firstChild.addEventListener('mouseover',on_mouseover,false);
+  groupbox.firstChild.addEventListener('mouseout',on_mouseout,false);
+
+  function on_click(ev){
+   try {
+    if (block) return; block = true;
+
+    function post_c(v) {
+     try {
+      /* FIXME - kludgy */
+      var t = input_cmd.match('apply_stat_cat') ? 'stat_cat' : ( input_cmd.match('apply_owning_lib') ? 'owning_lib' : 'attribute' );
+      var f;
+      switch(t) {
+       case 'attribute' :
+        f = input_cmd.match(/apply\("(.+?)",/)[1];
+       break;
+       case 'stat_cat' :
+        f = input_cmd.match(/apply_stat_cat\((.+?),/)[1];
+       break;
+       case 'owning_lib' :
+        f = null;
+       break;
+      }
+      g.changed[ hbox.id ] = { 'type' : t, 'field' : f, 'value' : v };
+      block = false;
+      setTimeout(
+       function() {
+        g.summarize( g.copies );
+        g.render();
+        document.getElementById(caption.id).focus();
+       }, 0
+      );
+     } catch(E) {
+      g.error.standard_unexpected_error_alert('post_c',E);
+     }
+    }
+    var x; var c; eval( input_cmd );
+    if (x) {
+     util.widgets.remove_children(vbox);
+     util.widgets.remove_children(hbox);
+     util.widgets.remove_children(hbox2);
+     hbox.appendChild(x);
+     var apply = document.createElement('button');
+     apply.setAttribute('label', $('catStrings').getString('staff.cat.copy_editor.apply.label'));
+     apply.setAttribute('accesskey', $('catStrings').getString('staff.cat.copy_editor.apply.accesskey'));
+     hbox2.appendChild(apply);
+     apply.addEventListener('command',function() { c(x.value); },false);
+     var cancel = document.createElement('button');
+     cancel.setAttribute('label', $('catStrings').getString('staff.cat.copy_editor.cancel.label'));
+     cancel.addEventListener('command',function() { setTimeout( function() { g.summarize( g.copies ); g.render(); document.getElementById(caption.id).focus(); }, 0); }, false);
+     hbox2.appendChild(cancel);
+     setTimeout( function() { x.focus(); }, 0 );
+    }
+   } catch(E) {
+    g.error.standard_unexpected_error_alert('render_input',E);
+   }
+  }
+  vbox.addEventListener('click',on_click, false);
+  hbox.addEventListener('click',on_click, false);
+  caption.addEventListener('click',on_click, false);
+  caption.addEventListener('keypress',function(ev) {
+   if (ev.keyCode == 13 /* enter */ || ev.keyCode == 77 /* mac enter */) on_click();
+  }, false);
+  caption.setAttribute('style','-moz-user-focus: normal');
+  caption.setAttribute('onfocus','this.setAttribute("class","outline_me")');
+  caption.setAttribute('onblur','this.setAttribute("class","")');
+
+ } catch(E) {
+  g.error.sdump('D_ERROR',E + '\n');
+ }
 }
 
 /******************************************************************************************************/
 /* store the copies in the global xpcom stash */
 
 g.stash_and_close = function() {
-	try {
-		if (g.handle_update) {
-			try {
-				var r = g.network.request(
-					api.FM_ACP_FLESHED_BATCH_UPDATE.app,
-					api.FM_ACP_FLESHED_BATCH_UPDATE.method,
-					[ ses(), g.copies, true ]
-				);
-				if (typeof r.ilsevent != 'undefined') {
-					g.error.standard_unexpected_error_alert('copy update',r);
-				} else {
-					alert($('catStrings').getString('staff.cat.copy_editor.handle_update.success'));
-				}
-				/* FIXME -- revisit the return value here */
-			} catch(E) {
-				alert($('catStrings').getString('staff.cat.copy_editor.handle_update.error') + ' ' + js2JSON(E));
-			}
-		}
-		//g.data.temp_copies = js2JSON( g.copies );
-		//g.data.stash('temp_copies');
-		xulG.copies = g.copies;
-		update_modal_xulG(xulG);
-		window.close();
-	} catch(E) {
-		g.error.standard_unexpected_error_alert('stash and close',E);
-	}
+ try {
+  if (g.handle_update) {
+   try {
+    var r = g.network.request(
+     api.FM_ACP_FLESHED_BATCH_UPDATE.app,
+     api.FM_ACP_FLESHED_BATCH_UPDATE.method,
+     [ ses(), g.copies, true ]
+    );
+    if (typeof r.ilsevent != 'undefined') {
+     g.error.standard_unexpected_error_alert('copy update',r);
+    } else {
+     alert($('catStrings').getString('staff.cat.copy_editor.handle_update.success'));
+    }
+    /* FIXME -- revisit the return value here */
+   } catch(E) {
+    alert($('catStrings').getString('staff.cat.copy_editor.handle_update.error') + ' ' + js2JSON(E));
+   }
+  }
+  //g.data.temp_copies = js2JSON( g.copies );
+  //g.data.stash('temp_copies');
+  xulG.copies = g.copies;
+  update_modal_xulG(xulG);
+  window.close();
+ } catch(E) {
+  g.error.standard_unexpected_error_alert('stash and close',E);
+ }
 }
 
 /******************************************************************************************************/
 /* spawn copy notes interface */
 
 g.copy_notes = function() {
-	JSAN.use('util.window'); var win = new util.window();
-	win.open(
-		urls.XUL_COPY_NOTES, 
-		//+ '?copy_id=' + window.escape(g.copies[0].id()),
-		$("catStrings").getString("staff.cat.copy_editor.copy_notes"),'chrome,resizable,modal',
-		{ 'copy_id' : g.copies[0].id() }
-	);
+ JSAN.use('util.window'); var win = new util.window();
+ win.open(
+  urls.XUL_COPY_NOTES, 
+  //+ '?copy_id=' + window.escape(g.copies[0].id()),
+  $("catStrings").getString("staff.cat.copy_editor.copy_notes"),'chrome,resizable,modal',
+  { 'copy_id' : g.copies[0].id() }
+ );
 }
 
 /******************************************************************************************************/
@@ -1276,62 +1276,62 @@ g.toggle_stat_cat_display = function(el) {
 /******************************************************************************************************/
 /* This adds a stat cat definition to the stat cat pane for rendering */
 g.save_attributes = function() {
-	JSAN.use('util.widgets'); JSAN.use('util.file'); var file = new util.file('copy_editor_prefs.'+g.data.server_unadorned);
+ JSAN.use('util.widgets'); JSAN.use('util.file'); var file = new util.file('copy_editor_prefs.'+g.data.server_unadorned);
     var what_to_save = {};
     for (var i in g.copy_editor_prefs) {
         what_to_save[i] = [];
         for (var j in g.copy_editor_prefs[i]) what_to_save[i].push(j);
     }
-	util.widgets.save_attributes(file, what_to_save );
+ util.widgets.save_attributes(file, what_to_save );
 }
 
 /******************************************************************************************************/
 /* This adds a stat cat definition to the stat cat pane for rendering */
 g.add_stat_cat = function(sc) {
     try {
-		if (typeof g.data.hash.asc == 'undefined') { g.data.hash.asc = {}; g.data.stash('hash'); }
+  if (typeof g.data.hash.asc == 'undefined') { g.data.hash.asc = {}; g.data.stash('hash'); }
 
-		var sc_id = sc;
+  var sc_id = sc;
 
-		if (typeof sc == 'object') {
+  if (typeof sc == 'object') {
 
-			sc_id = sc.id();
-		}
+   sc_id = sc.id();
+  }
 
-		if (typeof g.stat_cat_seen[sc_id] != 'undefined') { return; }
+  if (typeof g.stat_cat_seen[sc_id] != 'undefined') { return; }
 
-		g.stat_cat_seen[ sc_id ] = 1;
+  g.stat_cat_seen[ sc_id ] = 1;
 
-		if (typeof sc != 'object') {
+  if (typeof sc != 'object') {
 
-			sc = g.network.simple_request(
-				'FM_ASC_BATCH_RETRIEVE',
-				[ ses(), [ sc_id ] ]
-			)[0];
+   sc = g.network.simple_request(
+    'FM_ASC_BATCH_RETRIEVE',
+    [ ses(), [ sc_id ] ]
+   )[0];
 
-		}
+  }
 
-		g.data.hash.asc[ sc.id() ] = sc; g.data.stash('hash');
+  g.data.hash.asc[ sc.id() ] = sc; g.data.stash('hash');
 
-		var label_name = g.data.hash.aou[ sc.owner() ].shortname() + " : " + sc.name();
+  var label_name = g.data.hash.aou[ sc.owner() ].shortname() + " : " + sc.name();
 
-		var temp_array = [
-			label_name,
-			{
-				render: 'var l = util.functional.find_list( fm.stat_cat_entries(), function(e){ return e.stat_cat() == ' 
-					+ sc.id() + '; } ); l ? l.value() : $("catStrings").getString("staff.cat.copy_editor.field.unset_or_null");',
-				input: 'c = function(v){ g.apply_stat_cat(' + sc.id() + ',v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ [ $("catStrings").getString("staff.cat.copy_editor.remove_stat_cat_entry"), -1 ] ].concat( util.functional.map_list( g.data.hash.asc[' + sc.id() 
-					+ '].entries(), function(obj){ return [ obj.value(), obj.id() ]; } ) ).sort() ); '
-					+ 'x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c),false);',
+  var temp_array = [
+   label_name,
+   {
+    render: 'var l = util.functional.find_list( fm.stat_cat_entries(), function(e){ return e.stat_cat() == ' 
+     + sc.id() + '; } ); l ? l.value() : $("catStrings").getString("staff.cat.copy_editor.field.unset_or_null");',
+    input: 'c = function(v){ g.apply_stat_cat(' + sc.id() + ',v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ [ $("catStrings").getString("staff.cat.copy_editor.remove_stat_cat_entry"), -1 ] ].concat( util.functional.map_list( g.data.hash.asc[' + sc.id() 
+     + '].entries(), function(obj){ return [ obj.value(), obj.id() ]; } ) ).sort() ); '
+     + 'x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c),false);',
                 attr: {
                     sc_lib: sc.owner(),
                 }
-			}
-		];
+   }
+  ];
 
-		g.panes_and_field_names.right_pane4.push( temp_array );
-	} catch(E) {
-		g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_editor.add_stat_cat.error'), E);
+  g.panes_and_field_names.right_pane4.push( temp_array );
+ } catch(E) {
+  g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_editor.add_stat_cat.error'), E);
     }
 }
 
@@ -1340,37 +1340,37 @@ g.add_stat_cat = function(sc) {
 g.populate_stat_cats = function() {
     try {
         g.data.stash_retrieve();
-		g.stat_cat_seen = {};
+  g.stat_cat_seen = {};
 
-		function get(lib_id,only_these) {
+  function get(lib_id,only_these) {
             g.data.stash_retrieve();
-			var label = 'asc_list_for_lib_'+lib_id;
-			if (typeof g.data[label] == 'undefined') {
-				var robj = g.network.simple_request('FM_ASC_RETRIEVE_VIA_AOU', [ ses(), lib_id ]);
-				if (typeof robj.ilsevent != 'undefined') throw(robj);
-				var temp_list = [];
-				for (var j = 0; j < robj.length; j++) {
-					var my_asc = robj[j];
+   var label = 'asc_list_for_lib_'+lib_id;
+   if (typeof g.data[label] == 'undefined') {
+    var robj = g.network.simple_request('FM_ASC_RETRIEVE_VIA_AOU', [ ses(), lib_id ]);
+    if (typeof robj.ilsevent != 'undefined') throw(robj);
+    var temp_list = [];
+    for (var j = 0; j < robj.length; j++) {
+     var my_asc = robj[j];
                     if (typeof g.data.hash.asc == 'undefined') { g.data.hash.asc = {}; }
-					if (typeof g.data.hash.asc[ my_asc.id() ] == 'undefined') {
-						g.data.hash.asc[ my_asc.id() ] = my_asc;
-					}
+     if (typeof g.data.hash.asc[ my_asc.id() ] == 'undefined') {
+      g.data.hash.asc[ my_asc.id() ] = my_asc;
+     }
                     var only_this_lib = my_asc.owner(); if (typeof only_this_lib == 'object') only_this_lib = only_this_lib.id();
-					if (only_these.indexOf( String( only_this_lib ) ) != -1) {
-						temp_list.push( my_asc );
-					}
-				}
-				g.data[label] = temp_list; g.data.stash(label,'hash','list');
-			}
-			return g.data[label];
-		}
-
-		/* The stat cats for the pertinent library -- this is based on workstation ou */
+     if (only_these.indexOf( String( only_this_lib ) ) != -1) {
+      temp_list.push( my_asc );
+     }
+    }
+    g.data[label] = temp_list; g.data.stash(label,'hash','list');
+   }
+   return g.data[label];
+  }
+
+  /* The stat cats for the pertinent library -- this is based on workstation ou */
         var label = 'asc_list_for_' + typeof g.data.ws_ou == 'object' ? g.data.ws_ou.id() : g.data.ws_ou;
         g.data[ label ] = g.data.list.my_asc; g.data.stash('label');
-		for (var i = 0; i < g.data.list.my_asc.length; i++) {
-			g.add_stat_cat( g.data.list.my_asc[i] );
-		}
+  for (var i = 0; i < g.data.list.my_asc.length; i++) {
+   g.add_stat_cat( g.data.list.my_asc[i] );
+  }
 
         /* For the others, we want to consider the owning libs, circ libs, and any libs that have stat cats already on the copies,
             however, if batch editing, we only want to show the ones they have in common.  So let's compile the libs  */
@@ -1389,21 +1389,21 @@ g.populate_stat_cats = function() {
             }
         }
 
-		/* stat cats based on stat cat entries present on these copies */
+  /* stat cats based on stat cat entries present on these copies */
         var sc_libs = {};
-		for (var i = 0; i < g.copies.length; i++) {
-			var entries = g.copies[i].stat_cat_entries();
-			if (!entries) entries = [];
-			for (var j = 0; j < entries.length; j++) {
+  for (var i = 0; i < g.copies.length; i++) {
+   var entries = g.copies[i].stat_cat_entries();
+   if (!entries) entries = [];
+   for (var j = 0; j < entries.length; j++) {
                 var lib = entries[j].owner(); if (typeof lib == 'object') lib = lib.id();
-				sc_libs[ lib ] = true;
-			}
+    sc_libs[ lib ] = true;
+   }
         }
         add_common_ancestors(sc_libs); // CAVEAT - if a copy has no stat_cat_entries, it basically gets no vote here
 
         /* stat cats based on Circ Lib */
         sc_libs = {};
-		for (var i = 0; i < g.copies.length; i++) {
+  for (var i = 0; i < g.copies.length; i++) {
             var circ_lib = g.copies[i].circ_lib(); if (typeof circ_lib == 'object') circ_lib = circ_lib.id();
             sc_libs[ circ_lib ] = true;
         }
@@ -1411,27 +1411,27 @@ g.populate_stat_cats = function() {
 
         /* stat cats based on Owning Lib */
         sc_libs = {};
-		for (var i = 0; i < g.copies.length; i++) {
+  for (var i = 0; i < g.copies.length; i++) {
             var cn_id = g.copies[i].call_number();
-			if (cn_id > 0) {
-				if (! g.map_acn[ cn_id ]) {
+   if (cn_id > 0) {
+    if (! g.map_acn[ cn_id ]) {
                     var req = g.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ cn_id ]);
                     if (typeof req.ilsevent == 'undefined') {
-    					g.map_acn[ cn_id ] = req;
+         g.map_acn[ cn_id ] = req;
                     } else {
                         continue;
                     }
-				}
+    }
                 var owning_lib = g.map_acn[ cn_id ].owning_lib(); if (typeof owning_lib == 'object') owning_lib = owning_lib.id();
                 sc_libs[ owning_lib ] = true;
-			}
-		}
+   }
+  }
         add_common_ancestors(sc_libs); // CAVEAT - if a copy is a pre-cat, it basically gets no vote here
 
         g.panes_and_field_names.right_pane4.sort();
 
     } catch(E) {
-		alert(E);
+  alert(E);
         g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_editor.populate_stat_cat.error'),E);
     }
 }
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_editor.xul b/Open-ILS/xul/staff_client/server/cat/copy_editor.xul
index 4725605488..9216182e1a 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_editor.xul
+++ b/Open-ILS/xul/staff_client/server/cat/copy_editor.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,81 +19,81 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="cat_copy_editor_win" 
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	width="800" height="580" oils_persist="width height"
-	title="&staff.cat.copy_editor.window.label;"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+ width="800" height="580" oils_persist="width height"
+ title="&staff.cat.copy_editor.window.label;"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true;
-	</script>
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true;
+ </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="copy_editor.js"/>
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script type="text/javascript" src="copy_editor.js"/>
 
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+ <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
 
     <vbox id="brief_display_box"/>
 
-	<groupbox flex="1" class="my_overflow">
-		<caption id="caption" label="&staff.cat.copy_editor.groupbox1.label;"/>
+ <groupbox flex="1" class="my_overflow">
+  <caption id="caption" label="&staff.cat.copy_editor.groupbox1.label;"/>
 
-		<hbox id="top_nav">
-			<hbox style="background: grey">
-				<vbox><spacer flex="1"/><label value="&staff.cat.copy_editor.templates.label;" style="font-weight: bold"/><spacer flex="1"/></vbox>
-				<hbox id="template_placeholder"/>
-				<button id="apply_template" label="&staff.cat.copy_editor.templates.apply_template.label;" accesskey="&staff.cat.copy_editor.templates.apply_template.accesskey;" oncommand="g.apply_template()"/>
-				<button id="delete_template" label="&staff.cat.copy_editor.templates.delete_template.label;" oncommand="g.delete_template()"/>
-				<button id="import_templates" label="&staff.cat.copy_editor.templates.import_template.label;" oncommand="g.import_templates()"/>
-				<button id="export_templates" label="&staff.cat.copy_editor.templates.export_template.label;" oncommand="g.export_templates()"/>
-				<button id="save_template" label="&staff.cat.copy_editor.templates.save_template.label;" oncommand="g.save_template()"/>
-			</hbox>
-			<spacer flex="1"/>
-			<button label="&staff.cat.copy_editor.templates.reset.label;" accesskey="&staff.cat.copy_editor.templates.reset.accesskey;" oncommand="g.reset()"/>
-		</hbox>
+  <hbox id="top_nav">
+   <hbox style="background: grey">
+    <vbox><spacer flex="1"/><label value="&staff.cat.copy_editor.templates.label;" style="font-weight: bold"/><spacer flex="1"/></vbox>
+    <hbox id="template_placeholder"/>
+    <button id="apply_template" label="&staff.cat.copy_editor.templates.apply_template.label;" accesskey="&staff.cat.copy_editor.templates.apply_template.accesskey;" oncommand="g.apply_template()"/>
+    <button id="delete_template" label="&staff.cat.copy_editor.templates.delete_template.label;" oncommand="g.delete_template()"/>
+    <button id="import_templates" label="&staff.cat.copy_editor.templates.import_template.label;" oncommand="g.import_templates()"/>
+    <button id="export_templates" label="&staff.cat.copy_editor.templates.export_template.label;" oncommand="g.export_templates()"/>
+    <button id="save_template" label="&staff.cat.copy_editor.templates.save_template.label;" oncommand="g.save_template()"/>
+   </hbox>
+   <spacer flex="1"/>
+   <button label="&staff.cat.copy_editor.templates.reset.label;" accesskey="&staff.cat.copy_editor.templates.reset.accesskey;" oncommand="g.reset()"/>
+  </hbox>
 
-		<hbox flex="1" style="overflow: scroll">
-			<vbox flex="1">
-				<label value="&staff.cat.copy_editor.identification.label;" style="font-weight: bold; font-size: large"/>
-				<vbox id="left_pane" flex="1"/>
-			</vbox>
-			<splitter><grippy /></splitter>
-			<vbox flex="1">
-				<button style="font-weight: bold; font-size: normal" label="&staff.cat.copy_editor.identification.location.label;" accesskey="&staff.cat.copy_editor.identification.location.accesskey;" oncommand="document.getElementById('right_pane').firstChild.firstChild.focus();"/>
-				<vbox id="right_pane" flex="1"/>
-			</vbox>
-			<splitter><grippy /></splitter>
-			<vbox flex="1">
-				<button style="font-weight: bold; font-size: normal" label="&staff.cat.copy_editor.identification.circulation.label;" accesskey="&staff.cat.copy_editor.identification.circulation.accesskey;" oncommand="document.getElementById('right_pane2').firstChild.firstChild.focus();"/>
-				<vbox id="right_pane2" flex="1"/>
-			</vbox>
-			<splitter><grippy /></splitter>
-			<vbox flex="1">
-				<button style="font-weight: bold; font-size: normal" label="&staff.cat.copy_editor.identification.miscellaneous.label;" accesskey="&staff.cat.copy_editor.identification.miscellaneous.accesskey;" oncommand="document.getElementById('right_pane3').firstChild.firstChild.focus();"/>
-				<vbox id="right_pane3" flex="1"/>
-			</vbox>
-			<splitter><grippy /></splitter>
-			<vbox flex="1">
-				<button style="font-weight: bold; font-size: normal" label="&staff.cat.copy_editor.identification.statistics.label;" accesskey="&staff.cat.copy_editor.identification.statistics.accesskey;" oncommand="document.getElementById('right_pane4').firstChild.firstChild.focus();"/>
+  <hbox flex="1" style="overflow: scroll">
+   <vbox flex="1">
+    <label value="&staff.cat.copy_editor.identification.label;" style="font-weight: bold; font-size: large"/>
+    <vbox id="left_pane" flex="1"/>
+   </vbox>
+   <splitter><grippy /></splitter>
+   <vbox flex="1">
+    <button style="font-weight: bold; font-size: normal" label="&staff.cat.copy_editor.identification.location.label;" accesskey="&staff.cat.copy_editor.identification.location.accesskey;" oncommand="document.getElementById('right_pane').firstChild.firstChild.focus();"/>
+    <vbox id="right_pane" flex="1"/>
+   </vbox>
+   <splitter><grippy /></splitter>
+   <vbox flex="1">
+    <button style="font-weight: bold; font-size: normal" label="&staff.cat.copy_editor.identification.circulation.label;" accesskey="&staff.cat.copy_editor.identification.circulation.accesskey;" oncommand="document.getElementById('right_pane2').firstChild.firstChild.focus();"/>
+    <vbox id="right_pane2" flex="1"/>
+   </vbox>
+   <splitter><grippy /></splitter>
+   <vbox flex="1">
+    <button style="font-weight: bold; font-size: normal" label="&staff.cat.copy_editor.identification.miscellaneous.label;" accesskey="&staff.cat.copy_editor.identification.miscellaneous.accesskey;" oncommand="document.getElementById('right_pane3').firstChild.firstChild.focus();"/>
+    <vbox id="right_pane3" flex="1"/>
+   </vbox>
+   <splitter><grippy /></splitter>
+   <vbox flex="1">
+    <button style="font-weight: bold; font-size: normal" label="&staff.cat.copy_editor.identification.statistics.label;" accesskey="&staff.cat.copy_editor.identification.statistics.accesskey;" oncommand="document.getElementById('right_pane4').firstChild.firstChild.focus();"/>
                 <menu label="&staff.cat.copy_editor.stat_cat_lib_filter_menu.label;" id="stat_cat_lib_filter_menu">
                     <menupopup />
                 </menu>
-				<vbox id="right_pane4" flex="1"/>
-			</vbox>
-		</hbox>
+    <vbox id="right_pane4" flex="1"/>
+   </vbox>
+  </hbox>
 
-		<hbox id="nav">
-			<spacer flex="1"/>
-			<button id="copy_notes" label="&staff.cat.copy_editor.copy_notes.label;" accesskey="&staff.cat.copy_editor.copy_notes.accesskey;" oncommand="g.copy_notes();"/>
-			<button id="save" label="&staff.cat.copy_editor.save.label;" hidden="true" accesskey="&staff.cat.copy_editor.save.accesskey;" oncommand="g.stash_and_close();"/>
-			<button id="cancel" label="&staff.cat.copy_editor.cancel.label;" accesskey="&staff.cat.copy_editor.cancel.accesskey;" oncommand="window.close();"/>
-		</hbox>
+  <hbox id="nav">
+   <spacer flex="1"/>
+   <button id="copy_notes" label="&staff.cat.copy_editor.copy_notes.label;" accesskey="&staff.cat.copy_editor.copy_notes.accesskey;" oncommand="g.copy_notes();"/>
+   <button id="save" label="&staff.cat.copy_editor.save.label;" hidden="true" accesskey="&staff.cat.copy_editor.save.accesskey;" oncommand="g.stash_and_close();"/>
+   <button id="cancel" label="&staff.cat.copy_editor.cancel.label;" accesskey="&staff.cat.copy_editor.cancel.accesskey;" oncommand="window.close();"/>
+  </hbox>
 
-		<spacer/>
-	</groupbox>
+  <spacer/>
+ </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_notes.xul b/Open-ILS/xul/staff_client/server/cat/copy_notes.xul
index b7bfb924c3..772007febb 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_notes.xul
+++ b/Open-ILS/xul/staff_client/server/cat/copy_notes.xul
@@ -15,7 +15,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -23,201 +23,201 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="copy_notes_win" width="700" height="550"
-	onload="try{ my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try{ my_init(); font_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-
-		function $(id) { return document.getElementById(id); }
-
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { 
-					throw( $("commonStrings").getString('common.jsan.missing') );
-				}
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-
-				JSAN.use('util.error'); g.error = new util.error();
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('util.date'); JSAN.use('util.money'); 
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-
-				g.error.sdump('D_TRACE','my_init() for copy_notes.xul');
-
-				g.copy_id = xul_param('copy_id',{'modal_xulG':true});
-
-				refresh();
-
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['cat/copy_notes.xul', js2JSON(E)]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function refresh() {
-			retrieve_notes(); render_notes();
-		}
-
-		function retrieve_notes() {
-			g.notes = g.network.simple_request('FM_ACPN_RETRIEVE_ALL',[ { 'authtoken' : ses(), 'itemid' : g.copy_id } ]).reverse();
-		}
-
-		function apply(node,field,value) {
-			util.widgets.apply(
-				node,'name',field,
-				function(n) {
-					switch(n.nodeName) {
-						case 'description' : n.appendChild( document.createTextNode( value ) ); break;
-						case 'label' : n.value = value; break;
-						default : n.value = value; break;
-					}
-				}
-			);
-		}
-
-		function render_notes() {
-			JSAN.use('util.widgets'); util.widgets.remove_children('notes_panel');
-			var np = $('notes_panel');
-				var hbox = document.createElement('hbox'); np.appendChild(hbox);
-					var btn = document.createElement('button'); hbox.appendChild(btn);
-						btn.setAttribute('label', $('catStrings').getString('staff.cat.copy_notes.render_notes.label'));
-						btn.setAttribute('accesskey', $('catStrings').getString('staff.cat.copy_notes.render_notes.accesskey'));
-						btn.setAttribute('oncommand','new_note()');
-
-			for (var i = 0; i < g.notes.length; i++) {
-
-				/* template */
-				var node = $('note_template').cloneNode(true); np.appendChild(node); node.hidden = false;
-				apply(node,'create_date',g.notes[i].create_date().toString().substr(0,10));
-				util.widgets.apply(node,'name','create_date',
-					function(n) {
-						n.setAttribute(
-							"tooltiptext",
-							$('catStrings').getString('staff.cat.copy_notes.widgets_apply.note_id') + " "
-							+ g.notes[i].id() + " " 
-							+ $('catStrings').getString('staff.cat.copy_notes.widgets_apply.creator_id') + " "
-							+ g.notes[i].creator()
-						);
-					}
-				);
-				apply(node,'title',g.notes[i].title());
-				apply(node,'pub',get_bool( g.notes[i].pub() ) ? $('catStrings').getString('staff.cat.copy_notes.widgets.public') : $('catStrings').getString('staff.cat.copy_notes.widgets.private'));
-				apply(node,'value',g.notes[i].value());
-				apply(node,'id',g.notes[i].id());
-				apply(node,'creator',g.notes[i].creator());
-
-				/* button bar */
-				var hb = document.createElement('hbox'); np.appendChild(hb);
-					var btn1 = document.createElement('button'); hb.appendChild(btn1);
-						btn1.setAttribute('label', $('catStrings').getString('staff.cat.copy_notes.delete_note.label'));
-						btn1.setAttribute('image',"/xul/server/skin/media/images/up_arrow.gif");
-
-						btn1.addEventListener(
-							'command',
-							function(id){ return function() { 
-								var r = g.error.yns_alert(
-									$('catStrings').getFormattedString('staff.cat.copy_notes.delete_note.prompt.msg', [g.notes[id].title(), g.notes[id].create_date().toString().substr(0,10)]),
-									$('catStrings').getString('staff.cat.copy_notes.delete_note.prompt.title'),
-									$('catStrings').getString('staff.cat.copy_notes.delete_note.prompt.yes'),
-									$('catStrings').getString('staff.cat.copy_notes.delete_note.prompt.no'),
-									null,
-									$('commonStrings').getString('common.confirm')
-								); 
-								if (r == 0) {
-									g.network.simple_request('FM_ACPN_DELETE',[ses(),g.notes[id].id()]);
-									setTimeout(function() { 
-										alert($('catStrings').getString('staff.cat.copy_notes.delete_note.success'));
-										refresh(); },0
-									);
-								}
-							} }(i),
-							false
-						);
-					var spacer = document.createElement('spacer'); hb.appendChild(spacer); spacer.flex = 1;
-					var btn2 = document.createElement('button'); hb.appendChild(btn2);
-						btn2.setAttribute('label', $('catStrings').getString('staff.cat.copy_notes.delete_note.close_window'));
-						btn2.setAttribute('oncommand','window.close();');
-			}
-
-		}
-		
-		function new_note() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalBrowserWrite");
-				var xml = '<groupbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1"> \
-					<caption label="' + $('catStrings').getString('staff.cat.copy_notes.new_note.label') + '"/> \
-					<grid flex="1"><columns><column/><column flex="1"/></columns> \
-						<rows> \
-							<row><label value="' + $('catStrings').getString('staff.cat.copy_notes.new_note.public') + '"/><checkbox id="pub" name="fancy_data" checked="false"/></row> \
-							<row><label value="' + $('catStrings').getString('staff.cat.copy_notes.new_note.title') + '"/><textbox id="title" name="fancy_data" context="clipboard"/></row> \
-							<row><label value="' + $('catStrings').getString('staff.cat.copy_notes.new_note.note') + '"/><textbox multiline="true" id="note" name="fancy_data" context="clipboard"/></row> \
-							<row><spacer/><hbox> \
-								<button label="' + $('catStrings').getString('staff.cat.copy_notes.new_note.cancel.label') + '" name="fancy_cancel" accesskey="' + $('catStrings').getString('staff.cat.copy_notes.new_note.cancel.accesskey') + '"/> \
-								<button label="' + $('catStrings').getString('staff.cat.copy_notes.new_note.add_note.label') + '" accesskey="' + $('catStrings').getString('staff.cat.copy_notes.new_note.add_note.accesskey') + '" name="fancy_submit"/></hbox></row> \
-						</rows></grid></groupbox>';
-				//g.data.init({'via':'stash'});
-				//g.data.temp_note_xml = xml; g.data.stash('temp_note_xml');
-				JSAN.use('util.window'); var win = new util.window();
-				var fancy_prompt_data = win.open(
-					urls.XUL_FANCY_PROMPT,
-					//+ '?xml_in_stash=temp_note_xml'
-					//+ '&focus=' + window.escape('title')
-					//+ '&title=' + window.escape('Add Note'),
-					'fancy_prompt', 'chrome,resizable,modal,width=700,height=500',
-					{ 'xml' : xml, 'focus' : 'title', 'title' : $('catStrings').getString('staff.cat.copy_notes.new_note.add_note.label') }
-				);
-				//g.data.init({'via':'stash'});
-				if (fancy_prompt_data.fancy_status == 'complete') {
-					//alert(js2JSON(g.data.fancy_prompt_data));
-					var note = new acpn();
-					note.isnew(1);
-					note.title( fancy_prompt_data.title );
-					note.value( fancy_prompt_data.note );
-					note.pub( get_bool( fancy_prompt_data.pub ) ? get_db_true() : get_db_false() );
-					note.owning_copy( g.copy_id );
-					var r = g.network.simple_request('FM_ACPN_CREATE',[ ses(), note ]);
-					if (typeof r.ilsevent != 'undefined') throw(r);
-					setTimeout(function() {
-						alert($('catStrings').getString('staff.cat.copy_notes.new_note.success'));
-						refresh();},0
-					);
-				}
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_notes.new_note.error'),E);
-			}
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-
-	<stack hidden="true" id="note_template" flex="1">
-		<groupbox flex="1" style="background-color: black;"/>
-		<groupbox flex="1" style="background-color: #FFDE00; -moz-border-radius-topright: 35px;" >
-			<hbox>
-				<description name="title" style="font-weight: bold"/>
-				<spacer flex="1"/>
-				<description name="create_date" style="font-weight: bold"/>
-				<description name="pub" style="font-weight: bold"/>
-			</hbox>
-			<description name="value"/>
-		</groupbox>
-	</stack>
-
-	<vbox flex="1" class="my_overflow" id="notes_panel">
-	</vbox>
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+
+  function $(id) { return document.getElementById(id); }
+
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { 
+     throw( $("commonStrings").getString('common.jsan.missing') );
+    }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+
+    JSAN.use('util.error'); g.error = new util.error();
+    JSAN.use('util.network'); g.network = new util.network();
+    JSAN.use('util.date'); JSAN.use('util.money'); 
+    JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+
+    g.error.sdump('D_TRACE','my_init() for copy_notes.xul');
+
+    g.copy_id = xul_param('copy_id',{'modal_xulG':true});
+
+    refresh();
+
+   } catch(E) {
+    var err_msg = $("commonStrings").getFormattedString('common.exception', ['cat/copy_notes.xul', js2JSON(E)]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+
+  function refresh() {
+   retrieve_notes(); render_notes();
+  }
+
+  function retrieve_notes() {
+   g.notes = g.network.simple_request('FM_ACPN_RETRIEVE_ALL',[ { 'authtoken' : ses(), 'itemid' : g.copy_id } ]).reverse();
+  }
+
+  function apply(node,field,value) {
+   util.widgets.apply(
+    node,'name',field,
+    function(n) {
+     switch(n.nodeName) {
+      case 'description' : n.appendChild( document.createTextNode( value ) ); break;
+      case 'label' : n.value = value; break;
+      default : n.value = value; break;
+     }
+    }
+   );
+  }
+
+  function render_notes() {
+   JSAN.use('util.widgets'); util.widgets.remove_children('notes_panel');
+   var np = $('notes_panel');
+    var hbox = document.createElement('hbox'); np.appendChild(hbox);
+     var btn = document.createElement('button'); hbox.appendChild(btn);
+      btn.setAttribute('label', $('catStrings').getString('staff.cat.copy_notes.render_notes.label'));
+      btn.setAttribute('accesskey', $('catStrings').getString('staff.cat.copy_notes.render_notes.accesskey'));
+      btn.setAttribute('oncommand','new_note()');
+
+   for (var i = 0; i < g.notes.length; i++) {
+
+    /* template */
+    var node = $('note_template').cloneNode(true); np.appendChild(node); node.hidden = false;
+    apply(node,'create_date',g.notes[i].create_date().toString().substr(0,10));
+    util.widgets.apply(node,'name','create_date',
+     function(n) {
+      n.setAttribute(
+       "tooltiptext",
+       $('catStrings').getString('staff.cat.copy_notes.widgets_apply.note_id') + " "
+       + g.notes[i].id() + " " 
+       + $('catStrings').getString('staff.cat.copy_notes.widgets_apply.creator_id') + " "
+       + g.notes[i].creator()
+      );
+     }
+    );
+    apply(node,'title',g.notes[i].title());
+    apply(node,'pub',get_bool( g.notes[i].pub() ) ? $('catStrings').getString('staff.cat.copy_notes.widgets.public') : $('catStrings').getString('staff.cat.copy_notes.widgets.private'));
+    apply(node,'value',g.notes[i].value());
+    apply(node,'id',g.notes[i].id());
+    apply(node,'creator',g.notes[i].creator());
+
+    /* button bar */
+    var hb = document.createElement('hbox'); np.appendChild(hb);
+     var btn1 = document.createElement('button'); hb.appendChild(btn1);
+      btn1.setAttribute('label', $('catStrings').getString('staff.cat.copy_notes.delete_note.label'));
+      btn1.setAttribute('image',"/xul/server/skin/media/images/up_arrow.gif");
+
+      btn1.addEventListener(
+       'command',
+       function(id){ return function() { 
+        var r = g.error.yns_alert(
+         $('catStrings').getFormattedString('staff.cat.copy_notes.delete_note.prompt.msg', [g.notes[id].title(), g.notes[id].create_date().toString().substr(0,10)]),
+         $('catStrings').getString('staff.cat.copy_notes.delete_note.prompt.title'),
+         $('catStrings').getString('staff.cat.copy_notes.delete_note.prompt.yes'),
+         $('catStrings').getString('staff.cat.copy_notes.delete_note.prompt.no'),
+         null,
+         $('commonStrings').getString('common.confirm')
+        ); 
+        if (r == 0) {
+         g.network.simple_request('FM_ACPN_DELETE',[ses(),g.notes[id].id()]);
+         setTimeout(function() { 
+          alert($('catStrings').getString('staff.cat.copy_notes.delete_note.success'));
+          refresh(); },0
+         );
+        }
+       } }(i),
+       false
+      );
+     var spacer = document.createElement('spacer'); hb.appendChild(spacer); spacer.flex = 1;
+     var btn2 = document.createElement('button'); hb.appendChild(btn2);
+      btn2.setAttribute('label', $('catStrings').getString('staff.cat.copy_notes.delete_note.close_window'));
+      btn2.setAttribute('oncommand','window.close();');
+   }
+
+  }
+  
+  function new_note() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalBrowserWrite");
+    var xml = '<groupbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1"> \
+     <caption label="' + $('catStrings').getString('staff.cat.copy_notes.new_note.label') + '"/> \
+     <grid flex="1"><columns><column/><column flex="1"/></columns> \
+      <rows> \
+       <row><label value="' + $('catStrings').getString('staff.cat.copy_notes.new_note.public') + '"/><checkbox id="pub" name="fancy_data" checked="false"/></row> \
+       <row><label value="' + $('catStrings').getString('staff.cat.copy_notes.new_note.title') + '"/><textbox id="title" name="fancy_data" context="clipboard"/></row> \
+       <row><label value="' + $('catStrings').getString('staff.cat.copy_notes.new_note.note') + '"/><textbox multiline="true" id="note" name="fancy_data" context="clipboard"/></row> \
+       <row><spacer/><hbox> \
+        <button label="' + $('catStrings').getString('staff.cat.copy_notes.new_note.cancel.label') + '" name="fancy_cancel" accesskey="' + $('catStrings').getString('staff.cat.copy_notes.new_note.cancel.accesskey') + '"/> \
+        <button label="' + $('catStrings').getString('staff.cat.copy_notes.new_note.add_note.label') + '" accesskey="' + $('catStrings').getString('staff.cat.copy_notes.new_note.add_note.accesskey') + '" name="fancy_submit"/></hbox></row> \
+      </rows></grid></groupbox>';
+    //g.data.init({'via':'stash'});
+    //g.data.temp_note_xml = xml; g.data.stash('temp_note_xml');
+    JSAN.use('util.window'); var win = new util.window();
+    var fancy_prompt_data = win.open(
+     urls.XUL_FANCY_PROMPT,
+     //+ '?xml_in_stash=temp_note_xml'
+     //+ '&focus=' + window.escape('title')
+     //+ '&title=' + window.escape('Add Note'),
+     'fancy_prompt', 'chrome,resizable,modal,width=700,height=500',
+     { 'xml' : xml, 'focus' : 'title', 'title' : $('catStrings').getString('staff.cat.copy_notes.new_note.add_note.label') }
+    );
+    //g.data.init({'via':'stash'});
+    if (fancy_prompt_data.fancy_status == 'complete') {
+     //alert(js2JSON(g.data.fancy_prompt_data));
+     var note = new acpn();
+     note.isnew(1);
+     note.title( fancy_prompt_data.title );
+     note.value( fancy_prompt_data.note );
+     note.pub( get_bool( fancy_prompt_data.pub ) ? get_db_true() : get_db_false() );
+     note.owning_copy( g.copy_id );
+     var r = g.network.simple_request('FM_ACPN_CREATE',[ ses(), note ]);
+     if (typeof r.ilsevent != 'undefined') throw(r);
+     setTimeout(function() {
+      alert($('catStrings').getString('staff.cat.copy_notes.new_note.success'));
+      refresh();},0
+     );
+    }
+   } catch(E) {
+    g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_notes.new_note.error'),E);
+   }
+  }
+
+ ]]>
+ </script>
+
+ <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+ <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+
+ <stack hidden="true" id="note_template" flex="1">
+  <groupbox flex="1" style="background-color: black;"/>
+  <groupbox flex="1" style="background-color: #FFDE00; -moz-border-radius-topright: 35px;" >
+   <hbox>
+    <description name="title" style="font-weight: bold"/>
+    <spacer flex="1"/>
+    <description name="create_date" style="font-weight: bold"/>
+    <description name="pub" style="font-weight: bold"/>
+   </hbox>
+   <description name="value"/>
+  </groupbox>
+ </stack>
+
+ <vbox flex="1" class="my_overflow" id="notes_panel">
+ </vbox>
 
 
 </window>
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_summary.xul b/Open-ILS/xul/staff_client/server/cat/copy_summary.xul
index eafeb249a3..6be01e68d6 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_summary.xul
+++ b/Open-ILS/xul/staff_client/server/cat/copy_summary.xul
@@ -2,7 +2,7 @@
 <!-- Application: Evergreen Staff Client -->
 <!-- Screen: Brief Bib Display -->
 <!--
-	vim:noet:sw=4:ts=4:
+ vim:noet:sw=4:ts=4:
 -->
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -14,7 +14,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -22,224 +22,224 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="cat_copy_summary_win" 
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns:html="http://www.w3.org/1999/xhtml"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+ xmlns:html="http://www.w3.org/1999/xhtml"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+ </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-		function $w(id,text) { if ($(id)) util.widgets.set_text($(id),text); }
-
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { 
-					throw( $("commonStrings").getString('common.jsan.missing') );
-				}
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for cat_copy_summary.xul');
-
-				var copy_id = xul_param('copy_id'); 
-
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('util.date'); JSAN.use('util.widgets');
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.stash_retrieve();
-				var copy = xul_param('copy',{'stash_name':'temp_copy','clear_xpcom':true});
-				var callnumber = xul_param('callnumber',{'stash_name':'temp_callnumber','clear_xpcom':true});
-
-				$('caption').setAttribute('tooltiptext', $('catStrings').getFormattedString('staff.cat.copy_summary.copy_id', [(copy_id || copy.id())]));
-
-				JSAN.use('circ.util');
-				var columns = circ.util.columns( 
-					{ 
-						'barcode' : { 'hidden' : false },
-						'location' : { 'hidden' : false },
-						'owning_lib' : { 'hidden' : false },
-						'circ_lib' : { 'hidden' : false },
-						'call_number' : { 'hidden' : false },
-						'status' : { 'hidden' : false },
-						'alert_message' : { 'hidden' : false },
-					} 
-				).concat(
-					{
-						'id' : 'total_circs', 'label' : $('catStrings').getString('staff.cat.copy_summary.total_circs.label'), 'flex' : 1,
-						'primary' : false, 'hidden' : false, 'persist' : 'hidden width ordinal',
-						'render' : 'v = obj.network.simple_request("FM_CIRC_COUNT_RETRIEVE_VIA_COPY",[ my.acp.id() ]).total.count; v;' 
-					}
-				);
-
-				JSAN.use('util.list'); g.list = new util.list('item_summary_list');
-				g.list.init(
-					{
-						'columns' : columns,
-						'map_row_to_columns' : circ.util.std_map_row_to_columns(),
-					}
-				);
-	
-				function acp_callback(req) {
-					try {
-						var copy = req.getResultObject();
-						if (typeof copy.ilsevent != 'undefined') throw(copy);
-
-						function acn_callback(rreq) {
-							try {
-								$w('barcode',copy.barcode());	
-								$w('ref',get_bool(copy.ref()) ? $('catStrings').getString('staff.cat.copy_summary.yes') : $('catStrings').getString('staff.cat.copy_summary.no'));	
-								$w('opac_visible',get_bool(copy.opac_visible()) ? $('catStrings').getString('staff.cat.copy_summary.yes') : $('catStrings').getString('staff.cat.copy_summary.no'));	
-								$w('circulate',get_bool(copy.circulate()) ? $('catStrings').getString('staff.cat.copy_summary.yes') : $('catStrings').getString('staff.cat.copy_summary.no'));	
-								$w('holdable',get_bool(copy.holdable()) ? $('catStrings').getString('staff.cat.copy_summary.yes') : $('catStrings').getString('staff.cat.copy_summary.no'));	
-								$w('age_protect',copy.age_protect() == null ? $('staff.cat.copy_summary.unset') : ( typeof copy.age_protect() == 'object' ? copy.age_protect().name() : g.data.hash.crahp[ copy.age_protect() ].name() ) );	
-								$w('location',typeof copy.location() == 'object' ? copy.location().name() : g.data.lookup('acpl',copy.location()).name() );	
-								$w('create_date',util.date.formatted_date(copy.create_date(),'%F'));
-								$w('edit_date',util.date.formatted_date(copy.edit_date(),'%F'));
-								$w('status',typeof copy.status() == 'object' ? copy.status().name() : g.data.hash.ccs[ copy.status() ].name() );	
-							} catch(E) {
-								g.error.standard_unexpected_error_alert('rendering copy',E);
-							}
-							try {
-								var cn = rreq.getResultObject();
-								if (typeof cn.ilsevent != 'undefined') {
-									switch(Number(cn.ilsevent)) {
-										case 1508 /* ASSET_CALL_NUMBER_NOT_FOUND */ :
-											$w('callnumber', $('catStrings').getString('staff.cat.copy_summary.not_cataloged'));	
-										break;
-										default:
-											throw(cn);
-										break;
-									}
-								} else {
-									$w('callnumber',cn.label());	
-								}
-								g.list.append({'row':{'my':{'acp':copy,'acn':cn}}});
-							} catch(E) {
-								g.error.standard_unexpected_error_alert('retrieving volume',E);
-							}
-						}
-
-						if (callnumber) {
-							acn_callback( { 'getResultObject' : function() { return callnumber; } } );
-						} else {
-							g.network.simple_request(
-								'FM_ACN_RETRIEVE.authoritative',
-								[ copy.call_number() ], acn_callback
-							);
-						}
-					} catch(E) {
-						g.error.standard_unexpected_error_alert('retrieving copy',E);
-					}
-				}
-
-				if (copy_id) {
-					g.network.simple_request( 'FM_ACP_RETRIEVE', [ copy_id ], acp_callback);
-				} else {
-					acp_callback( { 'getResultObject' : function() { return copy; } } );
-					copy_id = copy.id();
-				}
-
-				g.network.simple_request('FM_CIRC_COUNT_RETRIEVE_VIA_COPY',[ copy_id ],function(req) {
-					try {
-						var robj = req.getResultObject();
-						if (typeof robj.ilsevent != 'undefined') throw(robj);
-						$w('total_circs',robj.total.count);
-					} catch(E) {
-						g.error.standard_unexpected_error_alert('retrieving circ total',E);
-					}
-				});
-
-				toggle_deck(); toggle_deck(); /* quick hack */
-
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert('copy_summary.xul',E); } catch(F) { alert(E + '\n' + F); }
-			}
-		}
-
-		function toggle_deck() {
-			try {
-				if ($('item_deck').selectedIndex == 0) {
-					$('item_deck').selectedIndex = 1; /* change to grid */
-					$('save_columns').hidden = true;
-					$('sel_clip').hidden = true;
-				} else {
-					$('item_deck').selectedIndex = 0; /* change to tree */
-					$('save_columns').hidden = false;
-					$('sel_clip').hidden = false;
-				}
-			} catch(E) {
-			}
-		}
-	]]>
-	</script>
-
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-
-	<groupbox id="groupbox" flex="1" style="overflow: none; min-height: 80;">
-		<caption label="&staff.cat.copy_summary.label;" id="caption"/>
-		<deck id="item_deck" oils_persist="selectedIndex">
-			<tree id="item_summary_list" enableColumnDrag="true" flex="1"/>
-			<grid>
-				<columns>
-					<column/>
-					<column/>
-					<column/>
-					<column/>
-					<column/>
-					<column/>
-					<column/>
-					<column/>
-				</columns>
-				<rows>
-					<row>
-						<label style="font-weight: bold" value="&staff.cat.copy_summary.barcode.label;"/>
-						<label id="barcode" style="color: blue; text-decoration: underline; -moz-user-focus: normal;" onclick="copy_to_clipboard(event);"/>
-						<label style="font-weight: bold" value="&staff.cat.copy_summary.location.label;"/>
-						<label id="location"/>
-						<label style="font-weight: bold" value="&staff.cat.copy_summary.call_number.label;"/>
-						<label id="callnumber"/>
-						<label style="font-weight: bold" value="&staff.cat.copy_summary.status.label;"/>
-						<label id="status"/>
-					</row>
-					<row>
-						<label style="font-weight: bold" value="&staff.cat.copy_summary.circulate.label;"/>
-						<label id="circulate"/>
-						<label style="font-weight: bold" value="&staff.cat.copy_summary.reference.label;"/>
-						<label id="ref"/>
-						<label style="font-weight: bold" value="&staff.cat.copy_summary.holdable.label;"/>
-						<label id="holdable"/>
-						<label style="font-weight: bold" value="&staff.cat.copy_summary.opac_visible.label;"/>
-						<label id="opac_visible"/>
-					</row>
-					<row>
-						<label style="font-weight: bold" value="&staff.cat.copy_summary.created.label;"/>
-						<label id="create_date"/>
-						<label style="font-weight: bold" value="&staff.cat.copy_summary.edited.label;"/>
-						<label id="edit_date"/>
-						<label style="font-weight: bold" value="&staff.cat.copy_summary.age_protect.label;"/>
-						<label id="age_protect"/>
-						<label style="font-weight: bold" value="&staff.cat.copy_summary.total_circs.label;"/>
-						<label id="total_circs"/>
-					</row>
-				</rows>
-			</grid>
-		</deck>
-		<hbox>
-			<button label="&staff.cat.copy_summary.alternate_view.label;" oncommand="toggle_deck()"/>
-			<button id="save_columns" label="&staff.cat.copy_summary.save_columns.label;" oncommand="try { g.list.save_columns(); } catch(E) { alert(E); }"/>
-			<button id="sel_clip" label="&staff.cat.copy_summary.sel_clip.label;" oncommand="try { g.list.node.view.selection.selectAll(); g.list.clipboard(); } catch(E) { alert(E); }"/>
-			<button id="print_export" label="&staff.cat.copy_summary.print_export.label;" oncommand="try { g.list.on_all_fleshed = function() { JSAN.use('util.print'); var p = new util.print(); p.simple( g.list.dump_csv(), { 'content_type' : 'text/plain' } ); setTimeout( function() { g.list.on_all_fleshed = null; }, 0); }; g.list.full_retrieve(); } catch(E) { alert(E); }"/>
-		</hbox>
-	</groupbox>
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  function $(id) { return document.getElementById(id); }
+  function $w(id,text) { if ($(id)) util.widgets.set_text($(id),text); }
+
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { 
+     throw( $("commonStrings").getString('common.jsan.missing') );
+    }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for cat_copy_summary.xul');
+
+    var copy_id = xul_param('copy_id'); 
+
+    JSAN.use('util.network'); g.network = new util.network();
+    JSAN.use('util.date'); JSAN.use('util.widgets');
+    JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.stash_retrieve();
+    var copy = xul_param('copy',{'stash_name':'temp_copy','clear_xpcom':true});
+    var callnumber = xul_param('callnumber',{'stash_name':'temp_callnumber','clear_xpcom':true});
+
+    $('caption').setAttribute('tooltiptext', $('catStrings').getFormattedString('staff.cat.copy_summary.copy_id', [(copy_id || copy.id())]));
+
+    JSAN.use('circ.util');
+    var columns = circ.util.columns( 
+     { 
+      'barcode' : { 'hidden' : false },
+      'location' : { 'hidden' : false },
+      'owning_lib' : { 'hidden' : false },
+      'circ_lib' : { 'hidden' : false },
+      'call_number' : { 'hidden' : false },
+      'status' : { 'hidden' : false },
+      'alert_message' : { 'hidden' : false },
+     } 
+    ).concat(
+     {
+      'id' : 'total_circs', 'label' : $('catStrings').getString('staff.cat.copy_summary.total_circs.label'), 'flex' : 1,
+      'primary' : false, 'hidden' : false, 'persist' : 'hidden width ordinal',
+      'render' : 'v = obj.network.simple_request("FM_CIRC_COUNT_RETRIEVE_VIA_COPY",[ my.acp.id() ]).total.count; v;' 
+     }
+    );
+
+    JSAN.use('util.list'); g.list = new util.list('item_summary_list');
+    g.list.init(
+     {
+      'columns' : columns,
+      'map_row_to_columns' : circ.util.std_map_row_to_columns(),
+     }
+    );
+ 
+    function acp_callback(req) {
+     try {
+      var copy = req.getResultObject();
+      if (typeof copy.ilsevent != 'undefined') throw(copy);
+
+      function acn_callback(rreq) {
+       try {
+        $w('barcode',copy.barcode()); 
+        $w('ref',get_bool(copy.ref()) ? $('catStrings').getString('staff.cat.copy_summary.yes') : $('catStrings').getString('staff.cat.copy_summary.no')); 
+        $w('opac_visible',get_bool(copy.opac_visible()) ? $('catStrings').getString('staff.cat.copy_summary.yes') : $('catStrings').getString('staff.cat.copy_summary.no')); 
+        $w('circulate',get_bool(copy.circulate()) ? $('catStrings').getString('staff.cat.copy_summary.yes') : $('catStrings').getString('staff.cat.copy_summary.no')); 
+        $w('holdable',get_bool(copy.holdable()) ? $('catStrings').getString('staff.cat.copy_summary.yes') : $('catStrings').getString('staff.cat.copy_summary.no')); 
+        $w('age_protect',copy.age_protect() == null ? $('staff.cat.copy_summary.unset') : ( typeof copy.age_protect() == 'object' ? copy.age_protect().name() : g.data.hash.crahp[ copy.age_protect() ].name() ) ); 
+        $w('location',typeof copy.location() == 'object' ? copy.location().name() : g.data.lookup('acpl',copy.location()).name() ); 
+        $w('create_date',util.date.formatted_date(copy.create_date(),'%F'));
+        $w('edit_date',util.date.formatted_date(copy.edit_date(),'%F'));
+        $w('status',typeof copy.status() == 'object' ? copy.status().name() : g.data.hash.ccs[ copy.status() ].name() ); 
+       } catch(E) {
+        g.error.standard_unexpected_error_alert('rendering copy',E);
+       }
+       try {
+        var cn = rreq.getResultObject();
+        if (typeof cn.ilsevent != 'undefined') {
+         switch(Number(cn.ilsevent)) {
+          case 1508 /* ASSET_CALL_NUMBER_NOT_FOUND */ :
+           $w('callnumber', $('catStrings').getString('staff.cat.copy_summary.not_cataloged')); 
+          break;
+          default:
+           throw(cn);
+          break;
+         }
+        } else {
+         $w('callnumber',cn.label()); 
+        }
+        g.list.append({'row':{'my':{'acp':copy,'acn':cn}}});
+       } catch(E) {
+        g.error.standard_unexpected_error_alert('retrieving volume',E);
+       }
+      }
+
+      if (callnumber) {
+       acn_callback( { 'getResultObject' : function() { return callnumber; } } );
+      } else {
+       g.network.simple_request(
+        'FM_ACN_RETRIEVE.authoritative',
+        [ copy.call_number() ], acn_callback
+       );
+      }
+     } catch(E) {
+      g.error.standard_unexpected_error_alert('retrieving copy',E);
+     }
+    }
+
+    if (copy_id) {
+     g.network.simple_request( 'FM_ACP_RETRIEVE', [ copy_id ], acp_callback);
+    } else {
+     acp_callback( { 'getResultObject' : function() { return copy; } } );
+     copy_id = copy.id();
+    }
+
+    g.network.simple_request('FM_CIRC_COUNT_RETRIEVE_VIA_COPY',[ copy_id ],function(req) {
+     try {
+      var robj = req.getResultObject();
+      if (typeof robj.ilsevent != 'undefined') throw(robj);
+      $w('total_circs',robj.total.count);
+     } catch(E) {
+      g.error.standard_unexpected_error_alert('retrieving circ total',E);
+     }
+    });
+
+    toggle_deck(); toggle_deck(); /* quick hack */
+
+   } catch(E) {
+    try { g.error.standard_unexpected_error_alert('copy_summary.xul',E); } catch(F) { alert(E + '\n' + F); }
+   }
+  }
+
+  function toggle_deck() {
+   try {
+    if ($('item_deck').selectedIndex == 0) {
+     $('item_deck').selectedIndex = 1; /* change to grid */
+     $('save_columns').hidden = true;
+     $('sel_clip').hidden = true;
+    } else {
+     $('item_deck').selectedIndex = 0; /* change to tree */
+     $('save_columns').hidden = false;
+     $('sel_clip').hidden = false;
+    }
+   } catch(E) {
+   }
+  }
+ ]]>
+ </script>
+
+ <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+ <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+
+ <groupbox id="groupbox" flex="1" style="overflow: none; min-height: 80;">
+  <caption label="&staff.cat.copy_summary.label;" id="caption"/>
+  <deck id="item_deck" oils_persist="selectedIndex">
+   <tree id="item_summary_list" enableColumnDrag="true" flex="1"/>
+   <grid>
+    <columns>
+     <column/>
+     <column/>
+     <column/>
+     <column/>
+     <column/>
+     <column/>
+     <column/>
+     <column/>
+    </columns>
+    <rows>
+     <row>
+      <label style="font-weight: bold" value="&staff.cat.copy_summary.barcode.label;"/>
+      <label id="barcode" style="color: blue; text-decoration: underline; -moz-user-focus: normal;" onclick="copy_to_clipboard(event);"/>
+      <label style="font-weight: bold" value="&staff.cat.copy_summary.location.label;"/>
+      <label id="location"/>
+      <label style="font-weight: bold" value="&staff.cat.copy_summary.call_number.label;"/>
+      <label id="callnumber"/>
+      <label style="font-weight: bold" value="&staff.cat.copy_summary.status.label;"/>
+      <label id="status"/>
+     </row>
+     <row>
+      <label style="font-weight: bold" value="&staff.cat.copy_summary.circulate.label;"/>
+      <label id="circulate"/>
+      <label style="font-weight: bold" value="&staff.cat.copy_summary.reference.label;"/>
+      <label id="ref"/>
+      <label style="font-weight: bold" value="&staff.cat.copy_summary.holdable.label;"/>
+      <label id="holdable"/>
+      <label style="font-weight: bold" value="&staff.cat.copy_summary.opac_visible.label;"/>
+      <label id="opac_visible"/>
+     </row>
+     <row>
+      <label style="font-weight: bold" value="&staff.cat.copy_summary.created.label;"/>
+      <label id="create_date"/>
+      <label style="font-weight: bold" value="&staff.cat.copy_summary.edited.label;"/>
+      <label id="edit_date"/>
+      <label style="font-weight: bold" value="&staff.cat.copy_summary.age_protect.label;"/>
+      <label id="age_protect"/>
+      <label style="font-weight: bold" value="&staff.cat.copy_summary.total_circs.label;"/>
+      <label id="total_circs"/>
+     </row>
+    </rows>
+   </grid>
+  </deck>
+  <hbox>
+   <button label="&staff.cat.copy_summary.alternate_view.label;" oncommand="toggle_deck()"/>
+   <button id="save_columns" label="&staff.cat.copy_summary.save_columns.label;" oncommand="try { g.list.save_columns(); } catch(E) { alert(E); }"/>
+   <button id="sel_clip" label="&staff.cat.copy_summary.sel_clip.label;" oncommand="try { g.list.node.view.selection.selectAll(); g.list.clipboard(); } catch(E) { alert(E); }"/>
+   <button id="print_export" label="&staff.cat.copy_summary.print_export.label;" oncommand="try { g.list.on_all_fleshed = function() { JSAN.use('util.print'); var p = new util.print(); p.simple( g.list.dump_csv(), { 'content_type' : 'text/plain' } ); setTimeout( function() { g.list.on_all_fleshed = null; }, 0); }; g.list.full_retrieve(); } catch(E) { alert(E); }"/>
+  </hbox>
+ </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/cat/marc_new.xul b/Open-ILS/xul/staff_client/server/cat/marc_new.xul
index 6dea6fd938..e8e97060d4 100644
--- a/Open-ILS/xul/staff_client/server/cat/marc_new.xul
+++ b/Open-ILS/xul/staff_client/server/cat/marc_new.xul
@@ -2,7 +2,7 @@
 <!-- Application: Evergreen Staff Client -->
 <!-- Screen: Example Template for remote xul -->
 <!--
-	vim:noet:sw=4:ts=4:
+ vim:noet:sw=4:ts=4:
 -->
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -14,7 +14,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -22,75 +22,75 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="example_template_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+ </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		var catStrings;
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  var catStrings;
 
-		function $(id) { return document.getElementById(id); }
+  function $(id) { return document.getElementById(id); }
 
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
-				/* load translatable strings for cataloging interfaces */
+    /* load translatable strings for cataloging interfaces */
                 catStrings = document.getElementById('catStrings');
 
-				if (typeof JSAN == 'undefined') { 
-					throw( $('commonStrings').getString('common.jsan.missing') );
-				}
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for example_template.xul');
-
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					try { window.xulG.set_tab_name(catStrings.getString('staff.cat.marc_new.tab_name')); } catch(E) { alert(E); }
-				}
-
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('util.widgets');
-				JSAN.use('util.functional');
-
-				var templates = g.network.simple_request('MARC_XML_TEMPLATE_LIST',[]);
-				if (typeof templates.ilsevent != 'undefined') throw(templates);
-				var ml = util.widgets.make_menulist(
-					util.functional.map_list(
-						templates.sort(),
-						function(el) {
-							return [ el /* The menu entry label */, el /* The menu entry value */ ];
-						}
-					)
-				);
-				$('menu_placeholder').appendChild(ml);
-
-				$('load').addEventListener(
-					'command',
-					function(ev) {
-
-						var template_name;
-						try {
-
-							template_name = $('menu_placeholder').firstChild.value;
-							var marc = g.network.simple_request(
-								'MARC_XML_TEMPLATE_RETRIEVE',
-								[ template_name ]
-							);
-							if (typeof marc.ilsevent != 'undefined') throw(marc);
-	
-							var url = urls.XUL_MARC_EDIT;
-							var params = {
-								'record' : { 'marc' : marc },
+    if (typeof JSAN == 'undefined') { 
+     throw( $('commonStrings').getString('common.jsan.missing') );
+    }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for example_template.xul');
+
+    if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+     try { window.xulG.set_tab_name(catStrings.getString('staff.cat.marc_new.tab_name')); } catch(E) { alert(E); }
+    }
+
+    JSAN.use('util.network'); g.network = new util.network();
+    JSAN.use('util.widgets');
+    JSAN.use('util.functional');
+
+    var templates = g.network.simple_request('MARC_XML_TEMPLATE_LIST',[]);
+    if (typeof templates.ilsevent != 'undefined') throw(templates);
+    var ml = util.widgets.make_menulist(
+     util.functional.map_list(
+      templates.sort(),
+      function(el) {
+       return [ el /* The menu entry label */, el /* The menu entry value */ ];
+      }
+     )
+    );
+    $('menu_placeholder').appendChild(ml);
+
+    $('load').addEventListener(
+     'command',
+     function(ev) {
+
+      var template_name;
+      try {
+
+       template_name = $('menu_placeholder').firstChild.value;
+       var marc = g.network.simple_request(
+        'MARC_XML_TEMPLATE_RETRIEVE',
+        [ template_name ]
+       );
+       if (typeof marc.ilsevent != 'undefined') throw(marc);
+ 
+       var url = urls.XUL_MARC_EDIT;
+       var params = {
+        'record' : { 'marc' : marc },
                                 'fast_add_item' : function(doc_id,cn_label,cp_barcode) {
                                     try {
                                         JSAN.use('cat.util'); return cat.util.fast_item_add(doc_id,cn_label,cp_barcode);
@@ -98,25 +98,25 @@
                                         alert(E);
                                     }
                                 },
-								'save' : {
-									'label' : catStrings.getString('staff.cat.marc_new.create_record.label'),
-									'func' : function(new_marcxml) {
-										try {
-											var robj = g.network.simple_request(
-												'MARC_XML_RECORD_IMPORT',
-												[ ses(), new_marcxml, catStrings.getString('staff.cat.marc_new.system_local.label'), 1 ]
-											);
-											if (typeof robj.ilsevent != 'undefined') throw(robj);
-											alert(catStrings.getString('staff.cat.marc_new.record_created.label'));
-
-											/* Replace tab with OPAC-view of record */
-
-											var opac_url = xulG.url_prefix( urls.opac_rdetail ) + '?r=' + robj.id();
-											var content_params = {
-												'session' : ses(),
-												'authtime' : ses('authtime'),
-												'opac_url' : opac_url
-											};
+        'save' : {
+         'label' : catStrings.getString('staff.cat.marc_new.create_record.label'),
+         'func' : function(new_marcxml) {
+          try {
+           var robj = g.network.simple_request(
+            'MARC_XML_RECORD_IMPORT',
+            [ ses(), new_marcxml, catStrings.getString('staff.cat.marc_new.system_local.label'), 1 ]
+           );
+           if (typeof robj.ilsevent != 'undefined') throw(robj);
+           alert(catStrings.getString('staff.cat.marc_new.record_created.label'));
+
+           /* Replace tab with OPAC-view of record */
+
+           var opac_url = xulG.url_prefix( urls.opac_rdetail ) + '?r=' + robj.id();
+           var content_params = {
+            'session' : ses(),
+            'authtime' : ses('authtime'),
+            'opac_url' : opac_url
+           };
                                             return { 
                                                 'id' : robj.id(), 
                                                 'on_complete' : function() {
@@ -132,53 +132,53 @@
                                                 }
                                             };
 
-										} catch(E) {
-											g.error.standard_unexpected_error_alert(
-												catStrings.getString('staff.cat.marc_new.creating_record.error'), E
-											);
-										}
-									}
-								}
-							};
+          } catch(E) {
+           g.error.standard_unexpected_error_alert(
+            catStrings.getString('staff.cat.marc_new.creating_record.error'), E
+           );
+          }
+         }
+        }
+       };
                             var marc_editor = document.createElement('iframe');
                             $('marc_editor_box').appendChild(marc_editor);
-							marc_editor.setAttribute('flex','1');
-							marc_editor.setAttribute('src',url);
-							netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-							get_contentWindow(marc_editor).xulG = params;
-
-							/* hide template widgets */
-							$('actions').hidden = true;
-
-							window.xulG.set_tab_name(template_name);
-
-						} catch(E) {
-							g.error.standard_unexpected_error_alert(
-								catStrings.getFormattedString('staff.cat.marc_new.loading_template.error', [template_name]), E
-							);
-						}
-
-					},
-					false
-				);
-
-			} catch(E) {
-				g.error.standard_unexpected_error_alert('cat/marc_new.xul',E);
-			}
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-
-	<vbox id="marc_editor_box" flex="1">
-		<hbox id="actions">
-			<hbox id="menu_placeholder" />
-			<button id="load" label="&staff.cat.marc_new.load.label;" accesskey="&staff.cat.marc_new.load.accesskey;"/>
-		</hbox>
-	</vbox>
+       marc_editor.setAttribute('flex','1');
+       marc_editor.setAttribute('src',url);
+       netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+       get_contentWindow(marc_editor).xulG = params;
+
+       /* hide template widgets */
+       $('actions').hidden = true;
+
+       window.xulG.set_tab_name(template_name);
+
+      } catch(E) {
+       g.error.standard_unexpected_error_alert(
+        catStrings.getFormattedString('staff.cat.marc_new.loading_template.error', [template_name]), E
+       );
+      }
+
+     },
+     false
+    );
+
+   } catch(E) {
+    g.error.standard_unexpected_error_alert('cat/marc_new.xul',E);
+   }
+  }
+
+ ]]>
+ </script>
+
+ <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+ <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+
+ <vbox id="marc_editor_box" flex="1">
+  <hbox id="actions">
+   <hbox id="menu_placeholder" />
+   <button id="load" label="&staff.cat.marc_new.load.label;" accesskey="&staff.cat.marc_new.load.accesskey;"/>
+  </hbox>
+ </vbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/cat/marc_view.html b/Open-ILS/xul/staff_client/server/cat/marc_view.html
index fac51d5d33..f03202ae2d 100644
--- a/Open-ILS/xul/staff_client/server/cat/marc_view.html
+++ b/Open-ILS/xul/staff_client/server/cat/marc_view.html
@@ -7,31 +7,31 @@
 <script type='text/javascript'>
 <![CDATA[
 
-	var xsltProcessor;
+ var xsltProcessor;
 
-	function xsl_marc2html_init() {
+ function xsl_marc2html_init() {
         try {
-    		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-    		xsltProcessor = new XSLTProcessor();
-    		var req = new XMLHttpRequest();
-    		req.open("GET", urls.xsl_marc2html, false);
-    		req.send(null);
+      netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+      xsltProcessor = new XSLTProcessor();
+      var req = new XMLHttpRequest();
+      req.open("GET", urls.xsl_marc2html, false);
+      req.send(null);
             if (req.status != 200) {
                 alert('We were unable to load ' + urls.xsl_marc2html + ' and thus cannot display the MARC here.\nReason: ' + req.statusText);
                 return false;
             }
-    		var xsl = req.responseXML;
-    		xsltProcessor.importStylesheet(xsl);
+      var xsl = req.responseXML;
+      xsltProcessor.importStylesheet(xsl);
             return true;
         } catch(E) {
             alert('An error occurred and we are unable to display the MARC here.\nError in xsl_marc2html_init: ' + E);
             return false;
         }
-	}
+ }
 
-	function apply_xsl_marc2html(marc) {
+ function apply_xsl_marc2html(marc) {
         try {
-    		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+      netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
             var obj = this;
             var parser = new DOMParser();
             var doc = parser.parseFromString( marc, 'text/xml' );
@@ -41,14 +41,14 @@
         } catch(E) {
             alert('An error occurred and we are unable to display the MARC here.\nError in apply_xsl_marc2html: ' + E);
         }
-	}
+ }
 
-	function my_init() {
-		if (!xsl_marc2html_init()) return;
-		document.body.innerHTML = "<button onclick='window.print()'>Print Page<\/button>";
-		if (typeof xulG != 'undefined' && xulG.marcxml) apply_xsl_marc2html(xulG.marcxml);
-		document.body.firstChild.focus();
-	}
+ function my_init() {
+  if (!xsl_marc2html_init()) return;
+  document.body.innerHTML = "<button onclick='window.print()'>Print Page<\/button>";
+  if (typeof xulG != 'undefined' && xulG.marcxml) apply_xsl_marc2html(xulG.marcxml);
+  document.body.firstChild.focus();
+ }
 
 ]]>
 </script>
diff --git a/Open-ILS/xul/staff_client/server/cat/marc_view.xul b/Open-ILS/xul/staff_client/server/cat/marc_view.xul
index 67f80214cd..4ac51c77a1 100644
--- a/Open-ILS/xul/staff_client/server/cat/marc_view.xul
+++ b/Open-ILS/xul/staff_client/server/cat/marc_view.xul
@@ -14,7 +14,7 @@ vim:noet:sw=4:ts=4:
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -22,70 +22,70 @@ vim:noet:sw=4:ts=4:
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="cat_marc_view_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+ </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { 
-					throw( document.getElementById('commonStrings').getString('common.jsan.missing') );
-				}
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for cat/marc_view.xul');
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { 
+     throw( document.getElementById('commonStrings').getString('common.jsan.missing') );
+    }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for cat/marc_view.xul');
 
-				var docid = xul_param('docid');
-				var noprint = xul_param('noprint');
+    var docid = xul_param('docid');
+    var noprint = xul_param('noprint');
 
-				JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-				var key = location.pathname + location.search + location.hash;
-				if (!docid && typeof data.modal_xulG_stack != 'undefined' && typeof data.modal_xulG_stack[key] != 'undefined') {
-					var modal_xulG = data.modal_xulG_stack[key][ data.modal_xulG_stack[key].length - 1 ];
-					if (typeof modal_xulG == 'object') {
-						docid = modal_xulG.docid;
-						if (modal_xulG.noprint) noprint = modal_xulG.noprint;
-					}
-				}
+    JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+    var key = location.pathname + location.search + location.hash;
+    if (!docid && typeof data.modal_xulG_stack != 'undefined' && typeof data.modal_xulG_stack[key] != 'undefined') {
+     var modal_xulG = data.modal_xulG_stack[key][ data.modal_xulG_stack[key].length - 1 ];
+     if (typeof modal_xulG == 'object') {
+      docid = modal_xulG.docid;
+      if (modal_xulG.noprint) noprint = modal_xulG.noprint;
+     }
+    }
 
-				JSAN.use('util.network'); g.network = new util.network();
+    JSAN.use('util.network'); g.network = new util.network();
 
-				g.network.request(
-					api.MARC_HTML_RETRIEVE.app,
-					api.MARC_HTML_RETRIEVE.method,
-					[ docid ],
-					function(req) {
-						marc_html = req.getResultObject();
-						if (noprint||typeof xulG == 'undefined') marc_html = marc_html.replace(/<button.+?button>/, '');
-						document.getElementById('marc_frame').setAttribute('src', 'data:text/html,' + marc_html);
-					}
-				);
+    g.network.request(
+     api.MARC_HTML_RETRIEVE.app,
+     api.MARC_HTML_RETRIEVE.method,
+     [ docid ],
+     function(req) {
+      marc_html = req.getResultObject();
+      if (noprint||typeof xulG == 'undefined') marc_html = marc_html.replace(/<button.+?button>/, '');
+      document.getElementById('marc_frame').setAttribute('src', 'data:text/html,' + marc_html);
+     }
+    );
 
-			} catch(E) {
-				var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['cat/marc_view.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
+   } catch(E) {
+    var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['cat/marc_view.xul', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
 
-	]]>
-	</script>
+ ]]>
+ </script>
 
-	<groupbox flex="1">
-		<caption label="&staff.cat.marc_view.title;"/>
-		<iframe id="marc_frame" flex="1"/>
-	</groupbox>
+ <groupbox flex="1">
+  <caption label="&staff.cat.marc_view.title;"/>
+  <iframe id="marc_frame" flex="1"/>
+ </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/cat/marcedit.css b/Open-ILS/xul/staff_client/server/cat/marcedit.css
index 7db7b02277..a0ed013c1a 100644
--- a/Open-ILS/xul/staff_client/server/cat/marcedit.css
+++ b/Open-ILS/xul/staff_client/server/cat/marcedit.css
@@ -1,98 +1,98 @@
 messagecatalog { -moz-binding: url('../main/bindings.xml#messagecatalog'); }
 input {
-	background-color: lightgrey;
+ background-color: lightgrey;
 }
 
 input:focus {
-	background-color: lightcyan;
+ background-color: lightcyan;
 }
 
 .marcSubfieldDelimiter, .marcSubfieldCode, .marcInd1, .marcInd2, .marcTag, .marcEditableControlfield, .marcSubfield, .marcControlfield, .marcLeader {
-	font-family: fixed, monospace;
-	margin: 0;
+ font-family: fixed, monospace;
+ margin: 0;
 }
 
 .marcEditableControlfield {
-	text-align: left;
+ text-align: left;
 }
 
 .marcSubfieldCode, .marcInd1, .marcInd2, .marcTag {
-	width: 1em;
+ width: 1em;
 }
 
 .marcSubfieldDelimiter, .marcSubfieldCode {
-	color: blue;
+ color: blue;
 }
 
 .marcInd1, .marcInd2, .marcTag {
-	text-align: center;
+ text-align: center;
 }
 
 .marcSubfield {
-	min-width: 1em;
+ min-width: 1em;
 }
 
 .tooltip {
-	/* width: 10em; */
+ /* width: 10em; */
 }
 
 caption {
-	font-weight: bold;
+ font-weight: bold;
 }
 
 grid row, grid column {
-	border-collapse: collapse;
-	border: solid thin gray;
-	vertical-align: bottom;
+ border-collapse: collapse;
+ border: solid thin gray;
+ vertical-align: bottom;
 }
 
 grid column {
-	background-color: lightgray; 
-	padding: 2px;
+ background-color: lightgray; 
+ padding: 2px;
 }
 
 grid#leaderGrid textbox {
-	min-width: 1em;
+ min-width: 1em;
 }
 
 grid#leaderGrid label {
-	font-weight: bold;
+ font-weight: bold;
 }
 
 grid#leaderGrid label, grid#leaderGrid textbox {
-	visibility: hidden;
+ visibility: hidden;
 }
 
 grid#leaderGrid[type="BKS"] *[set~="BKS"], grid#leaderGrid[type="BKS"] *[set~="BKS"] + textbox {
-	visibility: visible;
+ visibility: visible;
 }
 
 grid#leaderGrid[type="SER"] *[set~="SER"], grid#leaderGrid[type="SER"] *[set~="SER"] + textbox {
-	visibility: visible;
+ visibility: visible;
 }
 
 grid#leaderGrid[type="VIS"] *[set~="VIS"], grid#leaderGrid[type="VIS"] *[set~="VIS"] + textbox {
-	visibility: visible;
+ visibility: visible;
 }
 
 grid#leaderGrid[type="MIX"] *[set~="MIX"], grid#leaderGrid[type="MIX"] *[set~="MIX"] + textbox {
-	visibility: visible;
+ visibility: visible;
 }
 
 grid#leaderGrid[type="MAP"] *[set~="MAP"], grid#leaderGrid[type="MAP"] *[set~="MAP"] + textbox {
-	visibility: visible;
+ visibility: visible;
 }
 
 grid#leaderGrid[type="SCO"] *[set~="SCO"], grid#leaderGrid[type="SCO"] *[set~="SCO"] + textbox {
-	visibility: visible;
+ visibility: visible;
 }
 
 grid#leaderGrid[type="REC"] *[set~="REC"], grid#leaderGrid[type="REC"] *[set~="REC"] + textbox {
-	visibility: visible;
+ visibility: visible;
 }
 
 grid#leaderGrid[type="COM"] *[set~="COM"], grid#leaderGrid[type="COM"] *[set~="COM"] + textbox {
-	visibility: visible;
+ visibility: visible;
 }
 
 grid[name="-none-"] * label { color: black; }
diff --git a/Open-ILS/xul/staff_client/server/cat/marcedit.js b/Open-ILS/xul/staff_client/server/cat/marcedit.js
index c12a720934..f9a1bc85f2 100644
--- a/Open-ILS/xul/staff_client/server/cat/marcedit.js
+++ b/Open-ILS/xul/staff_client/server/cat/marcedit.js
@@ -22,1270 +22,1270 @@ var p;
 function $(id) { return document.getElementById(id); }
 
 function mangle_005() {
-	var now = new Date();
-	var y = now.getUTCFullYear();
-
-	var m = now.getUTCMonth() + 1;
-	if (m < 10) m = '0' + m;
-	
-	var d = now.getUTCDate();
-	if (d < 10) d = '0' + d;
-	
-	var H = now.getUTCHours();
-	if (H < 10) H = '0' + H;
-	
-	var M = now.getUTCMinutes();
-	if (M < 10) M = '0' + M;
-	
-	var S = now.getUTCSeconds();
-	if (S < 10) S = '0' + S;
-	
-
-	var stamp = '' + y + m + d + H + M + S + '.0';
-	createControlField('005',stamp);
+ var now = new Date();
+ var y = now.getUTCFullYear();
+
+ var m = now.getUTCMonth() + 1;
+ if (m < 10) m = '0' + m;
+ 
+ var d = now.getUTCDate();
+ if (d < 10) d = '0' + d;
+ 
+ var H = now.getUTCHours();
+ if (H < 10) H = '0' + H;
+ 
+ var M = now.getUTCMinutes();
+ if (M < 10) M = '0' + M;
+ 
+ var S = now.getUTCSeconds();
+ if (S < 10) S = '0' + S;
+ 
+
+ var stamp = '' + y + m + d + H + M + S + '.0';
+ createControlField('005',stamp);
 
 }
 
 function createControlField (tag,data) {
-	// first, remove the old field, if any;
-	for (var i in xml_record.controlfield.(@tag == tag)) delete xml_record.controlfield.(@tag == tag)[i];
-
-	var cf = <controlfield tag="" xmlns="http://www.loc.gov/MARC21/slim">{ data }</controlfield>;
-	cf.@tag = tag;
-
-	// then, find the right position and insert it
-	var done = 0;
-	var cfields = xml_record.controlfield;
-	var base = Number(tag.substring(2));
-	for (var i in cfields) {
-		var t = Number(cfields[i].@tag.toString().substring(2));
-		if (t > base) {
-			xml_record.insertChildBefore( cfields[i], cf );
-			done = 1
-			break;
-		}
-	}
-
-	if (!done) xml_record.insertChildBefore( xml_record.datafield[0], cf );
-
-	return cf;
+ // first, remove the old field, if any;
+ for (var i in xml_record.controlfield.(@tag == tag)) delete xml_record.controlfield.(@tag == tag)[i];
+
+ var cf = <controlfield tag="" xmlns="http://www.loc.gov/MARC21/slim">{ data }</controlfield>;
+ cf.@tag = tag;
+
+ // then, find the right position and insert it
+ var done = 0;
+ var cfields = xml_record.controlfield;
+ var base = Number(tag.substring(2));
+ for (var i in cfields) {
+  var t = Number(cfields[i].@tag.toString().substring(2));
+  if (t > base) {
+   xml_record.insertChildBefore( cfields[i], cf );
+   done = 1
+   break;
+  }
+ }
+
+ if (!done) xml_record.insertChildBefore( xml_record.datafield[0], cf );
+
+ return cf;
 }
 
 function xml_escape_unicode ( str ) {
-	return str.replace(
-		/([\u0080-\ufffe])/g,
-		function (r,s) { return "&#x" + s.charCodeAt(0).toString(16) + ";"; }
-	);
+ return str.replace(
+  /([\u0080-\ufffe])/g,
+  function (r,s) { return "&#x" + s.charCodeAt(0).toString(16) + ";"; }
+ );
 }
 
 function my_init() {
-	try {
-
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-		JSAN.errorLevel = "die"; // none, warn, or die
-		JSAN.addRepository('/xul/server/');
-
-		// Fake xulG for standalone...
-		try {
-			window.xulG.record;
-		} catch (e) {
-			window.xulG = {};
-			window.xulG.record = {};
-			window.xulG.save = {};
-
-			window.xulG.save.label = $('catStrings').getString('staff.cat.marcedit.save.label');
-			window.xulG.save.func = function (r) { alert(r); }
-
-			var cgi = new CGI();
-			var _rid = cgi.param('record');
-			if (_rid) {
-				window.xulG.record.url = '/opac/extras/supercat/retrieve/marcxml/record/' + _rid;
-			}
-		}
-		// End faking part...
-
-		document.getElementById('save-button').setAttribute('label', window.xulG.save.label);
-		document.getElementById('save-button').setAttribute('oncommand',
-			'mangle_005(); ' + 
-			'var xml_string = xml_escape_unicode( xml_record.toXMLString() ); ' + 
-			'save_attempt( xml_string ); ' +
-			'loadRecord(xml_record);'
-		);
-
-		if (window.xulG.record.url) {
-			var req =  new XMLHttpRequest();
-			req.open('POST',window.xulG.record.url,false);
-			req.send(null);
-			window.xulG.record.marc = req.responseText.replace(xmlDeclaration, '');
-		}
-
-		xml_record = new XML( window.xulG.record.marc );
-		if (xml_record..record[0]) xml_record = xml_record..record[0];
-
-		// Get the tooltip xml all async like
-		req =  new XMLHttpRequest();
-
-		// Set a default locale in case preferences fail us
-		var locale = "en-US";
-
-		// Try to get the locale from our preferences
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		try {
-			const Cc = Components.classes;
-			const Ci = Components.interfaces;
-			locale = Cc["@mozilla.org/preferences-service;1"].
-				getService(Ci.nsIPrefBranch).
-				getCharPref("general.useragent.locale");
-		}
-		catch (e) { }
-
-		// TODO: We should send a HEAD request to check for the existence of the desired file
-		// then fall back to the default locale if preferred locale is not necessary;
-		// however, for now we have a simplistic check:
-		//
-		// we currently have translations for only two locales; in the absence of a
-		// valid locale, default to the almighty en-US
-		if (locale != 'en-US' && locale != 'fr-CA') {
-			locale = 'en-US';
-		}
-
-		// Get the locale-specific tooltips
-		req.open('GET','/xul/server/locale/' + locale + '/marcedit-tooltips.xml',true);
-
-		context_menus = createComplexXULElement('popupset');
-		document.documentElement.appendChild( context_menus );
-
-		tag_menu = createPopup({position : 'after_start', id : 'tags_popup'});
-		context_menus.appendChild( tag_menu );
-
-		tag_menu.appendChild(
-			createMenuitem(
-				{ label : $('catStrings').getString('staff.cat.marcedit.add_row.label'),
-				  oncommand : 
-					'var e = document.createEvent("KeyEvents");' +
-					'e.initKeyEvent("keypress",1,1,null,1,0,0,0,13,0);' +
-					'current_focus.inputField.dispatchEvent(e);'
-				 }
-			)
-		);
-
-		tag_menu.appendChild(
-			createMenuitem(
-				{ label : $('catStrings').getString('staff.cat.marcedit.insert_row.label'),
-				  oncommand : 
-					'var e = document.createEvent("KeyEvents");' +
-					'e.initKeyEvent("keypress",1,1,null,1,0,1,0,13,0);' +
-					'current_focus.inputField.dispatchEvent(e);'
-				 }
-			)
-		);
-
-		tag_menu.appendChild(
-			createMenuitem(
-				{ label : $('catStrings').getString('staff.cat.marcedit.remove_row.label'),
-				  oncommand : 
-					'var e = document.createEvent("KeyEvents");' +
-					'e.initKeyEvent("keypress",1,1,null,1,0,0,0,46,0);' +
-					'current_focus.inputField.dispatchEvent(e);'
-				}
-			)
-		);
-
-		tag_menu.appendChild( createComplexXULElement( 'separator' ) );
-
-		tag_menu.appendChild(
-			createMenuitem(
-				{ label : $('catStrings').getString('staff.cat.marcedit.replace_006.label'),
-				  oncommand : 
-					'var e = document.createEvent("KeyEvents");' +
-					'e.initKeyEvent("keypress",1,1,null,1,0,0,0,64,0);' +
-					'current_focus.inputField.dispatchEvent(e);'
-				 }
-			)
-		);
-
-		tag_menu.appendChild(
-			createMenuitem(
-				{ label : $('catStrings').getString('staff.cat.marcedit.replace_007.label'),
-				  oncommand : 
-					'var e = document.createEvent("KeyEvents");' +
-					'e.initKeyEvent("keypress",1,1,null,1,0,0,0,65,0);' +
-					'current_focus.inputField.dispatchEvent(e);'
-				}
-			)
-		);
-
-		tag_menu.appendChild(
-			createMenuitem(
-				{ label : $('catStrings').getString('staff.cat.marcedit.replace_008.label'),
-				  oncommand : 
-					'var e = document.createEvent("KeyEvents");' +
-					'e.initKeyEvent("keypress",1,1,null,1,0,0,0,66,0);' +
-					'current_focus.inputField.dispatchEvent(e);'
-				}
-			)
-		);
-
-		tag_menu.appendChild( createComplexXULElement( 'separator' ) );
-
-		p = createComplexXULElement('popupset');
-		document.documentElement.appendChild( p );
-
-		req.onreadystatechange = function () {
-			if (req.readyState == 4) {
-				bib_data = new XML( req.responseText.replace(xmlDeclaration, '') );
-				genToolTips();
-			}
-		}
-		req.send(null);
-
-		loadRecord(xml_record);
+ try {
+
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+  JSAN.errorLevel = "die"; // none, warn, or die
+  JSAN.addRepository('/xul/server/');
+
+  // Fake xulG for standalone...
+  try {
+   window.xulG.record;
+  } catch (e) {
+   window.xulG = {};
+   window.xulG.record = {};
+   window.xulG.save = {};
+
+   window.xulG.save.label = $('catStrings').getString('staff.cat.marcedit.save.label');
+   window.xulG.save.func = function (r) { alert(r); }
+
+   var cgi = new CGI();
+   var _rid = cgi.param('record');
+   if (_rid) {
+    window.xulG.record.url = '/opac/extras/supercat/retrieve/marcxml/record/' + _rid;
+   }
+  }
+  // End faking part...
+
+  document.getElementById('save-button').setAttribute('label', window.xulG.save.label);
+  document.getElementById('save-button').setAttribute('oncommand',
+   'mangle_005(); ' + 
+   'var xml_string = xml_escape_unicode( xml_record.toXMLString() ); ' + 
+   'save_attempt( xml_string ); ' +
+   'loadRecord(xml_record);'
+  );
+
+  if (window.xulG.record.url) {
+   var req =  new XMLHttpRequest();
+   req.open('POST',window.xulG.record.url,false);
+   req.send(null);
+   window.xulG.record.marc = req.responseText.replace(xmlDeclaration, '');
+  }
+
+  xml_record = new XML( window.xulG.record.marc );
+  if (xml_record..record[0]) xml_record = xml_record..record[0];
+
+  // Get the tooltip xml all async like
+  req =  new XMLHttpRequest();
+
+  // Set a default locale in case preferences fail us
+  var locale = "en-US";
+
+  // Try to get the locale from our preferences
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  try {
+   const Cc = Components.classes;
+   const Ci = Components.interfaces;
+   locale = Cc["@mozilla.org/preferences-service;1"].
+    getService(Ci.nsIPrefBranch).
+    getCharPref("general.useragent.locale");
+  }
+  catch (e) { }
+
+  // TODO: We should send a HEAD request to check for the existence of the desired file
+  // then fall back to the default locale if preferred locale is not necessary;
+  // however, for now we have a simplistic check:
+  //
+  // we currently have translations for only two locales; in the absence of a
+  // valid locale, default to the almighty en-US
+  if (locale != 'en-US' && locale != 'fr-CA') {
+   locale = 'en-US';
+  }
+
+  // Get the locale-specific tooltips
+  req.open('GET','/xul/server/locale/' + locale + '/marcedit-tooltips.xml',true);
+
+  context_menus = createComplexXULElement('popupset');
+  document.documentElement.appendChild( context_menus );
+
+  tag_menu = createPopup({position : 'after_start', id : 'tags_popup'});
+  context_menus.appendChild( tag_menu );
+
+  tag_menu.appendChild(
+   createMenuitem(
+    { label : $('catStrings').getString('staff.cat.marcedit.add_row.label'),
+      oncommand : 
+     'var e = document.createEvent("KeyEvents");' +
+     'e.initKeyEvent("keypress",1,1,null,1,0,0,0,13,0);' +
+     'current_focus.inputField.dispatchEvent(e);'
+     }
+   )
+  );
+
+  tag_menu.appendChild(
+   createMenuitem(
+    { label : $('catStrings').getString('staff.cat.marcedit.insert_row.label'),
+      oncommand : 
+     'var e = document.createEvent("KeyEvents");' +
+     'e.initKeyEvent("keypress",1,1,null,1,0,1,0,13,0);' +
+     'current_focus.inputField.dispatchEvent(e);'
+     }
+   )
+  );
+
+  tag_menu.appendChild(
+   createMenuitem(
+    { label : $('catStrings').getString('staff.cat.marcedit.remove_row.label'),
+      oncommand : 
+     'var e = document.createEvent("KeyEvents");' +
+     'e.initKeyEvent("keypress",1,1,null,1,0,0,0,46,0);' +
+     'current_focus.inputField.dispatchEvent(e);'
+    }
+   )
+  );
+
+  tag_menu.appendChild( createComplexXULElement( 'separator' ) );
+
+  tag_menu.appendChild(
+   createMenuitem(
+    { label : $('catStrings').getString('staff.cat.marcedit.replace_006.label'),
+      oncommand : 
+     'var e = document.createEvent("KeyEvents");' +
+     'e.initKeyEvent("keypress",1,1,null,1,0,0,0,64,0);' +
+     'current_focus.inputField.dispatchEvent(e);'
+     }
+   )
+  );
+
+  tag_menu.appendChild(
+   createMenuitem(
+    { label : $('catStrings').getString('staff.cat.marcedit.replace_007.label'),
+      oncommand : 
+     'var e = document.createEvent("KeyEvents");' +
+     'e.initKeyEvent("keypress",1,1,null,1,0,0,0,65,0);' +
+     'current_focus.inputField.dispatchEvent(e);'
+    }
+   )
+  );
+
+  tag_menu.appendChild(
+   createMenuitem(
+    { label : $('catStrings').getString('staff.cat.marcedit.replace_008.label'),
+      oncommand : 
+     'var e = document.createEvent("KeyEvents");' +
+     'e.initKeyEvent("keypress",1,1,null,1,0,0,0,66,0);' +
+     'current_focus.inputField.dispatchEvent(e);'
+    }
+   )
+  );
+
+  tag_menu.appendChild( createComplexXULElement( 'separator' ) );
+
+  p = createComplexXULElement('popupset');
+  document.documentElement.appendChild( p );
+
+  req.onreadystatechange = function () {
+   if (req.readyState == 4) {
+    bib_data = new XML( req.responseText.replace(xmlDeclaration, '') );
+    genToolTips();
+   }
+  }
+  req.send(null);
+
+  loadRecord(xml_record);
 
         if (! xulG.fast_add_item) {
             document.getElementById('fastItemAdd_checkbox').hidden = true;
         }
         document.getElementById('fastItemAdd_textboxes').hidden = document.getElementById('fastItemAdd_checkbox').hidden || !document.getElementById('fastItemAdd_checkbox').checked;
 
-	} catch(E) {
-		alert('FIXME, MARC Editor, my_init: ' + E);
-	}
+ } catch(E) {
+  alert('FIXME, MARC Editor, my_init: ' + E);
+ }
 }
 
 
 function createComplexHTMLElement (e, attrs, objects, text) {
-	var l = document.createElementNS('http://www.w3.org/1999/xhtml',e);
+ var l = document.createElementNS('http://www.w3.org/1999/xhtml',e);
 
-	if (attrs) {
-		for (var i in attrs) l.setAttribute(i,attrs[i]);
-	}
+ if (attrs) {
+  for (var i in attrs) l.setAttribute(i,attrs[i]);
+ }
 
-	if (objects) {
-		for ( var i in objects ) l.appendChild( objects[i] );
-	}
+ if (objects) {
+  for ( var i in objects ) l.appendChild( objects[i] );
+ }
 
-	if (text) {
-		l.appendChild( document.createTextNode(text) )
-	}
+ if (text) {
+  l.appendChild( document.createTextNode(text) )
+ }
 
-	return l;
+ return l;
 }
 
 function createComplexXULElement (e, attrs, objects) {
-	var l = document.createElementNS('http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul',e);
-
-	if (attrs) {
-		for (var i in attrs) {
-			if (typeof attrs[i] == 'function') {
-				l.addEventListener( i, attrs[i], true );
-			} else {
-				l.setAttribute(i,attrs[i]);
-			}
-		}
-	} 
-
-	if (objects) {
-		for ( var i in objects ) l.appendChild( objects[i] );
-	}
-
-	return l;
+ var l = document.createElementNS('http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul',e);
+
+ if (attrs) {
+  for (var i in attrs) {
+   if (typeof attrs[i] == 'function') {
+    l.addEventListener( i, attrs[i], true );
+   } else {
+    l.setAttribute(i,attrs[i]);
+   }
+  }
+ } 
+
+ if (objects) {
+  for ( var i in objects ) l.appendChild( objects[i] );
+ }
+
+ return l;
 }
 
 function createDescription (attrs) {
-	return createComplexXULElement('description', attrs, Array.prototype.slice.apply(arguments, [1]) );
+ return createComplexXULElement('description', attrs, Array.prototype.slice.apply(arguments, [1]) );
 }
 
 function createTooltip (attrs) {
-	return createComplexXULElement('tooltip', attrs, Array.prototype.slice.apply(arguments, [1]) );
+ return createComplexXULElement('tooltip', attrs, Array.prototype.slice.apply(arguments, [1]) );
 }
 
 function createLabel (attrs) {
-	return createComplexXULElement('label', attrs, Array.prototype.slice.apply(arguments, [1]) );
+ return createComplexXULElement('label', attrs, Array.prototype.slice.apply(arguments, [1]) );
 }
 
 function createVbox (attrs) {
-	return createComplexXULElement('vbox', attrs, Array.prototype.slice.apply(arguments, [1]) );
+ return createComplexXULElement('vbox', attrs, Array.prototype.slice.apply(arguments, [1]) );
 }
 
 function createHbox (attrs) {
-	return createComplexXULElement('hbox', attrs, Array.prototype.slice.apply(arguments, [1]) );
+ return createComplexXULElement('hbox', attrs, Array.prototype.slice.apply(arguments, [1]) );
 }
 
 function createRow (attrs) {
-	return createComplexXULElement('row', attrs, Array.prototype.slice.apply(arguments, [1]) );
+ return createComplexXULElement('row', attrs, Array.prototype.slice.apply(arguments, [1]) );
 }
 
 function createTextbox (attrs) {
-	return createComplexXULElement('textbox', attrs, Array.prototype.slice.apply(arguments, [1]) );
+ return createComplexXULElement('textbox', attrs, Array.prototype.slice.apply(arguments, [1]) );
 }
 
 function createMenu (attrs) {
-	return createComplexXULElement('menu', attrs, Array.prototype.slice.apply(arguments, [1]) );
+ return createComplexXULElement('menu', attrs, Array.prototype.slice.apply(arguments, [1]) );
 }
 
 function createMenuPopup (attrs) {
-	return createComplexXULElement('menupopup', attrs, Array.prototype.slice.apply(arguments, [1]) );
+ return createComplexXULElement('menupopup', attrs, Array.prototype.slice.apply(arguments, [1]) );
 }
 
 function createPopup (attrs) {
-	return createComplexXULElement('popup', attrs, Array.prototype.slice.apply(arguments, [1]) );
+ return createComplexXULElement('popup', attrs, Array.prototype.slice.apply(arguments, [1]) );
 }
 
 function createMenuitem (attrs) {
-	return createComplexXULElement('menuitem', attrs, Array.prototype.slice.apply(arguments, [1]) );
+ return createComplexXULElement('menuitem', attrs, Array.prototype.slice.apply(arguments, [1]) );
 }
 
 function createCheckbox (attrs) {
-	return createComplexXULElement('checkbox', attrs, Array.prototype.slice.apply(arguments, [1]) );
+ return createComplexXULElement('checkbox', attrs, Array.prototype.slice.apply(arguments, [1]) );
 }
 
 function createMARCTextbox (element,attrs) {
 
-	var box = createComplexXULElement('textbox', attrs, Array.prototype.slice.apply(arguments, [2]) );
-	box.onkeypress = function (event) {
-		var root_node;
-		var node = element;
-		while(node = node.parent()) {
-			root_node = node;
-		}
-
-		var row = event.target;
-		while (row.tagName != 'row') row = row.parentNode;
-
-		if (element.nodeKind() == 'attribute') element[0]=box.value;
-		else element.setChildren( box.value );
-
-		if (element.localName() != 'controlfield') {
-			if ((event.charCode == 100 || event.charCode == 105) && event.ctrlKey) { // ctrl+d or ctrl+i
-
-				var index_sf, target, move_data;
-				if (element.localName() == 'subfield') {
-					index_sf = element;
-					target = event.target.parentNode;
-
-					var start = event.target.selectionStart;
-					var end = event.target.selectionEnd - event.target.selectionStart ?
-							event.target.selectionEnd :
-							event.target.value.length;
-
-					move_data = event.target.value.substring(start,end);
-					event.target.value = event.target.value.substring(0,start) + event.target.value.substring(end);
-					event.target.setAttribute('size', event.target.value.length + 2);
-	
-					element.setChildren( event.target.value );
-
-				} else if (element.localName() == 'code') {
-					index_sf = element.parent();
-					target = event.target.parentNode;
-				} else if (element.localName() == 'tag' || element.localName() == 'ind1' || element.localName() == 'ind2') {
-					index_sf = element.parent().children()[element.parent().children().length() - 1];
-					target = event.target.parentNode.lastChild.lastChild;
-				}
-
-				var sf = <subfield code="" xmlns="http://www.loc.gov/MARC21/slim">{ move_data }</subfield>;
-
-				index_sf.parent().insertChildAfter( index_sf, sf );
-
-				var new_sf = marcSubfield(sf);
-
-				if (target === target.parentNode.lastChild) {
-					target.parentNode.appendChild( new_sf );
-				} else {
-					target.parentNode.insertBefore( new_sf, target.nextSibling );
-				}
-
-				new_sf.firstChild.nextSibling.focus();
-
-				event.preventDefault();
-				return false;
-
-			} else if (event.keyCode == 13 || event.keyCode == 77) {
-				if (event.ctrlKey) { // ctrl+enter
-
-					var index;
-					if (element.localName() == 'subfield') index = element.parent();
-					if (element.localName() == 'code') index = element.parent().parent();
-					if (element.localName() == 'tag') index = element.parent();
-					if (element.localName() == 'ind1') index = element.parent();
-					if (element.localName() == 'ind2') index = element.parent();
-
-					var df = <datafield tag="" ind1="" ind2="" xmlns="http://www.loc.gov/MARC21/slim"><subfield code="" /></datafield>;
-
-					if (event.shiftKey) { // ctrl+shift+enter
-						index.parent().insertChildBefore( index, df );
-					} else {
-						index.parent().insertChildAfter( index, df );
-					}
-
-					var new_df = marcDatafield(df);
-
-					if (row.parentNode.lastChild === row) {
-						row.parentNode.appendChild( new_df );
-					} else {
-						if (event.shiftKey) { // ctrl+shift+enter
-							row.parentNode.insertBefore( new_df, row );
-						} else {
-							row.parentNode.insertBefore( new_df, row.nextSibling );
-						}
-					}
-
-					new_df.firstChild.focus();
-
-					event.preventDefault();
-					return false;
-
-				} else if (event.shiftKey) {
-					if (row.previousSibling.className.match('marcDatafieldRow'))
-						row.previousSibling.firstChild.focus();
-				} else {
-					row.nextSibling.firstChild.focus();
-				}
-
-			} else if (event.keyCode == 38 || event.keyCode == 40) { // up-arrow or down-arrow
-				if (event.ctrlKey) { // CTRL key: copy the field
-					var index;
-					if (element.localName() == 'subfield') index = element.parent();
-					if (element.localName() == 'code') index = element.parent().parent();
-					if (element.localName() == 'tag') index = element.parent();
-					if (element.localName() == 'ind1') index = element.parent();
-					if (element.localName() == 'ind2') index = element.parent();
-
-					var copyField = index.copy();
-
-					if (event.keyCode == 38) { // ctrl+up-arrow
-						index.parent().insertChildBefore( index, copyField );
-					} else {
-						index.parent().insertChildAfter( index, copyField );
-					}
-
-					var new_df = marcDatafield(copyField);
-
-					if (row.parentNode.lastChild === row) {
-						row.parentNode.appendChild( new_df );
-					} else {
-						if (event.keyCode == 38) { // ctrl+up-arrow
-							row.parentNode.insertBefore( new_df, row );
-						} else { // ctrl+down-arrow
-							row.parentNode.insertBefore( new_df, row.nextSibling );
-						}
-					}
-
-					new_df.firstChild.focus();
-
-					event.preventDefault();
-
-					return false;
-				}
-
-			} else if (event.keyCode == 46 && event.ctrlKey) { // ctrl+del
-
-				var index;
-				if (element.localName() == 'subfield') index = element.parent();
-				if (element.localName() == 'code') index = element.parent().parent();
-				if (element.localName() == 'tag') index = element.parent();
-				if (element.localName() == 'ind1') index = element.parent();
-				if (element.localName() == 'ind2') index = element.parent();
-
-				for (var i in index.parent().children()) {
-					if (index === index.parent().children()[i]) {
-						delete index.parent().children()[i];
-						break;
-					}
-				}
-
-				row.previousSibling.firstChild.focus();
-				row.parentNode.removeChild(row);
-
-				event.preventDefault();
-				return false;
-
-			} else if (event.keyCode == 46 && event.shiftKey) { // shift+del
-
-				var index;
-				if (element.localName() == 'subfield') index = element;
-				if (element.localName() == 'code') index = element.parent();
-
-				if (index) {
-					for (var i in index.parent().children()) {
-						if (index === index.parent().children()[i]) {
-							delete index.parent().children()[i];
-							break;
-						}
-					}
-
-					if (event.target.parentNode === event.target.parentNode.parentNode.lastChild) {
-						event.target.parentNode.previousSibling.lastChild.focus();
-					} else {
-						event.target.parentNode.nextSibling.firstChild.nextSibling.focus();
-					}
-
-					event.target.parentNode.parentNode.removeChild(event.target.parentNode);
-
-					event.preventDefault();
-					return false;
-				}
-			} else if (event.keyCode == 64 && event.ctrlKey) { // ctrl + F6
-				createControlField('006','                                        ');
-				loadRecord(xml_record);
-			} else if (event.keyCode == 65 && event.ctrlKey) { // ctrl + F7
-				createControlField('007','                                        ');
-				loadRecord(xml_record);
-			} else if (event.keyCode == 66 && event.ctrlKey) { // ctrl + F8
-				createControlField('008','                                        ');
-				loadRecord(xml_record);
-			}
-			return true;
-		}
-	};
-
-	box.addEventListener(
-		'keypress', 
-		function () {
-			if (element.nodeKind() == 'attribute') element[0]=box.value;
-			else element.setChildren( box.value );
-			return true;
-		},
-		false
-	);
-
-	box.addEventListener(
-		'change', 
-		function () {
-			if (element.nodeKind() == 'attribute') element[0]=box.value;
-			else element.setChildren( box.value );
-			return true;
-		},
-		false
-	);
-
-	box.addEventListener(
-		'keypress', 
-		function () {
-			if (element.nodeKind() == 'attribute') element[0]=box.value;
-			else element.setChildren( box.value );
-			return true;
-		},
-		true
-	);
-
-	box.addEventListener(
-		'keyup', 
-		function () {
-			if (element.localName() == 'controlfield')
-				eval('fillFixedFields(xml_record);');
-		},
-		true
-	);
-
-	return box;
+ var box = createComplexXULElement('textbox', attrs, Array.prototype.slice.apply(arguments, [2]) );
+ box.onkeypress = function (event) {
+  var root_node;
+  var node = element;
+  while(node = node.parent()) {
+   root_node = node;
+  }
+
+  var row = event.target;
+  while (row.tagName != 'row') row = row.parentNode;
+
+  if (element.nodeKind() == 'attribute') element[0]=box.value;
+  else element.setChildren( box.value );
+
+  if (element.localName() != 'controlfield') {
+   if ((event.charCode == 100 || event.charCode == 105) && event.ctrlKey) { // ctrl+d or ctrl+i
+
+    var index_sf, target, move_data;
+    if (element.localName() == 'subfield') {
+     index_sf = element;
+     target = event.target.parentNode;
+
+     var start = event.target.selectionStart;
+     var end = event.target.selectionEnd - event.target.selectionStart ?
+       event.target.selectionEnd :
+       event.target.value.length;
+
+     move_data = event.target.value.substring(start,end);
+     event.target.value = event.target.value.substring(0,start) + event.target.value.substring(end);
+     event.target.setAttribute('size', event.target.value.length + 2);
+ 
+     element.setChildren( event.target.value );
+
+    } else if (element.localName() == 'code') {
+     index_sf = element.parent();
+     target = event.target.parentNode;
+    } else if (element.localName() == 'tag' || element.localName() == 'ind1' || element.localName() == 'ind2') {
+     index_sf = element.parent().children()[element.parent().children().length() - 1];
+     target = event.target.parentNode.lastChild.lastChild;
+    }
+
+    var sf = <subfield code="" xmlns="http://www.loc.gov/MARC21/slim">{ move_data }</subfield>;
+
+    index_sf.parent().insertChildAfter( index_sf, sf );
+
+    var new_sf = marcSubfield(sf);
+
+    if (target === target.parentNode.lastChild) {
+     target.parentNode.appendChild( new_sf );
+    } else {
+     target.parentNode.insertBefore( new_sf, target.nextSibling );
+    }
+
+    new_sf.firstChild.nextSibling.focus();
+
+    event.preventDefault();
+    return false;
+
+   } else if (event.keyCode == 13 || event.keyCode == 77) {
+    if (event.ctrlKey) { // ctrl+enter
+
+     var index;
+     if (element.localName() == 'subfield') index = element.parent();
+     if (element.localName() == 'code') index = element.parent().parent();
+     if (element.localName() == 'tag') index = element.parent();
+     if (element.localName() == 'ind1') index = element.parent();
+     if (element.localName() == 'ind2') index = element.parent();
+
+     var df = <datafield tag="" ind1="" ind2="" xmlns="http://www.loc.gov/MARC21/slim"><subfield code="" /></datafield>;
+
+     if (event.shiftKey) { // ctrl+shift+enter
+      index.parent().insertChildBefore( index, df );
+     } else {
+      index.parent().insertChildAfter( index, df );
+     }
+
+     var new_df = marcDatafield(df);
+
+     if (row.parentNode.lastChild === row) {
+      row.parentNode.appendChild( new_df );
+     } else {
+      if (event.shiftKey) { // ctrl+shift+enter
+       row.parentNode.insertBefore( new_df, row );
+      } else {
+       row.parentNode.insertBefore( new_df, row.nextSibling );
+      }
+     }
+
+     new_df.firstChild.focus();
+
+     event.preventDefault();
+     return false;
+
+    } else if (event.shiftKey) {
+     if (row.previousSibling.className.match('marcDatafieldRow'))
+      row.previousSibling.firstChild.focus();
+    } else {
+     row.nextSibling.firstChild.focus();
+    }
+
+   } else if (event.keyCode == 38 || event.keyCode == 40) { // up-arrow or down-arrow
+    if (event.ctrlKey) { // CTRL key: copy the field
+     var index;
+     if (element.localName() == 'subfield') index = element.parent();
+     if (element.localName() == 'code') index = element.parent().parent();
+     if (element.localName() == 'tag') index = element.parent();
+     if (element.localName() == 'ind1') index = element.parent();
+     if (element.localName() == 'ind2') index = element.parent();
+
+     var copyField = index.copy();
+
+     if (event.keyCode == 38) { // ctrl+up-arrow
+      index.parent().insertChildBefore( index, copyField );
+     } else {
+      index.parent().insertChildAfter( index, copyField );
+     }
+
+     var new_df = marcDatafield(copyField);
+
+     if (row.parentNode.lastChild === row) {
+      row.parentNode.appendChild( new_df );
+     } else {
+      if (event.keyCode == 38) { // ctrl+up-arrow
+       row.parentNode.insertBefore( new_df, row );
+      } else { // ctrl+down-arrow
+       row.parentNode.insertBefore( new_df, row.nextSibling );
+      }
+     }
+
+     new_df.firstChild.focus();
+
+     event.preventDefault();
+
+     return false;
+    }
+
+   } else if (event.keyCode == 46 && event.ctrlKey) { // ctrl+del
+
+    var index;
+    if (element.localName() == 'subfield') index = element.parent();
+    if (element.localName() == 'code') index = element.parent().parent();
+    if (element.localName() == 'tag') index = element.parent();
+    if (element.localName() == 'ind1') index = element.parent();
+    if (element.localName() == 'ind2') index = element.parent();
+
+    for (var i in index.parent().children()) {
+     if (index === index.parent().children()[i]) {
+      delete index.parent().children()[i];
+      break;
+     }
+    }
+
+    row.previousSibling.firstChild.focus();
+    row.parentNode.removeChild(row);
+
+    event.preventDefault();
+    return false;
+
+   } else if (event.keyCode == 46 && event.shiftKey) { // shift+del
+
+    var index;
+    if (element.localName() == 'subfield') index = element;
+    if (element.localName() == 'code') index = element.parent();
+
+    if (index) {
+     for (var i in index.parent().children()) {
+      if (index === index.parent().children()[i]) {
+       delete index.parent().children()[i];
+       break;
+      }
+     }
+
+     if (event.target.parentNode === event.target.parentNode.parentNode.lastChild) {
+      event.target.parentNode.previousSibling.lastChild.focus();
+     } else {
+      event.target.parentNode.nextSibling.firstChild.nextSibling.focus();
+     }
+
+     event.target.parentNode.parentNode.removeChild(event.target.parentNode);
+
+     event.preventDefault();
+     return false;
+    }
+   } else if (event.keyCode == 64 && event.ctrlKey) { // ctrl + F6
+    createControlField('006','                                        ');
+    loadRecord(xml_record);
+   } else if (event.keyCode == 65 && event.ctrlKey) { // ctrl + F7
+    createControlField('007','                                        ');
+    loadRecord(xml_record);
+   } else if (event.keyCode == 66 && event.ctrlKey) { // ctrl + F8
+    createControlField('008','                                        ');
+    loadRecord(xml_record);
+   }
+   return true;
+  }
+ };
+
+ box.addEventListener(
+  'keypress', 
+  function () {
+   if (element.nodeKind() == 'attribute') element[0]=box.value;
+   else element.setChildren( box.value );
+   return true;
+  },
+  false
+ );
+
+ box.addEventListener(
+  'change', 
+  function () {
+   if (element.nodeKind() == 'attribute') element[0]=box.value;
+   else element.setChildren( box.value );
+   return true;
+  },
+  false
+ );
+
+ box.addEventListener(
+  'keypress', 
+  function () {
+   if (element.nodeKind() == 'attribute') element[0]=box.value;
+   else element.setChildren( box.value );
+   return true;
+  },
+  true
+ );
+
+ box.addEventListener(
+  'keyup', 
+  function () {
+   if (element.localName() == 'controlfield')
+    eval('fillFixedFields(xml_record);');
+  },
+  true
+ );
+
+ return box;
 }
 
 var rec_type = {
-	BKS : { Type : /[at]{1}/,	BLvl : /[acdm]{1}/ },
-	SER : { Type : /[a]{1}/,	BLvl : /[bs]{1}/ },
-	VIS : { Type : /[gkro]{1}/,	BLvl : /[abcdms]{1}/ },
-	MIX : { Type : /[p]{1}/,	BLvl : /[cd]{1}/ },
-	MAP : { Type : /[ef]{1}/,	BLvl : /[abcdms]{1}/ },
-	SCO : { Type : /[cd]{1}/,	BLvl : /[abcdms]{1}/ },
-	REC : { Type : /[ij]{1}/,	BLvl : /[abcdms]{1}/ },
-	COM : { Type : /[m]{1}/,	BLvl : /[abcdms]{1}/ }
+ BKS : { Type : /[at]{1}/, BLvl : /[acdm]{1}/ },
+ SER : { Type : /[a]{1}/, BLvl : /[bs]{1}/ },
+ VIS : { Type : /[gkro]{1}/, BLvl : /[abcdms]{1}/ },
+ MIX : { Type : /[p]{1}/, BLvl : /[cd]{1}/ },
+ MAP : { Type : /[ef]{1}/, BLvl : /[abcdms]{1}/ },
+ SCO : { Type : /[cd]{1}/, BLvl : /[abcdms]{1}/ },
+ REC : { Type : /[ij]{1}/, BLvl : /[abcdms]{1}/ },
+ COM : { Type : /[m]{1}/, BLvl : /[abcdms]{1}/ }
 };
 
 var ff_pos = {
-	TrAr : {
-		_8 : {
-			SCO : {start : 33, len : 1, def : ' ' },
-			REC : {start : 33, len : 1, def : 'n' }
-		},
-		_6 : {
-			SCO : {start : 16, len : 1, def : ' ' },
-			REC : {start : 16, len : 1, def : 'n' }
-		}
-	},
-	TMat : {
-		_8 : {
-			VIS : {start : 33, len : 1, def : ' ' }
-		},
-		_6 : {
-			VIS : {start : 16, len : 1, def : ' ' }
-		}
-	},
-	Time : {
-		_8 : {
-			VIS : {start : 18, len : 3, def : ' ' }
-		},
-		_6 : {
-			VIS : {start : 1, len : 3, def : ' ' }
-		}
-	},
-	Tech : {
-		_8 : {
-			VIS : {start : 34, len : 1, def : 'n' }
-		},
-		_6 : {
-			VIS : {start : 17, len : 1, def : 'n' }
-		}
-	},
-	SrTp : {
-		_8 : {
-			SER : {start : 21, len : 1, def : ' ' }
-		},
-		_6 : {
-			SER : {start : 4, len : 1, def : ' ' }
-		}
-	},
-	Srce : {
-		_8 : {
-			BKS : {start : 39, len : 1, def : 'd' },
-			SER : {start : 39, len : 1, def : 'd' },
-			VIS : {start : 39, len : 1, def : 'd' },
-			MIX : {start : 39, len : 1, def : 'd' },
-			MAP : {start : 39, len : 1, def : 'd' },
-			SCO : {start : 39, len : 1, def : 'd' },
-			REC : {start : 39, len : 1, def : 'd' },
-			COM : {start : 39, len : 1, def : 'd' }
-		}
-	},
-	SpFm : {
-		_8 : {
-			MAP : {start : 33, len : 2, def : ' ' }
-		},
-		_6 : {
-			MAP : {start : 16, len : 2, def : ' ' }
-		}
-	},
-	Relf : {
-		_8 : {
-			MAP : {start : 18, len : 4, def : ' ' }
-		},
-		_6 : {
-			MAP : {start : 1, len : 4, def : ' ' }
-		}
-	},
-	Regl : {
-		_8 : {
-			SER : {start : 19, len : 1, def : ' ' }
-		},
-		_6 : {
-			SER : {start : 2, len : 1, def : ' ' }
-		}
-	},
-	Proj : {
-		_8 : {
-			MAP : {start : 22, len : 2, def : ' ' }
-		},
-		_6 : {
-			MAP : {start : 5, len : 2, def : ' ' }
-		}
-	},
-	Part : {
-		_8 : {
-			SCO : {start : 21, len : 1, def : ' ' },
-			REC : {start : 21, len : 1, def : 'n' }
-		},
-		_6 : {
-			SCO : {start : 4, len : 1, def : ' ' },
-			REC : {start : 4, len : 1, def : 'n' }
-		}
-	},
-	Orig : {
-		_8 : {
-			SER : {start : 22, len : 1, def : ' ' }
-		},
-		_6 : {
-			SER : {start : 5, len : 1, def : ' ' }
-		}
-	},
-	LTxt : {
-		_8 : {
-			SCO : {start : 30, len : 2, def : ' ' },
-			REC : {start : 30, len : 2, def : ' ' }
-		},
-		_6 : {
-			SCO : {start : 13, len : 2, def : ' ' },
-			REC : {start : 13, len : 2, def : ' ' }
-		}
-	},
-	Freq : {
-		_8 : {
-			SER : {start : 18, len : 1, def : ' ' }
-		},
-		_6 : {
-			SER : {start : 1, len : 1, def : ' ' }
-		}
-	},
-	FMus : {
-		_8 : {
-			SCO : {start : 20, len : 1, def : ' ' },
-			REC : {start : 20, len : 1, def : 'n' }
-		},
-		_6 : {
-			SCO : {start : 3, len : 1, def : ' ' },
-			REC : {start : 3, len : 1, def : 'n' }
-		}
-	},
-	File : {
-		_8 : {
-			COM : {start : 26, len : 1, def : 'u' }
-		},
-		_6 : {
-			COM : {start : 9, len : 1, def : 'u' }
-		}
-	},
-	EntW : {
-		_8 : {
-			SER : {start : 24, len : 1, def : ' ' }
-		},
-		_6 : {
-			SER : {start : 7, len : 1, def : ' ' }
-		}
-	},
-	AccM : {
-		_8 : {
-			SCO : {start : 24, len : 6, def : ' ' },
-			REC : {start : 24, len : 6, def : ' ' }
-		},
-		_6 : {
-			SCO : {start : 7, len : 6, def : ' ' },
-			REC : {start : 7, len : 6, def : ' ' }
-		}
-	},
-	Comp : {
-		_8 : {
-			SCO : {start : 18, len : 2, def : ' ' },
-			REC : {start : 18, len : 2, def : ' ' }
-		},
-		_6 : {
-			SCO : {start : 1, len : 2, def : ' ' },
-			REC : {start : 1, len : 2, def : ' ' }
-		}
-	},
-	CrTp : {
-		_8 : {
-			MAP : {start : 25, len : 1, def : ' ' }
-		},
-		_6 : {
-			MAP : {start : 8, len : 1, def : ' ' }
-		}
-	},
-	Ctry : {
-		_8 : {
-			BKS : {start : 15, len : 3, def : ' ' },
-			SER : {start : 15, len : 3, def : ' ' },
-			VIS : {start : 15, len : 3, def : ' ' },
-			MIX : {start : 15, len : 3, def : ' ' },
-			MAP : {start : 15, len : 3, def : ' ' },
-			SCO : {start : 15, len : 3, def : ' ' },
-			REC : {start : 15, len : 3, def : ' ' },
-			COM : {start : 15, len : 3, def : ' ' }
-		}
-	},
-	Lang : {
-		_8 : {
-			BKS : {start : 35, len : 3, def : ' ' },
-			SER : {start : 35, len : 3, def : ' ' },
-			VIS : {start : 35, len : 3, def : ' ' },
-			MIX : {start : 35, len : 3, def : ' ' },
-			MAP : {start : 35, len : 3, def : ' ' },
-			SCO : {start : 35, len : 3, def : ' ' },
-			REC : {start : 35, len : 3, def : ' ' },
-			COM : {start : 35, len : 3, def : ' ' }
-		}
-	},
-	MRec : {
-		_8 : {
-			BKS : {start : 38, len : 1, def : ' ' },
-			SER : {start : 38, len : 1, def : ' ' },
-			VIS : {start : 38, len : 1, def : ' ' },
-			MIX : {start : 38, len : 1, def : ' ' },
-			MAP : {start : 38, len : 1, def : ' ' },
-			SCO : {start : 38, len : 1, def : ' ' },
-			REC : {start : 38, len : 1, def : ' ' },
-			COM : {start : 38, len : 1, def : ' ' }
-		}
-	},
-	DtSt : {
-		_8 : {
-			BKS : {start : 6, len : 1, def : ' ' },
-			SER : {start : 6, len : 1, def : 'c' },
-			VIS : {start : 6, len : 1, def : ' ' },
-			MIX : {start : 6, len : 1, def : ' ' },
-			MAP : {start : 6, len : 1, def : ' ' },
-			SCO : {start : 6, len : 1, def : ' ' },
-			REC : {start : 6, len : 1, def : ' ' },
-			COM : {start : 6, len : 1, def : ' ' }
-		}
-	},
-	Type : {
-		ldr : {
-			BKS : {start : 6, len : 1, def : 'a' },
-			SER : {start : 6, len : 1, def : 'a' },
-			VIS : {start : 6, len : 1, def : 'g' },
-			MIX : {start : 6, len : 1, def : 'p' },
-			MAP : {start : 6, len : 1, def : 'e' },
-			SCO : {start : 6, len : 1, def : 'c' },
-			REC : {start : 6, len : 1, def : 'i' },
-			COM : {start : 6, len : 1, def : 'm' }
-		}
-	},
-	Ctrl : {
-		ldr : {
-			BKS : {start : 8, len : 1, def : ' ' },
-			SER : {start : 8, len : 1, def : ' ' },
-			VIS : {start : 8, len : 1, def : ' ' },
-			MIX : {start : 8, len : 1, def : ' ' },
-			MAP : {start : 8, len : 1, def : ' ' },
-			SCO : {start : 8, len : 1, def : ' ' },
-			REC : {start : 8, len : 1, def : ' ' },
-			COM : {start : 8, len : 1, def : ' ' }
-		}
-	},
-	BLvl : {
-		ldr : {
-			BKS : {start : 7, len : 1, def : 'm' },
-			SER : {start : 7, len : 1, def : 's' },
-			VIS : {start : 7, len : 1, def : 'm' },
-			MIX : {start : 7, len : 1, def : 'c' },
-			MAP : {start : 7, len : 1, def : 'm' },
-			SCO : {start : 7, len : 1, def : 'm' },
-			REC : {start : 7, len : 1, def : 'm' },
-			COM : {start : 7, len : 1, def : 'm' }
-		}
-	},
-	Desc : {
-		ldr : {
-			BKS : {start : 18, len : 1, def : ' ' },
-			SER : {start : 18, len : 1, def : ' ' },
-			VIS : {start : 18, len : 1, def : ' ' },
-			MIX : {start : 18, len : 1, def : ' ' },
-			MAP : {start : 18, len : 1, def : ' ' },
-			SCO : {start : 18, len : 1, def : ' ' },
-			REC : {start : 18, len : 1, def : ' ' },
-			COM : {start : 18, len : 1, def : ' ' }
-		}
-	},
-	ELvl : {
-		ldr : {
-			BKS : {start : 17, len : 1, def : ' ' },
-			SER : {start : 17, len : 1, def : ' ' },
-			VIS : {start : 17, len : 1, def : ' ' },
-			MIX : {start : 17, len : 1, def : ' ' },
-			MAP : {start : 17, len : 1, def : ' ' },
-			SCO : {start : 17, len : 1, def : ' ' },
-			REC : {start : 17, len : 1, def : ' ' },
-			COM : {start : 17, len : 1, def : ' ' }
-		}
-	},
-	Indx : {
-		_8 : {
-			BKS : {start : 31, len : 1, def : '0' },
-			MAP : {start : 31, len : 1, def : '0' }
-		},
-		_6 : {
-			BKS : {start : 14, len : 1, def : '0' },
-			MAP : {start : 14, len : 1, def : '0' }
-		}
-	},
-	Date1 : {
-		_8 : {
-			BKS : {start : 7, len : 4, def : ' ' },
-			SER : {start : 7, len : 4, def : ' ' },
-			VIS : {start : 7, len : 4, def : ' ' },
-			MIX : {start : 7, len : 4, def : ' ' },
-			MAP : {start : 7, len : 4, def : ' ' },
-			SCO : {start : 7, len : 4, def : ' ' },
-			REC : {start : 7, len : 4, def : ' ' },
-			COM : {start : 7, len : 4, def : ' ' }
-		}
-	},
-	Date2 : {
-		_8 : {
-			BKS : {start : 11, len : 4, def : ' ' },
-			SER : {start : 11, len : 4, def : '9' },
-			VIS : {start : 11, len : 4, def : ' ' },
-			MIX : {start : 11, len : 4, def : ' ' },
-			MAP : {start : 11, len : 4, def : ' ' },
-			SCO : {start : 11, len : 4, def : ' ' },
-			REC : {start : 11, len : 4, def : ' ' },
-			COM : {start : 11, len : 4, def : ' ' }
-		}
-	},
-	LitF : {
-		_8 : {
-			BKS : {start : 33, len : 1, def : '0' }
-		},
-		_6 : {
-			BKS : {start : 16, len : 1, def : '0' }
-		}
-	},
-	Biog : {
-		_8 : {
-			BKS : {start : 34, len : 1, def : ' ' }
-		},
-		_6 : {
-			BKS : {start : 17, len : 1, def : ' ' }
-		}
-	},
-	Ills : {
-		_8 : {
-			BKS : {start : 18, len : 4, def : ' ' }
-		},
-		_6 : {
-			BKS : {start : 1, len : 4, def : ' ' }
-		}
-	},
-	Fest : {
-		_8 : {
-			BKS : {start : 30, len : 1, def : '0' }
-		},
-		_6 : {
-			BKS : {start : 13, len : 1, def : '0' }
-		}
-	},
-	Conf : {
-		_8 : {
-			BKS : {start : 29, len : 1, def : '0' },
-			SER : {start : 29, len : 1, def : '0' }
-		},
-		_6 : {
-			BKS : {start : 12, len : 1, def : '0' },
-			SER : {start : 12, len : 1, def : '0' }
-		}
-	},
-	Cont : {
-		_8 : {
-			BKS : {start : 24, len : 4, def : ' ' },
-			SER : {start : 25, len : 3, def : ' ' }
-		},
-		_6 : {
-			BKS : {start : 7, len : 4, def : ' ' },
-			SER : {start : 8, len : 3, def : ' ' }
-		}
-	},
-	GPub : {
-		_8 : {
-			BKS : {start : 28, len : 1, def : ' ' },
-			SER : {start : 28, len : 1, def : ' ' },
-			VIS : {start : 28, len : 1, def : ' ' },
-			MAP : {start : 28, len : 1, def : ' ' },
-			COM : {start : 28, len : 1, def : ' ' }
-		},
-		_6 : {
-			BKS : {start : 11, len : 1, def : ' ' },
-			SER : {start : 11, len : 1, def : ' ' },
-			VIS : {start : 11, len : 1, def : ' ' },
-			MAP : {start : 11, len : 1, def : ' ' },
-			COM : {start : 11, len : 1, def : ' ' }
-		}
-	},
-	Audn : {
-		_8 : {
-			BKS : {start : 22, len : 1, def : ' ' },
-			SER : {start : 22, len : 1, def : ' ' },
-			VIS : {start : 22, len : 1, def : ' ' },
-			SCO : {start : 22, len : 1, def : ' ' },
-			REC : {start : 22, len : 1, def : ' ' },
-			COM : {start : 22, len : 1, def : ' ' }
-		},
-		_6 : {
-			BKS : {start : 5, len : 1, def : ' ' },
-			SER : {start : 5, len : 1, def : ' ' },
-			VIS : {start : 5, len : 1, def : ' ' },
-			SCO : {start : 5, len : 1, def : ' ' },
-			REC : {start : 5, len : 1, def : ' ' },
-			COM : {start : 5, len : 1, def : ' ' }
-		}
-	},
-	Form : {
-		_8 : {
-			BKS : {start : 23, len : 1, def : ' ' },
-			SER : {start : 23, len : 1, def : ' ' },
-			VIS : {start : 29, len : 1, def : ' ' },
-			MIX : {start : 23, len : 1, def : ' ' },
-			MAP : {start : 29, len : 1, def : ' ' },
-			SCO : {start : 23, len : 1, def : ' ' },
-			REC : {start : 23, len : 1, def : ' ' }
-		},
-		_6 : {
-			BKS : {start : 6, len : 1, def : ' ' },
-			SER : {start : 6, len : 1, def : ' ' },
-			VIS : {start : 12, len : 1, def : ' ' },
-			MIX : {start : 6, len : 1, def : ' ' },
-			MAP : {start : 12, len : 1, def : ' ' },
-			SCO : {start : 6, len : 1, def : ' ' },
-			REC : {start : 6, len : 1, def : ' ' }
-		}
-	},
-	'S/L' : {
-		_8 : {
-			SER : {start : 34, len : 1, def : '0' }
-		},
-		_6 : {
-			SER : {start : 17, len : 1, def : '0' }
-		}
-	},
-	'Alph' : {
-		_8 : {
-			SER : {start : 33, len : 1, def : ' ' }
-		},
-		_6 : {
-			SER : {start : 16, len : 1, def : ' ' }
-		}
-	}
+ TrAr : {
+  _8 : {
+   SCO : {start : 33, len : 1, def : ' ' },
+   REC : {start : 33, len : 1, def : 'n' }
+  },
+  _6 : {
+   SCO : {start : 16, len : 1, def : ' ' },
+   REC : {start : 16, len : 1, def : 'n' }
+  }
+ },
+ TMat : {
+  _8 : {
+   VIS : {start : 33, len : 1, def : ' ' }
+  },
+  _6 : {
+   VIS : {start : 16, len : 1, def : ' ' }
+  }
+ },
+ Time : {
+  _8 : {
+   VIS : {start : 18, len : 3, def : ' ' }
+  },
+  _6 : {
+   VIS : {start : 1, len : 3, def : ' ' }
+  }
+ },
+ Tech : {
+  _8 : {
+   VIS : {start : 34, len : 1, def : 'n' }
+  },
+  _6 : {
+   VIS : {start : 17, len : 1, def : 'n' }
+  }
+ },
+ SrTp : {
+  _8 : {
+   SER : {start : 21, len : 1, def : ' ' }
+  },
+  _6 : {
+   SER : {start : 4, len : 1, def : ' ' }
+  }
+ },
+ Srce : {
+  _8 : {
+   BKS : {start : 39, len : 1, def : 'd' },
+   SER : {start : 39, len : 1, def : 'd' },
+   VIS : {start : 39, len : 1, def : 'd' },
+   MIX : {start : 39, len : 1, def : 'd' },
+   MAP : {start : 39, len : 1, def : 'd' },
+   SCO : {start : 39, len : 1, def : 'd' },
+   REC : {start : 39, len : 1, def : 'd' },
+   COM : {start : 39, len : 1, def : 'd' }
+  }
+ },
+ SpFm : {
+  _8 : {
+   MAP : {start : 33, len : 2, def : ' ' }
+  },
+  _6 : {
+   MAP : {start : 16, len : 2, def : ' ' }
+  }
+ },
+ Relf : {
+  _8 : {
+   MAP : {start : 18, len : 4, def : ' ' }
+  },
+  _6 : {
+   MAP : {start : 1, len : 4, def : ' ' }
+  }
+ },
+ Regl : {
+  _8 : {
+   SER : {start : 19, len : 1, def : ' ' }
+  },
+  _6 : {
+   SER : {start : 2, len : 1, def : ' ' }
+  }
+ },
+ Proj : {
+  _8 : {
+   MAP : {start : 22, len : 2, def : ' ' }
+  },
+  _6 : {
+   MAP : {start : 5, len : 2, def : ' ' }
+  }
+ },
+ Part : {
+  _8 : {
+   SCO : {start : 21, len : 1, def : ' ' },
+   REC : {start : 21, len : 1, def : 'n' }
+  },
+  _6 : {
+   SCO : {start : 4, len : 1, def : ' ' },
+   REC : {start : 4, len : 1, def : 'n' }
+  }
+ },
+ Orig : {
+  _8 : {
+   SER : {start : 22, len : 1, def : ' ' }
+  },
+  _6 : {
+   SER : {start : 5, len : 1, def : ' ' }
+  }
+ },
+ LTxt : {
+  _8 : {
+   SCO : {start : 30, len : 2, def : ' ' },
+   REC : {start : 30, len : 2, def : ' ' }
+  },
+  _6 : {
+   SCO : {start : 13, len : 2, def : ' ' },
+   REC : {start : 13, len : 2, def : ' ' }
+  }
+ },
+ Freq : {
+  _8 : {
+   SER : {start : 18, len : 1, def : ' ' }
+  },
+  _6 : {
+   SER : {start : 1, len : 1, def : ' ' }
+  }
+ },
+ FMus : {
+  _8 : {
+   SCO : {start : 20, len : 1, def : ' ' },
+   REC : {start : 20, len : 1, def : 'n' }
+  },
+  _6 : {
+   SCO : {start : 3, len : 1, def : ' ' },
+   REC : {start : 3, len : 1, def : 'n' }
+  }
+ },
+ File : {
+  _8 : {
+   COM : {start : 26, len : 1, def : 'u' }
+  },
+  _6 : {
+   COM : {start : 9, len : 1, def : 'u' }
+  }
+ },
+ EntW : {
+  _8 : {
+   SER : {start : 24, len : 1, def : ' ' }
+  },
+  _6 : {
+   SER : {start : 7, len : 1, def : ' ' }
+  }
+ },
+ AccM : {
+  _8 : {
+   SCO : {start : 24, len : 6, def : ' ' },
+   REC : {start : 24, len : 6, def : ' ' }
+  },
+  _6 : {
+   SCO : {start : 7, len : 6, def : ' ' },
+   REC : {start : 7, len : 6, def : ' ' }
+  }
+ },
+ Comp : {
+  _8 : {
+   SCO : {start : 18, len : 2, def : ' ' },
+   REC : {start : 18, len : 2, def : ' ' }
+  },
+  _6 : {
+   SCO : {start : 1, len : 2, def : ' ' },
+   REC : {start : 1, len : 2, def : ' ' }
+  }
+ },
+ CrTp : {
+  _8 : {
+   MAP : {start : 25, len : 1, def : ' ' }
+  },
+  _6 : {
+   MAP : {start : 8, len : 1, def : ' ' }
+  }
+ },
+ Ctry : {
+  _8 : {
+   BKS : {start : 15, len : 3, def : ' ' },
+   SER : {start : 15, len : 3, def : ' ' },
+   VIS : {start : 15, len : 3, def : ' ' },
+   MIX : {start : 15, len : 3, def : ' ' },
+   MAP : {start : 15, len : 3, def : ' ' },
+   SCO : {start : 15, len : 3, def : ' ' },
+   REC : {start : 15, len : 3, def : ' ' },
+   COM : {start : 15, len : 3, def : ' ' }
+  }
+ },
+ Lang : {
+  _8 : {
+   BKS : {start : 35, len : 3, def : ' ' },
+   SER : {start : 35, len : 3, def : ' ' },
+   VIS : {start : 35, len : 3, def : ' ' },
+   MIX : {start : 35, len : 3, def : ' ' },
+   MAP : {start : 35, len : 3, def : ' ' },
+   SCO : {start : 35, len : 3, def : ' ' },
+   REC : {start : 35, len : 3, def : ' ' },
+   COM : {start : 35, len : 3, def : ' ' }
+  }
+ },
+ MRec : {
+  _8 : {
+   BKS : {start : 38, len : 1, def : ' ' },
+   SER : {start : 38, len : 1, def : ' ' },
+   VIS : {start : 38, len : 1, def : ' ' },
+   MIX : {start : 38, len : 1, def : ' ' },
+   MAP : {start : 38, len : 1, def : ' ' },
+   SCO : {start : 38, len : 1, def : ' ' },
+   REC : {start : 38, len : 1, def : ' ' },
+   COM : {start : 38, len : 1, def : ' ' }
+  }
+ },
+ DtSt : {
+  _8 : {
+   BKS : {start : 6, len : 1, def : ' ' },
+   SER : {start : 6, len : 1, def : 'c' },
+   VIS : {start : 6, len : 1, def : ' ' },
+   MIX : {start : 6, len : 1, def : ' ' },
+   MAP : {start : 6, len : 1, def : ' ' },
+   SCO : {start : 6, len : 1, def : ' ' },
+   REC : {start : 6, len : 1, def : ' ' },
+   COM : {start : 6, len : 1, def : ' ' }
+  }
+ },
+ Type : {
+  ldr : {
+   BKS : {start : 6, len : 1, def : 'a' },
+   SER : {start : 6, len : 1, def : 'a' },
+   VIS : {start : 6, len : 1, def : 'g' },
+   MIX : {start : 6, len : 1, def : 'p' },
+   MAP : {start : 6, len : 1, def : 'e' },
+   SCO : {start : 6, len : 1, def : 'c' },
+   REC : {start : 6, len : 1, def : 'i' },
+   COM : {start : 6, len : 1, def : 'm' }
+  }
+ },
+ Ctrl : {
+  ldr : {
+   BKS : {start : 8, len : 1, def : ' ' },
+   SER : {start : 8, len : 1, def : ' ' },
+   VIS : {start : 8, len : 1, def : ' ' },
+   MIX : {start : 8, len : 1, def : ' ' },
+   MAP : {start : 8, len : 1, def : ' ' },
+   SCO : {start : 8, len : 1, def : ' ' },
+   REC : {start : 8, len : 1, def : ' ' },
+   COM : {start : 8, len : 1, def : ' ' }
+  }
+ },
+ BLvl : {
+  ldr : {
+   BKS : {start : 7, len : 1, def : 'm' },
+   SER : {start : 7, len : 1, def : 's' },
+   VIS : {start : 7, len : 1, def : 'm' },
+   MIX : {start : 7, len : 1, def : 'c' },
+   MAP : {start : 7, len : 1, def : 'm' },
+   SCO : {start : 7, len : 1, def : 'm' },
+   REC : {start : 7, len : 1, def : 'm' },
+   COM : {start : 7, len : 1, def : 'm' }
+  }
+ },
+ Desc : {
+  ldr : {
+   BKS : {start : 18, len : 1, def : ' ' },
+   SER : {start : 18, len : 1, def : ' ' },
+   VIS : {start : 18, len : 1, def : ' ' },
+   MIX : {start : 18, len : 1, def : ' ' },
+   MAP : {start : 18, len : 1, def : ' ' },
+   SCO : {start : 18, len : 1, def : ' ' },
+   REC : {start : 18, len : 1, def : ' ' },
+   COM : {start : 18, len : 1, def : ' ' }
+  }
+ },
+ ELvl : {
+  ldr : {
+   BKS : {start : 17, len : 1, def : ' ' },
+   SER : {start : 17, len : 1, def : ' ' },
+   VIS : {start : 17, len : 1, def : ' ' },
+   MIX : {start : 17, len : 1, def : ' ' },
+   MAP : {start : 17, len : 1, def : ' ' },
+   SCO : {start : 17, len : 1, def : ' ' },
+   REC : {start : 17, len : 1, def : ' ' },
+   COM : {start : 17, len : 1, def : ' ' }
+  }
+ },
+ Indx : {
+  _8 : {
+   BKS : {start : 31, len : 1, def : '0' },
+   MAP : {start : 31, len : 1, def : '0' }
+  },
+  _6 : {
+   BKS : {start : 14, len : 1, def : '0' },
+   MAP : {start : 14, len : 1, def : '0' }
+  }
+ },
+ Date1 : {
+  _8 : {
+   BKS : {start : 7, len : 4, def : ' ' },
+   SER : {start : 7, len : 4, def : ' ' },
+   VIS : {start : 7, len : 4, def : ' ' },
+   MIX : {start : 7, len : 4, def : ' ' },
+   MAP : {start : 7, len : 4, def : ' ' },
+   SCO : {start : 7, len : 4, def : ' ' },
+   REC : {start : 7, len : 4, def : ' ' },
+   COM : {start : 7, len : 4, def : ' ' }
+  }
+ },
+ Date2 : {
+  _8 : {
+   BKS : {start : 11, len : 4, def : ' ' },
+   SER : {start : 11, len : 4, def : '9' },
+   VIS : {start : 11, len : 4, def : ' ' },
+   MIX : {start : 11, len : 4, def : ' ' },
+   MAP : {start : 11, len : 4, def : ' ' },
+   SCO : {start : 11, len : 4, def : ' ' },
+   REC : {start : 11, len : 4, def : ' ' },
+   COM : {start : 11, len : 4, def : ' ' }
+  }
+ },
+ LitF : {
+  _8 : {
+   BKS : {start : 33, len : 1, def : '0' }
+  },
+  _6 : {
+   BKS : {start : 16, len : 1, def : '0' }
+  }
+ },
+ Biog : {
+  _8 : {
+   BKS : {start : 34, len : 1, def : ' ' }
+  },
+  _6 : {
+   BKS : {start : 17, len : 1, def : ' ' }
+  }
+ },
+ Ills : {
+  _8 : {
+   BKS : {start : 18, len : 4, def : ' ' }
+  },
+  _6 : {
+   BKS : {start : 1, len : 4, def : ' ' }
+  }
+ },
+ Fest : {
+  _8 : {
+   BKS : {start : 30, len : 1, def : '0' }
+  },
+  _6 : {
+   BKS : {start : 13, len : 1, def : '0' }
+  }
+ },
+ Conf : {
+  _8 : {
+   BKS : {start : 29, len : 1, def : '0' },
+   SER : {start : 29, len : 1, def : '0' }
+  },
+  _6 : {
+   BKS : {start : 12, len : 1, def : '0' },
+   SER : {start : 12, len : 1, def : '0' }
+  }
+ },
+ Cont : {
+  _8 : {
+   BKS : {start : 24, len : 4, def : ' ' },
+   SER : {start : 25, len : 3, def : ' ' }
+  },
+  _6 : {
+   BKS : {start : 7, len : 4, def : ' ' },
+   SER : {start : 8, len : 3, def : ' ' }
+  }
+ },
+ GPub : {
+  _8 : {
+   BKS : {start : 28, len : 1, def : ' ' },
+   SER : {start : 28, len : 1, def : ' ' },
+   VIS : {start : 28, len : 1, def : ' ' },
+   MAP : {start : 28, len : 1, def : ' ' },
+   COM : {start : 28, len : 1, def : ' ' }
+  },
+  _6 : {
+   BKS : {start : 11, len : 1, def : ' ' },
+   SER : {start : 11, len : 1, def : ' ' },
+   VIS : {start : 11, len : 1, def : ' ' },
+   MAP : {start : 11, len : 1, def : ' ' },
+   COM : {start : 11, len : 1, def : ' ' }
+  }
+ },
+ Audn : {
+  _8 : {
+   BKS : {start : 22, len : 1, def : ' ' },
+   SER : {start : 22, len : 1, def : ' ' },
+   VIS : {start : 22, len : 1, def : ' ' },
+   SCO : {start : 22, len : 1, def : ' ' },
+   REC : {start : 22, len : 1, def : ' ' },
+   COM : {start : 22, len : 1, def : ' ' }
+  },
+  _6 : {
+   BKS : {start : 5, len : 1, def : ' ' },
+   SER : {start : 5, len : 1, def : ' ' },
+   VIS : {start : 5, len : 1, def : ' ' },
+   SCO : {start : 5, len : 1, def : ' ' },
+   REC : {start : 5, len : 1, def : ' ' },
+   COM : {start : 5, len : 1, def : ' ' }
+  }
+ },
+ Form : {
+  _8 : {
+   BKS : {start : 23, len : 1, def : ' ' },
+   SER : {start : 23, len : 1, def : ' ' },
+   VIS : {start : 29, len : 1, def : ' ' },
+   MIX : {start : 23, len : 1, def : ' ' },
+   MAP : {start : 29, len : 1, def : ' ' },
+   SCO : {start : 23, len : 1, def : ' ' },
+   REC : {start : 23, len : 1, def : ' ' }
+  },
+  _6 : {
+   BKS : {start : 6, len : 1, def : ' ' },
+   SER : {start : 6, len : 1, def : ' ' },
+   VIS : {start : 12, len : 1, def : ' ' },
+   MIX : {start : 6, len : 1, def : ' ' },
+   MAP : {start : 12, len : 1, def : ' ' },
+   SCO : {start : 6, len : 1, def : ' ' },
+   REC : {start : 6, len : 1, def : ' ' }
+  }
+ },
+ 'S/L' : {
+  _8 : {
+   SER : {start : 34, len : 1, def : '0' }
+  },
+  _6 : {
+   SER : {start : 17, len : 1, def : '0' }
+  }
+ },
+ 'Alph' : {
+  _8 : {
+   SER : {start : 33, len : 1, def : ' ' }
+  },
+  _6 : {
+   SER : {start : 16, len : 1, def : ' ' }
+  }
+ }
 };
 
 function recordType (rec) {
-	try {
-		var _l = rec.leader.toString();
-
-		var _t = _l.substr(ff_pos.Type.ldr.BKS.start, ff_pos.Type.ldr.BKS.len);
-		var _b = _l.substr(ff_pos.BLvl.ldr.BKS.start, ff_pos.BLvl.ldr.BKS.len);
-
-		for (var t in rec_type) {
-			if (_t.match(rec_type[t].Type) && _b.match(rec_type[t].BLvl)) {
-				document.getElementById('recordTypeLabel').value = t;
-				_record_type = t;
-				return t;
-			}
-		}
-
-		// in case we don't have a valid record type ...
-		_record_type = 'BKS';
-		return _record_type;
-
-	} catch(E) {
-		alert('FIXME, MARC Editor, recordType: ' + E);
-	}
+ try {
+  var _l = rec.leader.toString();
+
+  var _t = _l.substr(ff_pos.Type.ldr.BKS.start, ff_pos.Type.ldr.BKS.len);
+  var _b = _l.substr(ff_pos.BLvl.ldr.BKS.start, ff_pos.BLvl.ldr.BKS.len);
+
+  for (var t in rec_type) {
+   if (_t.match(rec_type[t].Type) && _b.match(rec_type[t].BLvl)) {
+    document.getElementById('recordTypeLabel').value = t;
+    _record_type = t;
+    return t;
+   }
+  }
+
+  // in case we don't have a valid record type ...
+  _record_type = 'BKS';
+  return _record_type;
+
+ } catch(E) {
+  alert('FIXME, MARC Editor, recordType: ' + E);
+ }
 }
 
 function toggleFFE () {
-	var grid = document.getElementById('leaderGrid');
-	if (grid.hidden) {
-		grid.hidden = false;
-	} else {
-		grid.hidden = true;
-	}
-	return true;
+ var grid = document.getElementById('leaderGrid');
+ if (grid.hidden) {
+  grid.hidden = false;
+ } else {
+  grid.hidden = true;
+ }
+ return true;
 }
 
 function changeFFEditor (type) {
-	var grid = document.getElementById('leaderGrid');
-	grid.setAttribute('type',type);
+ var grid = document.getElementById('leaderGrid');
+ grid.setAttribute('type',type);
 }
 
 function fillFixedFields (rec) {
-	try {
-			var grid = document.getElementById('leaderGrid');
-
-			var rtype = _record_type;
-
-			var _l = rec.leader.toString();
-			var _6 = rec.controlfield.(@tag=='006').toString();
-			var _7 = rec.controlfield.(@tag=='007').toString();
-			var _8 = rec.controlfield.(@tag=='008').toString();
-
-			var list = [];
-			var pre_list = grid.getElementsByTagName('label');
-			for (var i in pre_list) {
-				if ( pre_list[i].getAttribute && pre_list[i].getAttribute('set').indexOf(grid.getAttribute('type')) > -1 ) {
-					list.push( pre_list[i] );
-				}
-			}
-
-			for (var i in list) {
-				var name = list[i].getAttribute('name');
-
-				if (!ff_pos[name])
-					continue;
-
-				var value = '';
-				if ( ff_pos[name].ldr && ff_pos[name].ldr[rtype] )
-					value = _l.substr(ff_pos[name].ldr[rtype].start, ff_pos[name].ldr[rtype].len);
-
-				if ( ff_pos[name]._8 && ff_pos[name]._8[rtype] )
-					value = _8.substr(ff_pos[name]._8[rtype].start, ff_pos[name]._8[rtype].len);
-
-				if ( !value && ff_pos[name]._6 && ff_pos[name]._6[rtype] )
-					value = _6.substr(ff_pos[name]._6[rtype].start, ff_pos[name]._6[rtype].len);
-
-				if ( ff_pos[name]._7 && ff_pos[name]._7[rtype] )
-					value = _7.substr(ff_pos[name]._7[rtype].start, ff_pos[name]._7[rtype].len);
-				
-				if (!value) {
-					var d;
-					var p;
-					if (ff_pos[name].ldr && ff_pos[name].ldr[rtype]) {
-						d = ff_pos[name].ldr[rtype].def;
-						p = 'ldr';
-					}
-
-					if (ff_pos[name]._8 && ff_pos[name]._8[rtype]) {
-						d = ff_pos[name]._8[rtype].def;
-						p = '_8';
-					}
-
-					if (!value && ff_pos[name]._6 && ff_pos[name]._6[rtype]) {
-						d = ff_pos[name]._6[rtype].def;
-						p = '_6';
-					}
-
-					if (ff_pos[name]._7 && ff_pos[name]._7[rtype]) {
-						d = ff_pos[name]._7[rtype].def;
-						p = '_7';
-					}
-
-					if (!value) {
-						for (var j = 0; j < ff_pos[name][p][rtype].len; j++) {
-							value += d;
-						}
-					}
-				}
-
-				list[i].nextSibling.value = value;
-			}
-
-			return true;
-	} catch(E) {
-		alert('FIXME, MARC Editor, fillFixedFields: ' + E);
-	}
+ try {
+   var grid = document.getElementById('leaderGrid');
+
+   var rtype = _record_type;
+
+   var _l = rec.leader.toString();
+   var _6 = rec.controlfield.(@tag=='006').toString();
+   var _7 = rec.controlfield.(@tag=='007').toString();
+   var _8 = rec.controlfield.(@tag=='008').toString();
+
+   var list = [];
+   var pre_list = grid.getElementsByTagName('label');
+   for (var i in pre_list) {
+    if ( pre_list[i].getAttribute && pre_list[i].getAttribute('set').indexOf(grid.getAttribute('type')) > -1 ) {
+     list.push( pre_list[i] );
+    }
+   }
+
+   for (var i in list) {
+    var name = list[i].getAttribute('name');
+
+    if (!ff_pos[name])
+     continue;
+
+    var value = '';
+    if ( ff_pos[name].ldr && ff_pos[name].ldr[rtype] )
+     value = _l.substr(ff_pos[name].ldr[rtype].start, ff_pos[name].ldr[rtype].len);
+
+    if ( ff_pos[name]._8 && ff_pos[name]._8[rtype] )
+     value = _8.substr(ff_pos[name]._8[rtype].start, ff_pos[name]._8[rtype].len);
+
+    if ( !value && ff_pos[name]._6 && ff_pos[name]._6[rtype] )
+     value = _6.substr(ff_pos[name]._6[rtype].start, ff_pos[name]._6[rtype].len);
+
+    if ( ff_pos[name]._7 && ff_pos[name]._7[rtype] )
+     value = _7.substr(ff_pos[name]._7[rtype].start, ff_pos[name]._7[rtype].len);
+    
+    if (!value) {
+     var d;
+     var p;
+     if (ff_pos[name].ldr && ff_pos[name].ldr[rtype]) {
+      d = ff_pos[name].ldr[rtype].def;
+      p = 'ldr';
+     }
+
+     if (ff_pos[name]._8 && ff_pos[name]._8[rtype]) {
+      d = ff_pos[name]._8[rtype].def;
+      p = '_8';
+     }
+
+     if (!value && ff_pos[name]._6 && ff_pos[name]._6[rtype]) {
+      d = ff_pos[name]._6[rtype].def;
+      p = '_6';
+     }
+
+     if (ff_pos[name]._7 && ff_pos[name]._7[rtype]) {
+      d = ff_pos[name]._7[rtype].def;
+      p = '_7';
+     }
+
+     if (!value) {
+      for (var j = 0; j < ff_pos[name][p][rtype].len; j++) {
+       value += d;
+      }
+     }
+    }
+
+    list[i].nextSibling.value = value;
+   }
+
+   return true;
+ } catch(E) {
+  alert('FIXME, MARC Editor, fillFixedFields: ' + E);
+ }
 }
 
 function updateFixedFields (element) {
-	var grid = document.getElementById('leaderGrid');
-	var recGrid = document.getElementById('recGrid');
+ var grid = document.getElementById('leaderGrid');
+ var recGrid = document.getElementById('recGrid');
 
-	var rtype = _record_type;
-	var new_value = element.value;
+ var rtype = _record_type;
+ var new_value = element.value;
 
-	var parts = {
-		ldr : _record.leader,
-		_6 : _record.controlfield.(@tag=='006'),
-		_7 : _record.controlfield.(@tag=='007'),
-		_8 : _record.controlfield.(@tag=='008')
-	};
+ var parts = {
+  ldr : _record.leader,
+  _6 : _record.controlfield.(@tag=='006'),
+  _7 : _record.controlfield.(@tag=='007'),
+  _8 : _record.controlfield.(@tag=='008')
+ };
 
-	var name = element.getAttribute('name');
-	for (var i in ff_pos[name]) {
+ var name = element.getAttribute('name');
+ for (var i in ff_pos[name]) {
 
-		if (!ff_pos[name][i][rtype]) continue;
-		if (!parts[i]) {
-			// we're missing the required field.  Add it now.
+  if (!ff_pos[name][i][rtype]) continue;
+  if (!parts[i]) {
+   // we're missing the required field.  Add it now.
 
-			var newfield;
-			if (i == '_6') newfield = '006';
-			else if (i == '_7') newfield = '007';
-			else if (i == '_8') newfield = '008';
-			else continue;
+   var newfield;
+   if (i == '_6') newfield = '006';
+   else if (i == '_7') newfield = '007';
+   else if (i == '_8') newfield = '008';
+   else continue;
 
-			createControlField(newfield,'                                        ');
-			parts[i] = _record.controlfield.(@tag==newfield);
-		}
+   createControlField(newfield,'                                        ');
+   parts[i] = _record.controlfield.(@tag==newfield);
+  }
 
-		var before = parts[i].substr(0, ff_pos[name][i][rtype].start);
-		var after = parts[i].substr(ff_pos[name][i][rtype].start + ff_pos[name][i][rtype].len);
+  var before = parts[i].substr(0, ff_pos[name][i][rtype].start);
+  var after = parts[i].substr(ff_pos[name][i][rtype].start + ff_pos[name][i][rtype].len);
 
-		for (var j = 0; new_value.length < ff_pos[name][i][rtype].len; j++) {
-			new_value += ff_pos[name][i][rtype].def;
-		}
+  for (var j = 0; new_value.length < ff_pos[name][i][rtype].len; j++) {
+   new_value += ff_pos[name][i][rtype].def;
+  }
 
-		parts[i].setChildren( before + new_value + after );
-		recGrid.getElementsByAttribute('tag',i)[0].lastChild.value = parts[i].toString();
-	}
+  parts[i].setChildren( before + new_value + after );
+  recGrid.getElementsByAttribute('tag',i)[0].lastChild.value = parts[i].toString();
+ }
 
-	return true;
+ return true;
 }
 
 function marcLeader (leader) {
-	var row = createRow(
-		{ class : 'marcLeaderRow',
-		  tag : 'ldr' },
-		createLabel(
-			{ value : 'LDR',
-			  class : 'marcTag',
-			  tooltiptext : $('catStrings').getString('staff.cat.marcedit.marcTag.LDR.label') } ),
-		createLabel(
-			{ value : '',
-			  class : 'marcInd1' } ),
-		createLabel(
-			{ value : '',
-			  class : 'marcInd2' } ),
-		createLabel(
-			{ value : leader.text(),
-			  class : 'marcLeader' } )
-	);
-
-	return row;
+ var row = createRow(
+  { class : 'marcLeaderRow',
+    tag : 'ldr' },
+  createLabel(
+   { value : 'LDR',
+     class : 'marcTag',
+     tooltiptext : $('catStrings').getString('staff.cat.marcedit.marcTag.LDR.label') } ),
+  createLabel(
+   { value : '',
+     class : 'marcInd1' } ),
+  createLabel(
+   { value : '',
+     class : 'marcInd2' } ),
+  createLabel(
+   { value : leader.text(),
+     class : 'marcLeader' } )
+ );
+
+ return row;
 }
 
 function marcControlfield (field) {
-	tagname = field.@tag.toString().substr(2);
-	var row;
-	if (tagname == '1' || tagname == '3' || tagname == '6' || tagname == '7' || tagname == '8') {
-		row = createRow(
-			{ class : 'marcControlfieldRow',
-			  tag : '_' + tagname },
-			createLabel(
-				{ value : field.@tag,
-				  class : 'marcTag',
-				  context : 'tags_popup',
-				  onmouseover : 'getTooltip(this, "tag");',
-				  tooltipid : 'tag' + field.@tag } ),
-			createLabel(
-				{ value : field.@ind1,
-				  class : 'marcInd1',
-				  onmouseover : 'getTooltip(this, "ind1");',
-				  tooltipid : 'tag' + field.@tag + 'ind1val' + field.@ind1 } ),
-			createLabel(
-				{ value : field.@ind2,
-				  class : 'marcInd2',
-				  onmouseover : 'getTooltip(this, "ind2");',
-				  tooltipid : 'tag' + field.@tag + 'ind2val' + field.@ind2 } ),
-			createMARCTextbox(
-				field,
-				{ value : field.text(),
-				  class : 'plain marcEditableControlfield',
-				  name : 'CONTROL' + tagname,
-				  context : 'clipboard',
-				  size : 50,
-				  maxlength : 50 } )
-			);
-	} else {
-		row = createRow(
-			{ class : 'marcControlfieldRow',
-			  tag : '_' + tagname },
-			createLabel(
-				{ value : field.@tag,
-				  class : 'marcTag',
-				  onmouseover : 'getTooltip(this, "tag");',
-				  tooltipid : 'tag' + field.@tag } ),
-			createLabel(
-				{ value : field.@ind1,
-				  class : 'marcInd1',
-				  onmouseover : 'getTooltip(this, "ind1");',
-				  tooltipid : 'tag' + field.@tag + 'ind1val' + field.@ind1 } ),
-			createLabel(
-				{ value : field.@ind2,
-				  class : 'marcInd2',
-				  onmouseover : 'getTooltip(this, "ind2");',
-				  tooltipid : 'tag' + field.@tag + 'ind2val' + field.@ind2 } ),
-			createLabel(
-				{ value : field.text(),
-				  class : 'marcControlfield' } )
-		);
-	}
-
-	return row;
+ tagname = field.@tag.toString().substr(2);
+ var row;
+ if (tagname == '1' || tagname == '3' || tagname == '6' || tagname == '7' || tagname == '8') {
+  row = createRow(
+   { class : 'marcControlfieldRow',
+     tag : '_' + tagname },
+   createLabel(
+    { value : field.@tag,
+      class : 'marcTag',
+      context : 'tags_popup',
+      onmouseover : 'getTooltip(this, "tag");',
+      tooltipid : 'tag' + field.@tag } ),
+   createLabel(
+    { value : field.@ind1,
+      class : 'marcInd1',
+      onmouseover : 'getTooltip(this, "ind1");',
+      tooltipid : 'tag' + field.@tag + 'ind1val' + field.@ind1 } ),
+   createLabel(
+    { value : field.@ind2,
+      class : 'marcInd2',
+      onmouseover : 'getTooltip(this, "ind2");',
+      tooltipid : 'tag' + field.@tag + 'ind2val' + field.@ind2 } ),
+   createMARCTextbox(
+    field,
+    { value : field.text(),
+      class : 'plain marcEditableControlfield',
+      name : 'CONTROL' + tagname,
+      context : 'clipboard',
+      size : 50,
+      maxlength : 50 } )
+   );
+ } else {
+  row = createRow(
+   { class : 'marcControlfieldRow',
+     tag : '_' + tagname },
+   createLabel(
+    { value : field.@tag,
+      class : 'marcTag',
+      onmouseover : 'getTooltip(this, "tag");',
+      tooltipid : 'tag' + field.@tag } ),
+   createLabel(
+    { value : field.@ind1,
+      class : 'marcInd1',
+      onmouseover : 'getTooltip(this, "ind1");',
+      tooltipid : 'tag' + field.@tag + 'ind1val' + field.@ind1 } ),
+   createLabel(
+    { value : field.@ind2,
+      class : 'marcInd2',
+      onmouseover : 'getTooltip(this, "ind2");',
+      tooltipid : 'tag' + field.@tag + 'ind2val' + field.@ind2 } ),
+   createLabel(
+    { value : field.text(),
+      class : 'marcControlfield' } )
+  );
+ }
+
+ return row;
 }
 
 function stackSubfields(checkbox) {
-	var list = document.getElementsByAttribute('name','sf_box');
-
-	var o = 'vertical';
-	if (!checkbox.checked) o = 'horizontal';
-	
-	for (var i = 0; i < list.length; i++) {
-		if (list[i]) list[i].setAttribute('orient',o);
-	}
+ var list = document.getElementsByAttribute('name','sf_box');
+
+ var o = 'vertical';
+ if (!checkbox.checked) o = 'horizontal';
+ 
+ for (var i = 0; i < list.length; i++) {
+  if (list[i]) list[i].setAttribute('orient',o);
+ }
 }
 
 function fastItemAdd_toggle(checkbox) {
@@ -1324,769 +1324,769 @@ function save_attempt(xml_string) {
 }
 
 function marcDatafield (field) {
-	var row = createRow(
-		{ class : 'marcDatafieldRow' },
-		createMARCTextbox(
-			field.@tag,
-			{ value : field.@tag,
-			  class : 'plain marcTag',
-			  name : 'marcTag',
-			  context : 'tags_popup',
-			  oninput : 'if (this.value.length == 3) { this.nextSibling.focus(); }',
-			  size : 3,
-			  maxlength : 3,
-			  onmouseover : 'current_focus = this; getTooltip(this, "tag");' } ),
-		createMARCTextbox(
-			field.@ind1,
-			{ value : field.@ind1,
-			  class : 'plain marcInd1',
-			  name : 'marcInd1',
-			  oninput : 'if (this.value.length == 1) { this.nextSibling.focus(); }',
-			  size : 1,
-			  maxlength : 1,
-			  onmouseover : 'current_focus = this; getContextMenu(this, "ind1"); getTooltip(this, "ind1");',
-			  oncontextmenu : 'getContextMenu(this, "ind1");' } ),
-		createMARCTextbox(
-			field.@ind2,
-			{ value : field.@ind2,
-			  class : 'plain marcInd2',
-			  name : 'marcInd2',
-			  oninput : 'if (this.value.length == 1) { this.nextSibling.firstChild.firstChild.focus(); }',
-			  size : 1,
-			  maxlength : 1,
-			  onmouseover : 'current_focus = this; getContextMenu(this, "ind2"); getTooltip(this, "ind2");',
-			  oncontextmenu : 'getContextMenu(this, "ind2");' } ),
-		createHbox({ name : 'sf_box' })
-	);
-
-	if (!current_focus && field.@tag == '') current_focus = row.childNodes[0];
-	if (!current_focus && field.@ind1 == '') current_focus = row.childNodes[1];
-	if (!current_focus && field.@ind2 == '') current_focus = row.childNodes[2];
-
-	var sf_box = row.lastChild;
-	if (document.getElementById('stackSubfields').checked)
-		sf_box.setAttribute('orient','vertical');
-
-	sf_box.addEventListener(
-		'click',
-		function (e) {
-			if (sf_box === e.target) {
-				sf_box.lastChild.lastChild.focus();
-			} else if (e.target.parentNode === sf_box) {
-				e.target.lastChild.focus();
-			}
-		},
-		false
-	);
-
-
-	for (var i in field.subfield) {
-		var sf = field.subfield[i];
-		sf_box.appendChild(
-			marcSubfield(sf)
-		);
-
-		if (sf.@code == '' && (!current_focus || current_focus.className.match(/Ind/)))
-			current_focus = sf_box.lastChild.childNodes[1];
-	}
-
-	return row;
+ var row = createRow(
+  { class : 'marcDatafieldRow' },
+  createMARCTextbox(
+   field.@tag,
+   { value : field.@tag,
+     class : 'plain marcTag',
+     name : 'marcTag',
+     context : 'tags_popup',
+     oninput : 'if (this.value.length == 3) { this.nextSibling.focus(); }',
+     size : 3,
+     maxlength : 3,
+     onmouseover : 'current_focus = this; getTooltip(this, "tag");' } ),
+  createMARCTextbox(
+   field.@ind1,
+   { value : field.@ind1,
+     class : 'plain marcInd1',
+     name : 'marcInd1',
+     oninput : 'if (this.value.length == 1) { this.nextSibling.focus(); }',
+     size : 1,
+     maxlength : 1,
+     onmouseover : 'current_focus = this; getContextMenu(this, "ind1"); getTooltip(this, "ind1");',
+     oncontextmenu : 'getContextMenu(this, "ind1");' } ),
+  createMARCTextbox(
+   field.@ind2,
+   { value : field.@ind2,
+     class : 'plain marcInd2',
+     name : 'marcInd2',
+     oninput : 'if (this.value.length == 1) { this.nextSibling.firstChild.firstChild.focus(); }',
+     size : 1,
+     maxlength : 1,
+     onmouseover : 'current_focus = this; getContextMenu(this, "ind2"); getTooltip(this, "ind2");',
+     oncontextmenu : 'getContextMenu(this, "ind2");' } ),
+  createHbox({ name : 'sf_box' })
+ );
+
+ if (!current_focus && field.@tag == '') current_focus = row.childNodes[0];
+ if (!current_focus && field.@ind1 == '') current_focus = row.childNodes[1];
+ if (!current_focus && field.@ind2 == '') current_focus = row.childNodes[2];
+
+ var sf_box = row.lastChild;
+ if (document.getElementById('stackSubfields').checked)
+  sf_box.setAttribute('orient','vertical');
+
+ sf_box.addEventListener(
+  'click',
+  function (e) {
+   if (sf_box === e.target) {
+    sf_box.lastChild.lastChild.focus();
+   } else if (e.target.parentNode === sf_box) {
+    e.target.lastChild.focus();
+   }
+  },
+  false
+ );
+
+
+ for (var i in field.subfield) {
+  var sf = field.subfield[i];
+  sf_box.appendChild(
+   marcSubfield(sf)
+  );
+
+  if (sf.@code == '' && (!current_focus || current_focus.className.match(/Ind/)))
+   current_focus = sf_box.lastChild.childNodes[1];
+ }
+
+ return row;
 }
 
-function marcSubfield (sf) {			
-	return createHbox(
-		{ class : 'marcSubfieldBox' },
-		createLabel(
-			{ value : "\u2021",
-			  class : 'plain marcSubfieldDelimiter',
-			  onmouseover : 'getTooltip(this.nextSibling, "subfield");',
-			  oncontextmenu : 'getContextMenu(this.nextSibling, "subfield");',
-	  		  //onclick : 'this.nextSibling.focus();',
-	  		  onfocus : 'this.nextSibling.focus();',
-			  size : 2 } ),
-		createMARCTextbox(
-			sf.@code,
-			{ value : sf.@code,
-			  class : 'plain marcSubfieldCode',
-			  name : 'marcSubfieldCode',
-			  onmouseover : 'current_focus = this; getContextMenu(this, "subfield"); getTooltip(this, "subfield");',
-			  oncontextmenu : 'getContextMenu(this, "subfield");',
-			  oninput : 'if (this.value.length == 1) { this.nextSibling.focus(); }',
-			  size : 2,
-			  maxlength : 1 } ),
-		createMARCTextbox(
-			sf,
-			{ value : sf.text(),
-			  name : sf.parent().@tag + ':' + sf.@code,
-			  class : 'plain marcSubfield', 
-			  onmouseover : 'getTooltip(this, "subfield");',
-			  contextmenu : function (event) { getAuthorityContextMenu(event.target, sf) },
-			  size : new String(sf.text()).length + 2,
-			  oninput : "this.setAttribute('size', this.value.length + 2);"
-			} )
-	);
+function marcSubfield (sf) {   
+ return createHbox(
+  { class : 'marcSubfieldBox' },
+  createLabel(
+   { value : "\u2021",
+     class : 'plain marcSubfieldDelimiter',
+     onmouseover : 'getTooltip(this.nextSibling, "subfield");',
+     oncontextmenu : 'getContextMenu(this.nextSibling, "subfield");',
+       //onclick : 'this.nextSibling.focus();',
+       onfocus : 'this.nextSibling.focus();',
+     size : 2 } ),
+  createMARCTextbox(
+   sf.@code,
+   { value : sf.@code,
+     class : 'plain marcSubfieldCode',
+     name : 'marcSubfieldCode',
+     onmouseover : 'current_focus = this; getContextMenu(this, "subfield"); getTooltip(this, "subfield");',
+     oncontextmenu : 'getContextMenu(this, "subfield");',
+     oninput : 'if (this.value.length == 1) { this.nextSibling.focus(); }',
+     size : 2,
+     maxlength : 1 } ),
+  createMARCTextbox(
+   sf,
+   { value : sf.text(),
+     name : sf.parent().@tag + ':' + sf.@code,
+     class : 'plain marcSubfield', 
+     onmouseover : 'getTooltip(this, "subfield");',
+     contextmenu : function (event) { getAuthorityContextMenu(event.target, sf) },
+     size : new String(sf.text()).length + 2,
+     oninput : "this.setAttribute('size', this.value.length + 2);"
+   } )
+ );
 }
 
 function loadRecord(rec) {
-	try {
-			_record = rec;
-			var grid_rows = document.getElementById('recGrid').lastChild;
+ try {
+   _record = rec;
+   var grid_rows = document.getElementById('recGrid').lastChild;
 
-			while (grid_rows.firstChild) grid_rows.removeChild(grid_rows.firstChild);
+   while (grid_rows.firstChild) grid_rows.removeChild(grid_rows.firstChild);
 
-			grid_rows.appendChild( marcLeader( rec.leader ) );
+   grid_rows.appendChild( marcLeader( rec.leader ) );
 
-			for (var i in rec.controlfield) {
-				grid_rows.appendChild( marcControlfield( rec.controlfield[i] ) );
-			}
+   for (var i in rec.controlfield) {
+    grid_rows.appendChild( marcControlfield( rec.controlfield[i] ) );
+   }
 
-			for (var i in rec.datafield) {
-				grid_rows.appendChild( marcDatafield( rec.datafield[i] ) );
-			}
+   for (var i in rec.datafield) {
+    grid_rows.appendChild( marcDatafield( rec.datafield[i] ) );
+   }
 
-			grid_rows.getElementsByAttribute('class','marcDatafieldRow')[0].firstChild.focus();
-			changeFFEditor(recordType(rec));
-			fillFixedFields(rec);
-	} catch(E) {
-		alert('FIXME, MARC Editor, loadRecord: ' + E);
-	}
+   grid_rows.getElementsByAttribute('class','marcDatafieldRow')[0].firstChild.focus();
+   changeFFEditor(recordType(rec));
+   fillFixedFields(rec);
+ } catch(E) {
+  alert('FIXME, MARC Editor, loadRecord: ' + E);
+ }
 }
 
 
 function genToolTips () {
-	for (var i in bib_data.field) {
-		var f = bib_data.field[i];
-	
-		tag_menu.appendChild(
-			createMenuitem(
-				{ label : f.@tag,
-				  oncommand : 
-				  	'current_focus.value = "' + f.@tag + '";' +
-					'var e = document.createEvent("MutationEvents");' +
-					'e.initMutationEvent("change",1,1,null,0,0,0,0);' +
-					'current_focus.inputField.dispatchEvent(e);',
-				  disabled : f.@tag < '010' ? "true" : "false",
-				  tooltiptext : f.description }
-			)
-		);
-	
-		var i1_popup = createPopup({position : 'after_start', id : 't' + f.@tag + 'i1' });
-		context_menus.appendChild( i1_popup );
-	
-		var i2_popup = createPopup({position : 'after_start', id : 't' + f.@tag + 'i2' });
-		context_menus.appendChild( i2_popup );
-	
-		var sf_popup = createPopup({position : 'after_start', id : 't' + f.@tag + 'sf' });
-		context_menus.appendChild( sf_popup );
-	
-		tooltip_hash['tag' + f.@tag] = f.description;
-		for (var j in f.indicator) {
-			var ind = f.indicator[j];
-			tooltip_hash['tag' + f.@tag + 'ind' + ind.@position + 'val' + ind.@value] = ind.description;
-	
-			if (ind.@position == 1) {
-				i1_popup.appendChild(
-					createMenuitem(
-						{ label : ind.@value,
-						  oncommand : 
-				  			'current_focus.value = "' + ind.@value + '";' +
-							'var e = document.createEvent("MutationEvents");' +
-							'e.initMutationEvent("change",1,1,null,0,0,0,0);' +
-							'current_focus.inputField.dispatchEvent(e);',
-						  tooltiptext : ind.description }
-					)
-				);
-			}
-	
-			if (ind.@position == 2) {
-				i2_popup.appendChild(
-					createMenuitem(
-						{ label : ind.@value,
-						  oncommand : 
-				  			'current_focus.value = "' + ind.@value + '";' +
-							'var e = document.createEvent("MutationEvents");' +
-							'e.initMutationEvent("change",1,1,null,0,0,0,0);' +
-							'current_focus.inputField.dispatchEvent(e);',
-						  tooltiptext : ind.description }
-					)
-				);
-			}
-		}
-	
-		for (var j in f.subfield) {
-			var sf = f.subfield[j];
-			tooltip_hash['tag' + f.@tag + 'sf' + sf.@code] = sf.description;
-	
-			sf_popup.appendChild(
-				createMenuitem(
-					{ label : sf.@code,
-					  oncommand : 
-			  			'current_focus.value = "' + sf.@code + '";' +
-						'var e = document.createEvent("MutationEvents");' +
-						'e.initMutationEvent("change",1,1,null,0,0,0,0);' +
-						'current_focus.inputField.dispatchEvent(e);',
-					  tooltiptext : sf.description
-					}
-				)
-			);
-		}
-	}
+ for (var i in bib_data.field) {
+  var f = bib_data.field[i];
+ 
+  tag_menu.appendChild(
+   createMenuitem(
+    { label : f.@tag,
+      oncommand : 
+       'current_focus.value = "' + f.@tag + '";' +
+     'var e = document.createEvent("MutationEvents");' +
+     'e.initMutationEvent("change",1,1,null,0,0,0,0);' +
+     'current_focus.inputField.dispatchEvent(e);',
+      disabled : f.@tag < '010' ? "true" : "false",
+      tooltiptext : f.description }
+   )
+  );
+ 
+  var i1_popup = createPopup({position : 'after_start', id : 't' + f.@tag + 'i1' });
+  context_menus.appendChild( i1_popup );
+ 
+  var i2_popup = createPopup({position : 'after_start', id : 't' + f.@tag + 'i2' });
+  context_menus.appendChild( i2_popup );
+ 
+  var sf_popup = createPopup({position : 'after_start', id : 't' + f.@tag + 'sf' });
+  context_menus.appendChild( sf_popup );
+ 
+  tooltip_hash['tag' + f.@tag] = f.description;
+  for (var j in f.indicator) {
+   var ind = f.indicator[j];
+   tooltip_hash['tag' + f.@tag + 'ind' + ind.@position + 'val' + ind.@value] = ind.description;
+ 
+   if (ind.@position == 1) {
+    i1_popup.appendChild(
+     createMenuitem(
+      { label : ind.@value,
+        oncommand : 
+         'current_focus.value = "' + ind.@value + '";' +
+       'var e = document.createEvent("MutationEvents");' +
+       'e.initMutationEvent("change",1,1,null,0,0,0,0);' +
+       'current_focus.inputField.dispatchEvent(e);',
+        tooltiptext : ind.description }
+     )
+    );
+   }
+ 
+   if (ind.@position == 2) {
+    i2_popup.appendChild(
+     createMenuitem(
+      { label : ind.@value,
+        oncommand : 
+         'current_focus.value = "' + ind.@value + '";' +
+       'var e = document.createEvent("MutationEvents");' +
+       'e.initMutationEvent("change",1,1,null,0,0,0,0);' +
+       'current_focus.inputField.dispatchEvent(e);',
+        tooltiptext : ind.description }
+     )
+    );
+   }
+  }
+ 
+  for (var j in f.subfield) {
+   var sf = f.subfield[j];
+   tooltip_hash['tag' + f.@tag + 'sf' + sf.@code] = sf.description;
+ 
+   sf_popup.appendChild(
+    createMenuitem(
+     { label : sf.@code,
+       oncommand : 
+        'current_focus.value = "' + sf.@code + '";' +
+      'var e = document.createEvent("MutationEvents");' +
+      'e.initMutationEvent("change",1,1,null,0,0,0,0);' +
+      'current_focus.inputField.dispatchEvent(e);',
+       tooltiptext : sf.description
+     }
+    )
+   );
+  }
+ }
 }
 
 function getTooltip (target, type) {
 
-	var tt = '';
-	if (type == 'subfield')
-		tt = 'tag' + target.parentNode.parentNode.parentNode.firstChild.value + 'sf' + target.parentNode.childNodes[1].value;
-
-	if (type == 'ind1')
-		tt = 'tag' + target.parentNode.firstChild.value + 'ind1val' + target.value;
-
-	if (type == 'ind2')
-		tt = 'tag' + target.parentNode.firstChild.value + 'ind2val' + target.value;
-
-	if (type == 'tag')
-		tt = 'tag' + target.parentNode.firstChild.value;
-
-	if (!document.getElementById( tt )) {
-		p.appendChild(
-			createTooltip(
-				{ id : tt,
-				  flex : "1",
-				  orient : 'vertical',
-				  onpopupshown : 'this.width = this.firstChild.boxObject.width + 10; this.height = this.firstChild.boxObject.height + 10;',
-				  class : 'tooltip' },
-				createDescription({}, document.createTextNode( tooltip_hash[tt] ) )
-			)
-		);
-	}
-
-	target.tooltip = tt;
-	return true;
+ var tt = '';
+ if (type == 'subfield')
+  tt = 'tag' + target.parentNode.parentNode.parentNode.firstChild.value + 'sf' + target.parentNode.childNodes[1].value;
+
+ if (type == 'ind1')
+  tt = 'tag' + target.parentNode.firstChild.value + 'ind1val' + target.value;
+
+ if (type == 'ind2')
+  tt = 'tag' + target.parentNode.firstChild.value + 'ind2val' + target.value;
+
+ if (type == 'tag')
+  tt = 'tag' + target.parentNode.firstChild.value;
+
+ if (!document.getElementById( tt )) {
+  p.appendChild(
+   createTooltip(
+    { id : tt,
+      flex : "1",
+      orient : 'vertical',
+      onpopupshown : 'this.width = this.firstChild.boxObject.width + 10; this.height = this.firstChild.boxObject.height + 10;',
+      class : 'tooltip' },
+    createDescription({}, document.createTextNode( tooltip_hash[tt] ) )
+   )
+  );
+ }
+
+ target.tooltip = tt;
+ return true;
 }
 
 function getContextMenu (target, type) {
 
-	var tt = '';
-	if (type == 'subfield')
-		tt = 't' + target.parentNode.parentNode.parentNode.firstChild.value + 'sf';
+ var tt = '';
+ if (type == 'subfield')
+  tt = 't' + target.parentNode.parentNode.parentNode.firstChild.value + 'sf';
 
-	if (type == 'ind1')
-		tt = 't' + target.parentNode.firstChild.value + 'i1';
+ if (type == 'ind1')
+  tt = 't' + target.parentNode.firstChild.value + 'i1';
 
-	if (type == 'ind2')
-		tt = 't' + target.parentNode.firstChild.value + 'i2';
+ if (type == 'ind2')
+  tt = 't' + target.parentNode.firstChild.value + 'i2';
 
-	target.setAttribute('context', tt);
-	return true;
+ target.setAttribute('context', tt);
+ return true;
 }
 
 var authority_tag_map = {
-	100 : ['[100,400,500,700]',100],
-	400 : ['[100,400,500,700]',100],
-	700 : ['[100,400,500,700]',100],
-	800 : ['[100,400,500,700]',100],
-	110 : ['[110,410,510,710]',110],
-	410 : ['[110,410,510,710]',110],
-	710 : ['[110,410,510,710]',110],
-	810 : ['[110,410,510,710]',110],
-	111 : ['[111,411,511,711]',111],
-	411 : ['[111,411,511,711]',111],
-	711 : ['[111,411,511,711]',111],
-	811 : ['[111,411,511,711]',111],
-	240 : ['[130,430,530,730]',130],
-	440 : ['[130,430,530,730]',130],
-	130 : ['[130,430,530,730]',130],
-	730 : ['[130,430,530,730]',130],
-	830 : ['[130,430,530,730]',130],
-	600 : ['[100,400,480,481,482,485,500,580,581,582,585,700,780,781,782,785]',100],
-	650 : ['[150,450,480,481,482,485,550,580,581,582,585,750,780,781,782,785]',150],
-	651 : ['[151,451,480,481,482,485,551,580,581,582,585,751,780,781,782,785]',151],
-	655 : ['[155,455,480,481,482,485,555,580,581,582,585,755,780,781,782,785]',155]
+ 100 : ['[100,400,500,700]',100],
+ 400 : ['[100,400,500,700]',100],
+ 700 : ['[100,400,500,700]',100],
+ 800 : ['[100,400,500,700]',100],
+ 110 : ['[110,410,510,710]',110],
+ 410 : ['[110,410,510,710]',110],
+ 710 : ['[110,410,510,710]',110],
+ 810 : ['[110,410,510,710]',110],
+ 111 : ['[111,411,511,711]',111],
+ 411 : ['[111,411,511,711]',111],
+ 711 : ['[111,411,511,711]',111],
+ 811 : ['[111,411,511,711]',111],
+ 240 : ['[130,430,530,730]',130],
+ 440 : ['[130,430,530,730]',130],
+ 130 : ['[130,430,530,730]',130],
+ 730 : ['[130,430,530,730]',130],
+ 830 : ['[130,430,530,730]',130],
+ 600 : ['[100,400,480,481,482,485,500,580,581,582,585,700,780,781,782,785]',100],
+ 650 : ['[150,450,480,481,482,485,550,580,581,582,585,750,780,781,782,785]',150],
+ 651 : ['[151,451,480,481,482,485,551,580,581,582,585,751,780,781,782,785]',151],
+ 655 : ['[155,455,480,481,482,485,555,580,581,582,585,755,780,781,782,785]',155]
 };
 
 function getAuthorityContextMenu (target, sf) {
-	var menu_id = sf.parent().@tag + ':' + sf.@code + '-authority-context-' + sf;
+ var menu_id = sf.parent().@tag + ':' + sf.@code + '-authority-context-' + sf;
 
-	var old = document.getElementById( menu_id );
-	if (old) old.parentNode.removeChild(old);
+ var old = document.getElementById( menu_id );
+ if (old) old.parentNode.removeChild(old);
 
-	var sf_popup = createPopup({ id : menu_id, flex : 1 });
-	context_menus.appendChild( sf_popup );
+ var sf_popup = createPopup({ id : menu_id, flex : 1 });
+ context_menus.appendChild( sf_popup );
 
-	if (!authority_tag_map[sf.parent().@tag]) {
-		sf_popup.appendChild(createLabel( { value : $('catStrings').getString('staff.cat.marcedit.not_authority_field.label') } ) );
-		target.setAttribute('context', 'clipboard');
-		return false;
-	}
+ if (!authority_tag_map[sf.parent().@tag]) {
+  sf_popup.appendChild(createLabel( { value : $('catStrings').getString('staff.cat.marcedit.not_authority_field.label') } ) );
+  target.setAttribute('context', 'clipboard');
+  return false;
+ }
 
-	var auth_data = searchAuthority( sf, authority_tag_map[sf.parent().@tag][0], sf.@code, 50);
+ var auth_data = searchAuthority( sf, authority_tag_map[sf.parent().@tag][0], sf.@code, 50);
 
-	var res = new XML( auth_data.responseText );
+ var res = new XML( auth_data.responseText );
 
-	var rec_list = [];
+ var rec_list = [];
 
-	var recs = res.gw::payload.gw::array.gw::string;
-	for (var i in recs) {
-		var x = recs[i];
-		var xml = new XML(x.toString());
-		var main = xml.datafield.(@tag.toString().match(/^1/)).subfield;
+ var recs = res.gw::payload.gw::array.gw::string;
+ for (var i in recs) {
+  var x = recs[i];
+  var xml = new XML(x.toString());
+  var main = xml.datafield.(@tag.toString().match(/^1/)).subfield;
 
-		if (! (main[0].parent().@tag == authority_tag_map[sf.parent().@tag][1]) ) continue;
+  if (! (main[0].parent().@tag == authority_tag_map[sf.parent().@tag][1]) ) continue;
 
-		var main_text = '';
-		for (var i in main) {
-			if (main_text) main_text += ' / ';
-			main_text += main[i];
-		}
+  var main_text = '';
+  for (var i in main) {
+   if (main_text) main_text += ' / ';
+   main_text += main[i];
+  }
 
-		rec_list.push( [ main_text, xml ] );
-	}
-	
-	for (var i in rec_list.sort( function (a, b) { if(a[0] > b[0]) return 1; return -1; } )) {
+  rec_list.push( [ main_text, xml ] );
+ }
+ 
+ for (var i in rec_list.sort( function (a, b) { if(a[0] > b[0]) return 1; return -1; } )) {
 
-		var main_text = rec_list[i][0];
-		var xml = rec_list[i][1];
-		var main = xml.datafield.(@tag.toString().match(/^1/)).subfield;
+  var main_text = rec_list[i][0];
+  var xml = rec_list[i][1];
+  var main = xml.datafield.(@tag.toString().match(/^1/)).subfield;
 
-		if (! (main[0].parent().@tag == authority_tag_map[sf.parent().@tag][1]) ) continue;
+  if (! (main[0].parent().@tag == authority_tag_map[sf.parent().@tag][1]) ) continue;
 
-		var grid = document.getElementsByAttribute('name','authority-marc-template')[0].cloneNode(true);
-		grid.setAttribute('name','-none-');
-		grid.setAttribute('style','overflow:scroll');
+  var grid = document.getElementsByAttribute('name','authority-marc-template')[0].cloneNode(true);
+  grid.setAttribute('name','-none-');
+  grid.setAttribute('style','overflow:scroll');
 
 
-		var submenu = createMenu( { label : main_text } );
+  var submenu = createMenu( { label : main_text } );
 
-		var popup = createMenuPopup({ flex : "1" });
-		submenu.appendChild(popup);
+  var popup = createMenuPopup({ flex : "1" });
+  submenu.appendChild(popup);
 
-		var fields = xml.datafield;
-		for (var j in fields) {
+  var fields = xml.datafield;
+  for (var j in fields) {
 
-			var row = createRow(
-				{},
-				createLabel( { value : fields[j].@tag } ),
-				createLabel( { value : fields[j].@ind1 } ),
-				createLabel( { value : fields[j].@ind2 } )
-			);
+   var row = createRow(
+    {},
+    createLabel( { value : fields[j].@tag } ),
+    createLabel( { value : fields[j].@ind1 } ),
+    createLabel( { value : fields[j].@ind2 } )
+   );
 
-			var sf_box = createHbox();
+   var sf_box = createHbox();
 
-			var subfields = fields[j].subfield;
-			for (var k in subfields) {
-				sf_box.appendChild(
-					createCheckbox(
-						{ label    : '\u2021' + subfields[k].@code + ' ' + subfields[k],
-						  subfield : subfields[k].@code,
-						  tag      : subfields[k].parent().@tag,
-						  value    : subfields[k]
-						}
-					)
-				);
-				row.appendChild(sf_box);
-			}
+   var subfields = fields[j].subfield;
+   for (var k in subfields) {
+    sf_box.appendChild(
+     createCheckbox(
+      { label    : '\u2021' + subfields[k].@code + ' ' + subfields[k],
+        subfield : subfields[k].@code,
+        tag      : subfields[k].parent().@tag,
+        value    : subfields[k]
+      }
+     )
+    );
+    row.appendChild(sf_box);
+   }
 
-			grid.lastChild.appendChild(row);
-		}
+   grid.lastChild.appendChild(row);
+  }
 
-		grid.hidden = false;
-		popup.appendChild( grid );
+  grid.hidden = false;
+  popup.appendChild( grid );
 
-		popup.appendChild(
-			createMenuitem(
-				{ label : $('catStrings').getString('staff.cat.marcedit.apply_selected.label'),
-				  command : function (event) {
-						applyAuthority(event.target.previousSibling, target, sf);
-						return true;
-				  }
-				}
-			)
-		);
+  popup.appendChild(
+   createMenuitem(
+    { label : $('catStrings').getString('staff.cat.marcedit.apply_selected.label'),
+      command : function (event) {
+      applyAuthority(event.target.previousSibling, target, sf);
+      return true;
+      }
+    }
+   )
+  );
 
-		sf_popup.appendChild( submenu );
-	}
+  sf_popup.appendChild( submenu );
+ }
 
-	if (sf_popup.childNodes.length == 0)
-		sf_popup.appendChild(createLabel( { value : $('catStrings').getString('staff.cat.marcedit.no_authority_match.label') } ) );
+ if (sf_popup.childNodes.length == 0)
+  sf_popup.appendChild(createLabel( { value : $('catStrings').getString('staff.cat.marcedit.no_authority_match.label') } ) );
 
-	target.setAttribute('context', menu_id);
-	return true;
+ target.setAttribute('context', menu_id);
+ return true;
 }
 
 function applyAuthority ( target, ui_sf, e4x_sf ) {
 
-	var new_vals = target.getElementsByAttribute('checked','true');
-	var field = e4x_sf.parent();
+ var new_vals = target.getElementsByAttribute('checked','true');
+ var field = e4x_sf.parent();
 
-	for (var i = 0; i < new_vals.length; i++) {
+ for (var i = 0; i < new_vals.length; i++) {
 
-		var sf_list = field.subfield;
-		for (var j in sf_list) {
+  var sf_list = field.subfield;
+  for (var j in sf_list) {
 
-			if (sf_list[j].@code == new_vals[i].getAttribute('subfield')) {
-				sf_list[j] = new_vals[i].getAttribute('value');
-				new_vals[i].setAttribute('subfield','');
-				break;
-			}
-		}
-	}
+   if (sf_list[j].@code == new_vals[i].getAttribute('subfield')) {
+    sf_list[j] = new_vals[i].getAttribute('value');
+    new_vals[i].setAttribute('subfield','');
+    break;
+   }
+  }
+ }
 
-	for (var i = 0; i < new_vals.length; i++) {
-		if (!new_vals[i].getAttribute('subfield')) continue;
+ for (var i = 0; i < new_vals.length; i++) {
+  if (!new_vals[i].getAttribute('subfield')) continue;
 
-		var val = new_vals[i].getAttribute('value');
+  var val = new_vals[i].getAttribute('value');
 
-		var sf = <subfield code="" xmlns="http://www.loc.gov/MARC21/slim">{val}</subfield>;
-		sf.@code = new_vals[i].getAttribute('subfield');
+  var sf = <subfield code="" xmlns="http://www.loc.gov/MARC21/slim">{val}</subfield>;
+  sf.@code = new_vals[i].getAttribute('subfield');
 
-		field.insertChildAfter(field.subfield[field.subfield.length() - 1], sf);
-	}
+  field.insertChildAfter(field.subfield[field.subfield.length() - 1], sf);
+ }
 
-	var row = marcDatafield( field );
+ var row = marcDatafield( field );
 
-	var node = ui_sf;
-	while (node.nodeName != 'row') {
-		node = node.parentNode;
-	}
+ var node = ui_sf;
+ while (node.nodeName != 'row') {
+  node = node.parentNode;
+ }
 
-	node.parentNode.replaceChild( row, node );
-	return true;
+ node.parentNode.replaceChild( row, node );
+ return true;
 }
 
 var control_map = {
-	100 : {
-		'a' : { 100 : 'a' },
-		'd' : { 100 : 'd' },
-		'q' : { 100 : 'q' }
-	},
-	110 : {
-		'a' : { 110 : 'a' },
-		'd' : { 110 : 'd' }
-	},
-	111 : {
-		'a' : { 111 : 'a' },
-		'd' : { 111 : 'd' }
-	},
-	130 : {
-		'a' : { 130 : 'a' },
-		'd' : { 130 : 'd' }
-	},
-	240 : {
-		'a' : { 130 : 'a' },
-		'd' : { 130 : 'd' }
-	},
-	400 : {
-		'a' : { 100 : 'a' },
-		'd' : { 100 : 'd' }
-	},
-	410 : {
-		'a' : { 110 : 'a' },
-		'd' : { 110 : 'd' }
-	},
-	411 : {
-		'a' : { 111 : 'a' },
-		'd' : { 111 : 'd' }
-	},
-	440 : {
-		'a' : { 130 : 'a' },
-		'n' : { 130 : 'n' },
-		'p' : { 130 : 'p' }
-	},
-	700 : {
-		'a' : { 100 : 'a' },
-		'd' : { 100 : 'd' },
-		'q' : { 100 : 'q' },
-		't' : { 100 : 't' }
-	},
-	710 : {
-		'a' : { 110 : 'a' },
-		'd' : { 110 : 'd' }
-	},
-	711 : {
-		'a' : { 111 : 'a' },
-		'd' : { 111 : 'd' }
-	},
-	730 : {
-		'a' : { 130 : 'a' },
-		'd' : { 130 : 'd' }
-	},
-	800 : {
-		'a' : { 100 : 'a' },
-		'd' : { 100 : 'd' }
-	},
-	810 : {
-		'a' : { 110 : 'a' },
-		'd' : { 110 : 'd' }
-	},
-	811 : {
-		'a' : { 111 : 'a' },
-		'd' : { 111 : 'd' }
-	},
-	830 : {
-		'a' : { 130 : 'a' },
-		'd' : { 130 : 'd' }
-	},
-	600 : {
-		'a' : { 100 : 'a' },
-		'd' : { 100 : 'd' },
-		'q' : { 100 : 'q' },
-		't' : { 100 : 't' },
-		'v' : { 180 : 'v',
-			100 : 'v',
-			181 : 'v',
-			182 : 'v',
-			185 : 'v'
-		},
-		'x' : { 180 : 'x',
-			100 : 'x',
-			181 : 'x',
-			182 : 'x',
-			185 : 'x'
-		},
-		'y' : { 180 : 'y',
-			100 : 'y',
-			181 : 'y',
-			182 : 'y',
-			185 : 'y'
-		},
-		'z' : { 180 : 'z',
-			100 : 'z',
-			181 : 'z',
-			182 : 'z',
-			185 : 'z'
-		}
-	},
-	610 : {
-		'a' : { 110 : 'a' },
-		'd' : { 110 : 'd' },
-		't' : { 110 : 't' },
-		'v' : { 180 : 'v',
-			110 : 'v',
-			181 : 'v',
-			182 : 'v',
-			185 : 'v'
-		},
-		'x' : { 180 : 'x',
-			110 : 'x',
-			181 : 'x',
-			182 : 'x',
-			185 : 'x'
-		},
-		'y' : { 180 : 'y',
-			110 : 'y',
-			181 : 'y',
-			182 : 'y',
-			185 : 'y'
-		},
-		'z' : { 180 : 'z',
-			110 : 'z',
-			181 : 'z',
-			182 : 'z',
-			185 : 'z'
-		}
-	},
-	611 : {
-		'a' : { 111 : 'a' },
-		'd' : { 111 : 'd' },
-		't' : { 111 : 't' },
-		'v' : { 180 : 'v',
-			111 : 'v',
-			181 : 'v',
-			182 : 'v',
-			185 : 'v'
-		},
-		'x' : { 180 : 'x',
-			111 : 'x',
-			181 : 'x',
-			182 : 'x',
-			185 : 'x'
-		},
-		'y' : { 180 : 'y',
-			111 : 'y',
-			181 : 'y',
-			182 : 'y',
-			185 : 'y'
-		},
-		'z' : { 180 : 'z',
-			111 : 'z',
-			181 : 'z',
-			182 : 'z',
-			185 : 'z'
-		}
-	},
-	630 : {
-		'a' : { 130 : 'a' },
-		'd' : { 130 : 'd' }
-	},
-	650 : {
-		'a' : { 150 : 'a' },
-		'b' : { 150 : 'b' },
-		'v' : { 180 : 'v',
-			150 : 'v',
-			181 : 'v',
-			182 : 'v',
-			185 : 'v'
-		},
-		'x' : { 180 : 'x',
-			150 : 'x',
-			181 : 'x',
-			182 : 'x',
-			185 : 'x'
-		},
-		'y' : { 180 : 'y',
-			150 : 'y',
-			181 : 'y',
-			182 : 'y',
-			185 : 'y'
-		},
-		'z' : { 180 : 'z',
-			150 : 'z',
-			181 : 'z',
-			182 : 'z',
-			185 : 'z'
-		}
-	},
-	651 : {
-		'a' : { 151 : 'a' },
-		'v' : { 180 : 'v',
-			151 : 'v',
-			181 : 'v',
-			182 : 'v',
-			185 : 'v'
-		},
-		'x' : { 180 : 'x',
-			151 : 'x',
-			181 : 'x',
-			182 : 'x',
-			185 : 'x'
-		},
-		'y' : { 180 : 'y',
-			151 : 'y',
-			181 : 'y',
-			182 : 'y',
-			185 : 'y'
-		},
-		'z' : { 180 : 'z',
-			151 : 'z',
-			181 : 'z',
-			182 : 'z',
-			185 : 'z'
-		}
-	},
-	655 : {
-		'a' : { 155 : 'a' },
-		'v' : { 180 : 'v',
-			155 : 'v',
-			181 : 'v',
-			182 : 'v',
-			185 : 'v'
-		},
-		'x' : { 180 : 'x',
-			155 : 'x',
-			181 : 'x',
-			182 : 'x',
-			185 : 'x'
-		},
-		'y' : { 180 : 'y',
-			155 : 'y',
-			181 : 'y',
-			182 : 'y',
-			185 : 'y'
-		},
-		'z' : { 180 : 'z',
-			155 : 'z',
-			181 : 'z',
-			182 : 'z',
-			185 : 'z'
-		}
-	}
+ 100 : {
+  'a' : { 100 : 'a' },
+  'd' : { 100 : 'd' },
+  'q' : { 100 : 'q' }
+ },
+ 110 : {
+  'a' : { 110 : 'a' },
+  'd' : { 110 : 'd' }
+ },
+ 111 : {
+  'a' : { 111 : 'a' },
+  'd' : { 111 : 'd' }
+ },
+ 130 : {
+  'a' : { 130 : 'a' },
+  'd' : { 130 : 'd' }
+ },
+ 240 : {
+  'a' : { 130 : 'a' },
+  'd' : { 130 : 'd' }
+ },
+ 400 : {
+  'a' : { 100 : 'a' },
+  'd' : { 100 : 'd' }
+ },
+ 410 : {
+  'a' : { 110 : 'a' },
+  'd' : { 110 : 'd' }
+ },
+ 411 : {
+  'a' : { 111 : 'a' },
+  'd' : { 111 : 'd' }
+ },
+ 440 : {
+  'a' : { 130 : 'a' },
+  'n' : { 130 : 'n' },
+  'p' : { 130 : 'p' }
+ },
+ 700 : {
+  'a' : { 100 : 'a' },
+  'd' : { 100 : 'd' },
+  'q' : { 100 : 'q' },
+  't' : { 100 : 't' }
+ },
+ 710 : {
+  'a' : { 110 : 'a' },
+  'd' : { 110 : 'd' }
+ },
+ 711 : {
+  'a' : { 111 : 'a' },
+  'd' : { 111 : 'd' }
+ },
+ 730 : {
+  'a' : { 130 : 'a' },
+  'd' : { 130 : 'd' }
+ },
+ 800 : {
+  'a' : { 100 : 'a' },
+  'd' : { 100 : 'd' }
+ },
+ 810 : {
+  'a' : { 110 : 'a' },
+  'd' : { 110 : 'd' }
+ },
+ 811 : {
+  'a' : { 111 : 'a' },
+  'd' : { 111 : 'd' }
+ },
+ 830 : {
+  'a' : { 130 : 'a' },
+  'd' : { 130 : 'd' }
+ },
+ 600 : {
+  'a' : { 100 : 'a' },
+  'd' : { 100 : 'd' },
+  'q' : { 100 : 'q' },
+  't' : { 100 : 't' },
+  'v' : { 180 : 'v',
+   100 : 'v',
+   181 : 'v',
+   182 : 'v',
+   185 : 'v'
+  },
+  'x' : { 180 : 'x',
+   100 : 'x',
+   181 : 'x',
+   182 : 'x',
+   185 : 'x'
+  },
+  'y' : { 180 : 'y',
+   100 : 'y',
+   181 : 'y',
+   182 : 'y',
+   185 : 'y'
+  },
+  'z' : { 180 : 'z',
+   100 : 'z',
+   181 : 'z',
+   182 : 'z',
+   185 : 'z'
+  }
+ },
+ 610 : {
+  'a' : { 110 : 'a' },
+  'd' : { 110 : 'd' },
+  't' : { 110 : 't' },
+  'v' : { 180 : 'v',
+   110 : 'v',
+   181 : 'v',
+   182 : 'v',
+   185 : 'v'
+  },
+  'x' : { 180 : 'x',
+   110 : 'x',
+   181 : 'x',
+   182 : 'x',
+   185 : 'x'
+  },
+  'y' : { 180 : 'y',
+   110 : 'y',
+   181 : 'y',
+   182 : 'y',
+   185 : 'y'
+  },
+  'z' : { 180 : 'z',
+   110 : 'z',
+   181 : 'z',
+   182 : 'z',
+   185 : 'z'
+  }
+ },
+ 611 : {
+  'a' : { 111 : 'a' },
+  'd' : { 111 : 'd' },
+  't' : { 111 : 't' },
+  'v' : { 180 : 'v',
+   111 : 'v',
+   181 : 'v',
+   182 : 'v',
+   185 : 'v'
+  },
+  'x' : { 180 : 'x',
+   111 : 'x',
+   181 : 'x',
+   182 : 'x',
+   185 : 'x'
+  },
+  'y' : { 180 : 'y',
+   111 : 'y',
+   181 : 'y',
+   182 : 'y',
+   185 : 'y'
+  },
+  'z' : { 180 : 'z',
+   111 : 'z',
+   181 : 'z',
+   182 : 'z',
+   185 : 'z'
+  }
+ },
+ 630 : {
+  'a' : { 130 : 'a' },
+  'd' : { 130 : 'd' }
+ },
+ 650 : {
+  'a' : { 150 : 'a' },
+  'b' : { 150 : 'b' },
+  'v' : { 180 : 'v',
+   150 : 'v',
+   181 : 'v',
+   182 : 'v',
+   185 : 'v'
+  },
+  'x' : { 180 : 'x',
+   150 : 'x',
+   181 : 'x',
+   182 : 'x',
+   185 : 'x'
+  },
+  'y' : { 180 : 'y',
+   150 : 'y',
+   181 : 'y',
+   182 : 'y',
+   185 : 'y'
+  },
+  'z' : { 180 : 'z',
+   150 : 'z',
+   181 : 'z',
+   182 : 'z',
+   185 : 'z'
+  }
+ },
+ 651 : {
+  'a' : { 151 : 'a' },
+  'v' : { 180 : 'v',
+   151 : 'v',
+   181 : 'v',
+   182 : 'v',
+   185 : 'v'
+  },
+  'x' : { 180 : 'x',
+   151 : 'x',
+   181 : 'x',
+   182 : 'x',
+   185 : 'x'
+  },
+  'y' : { 180 : 'y',
+   151 : 'y',
+   181 : 'y',
+   182 : 'y',
+   185 : 'y'
+  },
+  'z' : { 180 : 'z',
+   151 : 'z',
+   181 : 'z',
+   182 : 'z',
+   185 : 'z'
+  }
+ },
+ 655 : {
+  'a' : { 155 : 'a' },
+  'v' : { 180 : 'v',
+   155 : 'v',
+   181 : 'v',
+   182 : 'v',
+   185 : 'v'
+  },
+  'x' : { 180 : 'x',
+   155 : 'x',
+   181 : 'x',
+   182 : 'x',
+   185 : 'x'
+  },
+  'y' : { 180 : 'y',
+   155 : 'y',
+   181 : 'y',
+   182 : 'y',
+   185 : 'y'
+  },
+  'z' : { 180 : 'z',
+   155 : 'z',
+   181 : 'z',
+   182 : 'z',
+   185 : 'z'
+  }
+ }
 };
 
 function validateAuthority (button) {
-	var grid = document.getElementById('recGrid');
-	var label = button.getAttribute('label');
+ var grid = document.getElementById('recGrid');
+ var label = button.getAttribute('label');
 
-	//loop over rows
-	var rows = grid.lastChild.childNodes;
-	for (var i = 0; i < rows.length; i++) {
-		var row = rows[i];
-		var tag = row.firstChild;
+ //loop over rows
+ var rows = grid.lastChild.childNodes;
+ for (var i = 0; i < rows.length; i++) {
+  var row = rows[i];
+  var tag = row.firstChild;
 
-		if (!control_map[tag.value]) continue
-		button.setAttribute('label', label + ' - ' + tag.value);
+  if (!control_map[tag.value]) continue
+  button.setAttribute('label', label + ' - ' + tag.value);
 
-		var ind1 = tag.nextSibling;
-		var ind2 = ind1.nextSibling;
-		var subfields = ind2.nextSibling.childNodes;
+  var ind1 = tag.nextSibling;
+  var ind2 = ind1.nextSibling;
+  var subfields = ind2.nextSibling.childNodes;
 
         var tags = {};
 
-		for (var j = 0; j < subfields.length; j++) {
-			var sf = subfields[j];
+  for (var j = 0; j < subfields.length; j++) {
+   var sf = subfields[j];
             var sf_code = sf.childNodes[1].value;
             var sf_value = sf.childNodes[2].value;
 
-			if (!control_map[tag.value][sf_code]) continue;
+   if (!control_map[tag.value][sf_code]) continue;
 
-			var found = 0;
-			for (var a_tag in control_map[tag.value][sf_code]) {
+   var found = 0;
+   for (var a_tag in control_map[tag.value][sf_code]) {
                 if (!tags[a_tag]) tags[a_tag] = [];
                 tags[a_tag].push({ term : sf_value, subfield : sf_code });
-			}
+   }
 
-		}
+  }
 
         for (var val_tag in tags) {
-        	var auth_data = validateBibField( [val_tag], tags[val_tag]);
-	        var res = new XML( auth_data.responseText );
-	        found = parseInt(res.gw::payload.gw::string.toString());
+         var auth_data = validateBibField( [val_tag], tags[val_tag]);
+         var res = new XML( auth_data.responseText );
+         found = parseInt(res.gw::payload.gw::string.toString());
             if (found) break;
         }
 
-		// XXX If adt, etc should be validated separately from vxz, etc then move this up into the above for loop
-		for (var j = 0; j < subfields.length; j++) {
-			var sf = subfields[j];
-   			if (!found) {
-				sf.childNodes[2].inputField.style.color = 'red';
-			} else {
-				sf.childNodes[2].inputField.style.color = 'black';
-			}
+  // XXX If adt, etc should be validated separately from vxz, etc then move this up into the above for loop
+  for (var j = 0; j < subfields.length; j++) {
+   var sf = subfields[j];
+      if (!found) {
+    sf.childNodes[2].inputField.style.color = 'red';
+   } else {
+    sf.childNodes[2].inputField.style.color = 'black';
+   }
         }
-	}
+ }
 
-	button.setAttribute('label', label);
+ button.setAttribute('label', label);
 
-	return true;
+ return true;
 }
 
 
 function validateBibField (tags, searches) {
-	var url = "/gateway?input_format=json&format=xml&service=open-ils.search&method=open-ils.search.authority.validate.tag";
-	url += '&param="tags"&param=' + js2JSON(tags);
-	url += '&param="searches"&param=' + js2JSON(searches);
+ var url = "/gateway?input_format=json&format=xml&service=open-ils.search&method=open-ils.search.authority.validate.tag";
+ url += '&param="tags"&param=' + js2JSON(tags);
+ url += '&param="searches"&param=' + js2JSON(searches);
 
 
-	var req = new XMLHttpRequest();
-	req.open('GET',url,false);
-	req.send(null);
+ var req = new XMLHttpRequest();
+ req.open('GET',url,false);
+ req.send(null);
 
-	return req;
+ return req;
 
 }
 function searchAuthority (term, tag, sf, limit) {
-	var url = "/gateway?input_format=json&format=xml&service=open-ils.search&method=open-ils.search.authority.fts";
-	url += '&param="term"&param="' + term + '"';
-	url += '&param="limit"&param=' + limit;
-	url += '&param="tag"&param=' + tag;
-	url += '&param="subfield"&param="' + sf + '"';
+ var url = "/gateway?input_format=json&format=xml&service=open-ils.search&method=open-ils.search.authority.fts";
+ url += '&param="term"&param="' + term + '"';
+ url += '&param="limit"&param=' + limit;
+ url += '&param="tag"&param=' + tag;
+ url += '&param="subfield"&param="' + sf + '"';
 
 
-	var req = new XMLHttpRequest();
-	req.open('GET',url,false);
-	req.send(null);
+ var req = new XMLHttpRequest();
+ req.open('GET',url,false);
+ req.send(null);
 
-	return req;
+ return req;
 
 }
 
diff --git a/Open-ILS/xul/staff_client/server/cat/marcedit.xul b/Open-ILS/xul/staff_client/server/cat/marcedit.xul
index f755b038fd..b262f7897a 100644
--- a/Open-ILS/xul/staff_client/server/cat/marcedit.xul
+++ b/Open-ILS/xul/staff_client/server/cat/marcedit.xul
@@ -22,9 +22,9 @@
 <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
 <groupbox flex="0">
-	<caption label="&staff.cat.marcedit.options.label;"/>
-	<hbox flex="1">
-		<checkbox oils_persist="checked" accesskey="&staff.cat.marcedit.stackSubfields.accesskey;" label="&staff.cat.marcedit.stackSubfields.label;" oncommand="stackSubfields(this);" checked="false" id="stackSubfields"/>
+ <caption label="&staff.cat.marcedit.options.label;"/>
+ <hbox flex="1">
+  <checkbox oils_persist="checked" accesskey="&staff.cat.marcedit.stackSubfields.accesskey;" label="&staff.cat.marcedit.stackSubfields.label;" oncommand="stackSubfields(this);" checked="false" id="stackSubfields"/>
         <checkbox oils_persist="checked" accesskey="&staff.cat.marcedit.fastItemAdd.accesskey;" label="&staff.cat.marcedit.fastItemAdd.label;" oncommand="fastItemAdd_toggle(this);" checked="false" id="fastItemAdd_checkbox"/>
         <hbox id="fastItemAdd_textboxes">
             <label control="fastItemAdd_callnumber" accesskey="&staff.cat.marcedit.fastItemAdd_callnumber.accesskey;" value="&staff.cat.marcedit.fastItemAdd_callnumber.label;" />
@@ -32,192 +32,192 @@
             <label control="fastItemAdd_barcode" accesskey="&staff.cat.marcedit.fastItemAdd_barcode.accesskey;" value="&staff.cat.marcedit.fastItemAdd_barcode.label;" />
             <textbox context="clipboard" id="fastItemAdd_barcode"/>
         </hbox>
-		<button label="&staff.cat.marcedit.validate.label;" accesskey="&staff.cat.marcedit.validate.accesskey;" oncommand="validateAuthority(this);"/>
-		<button id="save-button" accesskey="&staff.cat.marcedit.save-button.accesskey;"/>
-		<button label="&staff.cat.marcedit.help.label;" accesskey="&staff.cat.marcedit.help.accesskey;"
-			oncommand="alert(
-				$('catStrings').getString('staff.cat.marcedit.help.add_row') + '\n' +
-				$('catStrings').getString('staff.cat.marcedit.help.insert_row') + '\n' +
-				$('catStrings').getString('staff.cat.marcedit.help.copy_row_up') + '\n' +
-				$('catStrings').getString('staff.cat.marcedit.help.copy_row_down') + '\n' +
-				$('catStrings').getString('staff.cat.marcedit.help.add_subfield') + '\n' +
-				$('catStrings').getString('staff.cat.marcedit.help.remove_row') + '\n' +
-				$('catStrings').getString('staff.cat.marcedit.help.remove_subfield') + '\n' +
-				$('catStrings').getString('staff.cat.marcedit.help.replace_006') + '\n' +
-				$('catStrings').getString('staff.cat.marcedit.help.replace_007') + '\n' +
-				$('catStrings').getString('staff.cat.marcedit.help.replace_008')
-			);"
-		/>
-	</hbox>
+  <button label="&staff.cat.marcedit.validate.label;" accesskey="&staff.cat.marcedit.validate.accesskey;" oncommand="validateAuthority(this);"/>
+  <button id="save-button" accesskey="&staff.cat.marcedit.save-button.accesskey;"/>
+  <button label="&staff.cat.marcedit.help.label;" accesskey="&staff.cat.marcedit.help.accesskey;"
+   oncommand="alert(
+    $('catStrings').getString('staff.cat.marcedit.help.add_row') + '\n' +
+    $('catStrings').getString('staff.cat.marcedit.help.insert_row') + '\n' +
+    $('catStrings').getString('staff.cat.marcedit.help.copy_row_up') + '\n' +
+    $('catStrings').getString('staff.cat.marcedit.help.copy_row_down') + '\n' +
+    $('catStrings').getString('staff.cat.marcedit.help.add_subfield') + '\n' +
+    $('catStrings').getString('staff.cat.marcedit.help.remove_row') + '\n' +
+    $('catStrings').getString('staff.cat.marcedit.help.remove_subfield') + '\n' +
+    $('catStrings').getString('staff.cat.marcedit.help.replace_006') + '\n' +
+    $('catStrings').getString('staff.cat.marcedit.help.replace_007') + '\n' +
+    $('catStrings').getString('staff.cat.marcedit.help.replace_008')
+   );"
+  />
+ </hbox>
 </groupbox>
 
 <groupbox flex="1">
-	<caption label="&staff.cat.marcedit.caption.label;"/>
-	<vbox flex="1" style="overflow: auto;">
-		<hbox>
-		<groupbox flex="0">
-			<caption>
-				<label value="&staff.cat.marcedit.toggleFFE.label;" ondblclick="toggleFFE();"/>
-				<label id="recordTypeLabel" context="recordTypeMenu"/>
-			</caption>
-			<vbox flex="0">
-				<grid flex="0" id="leaderGrid" type="BKS" hidden="false" oils_persist="hidden">
-					<columns>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-					</columns>
-					<rows>
-						<row>
-							<label name="Type" set="BKS SER VIS MIX MAP SCO REC COM" value="Type" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="Type" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-							<label name="ELvl" set="BKS SER VIS MIX MAP SCO REC COM" value="ELvl" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="ELvl" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-							<label name="Srce" set="BKS SER VIS MIX MAP SCO REC COM" value="Srce" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="Srce" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-							<label name="Audn" set="BKS VIS SCO REC COM" value="Audn" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="Audn" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-							<label name="Ctrl" set="BKS SER VIS MIX MAP SCO REC COM" value="Ctrl" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="Ctrl" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-							<label name="Lang" set="BKS SER VIS MIX MAP SCO REC COM" value="Lang" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="Lang" maxlength="3" size="3" oninput="updateFixedFields(this);"/>
-						</row>
-						<row>
-							<label name="BLvl" set="BKS SER VIS MIX MAP SCO REC COM" value="BLvl" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="BLvl" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-							<label name="Form" set="BKS SER VIS MIX MAP SCO REC" value="Form" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="Form" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-							<label name="Conf" set="BKS SER" value="Conf" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="Conf" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-							<label name="Biog" set="BKS" value="Biog" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="Biog" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-							<label name="MRec" set="BKS SER VIS MIX MAP SCO REC COM" value="MRec" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="MRec" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-							<label name="Ctry" set="BKS SER VIS MIX MAP SCO REC COM" value="Ctry" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="Ctry" maxlength="3" size="3" oninput="updateFixedFields(this);"/>
-						</row>
-						<row>
-							<label name="S/L" set="SER" value="S/L" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="S/L" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-							<label name="Cont" set="BKS SER" value="Cont" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="Cont" maxlength="4" size="4" oninput="updateFixedFields(this);"/>
-							<label name="GPub" set="BKS SER VIS MAP COM" value="GPub" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="GPub" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-							<label name="LitF" set="BKS" value="LitF" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="LitF" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-							<label name="Indx" set="BKS MAP" value="Indx" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="Indx" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-							<label name="Alph" set="SER" value="Alph" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="Alph" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-						</row>
-						<row>
-							<label name="Desc" set="BKS SER VIS MIX MAP SCO REC COM" value="Desc" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="Desc" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-							<label name="Ills" set="BKS" value="Ills" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="Ills" maxlength="4" size="4" oninput="updateFixedFields(this);"/>
-							<label name="Fest" set="BKS" value="Fest" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="Fest" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-							<label name="DtSt" set="BKS SER VIS MIX MAP SCO REC COM" value="DtSt" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="DtSt" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-							<label name="Date1" set="BKS SER VIS MIX MAP SCO REC COM" value="Date1" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="Date1" maxlength="4" size="4" oninput="updateFixedFields(this);"/>
-							<label name="Date2" set="BKS SER VIS MIX MAP SCO REC COM" value="Date2" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="Date2" maxlength="4" size="4" oninput="updateFixedFields(this);"/>
-						</row>
-						<row>
-							<label name="SrTp" set="SER" value="SrTp" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="SrTp" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-							<label name="Regl" set="SER" value="Regl" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="Regl" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-							<label name="Orig" set="SER" value="Orig" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="Orig" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-							<label name="Freq" set="SER" value="Freq" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="Freq" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-							<label name="EntW" set="SER" value="EntW" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="EntW" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-						</row>
-						<row>
-							<label name="TrAr" set="SCO REC" value="TrAr" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="TrAr" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-							<label name="Part" set="SCO REC" value="Part" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="Part" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-							<label name="LTxt" set="SCO REC" value="LTxt" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="LTxt" maxlength="2" size="2" oninput="updateFixedFields(this);"/>
-							<label name="FMus" set="SCO REC" value="FMus" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="FMus" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-							<label name="AccM" set="SCO REC" value="AccM" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="AccM" maxlength="6" size="6" oninput="updateFixedFields(this);"/>
-							<label name="Comp" set="SCO REC" value="Comp" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="Comp" maxlength="2" size="2" oninput="updateFixedFields(this);"/>
-						</row>
-						<row>
-							<label name="SpFm" set="MAP" value="SpFm" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="SpFm" maxlength="2" size="2" oninput="updateFixedFields(this);"/>
-							<label name="Relf" set="MAP" value="Relf" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="Relf" maxlength="4" size="4" oninput="updateFixedFields(this);"/>
-							<label name="Proj" set="MAP" value="Proj" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="Proj" maxlength="2" size="2" oninput="updateFixedFields(this);"/>
-							<label name="CrTp" set="MAP" value="CrTp" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="CrTp" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-						</row>
-						<row>
-							<label name="TMat" set="VIS" value="TMat" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="TMat" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-							<label name="Time" set="VIS" value="Time" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="Time" maxlength="3" size="3" oninput="updateFixedFields(this);"/>
-							<label name="Tech" set="VIS" value="Tech" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="Tech" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-							<label name="File" set="COM" value="File" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
-							<textbox context="clipboard" class="plain" name="File" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
-						</row>
-					</rows>
-				</grid>
-			</vbox>
-		</groupbox>
-		</hbox>
+ <caption label="&staff.cat.marcedit.caption.label;"/>
+ <vbox flex="1" style="overflow: auto;">
+  <hbox>
+  <groupbox flex="0">
+   <caption>
+    <label value="&staff.cat.marcedit.toggleFFE.label;" ondblclick="toggleFFE();"/>
+    <label id="recordTypeLabel" context="recordTypeMenu"/>
+   </caption>
+   <vbox flex="0">
+    <grid flex="0" id="leaderGrid" type="BKS" hidden="false" oils_persist="hidden">
+     <columns>
+      <column flex="1"/>
+      <column flex="1"/>
+      <column flex="1"/>
+      <column flex="1"/>
+      <column flex="1"/>
+      <column flex="1"/>
+      <column flex="1"/>
+      <column flex="1"/>
+      <column flex="1"/>
+      <column flex="1"/>
+      <column flex="1"/>
+      <column flex="1"/>
+     </columns>
+     <rows>
+      <row>
+       <label name="Type" set="BKS SER VIS MIX MAP SCO REC COM" value="Type" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="Type" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+       <label name="ELvl" set="BKS SER VIS MIX MAP SCO REC COM" value="ELvl" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="ELvl" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+       <label name="Srce" set="BKS SER VIS MIX MAP SCO REC COM" value="Srce" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="Srce" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+       <label name="Audn" set="BKS VIS SCO REC COM" value="Audn" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="Audn" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+       <label name="Ctrl" set="BKS SER VIS MIX MAP SCO REC COM" value="Ctrl" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="Ctrl" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+       <label name="Lang" set="BKS SER VIS MIX MAP SCO REC COM" value="Lang" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="Lang" maxlength="3" size="3" oninput="updateFixedFields(this);"/>
+      </row>
+      <row>
+       <label name="BLvl" set="BKS SER VIS MIX MAP SCO REC COM" value="BLvl" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="BLvl" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+       <label name="Form" set="BKS SER VIS MIX MAP SCO REC" value="Form" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="Form" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+       <label name="Conf" set="BKS SER" value="Conf" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="Conf" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+       <label name="Biog" set="BKS" value="Biog" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="Biog" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+       <label name="MRec" set="BKS SER VIS MIX MAP SCO REC COM" value="MRec" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="MRec" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+       <label name="Ctry" set="BKS SER VIS MIX MAP SCO REC COM" value="Ctry" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="Ctry" maxlength="3" size="3" oninput="updateFixedFields(this);"/>
+      </row>
+      <row>
+       <label name="S/L" set="SER" value="S/L" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="S/L" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+       <label name="Cont" set="BKS SER" value="Cont" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="Cont" maxlength="4" size="4" oninput="updateFixedFields(this);"/>
+       <label name="GPub" set="BKS SER VIS MAP COM" value="GPub" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="GPub" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+       <label name="LitF" set="BKS" value="LitF" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="LitF" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+       <label name="Indx" set="BKS MAP" value="Indx" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="Indx" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+       <label name="Alph" set="SER" value="Alph" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="Alph" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+      </row>
+      <row>
+       <label name="Desc" set="BKS SER VIS MIX MAP SCO REC COM" value="Desc" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="Desc" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+       <label name="Ills" set="BKS" value="Ills" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="Ills" maxlength="4" size="4" oninput="updateFixedFields(this);"/>
+       <label name="Fest" set="BKS" value="Fest" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="Fest" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+       <label name="DtSt" set="BKS SER VIS MIX MAP SCO REC COM" value="DtSt" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="DtSt" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+       <label name="Date1" set="BKS SER VIS MIX MAP SCO REC COM" value="Date1" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="Date1" maxlength="4" size="4" oninput="updateFixedFields(this);"/>
+       <label name="Date2" set="BKS SER VIS MIX MAP SCO REC COM" value="Date2" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="Date2" maxlength="4" size="4" oninput="updateFixedFields(this);"/>
+      </row>
+      <row>
+       <label name="SrTp" set="SER" value="SrTp" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="SrTp" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+       <label name="Regl" set="SER" value="Regl" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="Regl" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+       <label name="Orig" set="SER" value="Orig" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="Orig" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+       <label name="Freq" set="SER" value="Freq" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="Freq" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+       <label name="EntW" set="SER" value="EntW" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="EntW" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+      </row>
+      <row>
+       <label name="TrAr" set="SCO REC" value="TrAr" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="TrAr" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+       <label name="Part" set="SCO REC" value="Part" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="Part" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+       <label name="LTxt" set="SCO REC" value="LTxt" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="LTxt" maxlength="2" size="2" oninput="updateFixedFields(this);"/>
+       <label name="FMus" set="SCO REC" value="FMus" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="FMus" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+       <label name="AccM" set="SCO REC" value="AccM" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="AccM" maxlength="6" size="6" oninput="updateFixedFields(this);"/>
+       <label name="Comp" set="SCO REC" value="Comp" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="Comp" maxlength="2" size="2" oninput="updateFixedFields(this);"/>
+      </row>
+      <row>
+       <label name="SpFm" set="MAP" value="SpFm" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="SpFm" maxlength="2" size="2" oninput="updateFixedFields(this);"/>
+       <label name="Relf" set="MAP" value="Relf" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="Relf" maxlength="4" size="4" oninput="updateFixedFields(this);"/>
+       <label name="Proj" set="MAP" value="Proj" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="Proj" maxlength="2" size="2" oninput="updateFixedFields(this);"/>
+       <label name="CrTp" set="MAP" value="CrTp" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="CrTp" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+      </row>
+      <row>
+       <label name="TMat" set="VIS" value="TMat" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="TMat" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+       <label name="Time" set="VIS" value="Time" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="Time" maxlength="3" size="3" oninput="updateFixedFields(this);"/>
+       <label name="Tech" set="VIS" value="Tech" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="Tech" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+       <label name="File" set="COM" value="File" onclick="this.nextSibling.focus(); this.nextSibling.select();"/>
+       <textbox context="clipboard" class="plain" name="File" maxlength="1" size="1" oninput="updateFixedFields(this);"/>
+      </row>
+     </rows>
+    </grid>
+   </vbox>
+  </groupbox>
+  </hbox>
 
-		<grid id="recGrid" flex="1">
-			<columns>
-				<column/>
-				<column/>
-				<column/>
-				<column flex="1"/>
-			</columns>
-			<rows/>
-		</grid>
-	</vbox>
+  <grid id="recGrid" flex="1">
+   <columns>
+    <column/>
+    <column/>
+    <column/>
+    <column flex="1"/>
+   </columns>
+   <rows/>
+  </grid>
+ </vbox>
 </groupbox>
 
 <grid name="authority-marc-template" hidden="true">
-	<columns>
-		<column/>
-		<column/>
-		<column/>
-		<column flex="1"/>
-	</columns>
-	<rows/>
+ <columns>
+  <column/>
+  <column/>
+  <column/>
+  <column flex="1"/>
+ </columns>
+ <rows/>
 </grid>
 
 <popupset>
-	<popup id="recordTypeMenu" position="after_start">
-		<menuitem label="BKS" oncommand="changeFFEditor('BKS');"/>
-		<menuitem label="SER" oncommand="changeFFEditor('SER');"/>
-		<menuitem label="VIS" oncommand="changeFFEditor('VIS');"/>
-		<menuitem label="MIX" oncommand="changeFFEditor('MIX');"/>
-		<menuitem label="MAP" oncommand="changeFFEditor('MAP');"/>
-		<menuitem label="SCO" oncommand="changeFFEditor('SCO');"/>
-		<menuitem label="REC" oncommand="changeFFEditor('REC');"/>
-		<menuitem label="COM" oncommand="changeFFEditor('COM');"/>
-	</popup>
+ <popup id="recordTypeMenu" position="after_start">
+  <menuitem label="BKS" oncommand="changeFFEditor('BKS');"/>
+  <menuitem label="SER" oncommand="changeFFEditor('SER');"/>
+  <menuitem label="VIS" oncommand="changeFFEditor('VIS');"/>
+  <menuitem label="MIX" oncommand="changeFFEditor('MIX');"/>
+  <menuitem label="MAP" oncommand="changeFFEditor('MAP');"/>
+  <menuitem label="SCO" oncommand="changeFFEditor('SCO');"/>
+  <menuitem label="REC" oncommand="changeFFEditor('REC');"/>
+  <menuitem label="COM" oncommand="changeFFEditor('COM');"/>
+ </popup>
 </popupset>
 
 </window>
diff --git a/Open-ILS/xul/staff_client/server/cat/record_buckets.js b/Open-ILS/xul/staff_client/server/cat/record_buckets.js
index f105c3ca1f..925869682e 100644
--- a/Open-ILS/xul/staff_client/server/cat/record_buckets.js
+++ b/Open-ILS/xul/staff_client/server/cat/record_buckets.js
@@ -5,10 +5,10 @@ function $(id) { return document.getElementById(id); }
 if (typeof cat == 'undefined') cat = {};
 cat.record_buckets = function (params) {
 
-	JSAN.use('util.error'); this.error = new util.error();
-	JSAN.use('util.network'); this.network = new util.network();
-	JSAN.use('util.date');
-	JSAN.use('OpenILS.data'); this.data = new OpenILS.data(); this.data.init({'via':'stash'});
+ JSAN.use('util.error'); this.error = new util.error();
+ JSAN.use('util.network'); this.network = new util.network();
+ JSAN.use('util.date');
+ JSAN.use('OpenILS.data'); this.data = new OpenILS.data(); this.data.init({'via':'stash'});
     var x = document.getElementById("record_buckets_tabbox");
     if (x) {
         x.addEventListener(
@@ -32,102 +32,102 @@ cat.record_buckets = function (params) {
 };
 
 cat.record_buckets.pick_file = function (defaultFileName) {
-	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
-	var nsIFilePicker = Components.interfaces.nsIFilePicker;
-	var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance( nsIFilePicker );
+ var nsIFilePicker = Components.interfaces.nsIFilePicker;
+ var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance( nsIFilePicker );
 
-	fp.init( window, $("catStrings").getString('staff.cat.record_buckets.save_file_as'), nsIFilePicker.modeSave );
-	if (defaultFileName)
-		fp.defaultString = defaultFileName;
+ fp.init( window, $("catStrings").getString('staff.cat.record_buckets.save_file_as'), nsIFilePicker.modeSave );
+ if (defaultFileName)
+  fp.defaultString = defaultFileName;
 
-	fp.appendFilters( nsIFilePicker.filterAll );
+ fp.appendFilters( nsIFilePicker.filterAll );
 
-	var result = fp.show(); 
-	if ( (result == nsIFilePicker.returnOK || result == nsIFilePicker.returnReplace) && fp.file ) {
-		return fp.file;
-	} else {
-		return null;
-	}
+ var result = fp.show(); 
+ if ( (result == nsIFilePicker.returnOK || result == nsIFilePicker.returnReplace) && fp.file ) {
+  return fp.file;
+ } else {
+  return null;
+ }
 };
 
 cat.record_buckets.export_records = function(obj, output_type) {
-	try {
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		obj.list2.select_all();
-		obj.data.stash_retrieve();
-		JSAN.use('util.functional');
-
-		var record_ids = util.functional.map_list(
-			obj.list2.dump_retrieve_ids(),
-			function (o) { return JSON2js(o).docid }
-		);
-
-		var persist = Components.classes["@mozilla.org/embedding/browser/nsWebBrowserPersist;1"]
-			.createInstance(Components.interfaces.nsIWebBrowserPersist);
-
-		var proto_uri = 'https://' + window.location.hostname + '/exporter?format=' + output_type + '&ses=' + ses();
-
-		dump('Record Export URI is ' + proto_uri + '&id=' + record_ids.join('&id=') + '\n');
-
-		var uri = Components.classes["@mozilla.org/network/io-service;1"]
-			.getService(Components.interfaces.nsIIOService)
-			.newURI( proto_uri + '&id=' + record_ids.join('&id='), null, null );
-
-		var file = cat.record_buckets.pick_file('bucket.' + output_type);
-								
-		if (file) {
-			persist.saveURI(uri,null,null,null,null,file);
-		} else {
-			alert( $("catStrings").getString('staff.cat.record_buckets.export_records.alert') );
-		}
-
-	} catch(E) {
-		obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.record_buckets.export_records.std_unexpected_error'), E);
-	}
+ try {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  obj.list2.select_all();
+  obj.data.stash_retrieve();
+  JSAN.use('util.functional');
+
+  var record_ids = util.functional.map_list(
+   obj.list2.dump_retrieve_ids(),
+   function (o) { return JSON2js(o).docid }
+  );
+
+  var persist = Components.classes["@mozilla.org/embedding/browser/nsWebBrowserPersist;1"]
+   .createInstance(Components.interfaces.nsIWebBrowserPersist);
+
+  var proto_uri = 'https://' + window.location.hostname + '/exporter?format=' + output_type + '&ses=' + ses();
+
+  dump('Record Export URI is ' + proto_uri + '&id=' + record_ids.join('&id=') + '\n');
+
+  var uri = Components.classes["@mozilla.org/network/io-service;1"]
+   .getService(Components.interfaces.nsIIOService)
+   .newURI( proto_uri + '&id=' + record_ids.join('&id='), null, null );
+
+  var file = cat.record_buckets.pick_file('bucket.' + output_type);
+        
+  if (file) {
+   persist.saveURI(uri,null,null,null,null,file);
+  } else {
+   alert( $("catStrings").getString('staff.cat.record_buckets.export_records.alert') );
+  }
+
+ } catch(E) {
+  obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.record_buckets.export_records.std_unexpected_error'), E);
+ }
 };
 
 
 cat.record_buckets.prototype = {
-	'selection_list0' : [],
-	'selection_list1' : [],
-	'selection_list2' : [],
-	'bucket_id_name_map' : {},
-
-	'render_pending_records' : function() {
-		var obj = this;
-		obj.list1.clear();
-		for (var i = 0; i < obj.record_ids.length; i++) {
-			var item = obj.prep_record_for_list( obj.record_ids[i] );
-			if (item) obj.list1.append( item );
-		}
-	},
-
-	'init' : function( params ) {
-
-		var obj = this;
-
-		obj.record_ids = params['record_ids'] || [];
-
-		JSAN.use('circ.util');
-		var columns = circ.util.columns( 
-			{ 
-				'title' : { 'hidden' : false },
-				'author' : { 'hidden' : false },
-				'edition' : { 'hidden' : false },
-				'publisher' : { 'hidden' : false },
-				'pubdate' : { 'hidden' : false },
-				'isbn' : { 'hidden' : false },
-				'tcn' : { 'hidden' : false }
-			} 
-		);
-
-		JSAN.use('util.list'); 
+ 'selection_list0' : [],
+ 'selection_list1' : [],
+ 'selection_list2' : [],
+ 'bucket_id_name_map' : {},
+
+ 'render_pending_records' : function() {
+  var obj = this;
+  obj.list1.clear();
+  for (var i = 0; i < obj.record_ids.length; i++) {
+   var item = obj.prep_record_for_list( obj.record_ids[i] );
+   if (item) obj.list1.append( item );
+  }
+ },
+
+ 'init' : function( params ) {
+
+  var obj = this;
+
+  obj.record_ids = params['record_ids'] || [];
+
+  JSAN.use('circ.util');
+  var columns = circ.util.columns( 
+   { 
+    'title' : { 'hidden' : false },
+    'author' : { 'hidden' : false },
+    'edition' : { 'hidden' : false },
+    'publisher' : { 'hidden' : false },
+    'pubdate' : { 'hidden' : false },
+    'isbn' : { 'hidden' : false },
+    'tcn' : { 'hidden' : false }
+   } 
+  );
+
+  JSAN.use('util.list'); 
 
         function retrieve_row(params) {
             var row = params.row;
             try {
-			    obj.network.simple_request( 'MODS_SLIM_RECORD_RETRIEVE.authoritative', [ row.my.docid ],
+       obj.network.simple_request( 'MODS_SLIM_RECORD_RETRIEVE.authoritative', [ row.my.docid ],
                     function(req) {
                         try {
                             var record = req.getResultObject();
@@ -147,124 +147,124 @@ cat.record_buckets.prototype = {
             return row;
         }
 
-		obj.list0 = new util.list('record_query_list');
-		obj.list0.init(
-			{
-				'columns' : columns,
-				'map_row_to_columns' : circ.util.std_map_row_to_columns(),
+  obj.list0 = new util.list('record_query_list');
+  obj.list0.init(
+   {
+    'columns' : columns,
+    'map_row_to_columns' : circ.util.std_map_row_to_columns(),
                 'retrieve_row' : retrieve_row,
-				'on_select' : function(ev) {
-					try {
-						JSAN.use('util.functional');
-						var sel = obj.list0.retrieve_selection();
-						obj.controller.view.sel_clip1.setAttribute('disabled', sel.length < 1 ? "true" : "false");
-						obj.selection_list0 = util.functional.map_list(
-							sel,
-							function(o) { return JSON2js(o.getAttribute('retrieve_id')); }
-						);
-						obj.error.sdump('D_TRACE','circ/record_buckets: selection list 0 = ' + js2JSON(obj.selection_list1) );
-						if (obj.selection_list0.length == 0) {
-							obj.controller.view.cmd_add_sel_query_to_pending.setAttribute('disabled','true');
-						} else {
-							obj.controller.view.cmd_add_sel_query_to_pending.setAttribute('disabled','false');
-						}
-					} catch(E) {
-						alert('FIXME: ' + E);
-					}
-				}
-
-			}
-		);
-
-		obj.list1 = new util.list('pending_records_list');
-		obj.list1.init(
-			{
-				'columns' : columns,
-				'map_row_to_columns' : circ.util.std_map_row_to_columns(),
+    'on_select' : function(ev) {
+     try {
+      JSAN.use('util.functional');
+      var sel = obj.list0.retrieve_selection();
+      obj.controller.view.sel_clip1.setAttribute('disabled', sel.length < 1 ? "true" : "false");
+      obj.selection_list0 = util.functional.map_list(
+       sel,
+       function(o) { return JSON2js(o.getAttribute('retrieve_id')); }
+      );
+      obj.error.sdump('D_TRACE','circ/record_buckets: selection list 0 = ' + js2JSON(obj.selection_list1) );
+      if (obj.selection_list0.length == 0) {
+       obj.controller.view.cmd_add_sel_query_to_pending.setAttribute('disabled','true');
+      } else {
+       obj.controller.view.cmd_add_sel_query_to_pending.setAttribute('disabled','false');
+      }
+     } catch(E) {
+      alert('FIXME: ' + E);
+     }
+    }
+
+   }
+  );
+
+  obj.list1 = new util.list('pending_records_list');
+  obj.list1.init(
+   {
+    'columns' : columns,
+    'map_row_to_columns' : circ.util.std_map_row_to_columns(),
                 'retrieve_row' : retrieve_row,
-				'on_select' : function(ev) {
-					try {
-						JSAN.use('util.functional');
-						var sel = obj.list1.retrieve_selection();
-						obj.controller.view.sel_clip1.setAttribute('disabled', sel.length < 1 ? "true" : "false");
-						obj.selection_list1 = util.functional.map_list(
-							sel,
-							function(o) { return JSON2js(o.getAttribute('retrieve_id')); }
-						);
-						obj.error.sdump('D_TRACE','circ/record_buckets: selection list 1 = ' + js2JSON(obj.selection_list1) );
-						if (obj.selection_list1.length == 0) {
-							obj.controller.view.cmd_add_sel_pending_to_record_bucket.setAttribute('disabled','true');
-						} else {
-							obj.controller.view.cmd_add_sel_pending_to_record_bucket.setAttribute('disabled','false');
-						}
-					} catch(E) {
-						alert('FIXME: ' + E);
-					}
-				}
-
-			}
-		);
-
-		obj.render_pending_records();
-	
-		obj.list2 = new util.list('records_in_bucket_list');
-		obj.list2.init(
-			{
-				'columns' : columns,
-				'map_row_to_columns' : circ.util.std_map_row_to_columns(),
+    'on_select' : function(ev) {
+     try {
+      JSAN.use('util.functional');
+      var sel = obj.list1.retrieve_selection();
+      obj.controller.view.sel_clip1.setAttribute('disabled', sel.length < 1 ? "true" : "false");
+      obj.selection_list1 = util.functional.map_list(
+       sel,
+       function(o) { return JSON2js(o.getAttribute('retrieve_id')); }
+      );
+      obj.error.sdump('D_TRACE','circ/record_buckets: selection list 1 = ' + js2JSON(obj.selection_list1) );
+      if (obj.selection_list1.length == 0) {
+       obj.controller.view.cmd_add_sel_pending_to_record_bucket.setAttribute('disabled','true');
+      } else {
+       obj.controller.view.cmd_add_sel_pending_to_record_bucket.setAttribute('disabled','false');
+      }
+     } catch(E) {
+      alert('FIXME: ' + E);
+     }
+    }
+
+   }
+  );
+
+  obj.render_pending_records();
+ 
+  obj.list2 = new util.list('records_in_bucket_list');
+  obj.list2.init(
+   {
+    'columns' : columns,
+    'map_row_to_columns' : circ.util.std_map_row_to_columns(),
                 'retrieve_row' : retrieve_row,
-				'on_select' : function(ev) {
-					try {
-						JSAN.use('util.functional');
-						var sel = obj.list2.retrieve_selection();
-						obj.controller.view.sel_clip2.setAttribute('disabled', sel.length < 1 ? "true" : "false");
-						obj.selection_list2 = util.functional.map_list(
-							sel,
-							function(o) { return JSON2js(o.getAttribute('retrieve_id')); }
-						);
-						obj.error.sdump('D_TRACE','circ/record_buckets: selection list 2 = ' + js2JSON(obj.selection_list2) );
-						if (obj.selection_list2.length == 0) {
-							obj.controller.view.cmd_record_buckets_delete_item.setAttribute('disabled','true');
-							obj.controller.view.cmd_record_buckets_to_pending_buckets.setAttribute('disabled','true');
-						} else {
-							obj.controller.view.cmd_record_buckets_delete_item.setAttribute('disabled','false');
-							obj.controller.view.cmd_record_buckets_to_pending_buckets.setAttribute('disabled','false');
-						}
-					} catch(E) {
-						alert('FIXME: ' + E);
-					}
-				}
-			}
-		);
-		
-		JSAN.use('util.controller'); obj.controller = new util.controller();
-		obj.controller.init(
-			{
-				'control_map' : {
-					'save_columns2' : [
-						['command'],
-						function() { obj.list2.save_columns(); }
-					],
-					'save_columns1' : [
-						['command'],
-						function() { obj.list1.save_columns(); }
-					],
-					'save_columns0' : [
-						['command'],
-						function() { obj.list0.save_columns(); }
-					],
-					'sel_clip2' : [
-						['command'],
-						function() { obj.list2.clipboard(); }
-					],
-					'sel_clip1' : [
-						['command'],
-						function() { obj.list1.clipboard(); }
-					],
-					'sel_clip0' : [
-						['command'],
-						function() { obj.list0.clipboard(); }
-					],
+    'on_select' : function(ev) {
+     try {
+      JSAN.use('util.functional');
+      var sel = obj.list2.retrieve_selection();
+      obj.controller.view.sel_clip2.setAttribute('disabled', sel.length < 1 ? "true" : "false");
+      obj.selection_list2 = util.functional.map_list(
+       sel,
+       function(o) { return JSON2js(o.getAttribute('retrieve_id')); }
+      );
+      obj.error.sdump('D_TRACE','circ/record_buckets: selection list 2 = ' + js2JSON(obj.selection_list2) );
+      if (obj.selection_list2.length == 0) {
+       obj.controller.view.cmd_record_buckets_delete_item.setAttribute('disabled','true');
+       obj.controller.view.cmd_record_buckets_to_pending_buckets.setAttribute('disabled','true');
+      } else {
+       obj.controller.view.cmd_record_buckets_delete_item.setAttribute('disabled','false');
+       obj.controller.view.cmd_record_buckets_to_pending_buckets.setAttribute('disabled','false');
+      }
+     } catch(E) {
+      alert('FIXME: ' + E);
+     }
+    }
+   }
+  );
+  
+  JSAN.use('util.controller'); obj.controller = new util.controller();
+  obj.controller.init(
+   {
+    'control_map' : {
+     'save_columns2' : [
+      ['command'],
+      function() { obj.list2.save_columns(); }
+     ],
+     'save_columns1' : [
+      ['command'],
+      function() { obj.list1.save_columns(); }
+     ],
+     'save_columns0' : [
+      ['command'],
+      function() { obj.list0.save_columns(); }
+     ],
+     'sel_clip2' : [
+      ['command'],
+      function() { obj.list2.clipboard(); }
+     ],
+     'sel_clip1' : [
+      ['command'],
+      function() { obj.list1.clipboard(); }
+     ],
+     'sel_clip0' : [
+      ['command'],
+      function() { obj.list0.clipboard(); }
+     ],
                     'record_query_input' : [
                         ['render'],
                         function(ev) {
@@ -278,61 +278,61 @@ cat.record_buckets.prototype = {
                         ['command'],
                         function() { obj.submit(); }
                     ],
-					'record_buckets_menulist_placeholder' : [
-						['render'],
-						function(e) {
-							return function() {
-								JSAN.use('util.widgets'); JSAN.use('util.functional');
-								var buckets = obj.network.simple_request(
-									'BUCKET_RETRIEVE_VIA_USER',
-									[ ses(), obj.data.list.au[0].id() ]
-								);
-								if (typeof buckets.ilsevent != 'undefined') {
-									obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.record_buckets.buckets.std_unexpected_error'), buckets);
-									return;
-								}
-								var items = [
-									[$("catStrings").getString('staff.cat.record_buckets.menulist_placeholder.item1'),''],
-									[$("catStrings").getString('staff.cat.record_buckets.menulist_placeholder.item2'),-1]
-								].concat(
-									util.functional.map_list(
-										util.functional.filter_list(
-											buckets.biblio,
-											function(o) {
-												return o.btype() == 'staff_client';
-											}
-										),
-										function(o) {
-											obj.bucket_id_name_map[ o.id() ] = o.name();
-											return [ o.name(), o.id() ];
-										}
-									).sort( 
-				                        function( a, b ) {
-				                            if (a[0] < b[0]) return -1;
-				                            if (a[0] > b[0]) return 1;
-				                            return 0;
-				                        }
-									)
-								);
-								obj.error.sdump('D_TRACE','items = ' + js2JSON(items));
-								util.widgets.remove_children( e );
-								var ml = util.widgets.make_menulist(
-									items
-								);
-								e.appendChild( ml );
-								ml.setAttribute('id','bucket_menulist');
-								ml.setAttribute('accesskey','');
-
-								function change_bucket(ev) {
-									var bucket_id = ev.target.value;
-									if (bucket_id < 0 ) {
-										bucket_id = window.prompt($("catStrings").getString('staff.cat.record_buckets.change_bucket.bucket_id'));
-										ev.target.value = bucket_id;
-										ev.target.setAttribute('value',bucket_id);
-									}
-									if (!bucket_id) return;
-									var x = document.getElementById('info_box');
-									if (x) x.setAttribute('hidden','true');
+     'record_buckets_menulist_placeholder' : [
+      ['render'],
+      function(e) {
+       return function() {
+        JSAN.use('util.widgets'); JSAN.use('util.functional');
+        var buckets = obj.network.simple_request(
+         'BUCKET_RETRIEVE_VIA_USER',
+         [ ses(), obj.data.list.au[0].id() ]
+        );
+        if (typeof buckets.ilsevent != 'undefined') {
+         obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.record_buckets.buckets.std_unexpected_error'), buckets);
+         return;
+        }
+        var items = [
+         [$("catStrings").getString('staff.cat.record_buckets.menulist_placeholder.item1'),''],
+         [$("catStrings").getString('staff.cat.record_buckets.menulist_placeholder.item2'),-1]
+        ].concat(
+         util.functional.map_list(
+          util.functional.filter_list(
+           buckets.biblio,
+           function(o) {
+            return o.btype() == 'staff_client';
+           }
+          ),
+          function(o) {
+           obj.bucket_id_name_map[ o.id() ] = o.name();
+           return [ o.name(), o.id() ];
+          }
+         ).sort( 
+                            function( a, b ) {
+                                if (a[0] < b[0]) return -1;
+                                if (a[0] > b[0]) return 1;
+                                return 0;
+                            }
+         )
+        );
+        obj.error.sdump('D_TRACE','items = ' + js2JSON(items));
+        util.widgets.remove_children( e );
+        var ml = util.widgets.make_menulist(
+         items
+        );
+        e.appendChild( ml );
+        ml.setAttribute('id','bucket_menulist');
+        ml.setAttribute('accesskey','');
+
+        function change_bucket(ev) {
+         var bucket_id = ev.target.value;
+         if (bucket_id < 0 ) {
+          bucket_id = window.prompt($("catStrings").getString('staff.cat.record_buckets.change_bucket.bucket_id'));
+          ev.target.value = bucket_id;
+          ev.target.setAttribute('value',bucket_id);
+         }
+         if (!bucket_id) return;
+         var x = document.getElementById('info_box');
+         if (x) x.setAttribute('hidden','true');
                                     x = document.getElementById('bucket_item_count');
                                     if (x) x.setAttribute('label','');
                                     obj.controller.view.cmd_record_buckets_delete_bucket.setAttribute('disabled','true');
@@ -342,19 +342,19 @@ cat.record_buckets.prototype = {
                                     obj.controller.view.cmd_delete_records.setAttribute('disabled','true');
                                     obj.controller.view.cmd_sel_opac.setAttribute('disabled','true');
                                     obj.controller.view.record_buckets_list_actions.disabled = true;
-									var bucket = obj.network.simple_request(
-										'BUCKET_FLESH',
-										[ ses(), 'biblio', bucket_id ]
-									);
-									if (typeof bucket.ilsevent != 'undefined') {
-										if (bucket.ilsevent == 1506 /* CONTAINER_NOT_FOUND */) {
-											alert(catStrings.getFormattedString('staff.cat.record_buckets.menulist.change_bucket.undefined',[bucket_id]));
-										} else {
-											obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.record_buckets.change_bucket.error'),bucket);
-										}
-										return;
-									}
-									try {
+         var bucket = obj.network.simple_request(
+          'BUCKET_FLESH',
+          [ ses(), 'biblio', bucket_id ]
+         );
+         if (typeof bucket.ilsevent != 'undefined') {
+          if (bucket.ilsevent == 1506 /* CONTAINER_NOT_FOUND */) {
+           alert(catStrings.getFormattedString('staff.cat.record_buckets.menulist.change_bucket.undefined',[bucket_id]));
+          } else {
+           obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.record_buckets.change_bucket.error'),bucket);
+          }
+          return;
+         }
+         try {
                                         obj.controller.view.cmd_record_buckets_delete_bucket.setAttribute('disabled','false');
                                         obj.controller.view.cmd_record_buckets_refresh.setAttribute('disabled','false');
                                         obj.controller.view.record_buckets_export_records.disabled = false;
@@ -363,41 +363,41 @@ cat.record_buckets.prototype = {
                                         obj.controller.view.cmd_sel_opac.setAttribute('disabled','false');
                                         obj.controller.view.record_buckets_list_actions.disabled = false;
 
-										var x = document.getElementById('info_box');
-										x.setAttribute('hidden','false');
-										x = document.getElementById('bucket_number');
-										x.setAttribute('value',bucket.id());
-										x = document.getElementById('bucket_name');
-										x.setAttribute('value',bucket.name());
-										x = document.getElementById('bucket_owner');
-										var s = bucket.owner(); JSAN.use('patron.util');
-										if (s && typeof s != "object") s = patron.util.retrieve_fleshed_au_via_id(ses(),s); 
-										x.setAttribute('value',s.family_name() + ' (' + s.card().barcode() + ") @ " + obj.data.hash.aou[ s.home_ou() ].shortname());
-									} catch(E) {
-										alert(E);
-									}
-									var items = bucket.items() || [];
-									obj.list2.clear();
+          var x = document.getElementById('info_box');
+          x.setAttribute('hidden','false');
+          x = document.getElementById('bucket_number');
+          x.setAttribute('value',bucket.id());
+          x = document.getElementById('bucket_name');
+          x.setAttribute('value',bucket.name());
+          x = document.getElementById('bucket_owner');
+          var s = bucket.owner(); JSAN.use('patron.util');
+          if (s && typeof s != "object") s = patron.util.retrieve_fleshed_au_via_id(ses(),s); 
+          x.setAttribute('value',s.family_name() + ' (' + s.card().barcode() + ") @ " + obj.data.hash.aou[ s.home_ou() ].shortname());
+         } catch(E) {
+          alert(E);
+         }
+         var items = bucket.items() || [];
+         obj.list2.clear();
                                     var x = document.getElementById('bucket_item_count');
                                     if (x && catStrings) x.setAttribute('value',catStrings.getFormattedString('cat.total_bucket_items_in_bucket',[items.length]));
-									for (var i = 0; i < items.length; i++) {
-										var item = obj.prep_record_for_list( 
-											items[i].target_biblio_record_entry(),
-											items[i].id()
-										);
-										if (item) obj.list2.append( item );
-									}
-								}
-
-								ml.addEventListener( 'change_bucket', change_bucket , false);
-								ml.addEventListener( 'command', function() {
-									JSAN.use('util.widgets'); util.widgets.dispatch('change_bucket',ml);
-								}, false);
-								obj.controller.view.bucket_menulist = ml;
-								JSAN.use('util.widgets'); util.widgets.dispatch('change_bucket',ml);
-							};
-						},
-					],
+         for (var i = 0; i < items.length; i++) {
+          var item = obj.prep_record_for_list( 
+           items[i].target_biblio_record_entry(),
+           items[i].id()
+          );
+          if (item) obj.list2.append( item );
+         }
+        }
+
+        ml.addEventListener( 'change_bucket', change_bucket , false);
+        ml.addEventListener( 'command', function() {
+         JSAN.use('util.widgets'); util.widgets.dispatch('change_bucket',ml);
+        }, false);
+        obj.controller.view.bucket_menulist = ml;
+        JSAN.use('util.widgets'); util.widgets.dispatch('change_bucket',ml);
+       };
+      },
+     ],
 
                     'cmd_record_buckets_refresh' : [
                         ['command'],
@@ -406,143 +406,143 @@ cat.record_buckets.prototype = {
                         }
                     ],
 
-					'cmd_add_all_query_to_pending' : [
-						['command'],
-						function() {
-    						obj.list0.select_all();
-							for (var i = 0; i < obj.selection_list0.length; i++) {
-								var docid = obj.selection_list0[i].docid;
-								try {
-									var item = obj.prep_record_for_list( docid );
-									if (!item) continue;
-									obj.list1.append( item );
+     'cmd_add_all_query_to_pending' : [
+      ['command'],
+      function() {
+          obj.list0.select_all();
+       for (var i = 0; i < obj.selection_list0.length; i++) {
+        var docid = obj.selection_list0[i].docid;
+        try {
+         var item = obj.prep_record_for_list( docid );
+         if (!item) continue;
+         obj.list1.append( item );
                                     obj.record_ids.push( docid );
-								} catch(E) {
-									alert( js2JSON(E) );
-								}
-							}
-						}
-					],
-
-					'cmd_add_sel_query_to_pending' : [
-						['command'],
-						function() {
-							for (var i = 0; i < obj.selection_list0.length; i++) {
-								var docid = obj.selection_list0[i].docid;
-								try {
-									var item = obj.prep_record_for_list( docid );
-									if (!item) continue;
-									obj.list1.append( item );
+        } catch(E) {
+         alert( js2JSON(E) );
+        }
+       }
+      }
+     ],
+
+     'cmd_add_sel_query_to_pending' : [
+      ['command'],
+      function() {
+       for (var i = 0; i < obj.selection_list0.length; i++) {
+        var docid = obj.selection_list0[i].docid;
+        try {
+         var item = obj.prep_record_for_list( docid );
+         if (!item) continue;
+         obj.list1.append( item );
                                     obj.record_ids.push( docid );
-								} catch(E) {
-									alert( js2JSON(E) );
-								}
-							}
-						}
-					],
-
-
-					'cmd_add_all_pending_to_record_bucket' : [
-						['command'],
-						function() {
-							var bucket_id = obj.controller.view.bucket_menulist.value;
-							if (!bucket_id) return;
-							for (var i = 0; i < obj.record_ids.length; i++) {
-								var bucket_item = new cbrebi();
-								bucket_item.isnew('1');
-								bucket_item.bucket(bucket_id);
-								bucket_item.target_biblio_record_entry( obj.record_ids[i] );
-								try {
-									var robj = obj.network.simple_request('BUCKET_ITEM_CREATE',
-										[ ses(), 'biblio', bucket_item ]);
-
-									if (typeof robj == 'object') throw robj;
-
-									var item = obj.prep_record_for_list( obj.record_ids[i], robj );
-									if (!item) continue;
-
-									obj.list2.append( item );
-								} catch(E) {
-									alert( js2JSON(E) );
-								}
-							}
-						}
-					],
-					'cmd_add_sel_pending_to_record_bucket' : [
-						['command'],
-						function() {                                                        
-							var bucket_id = obj.controller.view.bucket_menulist.value;
-							if (!bucket_id) return;
-							for (var i = 0; i < obj.selection_list1.length; i++) {
-								var docid = obj.selection_list1[i].docid;
-								var bucket_item = new cbrebi();
-								bucket_item.isnew('1');
-								bucket_item.bucket(bucket_id);
-								bucket_item.target_biblio_record_entry( docid );
-								try {
-									var robj = obj.network.simple_request('BUCKET_ITEM_CREATE',
-										[ ses(), 'biblio', bucket_item ]);
-
-									if (typeof robj == 'object') throw robj;
-
-									var item = obj.prep_record_for_list( docid, robj );
-									if (!item) continue;
-
-									obj.list2.append( item );
-								} catch(E) {
-									alert( js2JSON(E) );
-								}
-							}
-
-						}
-					],
-					'cmd_record_buckets_to_pending_buckets' : [
-						['command'],
-						function() {                                                        
-							for (var i = 0; i < obj.selection_list2.length; i++) {
-								var docid = obj.selection_list2[i].docid;
-								var item = obj.prep_record_for_list( docid );
-								if (item) {
-									obj.list1.append( item );
-									obj.record_ids.push( docid );
-								}
-							}
-						}
-					],
-
-					'cmd_record_buckets_delete_item' : [
-						['command'],
-						function() {
-							for (var i = 0; i < obj.selection_list2.length; i++) {
-								try {
-									var bucket_item_id = obj.selection_list2[i].bucket_item_id;
-									var robj = obj.network.simple_request('BUCKET_ITEM_DELETE',
-										[ ses(), 'biblio', bucket_item_id ]);
-									if (typeof robj == 'object') throw robj;
-								} catch(E) {
-									alert(js2JSON(E));
-								}
+        } catch(E) {
+         alert( js2JSON(E) );
+        }
+       }
+      }
+     ],
+
+
+     'cmd_add_all_pending_to_record_bucket' : [
+      ['command'],
+      function() {
+       var bucket_id = obj.controller.view.bucket_menulist.value;
+       if (!bucket_id) return;
+       for (var i = 0; i < obj.record_ids.length; i++) {
+        var bucket_item = new cbrebi();
+        bucket_item.isnew('1');
+        bucket_item.bucket(bucket_id);
+        bucket_item.target_biblio_record_entry( obj.record_ids[i] );
+        try {
+         var robj = obj.network.simple_request('BUCKET_ITEM_CREATE',
+          [ ses(), 'biblio', bucket_item ]);
+
+         if (typeof robj == 'object') throw robj;
+
+         var item = obj.prep_record_for_list( obj.record_ids[i], robj );
+         if (!item) continue;
+
+         obj.list2.append( item );
+        } catch(E) {
+         alert( js2JSON(E) );
+        }
+       }
+      }
+     ],
+     'cmd_add_sel_pending_to_record_bucket' : [
+      ['command'],
+      function() {                                                        
+       var bucket_id = obj.controller.view.bucket_menulist.value;
+       if (!bucket_id) return;
+       for (var i = 0; i < obj.selection_list1.length; i++) {
+        var docid = obj.selection_list1[i].docid;
+        var bucket_item = new cbrebi();
+        bucket_item.isnew('1');
+        bucket_item.bucket(bucket_id);
+        bucket_item.target_biblio_record_entry( docid );
+        try {
+         var robj = obj.network.simple_request('BUCKET_ITEM_CREATE',
+          [ ses(), 'biblio', bucket_item ]);
+
+         if (typeof robj == 'object') throw robj;
+
+         var item = obj.prep_record_for_list( docid, robj );
+         if (!item) continue;
+
+         obj.list2.append( item );
+        } catch(E) {
+         alert( js2JSON(E) );
+        }
+       }
+
+      }
+     ],
+     'cmd_record_buckets_to_pending_buckets' : [
+      ['command'],
+      function() {                                                        
+       for (var i = 0; i < obj.selection_list2.length; i++) {
+        var docid = obj.selection_list2[i].docid;
+        var item = obj.prep_record_for_list( docid );
+        if (item) {
+         obj.list1.append( item );
+         obj.record_ids.push( docid );
+        }
+       }
+      }
+     ],
+
+     'cmd_record_buckets_delete_item' : [
+      ['command'],
+      function() {
+       for (var i = 0; i < obj.selection_list2.length; i++) {
+        try {
+         var bucket_item_id = obj.selection_list2[i].bucket_item_id;
+         var robj = obj.network.simple_request('BUCKET_ITEM_DELETE',
+          [ ses(), 'biblio', bucket_item_id ]);
+         if (typeof robj == 'object') throw robj;
+        } catch(E) {
+         alert(js2JSON(E));
+        }
                                                         }
-							setTimeout(
-								function() {
-									JSAN.use('util.widgets'); 
-									util.widgets.dispatch('change_bucket',obj.controller.view.bucket_menulist);
-								}, 0
-							);
-						}
-					],
-					'cmd_record_buckets_delete_bucket' : [
-						['command'],
-						function() {
-							try {
-								var bucket = obj.controller.view.bucket_menulist.value;
-								var name = obj.bucket_id_name_map[ bucket ];
-								var conf = window.confirm($("catStrings").getFormattedString('staff.cat.record_buckets.delete_bucket_named', [name]));
-								if (!conf) return;
-								obj.list2.clear();
-								var robj = obj.network.simple_request('BUCKET_DELETE',[ses(),'biblio',bucket]);
-								if (typeof robj == 'object') throw robj;
-								var x = document.getElementById('info_box');
+       setTimeout(
+        function() {
+         JSAN.use('util.widgets'); 
+         util.widgets.dispatch('change_bucket',obj.controller.view.bucket_menulist);
+        }, 0
+       );
+      }
+     ],
+     'cmd_record_buckets_delete_bucket' : [
+      ['command'],
+      function() {
+       try {
+        var bucket = obj.controller.view.bucket_menulist.value;
+        var name = obj.bucket_id_name_map[ bucket ];
+        var conf = window.confirm($("catStrings").getFormattedString('staff.cat.record_buckets.delete_bucket_named', [name]));
+        if (!conf) return;
+        obj.list2.clear();
+        var robj = obj.network.simple_request('BUCKET_DELETE',[ses(),'biblio',bucket]);
+        if (typeof robj == 'object') throw robj;
+        var x = document.getElementById('info_box');
                                 x.setAttribute('hidden','true');
                                 obj.controller.view.cmd_record_buckets_delete_bucket.setAttribute('disabled','true');
                                 obj.controller.view.cmd_record_buckets_refresh.setAttribute('disabled','true');
@@ -551,63 +551,63 @@ cat.record_buckets.prototype = {
                                 obj.controller.view.cmd_delete_records.setAttribute('disabled','true');
                                 obj.controller.view.cmd_sel_opac.setAttribute('disabled','true');
                                 obj.controller.view.record_buckets_list_actions.disabled = true;
-								obj.controller.render('record_buckets_menulist_placeholder');
-								setTimeout(
-									function() {
-										JSAN.use('util.widgets'); 
-										util.widgets.dispatch('change_bucket',obj.controller.view.bucket_menulist);
-									}, 0
-								);
-
-							} catch(E) {
-								alert('FIXME: ' + E);
-							}
-						}
-					],
-					'cmd_record_buckets_new_bucket' : [
-						['command'],
-						function() {
-							try {
-								var name = prompt(
-									$("catStrings").getString('staff.cat.record_buckets.new_bucket.bucket_prompt'),
-									'',
-									$("catStrings").getString('staff.cat.record_buckets.new_bucket.bucket_prompt_title')
-								);
-
-								if (name) {
-									var bucket = new cbreb();
-									bucket.btype('staff_client');
-									bucket.owner( obj.data.list.au[0].id() );
-									bucket.name( name );
-
-									var robj = obj.network.simple_request('BUCKET_CREATE',[ses(),'biblio',bucket]);
-
-									if (typeof robj == 'object') {
-										if (robj.ilsevent == 1710 /* CONTAINER_EXISTS */) {
-											alert($("catStrings").getString('staff.cat.record_buckets.new_bucket.same_name_alert'));
-											return;
-										}
-										throw robj;
-									}
-
-									obj.controller.render('record_buckets_menulist_placeholder');
-									obj.controller.view.bucket_menulist.value = robj;
-									setTimeout(
-										function() {
-											JSAN.use('util.widgets'); 
-											util.widgets.dispatch('change_bucket',obj.controller.view.bucket_menulist);
-										}, 0
-									);
-								}
-							} catch(E) {
-								alert( js2JSON(E) );
-							}
-						}
-					],
-					
-					'cmd_record_query_csv_to_clipboard' : [ ['command'], function() { obj.list0.dump_csv_to_clipboard(); } ], 
-					'cmd_pending_buckets_csv_to_clipboard' : [ ['command'], function() { obj.list1.dump_csv_to_clipboard(); } ], 
-					'cmd_record_buckets_csv_to_clipboard' : [ ['command'], function() { obj.list2.dump_csv_to_clipboard(); } ],
+        obj.controller.render('record_buckets_menulist_placeholder');
+        setTimeout(
+         function() {
+          JSAN.use('util.widgets'); 
+          util.widgets.dispatch('change_bucket',obj.controller.view.bucket_menulist);
+         }, 0
+        );
+
+       } catch(E) {
+        alert('FIXME: ' + E);
+       }
+      }
+     ],
+     'cmd_record_buckets_new_bucket' : [
+      ['command'],
+      function() {
+       try {
+        var name = prompt(
+         $("catStrings").getString('staff.cat.record_buckets.new_bucket.bucket_prompt'),
+         '',
+         $("catStrings").getString('staff.cat.record_buckets.new_bucket.bucket_prompt_title')
+        );
+
+        if (name) {
+         var bucket = new cbreb();
+         bucket.btype('staff_client');
+         bucket.owner( obj.data.list.au[0].id() );
+         bucket.name( name );
+
+         var robj = obj.network.simple_request('BUCKET_CREATE',[ses(),'biblio',bucket]);
+
+         if (typeof robj == 'object') {
+          if (robj.ilsevent == 1710 /* CONTAINER_EXISTS */) {
+           alert($("catStrings").getString('staff.cat.record_buckets.new_bucket.same_name_alert'));
+           return;
+          }
+          throw robj;
+         }
+
+         obj.controller.render('record_buckets_menulist_placeholder');
+         obj.controller.view.bucket_menulist.value = robj;
+         setTimeout(
+          function() {
+           JSAN.use('util.widgets'); 
+           util.widgets.dispatch('change_bucket',obj.controller.view.bucket_menulist);
+          }, 0
+         );
+        }
+       } catch(E) {
+        alert( js2JSON(E) );
+       }
+      }
+     ],
+     
+     'cmd_record_query_csv_to_clipboard' : [ ['command'], function() { obj.list0.dump_csv_to_clipboard(); } ], 
+     'cmd_pending_buckets_csv_to_clipboard' : [ ['command'], function() { obj.list1.dump_csv_to_clipboard(); } ], 
+     'cmd_record_buckets_csv_to_clipboard' : [ ['command'], function() { obj.list2.dump_csv_to_clipboard(); } ],
                     'cmd_record_query_csv_to_printer' : [ ['command'], function() { obj.list0.dump_csv_to_printer(); } ],
                     'cmd_pending_buckets_csv_to_printer' : [ ['command'], function() { obj.list1.dump_csv_to_printer(); } ],
                     'cmd_record_buckets_csv_to_printer' : [ ['command'], function() { obj.list2.dump_csv_to_printer(); } ], 
@@ -615,249 +615,249 @@ cat.record_buckets.prototype = {
                     'cmd_pending_buckets_csv_to_file' : [ ['command'], function() { obj.list1.dump_csv_to_file( { 'defaultFileName' : 'pending_records.txt' } ); } ],
                     'cmd_record_buckets_csv_to_file' : [ ['command'], function() { obj.list2.dump_csv_to_file( { 'defaultFileName' : 'bucket_records.txt' } ); } ], 
 
-					'cmd_export_records_usmarc' : [
-						['command'],
-						function () { return cat.record_buckets.export_records(obj, 'usmarc') }
-					],
-
-					'cmd_export_records_unimarc' : [
-						['command'],
-						function () { return cat.record_buckets.export_records(obj, 'unimarc') }
-					],
-
-					'cmd_export_records_xml' : [
-						['command'],
-						function () { return cat.record_buckets.export_records(obj, 'xml') }
-					],
-
-					'cmd_export_records_bre' : [
-						['command'],
-						function () { return cat.record_buckets.export_records(obj, 'bre') }
-					],
-
-					'cmd_merge_records' : [
-						['command'],
-						function() {
-							try {
-								obj.list2.select_all();
-								obj.data.stash_retrieve();
-								JSAN.use('util.functional');
-
-								var record_ids = util.functional.map_list(
-									obj.list2.dump_retrieve_ids(),
-									function (o) {
-										return JSON2js(o).docid; // docid
-									}
-								);
-
-								netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
-								var top_xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" >';
-								top_xml += '<description>' + $("catStrings").getString('staff.cat.record_buckets.merge_records.merge_lead') + '</description>';
-								top_xml += '<hbox>';
-								top_xml += '<button id="lead" disabled="true" label="'
-										+ $("catStrings").getString('staff.cat.record_buckets.merge_records.button.label') + '" name="fancy_submit"/>';
-								top_xml += '<button label="' + $("catStrings").getString('staff.cat.record_buckets.merge_records.cancel_button.label') +'" accesskey="'
-										+ $("catStrings").getString('staff.cat.record_buckets.merge_records.cancel_button.accesskey') +'" name="fancy_cancel"/></hbox></vbox>';
-
-								var xml = '<form xmlns="http://www.w3.org/1999/xhtml">';
-								xml += '<table><tr valign="top">';
-								for (var i = 0; i < record_ids.length; i++) {
-									xml += '<td><input value="' + $("catStrings").getString('staff.cat.record_buckets.merge_records.lead')
-									xml += '" id="record_' + record_ids[i] + '" type="radio" name="lead"';
-									xml += ' onclick="' + "try { var x = $('lead'); x.setAttribute('value',";
-									xml += record_ids[i] + '); x.disabled = false; } catch(E) { alert(E); }">';
-									xml += '</input>' + $("catStrings").getFormattedString('staff.cat.record_buckets.merge_records.lead_record_number',[record_ids[i]]) + '</td>';
-								}
-								xml += '</tr><tr valign="top">';
-								for (var i = 0; i < record_ids.length; i++) {
-									xml += '<td nowrap="nowrap"><iframe src="' + urls.XUL_BIB_BRIEF; 
-									xml += '?docid=' + record_ids[i] + '"/></td>';
-								}
-								xml += '</tr><tr valign="top">';
-								for (var i = 0; i < record_ids.length; i++) {
-									xml += '<td nowrap="nowrap"><iframe style="min-height: 1000px; min-width: 300px;" flex="1" src="' + urls.XUL_MARC_VIEW + '?docid=' + record_ids[i] + ' "/></td>';
-								}
-								xml += '</tr></table></form>';
-								//obj.data.temp_merge_top = top_xml; obj.data.stash('temp_merge_top');
-								//obj.data.temp_merge_mid = xml; obj.data.stash('temp_merge_mid');
-								JSAN.use('util.window'); var win = new util.window();
-								var fancy_prompt_data = win.open(
-									urls.XUL_FANCY_PROMPT,
-									//+ '?xml_in_stash=temp_merge_mid'
-									//+ '&top_xml_in_stash=temp_merge_top'
-									//+ '&title=' + window.escape('Record Merging'),
-									'fancy_prompt', 'chrome,resizable,modal,width=700,height=500',
-									{
-										'top_xml' : top_xml, 'xml' : xml, 'title' : $("catStrings").getString('staff.cat.record_buckets.merge_records.fancy_prompt_title')
-									}
-								);
-								//obj.data.stash_retrieve();
-
-								if (typeof fancy_prompt_data.fancy_status == 'undefined' || fancy_prompt_data.fancy_status == 'incomplete') {
-									alert($("catStrings").getString('staff.cat.record_buckets.merge_records.fancy_prompt.alert'));
-									return;
-								}
-								var robj = obj.network.simple_request('MERGE_RECORDS', 
-									[ 
-										ses(), 
-										fancy_prompt_data.lead, 
-										util.functional.filter_list( record_ids,
-											function(o) {
-												return o != fancy_prompt_data.lead;
-											}
-										)
-									]
-								);
-								if (typeof robj.ilsevent != 'undefined') {
-									throw(robj);
-								}
-
-								obj.render_pending_records(); // FIXME -- need a generic refresh for lists
-								setTimeout(
-									function() {
-										JSAN.use('util.widgets'); 
-										util.widgets.dispatch('change_bucket',obj.controller.view.bucket_menulist);
-									}, 0
-								);
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.record_buckets.merge_records.catch.std_unex_error'),E);
-							}
-
-						}
-					],
-					
-					'cmd_delete_records' : [
-						['command'],
-						function() {
-							try {
-								obj.list2.select_all();
-								obj.data.stash_retrieve();
-								JSAN.use('util.functional');
-
-								var record_ids = util.functional.map_list(
-									obj.list2.dump_retrieve_ids(),
-									function (o) {
-										return JSON2js(o).docid; // docid
-									}
-								);
-
-								netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
-								var top_xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" >';
-								top_xml += '<description>' + $("catStrings").getString('staff.cat.record_buckets.delete_records.xml1') + '</description>';
-								top_xml += '<hbox>';
-								top_xml += '<button id="lead" disabled="false" label="'
-										+ $("catStrings").getString('staff.cat.record_buckets.delete_records.button.label')
-										+ '" name="fancy_submit"/>';
-								top_xml += '<button label="'
-										+ $("catStrings").getString('staff.cat.record_buckets.delete_records.cancel_button.label') +'" accesskey="'
-										+ $("catStrings").getString('staff.cat.record_buckets.delete_records.cancel_button.accesskey') +'" name="fancy_cancel"/></hbox></vbox>';
-
-								var xml = '<form xmlns="http://www.w3.org/1999/xhtml">';
-								xml += '<table><tr valign="top">';
-								for (var i = 0; i < record_ids.length; i++) {
-									xml += '<td>' + $("catStrings").getFormattedString('staff.cat.record_buckets.delete_records.xml2', [record_ids[i]]) + '</td>';
-								}
-								xml += '</tr><tr valign="top">';
-								for (var i = 0; i < record_ids.length; i++) {
-									xml += '<td nowrap="nowrap"><iframe src="' + urls.XUL_BIB_BRIEF; 
-									xml += '?docid=' + record_ids[i] + '"/></td>';
-								}
-								xml += '</tr><tr valign="top">';
-								for (var i = 0; i < record_ids.length; i++) {
-									xml += '<td nowrap="nowrap"><iframe style="min-height: 1000px; min-width: 300px;" flex="1" src="' + urls.XUL_MARC_VIEW + '?docid=' + record_ids[i] + ' "/></td>';
-								}
-								xml += '</tr></table></form>';
-								//obj.data.temp_merge_top = top_xml; obj.data.stash('temp_merge_top');
-								//obj.data.temp_merge_mid = xml; obj.data.stash('temp_merge_mid');
-								JSAN.use('util.window'); var win = new util.window();
-								var fancy_prompt_data = win.open(
-									urls.XUL_FANCY_PROMPT,
-									//+ '?xml_in_stash=temp_merge_mid'
-									//+ '&top_xml_in_stash=temp_merge_top'
-									//+ '&title=' + window.escape('Record Purging'),
-									'fancy_prompt', 'chrome,resizable,modal,width=700,height=500',
-									{
-										'top_xml' : top_xml, 'xml' : xml, 'title' : $("catStrings").getString('staff.cat.record_buckets.delete_records.fancy_prompt_title')
-									}
-								);
-								//obj.data.stash_retrieve();
-								if (typeof fancy_prompt_data.fancy_status == 'undefined' || fancy_prompt_data.fancy_status != 'complete') {
-									alert($("catStrings").getString('staff.cat.record_buckets.delete_records.fancy_prompt.alert'));
-									return;
-								}
-								var s = '';
-								for (var i = 0; i < record_ids.length; i++) {
-									var robj = obj.network.simple_request('FM_BRE_DELETE',[ses(),record_ids[i]]);
-									if (typeof robj.ilsevent != 'undefined') {
-										if (!s) s = $("catStrings").getString('staff.cat.record_buckets.delete_records.s1');
-										s += $("catStrings").getFormattedString('staff.cat.record_buckets.delete_records.s2', [record_ids[i], robj.textcode, robj.desc]);
-									}
-								}
-								if (s) { alert(s); }
-
-								obj.render_pending_records(); // FIXME -- need a generic refresh for lists
-								setTimeout(
-									function() {
-										JSAN.use('util.widgets'); 
-										util.widgets.dispatch('change_bucket',obj.controller.view.bucket_menulist);
-									}, 0
-								);
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.record_buckets.delete_records.catch.std_unex_err',E));
-							}
-
-						}
-					],
-
-					'cmd_broken' : [
-						['command'],
-						function() { alert($("catStrings").getString('staff.cat.record_buckets.cmd_broken.alert')); }
-					],
-					'cmd_sel_opac' : [
-						['command'],
-						function() {
-							try {
-								obj.list2.select_all();
-								JSAN.use('util.functional');
-								var docids = util.functional.map_list(
-									obj.list2.dump_retrieve_ids(),
-									function (o) {
-										return JSON2js(o).docid; // docid
-									}
-								);
+     'cmd_export_records_usmarc' : [
+      ['command'],
+      function () { return cat.record_buckets.export_records(obj, 'usmarc') }
+     ],
+
+     'cmd_export_records_unimarc' : [
+      ['command'],
+      function () { return cat.record_buckets.export_records(obj, 'unimarc') }
+     ],
+
+     'cmd_export_records_xml' : [
+      ['command'],
+      function () { return cat.record_buckets.export_records(obj, 'xml') }
+     ],
+
+     'cmd_export_records_bre' : [
+      ['command'],
+      function () { return cat.record_buckets.export_records(obj, 'bre') }
+     ],
+
+     'cmd_merge_records' : [
+      ['command'],
+      function() {
+       try {
+        obj.list2.select_all();
+        obj.data.stash_retrieve();
+        JSAN.use('util.functional');
+
+        var record_ids = util.functional.map_list(
+         obj.list2.dump_retrieve_ids(),
+         function (o) {
+          return JSON2js(o).docid; // docid
+         }
+        );
+
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
+        var top_xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" >';
+        top_xml += '<description>' + $("catStrings").getString('staff.cat.record_buckets.merge_records.merge_lead') + '</description>';
+        top_xml += '<hbox>';
+        top_xml += '<button id="lead" disabled="true" label="'
+          + $("catStrings").getString('staff.cat.record_buckets.merge_records.button.label') + '" name="fancy_submit"/>';
+        top_xml += '<button label="' + $("catStrings").getString('staff.cat.record_buckets.merge_records.cancel_button.label') +'" accesskey="'
+          + $("catStrings").getString('staff.cat.record_buckets.merge_records.cancel_button.accesskey') +'" name="fancy_cancel"/></hbox></vbox>';
+
+        var xml = '<form xmlns="http://www.w3.org/1999/xhtml">';
+        xml += '<table><tr valign="top">';
+        for (var i = 0; i < record_ids.length; i++) {
+         xml += '<td><input value="' + $("catStrings").getString('staff.cat.record_buckets.merge_records.lead')
+         xml += '" id="record_' + record_ids[i] + '" type="radio" name="lead"';
+         xml += ' onclick="' + "try { var x = $('lead'); x.setAttribute('value',";
+         xml += record_ids[i] + '); x.disabled = false; } catch(E) { alert(E); }">';
+         xml += '</input>' + $("catStrings").getFormattedString('staff.cat.record_buckets.merge_records.lead_record_number',[record_ids[i]]) + '</td>';
+        }
+        xml += '</tr><tr valign="top">';
+        for (var i = 0; i < record_ids.length; i++) {
+         xml += '<td nowrap="nowrap"><iframe src="' + urls.XUL_BIB_BRIEF; 
+         xml += '?docid=' + record_ids[i] + '"/></td>';
+        }
+        xml += '</tr><tr valign="top">';
+        for (var i = 0; i < record_ids.length; i++) {
+         xml += '<td nowrap="nowrap"><iframe style="min-height: 1000px; min-width: 300px;" flex="1" src="' + urls.XUL_MARC_VIEW + '?docid=' + record_ids[i] + ' "/></td>';
+        }
+        xml += '</tr></table></form>';
+        //obj.data.temp_merge_top = top_xml; obj.data.stash('temp_merge_top');
+        //obj.data.temp_merge_mid = xml; obj.data.stash('temp_merge_mid');
+        JSAN.use('util.window'); var win = new util.window();
+        var fancy_prompt_data = win.open(
+         urls.XUL_FANCY_PROMPT,
+         //+ '?xml_in_stash=temp_merge_mid'
+         //+ '&top_xml_in_stash=temp_merge_top'
+         //+ '&title=' + window.escape('Record Merging'),
+         'fancy_prompt', 'chrome,resizable,modal,width=700,height=500',
+         {
+          'top_xml' : top_xml, 'xml' : xml, 'title' : $("catStrings").getString('staff.cat.record_buckets.merge_records.fancy_prompt_title')
+         }
+        );
+        //obj.data.stash_retrieve();
+
+        if (typeof fancy_prompt_data.fancy_status == 'undefined' || fancy_prompt_data.fancy_status == 'incomplete') {
+         alert($("catStrings").getString('staff.cat.record_buckets.merge_records.fancy_prompt.alert'));
+         return;
+        }
+        var robj = obj.network.simple_request('MERGE_RECORDS', 
+         [ 
+          ses(), 
+          fancy_prompt_data.lead, 
+          util.functional.filter_list( record_ids,
+           function(o) {
+            return o != fancy_prompt_data.lead;
+           }
+          )
+         ]
+        );
+        if (typeof robj.ilsevent != 'undefined') {
+         throw(robj);
+        }
+
+        obj.render_pending_records(); // FIXME -- need a generic refresh for lists
+        setTimeout(
+         function() {
+          JSAN.use('util.widgets'); 
+          util.widgets.dispatch('change_bucket',obj.controller.view.bucket_menulist);
+         }, 0
+        );
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.record_buckets.merge_records.catch.std_unex_error'),E);
+       }
+
+      }
+     ],
+     
+     'cmd_delete_records' : [
+      ['command'],
+      function() {
+       try {
+        obj.list2.select_all();
+        obj.data.stash_retrieve();
+        JSAN.use('util.functional');
+
+        var record_ids = util.functional.map_list(
+         obj.list2.dump_retrieve_ids(),
+         function (o) {
+          return JSON2js(o).docid; // docid
+         }
+        );
+
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
+        var top_xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" >';
+        top_xml += '<description>' + $("catStrings").getString('staff.cat.record_buckets.delete_records.xml1') + '</description>';
+        top_xml += '<hbox>';
+        top_xml += '<button id="lead" disabled="false" label="'
+          + $("catStrings").getString('staff.cat.record_buckets.delete_records.button.label')
+          + '" name="fancy_submit"/>';
+        top_xml += '<button label="'
+          + $("catStrings").getString('staff.cat.record_buckets.delete_records.cancel_button.label') +'" accesskey="'
+          + $("catStrings").getString('staff.cat.record_buckets.delete_records.cancel_button.accesskey') +'" name="fancy_cancel"/></hbox></vbox>';
+
+        var xml = '<form xmlns="http://www.w3.org/1999/xhtml">';
+        xml += '<table><tr valign="top">';
+        for (var i = 0; i < record_ids.length; i++) {
+         xml += '<td>' + $("catStrings").getFormattedString('staff.cat.record_buckets.delete_records.xml2', [record_ids[i]]) + '</td>';
+        }
+        xml += '</tr><tr valign="top">';
+        for (var i = 0; i < record_ids.length; i++) {
+         xml += '<td nowrap="nowrap"><iframe src="' + urls.XUL_BIB_BRIEF; 
+         xml += '?docid=' + record_ids[i] + '"/></td>';
+        }
+        xml += '</tr><tr valign="top">';
+        for (var i = 0; i < record_ids.length; i++) {
+         xml += '<td nowrap="nowrap"><iframe style="min-height: 1000px; min-width: 300px;" flex="1" src="' + urls.XUL_MARC_VIEW + '?docid=' + record_ids[i] + ' "/></td>';
+        }
+        xml += '</tr></table></form>';
+        //obj.data.temp_merge_top = top_xml; obj.data.stash('temp_merge_top');
+        //obj.data.temp_merge_mid = xml; obj.data.stash('temp_merge_mid');
+        JSAN.use('util.window'); var win = new util.window();
+        var fancy_prompt_data = win.open(
+         urls.XUL_FANCY_PROMPT,
+         //+ '?xml_in_stash=temp_merge_mid'
+         //+ '&top_xml_in_stash=temp_merge_top'
+         //+ '&title=' + window.escape('Record Purging'),
+         'fancy_prompt', 'chrome,resizable,modal,width=700,height=500',
+         {
+          'top_xml' : top_xml, 'xml' : xml, 'title' : $("catStrings").getString('staff.cat.record_buckets.delete_records.fancy_prompt_title')
+         }
+        );
+        //obj.data.stash_retrieve();
+        if (typeof fancy_prompt_data.fancy_status == 'undefined' || fancy_prompt_data.fancy_status != 'complete') {
+         alert($("catStrings").getString('staff.cat.record_buckets.delete_records.fancy_prompt.alert'));
+         return;
+        }
+        var s = '';
+        for (var i = 0; i < record_ids.length; i++) {
+         var robj = obj.network.simple_request('FM_BRE_DELETE',[ses(),record_ids[i]]);
+         if (typeof robj.ilsevent != 'undefined') {
+          if (!s) s = $("catStrings").getString('staff.cat.record_buckets.delete_records.s1');
+          s += $("catStrings").getFormattedString('staff.cat.record_buckets.delete_records.s2', [record_ids[i], robj.textcode, robj.desc]);
+         }
+        }
+        if (s) { alert(s); }
+
+        obj.render_pending_records(); // FIXME -- need a generic refresh for lists
+        setTimeout(
+         function() {
+          JSAN.use('util.widgets'); 
+          util.widgets.dispatch('change_bucket',obj.controller.view.bucket_menulist);
+         }, 0
+        );
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.record_buckets.delete_records.catch.std_unex_err',E));
+       }
+
+      }
+     ],
+
+     'cmd_broken' : [
+      ['command'],
+      function() { alert($("catStrings").getString('staff.cat.record_buckets.cmd_broken.alert')); }
+     ],
+     'cmd_sel_opac' : [
+      ['command'],
+      function() {
+       try {
+        obj.list2.select_all();
+        JSAN.use('util.functional');
+        var docids = util.functional.map_list(
+         obj.list2.dump_retrieve_ids(),
+         function (o) {
+          return JSON2js(o).docid; // docid
+         }
+        );
                                 var seen = {};
-								for (var i = 0; i < docids.length; i++) {
-									var doc_id = docids[i];
+        for (var i = 0; i < docids.length; i++) {
+         var doc_id = docids[i];
                                     if (seen[doc_id]) continue; seen[doc_id] = true;
-									var opac_url = xulG.url_prefix( urls.opac_rdetail ) + '?r=' + doc_id;
-									var content_params = { 
-										'session' : ses(),
-										'authtime' : ses('authtime'),
-										'opac_url' : opac_url
-									};
-									xulG.new_tab(
-										xulG.url_prefix(urls.XUL_OPAC_WRAPPER), 
-										{'tab_name':$("catStrings").getString('staff.cat.record_buckets.cmd_sel_opac.tab_name')}, 
-										content_params
-									);
-								}
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.record_buckets.cmd_sel_opac.catch.std_unex_err'),E);
-							}
-						}
-					],
+         var opac_url = xulG.url_prefix( urls.opac_rdetail ) + '?r=' + doc_id;
+         var content_params = { 
+          'session' : ses(),
+          'authtime' : ses('authtime'),
+          'opac_url' : opac_url
+         };
+         xulG.new_tab(
+          xulG.url_prefix(urls.XUL_OPAC_WRAPPER), 
+          {'tab_name':$("catStrings").getString('staff.cat.record_buckets.cmd_sel_opac.tab_name')}, 
+          content_params
+         );
+        }
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.record_buckets.cmd_sel_opac.catch.std_unex_err'),E);
+       }
+      }
+     ],
                     'record_buckets_export_records' : [ ['render'], function(){} ],
                     'record_buckets_list_actions' : [ ['render'], function(){} ]
-				}
-			}
-		);
-		this.controller.render();
+    }
+   }
+  );
+  this.controller.render();
 
-		if (typeof xulG == 'undefined') {
-			obj.controller.view.cmd_sel_opac.disabled = true;
-			obj.controller.view.cmd_sel_opac.setAttribute('disabled',true);
-		}
-	},
+  if (typeof xulG == 'undefined') {
+   obj.controller.view.cmd_sel_opac.disabled = true;
+   obj.controller.view.cmd_sel_opac.setAttribute('disabled',true);
+  }
+ },
 
     'submit' : function() {
         try {
@@ -911,9 +911,9 @@ cat.record_buckets.prototype = {
         }
     },
 
-	'prep_record_for_list' : function(docid,bucket_item_id) {
-		var obj = this;
-		try {
+ 'prep_record_for_list' : function(docid,bucket_item_id) {
+  var obj = this;
+  try {
             var item = {
                 'retrieve_id' : js2JSON( { 'docid' : docid, 'bucket_item_id' : bucket_item_id } ),
                 'row' : {
@@ -924,12 +924,12 @@ cat.record_buckets.prototype = {
                 }
             };
             return item;
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert($("catStrings").getFormattedString('staff.cat.record_buckets.prep_record_for_list.std_unex_err', [docid]),E);
-			return null;
-		}
-	}
-	
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert($("catStrings").getFormattedString('staff.cat.record_buckets.prep_record_for_list.std_unex_err', [docid]),E);
+   return null;
+  }
+ }
+ 
 };
 
 dump('exiting cat.record_buckets.js\n');
diff --git a/Open-ILS/xul/staff_client/server/cat/record_buckets.xul b/Open-ILS/xul/staff_client/server/cat/record_buckets.xul
index 4efb76f507..cef45a8f6c 100644
--- a/Open-ILS/xul/staff_client/server/cat/record_buckets.xul
+++ b/Open-ILS/xul/staff_client/server/cat/record_buckets.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -21,117 +21,117 @@
 <?xul-overlay href="/xul/server/cat/record_buckets_overlay.xul"?>
 
 <window id="record_buckets_win" title="&staff.cat.record_buckets.title;"
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }" height="300" width="300" oils_persist="height width"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }" height="300" width="300" oils_persist="height width"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
         var catStrings;
 
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
-				/* ugly hack so we don't have to upgrade the chrome for quick buckets */
-				if (typeof xulG == 'undefined') location.href = String(location.href).replace(/record_buckets.xul/,'record_buckets_quick.xul');
+    /* ugly hack so we don't have to upgrade the chrome for quick buckets */
+    if (typeof xulG == 'undefined') location.href = String(location.href).replace(/record_buckets.xul/,'record_buckets_quick.xul');
 
-				/* load translatable strings into easily referenced variables */
+    /* load translatable strings into easily referenced variables */
                 catStrings = document.getElementById('catStrings');
                 commonStrings = document.getElementById('commonStrings');
 
                 if (typeof JSAN == 'undefined') { throw( commonStrings.getString('common.jsan.missing') ); }
 
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for record_buckets.xul');
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-
-				var record_ids = xul_param(
-					'record_ids',{
-						'concat' : true,
-						'JSON2js_if_cgi' : true,
-						'JSON2js_if_xpcom' : true,
-						'stash_name':'rb_temp_record_ids',
-						'clear_xpcom' : true,
-					}
-				);
-
-				JSAN.use('cat.record_buckets'); g.record_buckets = new cat.record_buckets();
-				g.record_buckets.init( 
-					{ 
-						'record_ids' : record_ids,
-					} 
-				);
-	
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					try { window.xulG.set_tab_name(catStrings.getString('staff.cat.record_buckets.tab_name')); } catch(E) { alert(E); }
-				}
-
-			} catch(E) {
-				var err_msg = commonStrings.getFormattedString('common.exception', ['cat/record_buckets.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-	]]>
-	</script>
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for record_buckets.xul');
+    JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+
+    var record_ids = xul_param(
+     'record_ids',{
+      'concat' : true,
+      'JSON2js_if_cgi' : true,
+      'JSON2js_if_xpcom' : true,
+      'stash_name':'rb_temp_record_ids',
+      'clear_xpcom' : true,
+     }
+    );
+
+    JSAN.use('cat.record_buckets'); g.record_buckets = new cat.record_buckets();
+    g.record_buckets.init( 
+     { 
+      'record_ids' : record_ids,
+     } 
+    );
+ 
+    if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+     try { window.xulG.set_tab_name(catStrings.getString('staff.cat.record_buckets.tab_name')); } catch(E) { alert(E); }
+    }
+
+   } catch(E) {
+    var err_msg = commonStrings.getFormattedString('common.exception', ['cat/record_buckets.xul', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+
+ ]]>
+ </script>
 
     <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
     <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
 
-	<commandset id="record_buckets_cmds">
-		<command id="sel_clip0" disabled="true"/>
-		<command id="sel_clip1" disabled="true"/>
-		<command id="sel_clip2" disabled="true"/>
-		<command id="save_columns0" />
-		<command id="save_columns1" />
-		<command id="save_columns2" />
-
-		<command id="cmd_record_query_csv_to_printer" />
-		<command id="cmd_record_query_csv_to_clipboard" />
-		<command id="cmd_record_query_csv_to_file" />
-
-		<command id="cmd_pending_buckets_csv_to_printer" />
-		<command id="cmd_pending_buckets_csv_to_clipboard" />
-		<command id="cmd_pending_buckets_csv_to_file" />
-
-		<command id="cmd_record_buckets_new_bucket" />
-		<command id="cmd_record_buckets_delete_bucket" disabled="true"/>
-		<command id="cmd_record_buckets_refresh" disabled="true"/>
-
-    	<command id="cmd_record_buckets_delete_item" />
-    	<command id="cmd_record_buckets_to_pending_buckets" />
-
-		<command id="cmd_record_buckets_csv_to_printer" />
-		<command id="cmd_record_buckets_csv_to_clipboard" />
-		<command id="cmd_record_buckets_csv_to_file" />
-		
+ <commandset id="record_buckets_cmds">
+  <command id="sel_clip0" disabled="true"/>
+  <command id="sel_clip1" disabled="true"/>
+  <command id="sel_clip2" disabled="true"/>
+  <command id="save_columns0" />
+  <command id="save_columns1" />
+  <command id="save_columns2" />
+
+  <command id="cmd_record_query_csv_to_printer" />
+  <command id="cmd_record_query_csv_to_clipboard" />
+  <command id="cmd_record_query_csv_to_file" />
+
+  <command id="cmd_pending_buckets_csv_to_printer" />
+  <command id="cmd_pending_buckets_csv_to_clipboard" />
+  <command id="cmd_pending_buckets_csv_to_file" />
+
+  <command id="cmd_record_buckets_new_bucket" />
+  <command id="cmd_record_buckets_delete_bucket" disabled="true"/>
+  <command id="cmd_record_buckets_refresh" disabled="true"/>
+
+     <command id="cmd_record_buckets_delete_item" />
+     <command id="cmd_record_buckets_to_pending_buckets" />
+
+  <command id="cmd_record_buckets_csv_to_printer" />
+  <command id="cmd_record_buckets_csv_to_clipboard" />
+  <command id="cmd_record_buckets_csv_to_file" />
+  
         <command id="cmd_add_all_query_to_pending" />
         <command id="cmd_add_sel_query_to_pending" />
 
         <command id="cmd_add_all_pending_to_record_bucket" />
         <command id="cmd_add_sel_pending_to_record_bucket" />
 
-		<command id="cmd_merge_records" disabled="true" />
-		<command id="cmd_export_records_usmarc" />
-		<command id="cmd_export_records_unimarc" />
-		<command id="cmd_export_records_xml" />
-		<command id="cmd_export_records_bre" />
-		<command id="cmd_delete_records" disabled="true" />
-		<command id="cmd_sel_opac" disabled="true" />
-		
+  <command id="cmd_merge_records" disabled="true" />
+  <command id="cmd_export_records_usmarc" />
+  <command id="cmd_export_records_unimarc" />
+  <command id="cmd_export_records_xml" />
+  <command id="cmd_export_records_bre" />
+  <command id="cmd_delete_records" disabled="true" />
+  <command id="cmd_sel_opac" disabled="true" />
+  
         <command id="cmd_submit_query" />
-	</commandset>
+ </commandset>
 
-	<box id="record_buckets_main" />
+ <box id="record_buckets_main" />
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/cat/record_buckets_overlay.xul b/Open-ILS/xul/staff_client/server/cat/record_buckets_overlay.xul
index ca6b8ff214..6384252f66 100644
--- a/Open-ILS/xul/staff_client/server/cat/record_buckets_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/cat/record_buckets_overlay.xul
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 <overlay id="record_buckets_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading record_buckets_overlay.xul\n');</script>
 
@@ -13,18 +13,18 @@
 <commandset id="record_buckets_cmds" />
 
 <box id="record_buckets_main" flex="1" orient="vertical" class="my_overflow">
-	<vbox id="cmvb1" flex="1"/>
+ <vbox id="cmvb1" flex="1"/>
 </box>
 
 <vbox id="cmvb1" flex="1">
     <tabbox id="record_buckets_tabbox" flex="1" oils_persist="selectedIndex">
         <tabs>
             <tab id="record_query_tab" label="&staff.cat.record_buckets_overlay.record_query_tab.label;"
-									accesskey="&staff.cat.record_buckets_overlay.record_query_tab.accesskey;"/>
+         accesskey="&staff.cat.record_buckets_overlay.record_query_tab.accesskey;"/>
             <tab id="pending_records_tab" label="&staff.cat.record_buckets_overlay.pending_records_tab.label;"
-									accesskey="&staff.cat.record_buckets_overlay.pending_records_tab.accesskey;"/>
+         accesskey="&staff.cat.record_buckets_overlay.pending_records_tab.accesskey;"/>
             <tab id="bucket_view_tab" label="&staff.cat.record_buckets_overlay.bucket_view_tab.label;"
-								 accesskey="&staff.cat.record_buckets_overlay.bucket_view_tab.accesskey;" />
+         accesskey="&staff.cat.record_buckets_overlay.bucket_view_tab.accesskey;" />
         </tabs>
         <tabpanels flex="1">
             <tabpanel id="record_query_panel">
@@ -84,99 +84,99 @@
 </hbox>
 
 <hbox id="record_query_bottom_ui">
-	<button id="record_query_list_actions" oncommand="this.firstChild.showPopup();"
+ <button id="record_query_list_actions" oncommand="this.firstChild.showPopup();"
         label="&staff.cat.record_buckets_overlay.query_list_actions.label;" 
         accesskey="&staff.cat.record_buckets_overlay.query_list_actions.accesskey;" 
         type="menu" allowevents="true">
         <menupopup id="record_query_list_actions_popup">
-        	<menuitem command="sel_clip0" label="&staff.cat.record_buckets_overlay.menuitem.sel_clip0.label;" disabled="true" />
-    	    <menuitem command="cmd_record_query_csv_to_printer" label="&staff.cat.record_buckets_overlay.menuitem.query_csv_to_printer.label;" />
-        	<menuitem command="cmd_record_query_csv_to_clipboard" label="&staff.cat.record_buckets_overlay.menuitem.query_csv_to_clipboard.label;" accesskey=""/>
-        	<menuitem command="cmd_record_query_csv_to_file" label="&staff.cat.record_buckets_overlay.menuitem.query_csv_to_file.label;" accesskey=""/>
-	        <menuitem command="save_columns0" label="&staff.cat.record_buckets_overlay.menuitem.save_columns0.label;" />
+         <menuitem command="sel_clip0" label="&staff.cat.record_buckets_overlay.menuitem.sel_clip0.label;" disabled="true" />
+         <menuitem command="cmd_record_query_csv_to_printer" label="&staff.cat.record_buckets_overlay.menuitem.query_csv_to_printer.label;" />
+         <menuitem command="cmd_record_query_csv_to_clipboard" label="&staff.cat.record_buckets_overlay.menuitem.query_csv_to_clipboard.label;" accesskey=""/>
+         <menuitem command="cmd_record_query_csv_to_file" label="&staff.cat.record_buckets_overlay.menuitem.query_csv_to_file.label;" accesskey=""/>
+         <menuitem command="save_columns0" label="&staff.cat.record_buckets_overlay.menuitem.save_columns0.label;" />
         </menupopup>
     </button>
-	<spacer flex="1"/>
-	<button command="cmd_add_all_query_to_pending"
+ <spacer flex="1"/>
+ <button command="cmd_add_all_query_to_pending"
       label="&staff.cat.record_buckets_overlay.add_all_query_to_pending.label;"
-		  accesskey="" image="/xul/server/skin/media/images/right_arrow.png"/>
-	<button command="cmd_add_sel_query_to_pending"
-	  label="&staff.cat.record_buckets_overlay.add_sel_query_to_pending.label;"
-		accesskey="" image="/xul/server/skin/media/images/right_arrow.png"/>
+    accesskey="" image="/xul/server/skin/media/images/right_arrow.png"/>
+ <button command="cmd_add_sel_query_to_pending"
+   label="&staff.cat.record_buckets_overlay.add_sel_query_to_pending.label;"
+  accesskey="" image="/xul/server/skin/media/images/right_arrow.png"/>
 </hbox>
 
 <hbox id="pending_buckets_bottom_ui">
-	<button id="pending_buckets_list_actions" oncommand="this.firstChild.showPopup();"
+ <button id="pending_buckets_list_actions" oncommand="this.firstChild.showPopup();"
       label="&staff.cat.record_buckets_overlay.pending_buckets_list_actions.label;"
       accesskey="&staff.cat.record_buckets_overlay.pending_buckets_list_actions.accesskey;"
       type="menu" allowevents="true">
         <menupopup id="pending_buckets_list_actions_popup">
-        	<menuitem command="sel_clip1" label="&staff.cat.record_buckets_overlay.menuitem.sel_clip1.label;" disabled="true" />
-    	    <menuitem command="cmd_pending_buckets_csv_to_printer" label="&staff.cat.record_buckets_overlay.menuitem.pending_buckets_csv_to_printer.label;" />
-        	<menuitem command="cmd_pending_buckets_csv_to_clipboard" label="&staff.cat.record_buckets_overlay.menuitem.pending_buckets_csv_to_clipboard.label;" accesskey=""/>
-        	<menuitem command="cmd_pending_buckets_csv_to_file" label="&staff.cat.record_buckets_overlay.menuitem.pending_buckets_csv_to_file.label;" accesskey=""/>
-	        <menuitem command="save_columns1" label="&staff.cat.record_buckets_overlay.menuitem.save_columns1.label;" />
+         <menuitem command="sel_clip1" label="&staff.cat.record_buckets_overlay.menuitem.sel_clip1.label;" disabled="true" />
+         <menuitem command="cmd_pending_buckets_csv_to_printer" label="&staff.cat.record_buckets_overlay.menuitem.pending_buckets_csv_to_printer.label;" />
+         <menuitem command="cmd_pending_buckets_csv_to_clipboard" label="&staff.cat.record_buckets_overlay.menuitem.pending_buckets_csv_to_clipboard.label;" accesskey=""/>
+         <menuitem command="cmd_pending_buckets_csv_to_file" label="&staff.cat.record_buckets_overlay.menuitem.pending_buckets_csv_to_file.label;" accesskey=""/>
+         <menuitem command="save_columns1" label="&staff.cat.record_buckets_overlay.menuitem.save_columns1.label;" />
         </menupopup>
     </button>
-	<spacer flex="1"/>
-	<button command="cmd_add_all_pending_to_record_bucket"
+ <spacer flex="1"/>
+ <button command="cmd_add_all_pending_to_record_bucket"
       label="&staff.cat.record_buckets_overlay.add_all_pending_to_record_bucket.label;"
       accesskey="&staff.cat.record_buckets_overlay.add_all_pending_to_record_bucket.accesskey;"
       image="/xul/server/skin/media/images/right_arrow.png"/>
-	<button command="cmd_add_sel_pending_to_record_bucket"
+ <button command="cmd_add_sel_pending_to_record_bucket"
       label="&staff.cat.record_buckets_overlay.add_sel_pending_to_record_bucket.label;"
       accesskey="" image="/xul/server/skin/media/images/right_arrow.png"/>
 </hbox>
 
 <hbox id="record_buckets_top_ui">
-	<button command="cmd_record_buckets_delete_item"
+ <button command="cmd_record_buckets_delete_item"
       label="&staff.cat.record_buckets_overlay.record_buckets_del_item.label;"
       disabled="true" image="/xul/server/skin/media/images/icon_delete.gif"/>
-	<button command="cmd_record_buckets_to_pending_buckets"
+ <button command="cmd_record_buckets_to_pending_buckets"
       label="&staff.cat.record_buckets_overlay.record_buckets_to_pending_buckets.label;"
       disabled="true" image="/xul/server/skin/media/images/left_arrow.png"/>
 </hbox>
 
 <hbox id="info_box" hidden="true" style="font-size: large;">
-	<label value="&staff.cat.record_buckets_overlay.info_box.label;"/>
-	<label id="bucket_number" style="color: blue; text-decoration: underline; -moz-user-focus: normal;" onclick="copy_to_clipboard(event)"/>
-	<label id="bucket_name" style="color: blue;"/>
-	<label value="&staff.cat.record_buckets_overlay.bucket_owner.label;"/>
-	<label id="bucket_owner" style="color: blue;"/>
+ <label value="&staff.cat.record_buckets_overlay.info_box.label;"/>
+ <label id="bucket_number" style="color: blue; text-decoration: underline; -moz-user-focus: normal;" onclick="copy_to_clipboard(event)"/>
+ <label id="bucket_name" style="color: blue;"/>
+ <label value="&staff.cat.record_buckets_overlay.bucket_owner.label;"/>
+ <label id="bucket_owner" style="color: blue;"/>
 </hbox>
 
 <hbox id="record_buckets_bottom_ui">
-	<button id="record_buckets_list_actions" oncommand="this.firstChild.showPopup();"
+ <button id="record_buckets_list_actions" oncommand="this.firstChild.showPopup();"
       label="&staff.cat.record_buckets_overlay.record_buckets_list_actions.label;"
       accesskey="&staff.cat.record_buckets_overlay.record_buckets_list_actions.accesskey;"
       type="menu" allowevents="true" disabled="true">
         <menupopup id="record_buckets_list_actions_popup">
-	        <menuitem command="sel_clip2"
-						label="&staff.cat.record_buckets_overlay.menuitem.sel_clip2.label;" disabled="true" />
-    	    <menuitem command="cmd_record_buckets_csv_to_printer"
-						label="&staff.cat.record_buckets_overlay.menuitem.record_buckets_csv_to_printer.label;" />
-						<menuitem command="cmd_record_buckets_csv_to_clipboard"
-							label="&staff.cat.record_buckets_overlay.menuitem.record_buckets_csv_to_clipboard.label;" />
-						<menuitem command="cmd_record_buckets_csv_to_file"
-							label="&staff.cat.record_buckets_overlay.menuitem.record_buckets_csv_to_file.label;" accesskey=""/>
-	        <menuitem command="save_columns2" label="&staff.cat.record_buckets_overlay.menuitem.save_columns2.label;" />
+         <menuitem command="sel_clip2"
+      label="&staff.cat.record_buckets_overlay.menuitem.sel_clip2.label;" disabled="true" />
+         <menuitem command="cmd_record_buckets_csv_to_printer"
+      label="&staff.cat.record_buckets_overlay.menuitem.record_buckets_csv_to_printer.label;" />
+      <menuitem command="cmd_record_buckets_csv_to_clipboard"
+       label="&staff.cat.record_buckets_overlay.menuitem.record_buckets_csv_to_clipboard.label;" />
+      <menuitem command="cmd_record_buckets_csv_to_file"
+       label="&staff.cat.record_buckets_overlay.menuitem.record_buckets_csv_to_file.label;" accesskey=""/>
+         <menuitem command="save_columns2" label="&staff.cat.record_buckets_overlay.menuitem.save_columns2.label;" />
         </menupopup>
     </button>
-	<spacer flex="1"/>
-	<hbox style="background: grey">
-		<vbox><spacer flex="1"/><label value="&staff.cat.record_buckets_overlay.box.label;" style="font-weight: bold"/><spacer flex="1"/></vbox>
-		<button command="cmd_sel_opac" label="&staff.cat.record_buckets_overlay.sel_opac.label;" accesskey=""/>
-		<button command="cmd_delete_records" label="&staff.cat.record_buckets_overlay.del_records.label;"/>
-		<button command="cmd_merge_records" label="&staff.cat.record_buckets_overlay.merge_records.label;"/>
-		<button id="record_buckets_export_records" label="&staff.cat.record_buckets_overlay.export_records.label;" type="menu" allowevents="true" disabled="true">
-			<menupopup id="record_buckets_export_record_types" allowevents="true">
-				<menuitem command="cmd_export_records_usmarc" label="&staff.cat.record_buckets_overlay.menuitem.export_usmarc.label;"/>
-				<menuitem command="cmd_export_records_unimarc" label="&staff.cat.record_buckets_overlay.menuitem.export_unimarc.label;"/>
-				<menuitem command="cmd_export_records_xml" label="&staff.cat.record_buckets_overlay.menuitem.export_xml.label;"/>
-				<menuitem command="cmd_export_records_bre" label="&staff.cat.record_buckets_overlay.menuitem.export_eg_bre.label;"/>
-			</menupopup>
-		</button>
-	</hbox>
+ <spacer flex="1"/>
+ <hbox style="background: grey">
+  <vbox><spacer flex="1"/><label value="&staff.cat.record_buckets_overlay.box.label;" style="font-weight: bold"/><spacer flex="1"/></vbox>
+  <button command="cmd_sel_opac" label="&staff.cat.record_buckets_overlay.sel_opac.label;" accesskey=""/>
+  <button command="cmd_delete_records" label="&staff.cat.record_buckets_overlay.del_records.label;"/>
+  <button command="cmd_merge_records" label="&staff.cat.record_buckets_overlay.merge_records.label;"/>
+  <button id="record_buckets_export_records" label="&staff.cat.record_buckets_overlay.export_records.label;" type="menu" allowevents="true" disabled="true">
+   <menupopup id="record_buckets_export_record_types" allowevents="true">
+    <menuitem command="cmd_export_records_usmarc" label="&staff.cat.record_buckets_overlay.menuitem.export_usmarc.label;"/>
+    <menuitem command="cmd_export_records_unimarc" label="&staff.cat.record_buckets_overlay.menuitem.export_unimarc.label;"/>
+    <menuitem command="cmd_export_records_xml" label="&staff.cat.record_buckets_overlay.menuitem.export_xml.label;"/>
+    <menuitem command="cmd_export_records_bre" label="&staff.cat.record_buckets_overlay.menuitem.export_eg_bre.label;"/>
+   </menupopup>
+  </button>
+ </hbox>
 </hbox>
 
 </overlay>
diff --git a/Open-ILS/xul/staff_client/server/cat/record_buckets_quick.xul b/Open-ILS/xul/staff_client/server/cat/record_buckets_quick.xul
index 4d5a0252b3..bc31cff6d3 100644
--- a/Open-ILS/xul/staff_client/server/cat/record_buckets_quick.xul
+++ b/Open-ILS/xul/staff_client/server/cat/record_buckets_quick.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,150 +20,150 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="record_buckets_win" title="&staff.cat.record_buckets_quick.add_to_bucket.title;"
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }" oils_persist="height width"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
-	<scripts id="openils_util_scripts"/>
-
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-		function $c(n) { return document.createElement(n); }
-
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		                if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for cat/record_buckets_quick.xul');
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-
-				g.record_ids = xul_param(
-					'record_ids',{
-						'concat' : true,
-						'modal_xulG' : true,
-						'JSON2js_if_cgi' : true,
-						'JSON2js_if_xpcom' : true,
-						'stash_name':'rb_temp_record_ids',
-						'clear_xpcom' : true
-					}
-				);
-
-				$('desc').appendChild( document.createTextNode( 
-					(g.record_ids.length == 1 ?
-						$("catStrings").getString('staff.cat.record_buckets_quick.copy_one_record') :
-						$("catStrings").getFormattedString('staff.cat.record_buckets_quick.copy_multiple_records', [g.record_ids.length])) 
-				) );
-				var robj = g.network.simple_request('BUCKET_RETRIEVE_VIA_USER',[ ses(), g.data.list.au[0].id() ]);
-				if (typeof robj.ilsevent != 'undefined') throw(robj);
-
-				for (var i = 0; i < robj.biblio.length; i++) {
-					if (robj.biblio[i].btype() != 'staff_client') continue;
-					var listitem = $c('listitem');
-					listitem.setAttribute('label', robj.biblio[i].name());
-					listitem.setAttribute('id', robj.biblio[i].id());
-					$('bucket_list').appendChild(listitem);
-				}
-				try { $('bucket_list').selectedIndex = 0; } catch(E) { }
-				$('bucket_list').focus();
-
-			} catch(E) {
-				try { 
-					g.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.record_buckets_quick.initing_record_buckets_quick_xul'), E);
-				} catch(F) { 
-					alert(E); 
-				}
-			}
-		}
-
-		g.new_bucket = function() {
-			try {
-				var name = prompt($("catStrings").getString('staff.cat.record_buckets_quick.name_of_bucket'),
-					'',
-					$("catStrings").getString('staff.cat.record_buckets_quick.name_of_bucket.title'));
-				if (name) {
-					var bucket = new cbreb();
-					bucket.btype('staff_client');
-					bucket.owner( g.data.list.au[0].id() );
-					bucket.name( name );
-
-					var bucket_id = g.network.simple_request('BUCKET_CREATE',[ses(),'biblio',bucket]);
-					if (typeof bucket_id == 'object') throw bucket_id;
-
-					g.add_to_bucket(bucket_id);
-				}
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.record_buckets_quick.bucket_creation_failure'),E);
-			}
-		}
-
-		g.add_to_bucket = function(b) {
-			var bucket_id;
-			if (b) {
-				bucket_id = b;
-			} else {
-				try {
-					if ($('bucket_list').selectedItem) bucket_id = $('bucket_list').selectedItem.getAttribute('id');
-				} catch(E) {
-				}
-			}
-			if (!bucket_id) return;
-			for (var i = 0; i < g.record_ids.length; i++) {
-				var bucket_item = new cbrebi();
-				bucket_item.isnew('1');
-				bucket_item.bucket(bucket_id);
-				bucket_item.target_biblio_record_entry( g.record_ids[i] );
-				try {
-					var robj = g.network.simple_request('BUCKET_ITEM_CREATE', [ ses(), 'biblio', bucket_item ]);
-					if (typeof robj == 'object') throw robj;
-
-				} catch(E) {
-					g.error.standard_unexpected_error_alert($("catStrings").getFormattedString('staff.cat.record_buckets_quick.add_to_bucket.addition_failed', [bucket_id, g.record_ids[i]]), E);
-				}
-			}
-			window.close();
-		}
-
-		g.advanced = function() {
-			JSAN.use('util.window'); var win = new util.window();
-			g.data.rb_temp_record_ids = js2JSON( g.record_ids ); g.data.stash('rb_temp_record_ids');
-			win.open(urls.XUL_RECORD_BUCKETS,'adv_record_buckets','chrome,resizable,modal');
-			window.close();
-		}
-
-	]]>
-	</script>
-	
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-
-	<vbox flex="1" style="overflow: auto">
-	<groupbox flex="1">
-		<caption label="&staff.cat.record_buckets_quick.groupbox.caption;"/>
-		<description id="desc"/>
-		<listbox id="bucket_list" rows="5" flex="1" style="overflow: auto"/>
-		<hbox>
-			<button label="&staff.cat.record_buckets_quick.add_to_bucket.label;"
-				accesskey="&staff.cat.record_buckets_quick.add_to_bucket.accesskey;" oncommand="g.add_to_bucket()"/>
-			<button label="&staff.cat.record_buckets_quick.new_bucket.label;"
-				accesskey="&staff.cat.record_buckets_quick.new_bucket.accesskey;" oncommand="g.new_bucket()"/>
-		</hbox>
-		<hbox>
-			<!--
-			<button label="Advanced" accesskey="v" oncommand="g.advanced()"/>
-			-->
-			<button label="&staff.cat.record_buckets_quick.cancel.label;"
-				accesskey="&staff.cat.record_buckets_quick.cancel.accesskey;" oncommand="window.close()"/>
-		</hbox>
-	</groupbox>
-	</vbox>
+ onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }" oils_persist="height width"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
+ <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
+ <scripts id="openils_util_scripts"/>
+
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  function $(id) { return document.getElementById(id); }
+  function $c(n) { return document.createElement(n); }
+
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                  if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for cat/record_buckets_quick.xul');
+    JSAN.use('util.network'); g.network = new util.network();
+    JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+
+    g.record_ids = xul_param(
+     'record_ids',{
+      'concat' : true,
+      'modal_xulG' : true,
+      'JSON2js_if_cgi' : true,
+      'JSON2js_if_xpcom' : true,
+      'stash_name':'rb_temp_record_ids',
+      'clear_xpcom' : true
+     }
+    );
+
+    $('desc').appendChild( document.createTextNode( 
+     (g.record_ids.length == 1 ?
+      $("catStrings").getString('staff.cat.record_buckets_quick.copy_one_record') :
+      $("catStrings").getFormattedString('staff.cat.record_buckets_quick.copy_multiple_records', [g.record_ids.length])) 
+    ) );
+    var robj = g.network.simple_request('BUCKET_RETRIEVE_VIA_USER',[ ses(), g.data.list.au[0].id() ]);
+    if (typeof robj.ilsevent != 'undefined') throw(robj);
+
+    for (var i = 0; i < robj.biblio.length; i++) {
+     if (robj.biblio[i].btype() != 'staff_client') continue;
+     var listitem = $c('listitem');
+     listitem.setAttribute('label', robj.biblio[i].name());
+     listitem.setAttribute('id', robj.biblio[i].id());
+     $('bucket_list').appendChild(listitem);
+    }
+    try { $('bucket_list').selectedIndex = 0; } catch(E) { }
+    $('bucket_list').focus();
+
+   } catch(E) {
+    try { 
+     g.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.record_buckets_quick.initing_record_buckets_quick_xul'), E);
+    } catch(F) { 
+     alert(E); 
+    }
+   }
+  }
+
+  g.new_bucket = function() {
+   try {
+    var name = prompt($("catStrings").getString('staff.cat.record_buckets_quick.name_of_bucket'),
+     '',
+     $("catStrings").getString('staff.cat.record_buckets_quick.name_of_bucket.title'));
+    if (name) {
+     var bucket = new cbreb();
+     bucket.btype('staff_client');
+     bucket.owner( g.data.list.au[0].id() );
+     bucket.name( name );
+
+     var bucket_id = g.network.simple_request('BUCKET_CREATE',[ses(),'biblio',bucket]);
+     if (typeof bucket_id == 'object') throw bucket_id;
+
+     g.add_to_bucket(bucket_id);
+    }
+   } catch(E) {
+    g.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.record_buckets_quick.bucket_creation_failure'),E);
+   }
+  }
+
+  g.add_to_bucket = function(b) {
+   var bucket_id;
+   if (b) {
+    bucket_id = b;
+   } else {
+    try {
+     if ($('bucket_list').selectedItem) bucket_id = $('bucket_list').selectedItem.getAttribute('id');
+    } catch(E) {
+    }
+   }
+   if (!bucket_id) return;
+   for (var i = 0; i < g.record_ids.length; i++) {
+    var bucket_item = new cbrebi();
+    bucket_item.isnew('1');
+    bucket_item.bucket(bucket_id);
+    bucket_item.target_biblio_record_entry( g.record_ids[i] );
+    try {
+     var robj = g.network.simple_request('BUCKET_ITEM_CREATE', [ ses(), 'biblio', bucket_item ]);
+     if (typeof robj == 'object') throw robj;
+
+    } catch(E) {
+     g.error.standard_unexpected_error_alert($("catStrings").getFormattedString('staff.cat.record_buckets_quick.add_to_bucket.addition_failed', [bucket_id, g.record_ids[i]]), E);
+    }
+   }
+   window.close();
+  }
+
+  g.advanced = function() {
+   JSAN.use('util.window'); var win = new util.window();
+   g.data.rb_temp_record_ids = js2JSON( g.record_ids ); g.data.stash('rb_temp_record_ids');
+   win.open(urls.XUL_RECORD_BUCKETS,'adv_record_buckets','chrome,resizable,modal');
+   window.close();
+  }
+
+ ]]>
+ </script>
+ 
+ <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+ <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+
+ <vbox flex="1" style="overflow: auto">
+ <groupbox flex="1">
+  <caption label="&staff.cat.record_buckets_quick.groupbox.caption;"/>
+  <description id="desc"/>
+  <listbox id="bucket_list" rows="5" flex="1" style="overflow: auto"/>
+  <hbox>
+   <button label="&staff.cat.record_buckets_quick.add_to_bucket.label;"
+    accesskey="&staff.cat.record_buckets_quick.add_to_bucket.accesskey;" oncommand="g.add_to_bucket()"/>
+   <button label="&staff.cat.record_buckets_quick.new_bucket.label;"
+    accesskey="&staff.cat.record_buckets_quick.new_bucket.accesskey;" oncommand="g.new_bucket()"/>
+  </hbox>
+  <hbox>
+   <!--
+   <button label="Advanced" accesskey="v" oncommand="g.advanced()"/>
+   -->
+   <button label="&staff.cat.record_buckets_quick.cancel.label;"
+    accesskey="&staff.cat.record_buckets_quick.cancel.accesskey;" oncommand="window.close()"/>
+  </hbox>
+ </groupbox>
+ </vbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/cat/spine_labels.js b/Open-ILS/xul/staff_client/server/cat/spine_labels.js
index 11f692bf70..123d9d3656 100644
--- a/Open-ILS/xul/staff_client/server/cat/spine_labels.js
+++ b/Open-ILS/xul/staff_client/server/cat/spine_labels.js
@@ -1,298 +1,298 @@
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for spine_labels.xul');
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for spine_labels.xul');
 
-				JSAN.use('util.network'); g.network = new util.network();
+    JSAN.use('util.network'); g.network = new util.network();
 
-				g.cgi = new CGI();
+    g.cgi = new CGI();
 
-				g.barcodes = [];
-				if (g.cgi.param('barcodes')) {
-					g.barcodes = g.barcodes.concat( JSON2js(g.cgi.param('barcodes')) );
-				}
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.stash_retrieve();
-				if (g.data.temp_barcodes_for_labels) {
-					g.barcodes = g.barcodes.concat( g.data.temp_barcodes_for_labels );
-					g.data.temp_barcodes_for_labels = null; g.data.stash('temp_barcodes_for_labels');
-				}
+    g.barcodes = [];
+    if (g.cgi.param('barcodes')) {
+     g.barcodes = g.barcodes.concat( JSON2js(g.cgi.param('barcodes')) );
+    }
+    JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.stash_retrieve();
+    if (g.data.temp_barcodes_for_labels) {
+     g.barcodes = g.barcodes.concat( g.data.temp_barcodes_for_labels );
+     g.data.temp_barcodes_for_labels = null; g.data.stash('temp_barcodes_for_labels');
+    }
 
-				JSAN.use('circ.util');
-				g.cols = circ.util.columns( {} );
-				g.col_map = {};
-				for (var i = 0; i < g.cols.length; i++) {
-					g.col_map[ g.cols[i].id ] = { 'regex' : new RegExp('%' + g.cols[i].id + '%',"g"), 'render' : g.cols[i].render };
-				}
+    JSAN.use('circ.util');
+    g.cols = circ.util.columns( {} );
+    g.col_map = {};
+    for (var i = 0; i < g.cols.length; i++) {
+     g.col_map[ g.cols[i].id ] = { 'regex' : new RegExp('%' + g.cols[i].id + '%',"g"), 'render' : g.cols[i].render };
+    }
 
-				g.volumes = {};
+    g.volumes = {};
 
-				for (var i = 0; i < g.barcodes.length; i++) {
-					var copy = g.network.simple_request( 'FM_ACP_RETRIEVE_VIA_BARCODE.authoritative', [ g.barcodes[i] ] );
-					if (typeof copy.ilsevent != 'undefined') throw(copy);
-					if (!g.volumes[ copy.call_number() ]) {
-						var volume = g.network.simple_request( 'FM_ACN_RETRIEVE.authoritative', [ copy.call_number() ] );
-						if (typeof volume.ilsevent != 'undefined') throw(volume);
-						var record = g.network.simple_request('MODS_SLIM_RECORD_RETRIEVE.authoritative', [ volume.record() ]);
-						volume.record( record );
-						g.volumes[ volume.id() ] = volume;
-					}
-					if (g.volumes[ copy.call_number() ].copies()) {
-						var copies = g.volumes[ copy.call_number() ].copies();
-						copies.push( copy );
-						g.volumes[ copy.call_number() ].copies( copies );
-					} else {
-						g.volumes[ copy.call_number() ].copies( [ copy ] );
-					}
-				}
+    for (var i = 0; i < g.barcodes.length; i++) {
+     var copy = g.network.simple_request( 'FM_ACP_RETRIEVE_VIA_BARCODE.authoritative', [ g.barcodes[i] ] );
+     if (typeof copy.ilsevent != 'undefined') throw(copy);
+     if (!g.volumes[ copy.call_number() ]) {
+      var volume = g.network.simple_request( 'FM_ACN_RETRIEVE.authoritative', [ copy.call_number() ] );
+      if (typeof volume.ilsevent != 'undefined') throw(volume);
+      var record = g.network.simple_request('MODS_SLIM_RECORD_RETRIEVE.authoritative', [ volume.record() ]);
+      volume.record( record );
+      g.volumes[ volume.id() ] = volume;
+     }
+     if (g.volumes[ copy.call_number() ].copies()) {
+      var copies = g.volumes[ copy.call_number() ].copies();
+      copies.push( copy );
+      g.volumes[ copy.call_number() ].copies( copies );
+     } else {
+      g.volumes[ copy.call_number() ].copies( [ copy ] );
+     }
+    }
 
-				generate();
+    generate();
 
-				if (typeof xulG != 'undefined') $('close').hidden = true;
+    if (typeof xulG != 'undefined') $('close').hidden = true;
 
-			} catch(E) {
-				try {
-					g.error.standard_unexpected_error_alert('/xul/server/cat/spine_labels.xul',E);
-				} catch(F) {
-					alert('FIXME: ' + js2JSON(E));
-				}
-			}
-		}
+   } catch(E) {
+    try {
+     g.error.standard_unexpected_error_alert('/xul/server/cat/spine_labels.xul',E);
+    } catch(F) {
+     alert('FIXME: ' + js2JSON(E));
+    }
+   }
+  }
 
-		function show_macros() {
-			JSAN.use('util.functional');
-			alert( util.functional.map_list( g.cols, function(o) { return '%' + o.id + '%'; } ).join(" ") );
-		}
+  function show_macros() {
+   JSAN.use('util.functional');
+   alert( util.functional.map_list( g.cols, function(o) { return '%' + o.id + '%'; } ).join(" ") );
+  }
 
-		function $(id) { return document.getElementById(id); }
+  function $(id) { return document.getElementById(id); }
 
-		function generate() {
-			try {
-				var idx = 0;
-				JSAN.use('util.text'); JSAN.use('util.money');
-				JSAN.use('util.widgets'); util.widgets.remove_children('panel'); var pn = $('panel'); $('preview').disabled = false;
-				var lw = Number($('lw').value) || 8; /* spine label width */
-				var ll = Number($('ll').value) || 9; /* spine label length */
-				var plw = Number($('plw').value) || 28; /* pocket label width */
-				var pll = Number($('pll').value) || 9; /* pocket label length */
-				for (var i in g.volumes) {
-					var vb = document.createElement('vbox'); pn.appendChild(vb); vb.setAttribute('name','template'); vb.setAttribute('acn_id',g.volumes[i].id());
-					var ds = document.createElement('description'); vb.appendChild(ds);
-					ds.appendChild( document.createTextNode( g.volumes[i].label() ) );
-					var ds2 = document.createElement('description'); vb.appendChild(ds2);
-					ds2.appendChild( document.createTextNode( g.volumes[i].copies().length + (
-						g.volumes[i].copies().length == 1 ? $("catStrings").getString('staff.cat.spine_labels.copy') : $("catStrings").getString('staff.cat.spine_labels.copies')) ) );
-					ds2.setAttribute('style','color: green');
-					var hb = document.createElement('hbox'); vb.appendChild(hb);
+  function generate() {
+   try {
+    var idx = 0;
+    JSAN.use('util.text'); JSAN.use('util.money');
+    JSAN.use('util.widgets'); util.widgets.remove_children('panel'); var pn = $('panel'); $('preview').disabled = false;
+    var lw = Number($('lw').value) || 8; /* spine label width */
+    var ll = Number($('ll').value) || 9; /* spine label length */
+    var plw = Number($('plw').value) || 28; /* pocket label width */
+    var pll = Number($('pll').value) || 9; /* pocket label length */
+    for (var i in g.volumes) {
+     var vb = document.createElement('vbox'); pn.appendChild(vb); vb.setAttribute('name','template'); vb.setAttribute('acn_id',g.volumes[i].id());
+     var ds = document.createElement('description'); vb.appendChild(ds);
+     ds.appendChild( document.createTextNode( g.volumes[i].label() ) );
+     var ds2 = document.createElement('description'); vb.appendChild(ds2);
+     ds2.appendChild( document.createTextNode( g.volumes[i].copies().length + (
+      g.volumes[i].copies().length == 1 ? $("catStrings").getString('staff.cat.spine_labels.copy') : $("catStrings").getString('staff.cat.spine_labels.copies')) ) );
+     ds2.setAttribute('style','color: green');
+     var hb = document.createElement('hbox'); vb.appendChild(hb);
 
-					var gb = document.createElement('groupbox'); hb.appendChild(gb); 
-					/* take the call number and split it on whitespace */
-					var names = String(g.volumes[i].label()).split(/\s+/);
-					var j = 0;
-					while (j < ll || j < pll) {
-						var hb2 = document.createElement('hbox'); gb.appendChild(hb2);
-						
-						/* spine */
-						if (j < ll) {
-							var tb = document.createElement('textbox'); hb2.appendChild(tb); 
-							tb.value = '';
-							tb.setAttribute('class','plain'); tb.setAttribute('style','font-family: monospace');
-							tb.setAttribute('size',lw+1); tb.setAttribute('maxlength',lw);
-							tb.setAttribute('name','spine');
-							var name = names.shift(); if (name) {
-								name = String( name );
-								/* if the name is greater than the label width... */
-								if (name.length > lw) {
-									/* then try to split it on periods */
-									var sname = name.split(/\./);
-									if (sname.length > 1) {
-										/* if we can, then put the periods back in on each splitted element */
-										if (name.match(/^\./)) sname[0] = '.' + sname[0];
-										for (var k = 1; k < sname.length; k++) sname[k] = '.' + sname[k];
-										/* and put all but the first one back into the names array */
-										names = sname.slice(1).concat( names );
-										/* if the name fragment is still greater than the label width... */
-										if (sname[0].length > lw) {
-											/* then just truncate and throw the rest back into the names array */
-											tb.value = sname[0].substr(0,lw);
-											names = [ sname[0].substr(lw) ].concat( names );
-										} else {
-											/* otherwise we're set */
-											tb.value = sname[0];
-										}
-									} else {
-										/* if we can't split on periods, then just truncate and throw the rest back into the names array */
-										tb.value = name.substr(0,lw);
-										names = [ name.substr(lw) ].concat( names );
-									}
-								} else {
-									/* otherwise we're set */
-									tb.value = name;
-								}
-							}
-						}
+     var gb = document.createElement('groupbox'); hb.appendChild(gb); 
+     /* take the call number and split it on whitespace */
+     var names = String(g.volumes[i].label()).split(/\s+/);
+     var j = 0;
+     while (j < ll || j < pll) {
+      var hb2 = document.createElement('hbox'); gb.appendChild(hb2);
+      
+      /* spine */
+      if (j < ll) {
+       var tb = document.createElement('textbox'); hb2.appendChild(tb); 
+       tb.value = '';
+       tb.setAttribute('class','plain'); tb.setAttribute('style','font-family: monospace');
+       tb.setAttribute('size',lw+1); tb.setAttribute('maxlength',lw);
+       tb.setAttribute('name','spine');
+       var name = names.shift(); if (name) {
+        name = String( name );
+        /* if the name is greater than the label width... */
+        if (name.length > lw) {
+         /* then try to split it on periods */
+         var sname = name.split(/\./);
+         if (sname.length > 1) {
+          /* if we can, then put the periods back in on each splitted element */
+          if (name.match(/^\./)) sname[0] = '.' + sname[0];
+          for (var k = 1; k < sname.length; k++) sname[k] = '.' + sname[k];
+          /* and put all but the first one back into the names array */
+          names = sname.slice(1).concat( names );
+          /* if the name fragment is still greater than the label width... */
+          if (sname[0].length > lw) {
+           /* then just truncate and throw the rest back into the names array */
+           tb.value = sname[0].substr(0,lw);
+           names = [ sname[0].substr(lw) ].concat( names );
+          } else {
+           /* otherwise we're set */
+           tb.value = sname[0];
+          }
+         } else {
+          /* if we can't split on periods, then just truncate and throw the rest back into the names array */
+          tb.value = name.substr(0,lw);
+          names = [ name.substr(lw) ].concat( names );
+         }
+        } else {
+         /* otherwise we're set */
+         tb.value = name;
+        }
+       }
+      }
 
-						/* pocket */
-						if ($('pl').checked && j < pll) {
-							var tb2 = document.createElement('textbox'); hb2.appendChild(tb2); 
-							tb2.value = '';
-							tb2.setAttribute('class','plain'); tb2.setAttribute('style','font-family: monospace');
-							tb2.setAttribute('size',plw+1); tb2.setAttribute('maxlength',plw);
-							tb2.setAttribute('name','pocket');
-							if ($('title').checked && $('title_line').value == j + 1 && instanceOf(g.volumes[i].record(),mvr)) {
-								if (g.volumes[i].record().title()) {
-									tb2.value = util.text.wrap_on_space( g.volumes[i].record().title(), plw )[0];
-								} else {
-									tb2.value = '';
-								}
-							}
-							if ($('title_r').checked && $('title_r_line').value == j + 1 && instanceOf(g.volumes[i].record(),mvr)) {
-								if (g.volumes[i].record().title()) {
-									tb2.value = ( ($('title_r_indent').checked ? ' ' : '') + util.text.wrap_on_space( g.volumes[i].record().title(), plw )[1]).substr(0,plw);
-								} else {
-									tb2.value = '';
-								}
-							}
-							if ($('author').checked && $('author_line').value == j + 1 && instanceOf(g.volumes[i].record(),mvr)) {
-								if (g.volumes[i].record().author()) {
-									tb2.value = g.volumes[i].record().author().substr(0,plw);
-								} else {
-									tb2.value = '';
-								}
-							}
-							if ($('call_number').checked && $('call_number_line').value == j + 1) {
-								tb2.value = g.volumes[i].label().substr(0,plw);
-							}
-							if ($('owning_lib_shortname').checked && $('owning_lib_shortname_line').value == j + 1) {
-								var lib = g.volumes[i].owning_lib();
-								if (!instanceOf(lib,aou)) lib = g.data.hash.aou[ lib ];
-								tb2.value = lib.shortname().substr(0,plw);
-							}
-							if ($('owning_lib').checked && $('owning_lib_line').value == j + 1) {
-								var lib = g.volumes[i].owning_lib();
-								if (!instanceOf(lib,aou)) lib = g.data.hash.aou[ lib ];
-								tb2.value = lib.name().substr(0,plw);
-							}
-							if ($('shelving_location').checked && $('shelving_location_line').value == j + 1) {
-								tb2.value = '%location%';
-							}
-							if ($('barcode').checked && $('barcode_line').value == j + 1) {
-								tb2.value = '%barcode%';
-							}
-							if ($('custom1').checked && $('custom1_line').value == j + 1) {
-								tb2.value = $('custom1_tb').value;
-							}
-							if ($('custom2').checked && $('custom2_line').value == j + 1) {
-								tb2.value = $('custom2_tb').value;
-							}
-							if ($('custom3').checked && $('custom3_line').value == j + 1) {
-								tb2.value = $('custom3_tb').value;
-							}
-							if ($('custom4').checked && $('custom4_line').value == j + 1) {
-								tb2.value = $('custom4_tb').value;
-							}
-						}
+      /* pocket */
+      if ($('pl').checked && j < pll) {
+       var tb2 = document.createElement('textbox'); hb2.appendChild(tb2); 
+       tb2.value = '';
+       tb2.setAttribute('class','plain'); tb2.setAttribute('style','font-family: monospace');
+       tb2.setAttribute('size',plw+1); tb2.setAttribute('maxlength',plw);
+       tb2.setAttribute('name','pocket');
+       if ($('title').checked && $('title_line').value == j + 1 && instanceOf(g.volumes[i].record(),mvr)) {
+        if (g.volumes[i].record().title()) {
+         tb2.value = util.text.wrap_on_space( g.volumes[i].record().title(), plw )[0];
+        } else {
+         tb2.value = '';
+        }
+       }
+       if ($('title_r').checked && $('title_r_line').value == j + 1 && instanceOf(g.volumes[i].record(),mvr)) {
+        if (g.volumes[i].record().title()) {
+         tb2.value = ( ($('title_r_indent').checked ? ' ' : '') + util.text.wrap_on_space( g.volumes[i].record().title(), plw )[1]).substr(0,plw);
+        } else {
+         tb2.value = '';
+        }
+       }
+       if ($('author').checked && $('author_line').value == j + 1 && instanceOf(g.volumes[i].record(),mvr)) {
+        if (g.volumes[i].record().author()) {
+         tb2.value = g.volumes[i].record().author().substr(0,plw);
+        } else {
+         tb2.value = '';
+        }
+       }
+       if ($('call_number').checked && $('call_number_line').value == j + 1) {
+        tb2.value = g.volumes[i].label().substr(0,plw);
+       }
+       if ($('owning_lib_shortname').checked && $('owning_lib_shortname_line').value == j + 1) {
+        var lib = g.volumes[i].owning_lib();
+        if (!instanceOf(lib,aou)) lib = g.data.hash.aou[ lib ];
+        tb2.value = lib.shortname().substr(0,plw);
+       }
+       if ($('owning_lib').checked && $('owning_lib_line').value == j + 1) {
+        var lib = g.volumes[i].owning_lib();
+        if (!instanceOf(lib,aou)) lib = g.data.hash.aou[ lib ];
+        tb2.value = lib.name().substr(0,plw);
+       }
+       if ($('shelving_location').checked && $('shelving_location_line').value == j + 1) {
+        tb2.value = '%location%';
+       }
+       if ($('barcode').checked && $('barcode_line').value == j + 1) {
+        tb2.value = '%barcode%';
+       }
+       if ($('custom1').checked && $('custom1_line').value == j + 1) {
+        tb2.value = $('custom1_tb').value;
+       }
+       if ($('custom2').checked && $('custom2_line').value == j + 1) {
+        tb2.value = $('custom2_tb').value;
+       }
+       if ($('custom3').checked && $('custom3_line').value == j + 1) {
+        tb2.value = $('custom3_tb').value;
+       }
+       if ($('custom4').checked && $('custom4_line').value == j + 1) {
+        tb2.value = $('custom4_tb').value;
+       }
+      }
 
-						j++;
-					}
+      j++;
+     }
 
-					idx++;
-				}
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.spine_labels.generate.std_unexpeceted_err'),E);
-			}
-		}
+     idx++;
+    }
+   } catch(E) {
+    g.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.spine_labels.generate.std_unexpeceted_err'),E);
+   }
+  }
 
-		function expand_macros(text,copy,volume,record) {
-			var my = { 'acp' : copy, 'acn' : volume, 'mvr' : record };
-			var obj = { 'data' : g.data };
-			for (var i in g.col_map) {
-				var re = g.col_map[i].regex;
-				if (text.match(re)) {
-					try {
-						text = text.replace(re, (typeof g.col_map[i].render == 'function' ? g.col_map[i].render(my) : eval( g.col_map[i].render ) ) );
-					} catch(E) {
-						g.error.sdump('D_ERROR','spine_labels.js, expand_macros() = ' + E);
-					}
-				}
-			}
-			return text;
-		}
+  function expand_macros(text,copy,volume,record) {
+   var my = { 'acp' : copy, 'acn' : volume, 'mvr' : record };
+   var obj = { 'data' : g.data };
+   for (var i in g.col_map) {
+    var re = g.col_map[i].regex;
+    if (text.match(re)) {
+     try {
+      text = text.replace(re, (typeof g.col_map[i].render == 'function' ? g.col_map[i].render(my) : eval( g.col_map[i].render ) ) );
+     } catch(E) {
+      g.error.sdump('D_ERROR','spine_labels.js, expand_macros() = ' + E);
+     }
+    }
+   }
+   return text;
+  }
 
-		function preview(idx) {
-			try {
-					netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-					var pt = Number( $('pt').value ) || 10;  /* font size */
-					var lm = Number($('lm').value); if (lm == NaN) lm = 11; /* left margin */
-					var mm = Number($('mm').value); if (mm == NaN) mm = 2; /* middle margin */
-					var lw = Number($('lw').value) || 8; var ll = Number($('ll').value) || 9; /* spine label width and length */
-					var plw = Number($('plw').value) || 28; var pll = Number($('pll').value) || 9; /* pocket label width and length */
-					var html = "<html><head>";
+  function preview(idx) {
+   try {
+     netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+     var pt = Number( $('pt').value ) || 10;  /* font size */
+     var lm = Number($('lm').value); if (lm == NaN) lm = 11; /* left margin */
+     var mm = Number($('mm').value); if (mm == NaN) mm = 2; /* middle margin */
+     var lw = Number($('lw').value) || 8; var ll = Number($('ll').value) || 9; /* spine label width and length */
+     var plw = Number($('plw').value) || 28; var pll = Number($('pll').value) || 9; /* pocket label width and length */
+     var html = "<html><head>";
                     html += "<link type='text/css' rel='stylesheet' href='/xul/server/skin/print.css'></link>"
                     html += "<link type='text/css' rel='stylesheet' href='data:text/css,pre{font-size:" + pt + "pt;}'></link>";
                     html += "<title>Spine Labels</title></head><body>\n";
-					var nl = document.getElementsByAttribute('name','template');
-					for (var i = 0; i < nl.length; i++) {
-						if (typeof idx == 'undefined' || idx == null) { } else {
-							if (idx != i) continue;
-						}
-						var volume = g.volumes[ nl[i].getAttribute('acn_id') ];
+     var nl = document.getElementsByAttribute('name','template');
+     for (var i = 0; i < nl.length; i++) {
+      if (typeof idx == 'undefined' || idx == null) { } else {
+       if (idx != i) continue;
+      }
+      var volume = g.volumes[ nl[i].getAttribute('acn_id') ];
 
-						for (var j = 0; j < volume.copies().length; j++) {
-							var copy = volume.copies()[j];
+      for (var j = 0; j < volume.copies().length; j++) {
+       var copy = volume.copies()[j];
                             if (i == 0) {
-    							html += '<pre class="first_pre">\n';
+           html += '<pre class="first_pre">\n';
                             } else {
-    							html += '<pre class="not_first_pre">\n';
+           html += '<pre class="not_first_pre">\n';
                             }
-							var gb = nl[i].getElementsByTagName('groupbox')[0];
-							var nl2 = gb.getElementsByAttribute('name','spine');
-							for (var k = 0; k < nl2.length; k++) {
-								for (var m = 0; m < lm; m++) html += ' ';
-								html += util.text.preserve_string_in_html(expand_macros( nl2[k].value, copy, volume, volume.record() ).substr(0,lw));
-								if ($('pl').checked) {
-									var sib = nl2[k].nextSibling;
-									if (sib) {
-										for (var m = 0; m < lw - nl2[k].value.length; m++) html += ' ';
-										for (var m = 0; m < mm; m++) html += ' ';
-										html += util.text.preserve_string_in_html(expand_macros( sib.value, copy, volume, volume.record() ).substr(0,plw));
-									}
-								}
-								html += '\n';
-							}
-							html += '</pre>\n';
-						}
-					}
-					html += '</body></html>';
-					JSAN.use('util.window'); var win = new util.window();
-					var loc = ( urls.XUL_REMOTE_BROWSER );
-					//+ '?url=' + window.escape('about:blank') + '&show_print_button=1&alternate_print=1&no_xulG=1&title=' + window.escape('Spine Labels');
-					var w = win.open( loc, 'spine_preview', 'chrome,resizable,width=750,height=550');
-					w.xulG = { 
-						'url' : 'about:blank',
-						'show_print_button' : 1,
-						'alternate_print' : 1,
-						'no_xulG' : 1,
-						'title' : $("catStrings").getString('staff.cat.spine_labels.preview.title'),
-						'on_url_load' : function(b) { 
-							try { 
-								netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-								if (typeof w.xulG.written == 'undefined') {
-									w.xulG.written = true;
-									w.g.browser.get_content().document.write(html);
-									w.g.browser.get_content().document.close();
-								}
-							} catch(E) {
-								alert(E);
-							}
-						}
-					};
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.spine_labels.preview.std_unexpected_err'),E);
-			}
-		}
+       var gb = nl[i].getElementsByTagName('groupbox')[0];
+       var nl2 = gb.getElementsByAttribute('name','spine');
+       for (var k = 0; k < nl2.length; k++) {
+        for (var m = 0; m < lm; m++) html += ' ';
+        html += util.text.preserve_string_in_html(expand_macros( nl2[k].value, copy, volume, volume.record() ).substr(0,lw));
+        if ($('pl').checked) {
+         var sib = nl2[k].nextSibling;
+         if (sib) {
+          for (var m = 0; m < lw - nl2[k].value.length; m++) html += ' ';
+          for (var m = 0; m < mm; m++) html += ' ';
+          html += util.text.preserve_string_in_html(expand_macros( sib.value, copy, volume, volume.record() ).substr(0,plw));
+         }
+        }
+        html += '\n';
+       }
+       html += '</pre>\n';
+      }
+     }
+     html += '</body></html>';
+     JSAN.use('util.window'); var win = new util.window();
+     var loc = ( urls.XUL_REMOTE_BROWSER );
+     //+ '?url=' + window.escape('about:blank') + '&show_print_button=1&alternate_print=1&no_xulG=1&title=' + window.escape('Spine Labels');
+     var w = win.open( loc, 'spine_preview', 'chrome,resizable,width=750,height=550');
+     w.xulG = { 
+      'url' : 'about:blank',
+      'show_print_button' : 1,
+      'alternate_print' : 1,
+      'no_xulG' : 1,
+      'title' : $("catStrings").getString('staff.cat.spine_labels.preview.title'),
+      'on_url_load' : function(b) { 
+       try { 
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+        if (typeof w.xulG.written == 'undefined') {
+         w.xulG.written = true;
+         w.g.browser.get_content().document.write(html);
+         w.g.browser.get_content().document.close();
+        }
+       } catch(E) {
+        alert(E);
+       }
+      }
+     };
+   } catch(E) {
+    g.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.spine_labels.preview.std_unexpected_err'),E);
+   }
+  }
 
 
diff --git a/Open-ILS/xul/staff_client/server/cat/spine_labels.xul b/Open-ILS/xul/staff_client/server/cat/spine_labels.xul
index 884185ad23..ddce0719bd 100644
--- a/Open-ILS/xul/staff_client/server/cat/spine_labels.xul
+++ b/Open-ILS/xul/staff_client/server/cat/spine_labels.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,151 +20,151 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="spine_labels_win" 
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="/xul/server/cat/spine_labels.js"/>
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script type="text/javascript" src="/xul/server/cat/spine_labels.js"/>
 
     <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
     <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
 
-	<vbox id="spine_labels_main" flex="1" class="my_overflow">
-		<hbox flex="1" class="my_overflow">
-		<vbox>
-			<hbox>
-				<button label="&staff.cat.spine_labels.re-generate.label;"
-					accesskey="&staff.cat.spine_labels.re-generate.accesskey;" oncommand="generate()"/>
-				<spacer />
-				<button id="preview" disabled="true" label="&staff.cat.spine_labels.preview_and_print.label;"
-					accesskey="&staff.cat.spine_labels.preview_and_print.accesskey;" oncommand="preview()"/>
-				<spacer />
-				<button id="close" disabled="false" label="&staff.cat.spine_labels.close_window.label;"
-					accesskey="&staff.cat.spine_labels.close_window.accesskey;" oncommand="window.close()"/>
-			</hbox>
+ <vbox id="spine_labels_main" flex="1" class="my_overflow">
+  <hbox flex="1" class="my_overflow">
+  <vbox>
+   <hbox>
+    <button label="&staff.cat.spine_labels.re-generate.label;"
+     accesskey="&staff.cat.spine_labels.re-generate.accesskey;" oncommand="generate()"/>
+    <spacer />
+    <button id="preview" disabled="true" label="&staff.cat.spine_labels.preview_and_print.label;"
+     accesskey="&staff.cat.spine_labels.preview_and_print.accesskey;" oncommand="preview()"/>
+    <spacer />
+    <button id="close" disabled="false" label="&staff.cat.spine_labels.close_window.label;"
+     accesskey="&staff.cat.spine_labels.close_window.accesskey;" oncommand="window.close()"/>
+   </hbox>
 
-			<hbox>
-				<label value="&staff.cat.spine_labels.font_size.label;" control="pt"/>
-				<textbox id="pt" value="10" onchange="this.setAttribute('value',this.value)" oils_persist="value" context="clipboard"/>
-			</hbox>
-			<grid><columns><column/><column/><column/><column/></columns><rows>
-				<row> <label class="header" value="&staff.cat.spine_labels.spine_label.label;"/><spacer/> </row>
-				<row> <label value="&staff.cat.spine_labels.spine_label.left_margin.label;" control="lm"/><textbox id="lm" value="0" onchange="this.setAttribute('value',this.value)" oils_persist="value" context="clipboard"/> </row>
-				<row> <label value="&staff.cat.spine_labels.spine_label.label_width.label;" control="lw"/><textbox id="lw" value="8" onchange="this.setAttribute('value',this.value)" oils_persist="value" context="clipboard"/> </row>
-				<row> <label value="&staff.cat.spine_labels.spine_label.label_length.label;" control="ll"/><textbox id="ll" value="9" onchange="this.setAttribute('value',this.value)" oils_persist="value" context="clipboard"/> </row>
-				<row> <label class="header" value="&staff.cat.spine_labels.pocket_label.label;"/><checkbox id="pl" checked="false" oils_persist="checked" label="Enabled"/> </row>
-				<row> <label value="&staff.cat.spine_labels.pocket_label.middle_margin.label;" control="mm"/><textbox id="mm" value="2" onchange="this.setAttribute('value',this.value)" oils_persist="value" context="clipboard"/> </row>
-				<row> <label value="&staff.cat.spine_labels.pocket_label.label_width.label;" control="plw"/><textbox id="plw" value="28" onchange="this.setAttribute('value',this.value)" oils_persist="value" context="clipboard"/> </row>
-				<row> <label value="&staff.cat.spine_labels.pocket_label.label_length.label;" control="pll"/><textbox id="pll" value="9" onchange="this.setAttribute('value',this.value)" oils_persist="value" context="clipboard"/> </row>
-				<row>
-					<checkbox id="title" checked="true" oils_persist="checked" label="&staff.cat.spine_labels.pocket_label.title.label;"/>
-					<hbox>
-						<label value="&staff.cat.spine_labels.on_line.label;"/>
-						<textbox id="title_line" value="4" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
-					</hbox>
-				</row>
-				<row>
-					<checkbox id="title_r" checked="true" oils_persist="checked" label="&staff.cat.spine_labels.pocket_label.include_title.label;"/>
-					<hbox>
-						<label value="&staff.cat.spine_labels.on_line.label;"/>
-						<textbox id="title_r_line" value="5" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
-					</hbox>
-				</row>
-				<row> <spacer/><checkbox id="title_r_indent" checked="true" oils_persist="checked" label="&staff.cat.spine_labels.indent_title.label;"/> </row>
-				<row>
-					<checkbox id="author" checked="true" oils_persist="checked" label="Include Author"/>
-					<hbox>
-						<label value="&staff.cat.spine_labels.on_line.label;"/>
-						<textbox id="author_line" value="3" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
-					</hbox>
-				</row>
-				<row>
-					<checkbox id="call_number" checked="true" oils_persist="checked" label="&staff.cat.spine_labels.inc_call_number.label;"/>
-					<hbox>
-						<label value="&staff.cat.spine_labels.on_line.label;"/>
-						<textbox id="call_number_line" value="2" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
-					</hbox>
-				</row>
-				<row>
-					<checkbox id="owning_lib_shortname" checked="false" oils_persist="checked" label="&staff.cat.spine_labels.inc_owning_library_policy_code.label;"/>
-					<hbox>
-						<label value="&staff.cat.spine_labels.on_line.label;"/>
-						<textbox id="owning_lib_shortname_line" value="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
-					</hbox>
-				</row>
-				<row>
-					<checkbox id="owning_lib" checked="false" oils_persist="checked" label="&staff.cat.spine_labels.inc_owning_library.label;"/>
-					<hbox>
-						<label value="&staff.cat.spine_labels.on_line.label;"/>
-						<textbox id="owning_lib_line" value="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
-					</hbox>
-				</row>
-				<row>
-					<checkbox id="shelving_location" checked="false" oils_persist="checked" label="&staff.cat.spine_labels.inc_shelving_location.label;"/>
-					<hbox>
-						<label value="&staff.cat.spine_labels.on_line.label;"/>
-						<textbox id="shelving_location_line" value="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
-				</hbox>
-				</row>
-				<row>
-					<checkbox id="barcode" checked="true" oils_persist="checked" label="&staff.cat.spine_labels.inc_item_barcode.label;"/>
-					<hbox>
-						<label value="&staff.cat.spine_labels.on_line.label;"/>
-						<textbox id="barcode_line" value="1" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
-					</hbox>
-				</row>
-				<row>
-					<hbox>
-						<checkbox id="custom1" checked="false" oils_persist="checked" label="&staff.cat.spine_labels.custom.label;"/>
-						<textbox id="custom1_tb" value="%price%" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
-					</hbox>
-					<hbox>
-						<label value="&staff.cat.spine_labels.on_line.label;"/>
-						<textbox id="custom1_line" value="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
-					</hbox>
-				</row>
-				<row>
-					<hbox>
-						<checkbox id="custom2" checked="false" oils_persist="checked" label="&staff.cat.spine_labels.custom.label;"/>
-						<textbox id="custom2_tb" value="%deposit_amount%" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
-					</hbox>
-					<hbox>
-							<label value="&staff.cat.spine_labels.on_line.label;"/>
-							<textbox id="custom2_line" value="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
-					</hbox>
-				</row>
-				<row>
-					<hbox>
-						<checkbox id="custom3" checked="false" oils_persist="checked" label="&staff.cat.spine_labels.custom.label;"/>
-						<textbox id="custom3_tb" value="%alert_message%" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
-					</hbox>
-					<hbox>
-						<label value="&staff.cat.spine_labels.on_line.label;"/>
-						<textbox id="custom3_line" value="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
-					</hbox>
-				</row>
-				<row>
-					<hbox>
-						<checkbox id="custom4" checked="false" oils_persist="checked" label="&staff.cat.spine_labels.custom.label;"/>
-						<textbox id="custom4_tb" value="Don't sell me on eBay" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
-					</hbox>
-					<hbox>
-						<label value="&staff.cat.spine_labels.on_line.label;"/>
-						<textbox id="custom4_line" value="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
-					</hbox>
-				</row>
-			</rows></grid>
-			<button label="&staff.cat.spine_labels.available_macros.label;" oncommand="show_macros()"/>
-		</vbox>
-		<splitter><grippy/></splitter>
-		<vbox id="panel" flex="1" class="my_overflow"/>
-		</hbox>
-	</vbox>
+   <hbox>
+    <label value="&staff.cat.spine_labels.font_size.label;" control="pt"/>
+    <textbox id="pt" value="10" onchange="this.setAttribute('value',this.value)" oils_persist="value" context="clipboard"/>
+   </hbox>
+   <grid><columns><column/><column/><column/><column/></columns><rows>
+    <row> <label class="header" value="&staff.cat.spine_labels.spine_label.label;"/><spacer/> </row>
+    <row> <label value="&staff.cat.spine_labels.spine_label.left_margin.label;" control="lm"/><textbox id="lm" value="0" onchange="this.setAttribute('value',this.value)" oils_persist="value" context="clipboard"/> </row>
+    <row> <label value="&staff.cat.spine_labels.spine_label.label_width.label;" control="lw"/><textbox id="lw" value="8" onchange="this.setAttribute('value',this.value)" oils_persist="value" context="clipboard"/> </row>
+    <row> <label value="&staff.cat.spine_labels.spine_label.label_length.label;" control="ll"/><textbox id="ll" value="9" onchange="this.setAttribute('value',this.value)" oils_persist="value" context="clipboard"/> </row>
+    <row> <label class="header" value="&staff.cat.spine_labels.pocket_label.label;"/><checkbox id="pl" checked="false" oils_persist="checked" label="Enabled"/> </row>
+    <row> <label value="&staff.cat.spine_labels.pocket_label.middle_margin.label;" control="mm"/><textbox id="mm" value="2" onchange="this.setAttribute('value',this.value)" oils_persist="value" context="clipboard"/> </row>
+    <row> <label value="&staff.cat.spine_labels.pocket_label.label_width.label;" control="plw"/><textbox id="plw" value="28" onchange="this.setAttribute('value',this.value)" oils_persist="value" context="clipboard"/> </row>
+    <row> <label value="&staff.cat.spine_labels.pocket_label.label_length.label;" control="pll"/><textbox id="pll" value="9" onchange="this.setAttribute('value',this.value)" oils_persist="value" context="clipboard"/> </row>
+    <row>
+     <checkbox id="title" checked="true" oils_persist="checked" label="&staff.cat.spine_labels.pocket_label.title.label;"/>
+     <hbox>
+      <label value="&staff.cat.spine_labels.on_line.label;"/>
+      <textbox id="title_line" value="4" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+     </hbox>
+    </row>
+    <row>
+     <checkbox id="title_r" checked="true" oils_persist="checked" label="&staff.cat.spine_labels.pocket_label.include_title.label;"/>
+     <hbox>
+      <label value="&staff.cat.spine_labels.on_line.label;"/>
+      <textbox id="title_r_line" value="5" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+     </hbox>
+    </row>
+    <row> <spacer/><checkbox id="title_r_indent" checked="true" oils_persist="checked" label="&staff.cat.spine_labels.indent_title.label;"/> </row>
+    <row>
+     <checkbox id="author" checked="true" oils_persist="checked" label="Include Author"/>
+     <hbox>
+      <label value="&staff.cat.spine_labels.on_line.label;"/>
+      <textbox id="author_line" value="3" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+     </hbox>
+    </row>
+    <row>
+     <checkbox id="call_number" checked="true" oils_persist="checked" label="&staff.cat.spine_labels.inc_call_number.label;"/>
+     <hbox>
+      <label value="&staff.cat.spine_labels.on_line.label;"/>
+      <textbox id="call_number_line" value="2" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+     </hbox>
+    </row>
+    <row>
+     <checkbox id="owning_lib_shortname" checked="false" oils_persist="checked" label="&staff.cat.spine_labels.inc_owning_library_policy_code.label;"/>
+     <hbox>
+      <label value="&staff.cat.spine_labels.on_line.label;"/>
+      <textbox id="owning_lib_shortname_line" value="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+     </hbox>
+    </row>
+    <row>
+     <checkbox id="owning_lib" checked="false" oils_persist="checked" label="&staff.cat.spine_labels.inc_owning_library.label;"/>
+     <hbox>
+      <label value="&staff.cat.spine_labels.on_line.label;"/>
+      <textbox id="owning_lib_line" value="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+     </hbox>
+    </row>
+    <row>
+     <checkbox id="shelving_location" checked="false" oils_persist="checked" label="&staff.cat.spine_labels.inc_shelving_location.label;"/>
+     <hbox>
+      <label value="&staff.cat.spine_labels.on_line.label;"/>
+      <textbox id="shelving_location_line" value="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+    </hbox>
+    </row>
+    <row>
+     <checkbox id="barcode" checked="true" oils_persist="checked" label="&staff.cat.spine_labels.inc_item_barcode.label;"/>
+     <hbox>
+      <label value="&staff.cat.spine_labels.on_line.label;"/>
+      <textbox id="barcode_line" value="1" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+     </hbox>
+    </row>
+    <row>
+     <hbox>
+      <checkbox id="custom1" checked="false" oils_persist="checked" label="&staff.cat.spine_labels.custom.label;"/>
+      <textbox id="custom1_tb" value="%price%" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+     </hbox>
+     <hbox>
+      <label value="&staff.cat.spine_labels.on_line.label;"/>
+      <textbox id="custom1_line" value="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+     </hbox>
+    </row>
+    <row>
+     <hbox>
+      <checkbox id="custom2" checked="false" oils_persist="checked" label="&staff.cat.spine_labels.custom.label;"/>
+      <textbox id="custom2_tb" value="%deposit_amount%" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+     </hbox>
+     <hbox>
+       <label value="&staff.cat.spine_labels.on_line.label;"/>
+       <textbox id="custom2_line" value="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+     </hbox>
+    </row>
+    <row>
+     <hbox>
+      <checkbox id="custom3" checked="false" oils_persist="checked" label="&staff.cat.spine_labels.custom.label;"/>
+      <textbox id="custom3_tb" value="%alert_message%" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+     </hbox>
+     <hbox>
+      <label value="&staff.cat.spine_labels.on_line.label;"/>
+      <textbox id="custom3_line" value="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+     </hbox>
+    </row>
+    <row>
+     <hbox>
+      <checkbox id="custom4" checked="false" oils_persist="checked" label="&staff.cat.spine_labels.custom.label;"/>
+      <textbox id="custom4_tb" value="Don't sell me on eBay" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+     </hbox>
+     <hbox>
+      <label value="&staff.cat.spine_labels.on_line.label;"/>
+      <textbox id="custom4_line" value="" oils_persist="value" onchange="this.setAttribute('value',this.value)" context="clipboard"/>
+     </hbox>
+    </row>
+   </rows></grid>
+   <button label="&staff.cat.spine_labels.available_macros.label;" oncommand="show_macros()"/>
+  </vbox>
+  <splitter><grippy/></splitter>
+  <vbox id="panel" flex="1" class="my_overflow"/>
+  </hbox>
+ </vbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/cat/util.js b/Open-ILS/xul/staff_client/server/cat/util.js
index 59ec7fb1af..35bb3ac395 100644
--- a/Open-ILS/xul/staff_client/server/cat/util.js
+++ b/Open-ILS/xul/staff_client/server/cat/util.js
@@ -5,230 +5,230 @@ function $(id) { return document.getElementById(id); }
 if (typeof cat == 'undefined') var cat = {};
 cat.util = {};
 
-cat.util.EXPORT_OK	= [ 
-	'spawn_copy_editor', 'add_copies_to_bucket', 'show_in_opac', 'spawn_spine_editor', 'transfer_copies', 
-	'mark_item_missing', 'mark_item_damaged', 'replace_barcode', 'fast_item_add'
+cat.util.EXPORT_OK = [ 
+ 'spawn_copy_editor', 'add_copies_to_bucket', 'show_in_opac', 'spawn_spine_editor', 'transfer_copies', 
+ 'mark_item_missing', 'mark_item_damaged', 'replace_barcode', 'fast_item_add'
 ];
-cat.util.EXPORT_TAGS	= { ':all' : cat.util.EXPORT_OK };
+cat.util.EXPORT_TAGS = { ':all' : cat.util.EXPORT_OK };
 
 cat.util.replace_barcode = function(old_bc) {
-	try {
-		JSAN.use('util.network');
-		var network = new util.network();
+ try {
+  JSAN.use('util.network');
+  var network = new util.network();
 
-		if (!old_bc) old_bc = window.prompt($("catStrings").getString('staff.cat.util.replace_barcode.old_bc_window_prompt.prompt'),
-			'',
-			$("catStrings").getString('staff.cat.util.replace_barcode.old_bc_window_prompt.title'));
-		if (!old_bc) return;
+  if (!old_bc) old_bc = window.prompt($("catStrings").getString('staff.cat.util.replace_barcode.old_bc_window_prompt.prompt'),
+   '',
+   $("catStrings").getString('staff.cat.util.replace_barcode.old_bc_window_prompt.title'));
+  if (!old_bc) return;
 
-		var copy;
+  var copy;
         try {
-			copy = network.simple_request('FM_ACP_RETRIEVE_VIA_BARCODE',[ old_bc ]);
-			if (typeof copy.ilsevent != 'undefined') throw(copy); 
-			if (!copy) throw(copy);
-		} catch(E) {
-			alert($("catStrings").getFormattedString('staff.cat.util.replace_barcode.error_alert', [old_bc]) + '\n');
-			return old_bc;
-		}
-	
-		// Why did I want to do this twice?  Because this copy is more fleshed?
-		try {
-			copy = network.simple_request('FM_ACP_RETRIEVE',[ copy.id() ]);
-			if (typeof copy.ilsevent != 'undefined') throw(copy);
-			if (!copy) throw(copy);
-		} catch(E) {
-			try {
-				alert($("catStrings").getFormattedString('staff.cat.util.replace_barcode.error_alert', [old_bc]) +
-					 '\n' + (typeof E.ilsevent == 'undefined' ? '' : E.textcode + ' : ' + E.desc));
-			} catch(F) {
-				alert(E + '\n' + F);
-			}
-			return old_bc;
-		}
-	
-		var new_bc = window.prompt($("catStrings").getString('staff.cat.util.replace_barcode.new_bc_window_prompt.prompt'),
-			'',
-			$("catStrings").getString('staff.cat.util.replace_barcode.new_bc_window_prompt.title'));
-		new_bc = String( new_bc ).replace(/\s/g,'');
-		/* Casting a possibly null input value to a String turns it into "null" */
-		if (!new_bc || new_bc == 'null') {
-			alert($("catStrings").getString('staff.cat.util.replace_barcode.new_bc.failed'));
-			return old_bc;
-		}
-	
-		var test = network.simple_request('FM_ACP_RETRIEVE_VIA_BARCODE',[ new_bc ]);
-		if (typeof test.ilsevent == 'undefined') {
-			alert('Rename aborted.  Another copy has barcode "' + new_bc + '".');
-			return old_bc;
-		} else {
-			if (test.ilsevent != 1502 /* ASSET_COPY_NOT_FOUND */) {
-				obj.error.standard_unexpected_error_alert($("catStrings").getFormattedString('staff.cat.util.replace_barcode.testing_error', [new_bc]), test);
-				return old_bc;
-			}	
-		}
-
-		copy.barcode(new_bc); copy.ischanged('1');
-		var r = network.simple_request('FM_ACP_FLESHED_BATCH_UPDATE', [ ses(), [ copy ] ]);
-		if (typeof r.ilsevent != 'undefined') { 
-			if (r.ilsevent != 0) {
-				if (r.ilsevent == 5000 /* PERM_FAILURE */) {
-					alert($("catStrings").getString('staff.cat.util.replace_barcode.insufficient_permission_for_rename'));
-					return old_bc;
-				} else {
-					obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.util.replace_barcode.item_rename_error'),r);
-					return old_bc;
-				}
-			}
-		}
-
-		return new_bc;
-	} catch(E) {
-		JSAN.use('util.error'); var error = new util.error();
-		error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.util.replace_barcode.rename_error'),E);
-		return old_bc;
-	}
+   copy = network.simple_request('FM_ACP_RETRIEVE_VIA_BARCODE',[ old_bc ]);
+   if (typeof copy.ilsevent != 'undefined') throw(copy); 
+   if (!copy) throw(copy);
+  } catch(E) {
+   alert($("catStrings").getFormattedString('staff.cat.util.replace_barcode.error_alert', [old_bc]) + '\n');
+   return old_bc;
+  }
+ 
+  // Why did I want to do this twice?  Because this copy is more fleshed?
+  try {
+   copy = network.simple_request('FM_ACP_RETRIEVE',[ copy.id() ]);
+   if (typeof copy.ilsevent != 'undefined') throw(copy);
+   if (!copy) throw(copy);
+  } catch(E) {
+   try {
+    alert($("catStrings").getFormattedString('staff.cat.util.replace_barcode.error_alert', [old_bc]) +
+      '\n' + (typeof E.ilsevent == 'undefined' ? '' : E.textcode + ' : ' + E.desc));
+   } catch(F) {
+    alert(E + '\n' + F);
+   }
+   return old_bc;
+  }
+ 
+  var new_bc = window.prompt($("catStrings").getString('staff.cat.util.replace_barcode.new_bc_window_prompt.prompt'),
+   '',
+   $("catStrings").getString('staff.cat.util.replace_barcode.new_bc_window_prompt.title'));
+  new_bc = String( new_bc ).replace(/\s/g,'');
+  /* Casting a possibly null input value to a String turns it into "null" */
+  if (!new_bc || new_bc == 'null') {
+   alert($("catStrings").getString('staff.cat.util.replace_barcode.new_bc.failed'));
+   return old_bc;
+  }
+ 
+  var test = network.simple_request('FM_ACP_RETRIEVE_VIA_BARCODE',[ new_bc ]);
+  if (typeof test.ilsevent == 'undefined') {
+   alert('Rename aborted.  Another copy has barcode "' + new_bc + '".');
+   return old_bc;
+  } else {
+   if (test.ilsevent != 1502 /* ASSET_COPY_NOT_FOUND */) {
+    obj.error.standard_unexpected_error_alert($("catStrings").getFormattedString('staff.cat.util.replace_barcode.testing_error', [new_bc]), test);
+    return old_bc;
+   } 
+  }
+
+  copy.barcode(new_bc); copy.ischanged('1');
+  var r = network.simple_request('FM_ACP_FLESHED_BATCH_UPDATE', [ ses(), [ copy ] ]);
+  if (typeof r.ilsevent != 'undefined') { 
+   if (r.ilsevent != 0) {
+    if (r.ilsevent == 5000 /* PERM_FAILURE */) {
+     alert($("catStrings").getString('staff.cat.util.replace_barcode.insufficient_permission_for_rename'));
+     return old_bc;
+    } else {
+     obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.util.replace_barcode.item_rename_error'),r);
+     return old_bc;
+    }
+   }
+  }
+
+  return new_bc;
+ } catch(E) {
+  JSAN.use('util.error'); var error = new util.error();
+  error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.util.replace_barcode.rename_error'),E);
+  return old_bc;
+ }
 }
 
 cat.util.transfer_copies = function(params) {
-	JSAN.use('util.error'); var error = new util.error();
-	JSAN.use('OpenILS.data'); var data = new OpenILS.data();
-	JSAN.use('util.network'); var network = new util.network();
-	try {
-		data.stash_retrieve();
-		if (!data.marked_volume) {
-			alert($("catStrings").getString('staff.cat.util.transfer_copies.unmarked_volume_alert'));
-			return;
-		}
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
-		var xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: auto">';
-		if (!params.message) {
-			params.message = $("catStrings").getFormattedString('staff.cat.util.transfer_copies.params_message', [data.hash.aou[ params.owning_lib ].shortname(), params.volume_label]);
-			//params.message = 'Transfer items from their original volumes to ';
-			//params.message += data.hash.aou[ params.owning_lib ].shortname() + "'s volume labelled ";
-			//params.message += '"' + params.volume_label + '" on the following record (and change their circ libs to match)?';
-		}
-
-		xml += '<description>' + params.message.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</description>';
-		xml += '<hbox><button label="' + $("catStrings").getString('staff.cat.util.transfer_copies.transfer.label')+ '" name="fancy_submit"/>';
-		xml += '<button label="' + $("catStrings").getString('staff.cat.util.transfer_copies.cancel.label');
-		xml += '" accesskey="'+ $("catStrings").getString('staff.cat.util.transfer_copies.cancel.accesskey') +'" name="fancy_cancel"/></hbox>';
-		xml += '<iframe style="overflow: scroll" flex="1" src="' + urls.XUL_BIB_BRIEF + '?docid=' + params.docid + '"/>';
-		xml += '</vbox>';
-		//data.temp_transfer = xml; data.stash('temp_transfer');
-		JSAN.use('util.window'); var win = new util.window();
-		var fancy_prompt_data = win.open(
-			urls.XUL_FANCY_PROMPT,
-			//+ '?xml_in_stash=temp_transfer'
-			//+ '&title=' + window.escape('Item Transfer'),
-			'fancy_prompt', 'chrome,resizable,modal,width=500,height=300',
-			{ 'xml' : xml, 'title' : $("catStrings").getString('staff.cat.util.transfer_copies.window_title') }
-		);
-		if (fancy_prompt_data.fancy_status == 'incomplete') { alert($("catStrings").getString('staff.cat.util.transfer_copies.aborted_transfer')); return; }
-
-		JSAN.use('util.functional');
-
-		var copies = network.simple_request('FM_ACP_FLESHED_BATCH_RETRIEVE.authoritative', [ params.copy_ids ]);
-
-		for (var i = 0; i < copies.length; i++) {
-			copies[i].call_number( data.marked_volume );
-			copies[i].circ_lib( params.owning_lib );
-			copies[i].ischanged( 1 );
-		}
-
-		var robj = network.simple_request(
-			'FM_ACP_FLESHED_BATCH_UPDATE', 
-			[ ses(), copies, true ], 
-			null,
-			{
-				'title' : $("catStrings").getString('staff.cat.util.transfer_copies.override_transfer_failure'),
-				'overridable_events' : [
-					1208 /* TITLE_LAST_COPY */,
-					1227 /* COPY_DELETE_WARNING */,
-				]
-			}
-		);
-		
-		if (typeof robj.ilsevent != 'undefined') {
-			throw(robj);
-		} else {
-			alert($("catStrings").getString('staff.cat.util.transfer_copies.successful_transfer'));
-		}
-
-	} catch(E) {
-		error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.util.transfer_copies.transfer_error'),E);
-	}
+ JSAN.use('util.error'); var error = new util.error();
+ JSAN.use('OpenILS.data'); var data = new OpenILS.data();
+ JSAN.use('util.network'); var network = new util.network();
+ try {
+  data.stash_retrieve();
+  if (!data.marked_volume) {
+   alert($("catStrings").getString('staff.cat.util.transfer_copies.unmarked_volume_alert'));
+   return;
+  }
+  netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
+  var xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: auto">';
+  if (!params.message) {
+   params.message = $("catStrings").getFormattedString('staff.cat.util.transfer_copies.params_message', [data.hash.aou[ params.owning_lib ].shortname(), params.volume_label]);
+   //params.message = 'Transfer items from their original volumes to ';
+   //params.message += data.hash.aou[ params.owning_lib ].shortname() + "'s volume labelled ";
+   //params.message += '"' + params.volume_label + '" on the following record (and change their circ libs to match)?';
+  }
+
+  xml += '<description>' + params.message.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</description>';
+  xml += '<hbox><button label="' + $("catStrings").getString('staff.cat.util.transfer_copies.transfer.label')+ '" name="fancy_submit"/>';
+  xml += '<button label="' + $("catStrings").getString('staff.cat.util.transfer_copies.cancel.label');
+  xml += '" accesskey="'+ $("catStrings").getString('staff.cat.util.transfer_copies.cancel.accesskey') +'" name="fancy_cancel"/></hbox>';
+  xml += '<iframe style="overflow: scroll" flex="1" src="' + urls.XUL_BIB_BRIEF + '?docid=' + params.docid + '"/>';
+  xml += '</vbox>';
+  //data.temp_transfer = xml; data.stash('temp_transfer');
+  JSAN.use('util.window'); var win = new util.window();
+  var fancy_prompt_data = win.open(
+   urls.XUL_FANCY_PROMPT,
+   //+ '?xml_in_stash=temp_transfer'
+   //+ '&title=' + window.escape('Item Transfer'),
+   'fancy_prompt', 'chrome,resizable,modal,width=500,height=300',
+   { 'xml' : xml, 'title' : $("catStrings").getString('staff.cat.util.transfer_copies.window_title') }
+  );
+  if (fancy_prompt_data.fancy_status == 'incomplete') { alert($("catStrings").getString('staff.cat.util.transfer_copies.aborted_transfer')); return; }
+
+  JSAN.use('util.functional');
+
+  var copies = network.simple_request('FM_ACP_FLESHED_BATCH_RETRIEVE.authoritative', [ params.copy_ids ]);
+
+  for (var i = 0; i < copies.length; i++) {
+   copies[i].call_number( data.marked_volume );
+   copies[i].circ_lib( params.owning_lib );
+   copies[i].ischanged( 1 );
+  }
+
+  var robj = network.simple_request(
+   'FM_ACP_FLESHED_BATCH_UPDATE', 
+   [ ses(), copies, true ], 
+   null,
+   {
+    'title' : $("catStrings").getString('staff.cat.util.transfer_copies.override_transfer_failure'),
+    'overridable_events' : [
+     1208 /* TITLE_LAST_COPY */,
+     1227 /* COPY_DELETE_WARNING */,
+    ]
+   }
+  );
+  
+  if (typeof robj.ilsevent != 'undefined') {
+   throw(robj);
+  } else {
+   alert($("catStrings").getString('staff.cat.util.transfer_copies.successful_transfer'));
+  }
+
+ } catch(E) {
+  error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.util.transfer_copies.transfer_error'),E);
+ }
 }
 
 cat.util.spawn_spine_editor = function(selection_list) {
-	JSAN.use('util.error'); var error = new util.error();
-	try {
-		JSAN.use('util.functional');
-		JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.stash_retrieve();
-		data.temp_barcodes_for_labels = util.functional.map_list( selection_list, function(o){return o.barcode;}) ; 
-		data.stash('temp_barcodes_for_labels');
-		xulG.new_tab(
-			xulG.url_prefix( urls.XUL_SPINE_LABEL ),
-			{ 'tab_name' : $("catStrings").getString('staff.cat.util.spine_editor.tab_name') },
-			{}
-		);
-	} catch(E) {
-		error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.util.spine_editor.spine_editor_error'),E);
-	}
+ JSAN.use('util.error'); var error = new util.error();
+ try {
+  JSAN.use('util.functional');
+  JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.stash_retrieve();
+  data.temp_barcodes_for_labels = util.functional.map_list( selection_list, function(o){return o.barcode;}) ; 
+  data.stash('temp_barcodes_for_labels');
+  xulG.new_tab(
+   xulG.url_prefix( urls.XUL_SPINE_LABEL ),
+   { 'tab_name' : $("catStrings").getString('staff.cat.util.spine_editor.tab_name') },
+   {}
+  );
+ } catch(E) {
+  error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.util.spine_editor.spine_editor_error'),E);
+ }
 }
 
 cat.util.show_in_opac = function(selection_list) {
-	JSAN.use('util.error'); var error = new util.error();
-	var doc_id; var seen = {};
-	try {
-		for (var i = 0; i < selection_list.length; i++) {
-			doc_id = selection_list[i].doc_id;
-			if (!doc_id) {
-				alert($("catStrings").getFormattedString('staff.cat.util.show_in_opac.unknown_barcode', [selection_list[i].barcode]));
-				continue;
-			}
-			if (typeof seen[doc_id] != 'undefined') {
-				continue;
-			}
-			seen[doc_id] = true;
-			var opac_url = xulG.url_prefix( urls.opac_rdetail ) + '?r=' + doc_id;
-			var content_params = { 
-				'session' : ses(),
-				'authtime' : ses('authtime'),
-				'opac_url' : opac_url,
-			};
-			xulG.new_tab(
-				xulG.url_prefix(urls.XUL_OPAC_WRAPPER), 
-				{'tab_name':'Retrieving title...'}, 
-				content_params
-			);
-		}
-	} catch(E) {
-		error.standard_unexpected_error_alert($("catStrings").getFormattedString('staff.cat.util.show_in_opac.catalog_error_for_doc_id', [doc_id]),E);
-	}
+ JSAN.use('util.error'); var error = new util.error();
+ var doc_id; var seen = {};
+ try {
+  for (var i = 0; i < selection_list.length; i++) {
+   doc_id = selection_list[i].doc_id;
+   if (!doc_id) {
+    alert($("catStrings").getFormattedString('staff.cat.util.show_in_opac.unknown_barcode', [selection_list[i].barcode]));
+    continue;
+   }
+   if (typeof seen[doc_id] != 'undefined') {
+    continue;
+   }
+   seen[doc_id] = true;
+   var opac_url = xulG.url_prefix( urls.opac_rdetail ) + '?r=' + doc_id;
+   var content_params = { 
+    'session' : ses(),
+    'authtime' : ses('authtime'),
+    'opac_url' : opac_url,
+   };
+   xulG.new_tab(
+    xulG.url_prefix(urls.XUL_OPAC_WRAPPER), 
+    {'tab_name':'Retrieving title...'}, 
+    content_params
+   );
+  }
+ } catch(E) {
+  error.standard_unexpected_error_alert($("catStrings").getFormattedString('staff.cat.util.show_in_opac.catalog_error_for_doc_id', [doc_id]),E);
+ }
 }
 
 cat.util.add_copies_to_bucket = function(selection_list) {
-	JSAN.use('util.functional');
-	JSAN.use('util.window'); var win = new util.window();
-	JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-	data.cb_temp_copy_ids = js2JSON(
-		util.functional.map_list(
-			selection_list,
-			function (o) {
-				if (typeof o.copy_id != 'undefined' && o.copy_id != null) {
-					return o.copy_id;
-				} else {
-					return o;
-				}
-			}
-		)
-	);
-	data.stash('cb_temp_copy_ids');
-	win.open( 
-		xulG.url_prefix(urls.XUL_COPY_BUCKETS_QUICK),
-		'sel_bucket_win' + win.window_name_increment(),
-		'chrome,resizable,center'
-	);
+ JSAN.use('util.functional');
+ JSAN.use('util.window'); var win = new util.window();
+ JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+ data.cb_temp_copy_ids = js2JSON(
+  util.functional.map_list(
+   selection_list,
+   function (o) {
+    if (typeof o.copy_id != 'undefined' && o.copy_id != null) {
+     return o.copy_id;
+    } else {
+     return o;
+    }
+   }
+  )
+ );
+ data.stash('cb_temp_copy_ids');
+ win.open( 
+  xulG.url_prefix(urls.XUL_COPY_BUCKETS_QUICK),
+  'sel_bucket_win' + win.window_name_increment(),
+  'chrome,resizable,center'
+ );
 }
 
 cat.util.add_titles_to_bucket = function(record_ids) {
@@ -244,79 +244,79 @@ cat.util.add_titles_to_bucket = function(record_ids) {
 }
 
 cat.util.spawn_copy_editor = function(params) {
-	try {
+ try {
         if (!params.copy_ids && !params.copies) return;
-		if (params.copy_ids && params.copy_ids.length == 0) return;
-		if (params.copies && params.copies.length == 0) return;
+  if (params.copy_ids && params.copy_ids.length == 0) return;
+  if (params.copies && params.copies.length == 0) return;
         if (params.copy_ids) params.copy_ids = js2JSON(params.copy_ids); // legacy
         if (!params.caller_handles_update) params.handle_update = 1; // legacy
 
-		var obj = {};
-		JSAN.use('util.network'); obj.network = new util.network();
-		JSAN.use('util.error'); obj.error = new util.error();
-	
-		var title = '';
-		if (params.copy_ids && params.copy_ids.length > 1 && params.edit == 1)
-			title = $("catStrings").getString('staff.cat.util.copy_editor.batch_edit');
-		else if(params.copies && params.copies.length > 1 && params.edit == 1)
-			title = $("catStrings").getString('staff.cat.util.copy_editor.batch_view');
-		else if(params.copy_ids && params.copy_ids.length == 1)
-			title = $("catStrings").getString('staff.cat.util.copy_editor.edit');
-		else
-			title = $("catStrings").getString('staff.cat.util.copy_editor.view');
-
-		JSAN.use('util.window'); var win = new util.window();
-		var my_xulG = win.open(
-			(urls.XUL_COPY_EDITOR),
-			title,
-			'chrome,modal,resizable',
+  var obj = {};
+  JSAN.use('util.network'); obj.network = new util.network();
+  JSAN.use('util.error'); obj.error = new util.error();
+ 
+  var title = '';
+  if (params.copy_ids && params.copy_ids.length > 1 && params.edit == 1)
+   title = $("catStrings").getString('staff.cat.util.copy_editor.batch_edit');
+  else if(params.copies && params.copies.length > 1 && params.edit == 1)
+   title = $("catStrings").getString('staff.cat.util.copy_editor.batch_view');
+  else if(params.copy_ids && params.copy_ids.length == 1)
+   title = $("catStrings").getString('staff.cat.util.copy_editor.edit');
+  else
+   title = $("catStrings").getString('staff.cat.util.copy_editor.view');
+
+  JSAN.use('util.window'); var win = new util.window();
+  var my_xulG = win.open(
+   (urls.XUL_COPY_EDITOR),
+   title,
+   'chrome,modal,resizable',
             params
-		);
-		if (!my_xulG.copies && params.edit) {
+  );
+  if (!my_xulG.copies && params.edit) {
             alert(typeof params.no_copies_modified_msg != 'undefined' ? params.no_copies_modified_msg : $("catStrings").getString('staff.cat.util.copy_editor.not_modified'));
         } else {
             return my_xulG.copies;
         }
         return [];
-	} catch(E) {
-		JSAN.use('util.error'); var error = new util.error();
-		error.standard_unexpected_error_alert('error in cat.util.spawn_copy_editor',E);
-	}
+ } catch(E) {
+  JSAN.use('util.error'); var error = new util.error();
+  error.standard_unexpected_error_alert('error in cat.util.spawn_copy_editor',E);
+ }
 }
 
 cat.util.mark_item_damaged = function(copy_ids) {
-	var error;
-	try {
-		JSAN.use('util.error'); error = new util.error();
-		JSAN.use('util.functional');
-		JSAN.use('util.network'); var network = new util.network();
-		var copies = network.simple_request('FM_ACP_FLESHED_BATCH_RETRIEVE.authoritative', [ copy_ids ]);
-		if (typeof copies.ilsevent != 'undefined') throw(copies);
-		var magic_status = false;
-		for (var i = 0; i < copies.length; i++) {
-			var status = copies[i].status(); if (typeof status == 'object') status = status.id();
-			if (typeof my_constants.magical_statuses[ status ] != 'undefined') 
-				if (my_constants.magical_statuses[ status ].block_mark_item_damaged) magic_status = true;
-		}
-		if (magic_status) {
-		
-			error.yns_alert($("catStrings").getString('staff.cat.util.mark_item_damaged.af_message'),
-				$("catStrings").getString('staff.cat.util.mark_item_damaged.af_title'),
-				$("catStrings").getString('staff.cat.util.mark_item_damaged.af_ok_label'), null, null,
-				$("catStrings").getString('staff.cat.util.mark_item_damaged.af_confirm_action'));
-
-		} else {
-
-			var r = error.yns_alert($("catStrings").getFormattedString('staff.cat.util.mark_item_damaged.md_message', [util.functional.map_list( copies, function(o) { return o.barcode(); } ).join(", ")]),
-				$("catStrings").getString('staff.cat.util.mark_item_damaged.md_title'),
-				$("catStrings").getString('staff.cat.util.mark_item_damaged.md_ok_label'),
-				$("catStrings").getString('staff.cat.util.mark_item_damaged.md_cancel_label'), null,
-				$("catStrings").getString('staff.cat.util.mark_item_damaged.md_confirm_action'));
-
-			if (r == 0) {
-				var count = 0;
-				for (var i = 0; i < copies.length; i++) {
-					try {
+ var error;
+ try {
+  JSAN.use('util.error'); error = new util.error();
+  JSAN.use('util.functional');
+  JSAN.use('util.network'); var network = new util.network();
+  var copies = network.simple_request('FM_ACP_FLESHED_BATCH_RETRIEVE.authoritative', [ copy_ids ]);
+  if (typeof copies.ilsevent != 'undefined') throw(copies);
+  var magic_status = false;
+  for (var i = 0; i < copies.length; i++) {
+   var status = copies[i].status(); if (typeof status == 'object') status = status.id();
+   if (typeof my_constants.magical_statuses[ status ] != 'undefined') 
+    if (my_constants.magical_statuses[ status ].block_mark_item_damaged) magic_status = true;
+  }
+  if (magic_status) {
+  
+   error.yns_alert($("catStrings").getString('staff.cat.util.mark_item_damaged.af_message'),
+    $("catStrings").getString('staff.cat.util.mark_item_damaged.af_title'),
+    $("catStrings").getString('staff.cat.util.mark_item_damaged.af_ok_label'), null, null,
+    $("catStrings").getString('staff.cat.util.mark_item_damaged.af_confirm_action'));
+
+  } else {
+
+   var r = error.yns_alert($("catStrings").getFormattedString('staff.cat.util.mark_item_damaged.md_message', [util.functional.map_list( copies, function(o) { return o.barcode(); } ).join(", ")]),
+    $("catStrings").getString('staff.cat.util.mark_item_damaged.md_title'),
+    $("catStrings").getString('staff.cat.util.mark_item_damaged.md_ok_label'),
+    $("catStrings").getString('staff.cat.util.mark_item_damaged.md_cancel_label'), null,
+    $("catStrings").getString('staff.cat.util.mark_item_damaged.md_confirm_action'));
+
+   if (r == 0) {
+    var count = 0;
+    for (var i = 0; i < copies.length; i++) {
+     try {
 
                         var my_circ = network.simple_request('FM_CIRC_RETRIEVE_VIA_COPY',[ses(),copies[i].id(),1]);
                         if (typeof my_circ.ilsevent == 'undefined') { 
@@ -362,8 +362,8 @@ cat.util.mark_item_damaged = function(copy_ids) {
                             }
                         }
 
-						var robj = network.simple_request('MARK_ITEM_DAMAGED',[ses(),copies[i].id()]);
-						if (typeof robj.ilsevent != 'undefined') {
+      var robj = network.simple_request('MARK_ITEM_DAMAGED',[ses(),copies[i].id()]);
+      if (typeof robj.ilsevent != 'undefined') {
                             switch(robj.textcode) {
                                 case 'DAMAGE_CHARGE' :
                                     JSAN.use('util.money');
@@ -388,82 +388,82 @@ cat.util.mark_item_damaged = function(copy_ids) {
                                         $("catStrings").getString('staff.cat.util.mark_item_damaged.charge_patron_prompt.confirm_action'));
 
                                     robj = network.simple_request('MARK_ITEM_DAMAGED',[ ses(), copies[i].id(), {'apply_fines' : r1 == 0 ? 'apply' : 'noapply'} ]);
-						            if (typeof robj.ilsevent != 'undefined') { throw(robj); }
+                  if (typeof robj.ilsevent != 'undefined') { throw(robj); }
                                     break;
                                 default: throw(robj);
                             }
                         }
-						count++;
-					} catch(E) {
-						error.standard_unexpected_error_alert($("catStrings").getFormattedString('staff.cat.util.mark_item_damaged.marking_error', [copies[i].barcode()]),E);
-					}
-				}
-				alert(count == 1 ? $("catStrings").getString('staff.cat.util.mark_item_damaged.one_item_damaged') :
-					$("catStrings").getFormattedString('staff.cat.util.mark_item_damaged.multiple_item_damaged', [count]));
-			}
-		}
-
-	} catch(E) {
-		if (error) error.standard_unexpected_error_alert('cat.util.mark_item_damaged',E); else alert('FIXME: ' + E);
-	}
+      count++;
+     } catch(E) {
+      error.standard_unexpected_error_alert($("catStrings").getFormattedString('staff.cat.util.mark_item_damaged.marking_error', [copies[i].barcode()]),E);
+     }
+    }
+    alert(count == 1 ? $("catStrings").getString('staff.cat.util.mark_item_damaged.one_item_damaged') :
+     $("catStrings").getFormattedString('staff.cat.util.mark_item_damaged.multiple_item_damaged', [count]));
+   }
+  }
+
+ } catch(E) {
+  if (error) error.standard_unexpected_error_alert('cat.util.mark_item_damaged',E); else alert('FIXME: ' + E);
+ }
 }
 
 cat.util.mark_item_missing = function(copy_ids) {
-	var error;
-	try {
-		JSAN.use('util.error'); error = new util.error();
-		JSAN.use('util.functional');
-		JSAN.use('util.network'); var network = new util.network();
-		var copies = network.simple_request('FM_ACP_FLESHED_BATCH_RETRIEVE.authoritative', [ copy_ids ]);
-		if (typeof copies.ilsevent != 'undefined') throw(copies);
-		var magic_status = false;
-		for (var i = 0; i < copies.length; i++) {
-			var status = copies[i].status(); if (typeof status == 'object') status = status.id();
-			if (typeof my_constants.magical_statuses[ status ] != 'undefined') 
-				if (my_constants.magical_statuses[ status ].block_mark_item_action) magic_status = true;
-		}
-		if (magic_status) {
-		
-			error.yns_alert($("catStrings").getString('staff.cat.util.mark_item_missing.af_message'),
-				$("catStrings").getString('staff.cat.util.mark_item_missing.af_title'),
-				$("catStrings").getString('staff.cat.util.mark_item_missing.af_ok_label'), null, null,
-				$("catStrings").getString('staff.cat.util.mark_item_missing.af_confirm_action'));
-
-		} else {
-
-			var r = error.yns_alert($("catStrings").getFormattedString('staff.cat.util.mark_item_missing.ms_message', [util.functional.map_list( copies, function(o) { return o.barcode(); } ).join(", ")]),
-				$("catStrings").getString('staff.cat.util.mark_item_missing.ms_title'),
-				$("catStrings").getString('staff.cat.util.mark_item_missing.ms_ok_label'),
-				$("catStrings").getString('staff.cat.util.mark_item_missing.ms_cancel_label'), null,
-				$("catStrings").getString('staff.cat.util.mark_item_missing.ms_confirm_action'));
-
-			if (r == 0) {
-				var count = 0;
-				for (var i = 0; i < copies.length; i++) {
-					try {
-						var robj = network.simple_request('MARK_ITEM_MISSING',[ses(),copies[i].id()]);
-						if (typeof robj.ilsevent != 'undefined') throw(robj);
-						count++;
-					} catch(E) {
-						error.standard_unexpected_error_alert($("catStrings").getFormattedString('staff.cat.util.mark_item_missing.marking_error', [copies[i].barcode()]),E);
-					}
-				}
-				alert(count == 1 ? $("catStrings").getString('staff.cat.util.mark_item_missing.one_item_missing') :
-					$("catStrings").getFormattedString('staff.cat.util.mark_item_missing.multiple_item_missing', [count]));
-			}
-		}
-
-	} catch(E) {
-		if (error) error.standard_unexpected_error_alert('cat.util.mark_item_missing',E); else alert('FIXME: ' + E);
-	}
+ var error;
+ try {
+  JSAN.use('util.error'); error = new util.error();
+  JSAN.use('util.functional');
+  JSAN.use('util.network'); var network = new util.network();
+  var copies = network.simple_request('FM_ACP_FLESHED_BATCH_RETRIEVE.authoritative', [ copy_ids ]);
+  if (typeof copies.ilsevent != 'undefined') throw(copies);
+  var magic_status = false;
+  for (var i = 0; i < copies.length; i++) {
+   var status = copies[i].status(); if (typeof status == 'object') status = status.id();
+   if (typeof my_constants.magical_statuses[ status ] != 'undefined') 
+    if (my_constants.magical_statuses[ status ].block_mark_item_action) magic_status = true;
+  }
+  if (magic_status) {
+  
+   error.yns_alert($("catStrings").getString('staff.cat.util.mark_item_missing.af_message'),
+    $("catStrings").getString('staff.cat.util.mark_item_missing.af_title'),
+    $("catStrings").getString('staff.cat.util.mark_item_missing.af_ok_label'), null, null,
+    $("catStrings").getString('staff.cat.util.mark_item_missing.af_confirm_action'));
+
+  } else {
+
+   var r = error.yns_alert($("catStrings").getFormattedString('staff.cat.util.mark_item_missing.ms_message', [util.functional.map_list( copies, function(o) { return o.barcode(); } ).join(", ")]),
+    $("catStrings").getString('staff.cat.util.mark_item_missing.ms_title'),
+    $("catStrings").getString('staff.cat.util.mark_item_missing.ms_ok_label'),
+    $("catStrings").getString('staff.cat.util.mark_item_missing.ms_cancel_label'), null,
+    $("catStrings").getString('staff.cat.util.mark_item_missing.ms_confirm_action'));
+
+   if (r == 0) {
+    var count = 0;
+    for (var i = 0; i < copies.length; i++) {
+     try {
+      var robj = network.simple_request('MARK_ITEM_MISSING',[ses(),copies[i].id()]);
+      if (typeof robj.ilsevent != 'undefined') throw(robj);
+      count++;
+     } catch(E) {
+      error.standard_unexpected_error_alert($("catStrings").getFormattedString('staff.cat.util.mark_item_missing.marking_error', [copies[i].barcode()]),E);
+     }
+    }
+    alert(count == 1 ? $("catStrings").getString('staff.cat.util.mark_item_missing.one_item_missing') :
+     $("catStrings").getFormattedString('staff.cat.util.mark_item_missing.multiple_item_missing', [count]));
+   }
+  }
+
+ } catch(E) {
+  if (error) error.standard_unexpected_error_alert('cat.util.mark_item_missing',E); else alert('FIXME: ' + E);
+ }
 }
 
 cat.util.fast_item_add = function(doc_id,cn_label,cp_barcode) {
-	var error;
-	try {
+ var error;
+ try {
 
-		JSAN.use('util.error'); error = new util.error();
-		JSAN.use('util.network'); var network = new util.network();
+  JSAN.use('util.error'); error = new util.error();
+  JSAN.use('util.network'); var network = new util.network();
 
         var acn_id = network.simple_request(
             'FM_ACN_FIND_OR_CREATE',
@@ -494,12 +494,12 @@ cat.util.fast_item_add = function(doc_id,cn_label,cp_barcode) {
         copy_obj.opac_visible(get_db_true());
         copy_obj.ref(get_db_false());
 
-		JSAN.use('util.window'); var win = new util.window();
+  JSAN.use('util.window'); var win = new util.window();
         JSAN.use('cat.util');
         return cat.util.spawn_copy_editor( { 'handle_update' : 1, 'edit' : 1, 'docid' : doc_id, 'copies' : [ copy_obj ] });
 
-	} catch(E) {
-		if (error) error.standard_unexpected_error_alert('cat.util.fast_item_add',E); else alert('FIXME: ' + E);
-	}
+ } catch(E) {
+  if (error) error.standard_unexpected_error_alert('cat.util.fast_item_add',E); else alert('FIXME: ' + E);
+ }
 }
 dump('exiting cat/util.js\n');
diff --git a/Open-ILS/xul/staff_client/server/cat/volume_buckets.xul b/Open-ILS/xul/staff_client/server/cat/volume_buckets.xul
index 3926b4ad9b..3a6423205e 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_buckets.xul
+++ b/Open-ILS/xul/staff_client/server/cat/volume_buckets.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,46 +19,46 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="example_template_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+ </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-	function $(id) { return document.getElementById(id); }
-	
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for cat/volume_buckets.xul');
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+ function $(id) { return document.getElementById(id); }
+ 
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for cat/volume_buckets.xul');
 
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					try { window.xulG.set_tab_name($("catStrings").getString('staff.cat.volume_buckets.window_tab_name')); } catch(E) { alert(E); }
-				}
+    if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+     try { window.xulG.set_tab_name($("catStrings").getString('staff.cat.volume_buckets.window_tab_name')); } catch(E) { alert(E); }
+    }
 
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert('cat/volume_buckets.xul',E); } catch(F) { alert(E); }
-			}
-		}
+   } catch(E) {
+    try { g.error.standard_unexpected_error_alert('cat/volume_buckets.xul',E); } catch(F) { alert(E); }
+   }
+  }
 
-	]]>
-	</script>
+ ]]>
+ </script>
 
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-	
-	<label value="Just a stub, Not Yet Implemented"/>
+ <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+ <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+ 
+ <label value="Just a stub, Not Yet Implemented"/>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
index c7b2496efa..a83bfb90e3 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
+++ b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
@@ -2,393 +2,393 @@ const g_max_copies_that_can_be_added_at_a_time_per_volume = 100;
 var g = {};
 
 function my_init() {
-	try {
+ try {
 
-		/***********************************************************************************************************/
-		/* Initial setup */
+  /***********************************************************************************************************/
+  /* Initial setup */
 
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-		JSAN.errorLevel = "die"; // none, warn, or die
-		JSAN.addRepository('/xul/server/');
-		JSAN.use('util.error'); g.error = new util.error();
-		g.error.sdump('D_TRACE','my_init() for cat/volume_copy_creator.xul');
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+  JSAN.errorLevel = "die"; // none, warn, or die
+  JSAN.addRepository('/xul/server/');
+  JSAN.use('util.error'); g.error = new util.error();
+  g.error.sdump('D_TRACE','my_init() for cat/volume_copy_creator.xul');
 
-		JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-		JSAN.use('util.widgets'); JSAN.use('util.functional');
+  JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+  JSAN.use('util.widgets'); JSAN.use('util.functional');
 
-		JSAN.use('util.network'); g.network = new util.network();
+  JSAN.use('util.network'); g.network = new util.network();
 
-		/***********************************************************************************************************/
-		/* What record am I dealing with?  Am I adding just copies or copies and volumes? */
+  /***********************************************************************************************************/
+  /* What record am I dealing with?  Am I adding just copies or copies and volumes? */
 
-		g.doc_id = xul_param('doc_id');
+  g.doc_id = xul_param('doc_id');
         var sb = document.getElementById('summary_box'); while(sb.firstChild) sb.removeChild(sb.lastChild);
         var summary = document.createElement('iframe'); sb.appendChild(summary);
-		summary.setAttribute('src',urls.XUL_BIB_BRIEF);
-		summary.setAttribute('flex','1');
-		get_contentWindow(summary).xulG = { 'docid' : g.doc_id };
-
-		g.copy_shortcut = xul_param('copy_shortcut',{'JSON2js_if_cgi':true});
-		g.error.sdump('D_ERROR','location.href = ' + location.href + '\n\ncopy_short cut = ' + g.copy_shortcut + '\n\nou_ids = ' + xul_param('ou_ids'));
-
-		var ou_ids = xul_param('ou_ids',{'JSON2js_if_cgi' : true, 'concat' : true});;
-
-		/***********************************************************************************************************/
-		/* For the call number drop down */
-
-		var cn_blob;
-		try {
-			cn_blob = g.network.simple_request('BLOB_MARC_CALLNUMBERS_RETRIEVE',[g.doc_id]);
-		} catch(E) {
-			cn_blob = [];
-		}
-		if ((!g.copy_shortcut)) {
-			var hbox = document.getElementById('marc_cn');
-			var ml = util.widgets.make_menulist(
-				util.functional.map_list(
-					cn_blob,
-					function(o) {
-						for (var i in o) {
-							return [ o[i], i ];
-						}
-					}
-				).sort(
-					function(a,b) {
-						a = a[1]; b = b[1];
-						if (a == '082') return -1; 
-						if (b == '082') return 1; 
-						if (a == '092')  return -1; 
-						if (b == '092')  return 1; 
-						if (a < b) return -1; 
-						if (a > b) return 1; 
-						return 0;
-					}
-				)
-			); hbox.appendChild(ml);
-			ml.setAttribute('editable','true');
-			ml.setAttribute('width', '200');
-			var btn = document.createElement('button');
-			btn.setAttribute('label',$('catStrings').getString('staff.cat.volume_copy_creator.my_init.btn.label'));
-			btn.setAttribute('accesskey','A');
-			btn.setAttribute('image','/xul/server/skin/media/images/down_arrow.gif');
-			hbox.appendChild(btn);
-			btn.addEventListener(
-				'command',
-				function() {
-					var nl = document.getElementsByTagName('textbox');
-					for (var i = 0; i < nl.length; i++) {
-						if (nl[i].getAttribute('rel_vert_pos')==2 
-							&& !nl[i].disabled) nl[i].value = ml.value;
-					}
-					if (g.last_focus) setTimeout( function() { g.last_focus.focus(); }, 0 );
-				}, 
-				false
-			);
-		}
-
-		/***********************************************************************************************************/
-		/* render the orgs and volumes/input */
-
-		var rows = document.getElementById('rows');
-
-		var node_id = 0;
-		for (var i = 0; i < ou_ids.length; i++) {
-			try {
-				var org = g.data.hash.aou[ ou_ids[i] ];
-				if ( get_bool( g.data.hash.aout[ org.ou_type() ].can_have_vols() ) ) {
-					var row = document.createElement('row'); rows.appendChild(row); row.setAttribute('ou_id',ou_ids[i]);
-					g.render_library_label(row,ou_ids[i]);
-					g.render_volume_count_entry(row,ou_ids[i]);
-				}
-			} catch(E) {
-				g.error.sdump('D_ERROR',E);
-			}
-		}
-
-		g.load_prefs();
-
-	} catch(E) {
-		var err_msg = $("commonStrings").getFormattedString('common.exception', ['cat/volume_copy_creator.js', E]);
-		try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); dump(js2JSON(E)); }
-		alert(err_msg);
-	}
+  summary.setAttribute('src',urls.XUL_BIB_BRIEF);
+  summary.setAttribute('flex','1');
+  get_contentWindow(summary).xulG = { 'docid' : g.doc_id };
+
+  g.copy_shortcut = xul_param('copy_shortcut',{'JSON2js_if_cgi':true});
+  g.error.sdump('D_ERROR','location.href = ' + location.href + '\n\ncopy_short cut = ' + g.copy_shortcut + '\n\nou_ids = ' + xul_param('ou_ids'));
+
+  var ou_ids = xul_param('ou_ids',{'JSON2js_if_cgi' : true, 'concat' : true});;
+
+  /***********************************************************************************************************/
+  /* For the call number drop down */
+
+  var cn_blob;
+  try {
+   cn_blob = g.network.simple_request('BLOB_MARC_CALLNUMBERS_RETRIEVE',[g.doc_id]);
+  } catch(E) {
+   cn_blob = [];
+  }
+  if ((!g.copy_shortcut)) {
+   var hbox = document.getElementById('marc_cn');
+   var ml = util.widgets.make_menulist(
+    util.functional.map_list(
+     cn_blob,
+     function(o) {
+      for (var i in o) {
+       return [ o[i], i ];
+      }
+     }
+    ).sort(
+     function(a,b) {
+      a = a[1]; b = b[1];
+      if (a == '082') return -1; 
+      if (b == '082') return 1; 
+      if (a == '092')  return -1; 
+      if (b == '092')  return 1; 
+      if (a < b) return -1; 
+      if (a > b) return 1; 
+      return 0;
+     }
+    )
+   ); hbox.appendChild(ml);
+   ml.setAttribute('editable','true');
+   ml.setAttribute('width', '200');
+   var btn = document.createElement('button');
+   btn.setAttribute('label',$('catStrings').getString('staff.cat.volume_copy_creator.my_init.btn.label'));
+   btn.setAttribute('accesskey','A');
+   btn.setAttribute('image','/xul/server/skin/media/images/down_arrow.gif');
+   hbox.appendChild(btn);
+   btn.addEventListener(
+    'command',
+    function() {
+     var nl = document.getElementsByTagName('textbox');
+     for (var i = 0; i < nl.length; i++) {
+      if (nl[i].getAttribute('rel_vert_pos')==2 
+       && !nl[i].disabled) nl[i].value = ml.value;
+     }
+     if (g.last_focus) setTimeout( function() { g.last_focus.focus(); }, 0 );
+    }, 
+    false
+   );
+  }
+
+  /***********************************************************************************************************/
+  /* render the orgs and volumes/input */
+
+  var rows = document.getElementById('rows');
+
+  var node_id = 0;
+  for (var i = 0; i < ou_ids.length; i++) {
+   try {
+    var org = g.data.hash.aou[ ou_ids[i] ];
+    if ( get_bool( g.data.hash.aout[ org.ou_type() ].can_have_vols() ) ) {
+     var row = document.createElement('row'); rows.appendChild(row); row.setAttribute('ou_id',ou_ids[i]);
+     g.render_library_label(row,ou_ids[i]);
+     g.render_volume_count_entry(row,ou_ids[i]);
+    }
+   } catch(E) {
+    g.error.sdump('D_ERROR',E);
+   }
+  }
+
+  g.load_prefs();
+
+ } catch(E) {
+  var err_msg = $("commonStrings").getFormattedString('common.exception', ['cat/volume_copy_creator.js', E]);
+  try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); dump(js2JSON(E)); }
+  alert(err_msg);
+ }
 }
 
 g.render_library_label = function(row,ou_id) {
-	var label = document.createElement('label'); row.appendChild(label);
-	label.setAttribute('ou_id',ou_id);
-	label.setAttribute('value',g.data.hash.aou[ ou_id ].shortname());
+ var label = document.createElement('label'); row.appendChild(label);
+ label.setAttribute('ou_id',ou_id);
+ label.setAttribute('value',g.data.hash.aou[ ou_id ].shortname());
 }
 
 g.render_volume_count_entry = function(row,ou_id) {
-	var hb = document.createElement('vbox'); row.appendChild(hb);
-	var tb = document.createElement('textbox'); hb.appendChild(tb);
-	tb.setAttribute('ou_id',ou_id); tb.setAttribute('size','3'); tb.setAttribute('cols','3');
-	tb.setAttribute('rel_vert_pos','1'); 
-	if ( (!g.copy_shortcut) && (!g.last_focus) ) { tb.focus(); g.last_focus = tb; }
-	var node;
-	function render_copy_count_entry(ev) {
-		if (ev.target.disabled) return;
-		if (! isNaN( Number( ev.target.value) ) ) {
-			if ( Number( ev.target.value ) > g_max_copies_that_can_be_added_at_a_time_per_volume ) {
-				g.error.yns_alert($("catStrings").getFormattedString('staff.cat.volume_copy_creator.render_volume_count_entry.message', [g_max_copies_that_can_be_added_at_a_time_per_volume]),
-					$("catStrings").getString('staff.cat.volume_copy_creator.render_volume_count_entry.title'),
-					$("catStrings").getString('staff.cat.volume_copy_creator.render_volume_count_entry.ok_label'),null,null,'');
-				return;
-			}
-			if (node) { row.removeChild(node); node = null; }
-			//ev.target.disabled = true;
-			node = g.render_callnumber_copy_count_entry(row,ou_id,ev.target.value);
-		}
-	}
-	util.widgets.apply_vertical_tab_on_enter_handler( 
-		tb, 
-		function() { render_copy_count_entry({'target':tb}); setTimeout(function(){util.widgets.vertical_tab(tb);},0); }
-	);
-	tb.addEventListener( 'change', render_copy_count_entry, false);
-	tb.addEventListener( 'focus', function(ev) { g.last_focus = ev.target; }, false );
-	setTimeout(
-		function() {
-			try {
-			if (g.copy_shortcut) {
-				JSAN.use('util.functional');
-				tb.value = util.functional.map_object_to_list(
-					g.copy_shortcut[ou_id],
-					function(o,i) {
-						return g.copy_shortcut[ou_id][i];
-					}
-				).length
-				render_copy_count_entry({'target':tb});
-				tb.disabled = true;
-			}
-			} catch(E) {
-				alert(E);
-			}
-		}, 0
-	);
+ var hb = document.createElement('vbox'); row.appendChild(hb);
+ var tb = document.createElement('textbox'); hb.appendChild(tb);
+ tb.setAttribute('ou_id',ou_id); tb.setAttribute('size','3'); tb.setAttribute('cols','3');
+ tb.setAttribute('rel_vert_pos','1'); 
+ if ( (!g.copy_shortcut) && (!g.last_focus) ) { tb.focus(); g.last_focus = tb; }
+ var node;
+ function render_copy_count_entry(ev) {
+  if (ev.target.disabled) return;
+  if (! isNaN( Number( ev.target.value) ) ) {
+   if ( Number( ev.target.value ) > g_max_copies_that_can_be_added_at_a_time_per_volume ) {
+    g.error.yns_alert($("catStrings").getFormattedString('staff.cat.volume_copy_creator.render_volume_count_entry.message', [g_max_copies_that_can_be_added_at_a_time_per_volume]),
+     $("catStrings").getString('staff.cat.volume_copy_creator.render_volume_count_entry.title'),
+     $("catStrings").getString('staff.cat.volume_copy_creator.render_volume_count_entry.ok_label'),null,null,'');
+    return;
+   }
+   if (node) { row.removeChild(node); node = null; }
+   //ev.target.disabled = true;
+   node = g.render_callnumber_copy_count_entry(row,ou_id,ev.target.value);
+  }
+ }
+ util.widgets.apply_vertical_tab_on_enter_handler( 
+  tb, 
+  function() { render_copy_count_entry({'target':tb}); setTimeout(function(){util.widgets.vertical_tab(tb);},0); }
+ );
+ tb.addEventListener( 'change', render_copy_count_entry, false);
+ tb.addEventListener( 'focus', function(ev) { g.last_focus = ev.target; }, false );
+ setTimeout(
+  function() {
+   try {
+   if (g.copy_shortcut) {
+    JSAN.use('util.functional');
+    tb.value = util.functional.map_object_to_list(
+     g.copy_shortcut[ou_id],
+     function(o,i) {
+      return g.copy_shortcut[ou_id][i];
+     }
+    ).length
+    render_copy_count_entry({'target':tb});
+    tb.disabled = true;
+   }
+   } catch(E) {
+    alert(E);
+   }
+  }, 0
+ );
 }
 
 g.render_callnumber_copy_count_entry = function(row,ou_id,count) {
-	var grid = util.widgets.make_grid( [ {}, {} ] ); row.appendChild(grid);
-	grid.setAttribute('flex','1');
-	grid.setAttribute('ou_id',ou_id);
-	var rows = grid.lastChild;
-	var r = document.createElement('row'); rows.appendChild( r );
-	var x = document.createElement('label'); r.appendChild(x);
-	x.setAttribute('value', $("catStrings").getString('staff.cat.volume_copy_creator.render_callnumber_copy_count_entry.call_nums')); x.setAttribute('style','font-weight: bold');
-	x = document.createElement('label'); r.appendChild(x);
-	x.setAttribute('value',$("catStrings").getString('staff.cat.volume_copy_creator.render_callnumber_copy_count_entry.num_of_copies')); x.setAttribute('style','font-weight: bold');
-	x.setAttribute('size','3'); x.setAttribute('cols','3');
-
-
-	function handle_change(tb1,tb2,hb3) {
-		if (tb1.value == '') return;
-		if (isNaN( Number( tb2.value ) )) return;
-		if ( Number( tb2.value ) > g_max_copies_that_can_be_added_at_a_time_per_volume ) {
-			g.error.yns_alert($("catStrings").getFormattedString('staff.cat.volume_copy_creator.render_volume_count_entry.message', [g_max_copies_that_can_be_added_at_a_time_per_volume]),
-				$("catStrings").getString('staff.cat.volume_copy_creator.render_volume_count_entry.title'),
-				$("catStrings").getString('staff.cat.volume_copy_creator.render_volume_count_entry.ok_label'),null,null,'');
+ var grid = util.widgets.make_grid( [ {}, {} ] ); row.appendChild(grid);
+ grid.setAttribute('flex','1');
+ grid.setAttribute('ou_id',ou_id);
+ var rows = grid.lastChild;
+ var r = document.createElement('row'); rows.appendChild( r );
+ var x = document.createElement('label'); r.appendChild(x);
+ x.setAttribute('value', $("catStrings").getString('staff.cat.volume_copy_creator.render_callnumber_copy_count_entry.call_nums')); x.setAttribute('style','font-weight: bold');
+ x = document.createElement('label'); r.appendChild(x);
+ x.setAttribute('value',$("catStrings").getString('staff.cat.volume_copy_creator.render_callnumber_copy_count_entry.num_of_copies')); x.setAttribute('style','font-weight: bold');
+ x.setAttribute('size','3'); x.setAttribute('cols','3');
+
+
+ function handle_change(tb1,tb2,hb3) {
+  if (tb1.value == '') return;
+  if (isNaN( Number( tb2.value ) )) return;
+  if ( Number( tb2.value ) > g_max_copies_that_can_be_added_at_a_time_per_volume ) {
+   g.error.yns_alert($("catStrings").getFormattedString('staff.cat.volume_copy_creator.render_volume_count_entry.message', [g_max_copies_that_can_be_added_at_a_time_per_volume]),
+    $("catStrings").getString('staff.cat.volume_copy_creator.render_volume_count_entry.title'),
+    $("catStrings").getString('staff.cat.volume_copy_creator.render_volume_count_entry.ok_label'),null,null,'');
             return;
-		}
-
-		//if (tb1.disabled || tb2.disabled) return;
-
-		//tb1.disabled = true;
-		//tb2.disabled = true;
-
-		util.widgets.remove_children(hb3);
-
-		g.render_barcode_entry(hb3,tb1.value,Number(tb2.value),ou_id);
-		document.getElementById("Create").disabled = false;
-	}
-
-	function handle_change_tb1(ev) {
-		var _tb1 = ev.target;	
-		var _hb1 = _tb1.parentNode;
-		var _hb2 = _hb1.nextSibling;
-		var _tb2 = _hb2.firstChild;
-		var _hb3 = _hb2.nextSibling;
-		handle_change(_tb1,_tb2,_hb3);
-	}
-
-	function handle_change_tb2(ev) {
-		var _tb2 = ev.target;	
-		var _hb2 = _tb2.parentNode;
-		var _hb1 = _hb2.previousSibling;
-		var _tb1 = _hb1.firstChild;
-		var _hb3 = _hb2.nextSibling;
-		handle_change(_tb1,_tb2,_hb3);
-	}
-
-	for (var i = 0; i < count; i++) {
-		var r = document.createElement('row'); rows.appendChild(r);
-		var hb1 = document.createElement('vbox'); r.appendChild(hb1);
-		var hb2 = document.createElement('vbox'); r.appendChild(hb2);
-		var hb3 = document.createElement('vbox'); r.appendChild(hb3);
-		var tb1 = document.createElement('textbox'); hb1.appendChild(tb1);
-		tb1.setAttribute('rel_vert_pos','2');
-		tb1.setAttribute('ou_id',ou_id);
-		util.widgets.apply_vertical_tab_on_enter_handler( 
-			tb1, 
-			function() { handle_change_tb1({'target':tb1}); setTimeout(function(){util.widgets.vertical_tab(tb1);},0); }
-		);
-		var tb2 = document.createElement('textbox'); hb2.appendChild(tb2);
-		tb2.setAttribute('size','3'); tb2.setAttribute('cols','3');
-		tb2.setAttribute('rel_vert_pos','3');
-		tb2.setAttribute('ou_id',ou_id);
-		util.widgets.apply_vertical_tab_on_enter_handler( 
-			tb2, 
-			function() { handle_change_tb2({'target':tb2}); setTimeout(function(){util.widgets.vertical_tab(tb2);},0); }
-		);
-
-		tb1.addEventListener( 'change', handle_change_tb1, false);
-		tb1.addEventListener( 'focus', function(ev) { g.last_focus = ev.target; }, false );
-		tb2.addEventListener( 'change', handle_change_tb2, false);
-		tb2.addEventListener( 'focus', function(ev) { g.last_focus = ev.target; }, false );
-		if ( !g.last_focus ) { tb2.focus(); g.last_focus = tb2; }
-
-		setTimeout(
-			function(idx,tb){
-				return function() {
-					try {
-					JSAN.use('util.functional');
-					if (g.copy_shortcut) {
-						var label = util.functional.map_object_to_list(
-							g.copy_shortcut[ou_id],
-							function(o,i) {
-								return i;
-							}
-						)[idx];
-						tb.value = label; handle_change_tb1({'target':tb});
-						tb.disabled = true;
-					}
-					} catch(E) {
-						alert(E);
-					}
-				}
-			}(i,tb1),0
-		);
-	}
-
-	return grid;
+  }
+
+  //if (tb1.disabled || tb2.disabled) return;
+
+  //tb1.disabled = true;
+  //tb2.disabled = true;
+
+  util.widgets.remove_children(hb3);
+
+  g.render_barcode_entry(hb3,tb1.value,Number(tb2.value),ou_id);
+  document.getElementById("Create").disabled = false;
+ }
+
+ function handle_change_tb1(ev) {
+  var _tb1 = ev.target; 
+  var _hb1 = _tb1.parentNode;
+  var _hb2 = _hb1.nextSibling;
+  var _tb2 = _hb2.firstChild;
+  var _hb3 = _hb2.nextSibling;
+  handle_change(_tb1,_tb2,_hb3);
+ }
+
+ function handle_change_tb2(ev) {
+  var _tb2 = ev.target; 
+  var _hb2 = _tb2.parentNode;
+  var _hb1 = _hb2.previousSibling;
+  var _tb1 = _hb1.firstChild;
+  var _hb3 = _hb2.nextSibling;
+  handle_change(_tb1,_tb2,_hb3);
+ }
+
+ for (var i = 0; i < count; i++) {
+  var r = document.createElement('row'); rows.appendChild(r);
+  var hb1 = document.createElement('vbox'); r.appendChild(hb1);
+  var hb2 = document.createElement('vbox'); r.appendChild(hb2);
+  var hb3 = document.createElement('vbox'); r.appendChild(hb3);
+  var tb1 = document.createElement('textbox'); hb1.appendChild(tb1);
+  tb1.setAttribute('rel_vert_pos','2');
+  tb1.setAttribute('ou_id',ou_id);
+  util.widgets.apply_vertical_tab_on_enter_handler( 
+   tb1, 
+   function() { handle_change_tb1({'target':tb1}); setTimeout(function(){util.widgets.vertical_tab(tb1);},0); }
+  );
+  var tb2 = document.createElement('textbox'); hb2.appendChild(tb2);
+  tb2.setAttribute('size','3'); tb2.setAttribute('cols','3');
+  tb2.setAttribute('rel_vert_pos','3');
+  tb2.setAttribute('ou_id',ou_id);
+  util.widgets.apply_vertical_tab_on_enter_handler( 
+   tb2, 
+   function() { handle_change_tb2({'target':tb2}); setTimeout(function(){util.widgets.vertical_tab(tb2);},0); }
+  );
+
+  tb1.addEventListener( 'change', handle_change_tb1, false);
+  tb1.addEventListener( 'focus', function(ev) { g.last_focus = ev.target; }, false );
+  tb2.addEventListener( 'change', handle_change_tb2, false);
+  tb2.addEventListener( 'focus', function(ev) { g.last_focus = ev.target; }, false );
+  if ( !g.last_focus ) { tb2.focus(); g.last_focus = tb2; }
+
+  setTimeout(
+   function(idx,tb){
+    return function() {
+     try {
+     JSAN.use('util.functional');
+     if (g.copy_shortcut) {
+      var label = util.functional.map_object_to_list(
+       g.copy_shortcut[ou_id],
+       function(o,i) {
+        return i;
+       }
+      )[idx];
+      tb.value = label; handle_change_tb1({'target':tb});
+      tb.disabled = true;
+     }
+     } catch(E) {
+      alert(E);
+     }
+    }
+   }(i,tb1),0
+  );
+ }
+
+ return grid;
 }
 
 g.render_barcode_entry = function(node,callnumber,count,ou_id) {
-	try {
-		function ready_to_create(ev) {
-			document.getElementById("Create").disabled = false;
-		}
-
-		JSAN.use('util.barcode'); 
-
-		for (var i = 0; i < count; i++) {
-			var tb = document.createElement('textbox'); node.appendChild(tb);
-			tb.setAttribute('ou_id',ou_id);
-			tb.setAttribute('callnumber',callnumber);
-			tb.setAttribute('rel_vert_pos','4');
-			util.widgets.apply_vertical_tab_on_enter_handler( 
-				tb, 
-				function() { ready_to_create({'target':tb}); setTimeout(function(){util.widgets.vertical_tab(tb);},0); }
-			);
-			//tb.addEventListener('change',ready_to_create,false);
-			tb.addEventListener('change', function(ev) {
-				var barcode = String( ev.target.value ).replace(/\s/g,'');
-				if (barcode != ev.target.value) ev.target.value = barcode;
-				if ($('check_barcodes').checked && ! util.barcode.check(barcode) ) {
-					g.error.yns_alert($("catStrings").getFormattedString('staff.cat.volume_copy_creator.render_barcode_entry.alert_message', [barcode]),
-						$("catStrings").getString('staff.cat.volume_copy_creator.render_barcode_entry.alert_title'),
-						$("catStrings").getString('staff.cat.volume_copy_creator.render_barcode_entry.alert_ok_button'),null,null,
-						$("catStrings").getString('staff.cat.volume_copy_creator.render_barcode_entry.alert_confirm'));
-					setTimeout( function() { ev.target.select(); ev.target.focus(); }, 0);
-				}
-			}, false);
-			tb.addEventListener( 'focus', function(ev) { g.last_focus = ev.target; }, false );
-		}
-	} catch(E) {
-		g.error.sdump('D_ERROR','g.render_barcode_entry: ' + E);
-	}
+ try {
+  function ready_to_create(ev) {
+   document.getElementById("Create").disabled = false;
+  }
+
+  JSAN.use('util.barcode'); 
+
+  for (var i = 0; i < count; i++) {
+   var tb = document.createElement('textbox'); node.appendChild(tb);
+   tb.setAttribute('ou_id',ou_id);
+   tb.setAttribute('callnumber',callnumber);
+   tb.setAttribute('rel_vert_pos','4');
+   util.widgets.apply_vertical_tab_on_enter_handler( 
+    tb, 
+    function() { ready_to_create({'target':tb}); setTimeout(function(){util.widgets.vertical_tab(tb);},0); }
+   );
+   //tb.addEventListener('change',ready_to_create,false);
+   tb.addEventListener('change', function(ev) {
+    var barcode = String( ev.target.value ).replace(/\s/g,'');
+    if (barcode != ev.target.value) ev.target.value = barcode;
+    if ($('check_barcodes').checked && ! util.barcode.check(barcode) ) {
+     g.error.yns_alert($("catStrings").getFormattedString('staff.cat.volume_copy_creator.render_barcode_entry.alert_message', [barcode]),
+      $("catStrings").getString('staff.cat.volume_copy_creator.render_barcode_entry.alert_title'),
+      $("catStrings").getString('staff.cat.volume_copy_creator.render_barcode_entry.alert_ok_button'),null,null,
+      $("catStrings").getString('staff.cat.volume_copy_creator.render_barcode_entry.alert_confirm'));
+     setTimeout( function() { ev.target.select(); ev.target.focus(); }, 0);
+    }
+   }, false);
+   tb.addEventListener( 'focus', function(ev) { g.last_focus = ev.target; }, false );
+  }
+ } catch(E) {
+  g.error.sdump('D_ERROR','g.render_barcode_entry: ' + E);
+ }
 }
 
 g.new_node_id = -1;
 
 g.stash_and_close = function() {
 
-	try {
-
-		var nl = document.getElementsByTagName('textbox');
-
-		var volumes_hash = {};
-
-		var barcodes = [];
-		
-		for (var i = 0; i < nl.length; i++) {
-			if ( nl[i].getAttribute('rel_vert_pos') == 4 ) barcodes.push( nl[i] );
-			if ( nl[i].getAttribute('rel_vert_pos') == 2 )  {
-				var ou_id = nl[i].getAttribute('ou_id');
-				var callnumber = nl[i].value;
-				if (typeof volumes_hash[ou_id] == 'undefined') { volumes_hash[ou_id] = {} }
-				if (typeof volumes_hash[ou_id][callnumber] == 'undefined') { volumes_hash[ou_id][callnumber] = [] }
-			}
-		};
-	
-		for (var i = 0; i < barcodes.length; i++) {
-			var ou_id = barcodes[i].getAttribute('ou_id');
-			var callnumber = barcodes[i].getAttribute('callnumber');
-			var barcode = barcodes[i].value;
-
-			if (typeof volumes_hash[ou_id] == 'undefined') { volumes_hash[ou_id] = {} }
-			if (typeof volumes_hash[ou_id][callnumber] == 'undefined') { volumes_hash[ou_id][callnumber] = [] }
-
-			if (barcode != '') volumes_hash[ou_id][callnumber].push( barcode );
-		}
-
-		var volumes = [];
-		var copies = [];
-		var volume_labels = {};
-
-		for (var ou_id in volumes_hash) {
-			for (var cn in volumes_hash[ou_id]) {
-
-				var acn_id = g.network.simple_request(
-					'FM_ACN_FIND_OR_CREATE',
-					[ ses(), cn, g.doc_id, ou_id ]
-				);
-
-				if (typeof acn_id.ilsevent != 'undefined') {
-					g.error.standard_unexpected_error_alert($("catStrings").getFormattedString('staff.cat.volume_copy_creator.stash_and_close.problem_with_volume', [cn]), acn_id);
-					continue;
-				}
-
-				volume_labels[ acn_id ] = { 'label' : cn, 'owning_lib' : ou_id };
-
-				for (var i = 0; i < volumes_hash[ou_id][cn].length; i++) {
-					var copy = new acp();
-					copy.id( g.new_node_id-- );
-					copy.isnew('1');
-					copy.barcode( volumes_hash[ou_id][cn][i] );
-					copy.call_number( acn_id );
-					copy.circ_lib(ou_id);
-					/* FIXME -- use constants */
-					copy.deposit(0);
-					copy.price(0);
-					copy.deposit_amount(0);
-					copy.fine_level(2);
-					copy.loan_duration(2);
-					copy.location(1);
-					copy.status(0);
-					copy.circulate(get_db_true());
-					copy.holdable(get_db_true());
-					copy.opac_visible(get_db_true());
-					copy.ref(get_db_false());
-					copies.push( copy );
-				}
-			}
-		}
-
-		JSAN.use('util.window'); var win = new util.window();
-		if (copies.length > 0) {
-			JSAN.use('cat.util');
+ try {
+
+  var nl = document.getElementsByTagName('textbox');
+
+  var volumes_hash = {};
+
+  var barcodes = [];
+  
+  for (var i = 0; i < nl.length; i++) {
+   if ( nl[i].getAttribute('rel_vert_pos') == 4 ) barcodes.push( nl[i] );
+   if ( nl[i].getAttribute('rel_vert_pos') == 2 )  {
+    var ou_id = nl[i].getAttribute('ou_id');
+    var callnumber = nl[i].value;
+    if (typeof volumes_hash[ou_id] == 'undefined') { volumes_hash[ou_id] = {} }
+    if (typeof volumes_hash[ou_id][callnumber] == 'undefined') { volumes_hash[ou_id][callnumber] = [] }
+   }
+  };
+ 
+  for (var i = 0; i < barcodes.length; i++) {
+   var ou_id = barcodes[i].getAttribute('ou_id');
+   var callnumber = barcodes[i].getAttribute('callnumber');
+   var barcode = barcodes[i].value;
+
+   if (typeof volumes_hash[ou_id] == 'undefined') { volumes_hash[ou_id] = {} }
+   if (typeof volumes_hash[ou_id][callnumber] == 'undefined') { volumes_hash[ou_id][callnumber] = [] }
+
+   if (barcode != '') volumes_hash[ou_id][callnumber].push( barcode );
+  }
+
+  var volumes = [];
+  var copies = [];
+  var volume_labels = {};
+
+  for (var ou_id in volumes_hash) {
+   for (var cn in volumes_hash[ou_id]) {
+
+    var acn_id = g.network.simple_request(
+     'FM_ACN_FIND_OR_CREATE',
+     [ ses(), cn, g.doc_id, ou_id ]
+    );
+
+    if (typeof acn_id.ilsevent != 'undefined') {
+     g.error.standard_unexpected_error_alert($("catStrings").getFormattedString('staff.cat.volume_copy_creator.stash_and_close.problem_with_volume', [cn]), acn_id);
+     continue;
+    }
+
+    volume_labels[ acn_id ] = { 'label' : cn, 'owning_lib' : ou_id };
+
+    for (var i = 0; i < volumes_hash[ou_id][cn].length; i++) {
+     var copy = new acp();
+     copy.id( g.new_node_id-- );
+     copy.isnew('1');
+     copy.barcode( volumes_hash[ou_id][cn][i] );
+     copy.call_number( acn_id );
+     copy.circ_lib(ou_id);
+     /* FIXME -- use constants */
+     copy.deposit(0);
+     copy.price(0);
+     copy.deposit_amount(0);
+     copy.fine_level(2);
+     copy.loan_duration(2);
+     copy.location(1);
+     copy.status(0);
+     copy.circulate(get_db_true());
+     copy.holdable(get_db_true());
+     copy.opac_visible(get_db_true());
+     copy.ref(get_db_false());
+     copies.push( copy );
+    }
+   }
+  }
+
+  JSAN.use('util.window'); var win = new util.window();
+  if (copies.length > 0) {
+   JSAN.use('cat.util');
             copies = cat.util.spawn_copy_editor( { 'edit' : 1, 'docid' : g.doc_id, 'copies' : copies });
             try {
                 //case 1706 /* ITEM_BARCODE_EXISTS */ :
@@ -406,63 +406,63 @@ g.stash_and_close = function() {
             } catch(E) {
                 g.error.standard_unexpected_error_alert($(catStrings).getString('staff.cat.volume_copy_creator.stash_and_close.tree_err2'),E);
             }
-	}
+ }
 
-		if (typeof window.refresh == 'function') window.refresh();
+  if (typeof window.refresh == 'function') window.refresh();
 
-		window.close();
+  window.close();
 
-	} catch(E) {
-		g.error.standard_unexpected_error_alert($(catStrings).getString('staff.cat.volume_copy_creator.stash_and_close.tree_err3'),E);
-	}
+ } catch(E) {
+  g.error.standard_unexpected_error_alert($(catStrings).getString('staff.cat.volume_copy_creator.stash_and_close.tree_err3'),E);
+ }
 }
 
 g.load_prefs = function() {
-	try {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-		JSAN.use('util.file'); var file = new util.file('volume_copy_creator.prefs');
-		if (file._file.exists()) {
-			var prefs = file.get_object(); file.close();
-			if (prefs.check_barcodes) {
-				if ( prefs.check_barcodes == 'false' ) {
-					$('check_barcodes').checked = false;
-				} else {
-					$('check_barcodes').checked = prefs.check_barcodes;
-				}
-			} else {
-				$('check_barcodes').checked = false;
-			}
-			if (prefs.print_labels) {
-				if ( prefs.print_labels == 'false' ) {
-					$('print_labels').checked = false;
-				} else {
-					$('print_labels').checked = prefs.print_labels;
-				}
-			} else {
-				$('print_labels').checked = false;
-			}
-
-		}
-	} catch(E) {
-		g.error.standard_unexpected_error_alert($(catStrings).getString('staff.cat.volume_copy_creator.load_prefs.err_retrieving_prefs'),E);
-		
-	}
+ try {
+  netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+  JSAN.use('util.file'); var file = new util.file('volume_copy_creator.prefs');
+  if (file._file.exists()) {
+   var prefs = file.get_object(); file.close();
+   if (prefs.check_barcodes) {
+    if ( prefs.check_barcodes == 'false' ) {
+     $('check_barcodes').checked = false;
+    } else {
+     $('check_barcodes').checked = prefs.check_barcodes;
+    }
+   } else {
+    $('check_barcodes').checked = false;
+   }
+   if (prefs.print_labels) {
+    if ( prefs.print_labels == 'false' ) {
+     $('print_labels').checked = false;
+    } else {
+     $('print_labels').checked = prefs.print_labels;
+    }
+   } else {
+    $('print_labels').checked = false;
+   }
+
+  }
+ } catch(E) {
+  g.error.standard_unexpected_error_alert($(catStrings).getString('staff.cat.volume_copy_creator.load_prefs.err_retrieving_prefs'),E);
+  
+ }
 }
 
 g.save_prefs = function () {
-	try {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-		JSAN.use('util.file'); var file = new util.file('volume_copy_creator.prefs');
-		file.set_object(
-			{
-				'check_barcodes' : $('check_barcodes').checked,
-				'print_labels' : $('print_labels').checked,
-			}
-		);
-		file.close();
-	} catch(E) {
-		g.error.standard_unexpected_error_alert($(catStrings).getString('staff.cat.volume_copy_creator.save_prefs.err_storing_prefs'),E);
-	}
+ try {
+  netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+  JSAN.use('util.file'); var file = new util.file('volume_copy_creator.prefs');
+  file.set_object(
+   {
+    'check_barcodes' : $('check_barcodes').checked,
+    'print_labels' : $('print_labels').checked,
+   }
+  );
+  file.close();
+ } catch(E) {
+  g.error.standard_unexpected_error_alert($(catStrings).getString('staff.cat.volume_copy_creator.save_prefs.err_storing_prefs'),E);
+ }
 }
 
 
diff --git a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul
index c06e08d847..4e261fa043 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul
+++ b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,44 +19,44 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="cat_volume_copy_creator_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	width="800" height="580"
-	title="&staff.cat.volume_copy_creator.title;"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script type="text/javascript">
-	var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; 
-	</script>
-	<scripts id="openils_util_scripts"/>
-
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="volume_copy_creator.js"/>
-	
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+ onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+ width="800" height="580"
+ title="&staff.cat.volume_copy_creator.title;"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
+ <script type="text/javascript">
+ var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; 
+ </script>
+ <scripts id="openils_util_scripts"/>
+
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script type="text/javascript" src="volume_copy_creator.js"/>
+ 
+ <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+ <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <vbox id="summary_box"/>
-	<groupbox flex="1" class="my_overflow">
-		<caption id="caption" label="&staff.cat.volume_copy_creator.label;"/>
-		<hbox style="border-bottom: solid black thin">
-			<hbox id="marc_cn"/>
-			<spacer flex="1" />
-			<checkbox id="check_barcodes" label="&staff.cat.volume_copy_creator.check_barcodes.label;" oncommand="g.save_prefs();" accesskey="&staff.cat.volume_copy_creator.check_barcodes.accesskey;"/>
-			<checkbox id="print_labels" label="&staff.cat.volume_copy_creator.print_labels.label;"  oncommand="g.save_prefs();" accesskey="&staff.cat.volume_copy_creator.print_labels.accesskey;"/>
-			<button id="Create" accesskey="&staff.cat.volume_copy_creator.create.accesskey;" label="&staff.cat.volume_copy_creator.create.label;" disabled="true" oncommand="g.stash_and_close();"/>
-		</hbox>
-		<grid flex="1">
-			<columns> <column flex="0"/> <column flex="0"/> <column flex="1"/> </columns>
-			<rows id="rows">
-				<row>
-					<label value="&staff.cat.volume_copy_creator.library_label.value;" style="font-weight: bold"/>
-					<label value="&staff.cat.volume_copy_creator.num_of_volumes_label.value;" style="font-weight: bold"/>
-				</row>
-			</rows>
-		</grid>
-	</groupbox>
+ <groupbox flex="1" class="my_overflow">
+  <caption id="caption" label="&staff.cat.volume_copy_creator.label;"/>
+  <hbox style="border-bottom: solid black thin">
+   <hbox id="marc_cn"/>
+   <spacer flex="1" />
+   <checkbox id="check_barcodes" label="&staff.cat.volume_copy_creator.check_barcodes.label;" oncommand="g.save_prefs();" accesskey="&staff.cat.volume_copy_creator.check_barcodes.accesskey;"/>
+   <checkbox id="print_labels" label="&staff.cat.volume_copy_creator.print_labels.label;"  oncommand="g.save_prefs();" accesskey="&staff.cat.volume_copy_creator.print_labels.accesskey;"/>
+   <button id="Create" accesskey="&staff.cat.volume_copy_creator.create.accesskey;" label="&staff.cat.volume_copy_creator.create.label;" disabled="true" oncommand="g.stash_and_close();"/>
+  </hbox>
+  <grid flex="1">
+   <columns> <column flex="0"/> <column flex="0"/> <column flex="1"/> </columns>
+   <rows id="rows">
+    <row>
+     <label value="&staff.cat.volume_copy_creator.library_label.value;" style="font-weight: bold"/>
+     <label value="&staff.cat.volume_copy_creator.num_of_volumes_label.value;" style="font-weight: bold"/>
+    </row>
+   </rows>
+  </grid>
+ </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/cat/volume_editor.xul b/Open-ILS/xul/staff_client/server/cat/volume_editor.xul
index cbed04bb04..c5b77b8aa9 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_editor.xul
+++ b/Open-ILS/xul/staff_client/server/cat/volume_editor.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,99 +19,99 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="cat_volume_editor_win" 
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	title="&staff.cat.volume_editor.title;" height="400" width="300" oils_persist="height width"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+ title="&staff.cat.volume_editor.title;" height="400" width="300" oils_persist="height width"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+ </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
 
-		var xulG = {};
+  var xulG = {};
 
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for cat/volume_editor.xul');
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for cat/volume_editor.xul');
 
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+    JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
 
-				JSAN.use('util.network'); g.network = new util.network();
+    JSAN.use('util.network'); g.network = new util.network();
 
-				JSAN.use('util.functional');
+    JSAN.use('util.functional');
 
-				g.volumes = xul_param('volumes',{'stash_name':'volumes_temp','clear_xpcom':true,'modal_xulG':true}); //JSON2js( g.data.volumes_temp );
-				//g.data.volumes_temp = ''; g.data.stash('volumes_temp');
+    g.volumes = xul_param('volumes',{'stash_name':'volumes_temp','clear_xpcom':true,'modal_xulG':true}); //JSON2js( g.data.volumes_temp );
+    //g.data.volumes_temp = ''; g.data.stash('volumes_temp');
 
-				var rows = document.getElementById('rows');
+    var rows = document.getElementById('rows');
 
-				for (var i = 0; i < g.volumes.length; i++) {
-					var row = document.createElement('row'); rows.appendChild(row);
-					var lib_label = document.createElement('label'); row.appendChild(lib_label);
-					var tb = document.createElement('textbox'); row.appendChild(tb);
+    for (var i = 0; i < g.volumes.length; i++) {
+     var row = document.createElement('row'); rows.appendChild(row);
+     var lib_label = document.createElement('label'); row.appendChild(lib_label);
+     var tb = document.createElement('textbox'); row.appendChild(tb);
 
-					var lib_id = g.volumes[i].owning_lib();
-					var last_lib_seen;
+     var lib_id = g.volumes[i].owning_lib();
+     var last_lib_seen;
 
-					if (last_lib_seen != lib_id ) {
-						lib_label.setAttribute('value',g.data.hash.aou[ lib_id ].shortname() );
-						last_lib_seen = lib_id;
-					}
+     if (last_lib_seen != lib_id ) {
+      lib_label.setAttribute('value',g.data.hash.aou[ lib_id ].shortname() );
+      last_lib_seen = lib_id;
+     }
 
-					tb.setAttribute('value',g.volumes[i].label());
-					tb.setAttribute('onchange','try { var v = g.volumes['+i+']; v.ischanged("1"); v.label( this.value ); } catch(E) { alert(E); }');
-				}
+     tb.setAttribute('value',g.volumes[i].label());
+     tb.setAttribute('onchange','try { var v = g.volumes['+i+']; v.ischanged("1"); v.label( this.value ); } catch(E) { alert(E); }');
+    }
 
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['cat/volume_editor.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); dump(js2JSON(E)); }
-				alert(err_msg);
-			}
-		}
+   } catch(E) {
+    var err_msg = $("commonStrings").getFormattedString('common.exception', ['cat/volume_editor.xul', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); dump(js2JSON(E)); }
+    alert(err_msg);
+   }
+  }
 
-		g.stash_and_close = function() {
-			try {
-				//g.data.volumes_temp = js2JSON( g.volumes );
-				//g.error.sdump('D_CAT','in modal window, g.data.volumes_temp = \n' + g.data.volumes_temp + '\n');
-				//g.data.stash('volumes_temp');
-				xulG.volumes = g.volumes;
+  g.stash_and_close = function() {
+   try {
+    //g.data.volumes_temp = js2JSON( g.volumes );
+    //g.error.sdump('D_CAT','in modal window, g.data.volumes_temp = \n' + g.data.volumes_temp + '\n');
+    //g.data.stash('volumes_temp');
+    xulG.volumes = g.volumes;
                 xulG.update_these_volumes = 1;
-				update_modal_xulG(xulG);
-				window.close();
-			} catch(E) {
-				alert('FIXME: volume editor -> ' + E);
-			}
-		}
-
-	]]>
-	</script>
-	
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-
-	<groupbox flex="1" style="overflow: auto">
-		<caption id="caption" label="&staff.cat.volume_editor.caption.label;"/>
-		<hbox>
-			<button label="&staff.cat.volume_editor.cancel.label;" oncommand="window.close();"/>
-			<spacer flex="1" />
-			<button label="&staff.cat.volume_editor.modify.label;" oncommand="g.stash_and_close();"/>
-		</hbox>
-		<grid flex="1">
-			<columns> <column /> <column /> <column flex="1"/> </columns>
-			<rows id="rows" />
-		</grid>
-	</groupbox>
+    update_modal_xulG(xulG);
+    window.close();
+   } catch(E) {
+    alert('FIXME: volume editor -> ' + E);
+   }
+  }
+
+ ]]>
+ </script>
+ 
+ <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+ <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+
+ <groupbox flex="1" style="overflow: auto">
+  <caption id="caption" label="&staff.cat.volume_editor.caption.label;"/>
+  <hbox>
+   <button label="&staff.cat.volume_editor.cancel.label;" oncommand="window.close();"/>
+   <spacer flex="1" />
+   <button label="&staff.cat.volume_editor.modify.label;" oncommand="g.stash_and_close();"/>
+  </hbox>
+  <grid flex="1">
+   <columns> <column /> <column /> <column flex="1"/> </columns>
+   <rows id="rows" />
+  </grid>
+ </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/cat/z3950.js b/Open-ILS/xul/staff_client/server/cat/z3950.js
index 8ece2df239..1e9daeb6fa 100644
--- a/Open-ILS/xul/staff_client/server/cat/z3950.js
+++ b/Open-ILS/xul/staff_client/server/cat/z3950.js
@@ -4,18 +4,18 @@ function $(id) { return document.getElementById(id); }
 
 if (typeof cat == 'undefined') cat = {};
 cat.z3950 = function (params) {
-	try {
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		JSAN.use('util.error'); this.error = new util.error();
-		JSAN.use('util.network'); this.network = new util.network();
-	} catch(E) {
-		dump('cat.z3950: ' + E + '\n');
-	}
+ try {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  JSAN.use('util.error'); this.error = new util.error();
+  JSAN.use('util.network'); this.network = new util.network();
+ } catch(E) {
+  dump('cat.z3950: ' + E + '\n');
+ }
 }
 
 cat.z3950.prototype = {
 
-	'creds_version' : 2,
+ 'creds_version' : 2,
 
     'number_of_result_sets' : 0,
 
@@ -23,92 +23,92 @@ cat.z3950.prototype = {
 
     'limit' : 10,
 
-	'init' : function( params ) {
+ 'init' : function( params ) {
 
-		try {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			JSAN.use('util.widgets');
+  try {
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   JSAN.use('util.widgets');
 
-			var obj = this;
+   var obj = this;
 
             JSAN.use('OpenILS.data'); obj.data = new OpenILS.data(); obj.data.init({'via':'stash'});
 
-			obj.load_creds();
+   obj.load_creds();
 
-			JSAN.use('circ.util');
-			var columns = circ.util.columns(
-				{
-					'tcn' : { 'hidden' : false },
-					'isbn' : { 'hidden' : false },
-					'title' : { 'hidden' : false, 'flex' : '1' },
-					'author' : { 'hidden' : false },
-					'edition' : { 'hidden' : false },
-					'pubdate' : { 'hidden' : false },
-					'publisher' : { 'hidden' : false },
-					'service' : { 'hidden' : false }
-				}
+   JSAN.use('circ.util');
+   var columns = circ.util.columns(
+    {
+     'tcn' : { 'hidden' : false },
+     'isbn' : { 'hidden' : false },
+     'title' : { 'hidden' : false, 'flex' : '1' },
+     'author' : { 'hidden' : false },
+     'edition' : { 'hidden' : false },
+     'pubdate' : { 'hidden' : false },
+     'publisher' : { 'hidden' : false },
+     'service' : { 'hidden' : false }
+    }
             );
 
-			JSAN.use('util.list'); obj.list = new util.list('results');
-			obj.list.init(
-				{
-					'columns' : columns,
-					'map_row_to_columns' : circ.util.std_map_row_to_columns(),
-					'on_select' : function(ev) {
-						try {
-							JSAN.use('util.functional');
-							var sel = obj.list.retrieve_selection();
-							document.getElementById('sel_clip').setAttribute('disabled', sel.length < 1);
-							var list = util.functional.map_list(
-								sel,
-								function(o) { return o.getAttribute('retrieve_id'); }
-							);
-							obj.error.sdump('D_TRACE','cat/z3950: selection list = ' + js2JSON(list) );
-							obj.controller.view.marc_import.disabled = false;
-							obj.controller.view.marc_import.setAttribute('retrieve_id',list[0]);
-		                    obj.data.init({'via':'stash'});
-                    		if (obj.data.marked_record) {
-				    			obj.controller.view.marc_import_overlay.disabled = false;
+   JSAN.use('util.list'); obj.list = new util.list('results');
+   obj.list.init(
+    {
+     'columns' : columns,
+     'map_row_to_columns' : circ.util.std_map_row_to_columns(),
+     'on_select' : function(ev) {
+      try {
+       JSAN.use('util.functional');
+       var sel = obj.list.retrieve_selection();
+       document.getElementById('sel_clip').setAttribute('disabled', sel.length < 1);
+       var list = util.functional.map_list(
+        sel,
+        function(o) { return o.getAttribute('retrieve_id'); }
+       );
+       obj.error.sdump('D_TRACE','cat/z3950: selection list = ' + js2JSON(list) );
+       obj.controller.view.marc_import.disabled = false;
+       obj.controller.view.marc_import.setAttribute('retrieve_id',list[0]);
+                      obj.data.init({'via':'stash'});
+                      if (obj.data.marked_record) {
+           obj.controller.view.marc_import_overlay.disabled = false;
                             } else {
-				    			obj.controller.view.marc_import_overlay.disabled = true;
+           obj.controller.view.marc_import_overlay.disabled = true;
                             }
-			    			obj.controller.view.marc_import_overlay.setAttribute('retrieve_id',list[0]);
-							obj.controller.view.marc_view_btn.disabled = false;
-							obj.controller.view.marc_view_btn.setAttribute('retrieve_id',list[0]);
-						} catch(E) {
-							obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.obj_list_init.list_construction_error'),E);
-						}
-					},
-				}
-			);
+          obj.controller.view.marc_import_overlay.setAttribute('retrieve_id',list[0]);
+       obj.controller.view.marc_view_btn.disabled = false;
+       obj.controller.view.marc_view_btn.setAttribute('retrieve_id',list[0]);
+      } catch(E) {
+       obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.obj_list_init.list_construction_error'),E);
+      }
+     },
+    }
+   );
 
-			JSAN.use('util.controller'); obj.controller = new util.controller();
-			obj.controller.init(
-				{
-					control_map : {
-						'save_columns' : [ [ 'command' ], function() { obj.list.save_columns(); } ],
-						'sel_clip' : [ ['command'], function() { obj.list.clipboard(); } ],
-						'cmd_z3950_csv_to_clipboard' : [ ['command'], function() { obj.list.dump_csv_to_clipboard(); } ],
+   JSAN.use('util.controller'); obj.controller = new util.controller();
+   obj.controller.init(
+    {
+     control_map : {
+      'save_columns' : [ [ 'command' ], function() { obj.list.save_columns(); } ],
+      'sel_clip' : [ ['command'], function() { obj.list.clipboard(); } ],
+      'cmd_z3950_csv_to_clipboard' : [ ['command'], function() { obj.list.dump_csv_to_clipboard(); } ],
                         'cmd_z3950_csv_to_printer' : [ ['command'], function() { obj.list.dump_csv_to_printer(); } ], 
                         'cmd_z3950_csv_to_file' : [ ['command'], function() { obj.list.dump_csv_to_file( { 'defaultFileName' : 'z3950_results.txt' } ); } ],
-						'cmd_broken' : [
-							['command'],
-							function() { alert('Not Yet Implemented'); }
-						],
-						'result_message' : [['render'],function(e){return function(){};}],
-						'clear' : [
-							['command'],
-							function() {
-								obj.clear();
-							}
-						],
-						'save_creds' : [
-							['command'],
-							function() {
-								obj.save_creds();
+      'cmd_broken' : [
+       ['command'],
+       function() { alert('Not Yet Implemented'); }
+      ],
+      'result_message' : [['render'],function(e){return function(){};}],
+      'clear' : [
+       ['command'],
+       function() {
+        obj.clear();
+       }
+      ],
+      'save_creds' : [
+       ['command'],
+       function() {
+        obj.save_creds();
                                 setTimeout( function() { obj.focus(); }, 0 );
-							}
-						],
+       }
+      ],
                         'marc_view_btn' : [
                             ['render'],
                             function(e) {
@@ -116,39 +116,39 @@ cat.z3950.prototype = {
                                 e.setAttribute('accesskey', $("catStrings").getString('staff.cat.z3950.marc_view.accesskey'));
                             }
                         ],
-						'marc_view' : [
-							['command'],
-							function(ev) {
-								try {
-									var n = obj.controller.view.marc_view_btn;
-									if (n.getAttribute('toggle') == '1') {
-										document.getElementById('deck').selectedIndex = 0;
-										n.setAttribute('toggle','0');
-										n.setAttribute('label', $("catStrings").getString('staff.cat.z3950.marc_view.label'));
-										n.setAttribute('accesskey', $("catStrings").getString('staff.cat.z3950.marc_view.accesskey'));
-										document.getElementById('results').focus();
-									} else {
-										document.getElementById('deck').selectedIndex = 1;
-										n.setAttribute('toggle','1');
-										n.setAttribute('label', $("catStrings").getString('staff.cat.z3950.results_view.label'));
-										n.setAttribute('accesskey', $("catStrings").getString('staff.cat.z3950.results_view.accesskey'));
-										netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-										var f = get_contentWindow(document.getElementById('marc_frame'));
+      'marc_view' : [
+       ['command'],
+       function(ev) {
+        try {
+         var n = obj.controller.view.marc_view_btn;
+         if (n.getAttribute('toggle') == '1') {
+          document.getElementById('deck').selectedIndex = 0;
+          n.setAttribute('toggle','0');
+          n.setAttribute('label', $("catStrings").getString('staff.cat.z3950.marc_view.label'));
+          n.setAttribute('accesskey', $("catStrings").getString('staff.cat.z3950.marc_view.accesskey'));
+          document.getElementById('results').focus();
+         } else {
+          document.getElementById('deck').selectedIndex = 1;
+          n.setAttribute('toggle','1');
+          n.setAttribute('label', $("catStrings").getString('staff.cat.z3950.results_view.label'));
+          n.setAttribute('accesskey', $("catStrings").getString('staff.cat.z3950.results_view.accesskey'));
+          netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+          var f = get_contentWindow(document.getElementById('marc_frame'));
                                         var retrieve_id = n.getAttribute('retrieve_id');
                                         var result_idx = retrieve_id.split('-')[0];
                                         var record_idx = retrieve_id.split('-')[1];
-										f.xulG = { 'marcxml' : obj.result_set[result_idx].records[ record_idx ].marcxml };
-										f.my_init();
-										f.document.body.firstChild.focus();
-									}
-								} catch(E) {
-			                        obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.obj_controller_init.marc_view_error'),E);
-								}
-							},
-						],
-						'marc_import' : [
-							['command'],
-							function() {
+          f.xulG = { 'marcxml' : obj.result_set[result_idx].records[ record_idx ].marcxml };
+          f.my_init();
+          f.document.body.firstChild.focus();
+         }
+        } catch(E) {
+                           obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.obj_controller_init.marc_view_error'),E);
+        }
+       },
+      ],
+      'marc_import' : [
+       ['command'],
+       function() {
                                 try {
                                     var retrieve_id = obj.controller.view.marc_import.getAttribute('retrieve_id');
                                     var result_idx = retrieve_id.split('-')[0];
@@ -158,14 +158,14 @@ cat.z3950.prototype = {
                                         obj.result_set[ result_idx ].records[ record_idx ].service /* FIXME: we want biblio_source here */
                                     );
                                 } catch(E) {
-			                        obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.obj_controller_init.marc_import_error'),E);
+                           obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.obj_controller_init.marc_import_error'),E);
                                 }
-							},
-						],
-						'marc_import_overlay' : [ 
-							['command'],
-							function() {
-								try {
+       },
+      ],
+      'marc_import_overlay' : [ 
+       ['command'],
+       function() {
+        try {
                                     var retrieve_id = obj.controller.view.marc_import_overlay.getAttribute('retrieve_id');
                                     var result_idx = retrieve_id.split('-')[0];
                                     var record_idx = retrieve_id.split('-')[1];
@@ -173,17 +173,17 @@ cat.z3950.prototype = {
                                         obj.result_set[ result_idx ].records[ record_idx ].marcxml,
                                         obj.result_set[ result_idx ].records[ record_idx ].service /* FIXME: we want biblio_source here */
                                     );
-								} catch(E) {
-			                        obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.obj_controller_init.marc_import_overlay_error'),E);
-								}
-							},
-						],
-						'search' : [
-							['command'],
-							function() {
-								obj.initial_search();
-							},
-						],
+        } catch(E) {
+                           obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.obj_controller_init.marc_import_overlay_error'),E);
+        }
+       },
+      ],
+      'search' : [
+       ['command'],
+       function() {
+        obj.initial_search();
+       },
+      ],
                         'raw_search' : [ 
                             ['command'], 
                             function() { 
@@ -195,12 +195,12 @@ cat.z3950.prototype = {
                                 if (raw) obj.initial_raw_search(raw); 
                             } 
                         ], 
-						'page_next' : [
-							['command'],
-							function() {
-								obj.page_next();
-							},
-						],
+      'page_next' : [
+       ['command'],
+       function() {
+        obj.page_next();
+       },
+      ],
                         'toggle_form_btn' : [
                             ['render'],
                             function(e) {
@@ -214,7 +214,7 @@ cat.z3950.prototype = {
                             function() {
                                 var x = document.getElementById('top_pane');
                                 document.getElementById('splitter_grippy2').doCommand();
-								var n = obj.controller.view.toggle_form_btn;
+        var n = obj.controller.view.toggle_form_btn;
                                 if (x.collapsed) {
                                     n.setAttribute('image',"/xul/server/skin/media/images/down_arrow.gif");
                                     n.setAttribute('label',$("catStrings").getString('staff.cat.z3950.unhide_top_pane.label'));
@@ -242,13 +242,13 @@ cat.z3950.prototype = {
                                 }
                             }
                         ],
-						'service_rows' : [
-							['render'],
-							function(e) {
-								return function() {
-									try {
+      'service_rows' : [
+       ['render'],
+       function(e) {
+        return function() {
+         try {
 
-										function handle_switch(node) {
+          function handle_switch(node) {
                                             try {
                                                 $('search').setAttribute('disabled','true'); $('raw_search').setAttribute('disabled','true');
                                                 obj.active_services = [];
@@ -332,18 +332,18 @@ cat.z3950.prototype = {
                                                     }
                                                 }
                                             } catch(E) {
-										        obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.obj_controller_init.search_fields_error'),E);
+                  obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.obj_controller_init.search_fields_error'),E);
                                             }
-										}
+          }
 
                                         document.getElementById('native-evergreen-catalog_service').addEventListener('command',handle_switch,false);
 
-										var robj = obj.network.simple_request(
-											'RETRIEVE_Z3950_SERVICES',
-											[ ses() ]
-										);
-										if (typeof robj.ilsevent != 'undefined') throw(robj);
-										obj.services = robj;
+          var robj = obj.network.simple_request(
+           'RETRIEVE_Z3950_SERVICES',
+           [ ses() ]
+          );
+          if (typeof robj.ilsevent != 'undefined') throw(robj);
+          obj.services = robj;
                                         var x = document.getElementById('service_rows');
                                         var services = new Array();
                                         for (var i in obj.services) {
@@ -384,7 +384,7 @@ cat.z3950.prototype = {
                                         }
                                         //obj.services[ 'native-evergreen-catalog' ] = { 'attrs' : { 'author' : {}, 'title' : {} } };
                                         setTimeout(
-											function() { 
+           function() { 
                                                 if (obj.creds.hosts[ obj.data.server_unadorned ]) {
                                                     for (var i = 0; i < obj.creds.hosts[ obj.data.server_unadorned ].default_services.length; i++) {
                                                         var x = document.getElementById(obj.creds.hosts[ obj.data.server_unadorned ].default_services[i]+'_service');
@@ -395,19 +395,19 @@ cat.z3950.prototype = {
                                                     if (x) x.checked = true;
                                                 }
                                                 handle_switch();
-											},0
-										);
-									} catch(E) {
-										obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.obj_controller_init.z39_service_error'),E);
-									}
-								}
-							}
-						],
-					}
-				}
-			);
+           },0
+          );
+         } catch(E) {
+          obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.obj_controller_init.z39_service_error'),E);
+         }
+        }
+       }
+      ],
+     }
+    }
+   );
 
-			obj.controller.render();
+   obj.controller.render();
 
             setTimeout( function() { obj.focus(); }, 0 );
 
@@ -415,7 +415,7 @@ cat.z3950.prototype = {
                 function() {
                     obj.data.init({'via':'stash'});
                     if (obj.data.marked_record) {
-						var sel = obj.list.retrieve_selection();
+      var sel = obj.list.retrieve_selection();
                         if (sel.length > 0) { obj.controller.view.marc_import_overlay.disabled = false; }
                         if ($("overlay_tcn_indicator")) {
                             if (obj.data.marked_record_mvr) {
@@ -433,81 +433,81 @@ cat.z3950.prototype = {
                 }, 2000
             );
 
-		} catch(E) {
-			this.error.sdump('D_ERROR','cat.z3950.init: ' + E + '\n');
-		}
-	},
+  } catch(E) {
+   this.error.sdump('D_ERROR','cat.z3950.init: ' + E + '\n');
+  }
+ },
 
-	'focus' : function() {
-		var obj = this;
+ 'focus' : function() {
+  var obj = this;
         var focus_me; var or_focus_me;
         for (var i = 0; i < obj.active_services.length; i++) {
             if (obj.creds.hosts[ obj.data.server_unadorned ] && obj.creds.hosts[ obj.data.server_unadorned ].services[ obj.active_services[i] ]) {
-		        var x = obj.creds.hosts[ obj.data.server_unadorned ].services[ obj.active_services[i] ].default_attr;
+          var x = obj.creds.hosts[ obj.data.server_unadorned ].services[ obj.active_services[i] ].default_attr;
                 if (x) { focus_me = x; break; }
             }
             if (obj.services[ obj.active_services[i] ]) for (var i in obj.services[ obj.active_services[i] ].attr) { or_focus_me = i; }
         }
         if (! focus_me) focus_me = or_focus_me;
-		var xx = document.getElementById(focus_me+'_input'); if (xx) xx.focus();
-	},
+  var xx = document.getElementById(focus_me+'_input'); if (xx) xx.focus();
+ },
 
-	'clear' : function() {
-		var obj = this;
-		var nl = document.getElementsByAttribute('mytype','search_class');
-		for (var i = 0; i < nl.length; i++) { nl[i].value = ''; nl[i].setAttribute('value',''); }
-		obj.focus();
-	},
+ 'clear' : function() {
+  var obj = this;
+  var nl = document.getElementsByAttribute('mytype','search_class');
+  for (var i = 0; i < nl.length; i++) { nl[i].value = ''; nl[i].setAttribute('value',''); }
+  obj.focus();
+ },
 
-	'search_params' : {},
+ 'search_params' : {},
 
-	'initial_search' : function() {
-		try {
-			var obj = this;
+ 'initial_search' : function() {
+  try {
+   var obj = this;
             obj.result_set = []; obj.number_of_result_sets = 0;
-			JSAN.use('util.widgets');
-			util.widgets.remove_children( obj.controller.view.result_message );
-			var x = document.createElement('description'); obj.controller.view.result_message.appendChild(x);
+   JSAN.use('util.widgets');
+   util.widgets.remove_children( obj.controller.view.result_message );
+   var x = document.createElement('description'); obj.controller.view.result_message.appendChild(x);
             if (obj.active_services.length < 1) {
-			    x.appendChild( document.createTextNode($("catStrings").getString('staff.cat.z3950.initial_search.no_search_selection')));
+       x.appendChild( document.createTextNode($("catStrings").getString('staff.cat.z3950.initial_search.no_search_selection')));
                 return;
             }
-			x.appendChild( document.createTextNode($("catStrings").getString('staff.cat.z3950.initial_search.searching')));
-			obj.search_params = {}; obj.list.clear();
-			obj.controller.view.page_next.disabled = true;
-			obj.controller.view.cmd_z3950_csv_to_file.setAttribute('disabled','true');
-			obj.controller.view.cmd_z3950_csv_to_clipboard.setAttribute('disabled','true');
-			obj.controller.view.cmd_z3950_csv_to_printer.setAttribute('disabled','true');
+   x.appendChild( document.createTextNode($("catStrings").getString('staff.cat.z3950.initial_search.searching')));
+   obj.search_params = {}; obj.list.clear();
+   obj.controller.view.page_next.disabled = true;
+   obj.controller.view.cmd_z3950_csv_to_file.setAttribute('disabled','true');
+   obj.controller.view.cmd_z3950_csv_to_clipboard.setAttribute('disabled','true');
+   obj.controller.view.cmd_z3950_csv_to_printer.setAttribute('disabled','true');
 
-			obj.search_params.service_array = []; 
-			obj.search_params.username_array = [];
-			obj.search_params.password_array = [];
+   obj.search_params.service_array = []; 
+   obj.search_params.username_array = [];
+   obj.search_params.password_array = [];
             for (var i = 0; i < obj.active_services.length; i++) {
                 obj.search_params.service_array.push( obj.active_services[i] );
                 obj.search_params.username_array.push( document.getElementById( obj.active_services[i]+'_username' ).value );
                 obj.search_params.password_array.push( document.getElementById( obj.active_services[i]+'_password' ).value );
             }
-			obj.search_params.limit = Math.ceil( obj.limit / obj.active_services.length );
-			obj.search_params.offset = 0;
+   obj.search_params.limit = Math.ceil( obj.limit / obj.active_services.length );
+   obj.search_params.offset = 0;
 
-			obj.search_params.search = {};
-			var nl = document.getElementsByAttribute('mytype','search_class');
-			var count = 0;
-			for (var i = 0; i < nl.length; i++) {
-				if (nl[i].disabled) continue;
-				if (nl[i].value == '') continue;
-				count++;
-				obj.search_params.search[ nl[i].getAttribute('search_class') ] = nl[i].value;
-			}
-			if (count>0) {
-				obj.search();
-			} else {
-				util.widgets.remove_children( obj.controller.view.result_message );
-			}
-		} catch(E) {
-			this.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.initial_search.failed_search'),E);
-		}
-	},
+   obj.search_params.search = {};
+   var nl = document.getElementsByAttribute('mytype','search_class');
+   var count = 0;
+   for (var i = 0; i < nl.length; i++) {
+    if (nl[i].disabled) continue;
+    if (nl[i].value == '') continue;
+    count++;
+    obj.search_params.search[ nl[i].getAttribute('search_class') ] = nl[i].value;
+   }
+   if (count>0) {
+    obj.search();
+   } else {
+    util.widgets.remove_children( obj.controller.view.result_message );
+   }
+  } catch(E) {
+   this.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.initial_search.failed_search'),E);
+  }
+ },
 
     'initial_raw_search' : function(raw) {
         try {
@@ -517,100 +517,100 @@ cat.z3950.prototype = {
             util.widgets.remove_children( obj.controller.view.result_message );
             var x = document.createElement('description'); obj.controller.view.result_message.appendChild(x);
             if (obj.active_services.length < 1) {
-			    x.appendChild( document.createTextNode($("catStrings").getString('staff.cat.z3950.initial_search.no_search_selection')));
+       x.appendChild( document.createTextNode($("catStrings").getString('staff.cat.z3950.initial_search.no_search_selection')));
                 return;
             }
             if (obj.active_services.length > 1) {
-			    x.appendChild( document.createTextNode($("catStrings").getString('staff.cat.z3950.initial_search.too_many_selections')));
+       x.appendChild( document.createTextNode($("catStrings").getString('staff.cat.z3950.initial_search.too_many_selections')));
                 return;
             }
             if (obj.active_services[0] == 'native-evergreen-catalog') {
-			    x.appendChild( document.createTextNode($("catStrings").getString('staff.cat.z3950.initial_search.raw_search_unsupported_for_native_catalog')));
+       x.appendChild( document.createTextNode($("catStrings").getString('staff.cat.z3950.initial_search.raw_search_unsupported_for_native_catalog')));
                 return;
             }
-			x.appendChild( document.createTextNode($("catStrings").getString('staff.cat.z3950.initial_search.searching')));
-			obj.search_params = {}; obj.list.clear();
-			obj.controller.view.page_next.disabled = true;
-			obj.controller.view.cmd_z3950_csv_to_file.setAttribute('disabled','true');
-			obj.controller.view.cmd_z3950_csv_to_clipboard.setAttribute('disabled','true');
-			obj.controller.view.cmd_z3950_csv_to_printer.setAttribute('disabled','true');
+   x.appendChild( document.createTextNode($("catStrings").getString('staff.cat.z3950.initial_search.searching')));
+   obj.search_params = {}; obj.list.clear();
+   obj.controller.view.page_next.disabled = true;
+   obj.controller.view.cmd_z3950_csv_to_file.setAttribute('disabled','true');
+   obj.controller.view.cmd_z3950_csv_to_clipboard.setAttribute('disabled','true');
+   obj.controller.view.cmd_z3950_csv_to_printer.setAttribute('disabled','true');
 
-			obj.search_params.service_array = []; 
-			obj.search_params.username_array = [];
-			obj.search_params.password_array = [];
+   obj.search_params.service_array = []; 
+   obj.search_params.username_array = [];
+   obj.search_params.password_array = [];
             for (var i = 0; i < obj.active_services.length; i++) {
                 obj.search_params.service_array.push( obj.active_services[i] );
                 obj.search_params.username_array.push( document.getElementById( obj.active_services[i]+'_username' ).value );
                 obj.search_params.password_array.push( document.getElementById( obj.active_services[i]+'_password' ).value );
             }
-			obj.search_params.limit = Math.ceil( obj.limit / obj.active_services.length );
-			obj.search_params.offset = 0;
+   obj.search_params.limit = Math.ceil( obj.limit / obj.active_services.length );
+   obj.search_params.offset = 0;
 
             obj.search_params.query = raw;
 
             obj.search();
         } catch(E) {
-			this.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.initial_search.failed_search'),E);
+   this.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.initial_search.failed_search'),E);
         }
     },
 
-	'page_next' : function() {
-		try {
-			var obj = this;
-			JSAN.use('util.widgets');
-			util.widgets.remove_children( obj.controller.view.result_message );
-			var x = document.createElement('description'); obj.controller.view.result_message.appendChild(x);
-			x.appendChild( document.createTextNode($("catStrings").getString('staff.cat.z3950.page_next.more_results')));
-			obj.search_params.offset += obj.search_params.limit;
-			obj.search();
-		} catch(E) {
-			this.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.page_next.subsequent_search_error'),E);
-		}
-	},
+ 'page_next' : function() {
+  try {
+   var obj = this;
+   JSAN.use('util.widgets');
+   util.widgets.remove_children( obj.controller.view.result_message );
+   var x = document.createElement('description'); obj.controller.view.result_message.appendChild(x);
+   x.appendChild( document.createTextNode($("catStrings").getString('staff.cat.z3950.page_next.more_results')));
+   obj.search_params.offset += obj.search_params.limit;
+   obj.search();
+  } catch(E) {
+   this.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.page_next.subsequent_search_error'),E);
+  }
+ },
 
-	'search' : function() {
-		try {
-			var obj = this;
-			var method;
-			if (typeof obj.search_params.query == 'undefined') {
-				method = 'FM_BLOB_RETRIEVE_VIA_Z3950_SEARCH';
+ 'search' : function() {
+  try {
+   var obj = this;
+   var method;
+   if (typeof obj.search_params.query == 'undefined') {
+    method = 'FM_BLOB_RETRIEVE_VIA_Z3950_SEARCH';
                 obj.search_params.service = obj.search_params.service_array;
                 obj.search_params.username = obj.search_params.username_array;
                 obj.search_params.password = obj.search_params.password_array;
-			} else {
-				method = 'FM_BLOB_RETRIEVE_VIA_Z3950_RAW_SEARCH';
+   } else {
+    method = 'FM_BLOB_RETRIEVE_VIA_Z3950_RAW_SEARCH';
                 obj.search_params.service = obj.search_params.service_array[0];
                 obj.search_params.username = obj.search_params.username_array[0];
                 obj.search_params.password = obj.search_params.password_array[0];
-			}
-			obj.network.simple_request(
-				method,
-				[ ses(), obj.search_params ],
-				function(req) {
-					obj.handle_results(req.getResultObject())
-				}
-			);
-			document.getElementById('deck').selectedIndex = 0;
-		} catch(E) {
-			this.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.search.search_error'),E);
-		}
-	},
+   }
+   obj.network.simple_request(
+    method,
+    [ ses(), obj.search_params ],
+    function(req) {
+     obj.handle_results(req.getResultObject())
+    }
+   );
+   document.getElementById('deck').selectedIndex = 0;
+  } catch(E) {
+   this.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.search.search_error'),E);
+  }
+ },
 
-	'handle_results' : function(results) {
-		var obj = this;
-		try {
-			JSAN.use('util.widgets');
-			util.widgets.remove_children( obj.controller.view.result_message ); var x;
-			if (results == null) {
-				x = document.createElement('description'); obj.controller.view.result_message.appendChild(x);
-				x.appendChild( document.createTextNode($("catStrings").getString('staff.cat.z3950.handle_results.null_server_error')));
-				return;
-			}
-			if (typeof results.ilsevent != 'undefined') {
-				x = document.createElement('description'); obj.controller.view.result_message.appendChild(x);
-				x.appendChild( document.createTextNode($("catStrings").getFormattedString('staff.cat.z3950.handle_results.server_error', [results.textcode, results.desc])));
-				return;
-			}
+ 'handle_results' : function(results) {
+  var obj = this;
+  try {
+   JSAN.use('util.widgets');
+   util.widgets.remove_children( obj.controller.view.result_message ); var x;
+   if (results == null) {
+    x = document.createElement('description'); obj.controller.view.result_message.appendChild(x);
+    x.appendChild( document.createTextNode($("catStrings").getString('staff.cat.z3950.handle_results.null_server_error')));
+    return;
+   }
+   if (typeof results.ilsevent != 'undefined') {
+    x = document.createElement('description'); obj.controller.view.result_message.appendChild(x);
+    x.appendChild( document.createTextNode($("catStrings").getFormattedString('staff.cat.z3950.handle_results.server_error', [results.textcode, results.desc])));
+    return;
+   }
             obj.controller.view.cmd_z3950_csv_to_file.setAttribute('disabled','false');
             obj.controller.view.cmd_z3950_csv_to_clipboard.setAttribute('disabled','false');
             obj.controller.view.cmd_z3950_csv_to_printer.setAttribute('disabled','false');
@@ -684,32 +684,32 @@ cat.z3950.prototype = {
                 );
             }            
 
-		} catch(E) {
-			this.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.handle_results.search_result_error'),E);
-		}
-	},
+  } catch(E) {
+   this.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.handle_results.search_result_error'),E);
+  }
+ },
 
-	'replace_tab_with_opac' : function(doc_id) {
-		var opac_url = xulG.url_prefix( urls.opac_rdetail ) + '?r=' + doc_id;
-		var content_params = { 
-			'session' : ses(),
-			'authtime' : ses('authtime'),
-			'opac_url' : opac_url,
-		};
-		xulG.set_tab(
-			xulG.url_prefix(urls.XUL_OPAC_WRAPPER), 
-			{'tab_name': $("catStrings").getString('staff.cat.z3950.replace_tab_with_opac.tab_name')}, 
-			content_params
-		);
-	},
+ 'replace_tab_with_opac' : function(doc_id) {
+  var opac_url = xulG.url_prefix( urls.opac_rdetail ) + '?r=' + doc_id;
+  var content_params = { 
+   'session' : ses(),
+   'authtime' : ses('authtime'),
+   'opac_url' : opac_url,
+  };
+  xulG.set_tab(
+   xulG.url_prefix(urls.XUL_OPAC_WRAPPER), 
+   {'tab_name': $("catStrings").getString('staff.cat.z3950.replace_tab_with_opac.tab_name')}, 
+   content_params
+  );
+ },
 
-	'spawn_marc_editor' : function(my_marcxml,biblio_source) {
-		var obj = this;
-		xulG.new_tab(
-			xulG.url_prefix(urls.XUL_MARC_EDIT), 
-			{ 'tab_name' : 'MARC Editor' }, 
-			{ 
-				'record' : { 'marc' : my_marcxml },
+ 'spawn_marc_editor' : function(my_marcxml,biblio_source) {
+  var obj = this;
+  xulG.new_tab(
+   xulG.url_prefix(urls.XUL_MARC_EDIT), 
+   { 'tab_name' : 'MARC Editor' }, 
+   { 
+    'record' : { 'marc' : my_marcxml },
                 'fast_add_item' : function(doc_id,cn_label,cp_barcode) {
                     try {
                         JSAN.use('cat.util'); return cat.util.fast_item_add(doc_id,cn_label,cp_barcode);
@@ -717,43 +717,43 @@ cat.z3950.prototype = {
                         alert(E);
                     }
                 },
-				'save' : {
-					'label' : 'Import Record',
-					'func' : function (new_marcxml) {
-						try {
-							var r = obj.network.simple_request('MARC_XML_RECORD_IMPORT', [ ses(), new_marcxml, biblio_source ]);
-							if (typeof r.ilsevent != 'undefined') {
-								switch(Number(r.ilsevent)) {
-									case 1704 /* TCN_EXISTS */ :
-										var msg = $("catStrings").getFormattedString('staff.cat.z3950.spawn_marc_editor.same_tcn', [r.payload.tcn]);
-										var title = $("catStrings").getString('staff.cat.z3950.spawn_marc_editor.title');
-										var btn1 = $("catStrings").getString('staff.cat.z3950.spawn_marc_editor.btn1_overlay');
-										var btn2 = typeof r.payload.new_tcn == 'undefined' ? null : $("catStrings").getFormattedString('staff.cat.z3950.spawn_marc_editor.btn2_import', [r.payload.new_tcn]);
-										if (btn2) {
-											obj.data.init({'via':'stash'});
-											var robj = obj.network.simple_request(
-												'PERM_CHECK',[
-													ses(),
-													obj.data.list.au[0].id(),
-													obj.data.list.au[0].ws_ou(),
-													[ 'ALLOW_ALT_TCN' ]
-												]
-											);
-											if (typeof robj.ilsevent != 'undefined') {
-												obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.spawn_marc_editor.permission_error'),E);
-											}
-											if (robj.length != 0) btn2 = null;
-										}
-										var btn3 = $("catStrings").getString('staff.cat.z3950.spawn_marc_editor.btn3_cancel_import');
-										var p = obj.error.yns_alert(msg,title,btn1,btn2,btn3,$("catStrings").getString('staff.cat.z3950.spawn_marc_editor.confirm_action'));
-										obj.error.sdump('D_ERROR','option ' + p + 'chosen');
-										switch(p) {
-											case 0:
-												var r3 = obj.network.simple_request('MARC_XML_RECORD_UPDATE', [ ses(), r.payload.dup_record, new_marcxml, biblio_source ]);
-												if (typeof r3.ilsevent != 'undefined') {
-													throw(r3);
-												} else {
-													alert($("catStrings").getString('staff.cat.z3950.spawn_marc_editor.successful_overlay'));
+    'save' : {
+     'label' : 'Import Record',
+     'func' : function (new_marcxml) {
+      try {
+       var r = obj.network.simple_request('MARC_XML_RECORD_IMPORT', [ ses(), new_marcxml, biblio_source ]);
+       if (typeof r.ilsevent != 'undefined') {
+        switch(Number(r.ilsevent)) {
+         case 1704 /* TCN_EXISTS */ :
+          var msg = $("catStrings").getFormattedString('staff.cat.z3950.spawn_marc_editor.same_tcn', [r.payload.tcn]);
+          var title = $("catStrings").getString('staff.cat.z3950.spawn_marc_editor.title');
+          var btn1 = $("catStrings").getString('staff.cat.z3950.spawn_marc_editor.btn1_overlay');
+          var btn2 = typeof r.payload.new_tcn == 'undefined' ? null : $("catStrings").getFormattedString('staff.cat.z3950.spawn_marc_editor.btn2_import', [r.payload.new_tcn]);
+          if (btn2) {
+           obj.data.init({'via':'stash'});
+           var robj = obj.network.simple_request(
+            'PERM_CHECK',[
+             ses(),
+             obj.data.list.au[0].id(),
+             obj.data.list.au[0].ws_ou(),
+             [ 'ALLOW_ALT_TCN' ]
+            ]
+           );
+           if (typeof robj.ilsevent != 'undefined') {
+            obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.spawn_marc_editor.permission_error'),E);
+           }
+           if (robj.length != 0) btn2 = null;
+          }
+          var btn3 = $("catStrings").getString('staff.cat.z3950.spawn_marc_editor.btn3_cancel_import');
+          var p = obj.error.yns_alert(msg,title,btn1,btn2,btn3,$("catStrings").getString('staff.cat.z3950.spawn_marc_editor.confirm_action'));
+          obj.error.sdump('D_ERROR','option ' + p + 'chosen');
+          switch(p) {
+           case 0:
+            var r3 = obj.network.simple_request('MARC_XML_RECORD_UPDATE', [ ses(), r.payload.dup_record, new_marcxml, biblio_source ]);
+            if (typeof r3.ilsevent != 'undefined') {
+             throw(r3);
+            } else {
+             alert($("catStrings").getString('staff.cat.z3950.spawn_marc_editor.successful_overlay'));
                                                     return {
                                                         'id' : r3.id(),
                                                         'on_complete' : function() {
@@ -764,18 +764,18 @@ cat.z3950.prototype = {
                                                             }
                                                         }
                                                     };
-												}
-											break;
-											case 1:
-												var r2 = obj.network.request(
-													api.MARC_XML_RECORD_IMPORT.app,
-													api.MARC_XML_RECORD_IMPORT.method + '.override',
-													[ ses(), new_marcxml, biblio_source ]
-												);
-												if (typeof r2.ilsevent != 'undefined') {
-													throw(r2);
-												} else {
-													alert($("catStrings").getString('staff.cat.z3950.spawn_marc_editor.successful_import_with_new_tcn'));
+            }
+           break;
+           case 1:
+            var r2 = obj.network.request(
+             api.MARC_XML_RECORD_IMPORT.app,
+             api.MARC_XML_RECORD_IMPORT.method + '.override',
+             [ ses(), new_marcxml, biblio_source ]
+            );
+            if (typeof r2.ilsevent != 'undefined') {
+             throw(r2);
+            } else {
+             alert($("catStrings").getString('staff.cat.z3950.spawn_marc_editor.successful_import_with_new_tcn'));
                                                     return {
                                                         'id' : r2.id(),
                                                         'on_complete' : function() {
@@ -786,21 +786,21 @@ cat.z3950.prototype = {
                                                             }
                                                         }
                                                     };
-												}
-											break;
-											case 2:
-											default:
-												alert($("catStrings").getString('staff.cat.z3950.spawn_marc_editor.import_cancelled'));
-											break;
-										}
-									break;
-									default:
-										throw(r);
-									break;
-								}
-							} else {
-								alert($("catStrings").getString('staff.cat.z3950.spawn_marc_editor.successful_import'));
-								return {
+            }
+           break;
+           case 2:
+           default:
+            alert($("catStrings").getString('staff.cat.z3950.spawn_marc_editor.import_cancelled'));
+           break;
+          }
+         break;
+         default:
+          throw(r);
+         break;
+        }
+       } else {
+        alert($("catStrings").getString('staff.cat.z3950.spawn_marc_editor.successful_import'));
+        return {
                                     'id' : r.id(),
                                     'on_complete' : function() {
                                         try {
@@ -810,66 +810,66 @@ cat.z3950.prototype = {
                                         }
                                     }
                                 };
-							}
-						} catch(E) {
-							obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.spawn_marc_editor.import_error'),E);
-						}
-					}
-				}
-			} 
-		);
-	},
+       }
+      } catch(E) {
+       obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.spawn_marc_editor.import_error'),E);
+      }
+     }
+    }
+   } 
+  );
+ },
 
-	'confirm_overlay' : function(record_ids) {
-		var obj = this; // JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
-		var top_xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" >';
-		top_xml += '<description>'+$("catStrings").getString('staff.cat.z3950.confirm_overlay.description')+'</description>';
-		top_xml += '<hbox><button id="lead" disabled="false" label="'+$("catStrings").getString('staff.cat.z3950.confirm_overlay.lead.label')+'" name="fancy_submit"';
-		top_xml += ' accesskey="'+$("catStrings").getString('staff.cat.z3950.confirm_overlay.lead.accesskey')+'"/>';
-		top_xml += ' <button label="'+$("catStrings").getString('staff.cat.z3950.confirm_overlay.cancel.label')+'" accesskey="'+
-						$("catStrings").getString('staff.cat.z3950.confirm_overlay.cancel.accesskey')+'" name="fancy_cancel"/></hbox></vbox>';
+ 'confirm_overlay' : function(record_ids) {
+  var obj = this; // JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+  netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
+  var top_xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" >';
+  top_xml += '<description>'+$("catStrings").getString('staff.cat.z3950.confirm_overlay.description')+'</description>';
+  top_xml += '<hbox><button id="lead" disabled="false" label="'+$("catStrings").getString('staff.cat.z3950.confirm_overlay.lead.label')+'" name="fancy_submit"';
+  top_xml += ' accesskey="'+$("catStrings").getString('staff.cat.z3950.confirm_overlay.lead.accesskey')+'"/>';
+  top_xml += ' <button label="'+$("catStrings").getString('staff.cat.z3950.confirm_overlay.cancel.label')+'" accesskey="'+
+      $("catStrings").getString('staff.cat.z3950.confirm_overlay.cancel.accesskey')+'" name="fancy_cancel"/></hbox></vbox>';
 
-		var xml = '<form xmlns="http://www.w3.org/1999/xhtml">';
-		xml += '<table width="100%"><tr valign="top">';
-		for (var i = 0; i < record_ids.length; i++) {
-			xml += '<td nowrap="nowrap"><iframe src="' + urls.XUL_BIB_BRIEF; 
-			xml += '?docid=' + record_ids[i] + '"/></td>';
-		}
-		xml += '</tr><tr valign="top">';
-		for (var i = 0; i < record_ids.length; i++) {
+  var xml = '<form xmlns="http://www.w3.org/1999/xhtml">';
+  xml += '<table width="100%"><tr valign="top">';
+  for (var i = 0; i < record_ids.length; i++) {
+   xml += '<td nowrap="nowrap"><iframe src="' + urls.XUL_BIB_BRIEF; 
+   xml += '?docid=' + record_ids[i] + '"/></td>';
+  }
+  xml += '</tr><tr valign="top">';
+  for (var i = 0; i < record_ids.length; i++) {
             xml += '<td nowrap="nowrap"><iframe style="min-height: 1000px; min-width: 300px;" flex="1" src="' + urls.XUL_MARC_VIEW + '?docid=' + record_ids[i] + ' "/></td>';
-		}
-		xml += '</tr></table></form>';
-		// data.temp_merge_top = top_xml; data.stash('temp_merge_top');
-		// data.temp_merge_mid = xml; data.stash('temp_merge_mid');
-		JSAN.use('util.window'); var win = new util.window();
-		var fancy_prompt_data = win.open(
-			urls.XUL_FANCY_PROMPT,
-			// + '?xml_in_stash=temp_merge_mid'
-			// + '&top_xml_in_stash=temp_merge_top'
-			// + '&title=' + window.escape('Record Overlay'),
-			'fancy_prompt', 'chrome,resizable,modal,width=700,height=500',
-			{ 'top_xml' : top_xml, 'xml' : xml, 'title' : $("catStrings").getString('staff.cat.z3950.confirm_overlay.title') }
-		);
-		//data.stash_retrieve();
-		if (fancy_prompt_data.fancy_status == 'incomplete') { alert($("catStrings").getString('staff.cat.z3950.confirm_overlay.aborted')); return false; }
-		return true;
-	},
+  }
+  xml += '</tr></table></form>';
+  // data.temp_merge_top = top_xml; data.stash('temp_merge_top');
+  // data.temp_merge_mid = xml; data.stash('temp_merge_mid');
+  JSAN.use('util.window'); var win = new util.window();
+  var fancy_prompt_data = win.open(
+   urls.XUL_FANCY_PROMPT,
+   // + '?xml_in_stash=temp_merge_mid'
+   // + '&top_xml_in_stash=temp_merge_top'
+   // + '&title=' + window.escape('Record Overlay'),
+   'fancy_prompt', 'chrome,resizable,modal,width=700,height=500',
+   { 'top_xml' : top_xml, 'xml' : xml, 'title' : $("catStrings").getString('staff.cat.z3950.confirm_overlay.title') }
+  );
+  //data.stash_retrieve();
+  if (fancy_prompt_data.fancy_status == 'incomplete') { alert($("catStrings").getString('staff.cat.z3950.confirm_overlay.aborted')); return false; }
+  return true;
+ },
 
-	'spawn_marc_editor_for_overlay' : function(my_marcxml,biblio_source) {
-		var obj = this;
-		obj.data.init({'via':'stash'});
-		if (!obj.data.marked_record) {
-			alert($("catStrings").getString('staff.cat.z3950.spawn_marc_editor_for_overlay.try_again'));
-			return;
-		}
+ 'spawn_marc_editor_for_overlay' : function(my_marcxml,biblio_source) {
+  var obj = this;
+  obj.data.init({'via':'stash'});
+  if (!obj.data.marked_record) {
+   alert($("catStrings").getString('staff.cat.z3950.spawn_marc_editor_for_overlay.try_again'));
+   return;
+  }
 
-		xulG.new_tab(
-			xulG.url_prefix(urls.XUL_MARC_EDIT), 
-			{ 'tab_name' : $("catStrings").getString('staff.cat.z3950.spawn_marc_editor_for_overlay.tab_name') },
-			{ 
-				'record' : { 'marc' : my_marcxml },
+  xulG.new_tab(
+   xulG.url_prefix(urls.XUL_MARC_EDIT), 
+   { 'tab_name' : $("catStrings").getString('staff.cat.z3950.spawn_marc_editor_for_overlay.tab_name') },
+   { 
+    'record' : { 'marc' : my_marcxml },
                 'fast_add_item' : function(doc_id,cn_label,cp_barcode) {
                     try {
                         JSAN.use('cat.util'); cat.util.fast_item_add(doc_id,cn_label,cp_barcode);
@@ -877,47 +877,47 @@ cat.z3950.prototype = {
                         alert(E);
                     }
                 },
-				'save' : {
-					'label' : $("catStrings").getString('staff.cat.z3950.spawn_marc_editor_for_overlay.overlay_record_label'),
-					'func' : function (new_marcxml) {
-						try {
-							if (! obj.confirm_overlay( [ obj.data.marked_record ] ) ) { return; }
-							var r = obj.network.simple_request('MARC_XML_RECORD_REPLACE', [ ses(), obj.data.marked_record, new_marcxml, biblio_source ]);
-							if (typeof r.ilsevent != 'undefined') {
-								switch(Number(r.ilsevent)) {
-									case 1704 /* TCN_EXISTS */ :
-										var msg = $("catStrings").getFormattedString('staff.cat.z3950.spawn_marc_editor_for_overlay.same_tcn', [r.payload.tcn]);
-										var title = $("catStrings").getString('staff.cat.z3950.spawn_marc_editor_for_overlay.import_collision');
-										var btn1 = typeof r.payload.new_tcn == 'undefined' ? null : $("catStrings").getFormattedString('staff.cat.z3950.spawn_marc_editor_for_overlay.btn1_overlay', [r.payload.new_tcn]);
-										if (btn1) {
-											var robj = obj.network.simple_request(
-												'PERM_CHECK',[
-													ses(),
-													obj.data.list.au[0].id(),
-													obj.data.list.au[0].ws_ou(),
-													[ 'ALLOW_ALT_TCN' ]
-												]
-											);
-											if (typeof robj.ilsevent != 'undefined') {
-												obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.spawn_marc_editor_for_overlay.permission_error'),E);
-											}
-											if (robj.length != 0) btn1 = null;
-										}
-										var btn2 = $("catStrings").getString('staff.cat.z3950.spawn_marc_editor_for_overlay.btn2_cancel');
-										var p = obj.error.yns_alert(msg,title,btn1,btn2,null, $("catStrings").getString('staff.cat.z3950.spawn_marc_editor_for_overlay.confirm_action'));
-										obj.error.sdump('D_ERROR','option ' + p + 'chosen');
-										switch(p) {
-											case 0:
-												var r2 = obj.network.request(
-													api.MARC_XML_RECORD_REPLACE.app,
-													api.MARC_XML_RECORD_REPLACE.method + '.override',
-													[ ses(), obj.data.marked_record, new_marcxml, biblio_source ]
-												);
-												if (typeof r2.ilsevent != 'undefined') {
-													throw(r2);
-												} else {
-													alert($("catStrings").getString('staff.cat.z3950.spawn_marc_editor_for_overlay.successful_overlay_with_new_TCN'));
-													return {
+    'save' : {
+     'label' : $("catStrings").getString('staff.cat.z3950.spawn_marc_editor_for_overlay.overlay_record_label'),
+     'func' : function (new_marcxml) {
+      try {
+       if (! obj.confirm_overlay( [ obj.data.marked_record ] ) ) { return; }
+       var r = obj.network.simple_request('MARC_XML_RECORD_REPLACE', [ ses(), obj.data.marked_record, new_marcxml, biblio_source ]);
+       if (typeof r.ilsevent != 'undefined') {
+        switch(Number(r.ilsevent)) {
+         case 1704 /* TCN_EXISTS */ :
+          var msg = $("catStrings").getFormattedString('staff.cat.z3950.spawn_marc_editor_for_overlay.same_tcn', [r.payload.tcn]);
+          var title = $("catStrings").getString('staff.cat.z3950.spawn_marc_editor_for_overlay.import_collision');
+          var btn1 = typeof r.payload.new_tcn == 'undefined' ? null : $("catStrings").getFormattedString('staff.cat.z3950.spawn_marc_editor_for_overlay.btn1_overlay', [r.payload.new_tcn]);
+          if (btn1) {
+           var robj = obj.network.simple_request(
+            'PERM_CHECK',[
+             ses(),
+             obj.data.list.au[0].id(),
+             obj.data.list.au[0].ws_ou(),
+             [ 'ALLOW_ALT_TCN' ]
+            ]
+           );
+           if (typeof robj.ilsevent != 'undefined') {
+            obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.spawn_marc_editor_for_overlay.permission_error'),E);
+           }
+           if (robj.length != 0) btn1 = null;
+          }
+          var btn2 = $("catStrings").getString('staff.cat.z3950.spawn_marc_editor_for_overlay.btn2_cancel');
+          var p = obj.error.yns_alert(msg,title,btn1,btn2,null, $("catStrings").getString('staff.cat.z3950.spawn_marc_editor_for_overlay.confirm_action'));
+          obj.error.sdump('D_ERROR','option ' + p + 'chosen');
+          switch(p) {
+           case 0:
+            var r2 = obj.network.request(
+             api.MARC_XML_RECORD_REPLACE.app,
+             api.MARC_XML_RECORD_REPLACE.method + '.override',
+             [ ses(), obj.data.marked_record, new_marcxml, biblio_source ]
+            );
+            if (typeof r2.ilsevent != 'undefined') {
+             throw(r2);
+            } else {
+             alert($("catStrings").getString('staff.cat.z3950.spawn_marc_editor_for_overlay.successful_overlay_with_new_TCN'));
+             return {
                                                         'id' : r2.id(),
                                                         'on_complete' : function() {
                                                             try {
@@ -927,20 +927,20 @@ cat.z3950.prototype = {
                                                             }
                                                         }
                                                     };
-												}
-											break;
-											case 1:
-											default:
-												alert($("catStrings").getString('staff.cat.z3950.spawn_marc_editor_for_overlay.cancelled_overlay'));
-											break;
-										}
-									break;
-									default:
-										throw(r);
-									break;
-								}
-							} else {
-								alert($("catStrings").getString('staff.cat.z3950.spawn_marc_editor_for_overlay.success_overlay'));
+            }
+           break;
+           case 1:
+           default:
+            alert($("catStrings").getString('staff.cat.z3950.spawn_marc_editor_for_overlay.cancelled_overlay'));
+           break;
+          }
+         break;
+         default:
+          throw(r);
+         break;
+        }
+       } else {
+        alert($("catStrings").getString('staff.cat.z3950.spawn_marc_editor_for_overlay.success_overlay'));
                                 return {
                                     'id' : r.id(),
                                     'on_complete' : function() {
@@ -951,39 +951,39 @@ cat.z3950.prototype = {
                                         }
                                     }
                                 };
-							}
-						} catch(E) {
-							obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.spawn_marc_editor_for_overlay.overlay_error'),E);
-						}
-					}
-				}
-			} 
-		);
-	},
+       }
+      } catch(E) {
+       obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.spawn_marc_editor_for_overlay.overlay_error'),E);
+      }
+     }
+    }
+   } 
+  );
+ },
 
 
-	'load_creds' : function() {
-		var obj = this;
-		try {
-			obj.creds = { 'version' : g.save_version, 'services' : {}, 'hosts' : {} };
-			/*
-				{
-					'version' : xx,
-					'default_service' : xx,
-					'services' : {
+ 'load_creds' : function() {
+  var obj = this;
+  try {
+   obj.creds = { 'version' : g.save_version, 'services' : {}, 'hosts' : {} };
+   /*
+    {
+     'version' : xx,
+     'default_service' : xx,
+     'services' : {
 
-						'xx' : {
-							'username' : xx,
-							'password' : xx,
-							'default_attr' : xx,
-						},
+      'xx' : {
+       'username' : xx,
+       'password' : xx,
+       'default_attr' : xx,
+      },
 
-						'xx' : {
-							'username' : xx,
-							'password' : xx,
-							'default_attr' : xx,
-						},
-					},
+      'xx' : {
+       'username' : xx,
+       'password' : xx,
+       'default_attr' : xx,
+      },
+     },
                     // new in version 2
                     'hosts' : {
                         'xxxx' : {
@@ -1004,56 +1004,56 @@ cat.z3950.prototype = {
                             },
                         }
                     }
-				}
-			*/
-			netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-			JSAN.use('util.file'); var file = new util.file('z3950_store');
-			if (file._file.exists()) {
-				var creds = file.get_object(); file.close();
-				if (typeof creds.version != 'undefined') {
-					if (creds.version >= obj.creds_version) {  /* so apparently, this guy is assuming that future versions will be backwards compatible */
+    }
+   */
+   netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+   JSAN.use('util.file'); var file = new util.file('z3950_store');
+   if (file._file.exists()) {
+    var creds = file.get_object(); file.close();
+    if (typeof creds.version != 'undefined') {
+     if (creds.version >= obj.creds_version) {  /* so apparently, this guy is assuming that future versions will be backwards compatible */
                         if (typeof creds.hosts == 'undefined') creds.hosts = {};
-						obj.creds = creds;
-					}
-				}
-			}
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.load_creds.z3950_cred_error'),E);
-		}
-	},
+      obj.creds = creds;
+     }
+    }
+   }
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.load_creds.z3950_cred_error'),E);
+  }
+ },
 
-	'save_creds' : function () {
-		try {
-			var obj = this;
+ 'save_creds' : function () {
+  try {
+   var obj = this;
             if (typeof obj.creds.hosts == 'undefined') obj.creds.hosts = {};
             if (typeof obj.creds.hosts[ obj.data.server_unadorned ] == 'undefined') obj.creds.hosts[ obj.data.server_unadorned ] = { 'services' : {} };
             obj.creds.hosts[ obj.data.server_unadorned ].default_services = obj.active_services;
             for (var i = 0; i < obj.creds.hosts[ obj.data.server_unadorned ].default_services.length; i++) {
-			    var service = obj.creds.hosts[ obj.data.server_unadorned ].default_services[i];
-    			if (typeof obj.creds.hosts[ obj.data.server_unadorned ].services[ service ] == 'undefined') {
+       var service = obj.creds.hosts[ obj.data.server_unadorned ].default_services[i];
+       if (typeof obj.creds.hosts[ obj.data.server_unadorned ].services[ service ] == 'undefined') {
                     obj.creds.hosts[ obj.data.server_unadorned ].services[ service ] = {}
-    			}
-    			obj.creds.hosts[ obj.data.server_unadorned ].services[service].username = document.getElementById(service + '_username').value;
-    			obj.creds.hosts[ obj.data.server_unadorned ].services[service].password = document.getElementById(service + '_password').value;
-    			if (obj.default_attr) {
-    				obj.creds.hosts[ obj.data.server_unadorned ].services[service].default_attr = obj.default_attr;
-    			}
+       }
+       obj.creds.hosts[ obj.data.server_unadorned ].services[service].username = document.getElementById(service + '_username').value;
+       obj.creds.hosts[ obj.data.server_unadorned ].services[service].password = document.getElementById(service + '_password').value;
+       if (obj.default_attr) {
+        obj.creds.hosts[ obj.data.server_unadorned ].services[service].default_attr = obj.default_attr;
+       }
             }
-			obj.creds.version = obj.creds_version;
-			netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-			JSAN.use('util.file'); var file = new util.file('z3950_store');
-			file.set_object(obj.creds);
-			file.close();
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.save_creds.z3950_cred_error'),E);
-		}
-	},
+   obj.creds.version = obj.creds_version;
+   netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+   JSAN.use('util.file'); var file = new util.file('z3950_store');
+   file.set_object(obj.creds);
+   file.close();
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.z3950.save_creds.z3950_cred_error'),E);
+  }
+ },
 
-	'handle_enter' : function(ev) {
-		var obj = this;
-		if (ev.target.tagName != 'textbox') return;
-		if (ev.keyCode == 13 /* enter */ || ev.keyCode == 77 /* enter on a mac */) setTimeout( function() { obj.initial_search(); }, 0);
-	},
+ 'handle_enter' : function(ev) {
+  var obj = this;
+  if (ev.target.tagName != 'textbox') return;
+  if (ev.keyCode == 13 /* enter */ || ev.keyCode == 77 /* enter on a mac */) setTimeout( function() { obj.initial_search(); }, 0);
+ },
 }
 
 dump('exiting cat.z3950.js\n');
diff --git a/Open-ILS/xul/staff_client/server/cat/z3950.xul b/Open-ILS/xul/staff_client/server/cat/z3950.xul
index dfc1259bb8..31e9d160cb 100644
--- a/Open-ILS/xul/staff_client/server/cat/z3950.xul
+++ b/Open-ILS/xul/staff_client/server/cat/z3950.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 
@@ -20,78 +20,78 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="cat_z3950_win2" 
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns:html="http://www.w3.org/1999/xhtml"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+ xmlns:html="http://www.w3.org/1999/xhtml"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+ </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-		
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for cat_z3950.xul');
-
-				JSAN.use('cat.z3950'); g.z3950 = new cat.z3950();
-
-				g.z3950.init( 
-					{ 
-						/* this guy grabs most things through the DOM, but I want to move JSAN libraries away from that,
-						or at the very least, push node ID's in through here. */
-					} 
-				);
-
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					try { window.xulG.set_tab_name('Z39.50'); } catch(E) { alert(E); }
-				}
-
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['cat/z3950.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function handle_enter(ev) {
-			g.z3950.handle_enter(ev);
-		}
-
-		function default_focus() {
-			setTimeout( function() { try { g.z3950.focus(); } catch(E) { alert(E); } }, 0 );
-		}
-
-	]]>
-	</script>
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  function $(id) { return document.getElementById(id); }
+  
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for cat_z3950.xul');
+
+    JSAN.use('cat.z3950'); g.z3950 = new cat.z3950();
+
+    g.z3950.init( 
+     { 
+      /* this guy grabs most things through the DOM, but I want to move JSAN libraries away from that,
+      or at the very least, push node ID's in through here. */
+     } 
+    );
+
+    if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+     try { window.xulG.set_tab_name('Z39.50'); } catch(E) { alert(E); }
+    }
+
+   } catch(E) {
+    var err_msg = $("commonStrings").getFormattedString('common.exception', ['cat/z3950.xul', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+
+  function handle_enter(ev) {
+   g.z3950.handle_enter(ev);
+  }
+
+  function default_focus() {
+   setTimeout( function() { try { g.z3950.focus(); } catch(E) { alert(E); } }, 0 );
+  }
+
+ ]]>
+ </script>
 
     <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
      <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
 
-	<commandset id="cat_z3950_cmds">
-		<command id="cmd_broken" />
-		<command id="sel_clip" disabled="true" />
+ <commandset id="cat_z3950_cmds">
+  <command id="cmd_broken" />
+  <command id="sel_clip" disabled="true" />
         <command id="cmd_z3950_csv_to_printer" disabled="true" />
         <command id="cmd_z3950_csv_to_clipboard" disabled="true" />
         <command id="cmd_z3950_csv_to_file" disabled="true" />
-		<command id="save_columns" />
-		<command id="toggle_form" />
-		<command id="marc_view" />
-	</commandset>
+  <command id="save_columns" />
+  <command id="toggle_form" />
+  <command id="marc_view" />
+ </commandset>
 
-	<groupbox flex="1">
-		<caption label="&staff.cat.z3950.marc_import.label;"/>
+ <groupbox flex="1">
+  <caption label="&staff.cat.z3950.marc_import.label;"/>
             <hbox id="top_pane" oils_persist="height" flex="1">
                 <groupbox id="x_splitter1" oils_persist="width" flex="1">
                     <caption label="&staff.cat.z3950.query.label;"/>
@@ -186,7 +186,7 @@
                     <button id="marc_view_btn" command="marc_view" disabled="true"/>
                     <button id="marc_import_overlay" label="&staff.cat.z3950.marc_import_overlay.label;" accesskey="&staff.cat.z3950.marc_import_overlay.accesskey;" disabled="true"/>
                     <button id="marc_import" label="&staff.cat.z3950.result_message.marc_import.label;" accesskey="&staff.cat.z3950.result_message.marc_import.accesskey;" disabled="true"/>
-	                <button id="toggle_form_btn" command="toggle_form"/>
+                 <button id="toggle_form_btn" command="toggle_form"/>
                 </hbox>
                 <deck id="deck" flex="1">
                     <tree id="results" flex="1" enableColumnDrag="true" seltype="single"/>
diff --git a/Open-ILS/xul/staff_client/server/circ/checkin.js b/Open-ILS/xul/staff_client/server/circ/checkin.js
index 4a84d66ac0..5553ec8549 100644
--- a/Open-ILS/xul/staff_client/server/circ/checkin.js
+++ b/Open-ILS/xul/staff_client/server/circ/checkin.js
@@ -3,436 +3,436 @@ dump('entering circ.checkin.js\n');
 if (typeof circ == 'undefined') circ = {};
 circ.checkin = function (params) {
 
-	JSAN.use('util.error'); this.error = new util.error();
-	JSAN.use('util.network'); this.network = new util.network();
-	JSAN.use('util.barcode');
-	JSAN.use('util.date');
-	this.OpenILS = {}; JSAN.use('OpenILS.data'); this.OpenILS.data = new OpenILS.data(); this.OpenILS.data.init({'via':'stash'});
-	this.data = this.OpenILS.data;
+ JSAN.use('util.error'); this.error = new util.error();
+ JSAN.use('util.network'); this.network = new util.network();
+ JSAN.use('util.barcode');
+ JSAN.use('util.date');
+ this.OpenILS = {}; JSAN.use('OpenILS.data'); this.OpenILS.data = new OpenILS.data(); this.OpenILS.data.init({'via':'stash'});
+ this.data = this.OpenILS.data;
 }
 
 circ.checkin.prototype = {
 
-	'selection_list' : [],
+ 'selection_list' : [],
 
-	'init' : function( params ) {
+ 'init' : function( params ) {
 
-		var obj = this;
+  var obj = this;
 
-		JSAN.use('circ.util');
-		var columns = circ.util.columns( 
-			{ 
-				'barcode' : { 'hidden' : false },
-				'title' : { 'hidden' : false },
-				'location' : { 'hidden' : false },
-				'call_number' : { 'hidden' : false },
-				'status' : { 'hidden' : false },
-				'route_to' : { 'hidden' : false },
-				'alert_message' : { 'hidden' : false },
-				'checkin_time' : { 'hidden' : false }
-			},
-			{
-				'except_these' : [ 'uses', 'checkin_time_full' ]
-			}
-		);
+  JSAN.use('circ.util');
+  var columns = circ.util.columns( 
+   { 
+    'barcode' : { 'hidden' : false },
+    'title' : { 'hidden' : false },
+    'location' : { 'hidden' : false },
+    'call_number' : { 'hidden' : false },
+    'status' : { 'hidden' : false },
+    'route_to' : { 'hidden' : false },
+    'alert_message' : { 'hidden' : false },
+    'checkin_time' : { 'hidden' : false }
+   },
+   {
+    'except_these' : [ 'uses', 'checkin_time_full' ]
+   }
+  );
 
-		JSAN.use('util.list'); obj.list = new util.list('checkin_list');
-		obj.list.init(
-			{
-				'columns' : columns,
-				'map_row_to_columns' : circ.util.std_map_row_to_columns(),
-				'on_select' : function(ev) {
-					try {
-						JSAN.use('util.functional');
-						var sel = obj.list.retrieve_selection();
-						obj.selection_list = util.functional.map_list(
-							sel,
-							function(o) { return JSON2js(o.getAttribute('retrieve_id')); }
-						);
-						obj.error.sdump('D_TRACE', 'circ/copy_status: selection list = ' + js2JSON(obj.selection_list) );
-						if (obj.selection_list.length == 0) {
-							obj.controller.view.sel_edit.setAttribute('disabled','true');
-							obj.controller.view.sel_opac.setAttribute('disabled','true');
-							obj.controller.view.sel_patron.setAttribute('disabled','true');
-							obj.controller.view.sel_last_patron.setAttribute('disabled','true');
-							obj.controller.view.sel_copy_details.setAttribute('disabled','true');
-							obj.controller.view.sel_bucket.setAttribute('disabled','true');
-							obj.controller.view.sel_spine.setAttribute('disabled','true');
-							obj.controller.view.sel_transit_abort.setAttribute('disabled','true');
-							obj.controller.view.sel_clip.setAttribute('disabled','true');
-							obj.controller.view.sel_mark_items_damaged.setAttribute('disabled','true');
-						} else {
-							obj.controller.view.sel_edit.setAttribute('disabled','false');
-							obj.controller.view.sel_opac.setAttribute('disabled','false');
-							obj.controller.view.sel_patron.setAttribute('disabled','false');
-							obj.controller.view.sel_last_patron.setAttribute('disabled','false');
-							obj.controller.view.sel_copy_details.setAttribute('disabled','false');
-							obj.controller.view.sel_bucket.setAttribute('disabled','false');
-							obj.controller.view.sel_spine.setAttribute('disabled','false');
-							obj.controller.view.sel_transit_abort.setAttribute('disabled','false');
-							obj.controller.view.sel_clip.setAttribute('disabled','false');
-							obj.controller.view.sel_mark_items_damaged.setAttribute('disabled','false');
-						}
-					} catch(E) {
-						alert('FIXME: ' + E);
-					}
-				}
-			}
-		);
-		
-		JSAN.use('util.controller'); obj.controller = new util.controller();
-		obj.controller.init(
-			{
-				'control_map' : {
-					'save_columns' : [ [ 'command' ], function() { obj.list.save_columns(); } ],
-					'sel_clip' : [
-						['command'],
-						function() { 
+  JSAN.use('util.list'); obj.list = new util.list('checkin_list');
+  obj.list.init(
+   {
+    'columns' : columns,
+    'map_row_to_columns' : circ.util.std_map_row_to_columns(),
+    'on_select' : function(ev) {
+     try {
+      JSAN.use('util.functional');
+      var sel = obj.list.retrieve_selection();
+      obj.selection_list = util.functional.map_list(
+       sel,
+       function(o) { return JSON2js(o.getAttribute('retrieve_id')); }
+      );
+      obj.error.sdump('D_TRACE', 'circ/copy_status: selection list = ' + js2JSON(obj.selection_list) );
+      if (obj.selection_list.length == 0) {
+       obj.controller.view.sel_edit.setAttribute('disabled','true');
+       obj.controller.view.sel_opac.setAttribute('disabled','true');
+       obj.controller.view.sel_patron.setAttribute('disabled','true');
+       obj.controller.view.sel_last_patron.setAttribute('disabled','true');
+       obj.controller.view.sel_copy_details.setAttribute('disabled','true');
+       obj.controller.view.sel_bucket.setAttribute('disabled','true');
+       obj.controller.view.sel_spine.setAttribute('disabled','true');
+       obj.controller.view.sel_transit_abort.setAttribute('disabled','true');
+       obj.controller.view.sel_clip.setAttribute('disabled','true');
+       obj.controller.view.sel_mark_items_damaged.setAttribute('disabled','true');
+      } else {
+       obj.controller.view.sel_edit.setAttribute('disabled','false');
+       obj.controller.view.sel_opac.setAttribute('disabled','false');
+       obj.controller.view.sel_patron.setAttribute('disabled','false');
+       obj.controller.view.sel_last_patron.setAttribute('disabled','false');
+       obj.controller.view.sel_copy_details.setAttribute('disabled','false');
+       obj.controller.view.sel_bucket.setAttribute('disabled','false');
+       obj.controller.view.sel_spine.setAttribute('disabled','false');
+       obj.controller.view.sel_transit_abort.setAttribute('disabled','false');
+       obj.controller.view.sel_clip.setAttribute('disabled','false');
+       obj.controller.view.sel_mark_items_damaged.setAttribute('disabled','false');
+      }
+     } catch(E) {
+      alert('FIXME: ' + E);
+     }
+    }
+   }
+  );
+  
+  JSAN.use('util.controller'); obj.controller = new util.controller();
+  obj.controller.init(
+   {
+    'control_map' : {
+     'save_columns' : [ [ 'command' ], function() { obj.list.save_columns(); } ],
+     'sel_clip' : [
+      ['command'],
+      function() { 
                             obj.list.clipboard(); 
                             obj.controller.view.checkin_barcode_entry_textbox.focus();
                         }
-					],
-					'sel_edit' : [
-						['command'],
-						function() {
-							try {
-								obj.spawn_copy_editor();
-							} catch(E) {
-								alert(E);
-							}
-						}
-					],
-					'sel_spine' : [
-						['command'],
-						function() {
-							JSAN.use('cat.util');
-							cat.util.spawn_spine_editor(obj.selection_list);
-						}
-					],
-					'sel_opac' : [
-						['command'],
-						function() {
-							JSAN.use('cat.util');
-							cat.util.show_in_opac(obj.selection_list);
-						}
-					],
-					'sel_transit_abort' : [
-						['command'],
-						function() {
-							JSAN.use('circ.util');
-							circ.util.abort_transits(obj.selection_list);
-						}
-					],
-					'sel_patron' : [
-						['command'],
-						function() {
-							JSAN.use('circ.util');
-							circ.util.show_last_few_circs(obj.selection_list);
-						}
-					],
-					'sel_last_patron' : [
-						['command'],
-						function() {
-							var patrons = {};
-							for (var i = 0; i < obj.selection_list.length; i++) {
-								var circs = obj.network.simple_request('FM_CIRC_RETRIEVE_VIA_COPY',[ses(),obj.selection_list[i].copy_id,1]);
-								if (circs.length > 0) {
-									patrons[circs[0].usr()] = 1;
-								} else {
-									alert(document.getElementById('circStrings').getFormattedString('staff.circ.item_no_circs', [obj.selection_list[i].barcode]));
-								}
-							}
-							for (var i in patrons) {
-								xulG.new_patron_tab({},{'id' : i});
-							}
-						}
-					],
-					'sel_copy_details' : [
-						['command'],
-						function() {
-							JSAN.use('circ.util');
-							for (var i = 0; i < obj.selection_list.length; i++) {
-								circ.util.show_copy_details( obj.selection_list[i].copy_id );
-							}
-						}
-					],
-					'sel_mark_items_damaged' : [
-						['command'],
-						function() {
-							var funcs = [];
-							JSAN.use('cat.util'); JSAN.use('util.functional');
-							cat.util.mark_item_damaged( util.functional.map_list( obj.selection_list, function(o) { return o.copy_id; } ) );
-						}
-					],
-					'sel_bucket' : [
-						['command'],
-						function() {
-							JSAN.use('cat.util');
-							cat.util.add_copies_to_bucket(obj.selection_list);
-						}
-					],
-					'checkin_barcode_entry_textbox' : [
-						['keypress'],
-						function(ev) {
-							if (ev.keyCode && ev.keyCode == 13) {
-								obj.checkin();
-							}
-						}
-					],
-					'checkin_effective_date_label' : [
-						['render'],
-						function(e) {
-							return function() {
-								obj.controller.view.checkin_effective_date_textbox.value =
-									util.date.formatted_date(new Date(),'%F');
-							};
-						}
-					],
-					'checkin_effective_date_textbox' : [
-						['change'],
-						function(ev) {
-							if (ev.target.nodeName == 'textbox') {
-								try {
-									var flag = false;
-									var darray = ev.target.value.split('-');
-									var year = darray[0]; var month = darray[1]; var day = darray[2]; 
-									if ( (!year) || (year.length != 4) || (!Number(year)) ) flag = true;
-									if ( (!month) || (month.length !=2) || (!Number(month)) ) flag = true;
-									if ( (!day) || (day.length !=2) || (!Number(day)) ) flag = true;
-									if (flag) {
-										throw('invalid date format');
-									}
-									var d = new Date( year, month - 1, day );
-									if (d.toString() == 'Invalid Date') throw(document.getElementById('circStrings').getString('staff.circ.invalid_date'));
-									if ( d > new Date() ) throw(document.getElementById('circStrings').getString('staff.circ.future_date'));
-									ev.target.value = util.date.formatted_date(d,'%F');
-									var x = document.getElementById('background');
-									if (x) {
-										if ( ev.target.value == util.date.formatted_date(new Date(),'%F') ) {
-											x.setAttribute('style','background-color: green');
-											document.getElementById('background-text').setAttribute('value',document.getElementById('circStrings').getString('staff.circ.process_item'));
-										} else {
-											x.setAttribute('style','background-color: red');
-											document.getElementById('background-text').setAttribute('value',document.getElementById('circStrings').getFormattedString('staff.circ.backdated_checkin', [ev.target.value]));
-										}
-									}
+     ],
+     'sel_edit' : [
+      ['command'],
+      function() {
+       try {
+        obj.spawn_copy_editor();
+       } catch(E) {
+        alert(E);
+       }
+      }
+     ],
+     'sel_spine' : [
+      ['command'],
+      function() {
+       JSAN.use('cat.util');
+       cat.util.spawn_spine_editor(obj.selection_list);
+      }
+     ],
+     'sel_opac' : [
+      ['command'],
+      function() {
+       JSAN.use('cat.util');
+       cat.util.show_in_opac(obj.selection_list);
+      }
+     ],
+     'sel_transit_abort' : [
+      ['command'],
+      function() {
+       JSAN.use('circ.util');
+       circ.util.abort_transits(obj.selection_list);
+      }
+     ],
+     'sel_patron' : [
+      ['command'],
+      function() {
+       JSAN.use('circ.util');
+       circ.util.show_last_few_circs(obj.selection_list);
+      }
+     ],
+     'sel_last_patron' : [
+      ['command'],
+      function() {
+       var patrons = {};
+       for (var i = 0; i < obj.selection_list.length; i++) {
+        var circs = obj.network.simple_request('FM_CIRC_RETRIEVE_VIA_COPY',[ses(),obj.selection_list[i].copy_id,1]);
+        if (circs.length > 0) {
+         patrons[circs[0].usr()] = 1;
+        } else {
+         alert(document.getElementById('circStrings').getFormattedString('staff.circ.item_no_circs', [obj.selection_list[i].barcode]));
+        }
+       }
+       for (var i in patrons) {
+        xulG.new_patron_tab({},{'id' : i});
+       }
+      }
+     ],
+     'sel_copy_details' : [
+      ['command'],
+      function() {
+       JSAN.use('circ.util');
+       for (var i = 0; i < obj.selection_list.length; i++) {
+        circ.util.show_copy_details( obj.selection_list[i].copy_id );
+       }
+      }
+     ],
+     'sel_mark_items_damaged' : [
+      ['command'],
+      function() {
+       var funcs = [];
+       JSAN.use('cat.util'); JSAN.use('util.functional');
+       cat.util.mark_item_damaged( util.functional.map_list( obj.selection_list, function(o) { return o.copy_id; } ) );
+      }
+     ],
+     'sel_bucket' : [
+      ['command'],
+      function() {
+       JSAN.use('cat.util');
+       cat.util.add_copies_to_bucket(obj.selection_list);
+      }
+     ],
+     'checkin_barcode_entry_textbox' : [
+      ['keypress'],
+      function(ev) {
+       if (ev.keyCode && ev.keyCode == 13) {
+        obj.checkin();
+       }
+      }
+     ],
+     'checkin_effective_date_label' : [
+      ['render'],
+      function(e) {
+       return function() {
+        obj.controller.view.checkin_effective_date_textbox.value =
+         util.date.formatted_date(new Date(),'%F');
+       };
+      }
+     ],
+     'checkin_effective_date_textbox' : [
+      ['change'],
+      function(ev) {
+       if (ev.target.nodeName == 'textbox') {
+        try {
+         var flag = false;
+         var darray = ev.target.value.split('-');
+         var year = darray[0]; var month = darray[1]; var day = darray[2]; 
+         if ( (!year) || (year.length != 4) || (!Number(year)) ) flag = true;
+         if ( (!month) || (month.length !=2) || (!Number(month)) ) flag = true;
+         if ( (!day) || (day.length !=2) || (!Number(day)) ) flag = true;
+         if (flag) {
+          throw('invalid date format');
+         }
+         var d = new Date( year, month - 1, day );
+         if (d.toString() == 'Invalid Date') throw(document.getElementById('circStrings').getString('staff.circ.invalid_date'));
+         if ( d > new Date() ) throw(document.getElementById('circStrings').getString('staff.circ.future_date'));
+         ev.target.value = util.date.formatted_date(d,'%F');
+         var x = document.getElementById('background');
+         if (x) {
+          if ( ev.target.value == util.date.formatted_date(new Date(),'%F') ) {
+           x.setAttribute('style','background-color: green');
+           document.getElementById('background-text').setAttribute('value',document.getElementById('circStrings').getString('staff.circ.process_item'));
+          } else {
+           x.setAttribute('style','background-color: red');
+           document.getElementById('background-text').setAttribute('value',document.getElementById('circStrings').getFormattedString('staff.circ.backdated_checkin', [ev.target.value]));
+          }
+         }
 
-								} catch(E) {
-									dump('checkin:effective_date: ' + E + '\n');
-									alert(document.getElementById('circStrings').getFormattedString('staff.circ.backdate.exception', [E]));
-									ev.target.value = util.date.formatted_date(new Date(),'%F');
-								}
-							}
-						}
-					],
-					'cmd_broken' : [
-						['command'],
-						function() { alert(document.getElementById('circStrings').getString('staff.circ.unimplemented')); }
-					],
-					'cmd_checkin_submit_barcode' : [
-						['command'],
-						function() {
-							obj.checkin();
-						}
-					],
-					'cmd_checkin_print' : [
-						['command'],
-						function() {
-							var p = { 
-								'template' : 'checkin'
-							};
-							obj.list.print(p);
-						}
-					],
-					'cmd_csv_to_clipboard' : [ ['command'], function() { 
+        } catch(E) {
+         dump('checkin:effective_date: ' + E + '\n');
+         alert(document.getElementById('circStrings').getFormattedString('staff.circ.backdate.exception', [E]));
+         ev.target.value = util.date.formatted_date(new Date(),'%F');
+        }
+       }
+      }
+     ],
+     'cmd_broken' : [
+      ['command'],
+      function() { alert(document.getElementById('circStrings').getString('staff.circ.unimplemented')); }
+     ],
+     'cmd_checkin_submit_barcode' : [
+      ['command'],
+      function() {
+       obj.checkin();
+      }
+     ],
+     'cmd_checkin_print' : [
+      ['command'],
+      function() {
+       var p = { 
+        'template' : 'checkin'
+       };
+       obj.list.print(p);
+      }
+     ],
+     'cmd_csv_to_clipboard' : [ ['command'], function() { 
                         obj.list.dump_csv_to_clipboard(); 
                         obj.controller.view.checkin_barcode_entry_textbox.focus();
                     } ],
-					'cmd_csv_to_printer' : [ ['command'], function() { 
+     'cmd_csv_to_printer' : [ ['command'], function() { 
                         obj.list.dump_csv_to_printer(); 
                         obj.controller.view.checkin_barcode_entry_textbox.focus();
                     } ],
-					'cmd_csv_to_file' : [ ['command'], function() { 
+     'cmd_csv_to_file' : [ ['command'], function() { 
                         obj.list.dump_csv_to_file( { 'defaultFileName' : 'checked_in.txt' } ); 
                         obj.controller.view.checkin_barcode_entry_textbox.focus();
                     } ]
-				}
-			}
-		);
-		this.controller.render();
-		this.controller.view.checkin_barcode_entry_textbox.focus();
+    }
+   }
+  );
+  this.controller.render();
+  this.controller.view.checkin_barcode_entry_textbox.focus();
 
-	},
+ },
 
-	'test_barcode' : function(bc) {
-		var obj = this;
-		var x = document.getElementById('strict_barcode');
-		if (x && x.checked != true) return true;
-		var good = util.barcode.check(bc);
-		if (good) {
-			return true;
-		} else {
-			if ( 1 == obj.error.yns_alert(
-						document.getElementById('circStrings').getFormattedString('staff.circ.check_digit.bad', [bc]),
-						document.getElementById('circStrings').getString('staff.circ.barcode.bad'),
-						document.getElementById('circStrings').getString('staff.circ.cancel'),
-						document.getElementById('circStrings').getString('staff.circ.barcode.accept'),
-						null,
-						document.getElementById('circStrings').getString('staff.circ.confirm'),
-						'/xul/server/skin/media/images/bad_barcode.png'
-			) ) {
-				return true;
-			} else {
-				return false;
-			}
-		}
-	},
+ 'test_barcode' : function(bc) {
+  var obj = this;
+  var x = document.getElementById('strict_barcode');
+  if (x && x.checked != true) return true;
+  var good = util.barcode.check(bc);
+  if (good) {
+   return true;
+  } else {
+   if ( 1 == obj.error.yns_alert(
+      document.getElementById('circStrings').getFormattedString('staff.circ.check_digit.bad', [bc]),
+      document.getElementById('circStrings').getString('staff.circ.barcode.bad'),
+      document.getElementById('circStrings').getString('staff.circ.cancel'),
+      document.getElementById('circStrings').getString('staff.circ.barcode.accept'),
+      null,
+      document.getElementById('circStrings').getString('staff.circ.confirm'),
+      '/xul/server/skin/media/images/bad_barcode.png'
+   ) ) {
+    return true;
+   } else {
+    return false;
+   }
+  }
+ },
 
-	'checkin' : function() {
-		var obj = this;
-		try {
-			var barcode = obj.controller.view.checkin_barcode_entry_textbox.value;
-			if (!barcode) return;
-			if (barcode) {
-				if ( obj.test_barcode(barcode) ) { /* good */ } else { /* bad */ return; }
-			}
-			var backdate = obj.controller.view.checkin_effective_date_textbox.value;
-			var auto_print = document.getElementById('checkin_auto');
-			if (auto_print) auto_print = auto_print.checked;
-			JSAN.use('circ.util');
-			circ.util.checkin_via_barcode(
-				ses(), 
+ 'checkin' : function() {
+  var obj = this;
+  try {
+   var barcode = obj.controller.view.checkin_barcode_entry_textbox.value;
+   if (!barcode) return;
+   if (barcode) {
+    if ( obj.test_barcode(barcode) ) { /* good */ } else { /* bad */ return; }
+   }
+   var backdate = obj.controller.view.checkin_effective_date_textbox.value;
+   var auto_print = document.getElementById('checkin_auto');
+   if (auto_print) auto_print = auto_print.checked;
+   JSAN.use('circ.util');
+   circ.util.checkin_via_barcode(
+    ses(), 
                 { 
                     'barcode' : barcode,
- 					'disable_textbox' : function() { 
-						obj.controller.view.checkin_barcode_entry_textbox.disabled = true; 
-						obj.controller.view.cmd_checkin_submit_barcode.setAttribute('disabled', 'true'); 
-					},
-					'enable_textbox' : function() { 
-						obj.controller.view.checkin_barcode_entry_textbox.disabled = false; 
-						obj.controller.view.cmd_checkin_submit_barcode.setAttribute('disabled', 'false'); 
-					},
-					'checkin_result' : function(checkin) {
-						obj.controller.view.checkin_barcode_entry_textbox.disabled = false;
-						obj.controller.view.cmd_checkin_submit_barcode.setAttribute('disabled', 'false'); 
-						obj.checkin2(checkin,backdate);
-					}
+      'disable_textbox' : function() { 
+      obj.controller.view.checkin_barcode_entry_textbox.disabled = true; 
+      obj.controller.view.cmd_checkin_submit_barcode.setAttribute('disabled', 'true'); 
+     },
+     'enable_textbox' : function() { 
+      obj.controller.view.checkin_barcode_entry_textbox.disabled = false; 
+      obj.controller.view.cmd_checkin_submit_barcode.setAttribute('disabled', 'false'); 
+     },
+     'checkin_result' : function(checkin) {
+      obj.controller.view.checkin_barcode_entry_textbox.disabled = false;
+      obj.controller.view.cmd_checkin_submit_barcode.setAttribute('disabled', 'false'); 
+      obj.checkin2(checkin,backdate);
+     }
                 }, 
                 backdate, 
                 auto_print
-			);
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getFormattedString('staff.circ.checkin.exception', [E]));
-			if (typeof obj.on_failure == 'function') {
-				obj.on_failure(E);
-			}
-			if (typeof window.xulG == 'object' && typeof window.xulG.on_failure == 'function') {
-				obj.error.sdump('D_CIRC', document.getElementById('circStrings').getString('staff.circ.util.checkin.exception.external') + '\n');
-				window.xulG.on_failure(E);
-			} else {
-				obj.error.sdump('D_CIRC', document.getElementById('circStrings').getString('staff.circ.util.checkin.exception.no_external') + '\n');
-			}
-		}
+   );
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getFormattedString('staff.circ.checkin.exception', [E]));
+   if (typeof obj.on_failure == 'function') {
+    obj.on_failure(E);
+   }
+   if (typeof window.xulG == 'object' && typeof window.xulG.on_failure == 'function') {
+    obj.error.sdump('D_CIRC', document.getElementById('circStrings').getString('staff.circ.util.checkin.exception.external') + '\n');
+    window.xulG.on_failure(E);
+   } else {
+    obj.error.sdump('D_CIRC', document.getElementById('circStrings').getString('staff.circ.util.checkin.exception.no_external') + '\n');
+   }
+  }
 
-	},
+ },
 
-	'checkin2' : function(checkin,backdate) {
-		var obj = this;
-		try {
-			if (!checkin) return obj.on_failure(); /* circ.util.checkin handles errors and returns null currently */
-			if (checkin.ilsevent == 7010 /* COPY_ALERT_MESSAGE */
-				|| checkin.ilsevent == 1203 /* COPY_BAD_STATUS */
-				|| checkin.ilsevent == -1 /* offline */
-				|| checkin.ilsevent == 1502 /* ASSET_COPY_NOT_FOUND */
-				|| checkin.ilsevent == 1203 /* COPY_BAD_STATUS */
-				|| checkin.ilsevent == 7009 /* CIRC_CLAIMS_RETURNED */ 
-				|| checkin.ilsevent == 7011 /* COPY_STATUS_LOST */ 
-				|| checkin.ilsevent == 7012 /* COPY_STATUS_MISSING */) return obj.on_failure();
-			var retrieve_id = js2JSON( { 'copy_id' : checkin.copy.id(), 'barcode' : checkin.copy.barcode(), 'doc_id' : (typeof checkin.record != 'undefined' ? ( typeof checkin.record.ilsevent == 'undefined' ? checkin.record.doc_id() : null ) : null ) } );
-			if (checkin.circ && checkin.circ.checkin_time() == 'now') checkin.circ.checkin_time(backdate);
-			if (document.getElementById('trim_list')) {
-				var x = document.getElementById('trim_list');
-				if (x.checked) { obj.list.trim_list = 20; } else { obj.list.trim_list = null; }
-			}
-			obj.list.append(
-				{
-					'retrieve_id' : retrieve_id,
-					'row' : {
-						'my' : {
-							'circ' : checkin.circ,
-							'mvr' : checkin.record,
-							'acp' : checkin.copy,
-							'status' : checkin.status,
-							'route_to' : checkin.route_to,
-							'message' : checkin.message
-						}
-					},
-					'to_top' : true
-				//I could override map_row_to_column here
-				}
-			);
-			obj.list.node.view.selection.select(0);
+ 'checkin2' : function(checkin,backdate) {
+  var obj = this;
+  try {
+   if (!checkin) return obj.on_failure(); /* circ.util.checkin handles errors and returns null currently */
+   if (checkin.ilsevent == 7010 /* COPY_ALERT_MESSAGE */
+    || checkin.ilsevent == 1203 /* COPY_BAD_STATUS */
+    || checkin.ilsevent == -1 /* offline */
+    || checkin.ilsevent == 1502 /* ASSET_COPY_NOT_FOUND */
+    || checkin.ilsevent == 1203 /* COPY_BAD_STATUS */
+    || checkin.ilsevent == 7009 /* CIRC_CLAIMS_RETURNED */ 
+    || checkin.ilsevent == 7011 /* COPY_STATUS_LOST */ 
+    || checkin.ilsevent == 7012 /* COPY_STATUS_MISSING */) return obj.on_failure();
+   var retrieve_id = js2JSON( { 'copy_id' : checkin.copy.id(), 'barcode' : checkin.copy.barcode(), 'doc_id' : (typeof checkin.record != 'undefined' ? ( typeof checkin.record.ilsevent == 'undefined' ? checkin.record.doc_id() : null ) : null ) } );
+   if (checkin.circ && checkin.circ.checkin_time() == 'now') checkin.circ.checkin_time(backdate);
+   if (document.getElementById('trim_list')) {
+    var x = document.getElementById('trim_list');
+    if (x.checked) { obj.list.trim_list = 20; } else { obj.list.trim_list = null; }
+   }
+   obj.list.append(
+    {
+     'retrieve_id' : retrieve_id,
+     'row' : {
+      'my' : {
+       'circ' : checkin.circ,
+       'mvr' : checkin.record,
+       'acp' : checkin.copy,
+       'status' : checkin.status,
+       'route_to' : checkin.route_to,
+       'message' : checkin.message
+      }
+     },
+     'to_top' : true
+    //I could override map_row_to_column here
+    }
+   );
+   obj.list.node.view.selection.select(0);
 
-			JSAN.use('util.sound'); var sound = new util.sound(); sound.circ_good();
+   JSAN.use('util.sound'); var sound = new util.sound(); sound.circ_good();
 
-			if (typeof obj.on_checkin == 'function') {
-				obj.on_checkin(checkin);
-			}
-			if (typeof window.xulG == 'object' && typeof window.xulG.on_checkin == 'function') {
-				obj.error.sdump('D_CIRC', document.getElementById('circStrings').getString('staff.circ.checkin.exception.external') + '\n');
-				window.xulG.on_checkin(checkin);
-			} else {
-				obj.error.sdump('D_CIRC', document.getElementById('circStrings').getString('staff.circ.checkin.exception.no_external') + '\n');
-			}
+   if (typeof obj.on_checkin == 'function') {
+    obj.on_checkin(checkin);
+   }
+   if (typeof window.xulG == 'object' && typeof window.xulG.on_checkin == 'function') {
+    obj.error.sdump('D_CIRC', document.getElementById('circStrings').getString('staff.circ.checkin.exception.external') + '\n');
+    window.xulG.on_checkin(checkin);
+   } else {
+    obj.error.sdump('D_CIRC', document.getElementById('circStrings').getString('staff.circ.checkin.exception.no_external') + '\n');
+   }
 
-			return true;
+   return true;
 
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getFormattedString('staff.circ.checkin2.exception', [E]));
-			if (typeof obj.on_failure == 'function') {
-				obj.on_failure(E);
-			}
-			if (typeof window.xulG == 'object' && typeof window.xulG.on_failure == 'function') {
-				obj.error.sdump('D_CIRC', document.getElementById('circStrings').getString('staff.circ.checkin2.exception.external') + '\n');
-				window.xulG.on_failure(E);
-			} else {
-				obj.error.sdump('D_CIRC', document.getElementById('circStrings').getString('staff.circ.checkin2.exception.no_external') + '\n');
-			}
-		}
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getFormattedString('staff.circ.checkin2.exception', [E]));
+   if (typeof obj.on_failure == 'function') {
+    obj.on_failure(E);
+   }
+   if (typeof window.xulG == 'object' && typeof window.xulG.on_failure == 'function') {
+    obj.error.sdump('D_CIRC', document.getElementById('circStrings').getString('staff.circ.checkin2.exception.external') + '\n');
+    window.xulG.on_failure(E);
+   } else {
+    obj.error.sdump('D_CIRC', document.getElementById('circStrings').getString('staff.circ.checkin2.exception.no_external') + '\n');
+   }
+  }
 
-	},
+ },
 
-	'on_checkin' : function() {
-		this.controller.view.checkin_barcode_entry_textbox.disabled = false;
-		this.controller.view.checkin_barcode_entry_textbox.select();
-		this.controller.view.checkin_barcode_entry_textbox.value = '';
-		this.controller.view.checkin_barcode_entry_textbox.focus();
-	},
+ 'on_checkin' : function() {
+  this.controller.view.checkin_barcode_entry_textbox.disabled = false;
+  this.controller.view.checkin_barcode_entry_textbox.select();
+  this.controller.view.checkin_barcode_entry_textbox.value = '';
+  this.controller.view.checkin_barcode_entry_textbox.focus();
+ },
 
-	'on_failure' : function() {
-		this.controller.view.checkin_barcode_entry_textbox.disabled = false;
-		this.controller.view.checkin_barcode_entry_textbox.select();
-		this.controller.view.checkin_barcode_entry_textbox.focus();
-	},
-	
-	'spawn_copy_editor' : function() {
+ 'on_failure' : function() {
+  this.controller.view.checkin_barcode_entry_textbox.disabled = false;
+  this.controller.view.checkin_barcode_entry_textbox.select();
+  this.controller.view.checkin_barcode_entry_textbox.focus();
+ },
+ 
+ 'spawn_copy_editor' : function() {
 
-		var obj = this;
+  var obj = this;
 
-		JSAN.use('util.functional');
+  JSAN.use('util.functional');
 
-		var list = obj.selection_list;
+  var list = obj.selection_list;
 
-		list = util.functional.map_list(
-			list,
-			function (o) {
-				return o.copy_id;
-			}
-		);
+  list = util.functional.map_list(
+   list,
+   function (o) {
+    return o.copy_id;
+   }
+  );
 
-		JSAN.use('cat.util'); cat.util.spawn_copy_editor( { 'copy_ids' : list, 'edit' : 1 } );
+  JSAN.use('cat.util'); cat.util.spawn_copy_editor( { 'copy_ids' : list, 'edit' : 1 } );
 
-	}
+ }
 
 }
 
diff --git a/Open-ILS/xul/staff_client/server/circ/checkin.xul b/Open-ILS/xul/staff_client/server/circ/checkin.xul
index a59d9916ba..769ae10edd 100644
--- a/Open-ILS/xul/staff_client/server/circ/checkin.xul
+++ b/Open-ILS/xul/staff_client/server/circ/checkin.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -21,86 +21,86 @@
 <?xul-overlay href="/xul/server/circ/checkin_overlay.xul"?>
 
 <window id="checkin_win" 
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for checkin.xul');
-
-				var tab_name;
-				if (xul_param('hold_capture')) {
-					document.getElementById('checkin_auto').checked = true;
-					document.getElementById('checkin_auto').hidden = true;
-					document.getElementById('checkin_effective_date_hbox').hidden = true;
-					document.getElementById('caption').setAttribute('label',document.getElementById('circStrings').getString('staff.circ.checkin.hold_capture'));
-					document.getElementById('hold_capture_blurb').hidden = false;
-					tab_name = document.getElementById('circStrings').getString('staff.circ.checkin.hold_capture');
-				} else {
-					tab_name = document.getElementById('circStrings').getString('staff.circ.checkin.check_in.tab');
-				}
-
-				JSAN.use('circ.checkin'); g.checkin = new circ.checkin();
-				g.checkin.init( 
-					{ 
-					} 
-				);
-	
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					try { window.xulG.set_tab_name(tab_name); } catch(E) { alert(E); }
-				}
-
-			} catch(E) {
-				var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['circ.checkin.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function default_focus() { try { setTimeout( function() { document.getElementById('checkin_barcode_entry_textbox').focus(); }, 0); } catch(E) {} }
-	]]>
-	</script>
-
-	<popupset id="copy_status_popupset"/>
-
-	<commandset id="checkin_cmds">
-		<command id="cmd_checkin_submit_barcode" />
-		<command id="cmd_checkin_print" />
-		<command id="cmd_csv_to_clipboard" />
-		<command id="cmd_csv_to_printer" />
-		<command id="cmd_csv_to_file" />
-		<command id="save_columns" />
-		
-		<command id="sel_clip" disabled="true"/>
-		<command id="sel_edit" disabled="true"/>
-		<command id="sel_opac" disabled="true"/>
-		<command id="sel_patron" disabled="true"/>
-		<command id="sel_last_patron" disabled="true"/>
-		<command id="sel_copy_details" disabled="true"/>
-		<command id="sel_bucket" disabled="true"/>
-		<command id="sel_spine" disabled="true"/>
-		<command id="sel_transit_abort" disabled="true"/>
-		<command id="sel_mark_items_damaged" disabled="true"/>
-
-	</commandset>
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for checkin.xul');
+
+    var tab_name;
+    if (xul_param('hold_capture')) {
+     document.getElementById('checkin_auto').checked = true;
+     document.getElementById('checkin_auto').hidden = true;
+     document.getElementById('checkin_effective_date_hbox').hidden = true;
+     document.getElementById('caption').setAttribute('label',document.getElementById('circStrings').getString('staff.circ.checkin.hold_capture'));
+     document.getElementById('hold_capture_blurb').hidden = false;
+     tab_name = document.getElementById('circStrings').getString('staff.circ.checkin.hold_capture');
+    } else {
+     tab_name = document.getElementById('circStrings').getString('staff.circ.checkin.check_in.tab');
+    }
+
+    JSAN.use('circ.checkin'); g.checkin = new circ.checkin();
+    g.checkin.init( 
+     { 
+     } 
+    );
+ 
+    if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+     try { window.xulG.set_tab_name(tab_name); } catch(E) { alert(E); }
+    }
+
+   } catch(E) {
+    var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['circ.checkin.xul', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+
+  function default_focus() { try { setTimeout( function() { document.getElementById('checkin_barcode_entry_textbox').focus(); }, 0); } catch(E) {} }
+ ]]>
+ </script>
+
+ <popupset id="copy_status_popupset"/>
+
+ <commandset id="checkin_cmds">
+  <command id="cmd_checkin_submit_barcode" />
+  <command id="cmd_checkin_print" />
+  <command id="cmd_csv_to_clipboard" />
+  <command id="cmd_csv_to_printer" />
+  <command id="cmd_csv_to_file" />
+  <command id="save_columns" />
+  
+  <command id="sel_clip" disabled="true"/>
+  <command id="sel_edit" disabled="true"/>
+  <command id="sel_opac" disabled="true"/>
+  <command id="sel_patron" disabled="true"/>
+  <command id="sel_last_patron" disabled="true"/>
+  <command id="sel_copy_details" disabled="true"/>
+  <command id="sel_bucket" disabled="true"/>
+  <command id="sel_spine" disabled="true"/>
+  <command id="sel_transit_abort" disabled="true"/>
+  <command id="sel_mark_items_damaged" disabled="true"/>
+
+ </commandset>
 
     <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
     <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
 
-	<box id="checkin_main" />
+ <box id="checkin_main" />
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul b/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul
index 9eb53d58b8..8784845abe 100644
--- a/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul
@@ -2,102 +2,102 @@
 
 <!-- LOCALIZATION -->
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <overlay id="checkin_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading checkin_overlay.xul\n');</script>
 
 <commandset id="checkin_cmds" />
 
 <popupset id="copy_status_popupset">
-	<popup id="copy_status_actions" position="at_pointer"> 
-		<menuitem command="sel_clip" label="&staff.circ.checkin_overlay.sel_clip.label;" accesskey="&staff.circ.checkin_overlay.sel_clip.accesskey;" />
-		<menuitem command="sel_bucket" label="&staff.circ.checkin_overlay.sel_bucket.label;" accesskey="&staff.circ.checkin_overlay.sel_bucket.accesskey;"/>
-		<menuitem command="sel_opac" label="&staff.circ.checkin_overlay.sel_opac.label;" accesskey="&staff.circ.checkin_overlay.sel_opac.accesskey;" />
-		<menuitem command="sel_copy_details" label="&staff.circ.checkin_overlay.sel_copy_details.label;" accesskey="&staff.circ.checkin_overlay.sel_copy_details.accesskey;" />
-		<menuitem command="sel_patron" label="&staff.circ.checkin_overlay.sel_patron.label;" accesskey="&staff.circ.checkin_overlay.sel_patron.accesskey;"/>
-		<menuitem command="sel_last_patron" label="&staff.circ.checkin_overlay.sel_last_patron.label;" accesskey="&staff.circ.checkin_overlay.sel_last_patron.accesskey;"/>
-		<menuseparator/>
-		<menuitem command="sel_edit" label="&staff.circ.checkin_overlay.sel_edit.label;" accesskey="&staff.circ.checkin_overlay.sel_edit.accesskey;" />
-		<menuseparator />
-		<menuitem command="sel_mark_items_damaged" label="&staff.circ.checkin_overlay.sel_mark_items_damaged.label;" accesskey="&staff.circ.checkin_overlay.sel_mark_items_damaged.accesskey;"/>
-		<menuseparator />
-		<menuitem command="sel_transit_abort" label="&staff.circ.checkin_overlay.sel_transit_abort.label;" />
-		<menuseparator />
-		<menuitem command="sel_spine" label="&staff.circ.checkin_overlay.sel_spine.label;" accesskey="&staff.circ.checkin_overlay.sel_spine.accesskey;"/>
-		<menuitem command="save_columns" label="&staff.circ.checkin_overlay.save_columns.label;"/>
-	</popup>
+ <popup id="copy_status_actions" position="at_pointer"> 
+  <menuitem command="sel_clip" label="&staff.circ.checkin_overlay.sel_clip.label;" accesskey="&staff.circ.checkin_overlay.sel_clip.accesskey;" />
+  <menuitem command="sel_bucket" label="&staff.circ.checkin_overlay.sel_bucket.label;" accesskey="&staff.circ.checkin_overlay.sel_bucket.accesskey;"/>
+  <menuitem command="sel_opac" label="&staff.circ.checkin_overlay.sel_opac.label;" accesskey="&staff.circ.checkin_overlay.sel_opac.accesskey;" />
+  <menuitem command="sel_copy_details" label="&staff.circ.checkin_overlay.sel_copy_details.label;" accesskey="&staff.circ.checkin_overlay.sel_copy_details.accesskey;" />
+  <menuitem command="sel_patron" label="&staff.circ.checkin_overlay.sel_patron.label;" accesskey="&staff.circ.checkin_overlay.sel_patron.accesskey;"/>
+  <menuitem command="sel_last_patron" label="&staff.circ.checkin_overlay.sel_last_patron.label;" accesskey="&staff.circ.checkin_overlay.sel_last_patron.accesskey;"/>
+  <menuseparator/>
+  <menuitem command="sel_edit" label="&staff.circ.checkin_overlay.sel_edit.label;" accesskey="&staff.circ.checkin_overlay.sel_edit.accesskey;" />
+  <menuseparator />
+  <menuitem command="sel_mark_items_damaged" label="&staff.circ.checkin_overlay.sel_mark_items_damaged.label;" accesskey="&staff.circ.checkin_overlay.sel_mark_items_damaged.accesskey;"/>
+  <menuseparator />
+  <menuitem command="sel_transit_abort" label="&staff.circ.checkin_overlay.sel_transit_abort.label;" />
+  <menuseparator />
+  <menuitem command="sel_spine" label="&staff.circ.checkin_overlay.sel_spine.label;" accesskey="&staff.circ.checkin_overlay.sel_spine.accesskey;"/>
+  <menuitem command="save_columns" label="&staff.circ.checkin_overlay.save_columns.label;"/>
+ </popup>
 </popupset>
 
 <box id="checkin_main" flex="1" orient="vertical" class="my_overflow">
-	<vbox id="cmvb1" flex="1"/>
+ <vbox id="cmvb1" flex="1"/>
 </box>
 
 <vbox id="cmvb1" flex="1">
-	<hbox id="background" style="background-color: green;">
-		<spacer flex="1"/>
-		<vbox>
-			<label id="background-text" value="&staff.circ.checkin_overlay.background_text;" style="font-size: x-large; font-weight: bold;"/>
-			<label id="hold_capture_blurb" hidden="true" value="&staff.circ.checkin_overlay.background_text.hold_capture;" style="font-size: large; font-weight: bold;"/>
-		</vbox>
-		<spacer flex="1"/>
-	</hbox>
-	<groupbox id="cmgb1" flex="2">
-		<caption id="caption" label="&staff.circ.checkin.caption;" />
-		<hbox id="checkin_top_ui" />
-		<tree id="checkin_list" flex="1" enableColumnDrag="true" context="copy_status_actions" />
-		<hbox id="checkin_bottom_ui" />
-	</groupbox>
+ <hbox id="background" style="background-color: green;">
+  <spacer flex="1"/>
+  <vbox>
+   <label id="background-text" value="&staff.circ.checkin_overlay.background_text;" style="font-size: x-large; font-weight: bold;"/>
+   <label id="hold_capture_blurb" hidden="true" value="&staff.circ.checkin_overlay.background_text.hold_capture;" style="font-size: large; font-weight: bold;"/>
+  </vbox>
+  <spacer flex="1"/>
+ </hbox>
+ <groupbox id="cmgb1" flex="2">
+  <caption id="caption" label="&staff.circ.checkin.caption;" />
+  <hbox id="checkin_top_ui" />
+  <tree id="checkin_list" flex="1" enableColumnDrag="true" context="copy_status_actions" />
+  <hbox id="checkin_bottom_ui" />
+ </groupbox>
 </vbox>
 
 <hbox id="checkin_top_ui">
-	<vbox>
-		<hbox>
-			<label id="checkin_scan_barcode_label" 
-				value="&staff.circ.checkin.scan.label;" 
-				accesskey="&staff.circ.checkin.scan.accesskey;" 
-				control="checkin_barcode_entry_textbox"/>
-			<textbox id="checkin_barcode_entry_textbox" context="clipboard"/>
-			<button id="checkin_submit_barcode_button" 
-				label="&staff.circ.checkin.submit.label;" 
-				command="cmd_checkin_submit_barcode"
-				oldaccesskey="&staff.circ.checkin.submit.accesskey;"/>
-		</hbox>
-		<label id="no_change_label" value="" style="color: red" hidden="true"/>
-	</vbox>
-	<spacer flex="1"/>
-	<vbox>
-		<hbox>
-			<hbox id="checkin_effective_date_hbox">
-				<label id="checkin_effective_date_label" value="&staff.circ.checkin_overlay.effective_date.label;" control="checkin_effective_date_textbox" accesskey="&staff.circ.checkin_overlay.effective_date.accesskey;"/>
-				<textbox id="checkin_effective_date_textbox" context="clipboard"/>
-			</hbox>
-			<menubar>
-			<menu label="&staff.circ.checkin_overlay.actions.label;" accesskey="&staff.circ.checkin_overlay.actions.accesskey;">
-				<menupopup>
-					<menuitem command="sel_clip" label="&staff.circ.checkin_overlay.sel_clip.label;" accesskey="&staff.circ.checkin_overlay.sel_clip.accesskey;" />
-					<menuitem command="sel_bucket" label="&staff.circ.checkin_overlay.sel_bucket.label;" accesskey="&staff.circ.checkin_overlay.sel_bucket.accesskey;"/>
-					<menuitem command="sel_opac" label="&staff.circ.checkin_overlay.sel_opac.label;" accesskey="&staff.circ.checkin_overlay.sel_opac.accesskey;" />
-					<menuitem command="sel_copy_details" label="&staff.circ.checkin_overlay.sel_copy_details.label;" accesskey="&staff.circ.checkin_overlay.sel_copy_details.accesskey;" />
-					<menuitem command="sel_patron" label="&staff.circ.checkin_overlay.sel_patron.label;" accesskey="&staff.circ.checkin_overlay.sel_patron.accesskey;"/>
-					<menuitem command="sel_last_patron" label="&staff.circ.checkin_overlay.sel_last_patron.label;" accesskey="&staff.circ.checkin_overlay.sel_last_patron.accesskey;"/>
-					<menuseparator/>
-					<menuitem command="sel_edit" label="&staff.circ.checkin_overlay.sel_edit.label;" accesskey="&staff.circ.checkin_overlay.sel_edit.accesskey;" />
-					<menuseparator />
-					<menuitem command="sel_mark_items_damaged" label="&staff.circ.checkin_overlay.sel_mark_items_damaged.label;" accesskey="&staff.circ.checkin_overlay.sel_mark_items_damaged.accesskey;"/>
-					<menuseparator />
-					<menuitem command="sel_transit_abort" label="&staff.circ.checkin_overlay.sel_transit_abort.label;" />
-					<menuseparator />
-					<menuitem command="sel_spine" label="&staff.circ.checkin_overlay.sel_spine.label;" accesskey="&staff.circ.checkin_overlay.sel_spine.accesskey;"/>
-					<menuitem command="save_columns" label="&staff.circ.checkin_overlay.save_columns.label;"/>
-				</menupopup>
-			</menu>
-			</menubar>
-		</hbox>
-	</vbox>
+ <vbox>
+  <hbox>
+   <label id="checkin_scan_barcode_label" 
+    value="&staff.circ.checkin.scan.label;" 
+    accesskey="&staff.circ.checkin.scan.accesskey;" 
+    control="checkin_barcode_entry_textbox"/>
+   <textbox id="checkin_barcode_entry_textbox" context="clipboard"/>
+   <button id="checkin_submit_barcode_button" 
+    label="&staff.circ.checkin.submit.label;" 
+    command="cmd_checkin_submit_barcode"
+    oldaccesskey="&staff.circ.checkin.submit.accesskey;"/>
+  </hbox>
+  <label id="no_change_label" value="" style="color: red" hidden="true"/>
+ </vbox>
+ <spacer flex="1"/>
+ <vbox>
+  <hbox>
+   <hbox id="checkin_effective_date_hbox">
+    <label id="checkin_effective_date_label" value="&staff.circ.checkin_overlay.effective_date.label;" control="checkin_effective_date_textbox" accesskey="&staff.circ.checkin_overlay.effective_date.accesskey;"/>
+    <textbox id="checkin_effective_date_textbox" context="clipboard"/>
+   </hbox>
+   <menubar>
+   <menu label="&staff.circ.checkin_overlay.actions.label;" accesskey="&staff.circ.checkin_overlay.actions.accesskey;">
+    <menupopup>
+     <menuitem command="sel_clip" label="&staff.circ.checkin_overlay.sel_clip.label;" accesskey="&staff.circ.checkin_overlay.sel_clip.accesskey;" />
+     <menuitem command="sel_bucket" label="&staff.circ.checkin_overlay.sel_bucket.label;" accesskey="&staff.circ.checkin_overlay.sel_bucket.accesskey;"/>
+     <menuitem command="sel_opac" label="&staff.circ.checkin_overlay.sel_opac.label;" accesskey="&staff.circ.checkin_overlay.sel_opac.accesskey;" />
+     <menuitem command="sel_copy_details" label="&staff.circ.checkin_overlay.sel_copy_details.label;" accesskey="&staff.circ.checkin_overlay.sel_copy_details.accesskey;" />
+     <menuitem command="sel_patron" label="&staff.circ.checkin_overlay.sel_patron.label;" accesskey="&staff.circ.checkin_overlay.sel_patron.accesskey;"/>
+     <menuitem command="sel_last_patron" label="&staff.circ.checkin_overlay.sel_last_patron.label;" accesskey="&staff.circ.checkin_overlay.sel_last_patron.accesskey;"/>
+     <menuseparator/>
+     <menuitem command="sel_edit" label="&staff.circ.checkin_overlay.sel_edit.label;" accesskey="&staff.circ.checkin_overlay.sel_edit.accesskey;" />
+     <menuseparator />
+     <menuitem command="sel_mark_items_damaged" label="&staff.circ.checkin_overlay.sel_mark_items_damaged.label;" accesskey="&staff.circ.checkin_overlay.sel_mark_items_damaged.accesskey;"/>
+     <menuseparator />
+     <menuitem command="sel_transit_abort" label="&staff.circ.checkin_overlay.sel_transit_abort.label;" />
+     <menuseparator />
+     <menuitem command="sel_spine" label="&staff.circ.checkin_overlay.sel_spine.label;" accesskey="&staff.circ.checkin_overlay.sel_spine.accesskey;"/>
+     <menuitem command="save_columns" label="&staff.circ.checkin_overlay.save_columns.label;"/>
+    </menupopup>
+   </menu>
+   </menubar>
+  </hbox>
+ </vbox>
 
 </hbox>
 
@@ -107,23 +107,23 @@
         accesskey="&staff.generic.list_actions.accesskey;" 
         type="menu" allowevents="true">
         <menupopup id="list_actions_popup">
-        	<menuitem command="sel_clip" label="&staff.generic.list_actions.sel_clip.label;" accesskey="&staff.generic.list_actions.sel_clip.accesskey;" disabled="true" />
-    	    <menuitem command="cmd_csv_to_printer" label="&staff.generic.list_actions.csv_to_printer.label;" accesskey="&staff.generic.list_actions.csv_to_printer.accesskey;" />
-        	<menuitem command="cmd_csv_to_clipboard" label="&staff.generic.list_actions.csv_to_clipboard.label;" accesskey="&staff.generic.list_actions.csv_to_clipboard.accesskey;" />
-        	<menuitem command="cmd_csv_to_file" label="&staff.generic.list_actions.csv_to_file.label;" accesskey="&staff.generic.list_actions.csv_to_file.accesskey;" />
-	        <menuitem command="save_columns" label="&staff.generic.list_actions.save_columns.label;" accesskey="&staff.generic.list_actions.save_columns.accesskey;" />
+         <menuitem command="sel_clip" label="&staff.generic.list_actions.sel_clip.label;" accesskey="&staff.generic.list_actions.sel_clip.accesskey;" disabled="true" />
+         <menuitem command="cmd_csv_to_printer" label="&staff.generic.list_actions.csv_to_printer.label;" accesskey="&staff.generic.list_actions.csv_to_printer.accesskey;" />
+         <menuitem command="cmd_csv_to_clipboard" label="&staff.generic.list_actions.csv_to_clipboard.label;" accesskey="&staff.generic.list_actions.csv_to_clipboard.accesskey;" />
+         <menuitem command="cmd_csv_to_file" label="&staff.generic.list_actions.csv_to_file.label;" accesskey="&staff.generic.list_actions.csv_to_file.accesskey;" />
+         <menuitem command="save_columns" label="&staff.generic.list_actions.save_columns.label;" accesskey="&staff.generic.list_actions.save_columns.accesskey;" />
         </menupopup>
     </button>
 
-	<button id="checkin_print" 
-		label="&staff.checkin.print_receipt.label;" 
-		command="cmd_checkin_print"
-		accesskey="&staff.checkin.print_receipt.accesskey;"/>
-	<checkbox id="trim_list" label="&staff.circ.checkin_overlay.trim_list.label;" checked="true" oils_persist="checked"/> 
-	<checkbox id="strict_barcode" label="&staff.circ.checkin_overlay.strict_barcode.label;" checked="false" oils_persist="checked"/> 
-	<checkbox id="do_not_alert_on_precat" label="&staff.circ.checkin_overlay.do_not_alert_on_precat.label;" oils_persist="checked"/> 
-	<spacer id="pcii3s" flex="1"/>
-	<checkbox id="checkin_auto" label="&staff.circ.checkin_overlay.checkin_auto.label;" accesskey="&staff.circ.checkin_overlay.checkin_auto.accesskey;" oils_persist="checked"/> 
+ <button id="checkin_print" 
+  label="&staff.checkin.print_receipt.label;" 
+  command="cmd_checkin_print"
+  accesskey="&staff.checkin.print_receipt.accesskey;"/>
+ <checkbox id="trim_list" label="&staff.circ.checkin_overlay.trim_list.label;" checked="true" oils_persist="checked"/> 
+ <checkbox id="strict_barcode" label="&staff.circ.checkin_overlay.strict_barcode.label;" checked="false" oils_persist="checked"/> 
+ <checkbox id="do_not_alert_on_precat" label="&staff.circ.checkin_overlay.do_not_alert_on_precat.label;" oils_persist="checked"/> 
+ <spacer id="pcii3s" flex="1"/>
+ <checkbox id="checkin_auto" label="&staff.circ.checkin_overlay.checkin_auto.label;" accesskey="&staff.circ.checkin_overlay.checkin_auto.accesskey;" oils_persist="checked"/> 
 </hbox>
 
 </overlay>
diff --git a/Open-ILS/xul/staff_client/server/circ/checkout.js b/Open-ILS/xul/staff_client/server/circ/checkout.js
index 3e080db9e2..9b54fca598 100644
--- a/Open-ILS/xul/staff_client/server/circ/checkout.js
+++ b/Open-ILS/xul/staff_client/server/circ/checkout.js
@@ -3,292 +3,292 @@ dump('entering circ.checkout.js\n');
 if (typeof circ == 'undefined') { circ = {}; }
 circ.checkout = function (params) {
 
-	JSAN.use('util.error'); this.error = new util.error();
-	JSAN.use('util.network'); this.network = new util.network();
-	JSAN.use('OpenILS.data'); this.data = new OpenILS.data(); this.data.init({'via':'stash'});
-	JSAN.use('util.barcode');
+ JSAN.use('util.error'); this.error = new util.error();
+ JSAN.use('util.network'); this.network = new util.network();
+ JSAN.use('OpenILS.data'); this.data = new OpenILS.data(); this.data.init({'via':'stash'});
+ JSAN.use('util.barcode');
 };
 
 circ.checkout.prototype = {
 
-	'init' : function( params ) {
-
-		var obj = this;
-
-		obj.patron_id = params.patron_id;
-
-		JSAN.use('circ.util');
-		var columns = circ.util.columns( 
-			{ 
-				'barcode' : { 'hidden' : false },
-				'title' : { 'hidden' : false },
-				'due_date' : { 'hidden' : false }
-			} 
-		);
-
-		JSAN.use('util.list'); obj.list = new util.list('checkout_list');
-		obj.list.init(
-			{
-				'columns' : columns,
-				'map_row_to_columns' : circ.util.std_map_row_to_columns(),
-				'on_select' : function() {
-					var sel = obj.list.retrieve_selection();
-					document.getElementById('clip_button').disabled = sel.length < 1;
-				}
-			}
-		);
-		
-		JSAN.use('util.controller'); obj.controller = new util.controller();
-		obj.controller.init(
-			{
-				'control_map' : {
-					'save_columns' : [ [ 'command' ], function() { obj.list.save_columns(); } ],
-					'sel_clip' : [
-						['command'],
-						function() { obj.list.clipboard(); }
-					],
-					'checkout_menu_placeholder' : [
-						['render'],
-						function(e) {
-							return function() {
-								JSAN.use('util.widgets'); JSAN.use('util.functional'); JSAN.use('util.fm_utils');
-								var items = [ [ document.getElementById('circStrings').getString('staff.circ.checkout.barcode') , 'barcode' ] ].concat(
-									util.functional.map_list(
-										util.functional.filter_list(
-											obj.data.list.my_cnct,
-											function(o) {
-												return util.fm_utils.compare_aou_a_is_b_or_ancestor(o.owning_lib(), obj.data.list.au[0].ws_ou());
-											}
-										).sort(
-
-											function(a,b) {
-												try { 
-													return util.fm_utils.sort_func_aou_by_depth_and_then_string(
-														[ a.owning_lib(), a.name() ],
-														[ b.owning_lib(), b.name() ]
-													);
-												} catch(E) {
-													alert(document.getElementById('circStrings').getFormattedString('staff.circ.checkout.sorting.exception', [E]));
-													return 0;
-												}
-											}
-
-										),
-										function(o) {
-											return [ obj.data.hash.aou[ o.owning_lib() ].shortname() + ' : ' + o.name(), o.id() ];
-										}
-									)
-								);
-								g.error.sdump('D_TRACE','items = ' + js2JSON(items));
-								util.widgets.remove_children( e );
-								var ml = util.widgets.make_menulist(items);
-								e.appendChild( ml );
-								ml.setAttribute('id','checkout_menulist');
-								ml.setAttribute('accesskey','');
-								ml.addEventListener(
-									'command',
-									function(ev) {
-										var tb = obj.controller.view.checkout_barcode_entry_textbox;
-										var db = document.getElementById('duedate_hbox');
-										if (ev.target.value == 'barcode') {
-											db.hidden = false;
-											tb.disabled = false;
-											tb.value = '';
-											tb.focus();
-										} else {
-											db.hidden = true;
-											tb.disabled = true;
-											tb.value = document.getElementById('circStrings').getString('staff.circ.non_cataloged');
-										}
-									}, false
-								);
-								obj.controller.view.checkout_menu = ml;
-							};
-						}
-					],
-					'checkout_barcode_entry_textbox' : [
-						['keypress'],
-						function(ev) {
-							if (ev.keyCode && ev.keyCode == 13) {
-								obj.checkout( { barcode: ev.target.value } );
-							}
-						}
-					],
-					'checkout_duedate_menu' : [
-						['change'],
-						function(ev) { 
-							try {
-								obj.check_date(ev.target);
-								ev.target.parentNode.setAttribute('style','');
-							} catch(E) {
-								ev.target.parentNode.setAttribute('style','background-color: red');
-								alert(E + '\n' + document.getElementById('circStrings').getString('staff.circ.checkout.date.exception'));
-								try {
-									ev.target.inputField.select();
-									ev.target.inputField.focus();
-								} catch(EX) { /* this should work, let me try on other platforms */ 
-									obj.error.sdump('D_ERROR','menulist.inputField: ' + EX);
-								}
-							}
-						}
-					],
-					'cmd_broken' : [
-						['command'],
-						function() { alert(document.getElementById('circStrings').getString('staff.circ.checkout.unimplemented')); }
-					],
-					'cmd_checkout_submit' : [
-						['command'],
-						function() {
-							var params = {}; var count = 1;
-
-							if (obj.controller.view.checkout_menu.value == 'barcode' ||
-								obj.controller.view.checkout_menu.value === '') {
-								params.barcode = obj.controller.view.checkout_barcode_entry_textbox.value;
-							} else {
-								params.noncat = 1;
-								params.noncat_type = obj.controller.view.checkout_menu.value;
-								netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
-								var r = window.prompt(
-									document.getElementById('circStrings').getFormattedString('staff.circ.checkout.cmd_checkout_submit.msg', [obj.data.hash.cnct[params.noncat_type].name()]),
-									'1',
-									document.getElementById('circStrings').getString('staff.circ.checkout.cmd_checkout_submit.title')
-								);
-								if (r) {
-									count = Number(r);
-									if (count > 0) {
-										if (count > 99) {
-											obj.error.yns_alert(
-												document.getElementById('circStrings').getFormattedString('staff.circ.checkout.cmd_checkout_submit.too_many.msg', [count, obj.data.hash.cnct[params.noncat_type].name()]),
-												document.getElementById('circStrings').getString('staff.circ.checkout.cmd_checkout_submit.too_many.title'),
-												document.getElementById('circStrings').getString('staff.circ.checkout.ok.btn'),
-												null,
-												null,
-												document.getElementById('circStrings').getString('staff.circ.confirm')
-											);
-											return;
-										} else if (count > 20) {
-											r = obj.error.yns_alert(
-												document.getElementById('circStrings').getFormattedString('staff.circ.checkout.cmd_checkout_submit.confirm.msg', [count, obj.data.hash.cnct[params.noncat_type].name()]),
-												document.getElementById('circStrings').getString('staff.circ.checkout.cmd_checkout_submit.confirm.title'),
-												document.getElementById('circStrings').getString('staff.circ.checkout.yes.btn'),
-												document.getElementById('circStrings').getString('staff.circ.checkout.no.btn'),
-												null,
-												document.getElementById('circStrings').getString('staff.circ.confirm')
-											);
-											if (r !== 0) { return; }
-										}
-									} else {
-										r = obj.error.yns_alert(
-											document.getElementById('circStrings').getFormattedString('staff.circ.checkout.cmd_checkout_submit.non_numeric.msg', [r]),
-											document.getElementById('circStrings').getString('staff.circ.checkout.cmd_checkout_submit.non_numeric.title'),
-											document.getElementById('circStrings').getString('staff.circ.checkout.ok.btn'),
-											null,
-											null,
-											document.getElementById('circStrings').getString('staff.circ.confirm')
-										);
-										return;
-									}
-								} else {
-									return;
-								}
-							}
-							for (var i = 0; i < count; i++) {
-								obj.checkout( params );
-							}
-						}
-					],
-					'cmd_checkout_print' : [
-						['command'],
-						function() {
-							try {
-								obj.print();
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert('cmd_checkout_print',E);
-							}
-
-						}
-					],
-					'cmd_checkout_export' : [
-						['command'],
-						function() {
-							try {
-								obj.export_list();
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert('cmd_checkout_export',E); 
-							}
-						}
-					],
-
-
-					'cmd_checkout_reprint' : [
-						['command'],
-						function() {
-							JSAN.use('util.print'); var print = new util.print();
-							print.reprint_last();
-						}
-					],
-					'cmd_checkout_done' : [
-						['command'],
-						function() {
-							try {
-								if (document.getElementById('checkout_auto').checked) {
-									obj.print(true,function() { 
-										obj.list.clear();
-										xulG.set_tab(urls.XUL_PATRON_BARCODE_ENTRY,{},{}); 
-									});
-								} else {
-									obj.print(false,function() {
-										obj.list.clear();
-										xulG.set_tab(urls.XUL_PATRON_BARCODE_ENTRY,{},{});
-									});
-								}
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert('cmd_checkout_done',E);
-							}
-						}
-					]
-				}
-			}
-		);
-		this.controller.render();
-		//this.controller.view.checkout_barcode_entry_textbox.focus();
-
-		this.check_disable();
-
-		var robj = obj.network.simple_request(
-			'FM_CIRC_COUNT_RETRIEVE_VIA_USER.authoritative',
-			[ ses(), obj.patron_id ]
-		);
-		obj.items_out_count = (robj.out + robj.overdue + robj.claims_returned + robj.long_overdue );
-
-	},
-
-	'check_disable' : function() {
-		var obj = this;
-		try {
-			if (typeof xulG.check_stop_checkouts == 'function') {
-				var disable = xulG.check_stop_checkouts();
-				if (disable) {
-					document.getElementById('checkout_submit_barcode_button').disabled = true;
-					document.getElementById('checkout_done').disabled = true;
-					obj.controller.view.checkout_menu.disabled = true;
-					obj.controller.view.checkout_barcode_entry_textbox.disabled = true;
-				} else {
-					document.getElementById('checkout_submit_barcode_button').disabled = false;
-					document.getElementById('checkout_done').disabled = false;
-					obj.controller.view.checkout_menu.disabled = false;
-					obj.controller.view.checkout_barcode_entry_textbox.disabled = false;
-				}
-			}
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.checkout.disable.error'),E);
-		}
-	},
-
-	'print' : function(silent,f) {
-		var obj = this;
-		try {
-			obj.patron = obj.network.simple_request('FM_AU_FLESHED_RETRIEVE_VIA_ID',[ses(),obj.patron_id]);
+ 'init' : function( params ) {
+
+  var obj = this;
+
+  obj.patron_id = params.patron_id;
+
+  JSAN.use('circ.util');
+  var columns = circ.util.columns( 
+   { 
+    'barcode' : { 'hidden' : false },
+    'title' : { 'hidden' : false },
+    'due_date' : { 'hidden' : false }
+   } 
+  );
+
+  JSAN.use('util.list'); obj.list = new util.list('checkout_list');
+  obj.list.init(
+   {
+    'columns' : columns,
+    'map_row_to_columns' : circ.util.std_map_row_to_columns(),
+    'on_select' : function() {
+     var sel = obj.list.retrieve_selection();
+     document.getElementById('clip_button').disabled = sel.length < 1;
+    }
+   }
+  );
+  
+  JSAN.use('util.controller'); obj.controller = new util.controller();
+  obj.controller.init(
+   {
+    'control_map' : {
+     'save_columns' : [ [ 'command' ], function() { obj.list.save_columns(); } ],
+     'sel_clip' : [
+      ['command'],
+      function() { obj.list.clipboard(); }
+     ],
+     'checkout_menu_placeholder' : [
+      ['render'],
+      function(e) {
+       return function() {
+        JSAN.use('util.widgets'); JSAN.use('util.functional'); JSAN.use('util.fm_utils');
+        var items = [ [ document.getElementById('circStrings').getString('staff.circ.checkout.barcode') , 'barcode' ] ].concat(
+         util.functional.map_list(
+          util.functional.filter_list(
+           obj.data.list.my_cnct,
+           function(o) {
+            return util.fm_utils.compare_aou_a_is_b_or_ancestor(o.owning_lib(), obj.data.list.au[0].ws_ou());
+           }
+          ).sort(
+
+           function(a,b) {
+            try { 
+             return util.fm_utils.sort_func_aou_by_depth_and_then_string(
+              [ a.owning_lib(), a.name() ],
+              [ b.owning_lib(), b.name() ]
+             );
+            } catch(E) {
+             alert(document.getElementById('circStrings').getFormattedString('staff.circ.checkout.sorting.exception', [E]));
+             return 0;
+            }
+           }
+
+          ),
+          function(o) {
+           return [ obj.data.hash.aou[ o.owning_lib() ].shortname() + ' : ' + o.name(), o.id() ];
+          }
+         )
+        );
+        g.error.sdump('D_TRACE','items = ' + js2JSON(items));
+        util.widgets.remove_children( e );
+        var ml = util.widgets.make_menulist(items);
+        e.appendChild( ml );
+        ml.setAttribute('id','checkout_menulist');
+        ml.setAttribute('accesskey','');
+        ml.addEventListener(
+         'command',
+         function(ev) {
+          var tb = obj.controller.view.checkout_barcode_entry_textbox;
+          var db = document.getElementById('duedate_hbox');
+          if (ev.target.value == 'barcode') {
+           db.hidden = false;
+           tb.disabled = false;
+           tb.value = '';
+           tb.focus();
+          } else {
+           db.hidden = true;
+           tb.disabled = true;
+           tb.value = document.getElementById('circStrings').getString('staff.circ.non_cataloged');
+          }
+         }, false
+        );
+        obj.controller.view.checkout_menu = ml;
+       };
+      }
+     ],
+     'checkout_barcode_entry_textbox' : [
+      ['keypress'],
+      function(ev) {
+       if (ev.keyCode && ev.keyCode == 13) {
+        obj.checkout( { barcode: ev.target.value } );
+       }
+      }
+     ],
+     'checkout_duedate_menu' : [
+      ['change'],
+      function(ev) { 
+       try {
+        obj.check_date(ev.target);
+        ev.target.parentNode.setAttribute('style','');
+       } catch(E) {
+        ev.target.parentNode.setAttribute('style','background-color: red');
+        alert(E + '\n' + document.getElementById('circStrings').getString('staff.circ.checkout.date.exception'));
+        try {
+         ev.target.inputField.select();
+         ev.target.inputField.focus();
+        } catch(EX) { /* this should work, let me try on other platforms */ 
+         obj.error.sdump('D_ERROR','menulist.inputField: ' + EX);
+        }
+       }
+      }
+     ],
+     'cmd_broken' : [
+      ['command'],
+      function() { alert(document.getElementById('circStrings').getString('staff.circ.checkout.unimplemented')); }
+     ],
+     'cmd_checkout_submit' : [
+      ['command'],
+      function() {
+       var params = {}; var count = 1;
+
+       if (obj.controller.view.checkout_menu.value == 'barcode' ||
+        obj.controller.view.checkout_menu.value === '') {
+        params.barcode = obj.controller.view.checkout_barcode_entry_textbox.value;
+       } else {
+        params.noncat = 1;
+        params.noncat_type = obj.controller.view.checkout_menu.value;
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
+        var r = window.prompt(
+         document.getElementById('circStrings').getFormattedString('staff.circ.checkout.cmd_checkout_submit.msg', [obj.data.hash.cnct[params.noncat_type].name()]),
+         '1',
+         document.getElementById('circStrings').getString('staff.circ.checkout.cmd_checkout_submit.title')
+        );
+        if (r) {
+         count = Number(r);
+         if (count > 0) {
+          if (count > 99) {
+           obj.error.yns_alert(
+            document.getElementById('circStrings').getFormattedString('staff.circ.checkout.cmd_checkout_submit.too_many.msg', [count, obj.data.hash.cnct[params.noncat_type].name()]),
+            document.getElementById('circStrings').getString('staff.circ.checkout.cmd_checkout_submit.too_many.title'),
+            document.getElementById('circStrings').getString('staff.circ.checkout.ok.btn'),
+            null,
+            null,
+            document.getElementById('circStrings').getString('staff.circ.confirm')
+           );
+           return;
+          } else if (count > 20) {
+           r = obj.error.yns_alert(
+            document.getElementById('circStrings').getFormattedString('staff.circ.checkout.cmd_checkout_submit.confirm.msg', [count, obj.data.hash.cnct[params.noncat_type].name()]),
+            document.getElementById('circStrings').getString('staff.circ.checkout.cmd_checkout_submit.confirm.title'),
+            document.getElementById('circStrings').getString('staff.circ.checkout.yes.btn'),
+            document.getElementById('circStrings').getString('staff.circ.checkout.no.btn'),
+            null,
+            document.getElementById('circStrings').getString('staff.circ.confirm')
+           );
+           if (r !== 0) { return; }
+          }
+         } else {
+          r = obj.error.yns_alert(
+           document.getElementById('circStrings').getFormattedString('staff.circ.checkout.cmd_checkout_submit.non_numeric.msg', [r]),
+           document.getElementById('circStrings').getString('staff.circ.checkout.cmd_checkout_submit.non_numeric.title'),
+           document.getElementById('circStrings').getString('staff.circ.checkout.ok.btn'),
+           null,
+           null,
+           document.getElementById('circStrings').getString('staff.circ.confirm')
+          );
+          return;
+         }
+        } else {
+         return;
+        }
+       }
+       for (var i = 0; i < count; i++) {
+        obj.checkout( params );
+       }
+      }
+     ],
+     'cmd_checkout_print' : [
+      ['command'],
+      function() {
+       try {
+        obj.print();
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert('cmd_checkout_print',E);
+       }
+
+      }
+     ],
+     'cmd_checkout_export' : [
+      ['command'],
+      function() {
+       try {
+        obj.export_list();
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert('cmd_checkout_export',E); 
+       }
+      }
+     ],
+
+
+     'cmd_checkout_reprint' : [
+      ['command'],
+      function() {
+       JSAN.use('util.print'); var print = new util.print();
+       print.reprint_last();
+      }
+     ],
+     'cmd_checkout_done' : [
+      ['command'],
+      function() {
+       try {
+        if (document.getElementById('checkout_auto').checked) {
+         obj.print(true,function() { 
+          obj.list.clear();
+          xulG.set_tab(urls.XUL_PATRON_BARCODE_ENTRY,{},{}); 
+         });
+        } else {
+         obj.print(false,function() {
+          obj.list.clear();
+          xulG.set_tab(urls.XUL_PATRON_BARCODE_ENTRY,{},{});
+         });
+        }
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert('cmd_checkout_done',E);
+       }
+      }
+     ]
+    }
+   }
+  );
+  this.controller.render();
+  //this.controller.view.checkout_barcode_entry_textbox.focus();
+
+  this.check_disable();
+
+  var robj = obj.network.simple_request(
+   'FM_CIRC_COUNT_RETRIEVE_VIA_USER.authoritative',
+   [ ses(), obj.patron_id ]
+  );
+  obj.items_out_count = (robj.out + robj.overdue + robj.claims_returned + robj.long_overdue );
+
+ },
+
+ 'check_disable' : function() {
+  var obj = this;
+  try {
+   if (typeof xulG.check_stop_checkouts == 'function') {
+    var disable = xulG.check_stop_checkouts();
+    if (disable) {
+     document.getElementById('checkout_submit_barcode_button').disabled = true;
+     document.getElementById('checkout_done').disabled = true;
+     obj.controller.view.checkout_menu.disabled = true;
+     obj.controller.view.checkout_barcode_entry_textbox.disabled = true;
+    } else {
+     document.getElementById('checkout_submit_barcode_button').disabled = false;
+     document.getElementById('checkout_done').disabled = false;
+     obj.controller.view.checkout_menu.disabled = false;
+     obj.controller.view.checkout_barcode_entry_textbox.disabled = false;
+    }
+   }
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.checkout.disable.error'),E);
+  }
+ },
+
+ 'print' : function(silent,f) {
+  var obj = this;
+  try {
+   obj.patron = obj.network.simple_request('FM_AU_FLESHED_RETRIEVE_VIA_ID',[ses(),obj.patron_id]);
             var params = { 
                 'patron' : obj.patron, 
                 'lib' : obj.data.hash.aou[ obj.data.list.au[0].ws_ou() ],
@@ -308,612 +308,612 @@ circ.checkout.prototype = {
                     );
                 }
             };
-			if (silent) { params.no_prompt = true; }
-			obj.list.print(params);
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert('print',E);
-		}
-	},
-	
-	'export_list' : function(silent,f) {
-		var obj = this;
-		try {
-			obj.list.dump_csv_to_clipboard();
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert('export',E);
-		}
-	},
-
-	'check_date' : function(node) {
-		JSAN.use('util.date');
-		try {
-			if (node.value == 'Normal') { return true; }
-			var pattern = node.value.match(/Today \+ (\d+) days/);
-			if (pattern) {
-				var today = new Date();
-				var todayPlus = new Date(); todayPlus.setTime( today.getTime() + 24*60*60*1000*pattern[1] );
-				node.value = util.date.formatted_date(todayPlus,"%F");
-			}
-			if (! util.date.check('YYYY-MM-DD',node.value) ) { 
-				throw(document.getElementById('circStrings').getString('staff.circ.invalid_date'));
-			}
-			if (util.date.check_past('YYYY-MM-DD',node.value) ) {
-				throw(document.getElementById('circStrings').getString('staff.circ.checkout.date.too_early.error'));
-			}
-			if ( util.date.formatted_date(new Date(),'%F') == node.value) {
-				throw(document.getElementById('circStrings').getString('staff.circ.checkout.date.too_early.error'));
-			}
-			return true;
-		} catch(E) {
-			throw(E);
-		}
-	},
-
-	'_checkout_pending_hash' : {},
-
-	'_checkout' : function(params,permit) {
-		var obj = this;
-		try {
-		
-			/**********************************************************************************************************************/
-			/* This handles the return value of the checkout/renewal */
-			function _checkout_callback(req,x) {
-				try {
-
-					if (params.barcode) { 
-						delete obj._checkout_pending_hash[ params.barcode ];
-					}
-
-					var checkout = req.getResultObject();
-
-					if (checkout.ilsevent === '0') {
-		
-						if (!checkout.payload) { checkout.payload = {}; }
-		
-						if (!checkout.payload.circ) {
-							checkout.payload.circ = new aoc();
-							/*********************************************************************************************/
-							/* Non Cat */
-							if (checkout.payload.noncat_circ) {
-								checkout.payload.circ.circ_lib( checkout.payload.noncat_circ.circ_lib() );
-								checkout.payload.circ.circ_staff( checkout.payload.noncat_circ.staff() );
-								checkout.payload.circ.usr( checkout.payload.noncat_circ.patron() );
-						
-								JSAN.use('util.date');
-								var c = checkout.payload.noncat_circ.circ_time();
-								var d = c == "now" ? new Date() : util.date.db_date2Date( c );
-								var t =obj.data.hash.cnct[ checkout.payload.noncat_circ.item_type() ];
-								var cd = t.circ_duration() || "14 days";
-								var i = util.date.interval_to_seconds( cd ) * 1000;
-								d.setTime( Date.parse(d) + i );
-								checkout.payload.circ.due_date( util.date.formatted_date(d,'%F') );
-			
-							}
-						}
-	
-						if (!checkout.payload.record) {
-							checkout.payload.record = new mvr();
-							/*********************************************************************************************/
-							/* Non Cat */
-							if (checkout.payload.noncat_circ) {
-								checkout.payload.record.title(
-									obj.data.hash.cnct[ checkout.payload.noncat_circ.item_type() ].name()
-								);
-							}
-						}
-			
-						if (!checkout.payload.copy) {
-							checkout.payload.copy = new acp();
-							checkout.payload.copy.barcode( '' );
-						}
-			
-						/*********************************************************************************************/
-						/* Override mvr title/author with dummy title/author for Pre cat */
-						if (checkout.payload.copy.dummy_title()) {
-							checkout.payload.record.title( checkout.payload.copy.dummy_title() );
-						}
-						if (checkout.payload.copy.dummy_author()) {
-							checkout.payload.record.author( checkout.payload.copy.dummy_author() );
-						}
-			
-						obj.list.append(
-							{
-								'row' : {
-									'my' : {
-									'circ' : checkout.payload.circ,
-									'mvr' : checkout.payload.record,
-									'acp' : checkout.payload.copy
-									}
-								},
-								'to_top' : true
-							//I could override map_row_to_column here
-							}
-						);
-						document.getElementById('msg_area').removeChild(x);
-						/*
-						if (typeof obj.on_checkout == 'function') {
-							obj.on_checkout(checkout.payload);
-						}
-						*/
-						if (typeof window.xulG == 'object' && typeof window.xulG.on_list_change == 'function') {
-							window.xulG.on_list_change(checkout.payload);
-						} else {
-							obj.error.sdump('D_CIRC','circ.checkout: No external .on_checkout()\n');
-						}
-		
-					} else {
-						throw(checkout);
-					}
-		
-				} catch(E) {
-					x.setAttribute('style','color: red');
-					x.setAttribute('value', document.getElementById('circStrings').getFormattedString('staff.circ.checkout.barcode.failed', [params.barcode]));
-					if (typeof params.noncat == 'undefined') { obj.items_out_count--; }
-					obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getFormattedString('staff.circ.checkout.barcode.failed.alert', ['#3']),E);
-				}
-			}
-
-			/**********************************************************************************************************************/
-			/* This used to do the actual checkout/renewal */
-		
-			var x = document.createElement('label');
-			x.setAttribute('style','color: green');
-			if (params.barcode) {
-				x.setAttribute('value',document.getElementById('circStrings').getFormattedString('staff.circ.checkout.barcode.pending', [params.barcode]));
-			} else {
-				x.setAttribute('value',document.getElementById('circStrings').getString('staff.circ.checkout.non_cataloged.pending'));
-			}
-			document.getElementById('msg_area').appendChild(x);
+   if (silent) { params.no_prompt = true; }
+   obj.list.print(params);
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert('print',E);
+  }
+ },
+ 
+ 'export_list' : function(silent,f) {
+  var obj = this;
+  try {
+   obj.list.dump_csv_to_clipboard();
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert('export',E);
+  }
+ },
+
+ 'check_date' : function(node) {
+  JSAN.use('util.date');
+  try {
+   if (node.value == 'Normal') { return true; }
+   var pattern = node.value.match(/Today \+ (\d+) days/);
+   if (pattern) {
+    var today = new Date();
+    var todayPlus = new Date(); todayPlus.setTime( today.getTime() + 24*60*60*1000*pattern[1] );
+    node.value = util.date.formatted_date(todayPlus,"%F");
+   }
+   if (! util.date.check('YYYY-MM-DD',node.value) ) { 
+    throw(document.getElementById('circStrings').getString('staff.circ.invalid_date'));
+   }
+   if (util.date.check_past('YYYY-MM-DD',node.value) ) {
+    throw(document.getElementById('circStrings').getString('staff.circ.checkout.date.too_early.error'));
+   }
+   if ( util.date.formatted_date(new Date(),'%F') == node.value) {
+    throw(document.getElementById('circStrings').getString('staff.circ.checkout.date.too_early.error'));
+   }
+   return true;
+  } catch(E) {
+   throw(E);
+  }
+ },
+
+ '_checkout_pending_hash' : {},
+
+ '_checkout' : function(params,permit) {
+  var obj = this;
+  try {
+  
+   /**********************************************************************************************************************/
+   /* This handles the return value of the checkout/renewal */
+   function _checkout_callback(req,x) {
+    try {
+
+     if (params.barcode) { 
+      delete obj._checkout_pending_hash[ params.barcode ];
+     }
+
+     var checkout = req.getResultObject();
+
+     if (checkout.ilsevent === '0') {
+  
+      if (!checkout.payload) { checkout.payload = {}; }
+  
+      if (!checkout.payload.circ) {
+       checkout.payload.circ = new aoc();
+       /*********************************************************************************************/
+       /* Non Cat */
+       if (checkout.payload.noncat_circ) {
+        checkout.payload.circ.circ_lib( checkout.payload.noncat_circ.circ_lib() );
+        checkout.payload.circ.circ_staff( checkout.payload.noncat_circ.staff() );
+        checkout.payload.circ.usr( checkout.payload.noncat_circ.patron() );
+      
+        JSAN.use('util.date');
+        var c = checkout.payload.noncat_circ.circ_time();
+        var d = c == "now" ? new Date() : util.date.db_date2Date( c );
+        var t =obj.data.hash.cnct[ checkout.payload.noncat_circ.item_type() ];
+        var cd = t.circ_duration() || "14 days";
+        var i = util.date.interval_to_seconds( cd ) * 1000;
+        d.setTime( Date.parse(d) + i );
+        checkout.payload.circ.due_date( util.date.formatted_date(d,'%F') );
+   
+       }
+      }
+ 
+      if (!checkout.payload.record) {
+       checkout.payload.record = new mvr();
+       /*********************************************************************************************/
+       /* Non Cat */
+       if (checkout.payload.noncat_circ) {
+        checkout.payload.record.title(
+         obj.data.hash.cnct[ checkout.payload.noncat_circ.item_type() ].name()
+        );
+       }
+      }
+   
+      if (!checkout.payload.copy) {
+       checkout.payload.copy = new acp();
+       checkout.payload.copy.barcode( '' );
+      }
+   
+      /*********************************************************************************************/
+      /* Override mvr title/author with dummy title/author for Pre cat */
+      if (checkout.payload.copy.dummy_title()) {
+       checkout.payload.record.title( checkout.payload.copy.dummy_title() );
+      }
+      if (checkout.payload.copy.dummy_author()) {
+       checkout.payload.record.author( checkout.payload.copy.dummy_author() );
+      }
+   
+      obj.list.append(
+       {
+        'row' : {
+         'my' : {
+         'circ' : checkout.payload.circ,
+         'mvr' : checkout.payload.record,
+         'acp' : checkout.payload.copy
+         }
+        },
+        'to_top' : true
+       //I could override map_row_to_column here
+       }
+      );
+      document.getElementById('msg_area').removeChild(x);
+      /*
+      if (typeof obj.on_checkout == 'function') {
+       obj.on_checkout(checkout.payload);
+      }
+      */
+      if (typeof window.xulG == 'object' && typeof window.xulG.on_list_change == 'function') {
+       window.xulG.on_list_change(checkout.payload);
+      } else {
+       obj.error.sdump('D_CIRC','circ.checkout: No external .on_checkout()\n');
+      }
+  
+     } else {
+      throw(checkout);
+     }
+  
+    } catch(E) {
+     x.setAttribute('style','color: red');
+     x.setAttribute('value', document.getElementById('circStrings').getFormattedString('staff.circ.checkout.barcode.failed', [params.barcode]));
+     if (typeof params.noncat == 'undefined') { obj.items_out_count--; }
+     obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getFormattedString('staff.circ.checkout.barcode.failed.alert', ['#3']),E);
+    }
+   }
+
+   /**********************************************************************************************************************/
+   /* This used to do the actual checkout/renewal */
+  
+   var x = document.createElement('label');
+   x.setAttribute('style','color: green');
+   if (params.barcode) {
+    x.setAttribute('value',document.getElementById('circStrings').getFormattedString('staff.circ.checkout.barcode.pending', [params.barcode]));
+   } else {
+    x.setAttribute('value',document.getElementById('circStrings').getString('staff.circ.checkout.non_cataloged.pending'));
+   }
+   document.getElementById('msg_area').appendChild(x);
 
             /*
-			obj.network.request(
-				api.CHECKOUT.app,
-				api.CHECKOUT.method,
-				[ ses(), params, obj.items_out_count ],
-				function(req) {
-					_checkout_callback(req,x);
-				}
-			);
+   obj.network.request(
+    api.CHECKOUT.app,
+    api.CHECKOUT.method,
+    [ ses(), params, obj.items_out_count ],
+    function(req) {
+     _checkout_callback(req,x);
+    }
+   );
             */
-			
-			if (typeof params.noncat == 'undefined') { obj.items_out_count++; }
+   
+   if (typeof params.noncat == 'undefined') { obj.items_out_count++; }
            
            /* new */
             _checkout_callback({ 'getResultObject' : function() { return permit; } },x);
 
-		} catch(E) {
-			x.setAttribute('style','color: red');
-			x.setAttribute('value', document.getElementById('circStrings').getFormattedString('staff.circ.checkout.barcode.failed', [params.barcode]));
-			if (typeof params.noncat == 'undefined') { obj.items_out_count--; }
-			obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getFormattedString('staff.circ.checkout.barcode.failed.alert', ['#2']),E);
-		}
-	},
-
-
-	'test_barcode' : function(bc) {
-		var obj = this;
-		var x = document.getElementById('strict_barcode');
-		if (x && x.checked !== true) { return true; }
-		var good = util.barcode.check(bc);
-		if (good) {
-			return true;
-		} else {
-			if ( 1 == obj.error.yns_alert(
-						document.getElementById('circStrings').getFormattedString('staff.circ.check_digit.bad', [bc]),
-						document.getElementById('circStrings').getString('staff.circ.barcode.bad'),
-						document.getElementById('circStrings').getString('staff.circ.cancel'),
-						document.getElementById('circStrings').getString('staff.circ.barcode.accept'),
-						null,
-						document.getElementById('circStrings').getString('staff.circ.confirm'),
-						'/xul/server/skin/media/images/bad_barcode.png'
-				)
-			) {
-				return true;
-			} else {
-				return false;
-			}
-		}
-	},
-
-	'checkout' : function(params) {
-		var obj = this;
-
-		try { obj.check_date(obj.controller.view.checkout_duedate_menu); } catch(E) { return; }
-		if (obj.controller.view.checkout_duedate_menu.value != 'Normal') {
-			params.due_date = obj.controller.view.checkout_duedate_menu.value;
-		}
-
-		if (typeof obj.on_checkout == 'function') { obj.on_checkout(params); }
-
-		if (! (params.barcode||params.noncat)) { return; }
-
-		if (params.barcode) {
-
-			if ( obj.test_barcode(params.barcode) ) { /* good */ } else { /* bad */ return; }
-
-			if (typeof obj._checkout_pending_hash[ params.barcode ] != 'undefined') {
-
-				obj.error.sdump('D_CIRC','Redundant barcode scan == ' + params.barcode);
-				return; // redundant barcode scan
-
-			} else {
-
-				obj._checkout_pending_hash[ params.barcode ] = true;	
-
-			}
-		}
-
-
-		/**********************************************************************************************************************/
-		/* This used to be the Permissibility test before checkout */
-		try {
-
-			params.patron = obj.patron_id;
-
-			var permit = obj.network.simple_request(
-				//api.CHECKOUT_PERMIT.app,
-				'CHECKOUT_FULL',
-				[ ses(), params, obj.items_out_count ],
-				null,
-				{
-					'title' : document.getElementById('circStrings').getString('staff.circ.checkout.override.confirm'),
-					'overridable_events' : [ 
+  } catch(E) {
+   x.setAttribute('style','color: red');
+   x.setAttribute('value', document.getElementById('circStrings').getFormattedString('staff.circ.checkout.barcode.failed', [params.barcode]));
+   if (typeof params.noncat == 'undefined') { obj.items_out_count--; }
+   obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getFormattedString('staff.circ.checkout.barcode.failed.alert', ['#2']),E);
+  }
+ },
+
+
+ 'test_barcode' : function(bc) {
+  var obj = this;
+  var x = document.getElementById('strict_barcode');
+  if (x && x.checked !== true) { return true; }
+  var good = util.barcode.check(bc);
+  if (good) {
+   return true;
+  } else {
+   if ( 1 == obj.error.yns_alert(
+      document.getElementById('circStrings').getFormattedString('staff.circ.check_digit.bad', [bc]),
+      document.getElementById('circStrings').getString('staff.circ.barcode.bad'),
+      document.getElementById('circStrings').getString('staff.circ.cancel'),
+      document.getElementById('circStrings').getString('staff.circ.barcode.accept'),
+      null,
+      document.getElementById('circStrings').getString('staff.circ.confirm'),
+      '/xul/server/skin/media/images/bad_barcode.png'
+    )
+   ) {
+    return true;
+   } else {
+    return false;
+   }
+  }
+ },
+
+ 'checkout' : function(params) {
+  var obj = this;
+
+  try { obj.check_date(obj.controller.view.checkout_duedate_menu); } catch(E) { return; }
+  if (obj.controller.view.checkout_duedate_menu.value != 'Normal') {
+   params.due_date = obj.controller.view.checkout_duedate_menu.value;
+  }
+
+  if (typeof obj.on_checkout == 'function') { obj.on_checkout(params); }
+
+  if (! (params.barcode||params.noncat)) { return; }
+
+  if (params.barcode) {
+
+   if ( obj.test_barcode(params.barcode) ) { /* good */ } else { /* bad */ return; }
+
+   if (typeof obj._checkout_pending_hash[ params.barcode ] != 'undefined') {
+
+    obj.error.sdump('D_CIRC','Redundant barcode scan == ' + params.barcode);
+    return; // redundant barcode scan
+
+   } else {
+
+    obj._checkout_pending_hash[ params.barcode ] = true; 
+
+   }
+  }
+
+
+  /**********************************************************************************************************************/
+  /* This used to be the Permissibility test before checkout */
+  try {
+
+   params.patron = obj.patron_id;
+
+   var permit = obj.network.simple_request(
+    //api.CHECKOUT_PERMIT.app,
+    'CHECKOUT_FULL',
+    [ ses(), params, obj.items_out_count ],
+    null,
+    {
+     'title' : document.getElementById('circStrings').getString('staff.circ.checkout.override.confirm'),
+     'overridable_events' : [ 
                         null /* custom event */,
-						1212 /* PATRON_EXCEEDS_OVERDUE_COUNT */,
-						1213 /* PATRON_BARRED */,
-						1215 /* CIRC_EXCEEDS_COPY_RANGE */,
+      1212 /* PATRON_EXCEEDS_OVERDUE_COUNT */,
+      1213 /* PATRON_BARRED */,
+      1215 /* CIRC_EXCEEDS_COPY_RANGE */,
                         1232 /* ITEM_DEPOSIT_REQUIRED */,
                         1233 /* ITEM_RENTAL_FEE_REQUIRED */,
-						7002 /* PATRON_EXCEEDS_CHECKOUT_COUNT */,
-						7003 /* COPY_CIRC_NOT_ALLOWED */,
-						7004 /* COPY_NOT_AVAILABLE */, 
-						7006 /* COPY_IS_REFERENCE */, 
-						7010 /* COPY_ALERT_MESSAGE */,
-						7016 /* ITEM_ON_HOLDS_SHELF */,
-						7013 /* PATRON_EXCEEDS_FINES */
-					],
-					'text' : {
+      7002 /* PATRON_EXCEEDS_CHECKOUT_COUNT */,
+      7003 /* COPY_CIRC_NOT_ALLOWED */,
+      7004 /* COPY_NOT_AVAILABLE */, 
+      7006 /* COPY_IS_REFERENCE */, 
+      7010 /* COPY_ALERT_MESSAGE */,
+      7016 /* ITEM_ON_HOLDS_SHELF */,
+      7013 /* PATRON_EXCEEDS_FINES */
+     ],
+     'text' : {
                         '1232' : function(r) {
                             return document.getElementById('circStrings').getString('staff.circ.checkout.override.item_deposit_required.warning');
                         },
                         '1233' : function(r) {
                             return document.getElementById('circStrings').getString('staff.circ.checkout.override.item_rental_fee_required.warning');
                         },
-						'7004' : function(r) {
-							return r.payload.status().name();
-						},
-						'7010' : function(r) {
-							return r.payload;
-						}
-					}
-				}
-			);
-
-			if (!permit) { throw(permit); }
-
-			function test_event(list,ev) {
-				if (typeof list.ilsevent != 'undefined' ) {
-					if (list.ilsevent == ev) {
-						return list;
-					} else {
-						return false;
-					}
-				} else {
-					for (var i = 0; i < list.length; i++) {
-						if (typeof list[i].ilsevent != 'undefined') {
-							if (list[i].ilsevent == ev) { return list[i]; }
-						}
-					}
-					return false;
-				}
-			}
-
-			/**********************************************************************************************************************/
-			/* Normal case, proceed with checkout */
-			if (permit.ilsevent === '0') {
-
-				JSAN.use('util.sound'); var sound = new util.sound(); sound.circ_good();
-				params.permit_key = permit.payload;
-				obj._checkout( params, permit ); 
-
-			/**********************************************************************************************************************/
-			/* Item not cataloged or barcode mis-scan.  Prompt for pre-cat option */
-			} else {
-			
-				if (params.barcode) { delete obj._checkout_pending_hash[ params.barcode ];	}
-
-				var found_handled = false; var found_not_handled = false; var msg = '';	
-
-				if (test_event(permit,1202 /* ITEM_NOT_CATALOGED */)) {
-
-					if ( 1 == obj.error.yns_alert(
-						document.getElementById('circStrings').getString('staff.circ.checkout.not_cataloged.confirm'),
-						document.getElementById('circStrings').getString('staff.circ.alert'),
-						document.getElementById('circStrings').getString('staff.circ.cancel'),
-						document.getElementById('circStrings').getString('staff.circ.pre_cataloged'),
-						null,
-						document.getElementById('circStrings').getString('staff.circ.confirm'),
-						'/xul/server/skin/media/images/book_question.png'
-					) ) {
-
-						obj.data.dummy_title = ''; obj.data.dummy_author = ''; obj.data.stash('dummy_title','dummy_author');
-						JSAN.use('util.window'); var win = new util.window();
-						win.open(urls.XUL_PRE_CAT, 'dummy_fields', 'chrome,resizable,modal');
-						obj.data.stash_retrieve();
-
-						params.permit_key = permit.payload;
-						params.dummy_title = obj.data.dummy_title;
-						params.dummy_author = obj.data.dummy_author;
-						params.precat = 1;
-
-						if (params.dummy_title !== '') { 
-							//obj._checkout( params ); No real request method here anymore
-							obj.checkout( params );
-						} else {
-							alert(document.getElementById('circStrings').getString('staff.circ.checkout.cancelled'));
-						}
-					}
+      '7004' : function(r) {
+       return r.payload.status().name();
+      },
+      '7010' : function(r) {
+       return r.payload;
+      }
+     }
+    }
+   );
+
+   if (!permit) { throw(permit); }
+
+   function test_event(list,ev) {
+    if (typeof list.ilsevent != 'undefined' ) {
+     if (list.ilsevent == ev) {
+      return list;
+     } else {
+      return false;
+     }
+    } else {
+     for (var i = 0; i < list.length; i++) {
+      if (typeof list[i].ilsevent != 'undefined') {
+       if (list[i].ilsevent == ev) { return list[i]; }
+      }
+     }
+     return false;
+    }
+   }
+
+   /**********************************************************************************************************************/
+   /* Normal case, proceed with checkout */
+   if (permit.ilsevent === '0') {
+
+    JSAN.use('util.sound'); var sound = new util.sound(); sound.circ_good();
+    params.permit_key = permit.payload;
+    obj._checkout( params, permit ); 
+
+   /**********************************************************************************************************************/
+   /* Item not cataloged or barcode mis-scan.  Prompt for pre-cat option */
+   } else {
+   
+    if (params.barcode) { delete obj._checkout_pending_hash[ params.barcode ]; }
+
+    var found_handled = false; var found_not_handled = false; var msg = ''; 
+
+    if (test_event(permit,1202 /* ITEM_NOT_CATALOGED */)) {
+
+     if ( 1 == obj.error.yns_alert(
+      document.getElementById('circStrings').getString('staff.circ.checkout.not_cataloged.confirm'),
+      document.getElementById('circStrings').getString('staff.circ.alert'),
+      document.getElementById('circStrings').getString('staff.circ.cancel'),
+      document.getElementById('circStrings').getString('staff.circ.pre_cataloged'),
+      null,
+      document.getElementById('circStrings').getString('staff.circ.confirm'),
+      '/xul/server/skin/media/images/book_question.png'
+     ) ) {
+
+      obj.data.dummy_title = ''; obj.data.dummy_author = ''; obj.data.stash('dummy_title','dummy_author');
+      JSAN.use('util.window'); var win = new util.window();
+      win.open(urls.XUL_PRE_CAT, 'dummy_fields', 'chrome,resizable,modal');
+      obj.data.stash_retrieve();
+
+      params.permit_key = permit.payload;
+      params.dummy_title = obj.data.dummy_title;
+      params.dummy_author = obj.data.dummy_author;
+      params.precat = 1;
+
+      if (params.dummy_title !== '') { 
+       //obj._checkout( params ); No real request method here anymore
+       obj.checkout( params );
+      } else {
+       alert(document.getElementById('circStrings').getString('staff.circ.checkout.cancelled'));
+      }
+     }
 
                     return;
-				}
-
-				var test_permit;
-				if (typeof permit.ilsevent != 'undefined') { test_permit = [ permit ]; } else { test_permit = permit; }
-
-				var stop_checkout = false;
-				for (var i = 0; i < test_permit.length; i++) {
-					switch(Number(test_permit[i].ilsevent)) {
-						case 1216 /* PATRON_CARD_INACTIVE */ :
-						case 1217 /* PATRON_INACTIVE */ :
-						case 1224 /* PATRON_ACCOUNT_EXPIRED */ :
-							stop_checkout = true;
-						break;
-					}
-				}
-
-				for (var i = 0; i < test_permit.length; i++) {
-					dump('found [' + test_permit[i].ilsevent + ']\n');
-					switch(test_permit[i].ilsevent == null ? null : Number(test_permit[i].ilsevent)) {
-						case null /* custom event */ :
-							found_handled = true;
-						break;
-						case 1212 /* PATRON_EXCEEDS_OVERDUE_COUNT */ :
-							found_handled = true;
-						break;
-						case 1213 /* PATRON_BARRED */ :
-							found_handled = true;
-						break;
-						case 1215 /* CIRC_EXCEEDS_COPY_RANGE */ :
-							found_handled = true;
-						break;
-						case 1216 /* PATRON_CARD_INACTIVE */ :
-							found_handled = true;
-							msg += document.getElementById('circStrings').getString('staff.circ.checkout.card.inactive') + '\n';
-							obj.error.yns_alert(
-								msg,
-								document.getElementById('circStrings').getString('staff.circ.checkout.barcode.check_out_failed'),
-								document.getElementById('circStrings').getString('staff.circ.checkout.ok.btn'),
-								null,
-								null,
-								document.getElementById('circStrings').getString('staff.circ.confirm.msg')
-							);
-						break;
-						case 1217 /* PATRON_INACTIVE */ :
-							found_handled = true;
-							msg += document.getElementById('circStrings').getString('staff.circ.checkout.account.inactive') + '\n';
-							obj.error.yns_alert(
-								msg,
-								document.getElementById('circStrings').getString('staff.circ.checkout.barcode.check_out_failed'),
-								document.getElementById('circStrings').getString('staff.circ.checkout.ok.btn'),
-								null,
-								null,
-								document.getElementById('circStrings').getString('staff.circ.confirm.msg')
-							);
-						break;
-						case 1224 /* PATRON_ACCOUNT_EXPIRED */ :
-							found_handled = true;
-							msg += document.getElementById('circStrings').getString('staff.circ.checkout.account.expired') + '\n';
-							obj.error.yns_alert(
-								msg,
-								document.getElementById('circStrings').getString('staff.circ.checkout.barcode.check_out_failed'),
-								document.getElementById('circStrings').getString('staff.circ.checkout.ok.btn'),
-								null,
-								null,
-								document.getElementById('circStrings').getString('staff.circ.confirm.msg')
-							);
-						break;
-						case 1232 /* ITEM_DEPOSIT_REQUIRED */ :
-						case 1233 /* ITEM_RENTAL_FEE_REQUIRED */ :
-						case 7013 /* PATRON_EXCEEDS_FINES */ :
-							found_handled = true;
-						break;
-						case 7002 /* PATRON_EXCEEDS_CHECKOUT_COUNT */ :
-							found_handled = true;
-						break;
-						case 7003 /* COPY_CIRC_NOT_ALLOWED */ :
-							found_handled = true;
-						break;
-						case 7004 /* COPY_NOT_AVAILABLE */ :
-							msg += test_permit[i].desc + '\n' + document.getElementById('circStrings').getFormattedString('staff.circ.checkout.copy_status', [test_permit[i].payload.status().name()]) + '\n';
-							found_handled = true;
-						break;
-						case 7006 /* COPY_IS_REFERENCE */ :
-							msg += test_permit[i].desc + '\n';
-							found_handled = true;
-						break;
-						case 7009 /* CIRC_CLAIMS_RETURNED */ :
-							msg += test_permit[i].desc + '\n';
-							obj.error.yns_alert(
-								msg,
-								document.getElementById('circStrings').getString('staff.circ.checkout.barcode.check_out_failed'),
-								document.getElementById('circStrings').getString('staff.circ.checkout.ok.btn'),
-								null,
-								null,
-								document.getElementById('circStrings').getString('staff.circ.confirm.msg')
-							);
-							found_handled = true;
-						break;
-						case 7010 /* COPY_ALERT_MESSAGE */ :
-							msg += test_permit[i].desc + '\n' + document.getElementById('circStrings').getFormattedString('staff.circ.checkout.alert_message', [test_permit[i].payload]) + '\n';
-							found_handled = true;
-						break;
-						case 7016 /* ITEM_ON_HOLDS_SHELF */ :
-							msg += test_permit[i].desc + '\n';
-							found_handled = true;
-						break;
-						case 1202 /* ITEM_NOT_CATALOGED */ :
-							found_handled = true;
-						break;
-						case 5000 /* PERM_FAILURE */ :
-							msg += test_permit[i].desc + '\n' + document.getElementById('circStrings').getFormattedString('staff.circ.checkout.permission_denied', [test_permit[i].ilsperm]) + '\n';
-							found_handled = true;
-						break;
-						case 1702 /* OPEN_CIRCULATION_EXISTS */ :
-							msg += test_permit[i].desc + '\n';
-							found_handled = true;
-
-							var my_copy = obj.network.simple_request('FM_ACP_RETRIEVE_VIA_BARCODE',[params.barcode]);
-							if (typeof my_copy.ilsevent != 'undefined') { throw(my_copy); }
-							var my_circ = obj.network.simple_request('FM_CIRC_RETRIEVE_VIA_COPY',[ses(),my_copy.id(),1]);
-							if (typeof my_circ.ilsevent != 'undefined') { throw(my_copy); }
-							my_circ = my_circ[0];
-							var due_date = my_circ.due_date() ? my_circ.due_date().substr(0,10) : null;
-							JSAN.use('util.date'); var today = util.date.formatted_date(new Date(),'%F');
-							if (due_date) {
-								if (today > due_date) {
-									msg += (document.getElementById('circStrings').getFormattedString('staff.circ.checkout.item_due', [due_date]) + '\n');
-								}
-							}
-							if (! stop_checkout ) {
-								var r = obj.error.yns_alert(
-									msg,
-									document.getElementById('circStrings').getString('staff.circ.checkout.barcode.check_out_failed'),
-									document.getElementById('circStrings').getString('staff.circ.cancel'),
-									document.getElementById('circStrings').getString('staff.circ.checkout.normal_checkin_then_checkout'),
-									due_date ? (today > due_date ? document.getElementById('circStrings').getString('staff.circ.checkout.forgiving_checkin_then_checkout') : null) : null,
-									document.getElementById('circStrings').getString('staff.circ.confirm.msg')
-								);
-								JSAN.use('circ.util');
-								switch(r) {
-									case 1:
-										circ.util.checkin_via_barcode( ses(), { 'barcode' : params.barcode, 'noop' : 1 } );
-										obj.checkout(params);
-									break;
-									case 2:
-										circ.util.checkin_via_barcode( ses(), { 'barcode' : params.barcode, 'noop' : 1 }, due_date );
-										obj.checkout(params);
-									break;
-								}
-							} else {
-								obj.error.yns_alert(
-									msg,
-									document.getElementById('circStrings').getString('staff.circ.checkout.barcode.check_out_failed'),
-									document.getElementById('circStrings').getString('staff.circ.checkout.ok.btn'),
-									null,
-									null,
-									document.getElementById('circStrings').getString('staff.circ.confirm.msg')
-								);
-							}
-						break;
-						case 7014 /* COPY_IN_TRANSIT */ :
-							msg += test_permit[i].desc + '\n';
-							found_handled = true;
-							if (! stop_checkout ) {
-								var r = obj.error.yns_alert(
-									msg,
-									document.getElementById('circStrings').getString('staff.circ.checkout.barcode.check_out_failed'),
-									document.getElementById('circStrings').getString('staff.circ.cancel'),
-									document.getElementById('circStrings').getString('staff.circ.checkout.abort_transit_then_checkout'),
-									null,
-									document.getElementById('circStrings').getString('staff.circ.confirm.msg')
-								);
-								if (r == 1) {
-									var robj = obj.network.simple_request('FM_ATC_VOID',[ ses(), { 'barcode' : params.barcode } ]);
-									if (typeof robj.ilsevent == 'undefined') {
-										obj.checkout(params);
-									} else {
-										switch(robj.ilsevent) {
-											case 1225 /* TRANSIT_ABORT_NOT_ALLOWED */ :
-												alert(robj.desc);
-											break;
-											case 5000 /* PERM_FAILURE */ :
-											break;
-											default:
-												throw(robj);
-											break;
-										}
-									}
-								}
-							} else {
-								obj.error.yns_alert(
-									msg,
-									document.getElementById('circStrings').getString('staff.circ.checkout.barcode.check_out_failed'),
-									document.getElementById('circStrings').getString('staff.circ.checkout.ok.btn'),
-									null,
-									null,
-									document.getElementById('circStrings').getString('staff.circ.confirm.msg')
-								);
-							}
-						break;
-						case -1 /* NETWORK_FAILURE */ :
-							msg += document.getElementById('circStrings').getString('staff.circ.checkout.network_failure') + '\n';
-							found_handled = true;
-							obj.error.yns_alert(
-								msg,
-								document.getElementById('circStrings').getString('staff.circ.checkout.barcode.check_out_failed'),
-								document.getElementById('circStrings').getString('staff.circ.checkout.ok.btn'),
-								null,
-								null,
-								document.getElementById('circStrings').getString('staff.circ.confirm.msg')
-							);
-						break;
-						default:
-							msg += 'FIXME: ' + js2JSON(test_permit[i]) + '\n';
-							found_not_handled = true;
-						break;
-					}
-				}
-				
-				if (found_not_handled) {
-					obj.error.standard_unexpected_error_alert(msg,permit);
-				}
-
-				obj.controller.view.checkout_barcode_entry_textbox.select();
-				obj.controller.view.checkout_barcode_entry_textbox.focus();
-			}
-
-		} catch(E) {
-			if (params.barcode) { delete obj._checkout_pending_hash[ params.barcode ];	}
-			if (typeof E.ilsevent != 'undefined' && E.ilsevent == -1) {
-				obj.error.standard_network_error_alert(document.getElementById('circStrings').getString('staff.circ.checkout.suggest_offline'));
-			} else {
-				obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.checkout.barcode.check_out_failed'),E);
-			}
-			if (typeof obj.on_failure == 'function') {
-				obj.on_failure(E);
-			}
-			if (typeof window.xulG == 'object' && typeof window.xulG.on_failure == 'function') {
-				obj.error.sdump('D_CIRC','circ.checkout: Calling external .on_failure()\n');
-				window.xulG.on_failure(E);
-			} else {
-				obj.error.sdump('D_CIRC','circ.checkout: No external .on_failure()\n');
-			}
-		}
-
-	},
-
-	'on_checkout' : function() {
-		this.controller.view.checkout_menu.selectedIndex = 0;
-		this.controller.view.checkout_barcode_entry_textbox.disabled = false;
-		this.controller.view.checkout_barcode_entry_textbox.value = '';
-		this.controller.view.checkout_barcode_entry_textbox.focus();
-		document.getElementById('duedate_hbox').hidden = false;
-	},
-
-	'on_failure' : function() {
-		this.controller.view.checkout_barcode_entry_textbox.select();
-		this.controller.view.checkout_barcode_entry_textbox.focus();
-	}
+    }
+
+    var test_permit;
+    if (typeof permit.ilsevent != 'undefined') { test_permit = [ permit ]; } else { test_permit = permit; }
+
+    var stop_checkout = false;
+    for (var i = 0; i < test_permit.length; i++) {
+     switch(Number(test_permit[i].ilsevent)) {
+      case 1216 /* PATRON_CARD_INACTIVE */ :
+      case 1217 /* PATRON_INACTIVE */ :
+      case 1224 /* PATRON_ACCOUNT_EXPIRED */ :
+       stop_checkout = true;
+      break;
+     }
+    }
+
+    for (var i = 0; i < test_permit.length; i++) {
+     dump('found [' + test_permit[i].ilsevent + ']\n');
+     switch(test_permit[i].ilsevent == null ? null : Number(test_permit[i].ilsevent)) {
+      case null /* custom event */ :
+       found_handled = true;
+      break;
+      case 1212 /* PATRON_EXCEEDS_OVERDUE_COUNT */ :
+       found_handled = true;
+      break;
+      case 1213 /* PATRON_BARRED */ :
+       found_handled = true;
+      break;
+      case 1215 /* CIRC_EXCEEDS_COPY_RANGE */ :
+       found_handled = true;
+      break;
+      case 1216 /* PATRON_CARD_INACTIVE */ :
+       found_handled = true;
+       msg += document.getElementById('circStrings').getString('staff.circ.checkout.card.inactive') + '\n';
+       obj.error.yns_alert(
+        msg,
+        document.getElementById('circStrings').getString('staff.circ.checkout.barcode.check_out_failed'),
+        document.getElementById('circStrings').getString('staff.circ.checkout.ok.btn'),
+        null,
+        null,
+        document.getElementById('circStrings').getString('staff.circ.confirm.msg')
+       );
+      break;
+      case 1217 /* PATRON_INACTIVE */ :
+       found_handled = true;
+       msg += document.getElementById('circStrings').getString('staff.circ.checkout.account.inactive') + '\n';
+       obj.error.yns_alert(
+        msg,
+        document.getElementById('circStrings').getString('staff.circ.checkout.barcode.check_out_failed'),
+        document.getElementById('circStrings').getString('staff.circ.checkout.ok.btn'),
+        null,
+        null,
+        document.getElementById('circStrings').getString('staff.circ.confirm.msg')
+       );
+      break;
+      case 1224 /* PATRON_ACCOUNT_EXPIRED */ :
+       found_handled = true;
+       msg += document.getElementById('circStrings').getString('staff.circ.checkout.account.expired') + '\n';
+       obj.error.yns_alert(
+        msg,
+        document.getElementById('circStrings').getString('staff.circ.checkout.barcode.check_out_failed'),
+        document.getElementById('circStrings').getString('staff.circ.checkout.ok.btn'),
+        null,
+        null,
+        document.getElementById('circStrings').getString('staff.circ.confirm.msg')
+       );
+      break;
+      case 1232 /* ITEM_DEPOSIT_REQUIRED */ :
+      case 1233 /* ITEM_RENTAL_FEE_REQUIRED */ :
+      case 7013 /* PATRON_EXCEEDS_FINES */ :
+       found_handled = true;
+      break;
+      case 7002 /* PATRON_EXCEEDS_CHECKOUT_COUNT */ :
+       found_handled = true;
+      break;
+      case 7003 /* COPY_CIRC_NOT_ALLOWED */ :
+       found_handled = true;
+      break;
+      case 7004 /* COPY_NOT_AVAILABLE */ :
+       msg += test_permit[i].desc + '\n' + document.getElementById('circStrings').getFormattedString('staff.circ.checkout.copy_status', [test_permit[i].payload.status().name()]) + '\n';
+       found_handled = true;
+      break;
+      case 7006 /* COPY_IS_REFERENCE */ :
+       msg += test_permit[i].desc + '\n';
+       found_handled = true;
+      break;
+      case 7009 /* CIRC_CLAIMS_RETURNED */ :
+       msg += test_permit[i].desc + '\n';
+       obj.error.yns_alert(
+        msg,
+        document.getElementById('circStrings').getString('staff.circ.checkout.barcode.check_out_failed'),
+        document.getElementById('circStrings').getString('staff.circ.checkout.ok.btn'),
+        null,
+        null,
+        document.getElementById('circStrings').getString('staff.circ.confirm.msg')
+       );
+       found_handled = true;
+      break;
+      case 7010 /* COPY_ALERT_MESSAGE */ :
+       msg += test_permit[i].desc + '\n' + document.getElementById('circStrings').getFormattedString('staff.circ.checkout.alert_message', [test_permit[i].payload]) + '\n';
+       found_handled = true;
+      break;
+      case 7016 /* ITEM_ON_HOLDS_SHELF */ :
+       msg += test_permit[i].desc + '\n';
+       found_handled = true;
+      break;
+      case 1202 /* ITEM_NOT_CATALOGED */ :
+       found_handled = true;
+      break;
+      case 5000 /* PERM_FAILURE */ :
+       msg += test_permit[i].desc + '\n' + document.getElementById('circStrings').getFormattedString('staff.circ.checkout.permission_denied', [test_permit[i].ilsperm]) + '\n';
+       found_handled = true;
+      break;
+      case 1702 /* OPEN_CIRCULATION_EXISTS */ :
+       msg += test_permit[i].desc + '\n';
+       found_handled = true;
+
+       var my_copy = obj.network.simple_request('FM_ACP_RETRIEVE_VIA_BARCODE',[params.barcode]);
+       if (typeof my_copy.ilsevent != 'undefined') { throw(my_copy); }
+       var my_circ = obj.network.simple_request('FM_CIRC_RETRIEVE_VIA_COPY',[ses(),my_copy.id(),1]);
+       if (typeof my_circ.ilsevent != 'undefined') { throw(my_copy); }
+       my_circ = my_circ[0];
+       var due_date = my_circ.due_date() ? my_circ.due_date().substr(0,10) : null;
+       JSAN.use('util.date'); var today = util.date.formatted_date(new Date(),'%F');
+       if (due_date) {
+        if (today > due_date) {
+         msg += (document.getElementById('circStrings').getFormattedString('staff.circ.checkout.item_due', [due_date]) + '\n');
+        }
+       }
+       if (! stop_checkout ) {
+        var r = obj.error.yns_alert(
+         msg,
+         document.getElementById('circStrings').getString('staff.circ.checkout.barcode.check_out_failed'),
+         document.getElementById('circStrings').getString('staff.circ.cancel'),
+         document.getElementById('circStrings').getString('staff.circ.checkout.normal_checkin_then_checkout'),
+         due_date ? (today > due_date ? document.getElementById('circStrings').getString('staff.circ.checkout.forgiving_checkin_then_checkout') : null) : null,
+         document.getElementById('circStrings').getString('staff.circ.confirm.msg')
+        );
+        JSAN.use('circ.util');
+        switch(r) {
+         case 1:
+          circ.util.checkin_via_barcode( ses(), { 'barcode' : params.barcode, 'noop' : 1 } );
+          obj.checkout(params);
+         break;
+         case 2:
+          circ.util.checkin_via_barcode( ses(), { 'barcode' : params.barcode, 'noop' : 1 }, due_date );
+          obj.checkout(params);
+         break;
+        }
+       } else {
+        obj.error.yns_alert(
+         msg,
+         document.getElementById('circStrings').getString('staff.circ.checkout.barcode.check_out_failed'),
+         document.getElementById('circStrings').getString('staff.circ.checkout.ok.btn'),
+         null,
+         null,
+         document.getElementById('circStrings').getString('staff.circ.confirm.msg')
+        );
+       }
+      break;
+      case 7014 /* COPY_IN_TRANSIT */ :
+       msg += test_permit[i].desc + '\n';
+       found_handled = true;
+       if (! stop_checkout ) {
+        var r = obj.error.yns_alert(
+         msg,
+         document.getElementById('circStrings').getString('staff.circ.checkout.barcode.check_out_failed'),
+         document.getElementById('circStrings').getString('staff.circ.cancel'),
+         document.getElementById('circStrings').getString('staff.circ.checkout.abort_transit_then_checkout'),
+         null,
+         document.getElementById('circStrings').getString('staff.circ.confirm.msg')
+        );
+        if (r == 1) {
+         var robj = obj.network.simple_request('FM_ATC_VOID',[ ses(), { 'barcode' : params.barcode } ]);
+         if (typeof robj.ilsevent == 'undefined') {
+          obj.checkout(params);
+         } else {
+          switch(robj.ilsevent) {
+           case 1225 /* TRANSIT_ABORT_NOT_ALLOWED */ :
+            alert(robj.desc);
+           break;
+           case 5000 /* PERM_FAILURE */ :
+           break;
+           default:
+            throw(robj);
+           break;
+          }
+         }
+        }
+       } else {
+        obj.error.yns_alert(
+         msg,
+         document.getElementById('circStrings').getString('staff.circ.checkout.barcode.check_out_failed'),
+         document.getElementById('circStrings').getString('staff.circ.checkout.ok.btn'),
+         null,
+         null,
+         document.getElementById('circStrings').getString('staff.circ.confirm.msg')
+        );
+       }
+      break;
+      case -1 /* NETWORK_FAILURE */ :
+       msg += document.getElementById('circStrings').getString('staff.circ.checkout.network_failure') + '\n';
+       found_handled = true;
+       obj.error.yns_alert(
+        msg,
+        document.getElementById('circStrings').getString('staff.circ.checkout.barcode.check_out_failed'),
+        document.getElementById('circStrings').getString('staff.circ.checkout.ok.btn'),
+        null,
+        null,
+        document.getElementById('circStrings').getString('staff.circ.confirm.msg')
+       );
+      break;
+      default:
+       msg += 'FIXME: ' + js2JSON(test_permit[i]) + '\n';
+       found_not_handled = true;
+      break;
+     }
+    }
+    
+    if (found_not_handled) {
+     obj.error.standard_unexpected_error_alert(msg,permit);
+    }
+
+    obj.controller.view.checkout_barcode_entry_textbox.select();
+    obj.controller.view.checkout_barcode_entry_textbox.focus();
+   }
+
+  } catch(E) {
+   if (params.barcode) { delete obj._checkout_pending_hash[ params.barcode ]; }
+   if (typeof E.ilsevent != 'undefined' && E.ilsevent == -1) {
+    obj.error.standard_network_error_alert(document.getElementById('circStrings').getString('staff.circ.checkout.suggest_offline'));
+   } else {
+    obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.checkout.barcode.check_out_failed'),E);
+   }
+   if (typeof obj.on_failure == 'function') {
+    obj.on_failure(E);
+   }
+   if (typeof window.xulG == 'object' && typeof window.xulG.on_failure == 'function') {
+    obj.error.sdump('D_CIRC','circ.checkout: Calling external .on_failure()\n');
+    window.xulG.on_failure(E);
+   } else {
+    obj.error.sdump('D_CIRC','circ.checkout: No external .on_failure()\n');
+   }
+  }
+
+ },
+
+ 'on_checkout' : function() {
+  this.controller.view.checkout_menu.selectedIndex = 0;
+  this.controller.view.checkout_barcode_entry_textbox.disabled = false;
+  this.controller.view.checkout_barcode_entry_textbox.value = '';
+  this.controller.view.checkout_barcode_entry_textbox.focus();
+  document.getElementById('duedate_hbox').hidden = false;
+ },
+
+ 'on_failure' : function() {
+  this.controller.view.checkout_barcode_entry_textbox.select();
+  this.controller.view.checkout_barcode_entry_textbox.focus();
+ }
 };
 
 dump('exiting circ.checkout.js\n');
diff --git a/Open-ILS/xul/staff_client/server/circ/checkout.xul b/Open-ILS/xul/staff_client/server/circ/checkout.xul
index 3f7ceafcf1..03410473ab 100644
--- a/Open-ILS/xul/staff_client/server/circ/checkout.xul
+++ b/Open-ILS/xul/staff_client/server/circ/checkout.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -21,80 +21,80 @@
 <?xul-overlay href="/xul/server/circ/checkout_overlay.xul"?>
 
 <window id="checkout_win" 
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for checkout.xul');
-
-				var patron_id = xul_param('patron_id');
-
-				JSAN.use('circ.checkout'); g.checkout = new circ.checkout();
-				g.checkout.init( 
-					{ 
-						'patron_id' : patron_id,
-					} 
-				);
-		
-				default_focus();
-	
-			} catch(E) {
-				try {
-					g.error.standard_unexpected_error_alert('circ/checkout.xul',E);
-				} catch(F) {
-					dump('FIXME: circ/checkout.xul -> ' + E + ' -> ' + F + '\n');
-				}
-			}
-		}
-
-		function default_focus() {
-			try {
-				var x = document.getElementById('checkout_barcode_entry_textbox');
-				if (!x) return;
-				if (x.disabled) {
-					document.getElementById('checkout_duedate_menu').inputField.focus();
-				} else {
-				 x.focus();
-				}
-			} catch(E) {
-				try { g.error.sdump('D_ERROR','checkout default_focus(): ' + js2JSON(E)); } catch(F) { dump('FIXME: circ/checkout.xul default_focus() -> ' + E + ' -> ' + F) }
-			}
-		}
-
-		function refresh() {
-			g.checkout.check_disable();
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-
-	<commandset id="checkout_cmds">
-		<command id="cmd_checkout_submit" />
-		<command id="cmd_checkout_print" />
-		<command id="cmd_checkout_export" />
-		<command id="cmd_checkout_reprint" />
-		<command id="cmd_checkout_done" />
-		<command id="sel_clip" />
-		<command id="save_columns" />
-	</commandset>
-
-	<box id="checkout_main" />
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for checkout.xul');
+
+    var patron_id = xul_param('patron_id');
+
+    JSAN.use('circ.checkout'); g.checkout = new circ.checkout();
+    g.checkout.init( 
+     { 
+      'patron_id' : patron_id,
+     } 
+    );
+  
+    default_focus();
+ 
+   } catch(E) {
+    try {
+     g.error.standard_unexpected_error_alert('circ/checkout.xul',E);
+    } catch(F) {
+     dump('FIXME: circ/checkout.xul -> ' + E + ' -> ' + F + '\n');
+    }
+   }
+  }
+
+  function default_focus() {
+   try {
+    var x = document.getElementById('checkout_barcode_entry_textbox');
+    if (!x) return;
+    if (x.disabled) {
+     document.getElementById('checkout_duedate_menu').inputField.focus();
+    } else {
+     x.focus();
+    }
+   } catch(E) {
+    try { g.error.sdump('D_ERROR','checkout default_focus(): ' + js2JSON(E)); } catch(F) { dump('FIXME: circ/checkout.xul default_focus() -> ' + E + ' -> ' + F) }
+   }
+  }
+
+  function refresh() {
+   g.checkout.check_disable();
+  }
+
+ ]]>
+ </script>
+
+ <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+
+ <commandset id="checkout_cmds">
+  <command id="cmd_checkout_submit" />
+  <command id="cmd_checkout_print" />
+  <command id="cmd_checkout_export" />
+  <command id="cmd_checkout_reprint" />
+  <command id="cmd_checkout_done" />
+  <command id="sel_clip" />
+  <command id="save_columns" />
+ </commandset>
+
+ <box id="checkout_main" />
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/circ/checkout_overlay.xul b/Open-ILS/xul/staff_client/server/circ/checkout_overlay.xul
index 449e86648d..80e8f2d6d7 100644
--- a/Open-ILS/xul/staff_client/server/circ/checkout_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/circ/checkout_overlay.xul
@@ -1,77 +1,77 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 <overlay id="checkout_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading checkout_overlay.xul\n');</script>
 
 <commandset id="checkout_cmds" />
 
 <box id="checkout_main" flex="1" orient="vertical" class="my_overflow">
-	<vbox id="cmvb1" flex="1"/>
+ <vbox id="cmvb1" flex="1"/>
 </box>
 
 <vbox id="cmvb1" flex="1">
-	<groupbox id="cmgb1" flex="2">
-		<caption label="&staff.patron_navbar.checkout;" />
-		<hbox id="checkout_top_ui" />
-		<vbox id="msg_area" />
-		<tree id="checkout_list" flex="1" enableColumnDrag="true"/>
-		<hbox id="checkout_bottom_ui" />
-	</groupbox>
+ <groupbox id="cmgb1" flex="2">
+  <caption label="&staff.patron_navbar.checkout;" />
+  <hbox id="checkout_top_ui" />
+  <vbox id="msg_area" />
+  <tree id="checkout_list" flex="1" enableColumnDrag="true"/>
+  <hbox id="checkout_bottom_ui" />
+ </groupbox>
 </vbox>
 
 <hbox id="checkout_top_ui">
 <!--
-	<label id="checkout_scan_barcode.label" 
-		value="&staff.patron_display.checkout.scan.label;" 
-		accesskey="&staff.patron_display.checkout.scan.accesskey;" 
-		control="checkout_barcode_entry_textbox"/>
+ <label id="checkout_scan_barcode.label" 
+  value="&staff.patron_display.checkout.scan.label;" 
+  accesskey="&staff.patron_display.checkout.scan.accesskey;" 
+  control="checkout_barcode_entry_textbox"/>
 -->
-	<hbox id="checkout_menu_placeholder" flex="0"/>
-	<label accesskey="&staff.circ.checkout_overlay.barcode.accesskey;" control="checkout_barcode_entry_textbox"/>
-	<textbox id="checkout_barcode_entry_textbox" context="clipboard"/>
-	<button id="checkout_submit_barcode_button" 
-		label="&staff.patron_display.checkout.submit.label;" 
-		command="cmd_checkout_submit"
-		accesskey="&staff.patron_display.checkout.submit.accesskey;"/>
-	<spacer flex="1"/>
-	<hbox id="duedate_hbox">
-		<label value="&staff.circ.checkout_overlay.duedate_menu.label;" accesskey="&staff.circ.checkout_overlay.duedate_menu.accesskey;" control="checkout_duedate_menu"/>
-		<menulist id="checkout_duedate_menu" editable="true">
-			<menupopup>
-				<menuitem label="&common.date_helper.normal;" selected="true"/>
-				<menuitem label="&common.date_helper.3_days;" />
-				<menuitem label="&common.date_helper.7_days;" />
-				<menuitem label="&common.date_helper.14_days;" />
-				<menuitem label="&common.date_helper.30_days;" />
-			</menupopup>
-		</menulist>
-	</hbox>
+ <hbox id="checkout_menu_placeholder" flex="0"/>
+ <label accesskey="&staff.circ.checkout_overlay.barcode.accesskey;" control="checkout_barcode_entry_textbox"/>
+ <textbox id="checkout_barcode_entry_textbox" context="clipboard"/>
+ <button id="checkout_submit_barcode_button" 
+  label="&staff.patron_display.checkout.submit.label;" 
+  command="cmd_checkout_submit"
+  accesskey="&staff.patron_display.checkout.submit.accesskey;"/>
+ <spacer flex="1"/>
+ <hbox id="duedate_hbox">
+  <label value="&staff.circ.checkout_overlay.duedate_menu.label;" accesskey="&staff.circ.checkout_overlay.duedate_menu.accesskey;" control="checkout_duedate_menu"/>
+  <menulist id="checkout_duedate_menu" editable="true">
+   <menupopup>
+    <menuitem label="&common.date_helper.normal;" selected="true"/>
+    <menuitem label="&common.date_helper.3_days;" />
+    <menuitem label="&common.date_helper.7_days;" />
+    <menuitem label="&common.date_helper.14_days;" />
+    <menuitem label="&common.date_helper.30_days;" />
+   </menupopup>
+  </menulist>
+ </hbox>
 </hbox>
 
 <hbox id="checkout_bottom_ui">
-	<button id="checkout_print" 
-		label="&staff.patron_display.checkout.print_receipt.label;" 
-		command="cmd_checkout_print"
-		accesskey="&staff.patron_display.checkout.print_receipt.accesskey;"/>
-	<button id="checkout_export" 
-		label="&staff.circ.checkout_overlay.export.label;"
-		command="cmd_checkout_export"
-		accesskey="&staff.circ.checkout_overlay.export.accesskey;"/>
-	<button id="clip_button" disabled="true" command="sel_clip" label="&staff.circ.checkout_overlay.sel_clip.label;" />
-	<button id="save_col_btn" command="save_columns" label="&staff.circ.checkout_overlay.save_columns.label;" />
-	<checkbox id="strict_barcode" label="&staff.circ.checkout_overlay.strict_barcode.label;" checked="false" oils_persist="checked"/> 
-	<spacer id="pcii3s" flex="1"/>
-	<checkbox id="checkout_auto" oils_persist="checked"
-		label="&staff.patron_display.checkout.auto_print.label;" 
-		accesskey_old="&staff.patron_display.checkout.auto_print.accesskey;"/> 
-	<button id="checkout_done" 
-		label="&staff.patron_display.checkout.done.label;" 
-		command="cmd_checkout_done"
-		accesskey="&staff.patron_display.checkout.done.accesskey;"/>
+ <button id="checkout_print" 
+  label="&staff.patron_display.checkout.print_receipt.label;" 
+  command="cmd_checkout_print"
+  accesskey="&staff.patron_display.checkout.print_receipt.accesskey;"/>
+ <button id="checkout_export" 
+  label="&staff.circ.checkout_overlay.export.label;"
+  command="cmd_checkout_export"
+  accesskey="&staff.circ.checkout_overlay.export.accesskey;"/>
+ <button id="clip_button" disabled="true" command="sel_clip" label="&staff.circ.checkout_overlay.sel_clip.label;" />
+ <button id="save_col_btn" command="save_columns" label="&staff.circ.checkout_overlay.save_columns.label;" />
+ <checkbox id="strict_barcode" label="&staff.circ.checkout_overlay.strict_barcode.label;" checked="false" oils_persist="checked"/> 
+ <spacer id="pcii3s" flex="1"/>
+ <checkbox id="checkout_auto" oils_persist="checked"
+  label="&staff.patron_display.checkout.auto_print.label;" 
+  accesskey_old="&staff.patron_display.checkout.auto_print.accesskey;"/> 
+ <button id="checkout_done" 
+  label="&staff.patron_display.checkout.done.label;" 
+  command="cmd_checkout_done"
+  accesskey="&staff.patron_display.checkout.done.accesskey;"/>
 </hbox>
 
 </overlay>
diff --git a/Open-ILS/xul/staff_client/server/circ/circ_brief.xul b/Open-ILS/xul/staff_client/server/circ/circ_brief.xul
index c7d7218774..938fa8dc76 100644
--- a/Open-ILS/xul/staff_client/server/circ/circ_brief.xul
+++ b/Open-ILS/xul/staff_client/server/circ/circ_brief.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,137 +20,137 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="circ_circ_brief_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns:html="http://www.w3.org/1999/xhtml"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+ xmlns:html="http://www.w3.org/1999/xhtml"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+ </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for circ_circ_brief.xul');
-
-				g.circ_id = xul_param('circ_id');
-
-				var caption = xul_param('caption'); if (caption) $('caption').setAttribute('label',caption);
-				if (xul_param('no_border')) $('gb').setAttribute('style','border: none');
-
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('util.date');
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-
-				function circ_callback(req) {
-					try {
-						var r_circ = req.getResultObject();
-						$('circ_lib').value = r_circ.circ_lib() ? g.data.hash.aou[ r_circ.circ_lib() ].shortname() : '';
-						$('xact_start').value = r_circ.xact_start() ? r_circ.xact_start().toString().substr(0,16).replace(/T/,' ') : '';
-						$('due_date').value = r_circ.due_date() ? r_circ.due_date().toString().substr(0,10) : '';
-						$('circ_lib').setAttribute('tooltiptext', document.getElementById('circStrings').getFormattedString('staff.circ.circ_brief.staff_out_id', [r_circ.circ_staff()]) );
-						$('checkin_lib').value = r_circ.checkin_lib() ? g.data.hash.aou[ r_circ.checkin_lib() ].shortname() : '';
-						$('checkin_time').value = r_circ.checkin_time() ? r_circ.checkin_time().toString().substr(0,16).replace(/T/,' ') : '';
-						$('checkin_lib').setAttribute('tooltiptext', document.getElementById('circStrings').getFormattedString('staff.circ.circ_brief.staff_in_id', [r_circ.checkin_staff()]) );
-						$('id').value = r_circ.id() ? r_circ.id() : '';
-						$('stop_fines').value = r_circ.stop_fines() ? r_circ.stop_fines() : '';
-						$('stop_fines_time').value = r_circ.stop_fines_time() ? r_circ.stop_fines_time().toString().substr(0,16).replace(/T/,' ') : '';
-						var r = '';
-						if (get_bool( r_circ.desk_renewal() ) ) r += 'DESK ';
-						if (get_bool(r_circ.opac_renewal() ) ) r += 'OPAC ';
-						if (get_bool(r_circ.phone_renewal() ) ) r += 'PHONE ';
-						$('renewal').value = r || document.getElementById('circStrings').getString('staff.circ.checkout.no.btn');
-						g.patron_id = r_circ.usr(); $('add_billing').disabled = false;
-						g.network.simple_request('FM_AU_FLESHED_RETRIEVE_VIA_ID',[ ses(), r_circ.usr() ], function(preq) {
-							var r_au = preq.getResultObject();
-							$('patron_name').value = r_au.family_name() + ', ' + r_au.first_given_name() + ' ' + (r_au.second_given_name() ? r_au.second_given_name() + ' : ' + r_au.card().barcode() : '');
-							JSAN.use('patron.util'); patron.util.set_penalty_css(r_au);
-						});
-
-					} catch(E) {
-						g.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.circ_brief.failure'), E);
-					}
-				}
-
-				if (g.circ_id) {
-					g.network.simple_request( 'FM_CIRC_RETRIEVE_VIA_ID', [ ses(), g.circ_id ], circ_callback);
-				} else {
-					g.circ = g.data.temp_circ; g.data.temp_circ = null; g.data.stash('temp_circ');
-					g.circ_id = g.circ.id();
-					circ_callback( { 'getResultObject' : function() { return g.circ; } } );
-				}
-
-			} catch(E) {
-				var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['circ/circ_brief.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function $(id) { return document.getElementById(id); }
-
-		g.add_billing = function() {
-			JSAN.use('util.window');
-			var win = new util.window();
-			var w = win.open(
-				urls.XUL_PATRON_BILL_WIZARD,
-					//+ '?patron_id=' + window.escape(g.patron_id)
-					//+ '&xact_id=' + window.escape( g.circ_id ),
-				'billwizard',
-				'chrome,resizable,modal',
-				{ 'patron_id' : g.patron_id, 'xact_id' : g.circ_id }
-			);
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-
-	<groupbox id="gb" flex="1" style="overflow: auto;">
-		<caption id="caption"/>
-		<hbox>
-			<label id="patron_name" class="patronNameLarge" flex="1"/>
-			<label value="&staff.circ.circ_brief.patron_id.label;"/><label id="id"/>
-			<button id="add_billing" disabled="true" label="&staff.circ.circ_brief.add_billing.label;" oncommand="g.add_billing();"/>
-		</hbox>
-		<grid flex="1">
-			<columns>
-				<column/>
-				<column flex="1"/>
-				<column/>
-				<column flex="1"/>
-				<column/>
-				<column flex="1"/>
-				<column/>
-				<column flex="1"/>
-			</columns>
-			<rows>
-				<row>
-					<label style="font-weight: bold" value="&staff.circ.circ_brief.xact_start.label;"/><label id="xact_start"/>
-					<label style="font-weight: bold" value="&staff.circ.circ_brief.due_date.label;"/><label id="due_date"/>
-					<label style="font-weight: bold" value="&staff.circ.circ_brief.stop_fines_time.label;"/><label id="stop_fines_time"/>
-					<label style="font-weight: bold" value="&staff.circ.circ_brief.checkin_time.label;"/><label id="checkin_time"/>
-				</row>
-				<row>
-					<label style="font-weight: bold" value="&staff.circ.circ_brief.circ_lib.label;"/><label id="circ_lib"/>
-					<label style="font-weight: bold" value="&staff.circ.circ_brief.renewal.label;"/><label id="renewal"/>
-					<label style="font-weight: bold" value="&staff.circ.circ_brief.stop_fines.label;"/><label id="stop_fines"/>
-					<label style="font-weight: bold" value="&staff.circ.circ_brief.checkin_lib.label;"/><label id="checkin_lib"/>
-				</row>
-			</rows>
-		</grid>
-	</groupbox>
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for circ_circ_brief.xul');
+
+    g.circ_id = xul_param('circ_id');
+
+    var caption = xul_param('caption'); if (caption) $('caption').setAttribute('label',caption);
+    if (xul_param('no_border')) $('gb').setAttribute('style','border: none');
+
+    JSAN.use('util.network'); g.network = new util.network();
+    JSAN.use('util.date');
+    JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+
+    function circ_callback(req) {
+     try {
+      var r_circ = req.getResultObject();
+      $('circ_lib').value = r_circ.circ_lib() ? g.data.hash.aou[ r_circ.circ_lib() ].shortname() : '';
+      $('xact_start').value = r_circ.xact_start() ? r_circ.xact_start().toString().substr(0,16).replace(/T/,' ') : '';
+      $('due_date').value = r_circ.due_date() ? r_circ.due_date().toString().substr(0,10) : '';
+      $('circ_lib').setAttribute('tooltiptext', document.getElementById('circStrings').getFormattedString('staff.circ.circ_brief.staff_out_id', [r_circ.circ_staff()]) );
+      $('checkin_lib').value = r_circ.checkin_lib() ? g.data.hash.aou[ r_circ.checkin_lib() ].shortname() : '';
+      $('checkin_time').value = r_circ.checkin_time() ? r_circ.checkin_time().toString().substr(0,16).replace(/T/,' ') : '';
+      $('checkin_lib').setAttribute('tooltiptext', document.getElementById('circStrings').getFormattedString('staff.circ.circ_brief.staff_in_id', [r_circ.checkin_staff()]) );
+      $('id').value = r_circ.id() ? r_circ.id() : '';
+      $('stop_fines').value = r_circ.stop_fines() ? r_circ.stop_fines() : '';
+      $('stop_fines_time').value = r_circ.stop_fines_time() ? r_circ.stop_fines_time().toString().substr(0,16).replace(/T/,' ') : '';
+      var r = '';
+      if (get_bool( r_circ.desk_renewal() ) ) r += 'DESK ';
+      if (get_bool(r_circ.opac_renewal() ) ) r += 'OPAC ';
+      if (get_bool(r_circ.phone_renewal() ) ) r += 'PHONE ';
+      $('renewal').value = r || document.getElementById('circStrings').getString('staff.circ.checkout.no.btn');
+      g.patron_id = r_circ.usr(); $('add_billing').disabled = false;
+      g.network.simple_request('FM_AU_FLESHED_RETRIEVE_VIA_ID',[ ses(), r_circ.usr() ], function(preq) {
+       var r_au = preq.getResultObject();
+       $('patron_name').value = r_au.family_name() + ', ' + r_au.first_given_name() + ' ' + (r_au.second_given_name() ? r_au.second_given_name() + ' : ' + r_au.card().barcode() : '');
+       JSAN.use('patron.util'); patron.util.set_penalty_css(r_au);
+      });
+
+     } catch(E) {
+      g.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.circ_brief.failure'), E);
+     }
+    }
+
+    if (g.circ_id) {
+     g.network.simple_request( 'FM_CIRC_RETRIEVE_VIA_ID', [ ses(), g.circ_id ], circ_callback);
+    } else {
+     g.circ = g.data.temp_circ; g.data.temp_circ = null; g.data.stash('temp_circ');
+     g.circ_id = g.circ.id();
+     circ_callback( { 'getResultObject' : function() { return g.circ; } } );
+    }
+
+   } catch(E) {
+    var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['circ/circ_brief.xul', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+
+  function $(id) { return document.getElementById(id); }
+
+  g.add_billing = function() {
+   JSAN.use('util.window');
+   var win = new util.window();
+   var w = win.open(
+    urls.XUL_PATRON_BILL_WIZARD,
+     //+ '?patron_id=' + window.escape(g.patron_id)
+     //+ '&xact_id=' + window.escape( g.circ_id ),
+    'billwizard',
+    'chrome,resizable,modal',
+    { 'patron_id' : g.patron_id, 'xact_id' : g.circ_id }
+   );
+  }
+
+ ]]>
+ </script>
+
+ <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+
+ <groupbox id="gb" flex="1" style="overflow: auto;">
+  <caption id="caption"/>
+  <hbox>
+   <label id="patron_name" class="patronNameLarge" flex="1"/>
+   <label value="&staff.circ.circ_brief.patron_id.label;"/><label id="id"/>
+   <button id="add_billing" disabled="true" label="&staff.circ.circ_brief.add_billing.label;" oncommand="g.add_billing();"/>
+  </hbox>
+  <grid flex="1">
+   <columns>
+    <column/>
+    <column flex="1"/>
+    <column/>
+    <column flex="1"/>
+    <column/>
+    <column flex="1"/>
+    <column/>
+    <column flex="1"/>
+   </columns>
+   <rows>
+    <row>
+     <label style="font-weight: bold" value="&staff.circ.circ_brief.xact_start.label;"/><label id="xact_start"/>
+     <label style="font-weight: bold" value="&staff.circ.circ_brief.due_date.label;"/><label id="due_date"/>
+     <label style="font-weight: bold" value="&staff.circ.circ_brief.stop_fines_time.label;"/><label id="stop_fines_time"/>
+     <label style="font-weight: bold" value="&staff.circ.circ_brief.checkin_time.label;"/><label id="checkin_time"/>
+    </row>
+    <row>
+     <label style="font-weight: bold" value="&staff.circ.circ_brief.circ_lib.label;"/><label id="circ_lib"/>
+     <label style="font-weight: bold" value="&staff.circ.circ_brief.renewal.label;"/><label id="renewal"/>
+     <label style="font-weight: bold" value="&staff.circ.circ_brief.stop_fines.label;"/><label id="stop_fines"/>
+     <label style="font-weight: bold" value="&staff.circ.circ_brief.checkin_lib.label;"/><label id="checkin_lib"/>
+    </row>
+   </rows>
+  </grid>
+ </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/circ/circ_summary.xul b/Open-ILS/xul/staff_client/server/circ/circ_summary.xul
index 05b525a4f4..7ab4c67fbe 100644
--- a/Open-ILS/xul/staff_client/server/circ/circ_summary.xul
+++ b/Open-ILS/xul/staff_client/server/circ/circ_summary.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,138 +20,138 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="circ_circ_brief_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	width="750" height="550"
-	xmlns:html="http://www.w3.org/1999/xhtml"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+ width="750" height="550"
+ xmlns:html="http://www.w3.org/1999/xhtml"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+ </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  function $(id) { return document.getElementById(id); }
 
-		var xulG = {};
+  var xulG = {};
 
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') {
-					throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
-				}
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for circ_circ_brief.xul');
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') {
+     throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
+    }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for circ_circ_brief.xul');
 
-				g.copy_id = xul_param('copy_id',{'modal_xulG':true});
+    g.copy_id = xul_param('copy_id',{'modal_xulG':true});
 
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('util.date');
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+    JSAN.use('util.network'); g.network = new util.network();
+    JSAN.use('util.date');
+    JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
 
-				g.copy = g.network.simple_request('FM_ACP_RETRIEVE',[ g.copy_id ]);
-				if (typeof g.copy.ilsevent != 'undefined') throw(g.copy);
-				g.callnumber = g.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ g.copy.call_number() ]);
-				if (typeof g.callnumber.ilsevent != 'undefined') throw(g.callnumber);
+    g.copy = g.network.simple_request('FM_ACP_RETRIEVE',[ g.copy_id ]);
+    if (typeof g.copy.ilsevent != 'undefined') throw(g.copy);
+    g.callnumber = g.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ g.copy.call_number() ]);
+    if (typeof g.callnumber.ilsevent != 'undefined') throw(g.callnumber);
 
                 var tv = $('top_vbox'); while(tv.firstChild) tv.removeChild(tv.lastChild);
                 var top = document.createElement('iframe'); tv.appendChild(top);
-				top.setAttribute('src',urls.XUL_BIB_BRIEF);
+    top.setAttribute('src',urls.XUL_BIB_BRIEF);
                 top.setAttribute('flex','1');
-				get_contentWindow(top).xulG = { 'docid' : g.callnumber.record() };
+    get_contentWindow(top).xulG = { 'docid' : g.callnumber.record() };
                 var mv = $('mid_vbox'); while(mv.firstChild) mv.removeChild(mv.lastChild);
                 var mid = document.createElement('iframe'); mv.appendChild(mid);
-				mid.setAttribute('src',urls.XUL_COPY_SUMMARY);
+    mid.setAttribute('src',urls.XUL_COPY_SUMMARY);
                 mid.setAttribute('flex','1');
-				get_contentWindow(mid).xulG = { 'copy_id' : g.copy.id() };
-
-				show_circs();
-
-			} catch(E) {
-				g.error.standard_unexpected_error_alert('Error in circ_brief.xul, my_init()',E);
-			}
-		}
-
-		function show_circs() {
-			try {
-				$('r_last').disabled = true; $('r_all').disabled = true;	
-				g.circs = g.network.simple_request('FM_CIRC_RETRIEVE_VIA_COPY',
-					[ ses(), g.copy_id ]);
-				if (g.circs == null || typeof g.circs.ilsevent != 'undefined') throw(circs);
-				if (g.circs.length == 0) return;
-				//g.circs = g.circs.reverse(); /* put the most recent at the top */
-				$('r_last').disabled = false; $('r_all').disabled = false;	
-
-				var gb = $('circs');
-				for (var j = 0; j < g.circs.length; j++) {
-					var iframe = document.createElement('iframe');
-					iframe.setAttribute('style','overflow: none; min-height: 100px;');
-					iframe.setAttribute('flex','1');
-					gb.appendChild(iframe);
-					iframe.setAttribute('src', urls.XUL_CIRC_BRIEF); // + '?circ_id=' + g.circs[j].id() );
-					get_contentWindow(iframe).xulG = { 'circ_id' : g.circs[j].id() };
-				}
-			} catch(E) {
-				g.error.standard_unexpected_error_alert('error showing circs',E);
-			}
-		}
-
-		function retrieve_last() {
-			try {
-				//g.data.fancy_prompt_data = js2JSON( [ g.circs[0].usr() ] );
-				//g.data.stash('fancy_prompt_data');
-				xulG.retrieve_these_patrons = [ g.circs[0].usr() ];
-				update_modal_xulG(xulG);
-				window.close();
-			} catch(E) {
-				g.error.standard_unexpected_error_alert('retrieve_last',E);
-			}
-		}
-
-		function retrieve_all() {
-			try {
-				var patrons = []; var p_hash = {};
-				for (var i = 0; i < g.circs.length; i++) {
-					var usr = g.circs[i].usr();
-					if (typeof p_hash[usr] != 'undefined') { continue; }
-					p_hash[usr] = true;
-					patrons.push( function(a){return a;}(usr) );
-				}
-				//g.data.fancy_prompt_data = js2JSON(patrons);
-				//g.data.stash('fancy_prompt_data');
-				xulG.retrieve_these_patrons = patrons;
-				update_modal_xulG(xulG);
-				window.close();
-			} catch(E) {
-				g.error.standard_unexpected_error_alert('retrieve_all',E);
-			}
-		}
-
-	]]>
-	</script>
-
-	<vbox flex="1" class="my_overflow">
+    get_contentWindow(mid).xulG = { 'copy_id' : g.copy.id() };
+
+    show_circs();
+
+   } catch(E) {
+    g.error.standard_unexpected_error_alert('Error in circ_brief.xul, my_init()',E);
+   }
+  }
+
+  function show_circs() {
+   try {
+    $('r_last').disabled = true; $('r_all').disabled = true; 
+    g.circs = g.network.simple_request('FM_CIRC_RETRIEVE_VIA_COPY',
+     [ ses(), g.copy_id ]);
+    if (g.circs == null || typeof g.circs.ilsevent != 'undefined') throw(circs);
+    if (g.circs.length == 0) return;
+    //g.circs = g.circs.reverse(); /* put the most recent at the top */
+    $('r_last').disabled = false; $('r_all').disabled = false; 
+
+    var gb = $('circs');
+    for (var j = 0; j < g.circs.length; j++) {
+     var iframe = document.createElement('iframe');
+     iframe.setAttribute('style','overflow: none; min-height: 100px;');
+     iframe.setAttribute('flex','1');
+     gb.appendChild(iframe);
+     iframe.setAttribute('src', urls.XUL_CIRC_BRIEF); // + '?circ_id=' + g.circs[j].id() );
+     get_contentWindow(iframe).xulG = { 'circ_id' : g.circs[j].id() };
+    }
+   } catch(E) {
+    g.error.standard_unexpected_error_alert('error showing circs',E);
+   }
+  }
+
+  function retrieve_last() {
+   try {
+    //g.data.fancy_prompt_data = js2JSON( [ g.circs[0].usr() ] );
+    //g.data.stash('fancy_prompt_data');
+    xulG.retrieve_these_patrons = [ g.circs[0].usr() ];
+    update_modal_xulG(xulG);
+    window.close();
+   } catch(E) {
+    g.error.standard_unexpected_error_alert('retrieve_last',E);
+   }
+  }
+
+  function retrieve_all() {
+   try {
+    var patrons = []; var p_hash = {};
+    for (var i = 0; i < g.circs.length; i++) {
+     var usr = g.circs[i].usr();
+     if (typeof p_hash[usr] != 'undefined') { continue; }
+     p_hash[usr] = true;
+     patrons.push( function(a){return a;}(usr) );
+    }
+    //g.data.fancy_prompt_data = js2JSON(patrons);
+    //g.data.stash('fancy_prompt_data');
+    xulG.retrieve_these_patrons = patrons;
+    update_modal_xulG(xulG);
+    window.close();
+   } catch(E) {
+    g.error.standard_unexpected_error_alert('retrieve_all',E);
+   }
+  }
+
+ ]]>
+ </script>
+
+ <vbox flex="1" class="my_overflow">
         <vbox id="top_vbox" flex="1" class="my_overflow"/>
-		<splitter><grippy/></splitter>
+  <splitter><grippy/></splitter>
         <vbox id="mid_vbox" flex="1" class="my_overflow"/>
-		<splitter><grippy/></splitter>
-		<groupbox flex="1" id="circs" class="my_overflow">
-			<caption label="&staff.circ.circ_summary.caption;"/>
-		</groupbox>
-		<hbox>
-			<button id="r_last" label="&staff.circ.circ_summary.retrieve_last.label;" accesskey="&staff.circ.circ_summary.retrieve_last.accesskey;" oncommand="retrieve_last();"/>
-			<button id="r_all" label="&staff.circ.circ_summary.retrieve_all.label;" accesskey="&staff.circ.circ_summary.retrieve_all.accesskey;" oncommand="retrieve_all();"/>
-			<spacer flex="1"/>
-			<button label="&staff.circ.circ_summary.done.label;" accesskey="&staff.circ.circ_summary.done.accesskey;" oncommand="window.close();"/>
-		</hbox>
-	</vbox>
+  <splitter><grippy/></splitter>
+  <groupbox flex="1" id="circs" class="my_overflow">
+   <caption label="&staff.circ.circ_summary.caption;"/>
+  </groupbox>
+  <hbox>
+   <button id="r_last" label="&staff.circ.circ_summary.retrieve_last.label;" accesskey="&staff.circ.circ_summary.retrieve_last.accesskey;" oncommand="retrieve_last();"/>
+   <button id="r_all" label="&staff.circ.circ_summary.retrieve_all.label;" accesskey="&staff.circ.circ_summary.retrieve_all.accesskey;" oncommand="retrieve_all();"/>
+   <spacer flex="1"/>
+   <button label="&staff.circ.circ_summary.done.label;" accesskey="&staff.circ.circ_summary.done.accesskey;" oncommand="window.close();"/>
+  </hbox>
+ </vbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/circ/copy_details.xul b/Open-ILS/xul/staff_client/server/circ/copy_details.xul
index 18bf95bde1..a3cd46f4f1 100644
--- a/Open-ILS/xul/staff_client/server/circ/copy_details.xul
+++ b/Open-ILS/xul/staff_client/server/circ/copy_details.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,211 +20,211 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="circ_copy_details_win" 
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	width="800" height="600" oils_persist="width height"
-	xmlns:html="http://www.w3.org/1999/xhtml"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+ width="800" height="600" oils_persist="width height"
+ xmlns:html="http://www.w3.org/1999/xhtml"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+ </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-
-		var xulG = {};
-
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { 
-					throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
-				}
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for circ_copy_details.xul');
-
-				g.copy_id = xul_param('copy_id',{'modal_xulG':true});
-
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('util.date');
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-
-				// uber method
-				var robj = g.network.simple_request('FM_ACP_DETAILS', [ ses(), g.copy_id ] );
-				if (typeof robj.ilsevent != 'undefined') {
-					throw(robj);
-				}
-				if (robj.copy) {
-					g.copy = robj.copy;
-				} else {
-					throw(robj);
-				}
-				g.hold = robj.hold; g.transit = robj.transit; g.circ = robj.circ; g.callnumber = robj.volume;
-				var tt_msg = '';
-				if (g.hold) {
-					tt_msg = $('circStrings').getFormattedString('staff.circ.copy_details.hold', [g.hold.id()]);
-					$('hold_caption').setAttribute('tooltiptext', tt_msg);
-				}
-				if (g.transit) {
-					tt_msg = $('circStrings').getFormattedString('staff.circ.copy_details.transit', [g.transit.id()]);
-					$('transit_caption').setAttribute('tooltiptext', tt_msg);
-				}
-				if (g.circ) {
-					tt_msg = $('circStrings').getFormattedString('staff.circ.copy_details.circ', [g.circ.id()]);
-					$('circ_caption').setAttribute('tooltiptext', tt_msg);
-				}
-
-				//g.callnumber = g.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ g.copy.call_number() ]);
-				//if (typeof g.callnumber.ilsevent != 'undefined') throw(g.callnumber);
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  function $(id) { return document.getElementById(id); }
+
+  var xulG = {};
+
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { 
+     throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
+    }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for circ_copy_details.xul');
+
+    g.copy_id = xul_param('copy_id',{'modal_xulG':true});
+
+    JSAN.use('util.network'); g.network = new util.network();
+    JSAN.use('util.date');
+    JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+
+    // uber method
+    var robj = g.network.simple_request('FM_ACP_DETAILS', [ ses(), g.copy_id ] );
+    if (typeof robj.ilsevent != 'undefined') {
+     throw(robj);
+    }
+    if (robj.copy) {
+     g.copy = robj.copy;
+    } else {
+     throw(robj);
+    }
+    g.hold = robj.hold; g.transit = robj.transit; g.circ = robj.circ; g.callnumber = robj.volume;
+    var tt_msg = '';
+    if (g.hold) {
+     tt_msg = $('circStrings').getFormattedString('staff.circ.copy_details.hold', [g.hold.id()]);
+     $('hold_caption').setAttribute('tooltiptext', tt_msg);
+    }
+    if (g.transit) {
+     tt_msg = $('circStrings').getFormattedString('staff.circ.copy_details.transit', [g.transit.id()]);
+     $('transit_caption').setAttribute('tooltiptext', tt_msg);
+    }
+    if (g.circ) {
+     tt_msg = $('circStrings').getFormattedString('staff.circ.copy_details.circ', [g.circ.id()]);
+     $('circ_caption').setAttribute('tooltiptext', tt_msg);
+    }
+
+    //g.callnumber = g.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ g.copy.call_number() ]);
+    //if (typeof g.callnumber.ilsevent != 'undefined') throw(g.callnumber);
 
                 var tb = $('top_box'); while (tb.firstChild) tb.removeChild(tb.lastChild);
                 var top = document.createElement('iframe'); tb.appendChild(top);
-				top.setAttribute('src',urls.XUL_BIB_BRIEF);
-				top.setAttribute('flex','1');
-				get_contentWindow(top).xulG = { 'docid' : g.callnumber.record() };
-				//g.data.temp_copy = g.copy; g.data.stash('temp_copy'); 
-				//g.data.temp_callnumber = g.callnumber; g.data.stash('temp_callnumber'); 
+    top.setAttribute('src',urls.XUL_BIB_BRIEF);
+    top.setAttribute('flex','1');
+    get_contentWindow(top).xulG = { 'docid' : g.callnumber.record() };
+    //g.data.temp_copy = g.copy; g.data.stash('temp_copy'); 
+    //g.data.temp_callnumber = g.callnumber; g.data.stash('temp_callnumber'); 
                 var ib = $('item_summary_box'); while(ib.firstChild) ib.removeChild(ib.lastChild);
                 var item_summary = document.createElement('iframe'); ib.appendChild(item_summary);
-				item_summary.setAttribute('src',urls.XUL_COPY_SUMMARY);
-				item_summary.setAttribute('flex','1');
-				get_contentWindow(item_summary).xulG = { 'copy' : g.copy, 'callnumber' : g.callnumber };
-
-				$('r_last').disabled = true;
-				if (g.circ) {
-					$('r_last').disabled = false;
-					g.data.temp_circ = g.circ; g.data.stash('temp_circ');
+    item_summary.setAttribute('src',urls.XUL_COPY_SUMMARY);
+    item_summary.setAttribute('flex','1');
+    get_contentWindow(item_summary).xulG = { 'copy' : g.copy, 'callnumber' : g.callnumber };
+
+    $('r_last').disabled = true;
+    if (g.circ) {
+     $('r_last').disabled = false;
+     g.data.temp_circ = g.circ; g.data.stash('temp_circ');
                     var cb = $('circ_box'); while(cb.firstChild) cb.removeChild(cb.lastChild);
                     var circ_frame = document.createElement('iframe'); cb.appendChild(circ_frame);
-					circ_frame.setAttribute('src',urls.XUL_CIRC_BRIEF);
-				    circ_frame.setAttribute('flex','1');
-					get_contentWindow(circ_frame).xulG = { 'no_border' : 1 };
-					if (g.circ.checkin_time()) {
-						$('circ_caption').setAttribute('label', $('circStrings').getString('staff.circ.copy_details.last_circ'));
-					} else {
-						$('circ_caption').setAttribute('label', $('circStrings').getString('staff.circ.copy_details.current_circ'));
-					}
-				} else {
-					$('circ_caption').setAttribute('label', $('circStrings').getString('staff.circ.copy_details.no_circ'));
-				}
-
-				if (g.transit) {
-					JSAN.use('circ.util'); var columns = circ.util.transit_columns({});
-
-					JSAN.use('util.list'); g.list = new util.list('transit');
-					g.list.init( { 'columns' : columns, 'map_row_to_columns' : circ.util.std_map_row_to_columns(), });
-					g.list.append( { 'row' : { 'my' : { 'atc' : g.transit, } } });
-	
-				} else {
-					$('transit_caption').setAttribute('label', $('circStrings').getString('staff.circ.copy_details.not_transit'));
-					$('transit').hidden = true;
-				}
-
-
-				$('r_hold').disabled = true;
-				if (g.hold) {
-					$('r_hold').disabled = false;
-					var better_fleshed_hold_blob = g.network.simple_request('FM_AHR_BLOB_RETRIEVE.authoritative',[ ses(), g.hold.id() ]);
+     circ_frame.setAttribute('src',urls.XUL_CIRC_BRIEF);
+        circ_frame.setAttribute('flex','1');
+     get_contentWindow(circ_frame).xulG = { 'no_border' : 1 };
+     if (g.circ.checkin_time()) {
+      $('circ_caption').setAttribute('label', $('circStrings').getString('staff.circ.copy_details.last_circ'));
+     } else {
+      $('circ_caption').setAttribute('label', $('circStrings').getString('staff.circ.copy_details.current_circ'));
+     }
+    } else {
+     $('circ_caption').setAttribute('label', $('circStrings').getString('staff.circ.copy_details.no_circ'));
+    }
+
+    if (g.transit) {
+     JSAN.use('circ.util'); var columns = circ.util.transit_columns({});
+
+     JSAN.use('util.list'); g.list = new util.list('transit');
+     g.list.init( { 'columns' : columns, 'map_row_to_columns' : circ.util.std_map_row_to_columns(), });
+     g.list.append( { 'row' : { 'my' : { 'atc' : g.transit, } } });
+ 
+    } else {
+     $('transit_caption').setAttribute('label', $('circStrings').getString('staff.circ.copy_details.not_transit'));
+     $('transit').hidden = true;
+    }
+
+
+    $('r_hold').disabled = true;
+    if (g.hold) {
+     $('r_hold').disabled = false;
+     var better_fleshed_hold_blob = g.network.simple_request('FM_AHR_BLOB_RETRIEVE.authoritative',[ ses(), g.hold.id() ]);
                     var status_robj = better_fleshed_hold_blob.status;
-					JSAN.use('circ.util');
-					var columns = circ.util.hold_columns( 
-						{ 
-							'request_time' : { 'hidden' : false },
-							'pickup_lib_shortname' : { 'hidden' : false },
-							'hold_type' : { 'hidden' : true },
-							'current_copy' : { 'hidden' : true },
-							'capture_time' : { 'hidden' : true },
-							'email_notify' : { 'hidden' : false },
-							'phone_notify' : { 'hidden' : false },
-						} 
-					);
-
-					JSAN.use('util.list'); g.list = new util.list('hold');
-					g.list.init( { 'columns' : columns, 'map_row_to_columns' : circ.util.std_map_row_to_columns(), });
-					g.list.append( { 'row' : { 'my' : { 'ahr' : better_fleshed_hold_blob.hold, 'acp' : g.copy, 'status' : status_robj, } } });
-	
-					JSAN.use('patron.util'); 
-					var au_obj = patron.util.retrieve_fleshed_au_via_id( ses(), g.hold.usr() );
-					$('patron_name').setAttribute('value', $('circStrings').getFormattedString('staff.circ.copy_details.user_details', [au_obj.family_name(), au_obj.first_given_name(), au_obj.card().barcode()]) );
-
-				} else {
-					if (g.copy.status() == 8 /* ON HOLDS SHELF */) {
-						$('hold_caption').setAttribute('label', $('circStrings').getString('staff.circ.copy_details.bad_hold_status'));
-					} else {
-						$('hold_caption').setAttribute('label', $('circStrings').getString('staff.circ.copy_details.no_hold'));
-					}
-					$('hold').hidden = true;
-				}
-
-			} catch(E) {
-				g.error.standard_unexpected_error_alert('Error in copy_details.xul, my_init()',E);
-			}
-		}
-
-		function retrieve_last_patron() {
-			try {
-				//g.data.fancy_prompt_data = js2JSON( [ g.circ.usr() ] );
-				//g.data.stash('fancy_prompt_data');
-				xulG.retrieve_these_patrons = [ g.circ.usr() ];
-				update_modal_xulG(xulG);
-				window.close();
-			} catch(E) {
-				alert(E);
-			}
-		}
-
-		function retrieve_hold_patron() {
-			try {
-				//g.data.fancy_prompt_data = js2JSON( [ g.hold.usr() ] );
-				//g.data.stash('fancy_prompt_data');
-				xulG.retrieve_these_patrons = [ g.hold.usr() ];
-				update_modal_xulG(xulG);
-				window.close();
-			} catch(E) {
-				alert(E);
-			}
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-
-	<vbox flex="1" style="overflow: auto;">
-		<vbox id="top_box" flex="1" style="border: none; overflow: none; min-height: 80;"/>
-		<splitter><grippy/></splitter>
-		<vbox id="item_summary_box" flex="1" style="border: none; overflow: none; min-height: 80;"/>
-		<splitter><grippy/></splitter>
-		<groupbox flex="1" id="holds" style="overflow: none; min-height: 80;">
-			<caption id="hold_caption" label="&staff.circ.copy_details.hold_caption;"/>
-			<label id="patron_name" class="patronNameLarge"/>
-			<tree id="hold" flex="1" enableColumnDrag="true"/>
-			<spacer FIXME="label and tree get swapped without this"/>
-		</groupbox>
-		<splitter><grippy/></splitter>
-		<groupbox flex="1" id="transits" style="overflow: none; min-height: 80;">
-			<caption id="transit_caption" label="&staff.circ.copy_details.transit_caption;"/>
-			<tree id="transit" flex="1" enableColumnDrag="true"/>
-		</groupbox>
-		<splitter><grippy/></splitter>
-		<groupbox flex="1" id="circs" style="overflow: none; min-height: 80;">
-			<caption id="circ_caption" label="&staff.circ.copy_details.circ_caption;" style="font-weight: bold"/>
+     JSAN.use('circ.util');
+     var columns = circ.util.hold_columns( 
+      { 
+       'request_time' : { 'hidden' : false },
+       'pickup_lib_shortname' : { 'hidden' : false },
+       'hold_type' : { 'hidden' : true },
+       'current_copy' : { 'hidden' : true },
+       'capture_time' : { 'hidden' : true },
+       'email_notify' : { 'hidden' : false },
+       'phone_notify' : { 'hidden' : false },
+      } 
+     );
+
+     JSAN.use('util.list'); g.list = new util.list('hold');
+     g.list.init( { 'columns' : columns, 'map_row_to_columns' : circ.util.std_map_row_to_columns(), });
+     g.list.append( { 'row' : { 'my' : { 'ahr' : better_fleshed_hold_blob.hold, 'acp' : g.copy, 'status' : status_robj, } } });
+ 
+     JSAN.use('patron.util'); 
+     var au_obj = patron.util.retrieve_fleshed_au_via_id( ses(), g.hold.usr() );
+     $('patron_name').setAttribute('value', $('circStrings').getFormattedString('staff.circ.copy_details.user_details', [au_obj.family_name(), au_obj.first_given_name(), au_obj.card().barcode()]) );
+
+    } else {
+     if (g.copy.status() == 8 /* ON HOLDS SHELF */) {
+      $('hold_caption').setAttribute('label', $('circStrings').getString('staff.circ.copy_details.bad_hold_status'));
+     } else {
+      $('hold_caption').setAttribute('label', $('circStrings').getString('staff.circ.copy_details.no_hold'));
+     }
+     $('hold').hidden = true;
+    }
+
+   } catch(E) {
+    g.error.standard_unexpected_error_alert('Error in copy_details.xul, my_init()',E);
+   }
+  }
+
+  function retrieve_last_patron() {
+   try {
+    //g.data.fancy_prompt_data = js2JSON( [ g.circ.usr() ] );
+    //g.data.stash('fancy_prompt_data');
+    xulG.retrieve_these_patrons = [ g.circ.usr() ];
+    update_modal_xulG(xulG);
+    window.close();
+   } catch(E) {
+    alert(E);
+   }
+  }
+
+  function retrieve_hold_patron() {
+   try {
+    //g.data.fancy_prompt_data = js2JSON( [ g.hold.usr() ] );
+    //g.data.stash('fancy_prompt_data');
+    xulG.retrieve_these_patrons = [ g.hold.usr() ];
+    update_modal_xulG(xulG);
+    window.close();
+   } catch(E) {
+    alert(E);
+   }
+  }
+
+ ]]>
+ </script>
+
+ <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+
+ <vbox flex="1" style="overflow: auto;">
+  <vbox id="top_box" flex="1" style="border: none; overflow: none; min-height: 80;"/>
+  <splitter><grippy/></splitter>
+  <vbox id="item_summary_box" flex="1" style="border: none; overflow: none; min-height: 80;"/>
+  <splitter><grippy/></splitter>
+  <groupbox flex="1" id="holds" style="overflow: none; min-height: 80;">
+   <caption id="hold_caption" label="&staff.circ.copy_details.hold_caption;"/>
+   <label id="patron_name" class="patronNameLarge"/>
+   <tree id="hold" flex="1" enableColumnDrag="true"/>
+   <spacer FIXME="label and tree get swapped without this"/>
+  </groupbox>
+  <splitter><grippy/></splitter>
+  <groupbox flex="1" id="transits" style="overflow: none; min-height: 80;">
+   <caption id="transit_caption" label="&staff.circ.copy_details.transit_caption;"/>
+   <tree id="transit" flex="1" enableColumnDrag="true"/>
+  </groupbox>
+  <splitter><grippy/></splitter>
+  <groupbox flex="1" id="circs" style="overflow: none; min-height: 80;">
+   <caption id="circ_caption" label="&staff.circ.copy_details.circ_caption;" style="font-weight: bold"/>
             <vbox id="circ_box" flex="1" style="min-height: 80"/>
-		</groupbox>
-	</vbox>
-	<hbox>
-		<button id="r_last" label="&staff.circ.copy_details.r_last.label;" accesskey="&staff.circ.copy_details.r_last.accesskey;" oncommand="retrieve_last_patron();"/>
-		<button id="r_hold" label="&staff.circ.copy_details.r_hold.label;" accesskey="&staff.circ.copy_details.r_hold.accesskey;" oncommand="retrieve_hold_patron();"/>
-		<spacer flex="1"/>
-		<button id="done" label="&staff.circ.copy_details.done.label;" accesskey="&staff.circ.copy_details.done.accesskey;" oncommand="window.close();"/>
-	</hbox>
+  </groupbox>
+ </vbox>
+ <hbox>
+  <button id="r_last" label="&staff.circ.copy_details.r_last.label;" accesskey="&staff.circ.copy_details.r_last.accesskey;" oncommand="retrieve_last_patron();"/>
+  <button id="r_hold" label="&staff.circ.copy_details.r_hold.label;" accesskey="&staff.circ.copy_details.r_hold.accesskey;" oncommand="retrieve_hold_patron();"/>
+  <spacer flex="1"/>
+  <button id="done" label="&staff.circ.copy_details.done.label;" accesskey="&staff.circ.copy_details.done.accesskey;" oncommand="window.close();"/>
+ </hbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/circ/copy_status.js b/Open-ILS/xul/staff_client/server/circ/copy_status.js
index e623ea424d..3a307d0abf 100644
--- a/Open-ILS/xul/staff_client/server/circ/copy_status.js
+++ b/Open-ILS/xul/staff_client/server/circ/copy_status.js
@@ -4,114 +4,114 @@ dump('entering circ.copy_status.js\n');
 if (typeof circ == 'undefined') { circ = {}; }
 circ.copy_status = function (params) {
 
-	JSAN.use('util.error'); this.error = new util.error();
-	JSAN.use('util.network'); this.network = new util.network();
-	JSAN.use('util.barcode');
-	JSAN.use('util.date');
-	JSAN.use('OpenILS.data'); this.data = new OpenILS.data(); this.data.init({'via':'stash'});
-	JSAN.use('util.sound'); this.sound = new util.sound();
+ JSAN.use('util.error'); this.error = new util.error();
+ JSAN.use('util.network'); this.network = new util.network();
+ JSAN.use('util.barcode');
+ JSAN.use('util.date');
+ JSAN.use('OpenILS.data'); this.data = new OpenILS.data(); this.data.init({'via':'stash'});
+ JSAN.use('util.sound'); this.sound = new util.sound();
 };
 
 circ.copy_status.prototype = {
-	'selection_list' : [],
-	'list_copyid_map' : {},
-
-	'init' : function( params ) {
-
-		var obj = this;
-
-		JSAN.use('circ.util');
-		var columns = circ.util.columns( 
-			{ 
-				'barcode' : { 'hidden' : false },
-				'title' : { 'hidden' : false },
-				'location' : { 'hidden' : false },
-				'call_number' : { 'hidden' : false },
-				'status' : { 'hidden' : false },
-				'alert_message' : { 'hidden' : false },
-				'due_date' : { 'hidden' : false }
-			},
-			{
-				'except_these' : [
-					'checkin_time', 'checkin_time_full', 'route_to', 'message', 'uses', 'xact_finish'
-				]
-			}
-		);
-
-		JSAN.use('util.list'); obj.list = new util.list('copy_status_list');
-		obj.list.init(
-			{
-				'columns' : columns,
-				'map_row_to_columns' : circ.util.std_map_row_to_columns(),
-				'on_select' : function(ev) {
-					try {
-						JSAN.use('util.functional');
-						var sel = obj.list.retrieve_selection();
-						obj.selection_list = util.functional.map_list(
-							sel,
-							function(o) { return JSON2js(o.getAttribute('retrieve_id')); }
-						);
-						obj.error.sdump('D_TRACE','circ/copy_status: selection list = ' + js2JSON(obj.selection_list) );
-						if (obj.selection_list.length == 0) {
-							obj.controller.view.sel_checkin.setAttribute('disabled','true');
-							obj.controller.view.cmd_replace_barcode.setAttribute('disabled','true');
-							obj.controller.view.sel_edit.setAttribute('disabled','true');
-							obj.controller.view.sel_opac.setAttribute('disabled','true');
-							obj.controller.view.sel_bucket.setAttribute('disabled','true');
-							obj.controller.view.sel_record_bucket.setAttribute('disabled','true');
-							obj.controller.view.sel_copy_details.setAttribute('disabled','true');
-							obj.controller.view.sel_mark_items_damaged.setAttribute('disabled','true');
-							obj.controller.view.sel_mark_items_missing.setAttribute('disabled','true');
-							obj.controller.view.sel_patron.setAttribute('disabled','true');
-							obj.controller.view.sel_spine.setAttribute('disabled','true');
-							obj.controller.view.sel_transit_abort.setAttribute('disabled','true');
-							obj.controller.view.sel_clip.setAttribute('disabled','true');
-							obj.controller.view.sel_renew.setAttribute('disabled','true');
-							obj.controller.view.cmd_add_items.setAttribute('disabled','true');
-							obj.controller.view.cmd_delete_items.setAttribute('disabled','true');
-							obj.controller.view.cmd_transfer_items.setAttribute('disabled','true');
-							obj.controller.view.cmd_add_volumes.setAttribute('disabled','true');
-							obj.controller.view.cmd_edit_volumes.setAttribute('disabled','true');
-							obj.controller.view.cmd_delete_volumes.setAttribute('disabled','true');
-							obj.controller.view.cmd_mark_volume.setAttribute('disabled','true');
-							obj.controller.view.cmd_mark_library.setAttribute('disabled','true');
-							obj.controller.view.cmd_transfer_volume.setAttribute('disabled','true');
-						} else {
-							obj.controller.view.sel_checkin.setAttribute('disabled','false');
-							obj.controller.view.cmd_replace_barcode.setAttribute('disabled','false');
-							obj.controller.view.sel_edit.setAttribute('disabled','false');
-							obj.controller.view.sel_opac.setAttribute('disabled','false');
-							obj.controller.view.sel_patron.setAttribute('disabled','false');
-							obj.controller.view.sel_bucket.setAttribute('disabled','false');
-							obj.controller.view.sel_record_bucket.setAttribute('disabled','false');
-							obj.controller.view.sel_copy_details.setAttribute('disabled','false');
-							obj.controller.view.sel_mark_items_damaged.setAttribute('disabled','false');
-							obj.controller.view.sel_mark_items_missing.setAttribute('disabled','false');
-							obj.controller.view.sel_spine.setAttribute('disabled','false');
-							obj.controller.view.sel_transit_abort.setAttribute('disabled','false');
-							obj.controller.view.sel_clip.setAttribute('disabled','false');
-							obj.controller.view.sel_renew.setAttribute('disabled','false');
-							obj.controller.view.cmd_add_items.setAttribute('disabled','false');
-							obj.controller.view.cmd_delete_items.setAttribute('disabled','false');
-							obj.controller.view.cmd_transfer_items.setAttribute('disabled','false');
-							obj.controller.view.cmd_add_volumes.setAttribute('disabled','false');
-							obj.controller.view.cmd_edit_volumes.setAttribute('disabled','false');
-							obj.controller.view.cmd_delete_volumes.setAttribute('disabled','false');
-							obj.controller.view.cmd_mark_volume.setAttribute('disabled','false');
-							obj.controller.view.cmd_mark_library.setAttribute('disabled','false');
-							obj.controller.view.cmd_transfer_volume.setAttribute('disabled','false');
-						}
-					} catch(E) {
-						alert('FIXME: ' + E);
-					}
-				}
-			}
-		);
-		
-		JSAN.use('util.controller'); obj.controller = new util.controller();
-		obj.controller.init(
-			{
-				'control_map' : {
+ 'selection_list' : [],
+ 'list_copyid_map' : {},
+
+ 'init' : function( params ) {
+
+  var obj = this;
+
+  JSAN.use('circ.util');
+  var columns = circ.util.columns( 
+   { 
+    'barcode' : { 'hidden' : false },
+    'title' : { 'hidden' : false },
+    'location' : { 'hidden' : false },
+    'call_number' : { 'hidden' : false },
+    'status' : { 'hidden' : false },
+    'alert_message' : { 'hidden' : false },
+    'due_date' : { 'hidden' : false }
+   },
+   {
+    'except_these' : [
+     'checkin_time', 'checkin_time_full', 'route_to', 'message', 'uses', 'xact_finish'
+    ]
+   }
+  );
+
+  JSAN.use('util.list'); obj.list = new util.list('copy_status_list');
+  obj.list.init(
+   {
+    'columns' : columns,
+    'map_row_to_columns' : circ.util.std_map_row_to_columns(),
+    'on_select' : function(ev) {
+     try {
+      JSAN.use('util.functional');
+      var sel = obj.list.retrieve_selection();
+      obj.selection_list = util.functional.map_list(
+       sel,
+       function(o) { return JSON2js(o.getAttribute('retrieve_id')); }
+      );
+      obj.error.sdump('D_TRACE','circ/copy_status: selection list = ' + js2JSON(obj.selection_list) );
+      if (obj.selection_list.length == 0) {
+       obj.controller.view.sel_checkin.setAttribute('disabled','true');
+       obj.controller.view.cmd_replace_barcode.setAttribute('disabled','true');
+       obj.controller.view.sel_edit.setAttribute('disabled','true');
+       obj.controller.view.sel_opac.setAttribute('disabled','true');
+       obj.controller.view.sel_bucket.setAttribute('disabled','true');
+       obj.controller.view.sel_record_bucket.setAttribute('disabled','true');
+       obj.controller.view.sel_copy_details.setAttribute('disabled','true');
+       obj.controller.view.sel_mark_items_damaged.setAttribute('disabled','true');
+       obj.controller.view.sel_mark_items_missing.setAttribute('disabled','true');
+       obj.controller.view.sel_patron.setAttribute('disabled','true');
+       obj.controller.view.sel_spine.setAttribute('disabled','true');
+       obj.controller.view.sel_transit_abort.setAttribute('disabled','true');
+       obj.controller.view.sel_clip.setAttribute('disabled','true');
+       obj.controller.view.sel_renew.setAttribute('disabled','true');
+       obj.controller.view.cmd_add_items.setAttribute('disabled','true');
+       obj.controller.view.cmd_delete_items.setAttribute('disabled','true');
+       obj.controller.view.cmd_transfer_items.setAttribute('disabled','true');
+       obj.controller.view.cmd_add_volumes.setAttribute('disabled','true');
+       obj.controller.view.cmd_edit_volumes.setAttribute('disabled','true');
+       obj.controller.view.cmd_delete_volumes.setAttribute('disabled','true');
+       obj.controller.view.cmd_mark_volume.setAttribute('disabled','true');
+       obj.controller.view.cmd_mark_library.setAttribute('disabled','true');
+       obj.controller.view.cmd_transfer_volume.setAttribute('disabled','true');
+      } else {
+       obj.controller.view.sel_checkin.setAttribute('disabled','false');
+       obj.controller.view.cmd_replace_barcode.setAttribute('disabled','false');
+       obj.controller.view.sel_edit.setAttribute('disabled','false');
+       obj.controller.view.sel_opac.setAttribute('disabled','false');
+       obj.controller.view.sel_patron.setAttribute('disabled','false');
+       obj.controller.view.sel_bucket.setAttribute('disabled','false');
+       obj.controller.view.sel_record_bucket.setAttribute('disabled','false');
+       obj.controller.view.sel_copy_details.setAttribute('disabled','false');
+       obj.controller.view.sel_mark_items_damaged.setAttribute('disabled','false');
+       obj.controller.view.sel_mark_items_missing.setAttribute('disabled','false');
+       obj.controller.view.sel_spine.setAttribute('disabled','false');
+       obj.controller.view.sel_transit_abort.setAttribute('disabled','false');
+       obj.controller.view.sel_clip.setAttribute('disabled','false');
+       obj.controller.view.sel_renew.setAttribute('disabled','false');
+       obj.controller.view.cmd_add_items.setAttribute('disabled','false');
+       obj.controller.view.cmd_delete_items.setAttribute('disabled','false');
+       obj.controller.view.cmd_transfer_items.setAttribute('disabled','false');
+       obj.controller.view.cmd_add_volumes.setAttribute('disabled','false');
+       obj.controller.view.cmd_edit_volumes.setAttribute('disabled','false');
+       obj.controller.view.cmd_delete_volumes.setAttribute('disabled','false');
+       obj.controller.view.cmd_mark_volume.setAttribute('disabled','false');
+       obj.controller.view.cmd_mark_library.setAttribute('disabled','false');
+       obj.controller.view.cmd_transfer_volume.setAttribute('disabled','false');
+      }
+     } catch(E) {
+      alert('FIXME: ' + E);
+     }
+    }
+   }
+  );
+  
+  JSAN.use('util.controller'); obj.controller = new util.controller();
+  obj.controller.init(
+   {
+    'control_map' : {
                     'list_actions' : [
                         ['render'],
                         function(e) {
@@ -127,155 +127,155 @@ circ.copy_status.prototype = {
                     ],
                     'sel_clip' : [ ['command'], function() { obj.list.clipboard(); obj.controller.view.copy_status_barcode_entry_textbox.focus(); } ],
                     'save_columns' : [ ['command'], function() { obj.list.save_columns(); obj.controller.view.copy_status_barcode_entry_textbox.focus(); } ],
-					'sel_checkin' : [
-						['command'],
-						function() {
-							try {
-								var funcs = [];
-								JSAN.use('circ.util');
-								for (var i = 0; i < obj.selection_list.length; i++) {
-									var barcode = obj.selection_list[i].barcode;
-									var checkin = circ.util.checkin_via_barcode( ses(), { 'barcode' : barcode } );
-									funcs.push( function(a) { return function() { obj.copy_status( a, true ); }; }(barcode) );
-								}
-								for (var i = 0; i < funcs.length; i++) { funcs[i](); }
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.copy_status.sel_checkin.error'),E);
-							}
-						}
-					],
-					'cmd_replace_barcode' : [
-						['command'],
-						function() {
-							try {
-								var funcs = [];
-								JSAN.use('cat.util');
-								for (var i = 0; i < obj.selection_list.length; i++) {
-									try { 
-										var barcode = obj.selection_list[i].barcode;
-										var new_bc = cat.util.replace_barcode( barcode );
-										funcs.push( function(a) { return function() { obj.copy_status( a, true ); }; }(new_bc) );
-									} catch(E) {
-										obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getFormattedString('staff.circ.copy_status.cmd_replace_barcode.error', [barcode]), E);
-									}
-								}
-								for (var i = 0; i < funcs.length; i++) { funcs[i](); }
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.copy_status.cmd_replace_barcodes.error'), E);
-							}
-						}
-					],
-					'sel_edit' : [
-						['command'],
-						function() {
-							try {
-								var funcs = [];
-								obj.spawn_copy_editor();
-								for (var i = 0; i < obj.selection_list.length; i++) {
-										var barcode = obj.selection_list[i].barcode;
-										funcs.push( function(a) { return function() { obj.copy_status( a, true ); }; }(barcode) );
-								}
-								for (var i = 0; i < funcs.length; i++) { funcs[i](); }
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.copy_status.sel_edit.error'), E);
-							}
-						}
-					],
-					'sel_spine' : [
-						['command'],
-						function() {
-							JSAN.use('cat.util');
-							cat.util.spawn_spine_editor(obj.selection_list);
-						}
-					],
-					'sel_opac' : [
-						['command'],
-						function() {
-							JSAN.use('cat.util');
-							cat.util.show_in_opac(obj.selection_list);
-						}
-					],
-					'sel_transit_abort' : [
-						['command'],
-						function() {
-							var funcs = [];
-							JSAN.use('circ.util');
-							circ.util.abort_transits(obj.selection_list);
-							for (var i = 0; i < obj.selection_list.length; i++) {
-								var barcode = obj.selection_list[i].barcode;
-								funcs.push( function(a) { return function() { obj.copy_status( a, true ); }; }(barcode) );
-							}
-							for (var i = 0; i < funcs.length; i++) { funcs[i](); }
-						}
-					],
-					'sel_patron' : [
-						['command'],
-						function() {
-							JSAN.use('circ.util');
-							circ.util.show_last_few_circs(obj.selection_list);
-						}
-					],
-					'sel_copy_details' : [
-						['command'],
-						function() {
-							JSAN.use('circ.util');
-							for (var i = 0; i < obj.selection_list.length; i++) {
-								circ.util.show_copy_details( obj.selection_list[i].copy_id );
-							}
-						}
-					],
-					'sel_renew' : [
-						['command'],
-						function() {
-							var funcs = [];
-							JSAN.use('circ.util');
-							for (var i = 0; i < obj.selection_list.length; i++) {
-								var test = obj.selection_list[i].renewable;
-								var barcode = obj.selection_list[i].barcode;
-								if (test == 't') {
-									circ.util.renew_via_barcode( barcode );
-									funcs.push( function(a) { return function() { obj.copy_status( a, true ); }; }(barcode) );
-								} else {
-									alert(document.getElementById('circStrings').getFormattedString('staff.circ.copy_status.sel_renew.not_circulating', [barcode]));
-								}
-							}
-							for (var i = 0; i < funcs.length; i++) { funcs[i](); }
-						}
-					],
-
-					'sel_mark_items_damaged' : [
-						['command'],
-						function() {
-							var funcs = [];
-							JSAN.use('cat.util'); JSAN.use('util.functional');
-							cat.util.mark_item_damaged( util.functional.map_list( obj.selection_list, function(o) { return o.copy_id; } ) );
-							for (var i = 0; i < obj.selection_list.length; i++) {
-								var barcode = obj.selection_list[i].barcode;
-								funcs.push( function(a) { return function() { obj.copy_status( a, true ); }; }(barcode) );
-							}
-							for (var i = 0; i < funcs.length; i++) { funcs[i](); }
-						}
-					],
-					'sel_mark_items_missing' : [
-						['command'],
-						function() {
-							var funcs = [];
-							JSAN.use('cat.util'); JSAN.use('util.functional');
-							cat.util.mark_item_missing( util.functional.map_list( obj.selection_list, function(o) { return o.copy_id; } ) );
-							for (var i = 0; i < obj.selection_list.length; i++) {
-								var barcode = obj.selection_list[i].barcode;
-								funcs.push( function(a) { return function() { obj.copy_status( a, true ); }; }(barcode) );
-							}
-							for (var i = 0; i < funcs.length; i++) { funcs[i](); }
-						}
-					],
-					'sel_bucket' : [
-						['command'],
-						function() {
-							JSAN.use('cat.util');
-							cat.util.add_copies_to_bucket(obj.selection_list);
-						}
-					],
+     'sel_checkin' : [
+      ['command'],
+      function() {
+       try {
+        var funcs = [];
+        JSAN.use('circ.util');
+        for (var i = 0; i < obj.selection_list.length; i++) {
+         var barcode = obj.selection_list[i].barcode;
+         var checkin = circ.util.checkin_via_barcode( ses(), { 'barcode' : barcode } );
+         funcs.push( function(a) { return function() { obj.copy_status( a, true ); }; }(barcode) );
+        }
+        for (var i = 0; i < funcs.length; i++) { funcs[i](); }
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.copy_status.sel_checkin.error'),E);
+       }
+      }
+     ],
+     'cmd_replace_barcode' : [
+      ['command'],
+      function() {
+       try {
+        var funcs = [];
+        JSAN.use('cat.util');
+        for (var i = 0; i < obj.selection_list.length; i++) {
+         try { 
+          var barcode = obj.selection_list[i].barcode;
+          var new_bc = cat.util.replace_barcode( barcode );
+          funcs.push( function(a) { return function() { obj.copy_status( a, true ); }; }(new_bc) );
+         } catch(E) {
+          obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getFormattedString('staff.circ.copy_status.cmd_replace_barcode.error', [barcode]), E);
+         }
+        }
+        for (var i = 0; i < funcs.length; i++) { funcs[i](); }
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.copy_status.cmd_replace_barcodes.error'), E);
+       }
+      }
+     ],
+     'sel_edit' : [
+      ['command'],
+      function() {
+       try {
+        var funcs = [];
+        obj.spawn_copy_editor();
+        for (var i = 0; i < obj.selection_list.length; i++) {
+          var barcode = obj.selection_list[i].barcode;
+          funcs.push( function(a) { return function() { obj.copy_status( a, true ); }; }(barcode) );
+        }
+        for (var i = 0; i < funcs.length; i++) { funcs[i](); }
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.copy_status.sel_edit.error'), E);
+       }
+      }
+     ],
+     'sel_spine' : [
+      ['command'],
+      function() {
+       JSAN.use('cat.util');
+       cat.util.spawn_spine_editor(obj.selection_list);
+      }
+     ],
+     'sel_opac' : [
+      ['command'],
+      function() {
+       JSAN.use('cat.util');
+       cat.util.show_in_opac(obj.selection_list);
+      }
+     ],
+     'sel_transit_abort' : [
+      ['command'],
+      function() {
+       var funcs = [];
+       JSAN.use('circ.util');
+       circ.util.abort_transits(obj.selection_list);
+       for (var i = 0; i < obj.selection_list.length; i++) {
+        var barcode = obj.selection_list[i].barcode;
+        funcs.push( function(a) { return function() { obj.copy_status( a, true ); }; }(barcode) );
+       }
+       for (var i = 0; i < funcs.length; i++) { funcs[i](); }
+      }
+     ],
+     'sel_patron' : [
+      ['command'],
+      function() {
+       JSAN.use('circ.util');
+       circ.util.show_last_few_circs(obj.selection_list);
+      }
+     ],
+     'sel_copy_details' : [
+      ['command'],
+      function() {
+       JSAN.use('circ.util');
+       for (var i = 0; i < obj.selection_list.length; i++) {
+        circ.util.show_copy_details( obj.selection_list[i].copy_id );
+       }
+      }
+     ],
+     'sel_renew' : [
+      ['command'],
+      function() {
+       var funcs = [];
+       JSAN.use('circ.util');
+       for (var i = 0; i < obj.selection_list.length; i++) {
+        var test = obj.selection_list[i].renewable;
+        var barcode = obj.selection_list[i].barcode;
+        if (test == 't') {
+         circ.util.renew_via_barcode( barcode );
+         funcs.push( function(a) { return function() { obj.copy_status( a, true ); }; }(barcode) );
+        } else {
+         alert(document.getElementById('circStrings').getFormattedString('staff.circ.copy_status.sel_renew.not_circulating', [barcode]));
+        }
+       }
+       for (var i = 0; i < funcs.length; i++) { funcs[i](); }
+      }
+     ],
+
+     'sel_mark_items_damaged' : [
+      ['command'],
+      function() {
+       var funcs = [];
+       JSAN.use('cat.util'); JSAN.use('util.functional');
+       cat.util.mark_item_damaged( util.functional.map_list( obj.selection_list, function(o) { return o.copy_id; } ) );
+       for (var i = 0; i < obj.selection_list.length; i++) {
+        var barcode = obj.selection_list[i].barcode;
+        funcs.push( function(a) { return function() { obj.copy_status( a, true ); }; }(barcode) );
+       }
+       for (var i = 0; i < funcs.length; i++) { funcs[i](); }
+      }
+     ],
+     'sel_mark_items_missing' : [
+      ['command'],
+      function() {
+       var funcs = [];
+       JSAN.use('cat.util'); JSAN.use('util.functional');
+       cat.util.mark_item_missing( util.functional.map_list( obj.selection_list, function(o) { return o.copy_id; } ) );
+       for (var i = 0; i < obj.selection_list.length; i++) {
+        var barcode = obj.selection_list[i].barcode;
+        funcs.push( function(a) { return function() { obj.copy_status( a, true ); }; }(barcode) );
+       }
+       for (var i = 0; i < funcs.length; i++) { funcs[i](); }
+      }
+     ],
+     'sel_bucket' : [
+      ['command'],
+      function() {
+       JSAN.use('cat.util');
+       cat.util.add_copies_to_bucket(obj.selection_list);
+      }
+     ],
                     'sel_record_bucket' : [
                         ['command'],
                         function() {
@@ -289,151 +289,151 @@ circ.copy_status.prototype = {
                             );
                         }
                     ],
-					'copy_status_barcode_entry_textbox' : [
-						['keypress'],
-						function(ev) {
-							if (ev.keyCode && ev.keyCode == 13) {
-								obj.copy_status();
-							}
-						}
-					],
-					'cmd_broken' : [
-						['command'],
-						function() { alert(document.getElementById('circStrings').getString('staff.circ.unimplemented')); }
-					],
-					'cmd_copy_status_submit_barcode' : [
-						['command'],
-						function() {
-							obj.copy_status();
-						}
-					],
-					'cmd_copy_status_upload_file' : [
-						['command'],
-						function() {
-							netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
-							JSAN.use('util.file');
-							var f = new util.file('');
+     'copy_status_barcode_entry_textbox' : [
+      ['keypress'],
+      function(ev) {
+       if (ev.keyCode && ev.keyCode == 13) {
+        obj.copy_status();
+       }
+      }
+     ],
+     'cmd_broken' : [
+      ['command'],
+      function() { alert(document.getElementById('circStrings').getString('staff.circ.unimplemented')); }
+     ],
+     'cmd_copy_status_submit_barcode' : [
+      ['command'],
+      function() {
+       obj.copy_status();
+      }
+     ],
+     'cmd_copy_status_upload_file' : [
+      ['command'],
+      function() {
+       netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
+       JSAN.use('util.file');
+       var f = new util.file('');
                             var content = f.import_file( { 'title' : document.getElementById('circStrings').getString('staff.circ.copy_status.upload_file.title'), 'not_json' : true } );
                             if (!content) { return; }
-							var barcodes = content.split(/[,\s]+/);
-                			if (barcodes.length > 0) {
-			                    JSAN.use('util.exec'); var exec = new util.exec();
-			                    var funcs = [];
-			                    for (var i = 0; i < barcodes.length; i++) {
-			                        funcs.push(
-			                            function(b){
-			                                return function() {
-			                                    obj.copy_status(b);
-			                                };
-			                            }(barcodes[i])
-			                        );
-			                    }
-								funcs.push( function() { alert(document.getElementById('circStrings').getString('staff.circ.copy_status.upload_file.complete')); } );
-			                    exec.chain( funcs );
-			                } else {
-								alert(document.getElementById('circStrings').getString('staff.circ.copy_status.upload_file.no_barcodes'));
-							}
-
-						}
-					],
-					'cmd_copy_status_print' : [
-						['command'],
-						function() {
-							try {
+       var barcodes = content.split(/[,\s]+/);
+                   if (barcodes.length > 0) {
+                       JSAN.use('util.exec'); var exec = new util.exec();
+                       var funcs = [];
+                       for (var i = 0; i < barcodes.length; i++) {
+                           funcs.push(
+                               function(b){
+                                   return function() {
+                                       obj.copy_status(b);
+                                   };
+                               }(barcodes[i])
+                           );
+                       }
+        funcs.push( function() { alert(document.getElementById('circStrings').getString('staff.circ.copy_status.upload_file.complete')); } );
+                       exec.chain( funcs );
+                   } else {
+        alert(document.getElementById('circStrings').getString('staff.circ.copy_status.upload_file.no_barcodes'));
+       }
+
+      }
+     ],
+     'cmd_copy_status_print' : [
+      ['command'],
+      function() {
+       try {
                                 var p = { 
                                     'template' : 'item_status'
                                 };
-								obj.list.print(p);
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert('print',E); 
-							}
-						}
-					],
-					'cmd_add_items' : [
-						['command'],
-						function() {
-							try {
-
-								JSAN.use('util.functional');
-								var list = util.functional.map_list( obj.selection_list, function(o) { return o.acn_id; } );
-								if (list.length == 0) { return; }
-
-								var copy_shortcut = {}; var map_acn = {};
-
-								for (var i = 0; i < list.length; i++) {
-									var volume_id = list[i];
-									if (volume_id == -1) { 
-										continue; /* ignore magic pre-cat volume */
-									}
-									if (! map_acn[volume_id]) {
-										map_acn[ volume_id ] = obj.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ volume_id ]);
-									}
-									var record_id = map_acn[ volume_id ].record();
-									var ou_id = map_acn[ volume_id ].owning_lib();
-									var label = map_acn[ volume_id ].label();
-									if (!copy_shortcut[record_id]) {
-										copy_shortcut[record_id] = {};
-									}
-									if (!copy_shortcut[record_id][ou_id]) {
-										copy_shortcut[record_id][ou_id] = {};
-									}
-									copy_shortcut[record_id][ou_id][ label ] = volume_id;
-
-								}
-
-								for (var r in copy_shortcut) {
-
-									/* quick fix */  /* what was this fixing? */
-									list = []; for (var i in copy_shortcut[r]) { list.push( i ); }
-
-									var edit = 0;
-									try {
-										edit = obj.network.request(
-											api.PERM_MULTI_ORG_CHECK.app,
-											api.PERM_MULTI_ORG_CHECK.method,
-											[ 
-												ses(), 
-												obj.data.list.au[0].id(), 
-												list,
-												[ 'CREATE_COPY' ]
-											]
-										).length == 0 ? 1 : 0;
-									} catch(E) {
-										obj.error.sdump('D_ERROR','batch permission check: ' + E);
-									}
-	
-									if (edit==0) { 
-										return; // no read-only view for this interface
-									}
-	
-									var title = document.getElementById('circStrings').getFormattedString('staff.circ.copy_status.add_items.title', [r]);
-	
-									JSAN.use('util.window'); var win = new util.window();
-									var w = win.open(
-										window.xulG.url_prefix(urls.XUL_VOLUME_COPY_CREATOR),
-											//+'?doc_id=' + window.escape(r)
-											//+'&ou_ids=' + window.escape( js2JSON(list) )
-											//+'&copy_shortcut=' + window.escape( js2JSON(copy_shortcut[r]) ),
-										title,
-										'chrome,resizable',
-										{ 'doc_id' : r, 'ou_ids' : list, 'copy_shortcut' : copy_shortcut[r] }
-									);
-								}
-
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert('copy status -> add copies',E);
-							}
-						}
-
-					],
-					'cmd_delete_items' : [
-						['command'],
-						function() {
-							try {
+        obj.list.print(p);
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert('print',E); 
+       }
+      }
+     ],
+     'cmd_add_items' : [
+      ['command'],
+      function() {
+       try {
+
+        JSAN.use('util.functional');
+        var list = util.functional.map_list( obj.selection_list, function(o) { return o.acn_id; } );
+        if (list.length == 0) { return; }
+
+        var copy_shortcut = {}; var map_acn = {};
+
+        for (var i = 0; i < list.length; i++) {
+         var volume_id = list[i];
+         if (volume_id == -1) { 
+          continue; /* ignore magic pre-cat volume */
+         }
+         if (! map_acn[volume_id]) {
+          map_acn[ volume_id ] = obj.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ volume_id ]);
+         }
+         var record_id = map_acn[ volume_id ].record();
+         var ou_id = map_acn[ volume_id ].owning_lib();
+         var label = map_acn[ volume_id ].label();
+         if (!copy_shortcut[record_id]) {
+          copy_shortcut[record_id] = {};
+         }
+         if (!copy_shortcut[record_id][ou_id]) {
+          copy_shortcut[record_id][ou_id] = {};
+         }
+         copy_shortcut[record_id][ou_id][ label ] = volume_id;
+
+        }
+
+        for (var r in copy_shortcut) {
+
+         /* quick fix */  /* what was this fixing? */
+         list = []; for (var i in copy_shortcut[r]) { list.push( i ); }
+
+         var edit = 0;
+         try {
+          edit = obj.network.request(
+           api.PERM_MULTI_ORG_CHECK.app,
+           api.PERM_MULTI_ORG_CHECK.method,
+           [ 
+            ses(), 
+            obj.data.list.au[0].id(), 
+            list,
+            [ 'CREATE_COPY' ]
+           ]
+          ).length == 0 ? 1 : 0;
+         } catch(E) {
+          obj.error.sdump('D_ERROR','batch permission check: ' + E);
+         }
+ 
+         if (edit==0) { 
+          return; // no read-only view for this interface
+         }
+ 
+         var title = document.getElementById('circStrings').getFormattedString('staff.circ.copy_status.add_items.title', [r]);
+ 
+         JSAN.use('util.window'); var win = new util.window();
+         var w = win.open(
+          window.xulG.url_prefix(urls.XUL_VOLUME_COPY_CREATOR),
+           //+'?doc_id=' + window.escape(r)
+           //+'&ou_ids=' + window.escape( js2JSON(list) )
+           //+'&copy_shortcut=' + window.escape( js2JSON(copy_shortcut[r]) ),
+          title,
+          'chrome,resizable',
+          { 'doc_id' : r, 'ou_ids' : list, 'copy_shortcut' : copy_shortcut[r] }
+         );
+        }
+
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert('copy status -> add copies',E);
+       }
+      }
+
+     ],
+     'cmd_delete_items' : [
+      ['command'],
+      function() {
+       try {
 
                                 JSAN.use('util.functional');
 
-								var list = util.functional.map_list( obj.selection_list, function(o) { return o.copy_id; } );
+        var list = util.functional.map_list( obj.selection_list, function(o) { return o.copy_id; } );
 
                                 var copies = util.functional.map_list(
                                     list,
@@ -447,246 +447,246 @@ circ.copy_status.prototype = {
                                     copies[i].isdeleted(1);
                                 }
 
-								if (! window.confirm(document.getElementById('circStrings').getFormattedString('staff.circ.copy_status.del_items.confirm', [util.functional.map_list( copies, function(o) { return o.barcode(); }).join(", ")]))) {
-									return;
-								}
+        if (! window.confirm(document.getElementById('circStrings').getFormattedString('staff.circ.copy_status.del_items.confirm', [util.functional.map_list( copies, function(o) { return o.barcode(); }).join(", ")]))) {
+         return;
+        }
 
                                 var robj = obj.network.simple_request('FM_ACP_FLESHED_BATCH_UPDATE',[ ses(), copies, true]);
-								var robj = obj.network.simple_request(
-									'FM_ACP_FLESHED_BATCH_UPDATE', 
-									[ ses(), copies, true ], 
-									null,
-									{
-										'title' : document.getElementById('circStrings').getString('staff.circ.copy_status.del_items.title'),
-										'overridable_events' : [
-											1208 /* TITLE_LAST_COPY */,
-											1227 /* COPY_DELETE_WARNING */
-										]
-									}
-								);
-	
+        var robj = obj.network.simple_request(
+         'FM_ACP_FLESHED_BATCH_UPDATE', 
+         [ ses(), copies, true ], 
+         null,
+         {
+          'title' : document.getElementById('circStrings').getString('staff.circ.copy_status.del_items.title'),
+          'overridable_events' : [
+           1208 /* TITLE_LAST_COPY */,
+           1227 /* COPY_DELETE_WARNING */
+          ]
+         }
+        );
+ 
                                 if (typeof robj.ilsevent != 'undefined') {
-									switch(Number(robj.ilsevent)) {
-										case 1208 /* TITLE_LAST_COPY */:
-										case 1227 /* COPY_DELETE_WARNING */:
-										break;
-										default:
-											obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.copy_status.del_items.success.error'), robj);
-										break;
-									}
-								} else { alert(document.getElementById('circStrings').getString('staff.circ.copy_status.del_items.success')); }
-
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert('copy status -> delete items',E);
-							}
-						}
-					],
-					'cmd_transfer_items' : [
-						['command'],
-						function() {
-								try {
-									obj.data.stash_retrieve();
-									if (!obj.data.marked_volume) {
-										alert(document.getElementById('circStrings').getString('staff.circ.copy_status.transfer_items.mark_destination'));
-										return;
-									}
-									
-									JSAN.use('util.functional');
-
-									var list = util.functional.map_list( obj.selection_list, function(o) { return o.copy_id; } );
-
-									var volume = obj.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ obj.data.marked_volume ]);
-
-									JSAN.use('cat.util'); cat.util.transfer_copies( { 
-										'copy_ids' : list, 
-										'docid' : volume.record(),
-										'volume_label' : volume.label(),
-										'owning_lib' : volume.owning_lib()
-									} );
-
-								} catch(E) {
-									obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.copy_status.transfer_items.problem'), E);
-								}
-							}
-
-					],
-					'cmd_add_volumes' : [
-						['command'],
-						function() {
-							try {
-								JSAN.use('util.functional');
-								var list = util.functional.map_list( obj.selection_list, function(o) { return o.acn_id; } );
-								if (list.length == 0) { return; }
-
-								var aou_hash = {}; var map_acn = {};
-
-								for (var i = 0; i < list.length; i++) {
-									var volume_id = list[i];
-									if (volume_id == -1) {
-										continue; /* ignore magic pre-cat volume */
-									}
-									if (! map_acn[volume_id]) {
-										map_acn[ volume_id ] = obj.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ volume_id ]);
-									}
-									var record_id = map_acn[ volume_id ].record();
-									var ou_id = map_acn[ volume_id ].owning_lib();
-									var label = map_acn[ volume_id ].label();
-									if (!aou_hash[record_id]) aou_hash[record_id] = {};
-									aou_hash[record_id][ou_id] = 1;
-
-								}
-
-								for (var r in aou_hash) {
-
-									list = []; for (var org in aou_hash[r]) list.push(org);
-
-									var edit = 0;
-									try {
-										edit = obj.network.request(
-											api.PERM_MULTI_ORG_CHECK.app,
-											api.PERM_MULTI_ORG_CHECK.method,
-											[ 
-												ses(), 
-												obj.data.list.au[0].id(), 
-												list,
-												[ 'CREATE_VOLUME', 'CREATE_COPY' ]
-											]
-										).length == 0 ? 1 : 0;
-									} catch(E) {
-										obj.error.sdump('D_ERROR','batch permission check: ' + E);
-									}
-
-									if (edit==0) {
-										alert(document.getElementById('circStrings').getString('staff.circ.copy_status.add_volumes.perm_failure'));
-										return; // no read-only view for this interface
-									}
-
-									var title = document.getElementById('circStrings').getFormattedString('staff.circ.copy_status.add_volumes.title', [r]);
-
-									JSAN.use('util.window'); var win = new util.window();
-									var w = win.open(
-										window.xulG.url_prefix(urls.XUL_VOLUME_COPY_CREATOR),
-											//+'?doc_id=' + window.escape(r)
-											//+'&ou_ids=' + window.escape( js2JSON(list) ),
-										title,
-										'chrome,resizable',
-										{ 'doc_id' : r, 'ou_ids' : list }
-									);
-
-								}
-
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert('copy status -> add volumes',E);
-							}
-						}
-
-					],
-					'cmd_edit_volumes' : [
-						['command'],
-						function() {
-							try {
-								JSAN.use('util.functional');
-								var list = util.functional.map_list( obj.selection_list, function(o) { return o.acn_id; } );
-								if (list.length == 0) { return; }
-
-								var volume_hash = {}; var map_acn = {};
-
-								for (var i = 0; i < list.length; i++) {
-									var volume_id = list[i];
-									if (volume_id == -1) {
-										continue; /* ignore magic pre-cat volume */
-									}
-									if (! map_acn[volume_id]) {
-										map_acn[ volume_id ] = obj.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ volume_id ]);
-										map_acn[ volume_id ].copies( [] );
-									}
-									var record_id = map_acn[ volume_id ].record();
-									if (!volume_hash[record_id]) {
-										volume_hash[record_id] = {};
-									}
-									volume_hash[record_id][volume_id] = 1;
-								}
-
-								for (var rec in volume_hash) {
-
-									list = [];
-									for (var v in volume_hash[rec]) {
-										list.push( map_acn[v] );
-									}
-
-									var edit = 0;
-									try {
-										edit = obj.network.request(
-											api.PERM_MULTI_ORG_CHECK.app,
-											api.PERM_MULTI_ORG_CHECK.method,
-											[ 
-												ses(), 
-												obj.data.list.au[0].id(), 
-												util.functional.map_list(
-													list,
-													function (o) {
-														return o.owning_lib();
-													}
-												),
-												[ 'UPDATE_VOLUME' ]
-											]
-										).length == 0 ? 1 : 0;
-									} catch(E) {
-										obj.error.sdump('D_ERROR','batch permission check: ' + E);
-									}
-
-									if (edit==0) {
-										alert(document.getElementById('circStrings').getString('staff.circ.copy_status.edit_volumes.perm_failure'));
-										return; // no read-only view for this interface
-									}
-
-									var title;
-									if (list.length == 1) {
-										title = document.getElementById('circStrings').getFormattedString('staff.circ.copy_status.edit_volume.title', [rec]);
-									} else {
-										title = document.getElementById('circStrings').getFormattedString('staff.circ.copy_status.edit_volumes.title', [rec]);
-									}
-
-									JSAN.use('util.window'); var win = new util.window();
-									//obj.data.volumes_temp = js2JSON( list );
-									//obj.data.stash('volumes_temp');
-									var my_xulG = win.open(
-										window.xulG.url_prefix(urls.XUL_VOLUME_EDITOR),
-										title,
-										'chrome,modal,resizable',
-										{ 'volumes' : JSON2js(js2JSON(list)) }
-									);
-
-									/* FIXME -- need to unique the temp space, and not rely on modalness of window */
-									//obj.data.stash_retrieve();
-									//var volumes = JSON2js( obj.data.volumes_temp );
+         switch(Number(robj.ilsevent)) {
+          case 1208 /* TITLE_LAST_COPY */:
+          case 1227 /* COPY_DELETE_WARNING */:
+          break;
+          default:
+           obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.copy_status.del_items.success.error'), robj);
+          break;
+         }
+        } else { alert(document.getElementById('circStrings').getString('staff.circ.copy_status.del_items.success')); }
+
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert('copy status -> delete items',E);
+       }
+      }
+     ],
+     'cmd_transfer_items' : [
+      ['command'],
+      function() {
+        try {
+         obj.data.stash_retrieve();
+         if (!obj.data.marked_volume) {
+          alert(document.getElementById('circStrings').getString('staff.circ.copy_status.transfer_items.mark_destination'));
+          return;
+         }
+         
+         JSAN.use('util.functional');
+
+         var list = util.functional.map_list( obj.selection_list, function(o) { return o.copy_id; } );
+
+         var volume = obj.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ obj.data.marked_volume ]);
+
+         JSAN.use('cat.util'); cat.util.transfer_copies( { 
+          'copy_ids' : list, 
+          'docid' : volume.record(),
+          'volume_label' : volume.label(),
+          'owning_lib' : volume.owning_lib()
+         } );
+
+        } catch(E) {
+         obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.copy_status.transfer_items.problem'), E);
+        }
+       }
+
+     ],
+     'cmd_add_volumes' : [
+      ['command'],
+      function() {
+       try {
+        JSAN.use('util.functional');
+        var list = util.functional.map_list( obj.selection_list, function(o) { return o.acn_id; } );
+        if (list.length == 0) { return; }
+
+        var aou_hash = {}; var map_acn = {};
+
+        for (var i = 0; i < list.length; i++) {
+         var volume_id = list[i];
+         if (volume_id == -1) {
+          continue; /* ignore magic pre-cat volume */
+         }
+         if (! map_acn[volume_id]) {
+          map_acn[ volume_id ] = obj.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ volume_id ]);
+         }
+         var record_id = map_acn[ volume_id ].record();
+         var ou_id = map_acn[ volume_id ].owning_lib();
+         var label = map_acn[ volume_id ].label();
+         if (!aou_hash[record_id]) aou_hash[record_id] = {};
+         aou_hash[record_id][ou_id] = 1;
+
+        }
+
+        for (var r in aou_hash) {
+
+         list = []; for (var org in aou_hash[r]) list.push(org);
+
+         var edit = 0;
+         try {
+          edit = obj.network.request(
+           api.PERM_MULTI_ORG_CHECK.app,
+           api.PERM_MULTI_ORG_CHECK.method,
+           [ 
+            ses(), 
+            obj.data.list.au[0].id(), 
+            list,
+            [ 'CREATE_VOLUME', 'CREATE_COPY' ]
+           ]
+          ).length == 0 ? 1 : 0;
+         } catch(E) {
+          obj.error.sdump('D_ERROR','batch permission check: ' + E);
+         }
+
+         if (edit==0) {
+          alert(document.getElementById('circStrings').getString('staff.circ.copy_status.add_volumes.perm_failure'));
+          return; // no read-only view for this interface
+         }
+
+         var title = document.getElementById('circStrings').getFormattedString('staff.circ.copy_status.add_volumes.title', [r]);
+
+         JSAN.use('util.window'); var win = new util.window();
+         var w = win.open(
+          window.xulG.url_prefix(urls.XUL_VOLUME_COPY_CREATOR),
+           //+'?doc_id=' + window.escape(r)
+           //+'&ou_ids=' + window.escape( js2JSON(list) ),
+          title,
+          'chrome,resizable',
+          { 'doc_id' : r, 'ou_ids' : list }
+         );
+
+        }
+
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert('copy status -> add volumes',E);
+       }
+      }
+
+     ],
+     'cmd_edit_volumes' : [
+      ['command'],
+      function() {
+       try {
+        JSAN.use('util.functional');
+        var list = util.functional.map_list( obj.selection_list, function(o) { return o.acn_id; } );
+        if (list.length == 0) { return; }
+
+        var volume_hash = {}; var map_acn = {};
+
+        for (var i = 0; i < list.length; i++) {
+         var volume_id = list[i];
+         if (volume_id == -1) {
+          continue; /* ignore magic pre-cat volume */
+         }
+         if (! map_acn[volume_id]) {
+          map_acn[ volume_id ] = obj.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ volume_id ]);
+          map_acn[ volume_id ].copies( [] );
+         }
+         var record_id = map_acn[ volume_id ].record();
+         if (!volume_hash[record_id]) {
+          volume_hash[record_id] = {};
+         }
+         volume_hash[record_id][volume_id] = 1;
+        }
+
+        for (var rec in volume_hash) {
+
+         list = [];
+         for (var v in volume_hash[rec]) {
+          list.push( map_acn[v] );
+         }
+
+         var edit = 0;
+         try {
+          edit = obj.network.request(
+           api.PERM_MULTI_ORG_CHECK.app,
+           api.PERM_MULTI_ORG_CHECK.method,
+           [ 
+            ses(), 
+            obj.data.list.au[0].id(), 
+            util.functional.map_list(
+             list,
+             function (o) {
+              return o.owning_lib();
+             }
+            ),
+            [ 'UPDATE_VOLUME' ]
+           ]
+          ).length == 0 ? 1 : 0;
+         } catch(E) {
+          obj.error.sdump('D_ERROR','batch permission check: ' + E);
+         }
+
+         if (edit==0) {
+          alert(document.getElementById('circStrings').getString('staff.circ.copy_status.edit_volumes.perm_failure'));
+          return; // no read-only view for this interface
+         }
+
+         var title;
+         if (list.length == 1) {
+          title = document.getElementById('circStrings').getFormattedString('staff.circ.copy_status.edit_volume.title', [rec]);
+         } else {
+          title = document.getElementById('circStrings').getFormattedString('staff.circ.copy_status.edit_volumes.title', [rec]);
+         }
+
+         JSAN.use('util.window'); var win = new util.window();
+         //obj.data.volumes_temp = js2JSON( list );
+         //obj.data.stash('volumes_temp');
+         var my_xulG = win.open(
+          window.xulG.url_prefix(urls.XUL_VOLUME_EDITOR),
+          title,
+          'chrome,modal,resizable',
+          { 'volumes' : JSON2js(js2JSON(list)) }
+         );
+
+         /* FIXME -- need to unique the temp space, and not rely on modalness of window */
+         //obj.data.stash_retrieve();
+         //var volumes = JSON2js( obj.data.volumes_temp );
                                     if (typeof my_xulG.update_these_volumes == 'undefined') { return; }
-									var volumes = my_xulG.volumes;
-									if (!volumes) { return; }
-								
-									volumes = util.functional.filter_list(
-										volumes,
-										function (o) {
-											return o.ischanged() == '1';
-										}
-									);
-
-									volumes = util.functional.map_list(
-										volumes,
-										function (o) {
-											o.record( rec ); // staff client 2 did not do this.  Does it matter?
-											return o;
-										}
-									);
-
-									if (volumes.length == 0) { return; }
-
-									try {
-										var r = obj.network.request(
-											api.FM_ACN_TREE_UPDATE.app,
-											api.FM_ACN_TREE_UPDATE.method,
-											[ ses(), volumes, false ]
-										);
+         var volumes = my_xulG.volumes;
+         if (!volumes) { return; }
+        
+         volumes = util.functional.filter_list(
+          volumes,
+          function (o) {
+           return o.ischanged() == '1';
+          }
+         );
+
+         volumes = util.functional.map_list(
+          volumes,
+          function (o) {
+           o.record( rec ); // staff client 2 did not do this.  Does it matter?
+           return o;
+          }
+         );
+
+         if (volumes.length == 0) { return; }
+
+         try {
+          var r = obj.network.request(
+           api.FM_ACN_TREE_UPDATE.app,
+           api.FM_ACN_TREE_UPDATE.method,
+           [ ses(), volumes, false ]
+          );
                                         if (typeof r.ilsevent != 'undefined') {
                                             switch(Number(r.ilsevent)) {
                                                 case 1705 /* VOLUME_LABEL_EXISTS */ :
@@ -695,376 +695,376 @@ circ.copy_status.prototype = {
                                                 default: throw(r);
                                             }
                                         } else {
-    										alert(document.getElementById('circStrings').getString('staff.circ.copy_status.edit_volumes.success'));
+              alert(document.getElementById('circStrings').getString('staff.circ.copy_status.edit_volumes.success'));
                                         }
-									} catch(E) {
-										obj.error.standard_unexpected_error_alert('volume update error: ',E);
-									}
-
-								}
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert('Copy Status -> Volume Edit',E);
-							}
-						}
-
-					],
-					'cmd_delete_volumes' : [
-						['command'],
-						function() {
-							try {
-								JSAN.use('util.functional');
-								var list = util.functional.map_list( obj.selection_list, function(o) { return o.acn_id; } );
-								if (list.length == 0) { return; }
-
-								var map_acn = {};
-
-								for (var i = 0; i < list.length; i++) {
-									var volume_id = list[i];
-									if (volume_id == -1) {
-										continue; /* ignore magic pre-cat volume */
-									}
-									if (! map_acn[volume_id]) {
-										map_acn[ volume_id ] = obj.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ volume_id ]);
-									}
-								}
-
-								list = [];
-								for (var v in map_acn) {
-									list.push( map_acn[v] );
-								}
-
-								var confirm_prompt;
-								if (list.length == 1) {
-									confirm_prompt = document.getElementById('circStrings').getString('staff.circ.copy_status.delete_volumes.singular');
-								} else {
-									confirm_prompt = document.getElementById('circStrings').getString('staff.circ.copy_status.delete_volumes.plural');
-								}	
-
-								var r = obj.error.yns_alert(
-									confirm_prompt,
-									document.getElementById('circStrings').getString('staff.circ.copy_status.delete_volumes.title'),
-									document.getElementById('circStrings').getString('staff.circ.copy_status.delete_volumes.delete'),
-									document.getElementById('circStrings').getString('staff.circ.copy_status.delete_volumes.cancel'),
-									null,
-									document.getElementById('circStrings').getString('staff.circ.confirm')
-								);
-
-								if (r == 0) {
-									for (var i = 0; i < list.length; i++) {
-										list[i].isdeleted('1');
-									}
-									var robj = obj.network.simple_request(
-										'FM_ACN_TREE_UPDATE', 
-										[ ses(), list, true ],
-										null,
-										{
-											'title' : document.getElementById('circStrings').getString('staff.circ.copy_status.delete_volumes.override'),
-											'overridable_events' : [
-											]
-										}
-									);
-									if (robj == null) throw(robj);
-									if (typeof robj.ilsevent != 'undefined') {
-										if (robj.ilsevent == 1206 /* VOLUME_NOT_EMPTY */) {
-											alert(document.getElementById('circStrings').getString('staff.circ.copy_status.delete_volumes.delete_copies'));
-											return;
-										}
-										if (robj.ilsevent != 0) { throw(robj); }
-									}
-									alert(document.getElementById('circStrings').getString('staff.circ.copy_status.delete_volumes.success'));
-								}
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert('copy status -> delete volumes',E);
-							}
-
-						}
-
-					],
-					'cmd_mark_volume' : [
-						['command'],
-						function() {
-							try {
-								JSAN.use('util.functional');
-								var list = util.functional.map_list( obj.selection_list, function(o) { return o.acn_id; } );
-
-								if (list.length == 1) {
-									obj.data.marked_volume = list[0];
-									obj.data.stash('marked_volume');
-									alert(document.getElementById('circStrings').getString('staff.circ.copy_status.mark_volume.status'));
-								} else {
-									obj.error.yns_alert(
-										document.getElementById('circStrings').getString('staff.circ.copy_status.mark_volume.prompt'),
-										document.getElementById('circStrings').getString('staff.circ.copy_status.mark_volume.title'),
-										document.getElementById('circStrings').getString('staff.circ.copy_status.ok'),
-										null,
-										null,
-										document.getElementById('circStrings').getString('staff.circ.confirm')
-									);
-								}
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert('copy status -> mark volume',E);
-							}
-						}
-					],
-					'cmd_mark_library' : [
-						['command'],
-						function() {
-							try {
-								JSAN.use('util.functional');
-								var list = util.functional.map_list( obj.selection_list, function(o) { return o.acn_id; } );
-
-								if (list.length == 1) {
-									var v = obj.network.simple_request('FM_ACN_RETRIEVE.authoritative',[list[0]]);
-									var owning_lib = v.owning_lib();
-									if (typeof owning_lib == 'object') {
-										owning_lib = owning_lib.id();
-									}
-
-									obj.data.marked_library = { 'lib' : owning_lib, 'docid' : v.record() };
-									obj.data.stash('marked_library');
-									alert(document.getElementById('circStrings').getString('staff.circ.copy_status.mark_library'));
-								} else {
-									obj.error.yns_alert(
-										document.getElementById('circStrings').getString('staff.circ.copy_status.mark_library.limit_one'),
-										document.getElementById('circStrings').getString('staff.circ.copy_status.mark_library.limit_one.title'),
-										document.getElementById('circStrings').getString('staff.circ.copy_status.ok'),
-										null,
-										null,
-										document.getElementById('circStrings').getString('staff.circ.confirm')
-									);
-								}
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert('copy status -> mark library',E);
-							}
-						}
-					],
-					'cmd_transfer_volume' : [
-						['command'],
-						function() {
-							try {
-									obj.data.stash_retrieve();
-									if (!obj.data.marked_library) {
-										alert(document.getElementById('circStrings').getString('staff.circ.copy_status.transfer_volume.none'));
-										return;
-									}
-									
-									JSAN.use('util.functional');
-
-									var list = util.functional.map_list( obj.selection_list, function(o) { return o.acn_id; } );
-									if (list.length == 0) { return; }
-
-									var map_acn = {};
-
-									for (var i = 0; i < list.length; i++) {
-										var volume_id = list[i];
-										if (volume_id == -1) {
-											continue; /* ignore magic pre-cat volume */
-										}
-										if (! map_acn[volume_id]) {
-											map_acn[ volume_id ] = obj.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ volume_id ]);
-										}
-									}
-
-									list = [];
-									for (v in map_acn) {
-										list.push(map_acn[v]);
-									}
-
-									netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
-									var xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: auto">';
-									xml += '<description>';
-
-									var vols = util.functional.map_list(list,
-										function (o) {
-											return o.label();
-										}
-									).join(", ");
-
-									var volume_list = document.getElementById('circStrings').getFormattedString('staff.circ.copy_status.transfer_volume.confirm', 
-										[vols, obj.data.hash.aou[ obj.data.marked_library.lib ].shortname()]);
-
-									xml += volume_list;
-									xml += '</description>';
-									xml += '<hbox><button label="';
-									xml += document.getElementById('circStrings').getString('staff.circ.copy_status.transfer_volume.transfer.label');
-									xml += '" name="fancy_submit"/>';
-									xml += '<button label="';
-									xml += document.getElementById('circStrings').getString('staff.circ.copy_status.transfer_volume.cancel.label');
-									xml += '" accesskey="';
-									xml += document.getElementById('circStrings').getString('staff.circ.copy_status.transfer_volume.cancel.accesskey');
-									xml += '" name="fancy_cancel"/></hbox>';
-									xml += '<iframe style="overflow: scroll" flex="1" src="' + urls.XUL_BIB_BRIEF + '?docid=' + obj.data.marked_library.docid + '"/>';
-									xml += '</vbox>';
-									JSAN.use('OpenILS.data');
-									//var data = new OpenILS.data(); data.init({'via':'stash'});
-									//data.temp_transfer = xml; data.stash('temp_transfer');
-									JSAN.use('util.window'); var win = new util.window();
-									var fancy_prompt_data = win.open(
-										urls.XUL_FANCY_PROMPT,
-										//+ '?xml_in_stash=temp_transfer'
-										//+ '&title=' + window.escape('Volume Transfer'),
-										'fancy_prompt', 'chrome,resizable,modal,width=500,height=300',
-										{ 'xml' : xml, 'title' : document.getElementById('circStrings').getString('staff.circ.copy_status.transfer_volume.title') }
-									);
-								
-									if (fancy_prompt_data.fancy_status == 'incomplete') { 
-										alert(document.getElementById('circStrings').getString('staff.circ.copy_status.transfer_volume.aborted'));
-										return;
-									}
-
-									var robj = obj.network.simple_request(
-										'FM_ACN_TRANSFER', 
-										[ ses(), { 'docid' : obj.data.marked_library.docid, 'lib' : obj.data.marked_library.lib, 'volumes' : util.functional.map_list( list, function(o) { return o.id(); }) } ],
-										null,
-										{
-											'title' : document.getElementById('circStrings').getString('staff.circ.copy_status.transfer_volume.override_failure'),
-											'overridable_events' : [
-												1208 /* TITLE_LAST_COPY */,
-												1219 /* COPY_REMOTE_CIRC_LIB */
-											]
-										}
-									);
-
-									if (typeof robj.ilsevent != 'undefined') {
-										if (robj.ilsevent == 1221 /* ORG_CANNOT_HAVE_VOLS */) {
-											alert(document.getElementById('circStrings').getString('staff.circ.copy_status.transfer_volume.cannot_have_vols'));
-										} else {
-											throw(robj);
-										}
-									} else {
-										alert(document.getElementById('circStrings').getString('staff.circ.copy_status.transfer_volume.success'));
-									}
-
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.copy_status.transfer_volume.error'),E);
-							}
-						}
-
-					]
-				}
-			}
-		);
-		this.controller.render();
-		this.controller.view.copy_status_barcode_entry_textbox.focus();
-
-	},
-
-	'test_barcode' : function(bc) {
-		var obj = this;
-		var good = util.barcode.check(bc);
-		var x = document.getElementById('strict_barcode');
-		if (x && x.checked != true) { return true; }
-		if (good) {
-			return true;
-		} else {
-			if ( 1 == obj.error.yns_alert(
-						document.getElementById('circStrings').getFormattedString('staff.circ.check_digit.bad', [bc]),
-						document.getElementById('circStrings').getString('staff.circ.barcode.bad'),
-						document.getElementById('circStrings').getString('staff.circ.cancel'),
-						document.getElementById('circStrings').getString('staff.circ.barcode.accept'),
-						null,
-						document.getElementById('circStrings').getString('staff.circ.confirm'),
-						'/xul/server/skin/media/images/bad_barcode.png'
-			) ) {
-				return true;
-			} else {
-				return false;
-			}
-		}
-	},
-
-	'copy_status' : function(barcode,refresh) {
-		var obj = this;
-		try {
-			try { document.getElementById('last_scanned').setAttribute('value',''); } catch(E) {}
-			if (!barcode) {
-				barcode = obj.controller.view.copy_status_barcode_entry_textbox.value;
-			}
-			if (!barcode) { return; }
-			if (barcode) {
-				if ( obj.test_barcode(barcode) ) { /* good */ } else { /* bad */ return; }
-			}
-			JSAN.use('circ.util');
-			function handle_req(req) {
-				try {
-					var details = req.getResultObject();
-					if (details == null) {
-						throw(document.getElementById('circStrings').getString('staff.circ.copy_status.status.null_result'));
-					} else if (details.ilsevent) {
-						switch(Number(details.ilsevent)) {
-							case -1: 
-								obj.error.standard_network_error_alert(); 
-								obj.controller.view.copy_status_barcode_entry_textbox.select();
-								obj.controller.view.copy_status_barcode_entry_textbox.focus();
-								return;
-							break;
-							case 1502 /* ASSET_COPY_NOT_FOUND */ :
-								try { document.getElementById('last_scanned').setAttribute('value', document.getElementById('circStrings').getFormattedString('staff.circ.copy_status.status.copy_not_found', [barcode])); } catch(E) {}
-								obj.error.yns_alert(
-									document.getElementById('circStrings').getFormattedString('staff.circ.copy_status.status.copy_not_found', [barcode]),
-									document.getElementById('circStrings').getString('staff.circ.copy_status.status.not_cataloged'),
-									document.getElementById('circStrings').getString('staff.circ.copy_status.ok'),
-									null,
-									null,
-									document.getElementById('circStrings').getString('staff.circ.confirm.msg')
-								);
-								obj.controller.view.copy_status_barcode_entry_textbox.select();
-								obj.controller.view.copy_status_barcode_entry_textbox.focus();
-								return;
-							break;
-							default: 
-								throw(details); 
-							break;
-						}
-					}
-					var msg = details.copy.barcode() + ' -- ';
-					if (details.copy.call_number() == -1) {
-						msg += document.getElementById('circStrings').getString('staff.circ.copy_status.status.pre_cat') + '  ';
-					}
-					if (details.hold) {
-						msg += document.getElementById('circStrings').getString('staff.circ.copy_status.status.hold') + '  ';
-					}
-					if (details.transit) {
-						msg += document.getElementById('circStrings').getString('staff.circ.copy_status.status.transit') + '  ';
-					}
-					if (details.circ && ! details.circ.checkin_time()) {
-						msg += document.getElementById('circStrings').getString('staff.circ.copy_status.status.circ') + '  ';
-					}
-					try { document.getElementById('last_scanned').setAttribute('value',msg); } catch(E) {}
-					if (document.getElementById('trim_list')) {
-						var x = document.getElementById('trim_list');
-						if (x.checked) { obj.list.trim_list = 20; } else { obj.list.trim_list = null; }
-					}
-					var params = {
-						'retrieve_id' : js2JSON( 
-							{ 
-								'renewable' : details.circ ? 't' : 'f', 
-								'copy_id' : details.copy.id(), 
-								'acn_id' : details.volume ? details.volume.id() : -1, 
-								'barcode' : barcode, 
-								'doc_id' : details.mvr ? details.mvr.doc_id() : null  
-							} 
-						),
-						'row' : {
-							'my' : {
-								'mvr' : details.mvr,
-								'acp' : details.copy,
-								'acn' : details.volume,
-								'atc' : details.transit,
-								'circ' : details.circ,
-								'ahr' : details.hold
-							}
-						},
-						'to_top' : true
-					};
-					if (!refresh) {
-						var nparams = obj.list.append(params);
-						if (!document.getElementById('trim_list').checked) {
-							if (typeof obj.list_copyid_map[details.copy.id()] == 'undefined') obj.list_copyid_map[details.copy.id()] =[];
-							obj.list_copyid_map[details.copy.id()].push(nparams);
-						}
-					} else {
-						if (!document.getElementById('trim_list').checked) {
+         } catch(E) {
+          obj.error.standard_unexpected_error_alert('volume update error: ',E);
+         }
+
+        }
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert('Copy Status -> Volume Edit',E);
+       }
+      }
+
+     ],
+     'cmd_delete_volumes' : [
+      ['command'],
+      function() {
+       try {
+        JSAN.use('util.functional');
+        var list = util.functional.map_list( obj.selection_list, function(o) { return o.acn_id; } );
+        if (list.length == 0) { return; }
+
+        var map_acn = {};
+
+        for (var i = 0; i < list.length; i++) {
+         var volume_id = list[i];
+         if (volume_id == -1) {
+          continue; /* ignore magic pre-cat volume */
+         }
+         if (! map_acn[volume_id]) {
+          map_acn[ volume_id ] = obj.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ volume_id ]);
+         }
+        }
+
+        list = [];
+        for (var v in map_acn) {
+         list.push( map_acn[v] );
+        }
+
+        var confirm_prompt;
+        if (list.length == 1) {
+         confirm_prompt = document.getElementById('circStrings').getString('staff.circ.copy_status.delete_volumes.singular');
+        } else {
+         confirm_prompt = document.getElementById('circStrings').getString('staff.circ.copy_status.delete_volumes.plural');
+        } 
+
+        var r = obj.error.yns_alert(
+         confirm_prompt,
+         document.getElementById('circStrings').getString('staff.circ.copy_status.delete_volumes.title'),
+         document.getElementById('circStrings').getString('staff.circ.copy_status.delete_volumes.delete'),
+         document.getElementById('circStrings').getString('staff.circ.copy_status.delete_volumes.cancel'),
+         null,
+         document.getElementById('circStrings').getString('staff.circ.confirm')
+        );
+
+        if (r == 0) {
+         for (var i = 0; i < list.length; i++) {
+          list[i].isdeleted('1');
+         }
+         var robj = obj.network.simple_request(
+          'FM_ACN_TREE_UPDATE', 
+          [ ses(), list, true ],
+          null,
+          {
+           'title' : document.getElementById('circStrings').getString('staff.circ.copy_status.delete_volumes.override'),
+           'overridable_events' : [
+           ]
+          }
+         );
+         if (robj == null) throw(robj);
+         if (typeof robj.ilsevent != 'undefined') {
+          if (robj.ilsevent == 1206 /* VOLUME_NOT_EMPTY */) {
+           alert(document.getElementById('circStrings').getString('staff.circ.copy_status.delete_volumes.delete_copies'));
+           return;
+          }
+          if (robj.ilsevent != 0) { throw(robj); }
+         }
+         alert(document.getElementById('circStrings').getString('staff.circ.copy_status.delete_volumes.success'));
+        }
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert('copy status -> delete volumes',E);
+       }
+
+      }
+
+     ],
+     'cmd_mark_volume' : [
+      ['command'],
+      function() {
+       try {
+        JSAN.use('util.functional');
+        var list = util.functional.map_list( obj.selection_list, function(o) { return o.acn_id; } );
+
+        if (list.length == 1) {
+         obj.data.marked_volume = list[0];
+         obj.data.stash('marked_volume');
+         alert(document.getElementById('circStrings').getString('staff.circ.copy_status.mark_volume.status'));
+        } else {
+         obj.error.yns_alert(
+          document.getElementById('circStrings').getString('staff.circ.copy_status.mark_volume.prompt'),
+          document.getElementById('circStrings').getString('staff.circ.copy_status.mark_volume.title'),
+          document.getElementById('circStrings').getString('staff.circ.copy_status.ok'),
+          null,
+          null,
+          document.getElementById('circStrings').getString('staff.circ.confirm')
+         );
+        }
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert('copy status -> mark volume',E);
+       }
+      }
+     ],
+     'cmd_mark_library' : [
+      ['command'],
+      function() {
+       try {
+        JSAN.use('util.functional');
+        var list = util.functional.map_list( obj.selection_list, function(o) { return o.acn_id; } );
+
+        if (list.length == 1) {
+         var v = obj.network.simple_request('FM_ACN_RETRIEVE.authoritative',[list[0]]);
+         var owning_lib = v.owning_lib();
+         if (typeof owning_lib == 'object') {
+          owning_lib = owning_lib.id();
+         }
+
+         obj.data.marked_library = { 'lib' : owning_lib, 'docid' : v.record() };
+         obj.data.stash('marked_library');
+         alert(document.getElementById('circStrings').getString('staff.circ.copy_status.mark_library'));
+        } else {
+         obj.error.yns_alert(
+          document.getElementById('circStrings').getString('staff.circ.copy_status.mark_library.limit_one'),
+          document.getElementById('circStrings').getString('staff.circ.copy_status.mark_library.limit_one.title'),
+          document.getElementById('circStrings').getString('staff.circ.copy_status.ok'),
+          null,
+          null,
+          document.getElementById('circStrings').getString('staff.circ.confirm')
+         );
+        }
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert('copy status -> mark library',E);
+       }
+      }
+     ],
+     'cmd_transfer_volume' : [
+      ['command'],
+      function() {
+       try {
+         obj.data.stash_retrieve();
+         if (!obj.data.marked_library) {
+          alert(document.getElementById('circStrings').getString('staff.circ.copy_status.transfer_volume.none'));
+          return;
+         }
+         
+         JSAN.use('util.functional');
+
+         var list = util.functional.map_list( obj.selection_list, function(o) { return o.acn_id; } );
+         if (list.length == 0) { return; }
+
+         var map_acn = {};
+
+         for (var i = 0; i < list.length; i++) {
+          var volume_id = list[i];
+          if (volume_id == -1) {
+           continue; /* ignore magic pre-cat volume */
+          }
+          if (! map_acn[volume_id]) {
+           map_acn[ volume_id ] = obj.network.simple_request('FM_ACN_RETRIEVE.authoritative',[ volume_id ]);
+          }
+         }
+
+         list = [];
+         for (v in map_acn) {
+          list.push(map_acn[v]);
+         }
+
+         netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
+         var xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: auto">';
+         xml += '<description>';
+
+         var vols = util.functional.map_list(list,
+          function (o) {
+           return o.label();
+          }
+         ).join(", ");
+
+         var volume_list = document.getElementById('circStrings').getFormattedString('staff.circ.copy_status.transfer_volume.confirm', 
+          [vols, obj.data.hash.aou[ obj.data.marked_library.lib ].shortname()]);
+
+         xml += volume_list;
+         xml += '</description>';
+         xml += '<hbox><button label="';
+         xml += document.getElementById('circStrings').getString('staff.circ.copy_status.transfer_volume.transfer.label');
+         xml += '" name="fancy_submit"/>';
+         xml += '<button label="';
+         xml += document.getElementById('circStrings').getString('staff.circ.copy_status.transfer_volume.cancel.label');
+         xml += '" accesskey="';
+         xml += document.getElementById('circStrings').getString('staff.circ.copy_status.transfer_volume.cancel.accesskey');
+         xml += '" name="fancy_cancel"/></hbox>';
+         xml += '<iframe style="overflow: scroll" flex="1" src="' + urls.XUL_BIB_BRIEF + '?docid=' + obj.data.marked_library.docid + '"/>';
+         xml += '</vbox>';
+         JSAN.use('OpenILS.data');
+         //var data = new OpenILS.data(); data.init({'via':'stash'});
+         //data.temp_transfer = xml; data.stash('temp_transfer');
+         JSAN.use('util.window'); var win = new util.window();
+         var fancy_prompt_data = win.open(
+          urls.XUL_FANCY_PROMPT,
+          //+ '?xml_in_stash=temp_transfer'
+          //+ '&title=' + window.escape('Volume Transfer'),
+          'fancy_prompt', 'chrome,resizable,modal,width=500,height=300',
+          { 'xml' : xml, 'title' : document.getElementById('circStrings').getString('staff.circ.copy_status.transfer_volume.title') }
+         );
+        
+         if (fancy_prompt_data.fancy_status == 'incomplete') { 
+          alert(document.getElementById('circStrings').getString('staff.circ.copy_status.transfer_volume.aborted'));
+          return;
+         }
+
+         var robj = obj.network.simple_request(
+          'FM_ACN_TRANSFER', 
+          [ ses(), { 'docid' : obj.data.marked_library.docid, 'lib' : obj.data.marked_library.lib, 'volumes' : util.functional.map_list( list, function(o) { return o.id(); }) } ],
+          null,
+          {
+           'title' : document.getElementById('circStrings').getString('staff.circ.copy_status.transfer_volume.override_failure'),
+           'overridable_events' : [
+            1208 /* TITLE_LAST_COPY */,
+            1219 /* COPY_REMOTE_CIRC_LIB */
+           ]
+          }
+         );
+
+         if (typeof robj.ilsevent != 'undefined') {
+          if (robj.ilsevent == 1221 /* ORG_CANNOT_HAVE_VOLS */) {
+           alert(document.getElementById('circStrings').getString('staff.circ.copy_status.transfer_volume.cannot_have_vols'));
+          } else {
+           throw(robj);
+          }
+         } else {
+          alert(document.getElementById('circStrings').getString('staff.circ.copy_status.transfer_volume.success'));
+         }
+
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.copy_status.transfer_volume.error'),E);
+       }
+      }
+
+     ]
+    }
+   }
+  );
+  this.controller.render();
+  this.controller.view.copy_status_barcode_entry_textbox.focus();
+
+ },
+
+ 'test_barcode' : function(bc) {
+  var obj = this;
+  var good = util.barcode.check(bc);
+  var x = document.getElementById('strict_barcode');
+  if (x && x.checked != true) { return true; }
+  if (good) {
+   return true;
+  } else {
+   if ( 1 == obj.error.yns_alert(
+      document.getElementById('circStrings').getFormattedString('staff.circ.check_digit.bad', [bc]),
+      document.getElementById('circStrings').getString('staff.circ.barcode.bad'),
+      document.getElementById('circStrings').getString('staff.circ.cancel'),
+      document.getElementById('circStrings').getString('staff.circ.barcode.accept'),
+      null,
+      document.getElementById('circStrings').getString('staff.circ.confirm'),
+      '/xul/server/skin/media/images/bad_barcode.png'
+   ) ) {
+    return true;
+   } else {
+    return false;
+   }
+  }
+ },
+
+ 'copy_status' : function(barcode,refresh) {
+  var obj = this;
+  try {
+   try { document.getElementById('last_scanned').setAttribute('value',''); } catch(E) {}
+   if (!barcode) {
+    barcode = obj.controller.view.copy_status_barcode_entry_textbox.value;
+   }
+   if (!barcode) { return; }
+   if (barcode) {
+    if ( obj.test_barcode(barcode) ) { /* good */ } else { /* bad */ return; }
+   }
+   JSAN.use('circ.util');
+   function handle_req(req) {
+    try {
+     var details = req.getResultObject();
+     if (details == null) {
+      throw(document.getElementById('circStrings').getString('staff.circ.copy_status.status.null_result'));
+     } else if (details.ilsevent) {
+      switch(Number(details.ilsevent)) {
+       case -1: 
+        obj.error.standard_network_error_alert(); 
+        obj.controller.view.copy_status_barcode_entry_textbox.select();
+        obj.controller.view.copy_status_barcode_entry_textbox.focus();
+        return;
+       break;
+       case 1502 /* ASSET_COPY_NOT_FOUND */ :
+        try { document.getElementById('last_scanned').setAttribute('value', document.getElementById('circStrings').getFormattedString('staff.circ.copy_status.status.copy_not_found', [barcode])); } catch(E) {}
+        obj.error.yns_alert(
+         document.getElementById('circStrings').getFormattedString('staff.circ.copy_status.status.copy_not_found', [barcode]),
+         document.getElementById('circStrings').getString('staff.circ.copy_status.status.not_cataloged'),
+         document.getElementById('circStrings').getString('staff.circ.copy_status.ok'),
+         null,
+         null,
+         document.getElementById('circStrings').getString('staff.circ.confirm.msg')
+        );
+        obj.controller.view.copy_status_barcode_entry_textbox.select();
+        obj.controller.view.copy_status_barcode_entry_textbox.focus();
+        return;
+       break;
+       default: 
+        throw(details); 
+       break;
+      }
+     }
+     var msg = details.copy.barcode() + ' -- ';
+     if (details.copy.call_number() == -1) {
+      msg += document.getElementById('circStrings').getString('staff.circ.copy_status.status.pre_cat') + '  ';
+     }
+     if (details.hold) {
+      msg += document.getElementById('circStrings').getString('staff.circ.copy_status.status.hold') + '  ';
+     }
+     if (details.transit) {
+      msg += document.getElementById('circStrings').getString('staff.circ.copy_status.status.transit') + '  ';
+     }
+     if (details.circ && ! details.circ.checkin_time()) {
+      msg += document.getElementById('circStrings').getString('staff.circ.copy_status.status.circ') + '  ';
+     }
+     try { document.getElementById('last_scanned').setAttribute('value',msg); } catch(E) {}
+     if (document.getElementById('trim_list')) {
+      var x = document.getElementById('trim_list');
+      if (x.checked) { obj.list.trim_list = 20; } else { obj.list.trim_list = null; }
+     }
+     var params = {
+      'retrieve_id' : js2JSON( 
+       { 
+        'renewable' : details.circ ? 't' : 'f', 
+        'copy_id' : details.copy.id(), 
+        'acn_id' : details.volume ? details.volume.id() : -1, 
+        'barcode' : barcode, 
+        'doc_id' : details.mvr ? details.mvr.doc_id() : null  
+       } 
+      ),
+      'row' : {
+       'my' : {
+        'mvr' : details.mvr,
+        'acp' : details.copy,
+        'acn' : details.volume,
+        'atc' : details.transit,
+        'circ' : details.circ,
+        'ahr' : details.hold
+       }
+      },
+      'to_top' : true
+     };
+     if (!refresh) {
+      var nparams = obj.list.append(params);
+      if (!document.getElementById('trim_list').checked) {
+       if (typeof obj.list_copyid_map[details.copy.id()] == 'undefined') obj.list_copyid_map[details.copy.id()] =[];
+       obj.list_copyid_map[details.copy.id()].push(nparams);
+      }
+     } else {
+      if (!document.getElementById('trim_list').checked) {
                             if (typeof obj.list_copyid_map[details.copy.id()] != 'undefined') {
                                 for (var i = 0; i < obj.list_copyid_map[details.copy.id()].length; i++) {
                                     if (typeof obj.list_copyid_map[details.copy.id()][i] == 'undefined') {
@@ -1075,47 +1075,47 @@ circ.copy_status.prototype = {
                                     }
                                 }
                             } else {
-							    obj.list.append(params);
+           obj.list.append(params);
                             }
-						} else {
-							obj.list.append(params);
-						}
-					}
-				} catch(E) {
-					obj.error.standard_unexpected_error_alert('barcode = ' + barcode,E);
-				}
-			}
-			var result = obj.network.simple_request('FM_ACP_DETAILS_VIA_BARCODE.authoritative', [ ses(), barcode ]);
-			handle_req({'getResultObject':function(){return result;}}); // used to be async
-			obj.controller.view.copy_status_barcode_entry_textbox.value = '';
-			obj.controller.view.copy_status_barcode_entry_textbox.focus();
-			
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert('barcode = ' + barcode,E);
-			obj.controller.view.copy_status_barcode_entry_textbox.select();
-			obj.controller.view.copy_status_barcode_entry_textbox.focus();
-		}
-
-	},
-	
-	'spawn_copy_editor' : function() {
-
-		var obj = this;
-
-		JSAN.use('util.functional');
-
-		var list = obj.selection_list;
-
-		list = util.functional.map_list(
-			list,
-			function (o) {
-				return o.copy_id;
-			}
-		);
-
-		JSAN.use('cat.util'); cat.util.spawn_copy_editor( { 'copy_ids' : list, 'edit' : 1 } );
-
-	},
+      } else {
+       obj.list.append(params);
+      }
+     }
+    } catch(E) {
+     obj.error.standard_unexpected_error_alert('barcode = ' + barcode,E);
+    }
+   }
+   var result = obj.network.simple_request('FM_ACP_DETAILS_VIA_BARCODE.authoritative', [ ses(), barcode ]);
+   handle_req({'getResultObject':function(){return result;}}); // used to be async
+   obj.controller.view.copy_status_barcode_entry_textbox.value = '';
+   obj.controller.view.copy_status_barcode_entry_textbox.focus();
+   
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert('barcode = ' + barcode,E);
+   obj.controller.view.copy_status_barcode_entry_textbox.select();
+   obj.controller.view.copy_status_barcode_entry_textbox.focus();
+  }
+
+ },
+ 
+ 'spawn_copy_editor' : function() {
+
+  var obj = this;
+
+  JSAN.use('util.functional');
+
+  var list = obj.selection_list;
+
+  list = util.functional.map_list(
+   list,
+   function (o) {
+    return o.copy_id;
+   }
+  );
+
+  JSAN.use('cat.util'); cat.util.spawn_copy_editor( { 'copy_ids' : list, 'edit' : 1 } );
+
+ },
 
 }
 
diff --git a/Open-ILS/xul/staff_client/server/circ/copy_status.xul b/Open-ILS/xul/staff_client/server/circ/copy_status.xul
index a7d279bd86..05e4eeb167 100644
--- a/Open-ILS/xul/staff_client/server/circ/copy_status.xul
+++ b/Open-ILS/xul/staff_client/server/circ/copy_status.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -21,118 +21,118 @@
 <?xul-overlay href="/xul/server/circ/copy_status_overlay.xul"?>
 
 <window id="copy_status_win" 
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') {
-					throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
-				}
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for copy_status.xul');
-
-				JSAN.use('circ.copy_status'); g.copy_status = new circ.copy_status();
-				g.copy_status.init( 
-					{ 
-					} 
-				);
-
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					try {
-						window.xulG.set_tab_name(document.getElementById('circStrings').getString('staff.circ.copy_status.tab_name'));
-					} catch(E) {
-						alert(E);
-					}
-				}
-
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.stash_retrieve();
-
-				g.barcodes = xul_param(
-					'barcodes',{
-						'concat' : true,
-						'JSON2js_if_cgi' : true,
-						'stash_name':'temp_barcodes_for_copy_status',
-						'clear_xpcom' : true,
-					}
-				) || [];
-				
-				if (g.barcodes.length > 0) {
-					JSAN.use('util.exec'); var exec = new util.exec();
-					var funcs = [];
-					for (var i = 0; i < g.barcodes.length; i++) {
-						funcs.push(
-							function(b){
-								return function() {
-									g.copy_status.copy_status(b);
-								}
-							}(g.barcodes[i])
-						);
-					}
-					exec.chain( funcs );
-				}
-	
-			} catch(E) {
-				var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['circ.copy_status.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function default_focus() { try { setTimeout( function() { document.getElementById('copy_status_barcode_entry_textbox').focus(); }, 0); } catch(E) {} }
-	]]>
-	</script>
-
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-
-	<commandset id="copy_status_cmds">
-		<command id="cmd_copy_status_submit_barcode" />
-		<command id="cmd_copy_status_upload_file" />
-		<command id="cmd_copy_status_print" />
-		<command id="save_columns" />
-		<command id="sel_copy_details" disabled="true"/>
-		<command id="sel_mark_items_damaged" disabled="true"/>
-		<command id="sel_mark_items_missing" disabled="true"/>
-		<command id="cmd_replace_barcode" disabled="true"/>
-		<command id="sel_patron" disabled="true"/>
-		<command id="sel_checkin" disabled="true"/>
-		<command id="sel_renew" disabled="true"/>
-		<command id="sel_edit" disabled="true"/>
-		<command id="sel_opac" disabled="true"/>
-		<command id="sel_bucket" disabled="true"/>
-		<command id="sel_record_bucket" disabled="true" label="&staff.circ.copy_status_overlay.sel_record_bucket.label;" accesskey="&staff.circ.copy_status_overlay.sel_record_bucket.accesskey;" />
-		<command id="sel_spine" disabled="true"/>
-		<command id="sel_transit_abort" disabled="true"/>
-		<command id="sel_clip" disabled="true"/>
-		
-		<command id="cmd_add_items" disabled="true"/>
-		<command id="cmd_delete_items" disabled="true"/>
-		<command id="cmd_transfer_items" disabled="true"/>
-		<command id="cmd_add_volumes" disabled="true"/>
-		<command id="cmd_edit_volumes" disabled="true"/>
-		<command id="cmd_delete_volumes" disabled="true"/>
-		<command id="cmd_mark_volume" disabled="true"/>
-		<command id="cmd_mark_library" disabled="true"/>
-		<command id="cmd_transfer_volume" disabled="true"/>
-
-	</commandset>
-
-	<popupset id="copy_status_popupset"/>
-	<popupset id="copy_cat_status_popupset"/>
-
-	<box id="copy_status_main" />
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') {
+     throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
+    }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for copy_status.xul');
+
+    JSAN.use('circ.copy_status'); g.copy_status = new circ.copy_status();
+    g.copy_status.init( 
+     { 
+     } 
+    );
+
+    if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+     try {
+      window.xulG.set_tab_name(document.getElementById('circStrings').getString('staff.circ.copy_status.tab_name'));
+     } catch(E) {
+      alert(E);
+     }
+    }
+
+    JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.stash_retrieve();
+
+    g.barcodes = xul_param(
+     'barcodes',{
+      'concat' : true,
+      'JSON2js_if_cgi' : true,
+      'stash_name':'temp_barcodes_for_copy_status',
+      'clear_xpcom' : true,
+     }
+    ) || [];
+    
+    if (g.barcodes.length > 0) {
+     JSAN.use('util.exec'); var exec = new util.exec();
+     var funcs = [];
+     for (var i = 0; i < g.barcodes.length; i++) {
+      funcs.push(
+       function(b){
+        return function() {
+         g.copy_status.copy_status(b);
+        }
+       }(g.barcodes[i])
+      );
+     }
+     exec.chain( funcs );
+    }
+ 
+   } catch(E) {
+    var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['circ.copy_status.xul', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+
+  function default_focus() { try { setTimeout( function() { document.getElementById('copy_status_barcode_entry_textbox').focus(); }, 0); } catch(E) {} }
+ ]]>
+ </script>
+
+ <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+ <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+
+ <commandset id="copy_status_cmds">
+  <command id="cmd_copy_status_submit_barcode" />
+  <command id="cmd_copy_status_upload_file" />
+  <command id="cmd_copy_status_print" />
+  <command id="save_columns" />
+  <command id="sel_copy_details" disabled="true"/>
+  <command id="sel_mark_items_damaged" disabled="true"/>
+  <command id="sel_mark_items_missing" disabled="true"/>
+  <command id="cmd_replace_barcode" disabled="true"/>
+  <command id="sel_patron" disabled="true"/>
+  <command id="sel_checkin" disabled="true"/>
+  <command id="sel_renew" disabled="true"/>
+  <command id="sel_edit" disabled="true"/>
+  <command id="sel_opac" disabled="true"/>
+  <command id="sel_bucket" disabled="true"/>
+  <command id="sel_record_bucket" disabled="true" label="&staff.circ.copy_status_overlay.sel_record_bucket.label;" accesskey="&staff.circ.copy_status_overlay.sel_record_bucket.accesskey;" />
+  <command id="sel_spine" disabled="true"/>
+  <command id="sel_transit_abort" disabled="true"/>
+  <command id="sel_clip" disabled="true"/>
+  
+  <command id="cmd_add_items" disabled="true"/>
+  <command id="cmd_delete_items" disabled="true"/>
+  <command id="cmd_transfer_items" disabled="true"/>
+  <command id="cmd_add_volumes" disabled="true"/>
+  <command id="cmd_edit_volumes" disabled="true"/>
+  <command id="cmd_delete_volumes" disabled="true"/>
+  <command id="cmd_mark_volume" disabled="true"/>
+  <command id="cmd_mark_library" disabled="true"/>
+  <command id="cmd_transfer_volume" disabled="true"/>
+
+ </commandset>
+
+ <popupset id="copy_status_popupset"/>
+ <popupset id="copy_cat_status_popupset"/>
+
+ <box id="copy_status_main" />
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/circ/copy_status_overlay.xul b/Open-ILS/xul/staff_client/server/circ/copy_status_overlay.xul
index ef6f4e5b12..07b961cbdf 100644
--- a/Open-ILS/xul/staff_client/server/circ/copy_status_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/circ/copy_status_overlay.xul
@@ -1,181 +1,181 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 <overlay id="copy_status_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading copy_status_overlay.xul\n');</script>
 
 <commandset id="copy_status_cmds" />
 
 <popupset id="copy_status_popupset">
-	<popup id="copy_status_actions" position="at_pointer"> 
-		<menuitem command="sel_clip" label="&staff.circ.copy_status_overlay.sel_clip.label;" accesskey="&staff.circ.copy_status_overlay.sel_clip.accesskey;" />
-		<menuitem command="sel_bucket" label="&staff.circ.copy_status_overlay.sel_bucket.label;" accesskey="&staff.circ.copy_status_overlay.sel_bucket.accesskey;"/>
-		<menuitem command="sel_record_bucket" />
-		<menuitem command="sel_opac" label="&staff.circ.copy_status_overlay.sel_opac.label;" accesskey="&staff.circ.copy_status_overlay.sel_opac.accesskey;" />
-		<menuitem command="sel_copy_details" label="&staff.circ.copy_status_overlay.sel_copy_details.label;" accesskey="&staff.circ.copy_status_overlay.sel_copy_details.accesskey;" />
-		<menuitem command="sel_patron" label="&staff.circ.copy_status_overlay.sel_patron.label;" accesskey="&staff.circ.copy_status_overlay.sel_patron.accesskey;"/>
-		<menuseparator/>
-		<menuitem command="sel_edit" label="&staff.circ.copy_status_overlay.sel_edit.label;" accesskey="&staff.circ.copy_status_overlay.sel_edit.accesskey;" />
-		<menuseparator/>
-		<menuitem command="sel_mark_items_damaged" label="&staff.circ.copy_status_overlay.sel_mark_items_damaged.label;" accesskey="&staff.circ.copy_status_overlay.sel_mark_items_damaged.accesskey;"/>
-		<menuseparator/>
-		<menuitem command="sel_mark_items_missing" label="&staff.circ.copy_status_overlay.sel_mark_items_missing.label;" accesskey="&staff.circ.copy_status_overlay.sel_mark_items_missing.accesskey;"/>
-		<menuseparator/>
-		<menuitem command="sel_transit_abort" label="&staff.circ.copy_status_overlay.sel_transit_abort.label;" />
-		<menuseparator/>
-		<menuitem command="sel_checkin" label="&staff.circ.copy_status_overlay.sel_checkin.label;" accesskey="&staff.circ.copy_status_overlay.sel_checkin.accesskey;" />
-		<menuseparator/>
-		<menuitem command="sel_renew" label="&staff.circ.copy_status_overlay.sel_renew.label;" accesskey="&staff.circ.copy_status_overlay.sel_renew.accesskey;" />
-		<menuseparator />
-		<menuitem command="sel_spine" label="&staff.circ.copy_status_overlay.sel_spine.label;" accesskey="&staff.circ.copy_status_overlay.sel_spine.accesskey;"/>
-		<menuitem command="cmd_replace_barcode" label="&staff.circ.copy_status_overlay.cmd_replace_barcode.label;" accesskey="&staff.circ.copy_status_overlay.cmd_replace_barcode.accesskey;"/>
-		<menuitem command="save_columns" label="&staff.circ.copy_status_overlay.save_columns.label;"/>
-	</popup>
+ <popup id="copy_status_actions" position="at_pointer"> 
+  <menuitem command="sel_clip" label="&staff.circ.copy_status_overlay.sel_clip.label;" accesskey="&staff.circ.copy_status_overlay.sel_clip.accesskey;" />
+  <menuitem command="sel_bucket" label="&staff.circ.copy_status_overlay.sel_bucket.label;" accesskey="&staff.circ.copy_status_overlay.sel_bucket.accesskey;"/>
+  <menuitem command="sel_record_bucket" />
+  <menuitem command="sel_opac" label="&staff.circ.copy_status_overlay.sel_opac.label;" accesskey="&staff.circ.copy_status_overlay.sel_opac.accesskey;" />
+  <menuitem command="sel_copy_details" label="&staff.circ.copy_status_overlay.sel_copy_details.label;" accesskey="&staff.circ.copy_status_overlay.sel_copy_details.accesskey;" />
+  <menuitem command="sel_patron" label="&staff.circ.copy_status_overlay.sel_patron.label;" accesskey="&staff.circ.copy_status_overlay.sel_patron.accesskey;"/>
+  <menuseparator/>
+  <menuitem command="sel_edit" label="&staff.circ.copy_status_overlay.sel_edit.label;" accesskey="&staff.circ.copy_status_overlay.sel_edit.accesskey;" />
+  <menuseparator/>
+  <menuitem command="sel_mark_items_damaged" label="&staff.circ.copy_status_overlay.sel_mark_items_damaged.label;" accesskey="&staff.circ.copy_status_overlay.sel_mark_items_damaged.accesskey;"/>
+  <menuseparator/>
+  <menuitem command="sel_mark_items_missing" label="&staff.circ.copy_status_overlay.sel_mark_items_missing.label;" accesskey="&staff.circ.copy_status_overlay.sel_mark_items_missing.accesskey;"/>
+  <menuseparator/>
+  <menuitem command="sel_transit_abort" label="&staff.circ.copy_status_overlay.sel_transit_abort.label;" />
+  <menuseparator/>
+  <menuitem command="sel_checkin" label="&staff.circ.copy_status_overlay.sel_checkin.label;" accesskey="&staff.circ.copy_status_overlay.sel_checkin.accesskey;" />
+  <menuseparator/>
+  <menuitem command="sel_renew" label="&staff.circ.copy_status_overlay.sel_renew.label;" accesskey="&staff.circ.copy_status_overlay.sel_renew.accesskey;" />
+  <menuseparator />
+  <menuitem command="sel_spine" label="&staff.circ.copy_status_overlay.sel_spine.label;" accesskey="&staff.circ.copy_status_overlay.sel_spine.accesskey;"/>
+  <menuitem command="cmd_replace_barcode" label="&staff.circ.copy_status_overlay.cmd_replace_barcode.label;" accesskey="&staff.circ.copy_status_overlay.cmd_replace_barcode.accesskey;"/>
+  <menuitem command="save_columns" label="&staff.circ.copy_status_overlay.save_columns.label;"/>
+ </popup>
 </popupset>
 
 <popupset id="copy_cat_status_popupset">
-	<popup id="copy_cat_status_actions" position="at_pointer"> 
-		<menuitem command="sel_clip" label="&staff.circ.copy_status_overlay.sel_clip.label;" accesskey="&staff.circ.copy_status_overlay.sel_clip.accesskey;" />
-		<menuitem command="sel_bucket" label="&staff.circ.copy_status_overlay.sel_bucket.label;" accesskey="&staff.circ.copy_status_overlay.sel_bucket.accesskey;"/>
-		<menuitem command="sel_record_bucket" />
-		<menuitem command="sel_opac" label="&staff.circ.copy_status_overlay.sel_opac.label;" accesskey="&staff.circ.copy_status_overlay.sel_opac.accesskey;" />
-		<menuitem command="sel_copy_details" label="&staff.circ.copy_status_overlay.sel_copy_details.label;" accesskey="&staff.circ.copy_status_overlay.sel_copy_details.accesskey;" />
-		<menuitem command="sel_patron" label="&staff.circ.copy_status_overlay.sel_patron.label;" accesskey="&staff.circ.copy_status_overlay.sel_patron.accesskey;"/>
-		<menuseparator/>
-		<menuitem command="sel_edit" label="&staff.circ.copy_status_overlay.sel_edit.label;" accesskey="&staff.circ.copy_status_overlay.sel_edit.accesskey;" />
-		<menuitem command="cmd_transfer_items" label="&staff.circ.copy_status_overlay.cmd_transfer_items.label;" accesskey="&staff.circ.copy_status_overlay.cmd_transfer_items.accesskey;"/>
-		<menuseparator/>
-		<menuitem command="cmd_add_volumes" label="&staff.circ.copy_status_overlay.cmd_add_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_add_volumes.accesskey;"/>
-		<menuitem command="cmd_mark_library" label="&staff.circ.copy_status_overlay.cmd_mark_library.label;" accesskey="&staff.circ.copy_status_overlay.cmd_mark_library.accesskey;"/>
-		<menuseparator/>
-		<menuitem command="cmd_add_items" label="&staff.circ.copy_status_overlay.cmd_add_items.label;" accesskey="&staff.circ.copy_status_overlay.cmd_add_items.accesskey;"/>
-		<menuitem command="cmd_edit_volumes" label="&staff.circ.copy_status_overlay.cmd_edit_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_edit_volumes.accesskey;"/>
-		<menuitem command="cmd_mark_volume" label="&staff.circ.copy_status_overlay.cmd_mark_volume.label;" accesskey="&staff.circ.copy_status_overlay.cmd_mark_volume.accesskey;"/>
-		<menuitem command="cmd_transfer_volume" label="&staff.circ.copy_status_overlay.cmd_transfer_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_transfer_volumes.accesskey;"/>
-		<menuseparator/>
-		<menuitem command="cmd_delete_items" label="&staff.circ.copy_status_overlay.cmd_delete_items.label;" accesskey="&staff.circ.copy_status_overlay.cmd_delete_items.accesskey;"/>
-		<menuitem command="cmd_delete_volumes" label="&staff.circ.copy_status_overlay.cmd_delete_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_delete_volumes.accesskey;"/>
-		<menuseparator/>
-		<menuitem command="sel_mark_items_damaged" label="&staff.circ.copy_status_overlay.copy_actions.sel_mark_items_damaged.label;" accesskey="&staff.circ.copy_status_overlay.copy_actions.sel_mark_items_damaged.accesskey;"/>
-		<menuitem command="sel_mark_items_missing" label="&staff.circ.copy_status_overlay.copy_actions.sel_mark_items_missing.label;" accesskey="&staff.circ.copy_status_overlay.copy_actions.sel_mark_items_missing.accesskey;"/>
-		<menuseparator/>
-		<menuitem command="sel_spine" label="&staff.circ.copy_status_overlay.sel_spine.label;" accesskey="&staff.circ.copy_status_overlay.sel_spine.accesskey;"/>
-		<menuitem command="cmd_replace_barcode" label="&staff.circ.copy_status_overlay.cmd_replace_barcode.label;" accesskey="&staff.circ.copy_status_overlay.cmd_replace_barcode.accesskey;"/>
-		<menuitem command="save_columns" label="&staff.circ.copy_status_overlay.save_columns.label;"/>
-	</popup>
+ <popup id="copy_cat_status_actions" position="at_pointer"> 
+  <menuitem command="sel_clip" label="&staff.circ.copy_status_overlay.sel_clip.label;" accesskey="&staff.circ.copy_status_overlay.sel_clip.accesskey;" />
+  <menuitem command="sel_bucket" label="&staff.circ.copy_status_overlay.sel_bucket.label;" accesskey="&staff.circ.copy_status_overlay.sel_bucket.accesskey;"/>
+  <menuitem command="sel_record_bucket" />
+  <menuitem command="sel_opac" label="&staff.circ.copy_status_overlay.sel_opac.label;" accesskey="&staff.circ.copy_status_overlay.sel_opac.accesskey;" />
+  <menuitem command="sel_copy_details" label="&staff.circ.copy_status_overlay.sel_copy_details.label;" accesskey="&staff.circ.copy_status_overlay.sel_copy_details.accesskey;" />
+  <menuitem command="sel_patron" label="&staff.circ.copy_status_overlay.sel_patron.label;" accesskey="&staff.circ.copy_status_overlay.sel_patron.accesskey;"/>
+  <menuseparator/>
+  <menuitem command="sel_edit" label="&staff.circ.copy_status_overlay.sel_edit.label;" accesskey="&staff.circ.copy_status_overlay.sel_edit.accesskey;" />
+  <menuitem command="cmd_transfer_items" label="&staff.circ.copy_status_overlay.cmd_transfer_items.label;" accesskey="&staff.circ.copy_status_overlay.cmd_transfer_items.accesskey;"/>
+  <menuseparator/>
+  <menuitem command="cmd_add_volumes" label="&staff.circ.copy_status_overlay.cmd_add_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_add_volumes.accesskey;"/>
+  <menuitem command="cmd_mark_library" label="&staff.circ.copy_status_overlay.cmd_mark_library.label;" accesskey="&staff.circ.copy_status_overlay.cmd_mark_library.accesskey;"/>
+  <menuseparator/>
+  <menuitem command="cmd_add_items" label="&staff.circ.copy_status_overlay.cmd_add_items.label;" accesskey="&staff.circ.copy_status_overlay.cmd_add_items.accesskey;"/>
+  <menuitem command="cmd_edit_volumes" label="&staff.circ.copy_status_overlay.cmd_edit_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_edit_volumes.accesskey;"/>
+  <menuitem command="cmd_mark_volume" label="&staff.circ.copy_status_overlay.cmd_mark_volume.label;" accesskey="&staff.circ.copy_status_overlay.cmd_mark_volume.accesskey;"/>
+  <menuitem command="cmd_transfer_volume" label="&staff.circ.copy_status_overlay.cmd_transfer_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_transfer_volumes.accesskey;"/>
+  <menuseparator/>
+  <menuitem command="cmd_delete_items" label="&staff.circ.copy_status_overlay.cmd_delete_items.label;" accesskey="&staff.circ.copy_status_overlay.cmd_delete_items.accesskey;"/>
+  <menuitem command="cmd_delete_volumes" label="&staff.circ.copy_status_overlay.cmd_delete_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_delete_volumes.accesskey;"/>
+  <menuseparator/>
+  <menuitem command="sel_mark_items_damaged" label="&staff.circ.copy_status_overlay.copy_actions.sel_mark_items_damaged.label;" accesskey="&staff.circ.copy_status_overlay.copy_actions.sel_mark_items_damaged.accesskey;"/>
+  <menuitem command="sel_mark_items_missing" label="&staff.circ.copy_status_overlay.copy_actions.sel_mark_items_missing.label;" accesskey="&staff.circ.copy_status_overlay.copy_actions.sel_mark_items_missing.accesskey;"/>
+  <menuseparator/>
+  <menuitem command="sel_spine" label="&staff.circ.copy_status_overlay.sel_spine.label;" accesskey="&staff.circ.copy_status_overlay.sel_spine.accesskey;"/>
+  <menuitem command="cmd_replace_barcode" label="&staff.circ.copy_status_overlay.cmd_replace_barcode.label;" accesskey="&staff.circ.copy_status_overlay.cmd_replace_barcode.accesskey;"/>
+  <menuitem command="save_columns" label="&staff.circ.copy_status_overlay.save_columns.label;"/>
+ </popup>
 </popupset>
 
 
 <box id="copy_status_main" flex="1" orient="vertical" class="my_overflow">
-	<vbox id="cmvb1" flex="1"/>
+ <vbox id="cmvb1" flex="1"/>
 </box>
 
 <vbox id="cmvb1" flex="1">
-	<hbox id="background" style="background-color: yellow">
-		<spacer flex="1"/>
-		<label value="&staff.circ.copy_status_overlay.item_status.label;" style="font-size: x-large; font-weight: bold;"/>
-		<spacer flex="1"/>
-	</hbox>
-	<hbox id="last_scanned_hbox" style="background-color: yellow">
-		<spacer flex="1"/>
-		<label id="last_scanned" style="font-weight: bold;"/>
-		<spacer flex="1"/>
-	</hbox>
-	<groupbox id="cmgb1" flex="2">
-		<caption label="&staff.circ.copy_status_overlay.last_scanned.caption;" />
-		<hbox id="copy_status_top_ui" />
-		<tree id="copy_status_list" flex="1" enableColumnDrag="true" context="copy_status_actions" />
-		<hbox id="copy_status_bottom_ui" />
-	</groupbox>
+ <hbox id="background" style="background-color: yellow">
+  <spacer flex="1"/>
+  <label value="&staff.circ.copy_status_overlay.item_status.label;" style="font-size: x-large; font-weight: bold;"/>
+  <spacer flex="1"/>
+ </hbox>
+ <hbox id="last_scanned_hbox" style="background-color: yellow">
+  <spacer flex="1"/>
+  <label id="last_scanned" style="font-weight: bold;"/>
+  <spacer flex="1"/>
+ </hbox>
+ <groupbox id="cmgb1" flex="2">
+  <caption label="&staff.circ.copy_status_overlay.last_scanned.caption;" />
+  <hbox id="copy_status_top_ui" />
+  <tree id="copy_status_list" flex="1" enableColumnDrag="true" context="copy_status_actions" />
+  <hbox id="copy_status_bottom_ui" />
+ </groupbox>
 </vbox>
 
 <hbox id="copy_status_top_ui">
-	<label id="copy_status_scan_barcode_label" 
-		value="&staff.circ.copy_status_overlay.copy_status_scan_barcode.label;"
-		accesskey="&staff.circ.copy_status_overlay.copy_status_scan_barcode.accesskey;"
-		control="copy_status_barcode_entry_textbox"/>
-	<textbox id="copy_status_barcode_entry_textbox" context="clipboard"/>
-	<button id="copy_status_submit_barcode_button" 
-		label="&staff.circ.copy_status_overlay.copy_status_submit_barcode.label;"
-		accesskey="&staff.circ.copy_status_overlay.copy_status_submit_barcode.accesskey;"
-		command="cmd_copy_status_submit_barcode"/>
-	<button id="copy_status_upload_file_button" 
-		label="&staff.circ.copy_status_overlay.copy_status_upload_file.label;"
-		accesskey="&staff.circ.copy_status_overlay.copy_status_upload_file.accesskey;"
-		command="cmd_copy_status_upload_file"/>
-	<spacer flex="1"/>
-	<menubar>
-	<menu label="&staff.circ.copy_status_overlay.cataloger_actions.label;" accesskey="&staff.circ.copy_status_overlay.cataloger_actions.accesskey;">
-		<menupopup>
-			<menuitem command="sel_clip" label="&staff.circ.copy_status_overlay.sel_clip.label;" accesskey="&staff.circ.copy_status_overlay.sel_clip.accesskey;" />
-			<menuitem command="sel_bucket" label="&staff.circ.copy_status_overlay.sel_bucket.label;" accesskey="&staff.circ.copy_status_overlay.sel_bucket.accesskey;"/>
-			<menuitem command="sel_record_bucket" />
-			<menuitem command="sel_opac" label="&staff.circ.copy_status_overlay.sel_opac.label;" accesskey="&staff.circ.copy_status_overlay.sel_opac.accesskey;" />
-			<menuitem command="sel_copy_details" label="&staff.circ.copy_status_overlay.sel_copy_details.label;" accesskey="&staff.circ.copy_status_overlay.sel_copy_details.accesskey;" />
-			<menuitem command="sel_patron" label="&staff.circ.copy_status_overlay.sel_patron.label;" accesskey="&staff.circ.copy_status_overlay.sel_patron.accesskey;"/>
-			<menuseparator/>
-			<menuitem command="sel_edit" label="&staff.circ.copy_status_overlay.sel_edit.label;" accesskey="&staff.circ.copy_status_overlay.sel_edit.accesskey;" />
-			<menuitem command="cmd_transfer_items" label="&staff.circ.copy_status_overlay.cmd_transfer_items.label;" accesskey="&staff.circ.copy_status_overlay.cmd_transfer_items.accesskey;"/>
-			<menuseparator/>
-			<menuitem command="cmd_add_volumes" label="&staff.circ.copy_status_overlay.cmd_add_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_add_volumes.accesskey;"/>
-			<menuitem command="cmd_mark_library" label="&staff.circ.copy_status_overlay.cmd_mark_library.label;" accesskey="&staff.circ.copy_status_overlay.cmd_mark_library.accesskey;"/>
-			<menuseparator/>
-			<menuitem command="cmd_add_items" label="&staff.circ.copy_status_overlay.cmd_add_items.label;" accesskey="&staff.circ.copy_status_overlay.cmd_add_items.accesskey;"/>
-			<menuitem command="cmd_edit_volumes" label="&staff.circ.copy_status_overlay.cmd_edit_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_edit_volumes.accesskey;"/>
-			<menuitem command="cmd_mark_volume" label="&staff.circ.copy_status_overlay.cmd_mark_volume.label;" accesskey="&staff.circ.copy_status_overlay.cmd_mark_volume.accesskey;"/>
-			<menuitem command="cmd_transfer_volume" label="&staff.circ.copy_status_overlay.cmd_transfer_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_transfer_volumes.accesskey;"/>
-			<menuseparator/>
-			<menuitem command="cmd_delete_items" label="&staff.circ.copy_status_overlay.cmd_delete_items.label;" accesskey="&staff.circ.copy_status_overlay.cmd_delete_items.accesskey;"/>
-			<menuitem command="cmd_delete_volumes" label="&staff.circ.copy_status_overlay.cmd_delete_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_delete_volumes.accesskey;"/>
-			<menuseparator/>
-			<menuitem command="sel_mark_items_damaged" label="&staff.circ.copy_status_overlay.sel_mark_items_damaged.label;" accesskey="&staff.circ.copy_status_overlay.sel_mark_items_damaged.accesskey;"/>
-			<menuitem command="sel_mark_items_missing" label="&staff.circ.copy_status_overlay.sel_mark_items_missing.label;" accesskey="&staff.circ.copy_status_overlay.sel_mark_items_missing.accesskey;"/>
-			<menuseparator/>
-			<menuitem command="sel_spine" label="&staff.circ.copy_status_overlay.sel_spine.label;" accesskey="&staff.circ.copy_status_overlay.sel_spine.accesskey;"/>
-			<menuitem command="cmd_replace_barcode" label="&staff.circ.copy_status_overlay.cmd_replace_barcode.label;" accesskey="&staff.circ.copy_status_overlay.cmd_replace_barcode.accesskey;"/>
-			<menuitem command="save_columns" label="&staff.circ.copy_status_overlay.save_columns.label;"/>
-		</menupopup>
-	</menu>
-	<menu label="&staff.circ.copy_status_overlay.sel_items.label;" accesskey="&staff.circ.copy_status_overlay.sel_items.accesskey;">
-		<menupopup>
-			<menuitem command="sel_clip" label="&staff.circ.copy_status_overlay.sel_clip.label;" accesskey="&staff.circ.copy_status_overlay.sel_clip.accesskey;" />
-			<menuitem command="sel_bucket" label="&staff.circ.copy_status_overlay.sel_bucket.label;" accesskey="&staff.circ.copy_status_overlay.sel_bucket.accesskey;"/>
-			<menuitem command="sel_record_bucket" />
-			<menuitem command="sel_opac" label="&staff.circ.copy_status_overlay.sel_opac.label;" accesskey="&staff.circ.copy_status_overlay.sel_opac.accesskey;" />
-			<menuitem command="sel_copy_details" label="&staff.circ.copy_status_overlay.sel_copy_details.label;" accesskey="&staff.circ.copy_status_overlay.sel_copy_details.accesskey;" />
-			<menuitem command="sel_patron" label="&staff.circ.copy_status_overlay.sel_patron.label;" accesskey="&staff.circ.copy_status_overlay.sel_patron.accesskey;"/>
-			<menuseparator />
-			<menuitem command="sel_edit" label="&staff.circ.copy_status_overlay.sel_edit.label;" accesskey="&staff.circ.copy_status_overlay.sel_edit.accesskey;" />
-			<menuseparator />
-			<menuitem command="sel_mark_items_damaged" label="&staff.circ.copy_status_overlay.sel_mark_items_damaged.label;" accesskey="&staff.circ.copy_status_overlay.sel_mark_items_damaged.accesskey;"/>
-			<menuseparator />
-			<menuitem command="sel_mark_items_missing" label="&staff.circ.copy_status_overlay.sel_mark_items_missing.label;" accesskey="&staff.circ.copy_status_overlay.sel_mark_items_missing.accesskey;"/>
-			<menuseparator />
-			<menuitem command="sel_transit_abort" label="&staff.circ.copy_status_overlay.sel_transit_abort.label;" />
-			<menuseparator />
-			<menuitem command="sel_checkin" label="&staff.circ.copy_status_overlay.sel_checkin.label;" accesskey="&staff.circ.copy_status_overlay.sel_checkin.accesskey;" />
-			<menuseparator />
-			<menuitem command="sel_renew" label="&staff.circ.copy_status_overlay.sel_renew.label;" accesskey="&staff.circ.copy_status_overlay.sel_renew.accesskey;" />
-			<menuseparator />
-			<menuitem command="sel_spine" label="&staff.circ.copy_status_overlay.sel_spine.label;" accesskey="&staff.circ.copy_status_overlay.sel_spine.accesskey;"/>
-			<menuitem command="cmd_replace_barcode" label="&staff.circ.copy_status_overlay.cmd_replace_barcode.label;" accesskey="&staff.circ.copy_status_overlay.cmd_replace_barcode.accesskey;"/>
-			<menuitem command="save_columns" label="&staff.circ.copy_status_overlay.save_columns.label;"/>
-		</menupopup>
-	</menu>
-	</menubar>
+ <label id="copy_status_scan_barcode_label" 
+  value="&staff.circ.copy_status_overlay.copy_status_scan_barcode.label;"
+  accesskey="&staff.circ.copy_status_overlay.copy_status_scan_barcode.accesskey;"
+  control="copy_status_barcode_entry_textbox"/>
+ <textbox id="copy_status_barcode_entry_textbox" context="clipboard"/>
+ <button id="copy_status_submit_barcode_button" 
+  label="&staff.circ.copy_status_overlay.copy_status_submit_barcode.label;"
+  accesskey="&staff.circ.copy_status_overlay.copy_status_submit_barcode.accesskey;"
+  command="cmd_copy_status_submit_barcode"/>
+ <button id="copy_status_upload_file_button" 
+  label="&staff.circ.copy_status_overlay.copy_status_upload_file.label;"
+  accesskey="&staff.circ.copy_status_overlay.copy_status_upload_file.accesskey;"
+  command="cmd_copy_status_upload_file"/>
+ <spacer flex="1"/>
+ <menubar>
+ <menu label="&staff.circ.copy_status_overlay.cataloger_actions.label;" accesskey="&staff.circ.copy_status_overlay.cataloger_actions.accesskey;">
+  <menupopup>
+   <menuitem command="sel_clip" label="&staff.circ.copy_status_overlay.sel_clip.label;" accesskey="&staff.circ.copy_status_overlay.sel_clip.accesskey;" />
+   <menuitem command="sel_bucket" label="&staff.circ.copy_status_overlay.sel_bucket.label;" accesskey="&staff.circ.copy_status_overlay.sel_bucket.accesskey;"/>
+   <menuitem command="sel_record_bucket" />
+   <menuitem command="sel_opac" label="&staff.circ.copy_status_overlay.sel_opac.label;" accesskey="&staff.circ.copy_status_overlay.sel_opac.accesskey;" />
+   <menuitem command="sel_copy_details" label="&staff.circ.copy_status_overlay.sel_copy_details.label;" accesskey="&staff.circ.copy_status_overlay.sel_copy_details.accesskey;" />
+   <menuitem command="sel_patron" label="&staff.circ.copy_status_overlay.sel_patron.label;" accesskey="&staff.circ.copy_status_overlay.sel_patron.accesskey;"/>
+   <menuseparator/>
+   <menuitem command="sel_edit" label="&staff.circ.copy_status_overlay.sel_edit.label;" accesskey="&staff.circ.copy_status_overlay.sel_edit.accesskey;" />
+   <menuitem command="cmd_transfer_items" label="&staff.circ.copy_status_overlay.cmd_transfer_items.label;" accesskey="&staff.circ.copy_status_overlay.cmd_transfer_items.accesskey;"/>
+   <menuseparator/>
+   <menuitem command="cmd_add_volumes" label="&staff.circ.copy_status_overlay.cmd_add_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_add_volumes.accesskey;"/>
+   <menuitem command="cmd_mark_library" label="&staff.circ.copy_status_overlay.cmd_mark_library.label;" accesskey="&staff.circ.copy_status_overlay.cmd_mark_library.accesskey;"/>
+   <menuseparator/>
+   <menuitem command="cmd_add_items" label="&staff.circ.copy_status_overlay.cmd_add_items.label;" accesskey="&staff.circ.copy_status_overlay.cmd_add_items.accesskey;"/>
+   <menuitem command="cmd_edit_volumes" label="&staff.circ.copy_status_overlay.cmd_edit_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_edit_volumes.accesskey;"/>
+   <menuitem command="cmd_mark_volume" label="&staff.circ.copy_status_overlay.cmd_mark_volume.label;" accesskey="&staff.circ.copy_status_overlay.cmd_mark_volume.accesskey;"/>
+   <menuitem command="cmd_transfer_volume" label="&staff.circ.copy_status_overlay.cmd_transfer_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_transfer_volumes.accesskey;"/>
+   <menuseparator/>
+   <menuitem command="cmd_delete_items" label="&staff.circ.copy_status_overlay.cmd_delete_items.label;" accesskey="&staff.circ.copy_status_overlay.cmd_delete_items.accesskey;"/>
+   <menuitem command="cmd_delete_volumes" label="&staff.circ.copy_status_overlay.cmd_delete_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_delete_volumes.accesskey;"/>
+   <menuseparator/>
+   <menuitem command="sel_mark_items_damaged" label="&staff.circ.copy_status_overlay.sel_mark_items_damaged.label;" accesskey="&staff.circ.copy_status_overlay.sel_mark_items_damaged.accesskey;"/>
+   <menuitem command="sel_mark_items_missing" label="&staff.circ.copy_status_overlay.sel_mark_items_missing.label;" accesskey="&staff.circ.copy_status_overlay.sel_mark_items_missing.accesskey;"/>
+   <menuseparator/>
+   <menuitem command="sel_spine" label="&staff.circ.copy_status_overlay.sel_spine.label;" accesskey="&staff.circ.copy_status_overlay.sel_spine.accesskey;"/>
+   <menuitem command="cmd_replace_barcode" label="&staff.circ.copy_status_overlay.cmd_replace_barcode.label;" accesskey="&staff.circ.copy_status_overlay.cmd_replace_barcode.accesskey;"/>
+   <menuitem command="save_columns" label="&staff.circ.copy_status_overlay.save_columns.label;"/>
+  </menupopup>
+ </menu>
+ <menu label="&staff.circ.copy_status_overlay.sel_items.label;" accesskey="&staff.circ.copy_status_overlay.sel_items.accesskey;">
+  <menupopup>
+   <menuitem command="sel_clip" label="&staff.circ.copy_status_overlay.sel_clip.label;" accesskey="&staff.circ.copy_status_overlay.sel_clip.accesskey;" />
+   <menuitem command="sel_bucket" label="&staff.circ.copy_status_overlay.sel_bucket.label;" accesskey="&staff.circ.copy_status_overlay.sel_bucket.accesskey;"/>
+   <menuitem command="sel_record_bucket" />
+   <menuitem command="sel_opac" label="&staff.circ.copy_status_overlay.sel_opac.label;" accesskey="&staff.circ.copy_status_overlay.sel_opac.accesskey;" />
+   <menuitem command="sel_copy_details" label="&staff.circ.copy_status_overlay.sel_copy_details.label;" accesskey="&staff.circ.copy_status_overlay.sel_copy_details.accesskey;" />
+   <menuitem command="sel_patron" label="&staff.circ.copy_status_overlay.sel_patron.label;" accesskey="&staff.circ.copy_status_overlay.sel_patron.accesskey;"/>
+   <menuseparator />
+   <menuitem command="sel_edit" label="&staff.circ.copy_status_overlay.sel_edit.label;" accesskey="&staff.circ.copy_status_overlay.sel_edit.accesskey;" />
+   <menuseparator />
+   <menuitem command="sel_mark_items_damaged" label="&staff.circ.copy_status_overlay.sel_mark_items_damaged.label;" accesskey="&staff.circ.copy_status_overlay.sel_mark_items_damaged.accesskey;"/>
+   <menuseparator />
+   <menuitem command="sel_mark_items_missing" label="&staff.circ.copy_status_overlay.sel_mark_items_missing.label;" accesskey="&staff.circ.copy_status_overlay.sel_mark_items_missing.accesskey;"/>
+   <menuseparator />
+   <menuitem command="sel_transit_abort" label="&staff.circ.copy_status_overlay.sel_transit_abort.label;" />
+   <menuseparator />
+   <menuitem command="sel_checkin" label="&staff.circ.copy_status_overlay.sel_checkin.label;" accesskey="&staff.circ.copy_status_overlay.sel_checkin.accesskey;" />
+   <menuseparator />
+   <menuitem command="sel_renew" label="&staff.circ.copy_status_overlay.sel_renew.label;" accesskey="&staff.circ.copy_status_overlay.sel_renew.accesskey;" />
+   <menuseparator />
+   <menuitem command="sel_spine" label="&staff.circ.copy_status_overlay.sel_spine.label;" accesskey="&staff.circ.copy_status_overlay.sel_spine.accesskey;"/>
+   <menuitem command="cmd_replace_barcode" label="&staff.circ.copy_status_overlay.cmd_replace_barcode.label;" accesskey="&staff.circ.copy_status_overlay.cmd_replace_barcode.accesskey;"/>
+   <menuitem command="save_columns" label="&staff.circ.copy_status_overlay.save_columns.label;"/>
+  </menupopup>
+ </menu>
+ </menubar>
 
 </hbox>
 
 <hbox id="copy_status_bottom_ui">
     <hbox id="list_actions"/>
 
-	<button id="copy_status_print" label="&staff.circ.copy_status_overlay.copy_status_print.label;" command="cmd_copy_status_print" accesskey="&staff.circ.copy_status_overlay.copy_status_print.accesskey;"/>
+ <button id="copy_status_print" label="&staff.circ.copy_status_overlay.copy_status_print.label;" command="cmd_copy_status_print" accesskey="&staff.circ.copy_status_overlay.copy_status_print.accesskey;"/>
     <checkbox id="trim_list" label="&staff.circ.copy_status_overlay.trim_list.label;" checked="true" oils_persist="checked" oncommand="try{this.setAttribute('checked',this.checked);}catch(E){alert(E);}" />
-	<checkbox id="strict_barcode" label="&staff.circ.copy_status_overlay.strict_barcode.label;" checked="false" oils_persist="checked" oncommand="try{this.setAttribute('checked',this.checked);}catch(E){alert(E);}" /> 
-	<spacer flex="1"/>
+ <checkbox id="strict_barcode" label="&staff.circ.copy_status_overlay.strict_barcode.label;" checked="false" oils_persist="checked" oncommand="try{this.setAttribute('checked',this.checked);}catch(E){alert(E);}" /> 
+ <spacer flex="1"/>
 </hbox>
 
 </overlay>
diff --git a/Open-ILS/xul/staff_client/server/circ/in_house_use.js b/Open-ILS/xul/staff_client/server/circ/in_house_use.js
index 343250e00c..ceecdf5b7c 100644
--- a/Open-ILS/xul/staff_client/server/circ/in_house_use.js
+++ b/Open-ILS/xul/staff_client/server/circ/in_house_use.js
@@ -4,358 +4,358 @@ dump('entering circ.in_house_use.js\n');
 if (typeof circ == 'undefined') circ = {};
 circ.in_house_use = function (params) {
 
-	JSAN.use('util.error'); this.error = new util.error();
-	JSAN.use('util.network'); this.network = new util.network();
-	JSAN.use('util.barcode');
-	JSAN.use('util.date');
-	JSAN.use('OpenILS.data'); this.data = new OpenILS.data(); this.data.init({'via':'stash'});
-	JSAN.use('util.sound'); this.sound = new util.sound();
+ JSAN.use('util.error'); this.error = new util.error();
+ JSAN.use('util.network'); this.network = new util.network();
+ JSAN.use('util.barcode');
+ JSAN.use('util.date');
+ JSAN.use('OpenILS.data'); this.data = new OpenILS.data(); this.data.init({'via':'stash'});
+ JSAN.use('util.sound'); this.sound = new util.sound();
 }
 
 circ.in_house_use.prototype = {
 
-	'init' : function( params ) {
+ 'init' : function( params ) {
 
-		var obj = this;
+  var obj = this;
 
-		obj.entry_cap = Number( obj.data.hash.aous['ui.circ.in_house_use.entry_cap'] ) || 99; 
-		obj.entry_warn = Number( obj.data.hash.aous['ui.circ.in_house_use.entry_warn'] ) || 20; 
+  obj.entry_cap = Number( obj.data.hash.aous['ui.circ.in_house_use.entry_cap'] ) || 99; 
+  obj.entry_warn = Number( obj.data.hash.aous['ui.circ.in_house_use.entry_warn'] ) || 20; 
 
-		JSAN.use('circ.util');
-		var columns = circ.util.columns( 
-			{ 
-				'barcode' : { 'hidden' : false },
-				'title' : { 'hidden' : false },
-				'status' : { 'hidden' : false },
-				'location' : { 'hidden' : false },
-				'call_number' : { 'hidden' : false },
-				'uses' : { 'hidden' : false }
-			} 
-		);
+  JSAN.use('circ.util');
+  var columns = circ.util.columns( 
+   { 
+    'barcode' : { 'hidden' : false },
+    'title' : { 'hidden' : false },
+    'status' : { 'hidden' : false },
+    'location' : { 'hidden' : false },
+    'call_number' : { 'hidden' : false },
+    'uses' : { 'hidden' : false }
+   } 
+  );
 
-		JSAN.use('util.list'); obj.list = new util.list('in_house_use_list');
-		obj.list.init(
-			{
-				'columns' : columns,
-				'map_row_to_columns' : circ.util.std_map_row_to_columns(),
-				'on_select' : function() {
-					var sel = obj.list.retrieve_selection();
-					obj.controller.view.sel_clip.setAttribute('disabled', sel.length < 1);
-				}
-			}
-		);
-		
-		JSAN.use('util.controller'); obj.controller = new util.controller();
-		obj.controller.init(
-			{
-				'control_map' : {
-					'save_columns' : [ [ 'command' ], function() { obj.list.save_columns(); } ],
-					'sel_clip' : [
-						['command'],
-						function() { 
-							obj.list.clipboard(); 
-							obj.controller.view.in_house_use_barcode_entry_textbox.focus();
-						}
-					],
-					'in_house_use_menu_placeholder' : [
-						['render'],
-						function(e) {
-							return function() {
-								JSAN.use('util.widgets'); JSAN.use('util.functional'); JSAN.use('util.fm_utils');
-								var items = [ [ document.getElementById('circStrings').getString('staff.circ.in_house_use.barcode') , 'barcode' ] ].concat(
-									util.functional.map_list(
-										util.functional.filter_list(
-											obj.data.list.my_cnct,
-											function(o) {
-												return util.fm_utils.compare_aou_a_is_b_or_ancestor(o.owning_lib(), obj.data.list.au[0].ws_ou());
-											}
-										).sort(
+  JSAN.use('util.list'); obj.list = new util.list('in_house_use_list');
+  obj.list.init(
+   {
+    'columns' : columns,
+    'map_row_to_columns' : circ.util.std_map_row_to_columns(),
+    'on_select' : function() {
+     var sel = obj.list.retrieve_selection();
+     obj.controller.view.sel_clip.setAttribute('disabled', sel.length < 1);
+    }
+   }
+  );
+  
+  JSAN.use('util.controller'); obj.controller = new util.controller();
+  obj.controller.init(
+   {
+    'control_map' : {
+     'save_columns' : [ [ 'command' ], function() { obj.list.save_columns(); } ],
+     'sel_clip' : [
+      ['command'],
+      function() { 
+       obj.list.clipboard(); 
+       obj.controller.view.in_house_use_barcode_entry_textbox.focus();
+      }
+     ],
+     'in_house_use_menu_placeholder' : [
+      ['render'],
+      function(e) {
+       return function() {
+        JSAN.use('util.widgets'); JSAN.use('util.functional'); JSAN.use('util.fm_utils');
+        var items = [ [ document.getElementById('circStrings').getString('staff.circ.in_house_use.barcode') , 'barcode' ] ].concat(
+         util.functional.map_list(
+          util.functional.filter_list(
+           obj.data.list.my_cnct,
+           function(o) {
+            return util.fm_utils.compare_aou_a_is_b_or_ancestor(o.owning_lib(), obj.data.list.au[0].ws_ou());
+           }
+          ).sort(
 
-											function(a,b) {
-												try { 
-													return util.fm_utils.sort_func_aou_by_depth_and_then_string(
-														[ a.owning_lib(), a.name() ],
-														[ b.owning_lib(), b.name() ]
-													);
-												} catch(E) {
-													alert(document.getElementById('circStrings').getString('staff.circ.in_house_use.noncat_sort_error') + ' ' + E);
-													return 0;
-												}
-											}
+           function(a,b) {
+            try { 
+             return util.fm_utils.sort_func_aou_by_depth_and_then_string(
+              [ a.owning_lib(), a.name() ],
+              [ b.owning_lib(), b.name() ]
+             );
+            } catch(E) {
+             alert(document.getElementById('circStrings').getString('staff.circ.in_house_use.noncat_sort_error') + ' ' + E);
+             return 0;
+            }
+           }
 
-										),
-										function(o) {
-											return [ obj.data.hash.aou[ o.owning_lib() ].shortname() + ' : ' + o.name(), o.id() ];
-										}
-									)
-								);
-								g.error.sdump('D_TRACE', document.getElementById('circStrings').getString('staff.circ.in_house_use.items_dump') + js2JSON(items));
-								util.widgets.remove_children( e );
-								var ml = util.widgets.make_menulist(
-									items
-								);
-								e.appendChild( ml );
-								ml.setAttribute('id','in_house_use_menulist');
-								ml.setAttribute('accesskey','');
-								ml.addEventListener(
-									'command',
-									function(ev) {
-										var tb = obj.controller.view.in_house_use_barcode_entry_textbox;
-										if (ev.target.value == 'barcode') {
-											tb.disabled = false;
-											tb.value = '';
-											tb.focus();
-										} else {
-											tb.disabled = true;
-											tb.value = document.getElementById('circStrings').getString('staff.circ.in_house_use.noncataloged');
-										}
-									}, false
-								);
-								obj.controller.view.in_house_use_menu = ml;
-							};
-						},
-					],
-					'in_house_use_barcode_entry_textbox' : [
-						['keypress'],
-						function(ev) {
-							if (ev.keyCode && ev.keyCode == 13) {
-								obj.in_house_use();
-							}
-						}
-					],
-					'in_house_use_multiplier_label' : [
-						['render'],
-						function(e) {
-							return function() {
-								obj.controller.view.in_house_use_multiplier_textbox.select();
-								obj.controller.view.in_house_use_multiplier_textbox.value = 1;
-							};
-						}
-					],
-					'in_house_use_multiplier_textbox' : [
-						['change'],
-						function(ev) {
-							if (ev.target.nodeName == 'textbox') {
-								try {
-									var value = Number(ev.target.value);
-									if (value > 0) {
-										if (value > obj.entry_cap) { throw(value); }
-									} else {
-										throw(value);
-									}
-								} catch(E) {
-									dump('in_house_use:multiplier: ' + E + '\n');
-									obj.sound.circ_bad();
-									setTimeout(
-										function() {
-											obj.controller.view.in_house_use_multiplier_textbox.focus();
-											obj.controller.view.in_house_use_multiplier_textbox.select();
-										}, 0
-									);
-								}
-							}
-						}
-					],
-					'cmd_broken' : [
-						['command'],
-						function() { alert(document.getElementById('circStrings').getString('staff.circ.unimplemented')); }
-					],
-					'cmd_in_house_use_submit_barcode' : [
-						['command'],
-						function() {
-							obj.in_house_use();
-						}
-					],
-					'cmd_in_house_use_print' : [
-						['command'],
-						function() {
-							var p = { 
-								'template' : 'in_house_use'
-							};
-							obj.list.print(p);
-						}
-					],
-					'cmd_csv_to_clipboard' : [ ['command'], function() { 
+          ),
+          function(o) {
+           return [ obj.data.hash.aou[ o.owning_lib() ].shortname() + ' : ' + o.name(), o.id() ];
+          }
+         )
+        );
+        g.error.sdump('D_TRACE', document.getElementById('circStrings').getString('staff.circ.in_house_use.items_dump') + js2JSON(items));
+        util.widgets.remove_children( e );
+        var ml = util.widgets.make_menulist(
+         items
+        );
+        e.appendChild( ml );
+        ml.setAttribute('id','in_house_use_menulist');
+        ml.setAttribute('accesskey','');
+        ml.addEventListener(
+         'command',
+         function(ev) {
+          var tb = obj.controller.view.in_house_use_barcode_entry_textbox;
+          if (ev.target.value == 'barcode') {
+           tb.disabled = false;
+           tb.value = '';
+           tb.focus();
+          } else {
+           tb.disabled = true;
+           tb.value = document.getElementById('circStrings').getString('staff.circ.in_house_use.noncataloged');
+          }
+         }, false
+        );
+        obj.controller.view.in_house_use_menu = ml;
+       };
+      },
+     ],
+     'in_house_use_barcode_entry_textbox' : [
+      ['keypress'],
+      function(ev) {
+       if (ev.keyCode && ev.keyCode == 13) {
+        obj.in_house_use();
+       }
+      }
+     ],
+     'in_house_use_multiplier_label' : [
+      ['render'],
+      function(e) {
+       return function() {
+        obj.controller.view.in_house_use_multiplier_textbox.select();
+        obj.controller.view.in_house_use_multiplier_textbox.value = 1;
+       };
+      }
+     ],
+     'in_house_use_multiplier_textbox' : [
+      ['change'],
+      function(ev) {
+       if (ev.target.nodeName == 'textbox') {
+        try {
+         var value = Number(ev.target.value);
+         if (value > 0) {
+          if (value > obj.entry_cap) { throw(value); }
+         } else {
+          throw(value);
+         }
+        } catch(E) {
+         dump('in_house_use:multiplier: ' + E + '\n');
+         obj.sound.circ_bad();
+         setTimeout(
+          function() {
+           obj.controller.view.in_house_use_multiplier_textbox.focus();
+           obj.controller.view.in_house_use_multiplier_textbox.select();
+          }, 0
+         );
+        }
+       }
+      }
+     ],
+     'cmd_broken' : [
+      ['command'],
+      function() { alert(document.getElementById('circStrings').getString('staff.circ.unimplemented')); }
+     ],
+     'cmd_in_house_use_submit_barcode' : [
+      ['command'],
+      function() {
+       obj.in_house_use();
+      }
+     ],
+     'cmd_in_house_use_print' : [
+      ['command'],
+      function() {
+       var p = { 
+        'template' : 'in_house_use'
+       };
+       obj.list.print(p);
+      }
+     ],
+     'cmd_csv_to_clipboard' : [ ['command'], function() { 
                         obj.list.dump_csv_to_clipboard(); 
                         obj.controller.view.in_house_use_barcode_entry_textbox.focus();
                     } ],
-					'cmd_csv_to_printer' : [ ['command'], function() { 
+     'cmd_csv_to_printer' : [ ['command'], function() { 
                         obj.list.dump_csv_to_printer(); 
                         obj.controller.view.in_house_use_barcode_entry_textbox.focus();
                     } ],
-					'cmd_csv_to_file' : [ ['command'], function() { 
+     'cmd_csv_to_file' : [ ['command'], function() { 
                         obj.list.dump_csv_to_file( { 'defaultFileName' : 'checked_in.txt' } ); 
                         obj.controller.view.in_house_use_barcode_entry_textbox.focus();
                     } ]
 
-				}
-			}
-		);
-		this.controller.render();
-		this.controller.view.in_house_use_barcode_entry_textbox.focus();
+    }
+   }
+  );
+  this.controller.render();
+  this.controller.view.in_house_use_barcode_entry_textbox.focus();
 
-	},
+ },
 
-	'test_barcode' : function(bc) {
-		var obj = this;
-		var good = util.barcode.check(bc);
-		var x = document.getElementById('strict_barcode');
-		if (x && x.checked != true) return true;
-		if (good) {
-			return true;
-		} else {
-			if ( 1 == obj.error.yns_alert(
-						document.getElementById('circStrings').getFormattedString('staff.circ.check_digit.bad', [bc]),
-						document.getElementById('circStrings').getString('staff.circ.barcode.bad'),
-						document.getElementById('circStrings').getString('staff.circ.cancel'),
-						document.getElementById('circStrings').getString('staff.circ.barcode.accept'),
-						null,
-						document.getElementById('circStrings').getString('staff.circ.confirm'),
-						'/xul/server/skin/media/images/bad_barcode.png'
-			) ) {
-				return true;
-			} else {
-				return false;
-			}
-		}
-	},
+ 'test_barcode' : function(bc) {
+  var obj = this;
+  var good = util.barcode.check(bc);
+  var x = document.getElementById('strict_barcode');
+  if (x && x.checked != true) return true;
+  if (good) {
+   return true;
+  } else {
+   if ( 1 == obj.error.yns_alert(
+      document.getElementById('circStrings').getFormattedString('staff.circ.check_digit.bad', [bc]),
+      document.getElementById('circStrings').getString('staff.circ.barcode.bad'),
+      document.getElementById('circStrings').getString('staff.circ.cancel'),
+      document.getElementById('circStrings').getString('staff.circ.barcode.accept'),
+      null,
+      document.getElementById('circStrings').getString('staff.circ.confirm'),
+      '/xul/server/skin/media/images/bad_barcode.png'
+   ) ) {
+    return true;
+   } else {
+    return false;
+   }
+  }
+ },
 
-	'in_house_use' : function() {
-		var obj = this;
-		try {
-			var barcode;
-			if (obj.controller.view.in_house_use_menu.value == '' || obj.controller.view.in_house_use_menu.value == 'barcode') {
-				barcode = obj.controller.view.in_house_use_barcode_entry_textbox.value;
-				if (barcode) {
-					if ( obj.test_barcode(barcode) ) { /* good */ } else { /* bad */ return; }
-				}
-			} else {
-				barcode = ( obj.controller.view.in_house_use_menu.value );
-				//barcode = obj.data.hash.cnct[ obj.controller.view.in_house_use_menu.value ].name()
-			}
-			var multiplier = Number( obj.controller.view.in_house_use_multiplier_textbox.value );
+ 'in_house_use' : function() {
+  var obj = this;
+  try {
+   var barcode;
+   if (obj.controller.view.in_house_use_menu.value == '' || obj.controller.view.in_house_use_menu.value == 'barcode') {
+    barcode = obj.controller.view.in_house_use_barcode_entry_textbox.value;
+    if (barcode) {
+     if ( obj.test_barcode(barcode) ) { /* good */ } else { /* bad */ return; }
+    }
+   } else {
+    barcode = ( obj.controller.view.in_house_use_menu.value );
+    //barcode = obj.data.hash.cnct[ obj.controller.view.in_house_use_menu.value ].name()
+   }
+   var multiplier = Number( obj.controller.view.in_house_use_multiplier_textbox.value );
 
-			if (barcode == '') {
-				obj.controller.view.in_house_use_barcode_entry_textbox.focus();
-				return; 
-			}
+   if (barcode == '') {
+    obj.controller.view.in_house_use_barcode_entry_textbox.focus();
+    return; 
+   }
 
-			if (multiplier == 0 || multiplier > obj.entry_cap) {
-				obj.controller.view.in_house_use_multiplier_textbox.focus();
-				obj.controller.view.in_house_use_multiplier_textbox.select();
-				return;
-			}
+   if (multiplier == 0 || multiplier > obj.entry_cap) {
+    obj.controller.view.in_house_use_multiplier_textbox.focus();
+    obj.controller.view.in_house_use_multiplier_textbox.select();
+    return;
+   }
 
-			if (multiplier > obj.entry_warn) {
-				var r = obj.error.yns_alert(
-					document.getElementById('circStrings').getFormattedString('staff.circ.in_house_use.confirm_multiple', [barcode, multiplier]),
-					document.getElementById('circStrings').getString('staff.circ.in_house_use.confirm_multiple.title'),
-					document.getElementById('circStrings').getString('staff.circ.in_house_use.yes'),
-					document.getElementById('circStrings').getString('staff.circ.in_house_use.no'),
-					null,
-					document.getElementById('circStrings').getString('staff.circ.confirm.msg')
-				);
-				if (r != 0) {
-					obj.controller.view.in_house_use_multiplier_textbox.focus();
-					obj.controller.view.in_house_use_multiplier_textbox.select();
-					return;
-				}
-			}
+   if (multiplier > obj.entry_warn) {
+    var r = obj.error.yns_alert(
+     document.getElementById('circStrings').getFormattedString('staff.circ.in_house_use.confirm_multiple', [barcode, multiplier]),
+     document.getElementById('circStrings').getString('staff.circ.in_house_use.confirm_multiple.title'),
+     document.getElementById('circStrings').getString('staff.circ.in_house_use.yes'),
+     document.getElementById('circStrings').getString('staff.circ.in_house_use.no'),
+     null,
+     document.getElementById('circStrings').getString('staff.circ.confirm.msg')
+    );
+    if (r != 0) {
+     obj.controller.view.in_house_use_multiplier_textbox.focus();
+     obj.controller.view.in_house_use_multiplier_textbox.select();
+     return;
+    }
+   }
 
-			JSAN.use('circ.util');
+   JSAN.use('circ.util');
 
-			if (obj.controller.view.in_house_use_menu.value == 'barcode') {
+   if (obj.controller.view.in_house_use_menu.value == 'barcode') {
 
-				var copy = obj.network.simple_request('FM_ACP_RETRIEVE_VIA_BARCODE',[ barcode ]); 
-				if (copy.ilsevent) { 
-					switch(Number(copy.ilsevent)) {
-						case -1 : 
-							obj.error.standard_network_error_alert(document.getElementById('circStrings').getString('staff.circ.in_house_use.failed.verbose'));
-							break;
-						case 1502 /* ASSET_COPY_NOT_FOUND */ : 
-							obj.error.yns_alert(
-								copy.textcode,
-								document.getElementById('circStrings').getString('staff.circ.in_house_use.failed'),
-								document.getElementById('circStrings').getString('staff.circ.in_house_use.ok'),
-								null,
-								null,
-								document.getElementById('circStrings').getString('staff.circ.confirm.msg')
-							);
-							break;
-						default:
-							throw(copy);
-					}
-					return; 
-				}
-	
-				var mods = obj.network.simple_request('MODS_SLIM_RECORD_RETRIEVE_VIA_COPY.authoritative',[ copy.id() ]);
-				var result = obj.network.simple_request('FM_AIHU_CREATE',
-					[ ses(), { 'copyid' : copy.id(), 'location' : obj.data.list.au[0].ws_ou(), 'count' : multiplier } ]
-				);
+    var copy = obj.network.simple_request('FM_ACP_RETRIEVE_VIA_BARCODE',[ barcode ]); 
+    if (copy.ilsevent) { 
+     switch(Number(copy.ilsevent)) {
+      case -1 : 
+       obj.error.standard_network_error_alert(document.getElementById('circStrings').getString('staff.circ.in_house_use.failed.verbose'));
+       break;
+      case 1502 /* ASSET_COPY_NOT_FOUND */ : 
+       obj.error.yns_alert(
+        copy.textcode,
+        document.getElementById('circStrings').getString('staff.circ.in_house_use.failed'),
+        document.getElementById('circStrings').getString('staff.circ.in_house_use.ok'),
+        null,
+        null,
+        document.getElementById('circStrings').getString('staff.circ.confirm.msg')
+       );
+       break;
+      default:
+       throw(copy);
+     }
+     return; 
+    }
+ 
+    var mods = obj.network.simple_request('MODS_SLIM_RECORD_RETRIEVE_VIA_COPY.authoritative',[ copy.id() ]);
+    var result = obj.network.simple_request('FM_AIHU_CREATE',
+     [ ses(), { 'copyid' : copy.id(), 'location' : obj.data.list.au[0].ws_ou(), 'count' : multiplier } ]
+    );
 
-			} else {
-				var result = obj.network.simple_request('FM_ANCIHU_CREATE',
-					[ ses(), { 'non_cat_type' : obj.controller.view.in_house_use_menu.value, 'location' : obj.data.list.au[0].ws_ou(), 'count' : multiplier } ]
-				);
-				mods = new mvr(); mods.title( obj.data.hash.cnct[ obj.controller.view.in_house_use_menu.value ].name()); 
-				copy = new acp(); copy.barcode( '' );
-			}
+   } else {
+    var result = obj.network.simple_request('FM_ANCIHU_CREATE',
+     [ ses(), { 'non_cat_type' : obj.controller.view.in_house_use_menu.value, 'location' : obj.data.list.au[0].ws_ou(), 'count' : multiplier } ]
+    );
+    mods = new mvr(); mods.title( obj.data.hash.cnct[ obj.controller.view.in_house_use_menu.value ].name()); 
+    copy = new acp(); copy.barcode( '' );
+   }
 
-			if (document.getElementById('trim_list')) {
-				var x = document.getElementById('trim_list');
-				if (x.checked) { obj.list.trim_list = 20; } else { obj.list.trim_list = null; }
-			}
-			obj.list.append(
-				{
-					'row' : {
-						'my' : {
-							'mvr' : mods,
-							'acp' : copy,
-							'uses' : result.length
-						}
-					},
-					'to_top' : true
-				//I could override map_row_to_column here
-				}
-			);
-			obj.sound.circ_good();
+   if (document.getElementById('trim_list')) {
+    var x = document.getElementById('trim_list');
+    if (x.checked) { obj.list.trim_list = 20; } else { obj.list.trim_list = null; }
+   }
+   obj.list.append(
+    {
+     'row' : {
+      'my' : {
+       'mvr' : mods,
+       'acp' : copy,
+       'uses' : result.length
+      }
+     },
+     'to_top' : true
+    //I could override map_row_to_column here
+    }
+   );
+   obj.sound.circ_good();
 
-			if (typeof obj.on_in_house_use == 'function') {
-				obj.on_in_house_use(result);
-			}
-			if (typeof window.xulG == 'object' && typeof window.xulG.on_in_house_use == 'function') {
-				obj.error.sdump('D_CIRC', + document.getElementById('circStrings').getString('staff.circ.in_house_use.external') + '\n');
-				window.xulG.on_in_house_use(result);
-			} else {
-				obj.error.sdump('D_CIRC', + document.getElementById('circStrings').getString('staff.circ.in_house_use.no_external') + '\n');
-			}
+   if (typeof obj.on_in_house_use == 'function') {
+    obj.on_in_house_use(result);
+   }
+   if (typeof window.xulG == 'object' && typeof window.xulG.on_in_house_use == 'function') {
+    obj.error.sdump('D_CIRC', + document.getElementById('circStrings').getString('staff.circ.in_house_use.external') + '\n');
+    window.xulG.on_in_house_use(result);
+   } else {
+    obj.error.sdump('D_CIRC', + document.getElementById('circStrings').getString('staff.circ.in_house_use.no_external') + '\n');
+   }
 
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.in_house_use.failed'), E);
-			if (typeof obj.on_failure == 'function') {
-				obj.on_failure(E);
-			}
-			if (typeof window.xulG == 'object' && typeof window.xulG.on_failure == 'function') {
-				obj.error.sdump('D_CIRC', + document.getElementById('circStrings').getString('staff.circ.in_house_use.on_failure.external') + '\n');
-				window.xulG.on_failure(E);
-			} else {
-				obj.error.sdump('D_CIRC', + document.getElementById('circStrings').getString('staff.circ.in_house_use.on_failure.external') + '\n');
-			}
-		}
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.in_house_use.failed'), E);
+   if (typeof obj.on_failure == 'function') {
+    obj.on_failure(E);
+   }
+   if (typeof window.xulG == 'object' && typeof window.xulG.on_failure == 'function') {
+    obj.error.sdump('D_CIRC', + document.getElementById('circStrings').getString('staff.circ.in_house_use.on_failure.external') + '\n');
+    window.xulG.on_failure(E);
+   } else {
+    obj.error.sdump('D_CIRC', + document.getElementById('circStrings').getString('staff.circ.in_house_use.on_failure.external') + '\n');
+   }
+  }
 
-	},
+ },
 
-	'on_in_house_use' : function() {
-		this.controller.view.in_house_use_multiplier_textbox.select();
-		this.controller.view.in_house_use_multiplier_textbox.value = '1';
-		this.controller.view.in_house_use_barcode_entry_textbox.value = '';
-		this.controller.view.in_house_use_barcode_entry_textbox.focus();
-	},
+ 'on_in_house_use' : function() {
+  this.controller.view.in_house_use_multiplier_textbox.select();
+  this.controller.view.in_house_use_multiplier_textbox.value = '1';
+  this.controller.view.in_house_use_barcode_entry_textbox.value = '';
+  this.controller.view.in_house_use_barcode_entry_textbox.focus();
+ },
 
-	'on_failure' : function() {
-		this.controller.view.in_house_use_barcode_entry_textbox.select();
-		this.controller.view.in_house_use_barcode_entry_textbox.focus();
-	}
+ 'on_failure' : function() {
+  this.controller.view.in_house_use_barcode_entry_textbox.select();
+  this.controller.view.in_house_use_barcode_entry_textbox.focus();
+ }
 }
 
 dump('exiting circ.in_house_use.js\n');
diff --git a/Open-ILS/xul/staff_client/server/circ/in_house_use.xul b/Open-ILS/xul/staff_client/server/circ/in_house_use.xul
index 1eb00db8c5..6a4b1d4c81 100644
--- a/Open-ILS/xul/staff_client/server/circ/in_house_use.xul
+++ b/Open-ILS/xul/staff_client/server/circ/in_house_use.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,90 +20,90 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="in_house_use_win" 
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') {
-					throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
-				}
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for in_house_use.xul');
-
-				JSAN.use('circ.in_house_use'); g.in_house_use = new circ.in_house_use();
-				g.in_house_use.init( 
-					{ 
-					} 
-				);
-	
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					try {
-						window.xulG.set_tab_name(document.getElementById('circStrings').getString('staff.circ.in_house_use.tab_name'));
-					} catch(E) {
-						alert(E);
-					}
-				}
-
-			} catch(E) {
-				var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['circ.in_house_use.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function default_focus() { try { setTimeout( function() { document.getElementById('in_house_use_barcode_entry_textbox').focus(); }, 0); } catch(E) {} }
-	]]>
-	</script>
-
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-
-	<commandset id="in_house_use_cmds">
-		<command id="sel_clip" disabled="true" />
-		<command id="cmd_csv_to_clipboard" />
-		<command id="cmd_csv_to_printer" />
-		<command id="cmd_csv_to_file" />
-		<command id="cmd_in_house_use_submit_barcode" />
-		<command id="cmd_in_house_use_print" />
-		<command id="save_columns" />
-	</commandset>
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') {
+     throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
+    }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for in_house_use.xul');
+
+    JSAN.use('circ.in_house_use'); g.in_house_use = new circ.in_house_use();
+    g.in_house_use.init( 
+     { 
+     } 
+    );
+ 
+    if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+     try {
+      window.xulG.set_tab_name(document.getElementById('circStrings').getString('staff.circ.in_house_use.tab_name'));
+     } catch(E) {
+      alert(E);
+     }
+    }
+
+   } catch(E) {
+    var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['circ.in_house_use.xul', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+
+  function default_focus() { try { setTimeout( function() { document.getElementById('in_house_use_barcode_entry_textbox').focus(); }, 0); } catch(E) {} }
+ ]]>
+ </script>
+
+ <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+
+ <commandset id="in_house_use_cmds">
+  <command id="sel_clip" disabled="true" />
+  <command id="cmd_csv_to_clipboard" />
+  <command id="cmd_csv_to_printer" />
+  <command id="cmd_csv_to_file" />
+  <command id="cmd_in_house_use_submit_barcode" />
+  <command id="cmd_in_house_use_print" />
+  <command id="save_columns" />
+ </commandset>
 
 <box id="in_house_use_main" flex="1" orient="vertical" class="my_overflow">
 <vbox id="cmvb1" flex="1">
 <hbox id="background" style="background-color: purple; color: white;">
-	<spacer flex="1"/>
-	<label value="&staff.circ.in_house_use.main.label;" style="font-size: x-large; font-weight: bold;"/>
-	<spacer flex="1"/>
+ <spacer flex="1"/>
+ <label value="&staff.circ.in_house_use.main.label;" style="font-size: x-large; font-weight: bold;"/>
+ <spacer flex="1"/>
 </hbox>
 <groupbox id="cmgb1" flex="2">
 
-	<caption label="&staff.circ.in_house_use.cmgb1.caption;" />
+ <caption label="&staff.circ.in_house_use.cmgb1.caption;" />
 
-	<hbox id="in_house_use_top_ui">
-		<label id="in_house_use_multiplier_label" value="&staff.circ.in_house_use.multiplier.label;" control="in_house_use_multiplier_textbox" accesskey="&staff.circ.in_house_use.multiplier.accesskey;" hidden="false"/>
-		<textbox id="in_house_use_multiplier_textbox" value="1" hidden="false" size="6" cols="6" context="clipboard"/>
-		<hbox id="in_house_use_menu_placeholder" flex="0"/>
-		<textbox id="in_house_use_barcode_entry_textbox" context="clipboard"/>
-		<button id="in_house_use_submit_barcode_button" 
-			label="&staff.circ.in_house_use.submit.label;"
-			command="cmd_in_house_use_submit_barcode"
-			accesskey="&staff.circ.in_house_use.submit.accesskey;"/>
-	</hbox>
+ <hbox id="in_house_use_top_ui">
+  <label id="in_house_use_multiplier_label" value="&staff.circ.in_house_use.multiplier.label;" control="in_house_use_multiplier_textbox" accesskey="&staff.circ.in_house_use.multiplier.accesskey;" hidden="false"/>
+  <textbox id="in_house_use_multiplier_textbox" value="1" hidden="false" size="6" cols="6" context="clipboard"/>
+  <hbox id="in_house_use_menu_placeholder" flex="0"/>
+  <textbox id="in_house_use_barcode_entry_textbox" context="clipboard"/>
+  <button id="in_house_use_submit_barcode_button" 
+   label="&staff.circ.in_house_use.submit.label;"
+   command="cmd_in_house_use_submit_barcode"
+   accesskey="&staff.circ.in_house_use.submit.accesskey;"/>
+ </hbox>
 
-	<tree id="in_house_use_list" flex="1" enableColumnDrag="true" />
+ <tree id="in_house_use_list" flex="1" enableColumnDrag="true" />
 
-	<hbox id="in_house_use_bottom_ui">
+ <hbox id="in_house_use_bottom_ui">
         <button id="list_actions" oncommand="this.firstChild.showPopup();"
             label="&staff.generic.list_actions.label;" 
             accesskey="&staff.generic.list_actions.accesskey;" 
@@ -117,14 +117,14 @@
             </menupopup>
         </button>
 
-		<button id="in_house_use_print" 
-			label="&staff.circ.in_house_use.print.label;" 
-			command="cmd_in_house_use_print"
-			accesskey=""/>
-		<checkbox id="trim_list" label="&staff.circ.in_house_use.trim_list.label;" checked="true" oils_persist="checked"/> 
-		<checkbox id="strict_barcode" label="&staff.circ.in_house_use.strict_barcode.label;" checked="false" oils_persist="checked"/> 
-		<spacer id="pcii3s" flex="1"/>
-	</hbox>
+  <button id="in_house_use_print" 
+   label="&staff.circ.in_house_use.print.label;" 
+   command="cmd_in_house_use_print"
+   accesskey=""/>
+  <checkbox id="trim_list" label="&staff.circ.in_house_use.trim_list.label;" checked="true" oils_persist="checked"/> 
+  <checkbox id="strict_barcode" label="&staff.circ.in_house_use.strict_barcode.label;" checked="false" oils_persist="checked"/> 
+  <spacer id="pcii3s" flex="1"/>
+ </hbox>
 
 </groupbox>
 </vbox>
diff --git a/Open-ILS/xul/staff_client/server/circ/pre_cat_fields.xul b/Open-ILS/xul/staff_client/server/circ/pre_cat_fields.xul
index ec32c395ff..dc1f4eb37c 100644
--- a/Open-ILS/xul/staff_client/server/circ/pre_cat_fields.xul
+++ b/Open-ILS/xul/staff_client/server/circ/pre_cat_fields.xul
@@ -14,7 +14,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -22,68 +22,68 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="pre_cat_fields" title="&staff.circ.pre_cat.window.title;"
-	orient="vertical" style="overflow: auto"
-	onload="try{my_init();font_helper(); }catch(E){alert(E);}"
-	onunload="try{my_finish();}catch(E){alert(E);}"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ orient="vertical" style="overflow: auto"
+ onload="try{my_init();font_helper(); }catch(E){alert(E);}"
+ onunload="try{my_finish();}catch(E){alert(E);}"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-
-	<script>
-	<![CDATA[
-
-		function my_init() {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			if (typeof JSAN == 'undefined') {
-				throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
-			}
-			JSAN.errorLevel = "die"; // none, warn, or die
-			JSAN.addRepository('/xul/server/');
-			JSAN.use('util.error'); g.error = new util.error();
-			g.error.sdump('D_TRACE','my_init() for pre_cat_fields.xul');
-			JSAN.use('OpenILS.data'); g.data = new OpenILS.data();
-			g.data.init({'via':'stash'});
-
-			document.getElementById('dummy_title').focus();
-		}
-
-		function my_finish() {
-			/* FIXME -- need unique temp space name */
-			/* FIXME -- We need to blank dummy_title on a forced window close */
-			g.data.stash('dummy_title','dummy_author');
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-
-	<groupbox>
-		<caption label="&staff.circ.pre_cat.caption.label;"/>
-		<grid>
-			<columns><column /><column flex="1"/></columns>
-			<rows>
-				<row>
-					<label value="&staff.circ.pre_cat.dummy_title.value;" control="dummy_title"/>
-					<textbox id="dummy_title" onchange="g.data.dummy_title = event.target.value;" context="clipboard"/>
-				</row>
-				<row>
-					<label value="&staff.circ.pre_cat.dummy_author.value;" control="dummy_author"/>
-					<textbox id="dummy_author" onchange="g.data.dummy_author = event.target.value;" context="clipboard"/>
-				</row>
-			</rows>
-		</grid>
-		<hbox>
-			<spacer flex="1"/>
-			<button label="&staff.circ.pre_cat.cancel.label;" oncommand="g.data.dummy_title = ''; window.close()" accesskey="&staff.circ.pre_cat.cancel.accesskey;"/>
-			<button label="&staff.circ.pre_cat.checkout.label;" oncommand="window.close();" accesskey="&staff.circ.pre_cat.checkout.accesskey;"/>
-		</hbox>
-	</groupbox>
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+
+ <script>
+ <![CDATA[
+
+  function my_init() {
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   if (typeof JSAN == 'undefined') {
+    throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
+   }
+   JSAN.errorLevel = "die"; // none, warn, or die
+   JSAN.addRepository('/xul/server/');
+   JSAN.use('util.error'); g.error = new util.error();
+   g.error.sdump('D_TRACE','my_init() for pre_cat_fields.xul');
+   JSAN.use('OpenILS.data'); g.data = new OpenILS.data();
+   g.data.init({'via':'stash'});
+
+   document.getElementById('dummy_title').focus();
+  }
+
+  function my_finish() {
+   /* FIXME -- need unique temp space name */
+   /* FIXME -- We need to blank dummy_title on a forced window close */
+   g.data.stash('dummy_title','dummy_author');
+  }
+
+ ]]>
+ </script>
+
+ <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+
+ <groupbox>
+  <caption label="&staff.circ.pre_cat.caption.label;"/>
+  <grid>
+   <columns><column /><column flex="1"/></columns>
+   <rows>
+    <row>
+     <label value="&staff.circ.pre_cat.dummy_title.value;" control="dummy_title"/>
+     <textbox id="dummy_title" onchange="g.data.dummy_title = event.target.value;" context="clipboard"/>
+    </row>
+    <row>
+     <label value="&staff.circ.pre_cat.dummy_author.value;" control="dummy_author"/>
+     <textbox id="dummy_author" onchange="g.data.dummy_author = event.target.value;" context="clipboard"/>
+    </row>
+   </rows>
+  </grid>
+  <hbox>
+   <spacer flex="1"/>
+   <button label="&staff.circ.pre_cat.cancel.label;" oncommand="g.data.dummy_title = ''; window.close()" accesskey="&staff.circ.pre_cat.cancel.accesskey;"/>
+   <button label="&staff.circ.pre_cat.checkout.label;" oncommand="window.close();" accesskey="&staff.circ.pre_cat.checkout.accesskey;"/>
+  </hbox>
+ </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.js b/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.js
index e0c32f1287..ab4fa01e27 100644
--- a/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.js
+++ b/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.js
@@ -3,400 +3,400 @@ dump('entering print_list_template_editor.js\n');
 
 if (typeof circ == 'undefined') circ = {};
 circ.print_list_template_editor = function (params) {
-	try {
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		JSAN.use('util.error'); this.error = new util.error();
-	} catch(E) {
-		dump('print_list: ' + E + '\n');
-	}
+ try {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  JSAN.use('util.error'); this.error = new util.error();
+ } catch(E) {
+  dump('print_list: ' + E + '\n');
+ }
 }
 
 circ.print_list_template_editor.prototype = {
 
-	'init' : function( params ) {
+ 'init' : function( params ) {
 
-		try {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  try {
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
-			var obj = this;
+   var obj = this;
 
-			JSAN.use('OpenILS.data'); obj.data = new OpenILS.data(); obj.data.init({'via':'stash'});
-			this.test_patron = new au();
-			this.test_patron.family_name('Doe');
-			this.test_patron.first_given_name('John');
-			this.test_patron.alias('Curly');
-			this.test_card = new ac();
-			this.test_card.barcode('123456789');
-			this.test_patron.card( this.test_card );
+   JSAN.use('OpenILS.data'); obj.data = new OpenILS.data(); obj.data.init({'via':'stash'});
+   this.test_patron = new au();
+   this.test_patron.family_name('Doe');
+   this.test_patron.first_given_name('John');
+   this.test_patron.alias('Curly');
+   this.test_card = new ac();
+   this.test_card.barcode('123456789');
+   this.test_patron.card( this.test_card );
 
-			this.test_data = {
-				'payment' : {
-					'original_balance' : '16.36',
-					'payment_type' : 'Cash',
-					'payment_received' : '0.00',
-					'payment_applied' : '0.00',
-					'voided_balance' : '0.50',
-					'change_given' : '0.00',
-					'credit_given' : '0.00',
-					'note' : "We refunded this because...",
-					'new_balance' : '16.36'
-				}
-			}
+   this.test_data = {
+    'payment' : {
+     'original_balance' : '16.36',
+     'payment_type' : 'Cash',
+     'payment_received' : '0.00',
+     'payment_applied' : '0.00',
+     'voided_balance' : '0.50',
+     'change_given' : '0.00',
+     'credit_given' : '0.00',
+     'note' : "We refunded this because...",
+     'new_balance' : '16.36'
+    }
+   }
 
-			this.test_list = {
-			
-				'items' : [
-				{"uses":"undefined","alert_message":"","author":"Annixter, Jane.","barcode":"3635300990263","call_number":"F","checkin_time":"   ","checkin_time_full":"","xact_start":"2006-08-23","xact_start_full":"2006-08-23T14:37:15-0400","circ_as_type":"","circ_id":"19907","circ_lib":"URRLS-SC","circ_modifier":"","circulate":"Yes","acp_id":"34","copy_number":"1","create_date":"2006-04-28","edit_date":"2006-08-23","deleted":"No","deposit_amount":"0.00","deposit":"No","mvr_doc_id":"13","due_date":"2006-08-23","edition":"","fine_level":"Low","stop_fines":"","stop_fines_time":"","holdable":"Yes","isbn":"","loan_duration":"Short","location":"Adult","message":"   ","opac_visible":"Yes","owning_lib":"URRLS-SC","price":"10.00","pubdate":"1961","publisher":"Longmans","ref":"No","renewal_remaining":"0","route_to":"   ","status":"Checked out","tcn":"PIN01000015 ","title":"Peace comes to Castle Oak ","xact_finish":""},
-				{"uses":"undefined","alert_message":"","author":"Josephson, Matthew","barcode":"33207002163014","call_number":"NONFIC 330.922 JOSEPHSO","checkin_time":"   ","checkin_time_full":"","xact_start":"2006-08-23","xact_start_full":"2006-08-23T14:37:23-0400","circ_as_type":"","circ_id":"19908","circ_lib":"ARL-ATH","circ_modifier":"","circulate":"Yes","acp_id":"1658","copy_number":"1","create_date":"2006-04-28","edit_date":"2006-08-23","deleted":"No","deposit_amount":"0.00","deposit":"No","mvr_doc_id":"250","due_date":"2006-09-06","edition":"","fine_level":"Low","stop_fines":"","stop_fines_time":"","holdable":"Yes","isbn":"","loan_duration":"Short","location":"Adult","message":"   ","opac_visible":"Yes","owning_lib":"ARL-ATH","price":"10.95","pubdate":"[c1934]","publisher":"Harcourt, Brace and company","ref":"No","renewal_remaining":"0","route_to":"   ","status":"Checked out","tcn":"PIN01000311 ","title":"The  robber barons :  the great American capitalists, 1861-1901","xact_finish":""},
-				{"uses":"undefined","alert_message":"","author":"Payne, Emmy","barcode":"33034001434539","call_number":"EJ PAYNE","checkin_time":"   ","checkin_time_full":"","xact_start":"2006-08-23","xact_start_full":"2006-08-23T14:36:54-0400","circ_as_type":"","circ_id":"19904","circ_lib":"SHRL-RM","circ_modifier":"","circulate":"Yes","acp_id":"6165596","copy_number":"1","create_date":"2006-04-28","edit_date":"2006-08-23","deleted":"No","deposit_amount":"0.00","deposit":"No","mvr_doc_id":"1220497","due_date":"2006-09-06","edition":"Reinforced ed.","fine_level":"Low","stop_fines":"","stop_fines_time":"","holdable":"Yes","isbn":"075872926X (BWI bdg.)","loan_duration":"Short","location":"Adult","message":"   ","opac_visible":"Yes","owning_lib":"SHRL-RM","price":"0.00","pubdate":"1944","publisher":"Houghton Mifflin","ref":"No","renewal_remaining":"0","route_to":"   ","status":"Checked out","tcn":"PIN01000377 ","title":"Katy no-pocket ","xact_finish":""},
-				{"uses":"undefined","alert_message":"","author":"Ames, Leslie","barcode":"31039000791757","call_number":"AF AME","checkin_time":"   ","checkin_time_full":"","xact_start":"2006-08-23","xact_start_full":"2006-08-23T14:37:07-0400","circ_as_type":"","circ_id":"19906","circ_lib":"ORLS-TEL","circ_modifier":"","circulate":"Yes","acp_id":"28","copy_number":"1","create_date":"2006-04-28","edit_date":"2006-08-23","deleted":"No","deposit_amount":"0.00","deposit":"No","mvr_doc_id":"8","due_date":"2006-09-06","edition":"","fine_level":"Low","stop_fines":"","stop_fines_time":"","holdable":"Yes","isbn":"","loan_duration":"Short","location":"Adult","message":"   ","opac_visible":"Yes","owning_lib":"ORLS-TEL","price":"5.95","pubdate":"","publisher":"Lenox Hill","ref":"No","renewal_remaining":"0","route_to":"   ","status":"Checked out","tcn":"PIN01000009 ","title":"King's Castle ","xact_finish":""},
-				{"uses":"undefined","alert_message":"","author":"Payne, Emmy","barcode":"33034001434539","call_number":"EJ PAYNE","checkin_time":"   ","checkin_time_full":"","xact_start":"2006-08-23","xact_start_full":"2006-08-23T14:36:54-0400","circ_as_type":"","circ_id":"19903","circ_lib":"SHRL-RM","circ_modifier":"","circulate":"Yes","acp_id":"6165596","copy_number":"1","create_date":"2006-04-28","edit_date":"2006-08-23","deleted":"No","deposit_amount":"0.00","deposit":"No","mvr_doc_id":"1220497","due_date":"2006-09-06","edition":"Reinforced ed.","fine_level":"Low","stop_fines":"","stop_fines_time":"","holdable":"Yes","isbn":"075872926X (BWI bdg.)","loan_duration":"Short","location":"Adult","message":"   ","opac_visible":"Yes","owning_lib":"SHRL-RM","price":"0.00","pubdate":"1944","publisher":"Houghton Mifflin","ref":"No","renewal_remaining":"0","route_to":"   ","status":"Checked out","tcn":"PIN01000377 ","title":"Katy no-pocket ","xact_finish":""}],
-				'holds' : [{"author":"Wells, H. G. ","available_time":"2006-08-03","available_timestamp":"2006-08-03T15:14:53-0400","capture_time":"2006-08-03","capture_timestamp":"2006-08-03T15:14:53-0400","current_copy":"33207003884402","edition":"","email_notify":"No","expire_time":"","fulfillment_time":"","id":"57","holdable_formats":"","isbn":"0192828266 :","notify_time":"","notify_count":"0","patron_name":"23500000023053 Stompro, Josh","phone_notify":"218-233-3757","pickup_lib_shortname":"ARL-ATH","pickup_lib":"Athens-Clarke County Library","prev_check_time":"2006-08-02T16:15:11-0400","pubdate":"1995","publisher":"Oxford University Press","request_time":"2006-05-20","request_timestamp":"2006-05-20","requestor":"1000000","selection_depth":"0","status":"Ready for pickup","tcn":"PIN03002240 ","target":"131469","title":"The  war of the worlds","transit_dest_recv_time":"","transit_dest_lib":"","transit_source":"","transit_source_send_time":"","hold_type":"T","usr":"1000567"},
-				{"author":"Kramer, Kathryn.","available_time":"2006-08-03","available_timestamp":"2006-08-03T15:32:58-0400","capture_time":"2006-08-03","capture_timestamp":"2006-08-03T15:32:58-0400","current_copy":"33207004030757","edition":"1st ed.","email_notify":"No","expire_time":"","fulfillment_time":"","id":"470","holdable_formats":"","isbn":"0375400834","notify_time":"2006-08-24T15:12:30-0400","notify_count":"1","patron_name":"21034000217210 Jenkins, George","phone_notify":"229-985-3464","pickup_lib_shortname":"ARL-ATH","pickup_lib":"Athens-Clarke County Library","prev_check_time":"2006-08-03T12:15:03-0400","pubdate":"1998","publisher":"Knopf","request_time":"2006-07-28","request_timestamp":"2006-07-28","requestor":"3","selection_depth":"0","status":"Ready for pickup","tcn":"PIN03053147 ","target":"313678","title":"Sweet water ","transit_dest_recv_time":"","transit_dest_lib":"","transit_source":"","transit_source_send_time":"","hold_type":"T","usr":"1001151"},
-				{"author":"Silva, Daniel","available_time":"2006-08-03","available_timestamp":"2006-08-03T15:39:35-0400","capture_time":"2006-08-03","capture_timestamp":"2006-08-03T15:39:35-0400","current_copy":"33207004323517","edition":"1st ed.","email_notify":"No","expire_time":"","fulfillment_time":"","id":"448","holdable_formats":"","isbn":"0375500898 (alk. paper)","notify_time":"","notify_count":"0","patron_name":"21099000002755 Broome, Sandra","phone_notify":"706-236-4632","pickup_lib_shortname":"ARL-ATH","pickup_lib":"Athens-Clarke County Library","prev_check_time":"2006-08-02T17:16:39-0400","pubdate":"c1999","publisher":"Random House","request_time":"2006-07-27","request_timestamp":"2006-07-27","requestor":"1000001","selection_depth":"0","status":"Ready for pickup","tcn":"ocm40444117 ","target":"77772","title":"The  marching season :  a novel","transit_dest_recv_time":"","transit_dest_lib":"","transit_source":"","transit_source_send_time":"","hold_type":"T","usr":"1000846"},
-				{"author":"Seuss","available_time":"2006-08-13","available_timestamp":"2006-08-13T20:55:02-0400","capture_time":"2006-08-13","capture_timestamp":"2006-08-13T20:55:02-0400","current_copy":"20070805","edition":"","email_notify":"No","expire_time":"","fulfillment_time":"","id":"1697","holdable_formats":"","isbn":"039480001X :","notify_time":"","notify_count":"0","patron_name":"4545 Tripper, Jack","phone_notify":"444-333-2222","pickup_lib_shortname":"ARL-ATH","pickup_lib":"Athens-Clarke County Library","prev_check_time":"2006-08-13T20:45:09-0400","pubdate":"1992, c1957","publisher":"Seedlings Braille Books for Children","request_time":"2006-08-13","request_timestamp":"2006-08-13","requestor":"1000000","selection_depth":"0","status":"Ready for pickup","tcn":"ocm47673093 ","target":"1534993","title":"The  cat in the hat","transit_dest_recv_time":"","transit_dest_lib":"","transit_source":"","transit_source_send_time":"","hold_type":"T","usr":"1002261"},
-				{"author":"Potter, Sally.","available_time":"2006-08-09","available_timestamp":"2006-08-09T18:06:10-0400","capture_time":"2006-08-09","capture_timestamp":"2006-08-09T18:06:10-0400","current_copy":"31001000843129","edition":"","email_notify":"No","expire_time":"","fulfillment_time":"","id":"1004","holdable_formats":"","isbn":"0783262663","notify_time":"2006-08-10T15:24:46-0400","notify_count":"12","patron_name":"2222233333 Erickson, Bill","phone_notify":"999-999-9999","pickup_lib_shortname":"ARL-ATH","pickup_lib":"Athens-Clarke County Library","prev_check_time":"2006-08-09T12:15:27-0400","pubdate":"c2001","publisher":"Universal Studios","request_time":"2006-08-08","request_timestamp":"2006-08-08","requestor":"3","selection_depth":"0","status":"Ready for pickup","tcn":"ocm48683123 ","target":"1572303","title":"The  man who cried","transit_dest_recv_time":"","transit_dest_lib":"","transit_source":"","transit_source_send_time":"","hold_type":"T","usr":"3"}],
-				'bills' : [{"balance_owed":"-5.00","xact_finish":"2006-05-08","xact_start":"2006-05-08","id":"9","last_billing_ts":"2006-05-08 18:53","last_billing_note":"test","last_billing_type":"Miscellaneous charges","last_payment_ts":"2006-05-08 18:53","last_payment_note":"","last_payment_type":"cash_payment","total_owed":"0.00","total_paid":"5.00","xact_type":"grocery","usr":"Id = 1000502"},
-				{"balance_owed":"-5.00","xact_finish":"2006-05-08","xact_start":"2006-05-08","id":"11","last_billing_ts":"2006-05-08 19:11","last_billing_note":"test","last_billing_type":"Miscellaneous","last_payment_ts":"2006-05-08 19:12","last_payment_note":"","last_payment_type":"cash_payment","total_owed":"0.00","total_paid":"5.00","xact_type":"grocery","usr":"Id = 1000502"},
-				{"balance_owed":"-50.00","xact_finish":"2006-05-08","xact_start":"2006-05-08","id":"18","last_billing_ts":"2006-05-08 20:20","last_billing_note":"","last_billing_type":"Miscellaneous","last_payment_ts":"2006-05-08 21:27","last_payment_note":"","last_payment_type":"cash_payment","total_owed":"0.00","total_paid":"50.00","xact_type":"grocery","usr":"Id = 1000502"},
-				{"balance_owed":"1.00","xact_finish":"2006-06-14","xact_start":"2006-06-14","id":"451","last_billing_ts":"2006-06-14 16:49","last_billing_note":"SYSTEM GENERATED","last_billing_type":"Lost Materials","last_payment_ts":"2006-06-14 16:49","last_payment_note":"","last_payment_type":"cash_payment","total_owed":"6.00","total_paid":"5.00","xact_type":"circulation","usr":"Id = 1000502"},
-				{"balance_owed":"-1.00","xact_finish":"2006-06-17","xact_start":"2006-06-17","id":"3689","last_billing_ts":"2006-06-17 04:01","last_billing_note":"","last_billing_type":"Miscellaneous","last_payment_ts":"2006-06-17 18:51","last_payment_note":"","last_payment_type":"cash_payment","total_owed":"10.00","total_paid":"11.00","xact_type":"grocery","usr":"Id = 1000502"},
-				{"balance_owed":".66","xact_finish":"","xact_start":"2006-06-27","id":"5589","last_billing_ts":"2006-08-22 00:00","last_billing_note":"Overdue Fine","last_billing_type":"Overdue materials","last_payment_ts":"2006-09-04 17:31","last_payment_note":"","last_payment_type":"cash_payment","total_owed":"5.60","total_paid":"4.94","xact_type":"circulation","usr":"Id = 1000502"},
-				{"balance_owed":".70","xact_finish":"","xact_start":"2006-06-27","id":"5593","last_billing_ts":"2006-08-22 00:00","last_billing_note":"Overdue Fine","last_billing_type":"Overdue materials","last_payment_ts":"2006-08-16 11:01","last_payment_note":"","last_payment_type":"cash_payment","total_owed":"5.50","total_paid":"4.80","xact_type":"circulation","usr":"Id = 1000502"},
-				{"balance_owed":"5.00","xact_finish":"","xact_start":"2006-08-16","id":"14834","last_billing_ts":"2006-08-16 12:25","last_billing_note":"","last_billing_type":"Damaged material","last_payment_ts":"","last_payment_note":"","last_payment_type":"","total_owed":"5.00","total_paid":"0.00","xact_type":"grocery","usr":"Id = 1000502"},
-				{"balance_owed":"10.00","xact_finish":"","xact_start":"2006-08-16","id":"14858","last_billing_ts":"2006-08-16 12:34","last_billing_note":"","last_billing_type":"Damaged material","last_payment_ts":"","last_payment_note":"","last_payment_type":"","total_owed":"10.00","total_paid":"0.00","xact_type":"grocery","usr":"Id = 1000502"}],
-				'payment' : [{"bill_id":5559,"payment":"-0.04","last_billing_type":"Overdue materials","last_billing_note":"Overdue Fine","title":"Hali Bote Azikaban de tao fan","barcode":"a16"},{"bill_id":5589,"payment":"0.04","last_billing_type":"Overdue materials","last_billing_note":"Overdue Fine","title":"Hali Bote Azikaban de tao fan","barcode":"a47"}],
-				'patrons' : [],
-				'transits' : [{"transit_item_author":"Arvetis, Chris.","transit_item_barcode":"3947801748348","transit_item_callnumber":"JE ARV","transit_item_title":"Why do birds sing?","transit_target_copy":"2385751","transit_dest_lib":"PIED-WIN","transit_id":"25","transit_source":"ARL-ATH","transit_source_send_time":"2006-05-24T16:37:09-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
-				{"transit_item_author":"Pine, Tillie S.","transit_item_barcode":"3635300990762","transit_item_callnumber":"F","transit_item_title":"Water all around ","transit_target_copy":"1","transit_dest_lib":"URRLS-SC","transit_id":"26","transit_source":"ARL-ATH","transit_source_send_time":"2006-05-27T22:49:40-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
-				{"transit_item_author":"","transit_item_barcode":"31057000861941","transit_item_callnumber":"CD J 781.5246 CASPE","transit_item_title":"Casper's spookiest songs and sounds  10 spooky songs plus creepy sound effects","transit_target_copy":"7923932","transit_dest_lib":"WGRL-LS","transit_id":"98","transit_source":"ARL-ATH","transit_source_send_time":"2006-06-29T16:34:38-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
-				{"transit_item_author":"Davidson, MaryJanice.","transit_item_barcode":"31027005649112","transit_item_callnumber":"AC DAV","transit_item_title":"Undead and unreturnable ","transit_target_copy":"7924995","transit_dest_lib":"HCLS-LG","transit_id":"100","transit_source":"ARL-ATH","transit_source_send_time":"2006-07-07T16:02:32-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
-				{"transit_item_author":"Evanovich, Janet.","transit_item_barcode":"31001001097295","transit_item_callnumber":"813/.54","transit_item_title":"Two for the dough","transit_target_copy":"8000335","transit_dest_lib":"ARL-BOG","transit_id":"102","transit_source":"ARL-ATH","transit_source_send_time":"2006-07-11T12:12:11-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
-				{"transit_item_author":"Edwards, Anne","transit_item_barcode":"39021423853564","transit_item_callnumber":"780.92 STREISAND","transit_item_title":"Streisand a biography","transit_target_copy":"949781","transit_dest_lib":"ECGR-BKM","transit_id":"110","transit_source":"ARL-ATH","transit_source_send_time":"2006-07-14T10:00:01-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
-				{"transit_item_author":"Riese, Randall.","transit_item_barcode":"31025900460205","transit_item_callnumber":"921 STREISAND 1993","transit_item_title":"Her name is Barbra an intimate portrait of the real Barbra Streisand","transit_target_copy":"2210566","transit_dest_lib":"HALL-BPL","transit_id":"112","transit_source":"ARL-ATH","transit_source_send_time":"2006-07-14T10:01:39-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
-				{"transit_item_author":"Rowling, J. K.","transit_item_barcode":"a45","transit_item_callnumber":"JROWLING2","transit_item_title":"Hali Bote Azikaban de tao fan","transit_target_copy":"8000297","transit_dest_lib":"WGRL-LS","transit_id":"118","transit_source":"ARL-ATH","transit_source_send_time":"2006-07-19T13:52:38-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
-				{"transit_item_author":"Some Author","transit_item_barcode":"321","transit_item_callnumber":"UNCATALOGED","transit_item_title":"Big Book","transit_target_copy":"8000387","transit_dest_lib":"ROCK-NG","transit_id":"119","transit_source":"ARL-ATH","transit_source_send_time":"2006-07-19T13:58:21-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
-				{"transit_item_author":"Thomas, Joyce Carol.","transit_item_barcode":"31036000522216","transit_item_callnumber":"E THOMAS","transit_item_title":"The  gospel Cinderella","transit_target_copy":"7422951","transit_dest_lib":"NCLS-COVTN","transit_id":"200","transit_source":"ARL-ATH","transit_source_send_time":"2006-07-25T15:20:00-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
-				{"transit_item_author":"Robinson, Barbara","transit_item_barcode":"31036000545159","transit_item_callnumber":"J ROBINSON","transit_item_title":"The  best Halloween ever","transit_target_copy":"7487432","transit_dest_lib":"NCLS-COVTN","transit_id":"206","transit_source":"ARL-ATH","transit_source_send_time":"2006-07-25T15:25:44-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
-				{"transit_item_author":"Robinson, Barbara","transit_item_barcode":"31036000545142","transit_item_callnumber":"J ROBINSON","transit_item_title":"The  best Halloween ever","transit_target_copy":"7487431","transit_dest_lib":"NCLS-COVTN","transit_id":"207","transit_source":"ARL-ATH","transit_source_send_time":"2006-07-25T15:25:49-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
-				{"transit_item_author":"Grafton, Sue.","transit_item_barcode":"31036000527900","transit_item_callnumber":"F GRAFTON","transit_item_title":"\"H\" is for homicide","transit_target_copy":"7273824","transit_dest_lib":"NCLS-COVTN","transit_id":"208","transit_source":"ARL-ATH","transit_source_send_time":"2006-07-25T15:25:58-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
-				{"transit_item_author":"Beaumont, Karen.","transit_item_barcode":"31036000521853","transit_item_callnumber":"E BEAUMONT","transit_item_title":"I like myself!","transit_target_copy":"7387328","transit_dest_lib":"NCLS-COVTN","transit_id":"211","transit_source":"ARL-ATH","transit_source_send_time":"2006-07-25T15:26:08-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
-				{"transit_item_author":"Sandler, Martin W.","transit_item_barcode":"31036000522612","transit_item_callnumber":"J 388.42 SANDLER","transit_item_title":"Straphanging in the USA trolleys and subways in American life","transit_target_copy":"7360328","transit_dest_lib":"NCLS-COVTN","transit_id":"212","transit_source":"ARL-ATH","transit_source_send_time":"2006-07-25T15:35:17-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
-				{"transit_item_author":"Bohjalian, Christopher A.","transit_item_barcode":"31036000538303","transit_item_callnumber":"F BOHJALIAN","transit_item_title":"Before you know kindness :  a novel","transit_target_copy":"7544549","transit_dest_lib":"NCLS-COVTN","transit_id":"218","transit_source":"ARL-ATH","transit_source_send_time":"2006-07-26T10:23:20-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},],
-				'offline_checkout' : [],
-				'offline_checkin' : [],
-				'offline_renew' : [],
-				'offline_inhouse_use' : []
-			}
+   this.test_list = {
+   
+    'items' : [
+    {"uses":"undefined","alert_message":"","author":"Annixter, Jane.","barcode":"3635300990263","call_number":"F","checkin_time":"   ","checkin_time_full":"","xact_start":"2006-08-23","xact_start_full":"2006-08-23T14:37:15-0400","circ_as_type":"","circ_id":"19907","circ_lib":"URRLS-SC","circ_modifier":"","circulate":"Yes","acp_id":"34","copy_number":"1","create_date":"2006-04-28","edit_date":"2006-08-23","deleted":"No","deposit_amount":"0.00","deposit":"No","mvr_doc_id":"13","due_date":"2006-08-23","edition":"","fine_level":"Low","stop_fines":"","stop_fines_time":"","holdable":"Yes","isbn":"","loan_duration":"Short","location":"Adult","message":"   ","opac_visible":"Yes","owning_lib":"URRLS-SC","price":"10.00","pubdate":"1961","publisher":"Longmans","ref":"No","renewal_remaining":"0","route_to":"   ","status":"Checked out","tcn":"PIN01000015 ","title":"Peace comes to Castle Oak ","xact_finish":""},
+    {"uses":"undefined","alert_message":"","author":"Josephson, Matthew","barcode":"33207002163014","call_number":"NONFIC 330.922 JOSEPHSO","checkin_time":"   ","checkin_time_full":"","xact_start":"2006-08-23","xact_start_full":"2006-08-23T14:37:23-0400","circ_as_type":"","circ_id":"19908","circ_lib":"ARL-ATH","circ_modifier":"","circulate":"Yes","acp_id":"1658","copy_number":"1","create_date":"2006-04-28","edit_date":"2006-08-23","deleted":"No","deposit_amount":"0.00","deposit":"No","mvr_doc_id":"250","due_date":"2006-09-06","edition":"","fine_level":"Low","stop_fines":"","stop_fines_time":"","holdable":"Yes","isbn":"","loan_duration":"Short","location":"Adult","message":"   ","opac_visible":"Yes","owning_lib":"ARL-ATH","price":"10.95","pubdate":"[c1934]","publisher":"Harcourt, Brace and company","ref":"No","renewal_remaining":"0","route_to":"   ","status":"Checked out","tcn":"PIN01000311 ","title":"The  robber barons :  the great American capitalists, 1861-1901","xact_finish":""},
+    {"uses":"undefined","alert_message":"","author":"Payne, Emmy","barcode":"33034001434539","call_number":"EJ PAYNE","checkin_time":"   ","checkin_time_full":"","xact_start":"2006-08-23","xact_start_full":"2006-08-23T14:36:54-0400","circ_as_type":"","circ_id":"19904","circ_lib":"SHRL-RM","circ_modifier":"","circulate":"Yes","acp_id":"6165596","copy_number":"1","create_date":"2006-04-28","edit_date":"2006-08-23","deleted":"No","deposit_amount":"0.00","deposit":"No","mvr_doc_id":"1220497","due_date":"2006-09-06","edition":"Reinforced ed.","fine_level":"Low","stop_fines":"","stop_fines_time":"","holdable":"Yes","isbn":"075872926X (BWI bdg.)","loan_duration":"Short","location":"Adult","message":"   ","opac_visible":"Yes","owning_lib":"SHRL-RM","price":"0.00","pubdate":"1944","publisher":"Houghton Mifflin","ref":"No","renewal_remaining":"0","route_to":"   ","status":"Checked out","tcn":"PIN01000377 ","title":"Katy no-pocket ","xact_finish":""},
+    {"uses":"undefined","alert_message":"","author":"Ames, Leslie","barcode":"31039000791757","call_number":"AF AME","checkin_time":"   ","checkin_time_full":"","xact_start":"2006-08-23","xact_start_full":"2006-08-23T14:37:07-0400","circ_as_type":"","circ_id":"19906","circ_lib":"ORLS-TEL","circ_modifier":"","circulate":"Yes","acp_id":"28","copy_number":"1","create_date":"2006-04-28","edit_date":"2006-08-23","deleted":"No","deposit_amount":"0.00","deposit":"No","mvr_doc_id":"8","due_date":"2006-09-06","edition":"","fine_level":"Low","stop_fines":"","stop_fines_time":"","holdable":"Yes","isbn":"","loan_duration":"Short","location":"Adult","message":"   ","opac_visible":"Yes","owning_lib":"ORLS-TEL","price":"5.95","pubdate":"","publisher":"Lenox Hill","ref":"No","renewal_remaining":"0","route_to":"   ","status":"Checked out","tcn":"PIN01000009 ","title":"King's Castle ","xact_finish":""},
+    {"uses":"undefined","alert_message":"","author":"Payne, Emmy","barcode":"33034001434539","call_number":"EJ PAYNE","checkin_time":"   ","checkin_time_full":"","xact_start":"2006-08-23","xact_start_full":"2006-08-23T14:36:54-0400","circ_as_type":"","circ_id":"19903","circ_lib":"SHRL-RM","circ_modifier":"","circulate":"Yes","acp_id":"6165596","copy_number":"1","create_date":"2006-04-28","edit_date":"2006-08-23","deleted":"No","deposit_amount":"0.00","deposit":"No","mvr_doc_id":"1220497","due_date":"2006-09-06","edition":"Reinforced ed.","fine_level":"Low","stop_fines":"","stop_fines_time":"","holdable":"Yes","isbn":"075872926X (BWI bdg.)","loan_duration":"Short","location":"Adult","message":"   ","opac_visible":"Yes","owning_lib":"SHRL-RM","price":"0.00","pubdate":"1944","publisher":"Houghton Mifflin","ref":"No","renewal_remaining":"0","route_to":"   ","status":"Checked out","tcn":"PIN01000377 ","title":"Katy no-pocket ","xact_finish":""}],
+    'holds' : [{"author":"Wells, H. G. ","available_time":"2006-08-03","available_timestamp":"2006-08-03T15:14:53-0400","capture_time":"2006-08-03","capture_timestamp":"2006-08-03T15:14:53-0400","current_copy":"33207003884402","edition":"","email_notify":"No","expire_time":"","fulfillment_time":"","id":"57","holdable_formats":"","isbn":"0192828266 :","notify_time":"","notify_count":"0","patron_name":"23500000023053 Stompro, Josh","phone_notify":"218-233-3757","pickup_lib_shortname":"ARL-ATH","pickup_lib":"Athens-Clarke County Library","prev_check_time":"2006-08-02T16:15:11-0400","pubdate":"1995","publisher":"Oxford University Press","request_time":"2006-05-20","request_timestamp":"2006-05-20","requestor":"1000000","selection_depth":"0","status":"Ready for pickup","tcn":"PIN03002240 ","target":"131469","title":"The  war of the worlds","transit_dest_recv_time":"","transit_dest_lib":"","transit_source":"","transit_source_send_time":"","hold_type":"T","usr":"1000567"},
+    {"author":"Kramer, Kathryn.","available_time":"2006-08-03","available_timestamp":"2006-08-03T15:32:58-0400","capture_time":"2006-08-03","capture_timestamp":"2006-08-03T15:32:58-0400","current_copy":"33207004030757","edition":"1st ed.","email_notify":"No","expire_time":"","fulfillment_time":"","id":"470","holdable_formats":"","isbn":"0375400834","notify_time":"2006-08-24T15:12:30-0400","notify_count":"1","patron_name":"21034000217210 Jenkins, George","phone_notify":"229-985-3464","pickup_lib_shortname":"ARL-ATH","pickup_lib":"Athens-Clarke County Library","prev_check_time":"2006-08-03T12:15:03-0400","pubdate":"1998","publisher":"Knopf","request_time":"2006-07-28","request_timestamp":"2006-07-28","requestor":"3","selection_depth":"0","status":"Ready for pickup","tcn":"PIN03053147 ","target":"313678","title":"Sweet water ","transit_dest_recv_time":"","transit_dest_lib":"","transit_source":"","transit_source_send_time":"","hold_type":"T","usr":"1001151"},
+    {"author":"Silva, Daniel","available_time":"2006-08-03","available_timestamp":"2006-08-03T15:39:35-0400","capture_time":"2006-08-03","capture_timestamp":"2006-08-03T15:39:35-0400","current_copy":"33207004323517","edition":"1st ed.","email_notify":"No","expire_time":"","fulfillment_time":"","id":"448","holdable_formats":"","isbn":"0375500898 (alk. paper)","notify_time":"","notify_count":"0","patron_name":"21099000002755 Broome, Sandra","phone_notify":"706-236-4632","pickup_lib_shortname":"ARL-ATH","pickup_lib":"Athens-Clarke County Library","prev_check_time":"2006-08-02T17:16:39-0400","pubdate":"c1999","publisher":"Random House","request_time":"2006-07-27","request_timestamp":"2006-07-27","requestor":"1000001","selection_depth":"0","status":"Ready for pickup","tcn":"ocm40444117 ","target":"77772","title":"The  marching season :  a novel","transit_dest_recv_time":"","transit_dest_lib":"","transit_source":"","transit_source_send_time":"","hold_type":"T","usr":"1000846"},
+    {"author":"Seuss","available_time":"2006-08-13","available_timestamp":"2006-08-13T20:55:02-0400","capture_time":"2006-08-13","capture_timestamp":"2006-08-13T20:55:02-0400","current_copy":"20070805","edition":"","email_notify":"No","expire_time":"","fulfillment_time":"","id":"1697","holdable_formats":"","isbn":"039480001X :","notify_time":"","notify_count":"0","patron_name":"4545 Tripper, Jack","phone_notify":"444-333-2222","pickup_lib_shortname":"ARL-ATH","pickup_lib":"Athens-Clarke County Library","prev_check_time":"2006-08-13T20:45:09-0400","pubdate":"1992, c1957","publisher":"Seedlings Braille Books for Children","request_time":"2006-08-13","request_timestamp":"2006-08-13","requestor":"1000000","selection_depth":"0","status":"Ready for pickup","tcn":"ocm47673093 ","target":"1534993","title":"The  cat in the hat","transit_dest_recv_time":"","transit_dest_lib":"","transit_source":"","transit_source_send_time":"","hold_type":"T","usr":"1002261"},
+    {"author":"Potter, Sally.","available_time":"2006-08-09","available_timestamp":"2006-08-09T18:06:10-0400","capture_time":"2006-08-09","capture_timestamp":"2006-08-09T18:06:10-0400","current_copy":"31001000843129","edition":"","email_notify":"No","expire_time":"","fulfillment_time":"","id":"1004","holdable_formats":"","isbn":"0783262663","notify_time":"2006-08-10T15:24:46-0400","notify_count":"12","patron_name":"2222233333 Erickson, Bill","phone_notify":"999-999-9999","pickup_lib_shortname":"ARL-ATH","pickup_lib":"Athens-Clarke County Library","prev_check_time":"2006-08-09T12:15:27-0400","pubdate":"c2001","publisher":"Universal Studios","request_time":"2006-08-08","request_timestamp":"2006-08-08","requestor":"3","selection_depth":"0","status":"Ready for pickup","tcn":"ocm48683123 ","target":"1572303","title":"The  man who cried","transit_dest_recv_time":"","transit_dest_lib":"","transit_source":"","transit_source_send_time":"","hold_type":"T","usr":"3"}],
+    'bills' : [{"balance_owed":"-5.00","xact_finish":"2006-05-08","xact_start":"2006-05-08","id":"9","last_billing_ts":"2006-05-08 18:53","last_billing_note":"test","last_billing_type":"Miscellaneous charges","last_payment_ts":"2006-05-08 18:53","last_payment_note":"","last_payment_type":"cash_payment","total_owed":"0.00","total_paid":"5.00","xact_type":"grocery","usr":"Id = 1000502"},
+    {"balance_owed":"-5.00","xact_finish":"2006-05-08","xact_start":"2006-05-08","id":"11","last_billing_ts":"2006-05-08 19:11","last_billing_note":"test","last_billing_type":"Miscellaneous","last_payment_ts":"2006-05-08 19:12","last_payment_note":"","last_payment_type":"cash_payment","total_owed":"0.00","total_paid":"5.00","xact_type":"grocery","usr":"Id = 1000502"},
+    {"balance_owed":"-50.00","xact_finish":"2006-05-08","xact_start":"2006-05-08","id":"18","last_billing_ts":"2006-05-08 20:20","last_billing_note":"","last_billing_type":"Miscellaneous","last_payment_ts":"2006-05-08 21:27","last_payment_note":"","last_payment_type":"cash_payment","total_owed":"0.00","total_paid":"50.00","xact_type":"grocery","usr":"Id = 1000502"},
+    {"balance_owed":"1.00","xact_finish":"2006-06-14","xact_start":"2006-06-14","id":"451","last_billing_ts":"2006-06-14 16:49","last_billing_note":"SYSTEM GENERATED","last_billing_type":"Lost Materials","last_payment_ts":"2006-06-14 16:49","last_payment_note":"","last_payment_type":"cash_payment","total_owed":"6.00","total_paid":"5.00","xact_type":"circulation","usr":"Id = 1000502"},
+    {"balance_owed":"-1.00","xact_finish":"2006-06-17","xact_start":"2006-06-17","id":"3689","last_billing_ts":"2006-06-17 04:01","last_billing_note":"","last_billing_type":"Miscellaneous","last_payment_ts":"2006-06-17 18:51","last_payment_note":"","last_payment_type":"cash_payment","total_owed":"10.00","total_paid":"11.00","xact_type":"grocery","usr":"Id = 1000502"},
+    {"balance_owed":".66","xact_finish":"","xact_start":"2006-06-27","id":"5589","last_billing_ts":"2006-08-22 00:00","last_billing_note":"Overdue Fine","last_billing_type":"Overdue materials","last_payment_ts":"2006-09-04 17:31","last_payment_note":"","last_payment_type":"cash_payment","total_owed":"5.60","total_paid":"4.94","xact_type":"circulation","usr":"Id = 1000502"},
+    {"balance_owed":".70","xact_finish":"","xact_start":"2006-06-27","id":"5593","last_billing_ts":"2006-08-22 00:00","last_billing_note":"Overdue Fine","last_billing_type":"Overdue materials","last_payment_ts":"2006-08-16 11:01","last_payment_note":"","last_payment_type":"cash_payment","total_owed":"5.50","total_paid":"4.80","xact_type":"circulation","usr":"Id = 1000502"},
+    {"balance_owed":"5.00","xact_finish":"","xact_start":"2006-08-16","id":"14834","last_billing_ts":"2006-08-16 12:25","last_billing_note":"","last_billing_type":"Damaged material","last_payment_ts":"","last_payment_note":"","last_payment_type":"","total_owed":"5.00","total_paid":"0.00","xact_type":"grocery","usr":"Id = 1000502"},
+    {"balance_owed":"10.00","xact_finish":"","xact_start":"2006-08-16","id":"14858","last_billing_ts":"2006-08-16 12:34","last_billing_note":"","last_billing_type":"Damaged material","last_payment_ts":"","last_payment_note":"","last_payment_type":"","total_owed":"10.00","total_paid":"0.00","xact_type":"grocery","usr":"Id = 1000502"}],
+    'payment' : [{"bill_id":5559,"payment":"-0.04","last_billing_type":"Overdue materials","last_billing_note":"Overdue Fine","title":"Hali Bote Azikaban de tao fan","barcode":"a16"},{"bill_id":5589,"payment":"0.04","last_billing_type":"Overdue materials","last_billing_note":"Overdue Fine","title":"Hali Bote Azikaban de tao fan","barcode":"a47"}],
+    'patrons' : [],
+    'transits' : [{"transit_item_author":"Arvetis, Chris.","transit_item_barcode":"3947801748348","transit_item_callnumber":"JE ARV","transit_item_title":"Why do birds sing?","transit_target_copy":"2385751","transit_dest_lib":"PIED-WIN","transit_id":"25","transit_source":"ARL-ATH","transit_source_send_time":"2006-05-24T16:37:09-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
+    {"transit_item_author":"Pine, Tillie S.","transit_item_barcode":"3635300990762","transit_item_callnumber":"F","transit_item_title":"Water all around ","transit_target_copy":"1","transit_dest_lib":"URRLS-SC","transit_id":"26","transit_source":"ARL-ATH","transit_source_send_time":"2006-05-27T22:49:40-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
+    {"transit_item_author":"","transit_item_barcode":"31057000861941","transit_item_callnumber":"CD J 781.5246 CASPE","transit_item_title":"Casper's spookiest songs and sounds  10 spooky songs plus creepy sound effects","transit_target_copy":"7923932","transit_dest_lib":"WGRL-LS","transit_id":"98","transit_source":"ARL-ATH","transit_source_send_time":"2006-06-29T16:34:38-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
+    {"transit_item_author":"Davidson, MaryJanice.","transit_item_barcode":"31027005649112","transit_item_callnumber":"AC DAV","transit_item_title":"Undead and unreturnable ","transit_target_copy":"7924995","transit_dest_lib":"HCLS-LG","transit_id":"100","transit_source":"ARL-ATH","transit_source_send_time":"2006-07-07T16:02:32-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
+    {"transit_item_author":"Evanovich, Janet.","transit_item_barcode":"31001001097295","transit_item_callnumber":"813/.54","transit_item_title":"Two for the dough","transit_target_copy":"8000335","transit_dest_lib":"ARL-BOG","transit_id":"102","transit_source":"ARL-ATH","transit_source_send_time":"2006-07-11T12:12:11-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
+    {"transit_item_author":"Edwards, Anne","transit_item_barcode":"39021423853564","transit_item_callnumber":"780.92 STREISAND","transit_item_title":"Streisand a biography","transit_target_copy":"949781","transit_dest_lib":"ECGR-BKM","transit_id":"110","transit_source":"ARL-ATH","transit_source_send_time":"2006-07-14T10:00:01-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
+    {"transit_item_author":"Riese, Randall.","transit_item_barcode":"31025900460205","transit_item_callnumber":"921 STREISAND 1993","transit_item_title":"Her name is Barbra an intimate portrait of the real Barbra Streisand","transit_target_copy":"2210566","transit_dest_lib":"HALL-BPL","transit_id":"112","transit_source":"ARL-ATH","transit_source_send_time":"2006-07-14T10:01:39-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
+    {"transit_item_author":"Rowling, J. K.","transit_item_barcode":"a45","transit_item_callnumber":"JROWLING2","transit_item_title":"Hali Bote Azikaban de tao fan","transit_target_copy":"8000297","transit_dest_lib":"WGRL-LS","transit_id":"118","transit_source":"ARL-ATH","transit_source_send_time":"2006-07-19T13:52:38-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
+    {"transit_item_author":"Some Author","transit_item_barcode":"321","transit_item_callnumber":"UNCATALOGED","transit_item_title":"Big Book","transit_target_copy":"8000387","transit_dest_lib":"ROCK-NG","transit_id":"119","transit_source":"ARL-ATH","transit_source_send_time":"2006-07-19T13:58:21-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
+    {"transit_item_author":"Thomas, Joyce Carol.","transit_item_barcode":"31036000522216","transit_item_callnumber":"E THOMAS","transit_item_title":"The  gospel Cinderella","transit_target_copy":"7422951","transit_dest_lib":"NCLS-COVTN","transit_id":"200","transit_source":"ARL-ATH","transit_source_send_time":"2006-07-25T15:20:00-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
+    {"transit_item_author":"Robinson, Barbara","transit_item_barcode":"31036000545159","transit_item_callnumber":"J ROBINSON","transit_item_title":"The  best Halloween ever","transit_target_copy":"7487432","transit_dest_lib":"NCLS-COVTN","transit_id":"206","transit_source":"ARL-ATH","transit_source_send_time":"2006-07-25T15:25:44-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
+    {"transit_item_author":"Robinson, Barbara","transit_item_barcode":"31036000545142","transit_item_callnumber":"J ROBINSON","transit_item_title":"The  best Halloween ever","transit_target_copy":"7487431","transit_dest_lib":"NCLS-COVTN","transit_id":"207","transit_source":"ARL-ATH","transit_source_send_time":"2006-07-25T15:25:49-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
+    {"transit_item_author":"Grafton, Sue.","transit_item_barcode":"31036000527900","transit_item_callnumber":"F GRAFTON","transit_item_title":"\"H\" is for homicide","transit_target_copy":"7273824","transit_dest_lib":"NCLS-COVTN","transit_id":"208","transit_source":"ARL-ATH","transit_source_send_time":"2006-07-25T15:25:58-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
+    {"transit_item_author":"Beaumont, Karen.","transit_item_barcode":"31036000521853","transit_item_callnumber":"E BEAUMONT","transit_item_title":"I like myself!","transit_target_copy":"7387328","transit_dest_lib":"NCLS-COVTN","transit_id":"211","transit_source":"ARL-ATH","transit_source_send_time":"2006-07-25T15:26:08-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
+    {"transit_item_author":"Sandler, Martin W.","transit_item_barcode":"31036000522612","transit_item_callnumber":"J 388.42 SANDLER","transit_item_title":"Straphanging in the USA trolleys and subways in American life","transit_target_copy":"7360328","transit_dest_lib":"NCLS-COVTN","transit_id":"212","transit_source":"ARL-ATH","transit_source_send_time":"2006-07-25T15:35:17-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},
+    {"transit_item_author":"Bohjalian, Christopher A.","transit_item_barcode":"31036000538303","transit_item_callnumber":"F BOHJALIAN","transit_item_title":"Before you know kindness :  a novel","transit_target_copy":"7544549","transit_dest_lib":"NCLS-COVTN","transit_id":"218","transit_source":"ARL-ATH","transit_source_send_time":"2006-07-26T10:23:20-0400","capture_time":"   ","capture_timestamp":"   ","expire_time":"   ","patron_name":"undefined undefined, undefined","request_time":"   ","request_timestamp":"   ","hold_type":"   "},],
+    'offline_checkout' : [],
+    'offline_checkin' : [],
+    'offline_renew' : [],
+    'offline_inhouse_use' : []
+   }
 
-			obj.controller_init();
-			obj.controller.render(); obj.controller.view.template_name_menu.focus();
+   obj.controller_init();
+   obj.controller.render(); obj.controller.view.template_name_menu.focus();
 
-			obj.post_init();
+   obj.post_init();
 
-		} catch(E) {
-			alert('init: ' + E);
-			this.error.sdump('D_ERROR','print_list.init: ' + E + '\n');
-		}
-	},
+  } catch(E) {
+   alert('init: ' + E);
+   this.error.sdump('D_ERROR','print_list.init: ' + E + '\n');
+  }
+ },
 
-	'post_init' : function() {
-		var obj = this;
-		setTimeout(
-			function() {
-				var tmp = obj.data.print_list_templates[ obj.controller.view.template_name_menu.value ];
-				obj.controller.view.template_type_menu.value = tmp.type;
-				obj.controller.view.header.value = tmp.header;
-				obj.controller.view.line_item.value = tmp.line_item;
-				obj.controller.view.footer.value = tmp.footer;
-				obj.preview();
-			}, 0
-		);
-	},
+ 'post_init' : function() {
+  var obj = this;
+  setTimeout(
+   function() {
+    var tmp = obj.data.print_list_templates[ obj.controller.view.template_name_menu.value ];
+    obj.controller.view.template_type_menu.value = tmp.type;
+    obj.controller.view.header.value = tmp.header;
+    obj.controller.view.line_item.value = tmp.line_item;
+    obj.controller.view.footer.value = tmp.footer;
+    obj.preview();
+   }, 0
+  );
+ },
 
-	'controller_init' : function() {
-		try {
-			var obj = this;
-			JSAN.use('util.controller'); obj.controller = new util.controller();
-			obj.controller.init(
-				{
-					control_map : {
-						'sample' : [ ['command'], function() { } ],
-						'header' : [ ['change'], function() { obj.preview(); } ],
-						'line_item' : [ ['change'], function() { obj.preview(); } ],
-						'footer' : [ ['change'], function() { obj.preview(); } ],
-						'preview' : [
-							['command'],
-							function() {
-								obj.preview();
-							}
-						],
-						'save' : [
-							['command'],
-							function() {
-								obj.save_template( obj.controller.view.template_name_menu.value );
-							}
-						],
-						'export' : [
-							['command'],
-							function() {
-								obj.export_templates();
-							}
-						],
-						'import' : [
-							['command'],
-							function() {
-								obj.import_templates();
-							}
-						],
-						'default' : [
-							['command'],
-							function() {
-								obj.data.print_list_defaults();
-								obj.post_init();
-							}
-						],
-						'macros' : [
-							['command'],
-							function() {
-								try {
-									JSAN.use('util.functional');
-									var template_type = obj.controller.view.template_type_menu.value;
-									var macros = [];
-									switch(template_type) {
-										case 'items':
-											JSAN.use('circ.util');
-											macros = util.functional.map_list(
-												circ.util.columns( {} ),
-												function(o) {
-													return '%' + o.id + '%';
-												}
-											);
-										break;
-										case 'holds':
-											JSAN.use('circ.util');
-											macros = util.functional.map_list(
-												circ.util.hold_columns( {} ),
-												function(o) {
-													return '%' + o.id + '%';
-												}
-											);
-										break;
-										case 'transits':
-											JSAN.use('circ.util');
-											macros = util.functional.map_list(
-												circ.util.transit_columns( {} ),
-												function(o) {
-													return '%' + o.id + '%';
-												}
-											);
-										break;
-										case 'offline_checkout':
-											JSAN.use('circ.util');
-											macros = util.functional.map_list(
-												circ.util.offline_checkout_columns( {} ),
-												function(o) {
-													return '%' + o.id + '%';
-												}
-											);
-										break;
-										case 'offline_checkin':
-											JSAN.use('circ.util');
-											macros = util.functional.map_list(
-												circ.util.offline_checkin_columns( {} ),
-												function(o) {
-													return '%' + o.id + '%';
-												}
-											);
-										break;
-										case 'offline_renew':
-											JSAN.use('circ.util');
-											macros = util.functional.map_list(
-												circ.util.offline_renew_columns( {} ),
-												function(o) {
-													return '%' + o.id + '%';
-												}
-											);
-										break;
+ 'controller_init' : function() {
+  try {
+   var obj = this;
+   JSAN.use('util.controller'); obj.controller = new util.controller();
+   obj.controller.init(
+    {
+     control_map : {
+      'sample' : [ ['command'], function() { } ],
+      'header' : [ ['change'], function() { obj.preview(); } ],
+      'line_item' : [ ['change'], function() { obj.preview(); } ],
+      'footer' : [ ['change'], function() { obj.preview(); } ],
+      'preview' : [
+       ['command'],
+       function() {
+        obj.preview();
+       }
+      ],
+      'save' : [
+       ['command'],
+       function() {
+        obj.save_template( obj.controller.view.template_name_menu.value );
+       }
+      ],
+      'export' : [
+       ['command'],
+       function() {
+        obj.export_templates();
+       }
+      ],
+      'import' : [
+       ['command'],
+       function() {
+        obj.import_templates();
+       }
+      ],
+      'default' : [
+       ['command'],
+       function() {
+        obj.data.print_list_defaults();
+        obj.post_init();
+       }
+      ],
+      'macros' : [
+       ['command'],
+       function() {
+        try {
+         JSAN.use('util.functional');
+         var template_type = obj.controller.view.template_type_menu.value;
+         var macros = [];
+         switch(template_type) {
+          case 'items':
+           JSAN.use('circ.util');
+           macros = util.functional.map_list(
+            circ.util.columns( {} ),
+            function(o) {
+             return '%' + o.id + '%';
+            }
+           );
+          break;
+          case 'holds':
+           JSAN.use('circ.util');
+           macros = util.functional.map_list(
+            circ.util.hold_columns( {} ),
+            function(o) {
+             return '%' + o.id + '%';
+            }
+           );
+          break;
+          case 'transits':
+           JSAN.use('circ.util');
+           macros = util.functional.map_list(
+            circ.util.transit_columns( {} ),
+            function(o) {
+             return '%' + o.id + '%';
+            }
+           );
+          break;
+          case 'offline_checkout':
+           JSAN.use('circ.util');
+           macros = util.functional.map_list(
+            circ.util.offline_checkout_columns( {} ),
+            function(o) {
+             return '%' + o.id + '%';
+            }
+           );
+          break;
+          case 'offline_checkin':
+           JSAN.use('circ.util');
+           macros = util.functional.map_list(
+            circ.util.offline_checkin_columns( {} ),
+            function(o) {
+             return '%' + o.id + '%';
+            }
+           );
+          break;
+          case 'offline_renew':
+           JSAN.use('circ.util');
+           macros = util.functional.map_list(
+            circ.util.offline_renew_columns( {} ),
+            function(o) {
+             return '%' + o.id + '%';
+            }
+           );
+          break;
                                         case 'offline_inhouse_use':
-											JSAN.use('circ.util');
-											macros = util.functional.map_list(
-												circ.util.offline_inhouse_use_columns( {} ),
-												function(o) {
-													return '%' + o.id + '%';
-												}
-											);
-										break;
-										case 'bills':
-											JSAN.use('patron.util');
-											macros = util.functional.map_list(
-												patron.util.mbts_columns( {} ),
-												function(o) {
-													return '%' + o.id + '%';
-												}
-											);
-										break;
-										case 'patrons':
-											JSAN.use('patron.util');
-											macros = util.functional.map_list(
-												patron.util.columns( {} ),
-												function(o) {
-													return '%' + o.id + '%';
-												}
-											);
-										break;
-										case 'payment' : 
-											macros = [ '%original_balance%', '%payment_received%', '%payment_applied%', '%payment_type%', '%voided_balance%', '%change_given%', '%new_balance%', '%note%', '%bill_id%', '%payment%', '%title%' ];
-										break;
-									}
-									var macro_string = macros.join(', ');
-									JSAN.use('util.window');
-									var win = new util.window();
-									win.open('data:text/html,'
-										+ window.escape(
-											'<html style="width: 600; height: 400;">'
-											+ '<head><title>' 
-											+ document.getElementById('circStrings').getString('staff.circ.print_list_template.window.title')
-											+ '</title></head>'
-											+ '<body onload="document.getElementById(\'btn\').focus()">'
-											+ '<h1>' 
-											+ document.getElementById('circStrings').getString('staff.circ.print_list_template.window.heading')
-											+ '</h1>'
-											+ '<p>%SHORTNAME%, %TODAY%, %STAFF_FIRSTNAME%, %STAFF_LASTNAME%, '
-											+ '%PATRON_FIRSTNAME%, %PATRON_ALIAS%, %PATRON_ALIAS_OR_FIRSTNAME%, %LIBRARY%</p>'
-											+ '<h1>'
-											+ document.getElementById('circStrings').getFormattedString('staff.circ.print_list_template.window.template_type', [template_type])
-											+ '</h1>'
-											+ '<p>' 
-											+ macro_string 
-											+ '</p>'
-											+ '<button id="btn" onclick="window.close()">'
-											+ document.getElementById('circStrings').getString('staff.circ.print_list_template.window.close')
-											+ '</button>'
-											+ '</body></html>'
-										), 'title', 'chrome,resizable');
-								} catch(E) {
-									alert(E);
-								}
-							}
-						],
-						'template_name_menu_placeholder' : [
-							['render'],
-							function(e) {
-								return function() {
-									JSAN.use('util.widgets'); JSAN.use('util.functional');
-									util.widgets.remove_children(e);
-									var ml = util.widgets.make_menulist(
-										util.functional.map_object_to_list(
-											obj.data.print_list_templates,
-											function(o,i) { return [i,i]; }
-										)
-									);
-									ml.setAttribute('id','template_name_menu');
-									//ml.setAttribute('editable','true');
-									ml.setAttribute('flex','1');
-									e.appendChild(ml);
-									obj.controller.view.template_name_menu = ml;
-									ml.addEventListener(
-										'command',
-										function(ev) {
-											var tmp = obj.data.print_list_templates[ ev.target.value ];
-											obj.controller.view.template_type_menu.value = tmp.type;
-											obj.controller.view.header.value = tmp.header;
-											obj.controller.view.line_item.value = tmp.line_item;
-											obj.controller.view.footer.value = tmp.footer;
-											obj.preview();
-										},
-										false
-									);
-								}
-							}
-						],
-						'template_type_menu_placeholder' : [
-							['render'],
-							function(e) {
-								return function() {
-									JSAN.use('util.widgets'); JSAN.use('util.functional');
-									util.widgets.remove_children(e);
-									var ml = util.widgets.make_menulist(
-										util.functional.map_list(
-											obj.data.print_list_types,
-											function(o) { return [o,o]; }
-										)
-									);
-									ml.setAttribute('id','template_types_menu');
-									ml.setAttribute('disabled','true');
-									e.appendChild(ml);
-									obj.controller.view.template_type_menu = ml;
-								}
-							}
-						]
+           JSAN.use('circ.util');
+           macros = util.functional.map_list(
+            circ.util.offline_inhouse_use_columns( {} ),
+            function(o) {
+             return '%' + o.id + '%';
+            }
+           );
+          break;
+          case 'bills':
+           JSAN.use('patron.util');
+           macros = util.functional.map_list(
+            patron.util.mbts_columns( {} ),
+            function(o) {
+             return '%' + o.id + '%';
+            }
+           );
+          break;
+          case 'patrons':
+           JSAN.use('patron.util');
+           macros = util.functional.map_list(
+            patron.util.columns( {} ),
+            function(o) {
+             return '%' + o.id + '%';
+            }
+           );
+          break;
+          case 'payment' : 
+           macros = [ '%original_balance%', '%payment_received%', '%payment_applied%', '%payment_type%', '%voided_balance%', '%change_given%', '%new_balance%', '%note%', '%bill_id%', '%payment%', '%title%' ];
+          break;
+         }
+         var macro_string = macros.join(', ');
+         JSAN.use('util.window');
+         var win = new util.window();
+         win.open('data:text/html,'
+          + window.escape(
+           '<html style="width: 600; height: 400;">'
+           + '<head><title>' 
+           + document.getElementById('circStrings').getString('staff.circ.print_list_template.window.title')
+           + '</title></head>'
+           + '<body onload="document.getElementById(\'btn\').focus()">'
+           + '<h1>' 
+           + document.getElementById('circStrings').getString('staff.circ.print_list_template.window.heading')
+           + '</h1>'
+           + '<p>%SHORTNAME%, %TODAY%, %STAFF_FIRSTNAME%, %STAFF_LASTNAME%, '
+           + '%PATRON_FIRSTNAME%, %PATRON_ALIAS%, %PATRON_ALIAS_OR_FIRSTNAME%, %LIBRARY%</p>'
+           + '<h1>'
+           + document.getElementById('circStrings').getFormattedString('staff.circ.print_list_template.window.template_type', [template_type])
+           + '</h1>'
+           + '<p>' 
+           + macro_string 
+           + '</p>'
+           + '<button id="btn" onclick="window.close()">'
+           + document.getElementById('circStrings').getString('staff.circ.print_list_template.window.close')
+           + '</button>'
+           + '</body></html>'
+          ), 'title', 'chrome,resizable');
+        } catch(E) {
+         alert(E);
+        }
+       }
+      ],
+      'template_name_menu_placeholder' : [
+       ['render'],
+       function(e) {
+        return function() {
+         JSAN.use('util.widgets'); JSAN.use('util.functional');
+         util.widgets.remove_children(e);
+         var ml = util.widgets.make_menulist(
+          util.functional.map_object_to_list(
+           obj.data.print_list_templates,
+           function(o,i) { return [i,i]; }
+          )
+         );
+         ml.setAttribute('id','template_name_menu');
+         //ml.setAttribute('editable','true');
+         ml.setAttribute('flex','1');
+         e.appendChild(ml);
+         obj.controller.view.template_name_menu = ml;
+         ml.addEventListener(
+          'command',
+          function(ev) {
+           var tmp = obj.data.print_list_templates[ ev.target.value ];
+           obj.controller.view.template_type_menu.value = tmp.type;
+           obj.controller.view.header.value = tmp.header;
+           obj.controller.view.line_item.value = tmp.line_item;
+           obj.controller.view.footer.value = tmp.footer;
+           obj.preview();
+          },
+          false
+         );
+        }
+       }
+      ],
+      'template_type_menu_placeholder' : [
+       ['render'],
+       function(e) {
+        return function() {
+         JSAN.use('util.widgets'); JSAN.use('util.functional');
+         util.widgets.remove_children(e);
+         var ml = util.widgets.make_menulist(
+          util.functional.map_list(
+           obj.data.print_list_types,
+           function(o) { return [o,o]; }
+          )
+         );
+         ml.setAttribute('id','template_types_menu');
+         ml.setAttribute('disabled','true');
+         e.appendChild(ml);
+         obj.controller.view.template_type_menu = ml;
+        }
+       }
+      ]
 
-					}
-				}
-			);
-		} catch(E) {
-			alert('controller_init: ' + E );
-		}
-	},
+     }
+    }
+   );
+  } catch(E) {
+   alert('controller_init: ' + E );
+  }
+ },
 
-	'preview' : function () { 
-		try {
-			var list = this.test_list[ this.controller.view.template_type_menu.value ];
-			if (typeof list == 'undefined') list = [];
-			var data = this.test_data[ this.controller.view.template_type_menu.value ];
-			if (typeof data == 'undefined') data = {};
+ 'preview' : function () { 
+  try {
+   var list = this.test_list[ this.controller.view.template_type_menu.value ];
+   if (typeof list == 'undefined') list = [];
+   var data = this.test_data[ this.controller.view.template_type_menu.value ];
+   if (typeof data == 'undefined') data = {};
 
-			var params = { 
-				'patron' : this.test_patron, 
-				'lib' : this.data.hash.aou[ this.data.list.au[0].ws_ou() ],
-				'staff' : this.data.list.au[0],
-				'header' : this.controller.view.header.value,
-				'line_item' : this.controller.view.line_item.value,
-				'footer' : this.controller.view.footer.value,
-				'type' : this.controller.view.template_type_menu.value,
-				'list' : list,
-				'data' : data,
-				'sample_frame' : this.controller.view.sample
-			};
-			JSAN.use('util.print'); var print = new util.print();
-			print.tree_list( params );
-		} catch(E) {
-			this.error.sdump('D_ERROR', document.getElementById('circStrings').getString('staff.circ.print_list_template.preview') + ' ' + E);
-			alert(document.getElementById('circStrings').getString('staff.circ.print_list_template.preview') + ' ' + E);
-		}
-	},
+   var params = { 
+    'patron' : this.test_patron, 
+    'lib' : this.data.hash.aou[ this.data.list.au[0].ws_ou() ],
+    'staff' : this.data.list.au[0],
+    'header' : this.controller.view.header.value,
+    'line_item' : this.controller.view.line_item.value,
+    'footer' : this.controller.view.footer.value,
+    'type' : this.controller.view.template_type_menu.value,
+    'list' : list,
+    'data' : data,
+    'sample_frame' : this.controller.view.sample
+   };
+   JSAN.use('util.print'); var print = new util.print();
+   print.tree_list( params );
+  } catch(E) {
+   this.error.sdump('D_ERROR', document.getElementById('circStrings').getString('staff.circ.print_list_template.preview') + ' ' + E);
+   alert(document.getElementById('circStrings').getString('staff.circ.print_list_template.preview') + ' ' + E);
+  }
+ },
 
-	'save_template' : function(name) {
-		var obj = this;
-		obj.data.print_list_templates[name].header = obj.controller.view.header.value;
-		obj.data.print_list_templates[name].line_item = obj.controller.view.line_item.value;
-		obj.data.print_list_templates[name].footer = obj.controller.view.footer.value;
-		obj.data.print_list_templates[name].type = obj.controller.view.template_type_menu.value;
-		obj.data.stash( 'print_list_templates' );
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		JSAN.use('util.file'); var file = new util.file('print_list_templates');
-		file.set_object(obj.data.print_list_templates); file.close();
-		alert(document.getElementById('circStrings').getString('staff.circ.print_list_template.save') + '\n' + js2JSON(obj.data.print_list_templates[name]));
-	},
+ 'save_template' : function(name) {
+  var obj = this;
+  obj.data.print_list_templates[name].header = obj.controller.view.header.value;
+  obj.data.print_list_templates[name].line_item = obj.controller.view.line_item.value;
+  obj.data.print_list_templates[name].footer = obj.controller.view.footer.value;
+  obj.data.print_list_templates[name].type = obj.controller.view.template_type_menu.value;
+  obj.data.stash( 'print_list_templates' );
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  JSAN.use('util.file'); var file = new util.file('print_list_templates');
+  file.set_object(obj.data.print_list_templates); file.close();
+  alert(document.getElementById('circStrings').getString('staff.circ.print_list_template.save') + '\n' + js2JSON(obj.data.print_list_templates[name]));
+ },
 
-	'export_templates' : function() {
-		try {
-			var obj = this;
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			JSAN.use('util.file'); var f = new util.file('');
+ 'export_templates' : function() {
+  try {
+   var obj = this;
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   JSAN.use('util.file'); var f = new util.file('');
             f.export_file( { 'title' : document.getElementById('circStrings').getString('staff.circ.print_list_template.save_as'), 'data' : obj.data.print_list_templates } );
 
-		} catch(E) {
-			this.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.print_list_template.export.error'),E);
-		}
-	},
+  } catch(E) {
+   this.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.print_list_template.export.error'),E);
+  }
+ },
 
-	'import_templates' : function() {
-		try {
-			var obj = this;
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			JSAN.use('util.file'); var f = new util.file('');
+ 'import_templates' : function() {
+  try {
+   var obj = this;
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   JSAN.use('util.file'); var f = new util.file('');
             var temp = f.import_file( { 'title' : document.getElementById('circStrings').getString('staff.circ.print_list_template.import') } );
             if (!temp) { return; }
             var s = '';
@@ -412,11 +412,11 @@ circ.print_list_template_editor.prototype = {
             } else {
                 alert(document.getElementById('circStrings').getString('staff.circ.print_list_template.reload'));
             }
-	
-		} catch(E) {
-			this.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.print_list_template.import.error'),E);
-		}
-	}
+ 
+  } catch(E) {
+   this.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.print_list_template.import.error'),E);
+  }
+ }
 
 }
 
diff --git a/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.xul b/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.xul
index 5e7a4550f2..f8827db3d1 100644
--- a/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.xul
+++ b/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,110 +19,110 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="print_list_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+ </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') {
-					throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
-				}
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for print_list.xul');
-
-				JSAN.use('circ.print_list_template_editor');
-				g.editor = new circ.print_list_template_editor();
-
-				g.editor.init( 
-					{ 
-					} 
-				);
-
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					try { window.xulG.set_tab_name(document.getElementById('circStrings').getString('staff.circ.print_list_template.tab_name')); } catch(E) { alert(E); }
-				}
-
-			} catch(E) {
-				var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['circ/print_list_template_editor.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-
-	<commandset id="print_list_cmds">
-		<command id="cmd_broken" />
-	</commandset>
-
-	<groupbox id="main" flex="1">
-		<caption label="&staff.circ.print_list.main.label;" />
-		<hbox id="top_ui">
-			<groupbox flex="1">
-				<caption label="&staff.circ.print_list.top_ui.label;" />
-				<hbox>
-					<label value="&staff.circ.print_list.top_ui.name.label;" accesskey="&staff.circ.print_list.top_ui.name.accesskey;" control="template_name_menu" />
-					<hbox id="template_name_menu_placeholder" flex="1"/>
-				</hbox>
-				<hbox>
-					<label value="&staff.circ.print_list.top_ui.type.label;" />
-					<hbox id="template_type_menu_placeholder" />
-				</hbox>
-			</groupbox>
-			<groupbox orient="horizontal">
-				<caption label="&staff.circ.print_list.top_ui.actions.label;" />
-				<vbox>
-					<button id="preview" label="&staff.circ.print_list.top_ui.preview.label;" accesskey="&staff.circ.print_list.top_ui.preview.accesskey;" />
-					<button id="macros" label="&staff.circ.print_list.top_ui.macros.label;" accesskey="&staff.circ.print_list.top_ui.macros.accesskey;" />
-				</vbox>
-				<vbox>
-					<button id="default" label="&staff.circ.print_list.top_ui.default.label;" accesskey="&staff.circ.print_list.top_ui.default.accesskey;" />
-					<button id="save" label="&staff.circ.print_list.top_ui.save.label;" accesskey="&staff.circ.print_list.top_ui.save.accesskey;" />
-				</vbox>
-				<vbox>
-					<description>&staff.circ.print_list.top_ui.description;</description>
-					<button id="export" label="&staff.circ.print_list.top_ui.description.export.label;" accesskey="&staff.circ.print_list.top_ui.description.export.accesskey;" />
-					<button id="import" label="&staff.circ.print_list.top_ui.description.import.label;" accesskey="&staff.circ.print_list.top_ui.description.import.accesskey;" />
-				</vbox>
-			</groupbox>
-		</hbox>
-		<hbox flex="1">
-			<groupbox flex="1">
-				<caption label="&staff.circ.print_list.top_ui.preview.label;" />
-				<iframe id="sample" flex="1"/>
-			</groupbox>
-			<vbox flex="1">
-				<groupbox flex="1">
-					<caption label="&staff.circ.print_list.header.label;"/>
-					<textbox id="header" multiline="true" flex="1" context="clipboard"/>
-				</groupbox>
-				<groupbox flex="1">
-					<caption label="&staff.circ.print_list.line_item.label;"/>
-					<textbox id="line_item" multiline="true" flex="1" context="clipboard"/>
-				</groupbox>
-				<groupbox flex="1">
-					<caption label="&staff.circ.print_list.footer.label;"/>
-					<textbox id="footer" multiline="true" flex="1" context="clipboard"/>
-				</groupbox>
-			</vbox>
-		</hbox>
-	</groupbox>
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') {
+     throw( document.getElementById("commonStrings").getString('common.jsan.missing') );
+    }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for print_list.xul');
+
+    JSAN.use('circ.print_list_template_editor');
+    g.editor = new circ.print_list_template_editor();
+
+    g.editor.init( 
+     { 
+     } 
+    );
+
+    if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+     try { window.xulG.set_tab_name(document.getElementById('circStrings').getString('staff.circ.print_list_template.tab_name')); } catch(E) { alert(E); }
+    }
+
+   } catch(E) {
+    var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['circ/print_list_template_editor.xul', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+
+ ]]>
+ </script>
+
+ <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+
+ <commandset id="print_list_cmds">
+  <command id="cmd_broken" />
+ </commandset>
+
+ <groupbox id="main" flex="1">
+  <caption label="&staff.circ.print_list.main.label;" />
+  <hbox id="top_ui">
+   <groupbox flex="1">
+    <caption label="&staff.circ.print_list.top_ui.label;" />
+    <hbox>
+     <label value="&staff.circ.print_list.top_ui.name.label;" accesskey="&staff.circ.print_list.top_ui.name.accesskey;" control="template_name_menu" />
+     <hbox id="template_name_menu_placeholder" flex="1"/>
+    </hbox>
+    <hbox>
+     <label value="&staff.circ.print_list.top_ui.type.label;" />
+     <hbox id="template_type_menu_placeholder" />
+    </hbox>
+   </groupbox>
+   <groupbox orient="horizontal">
+    <caption label="&staff.circ.print_list.top_ui.actions.label;" />
+    <vbox>
+     <button id="preview" label="&staff.circ.print_list.top_ui.preview.label;" accesskey="&staff.circ.print_list.top_ui.preview.accesskey;" />
+     <button id="macros" label="&staff.circ.print_list.top_ui.macros.label;" accesskey="&staff.circ.print_list.top_ui.macros.accesskey;" />
+    </vbox>
+    <vbox>
+     <button id="default" label="&staff.circ.print_list.top_ui.default.label;" accesskey="&staff.circ.print_list.top_ui.default.accesskey;" />
+     <button id="save" label="&staff.circ.print_list.top_ui.save.label;" accesskey="&staff.circ.print_list.top_ui.save.accesskey;" />
+    </vbox>
+    <vbox>
+     <description>&staff.circ.print_list.top_ui.description;</description>
+     <button id="export" label="&staff.circ.print_list.top_ui.description.export.label;" accesskey="&staff.circ.print_list.top_ui.description.export.accesskey;" />
+     <button id="import" label="&staff.circ.print_list.top_ui.description.import.label;" accesskey="&staff.circ.print_list.top_ui.description.import.accesskey;" />
+    </vbox>
+   </groupbox>
+  </hbox>
+  <hbox flex="1">
+   <groupbox flex="1">
+    <caption label="&staff.circ.print_list.top_ui.preview.label;" />
+    <iframe id="sample" flex="1"/>
+   </groupbox>
+   <vbox flex="1">
+    <groupbox flex="1">
+     <caption label="&staff.circ.print_list.header.label;"/>
+     <textbox id="header" multiline="true" flex="1" context="clipboard"/>
+    </groupbox>
+    <groupbox flex="1">
+     <caption label="&staff.circ.print_list.line_item.label;"/>
+     <textbox id="line_item" multiline="true" flex="1" context="clipboard"/>
+    </groupbox>
+    <groupbox flex="1">
+     <caption label="&staff.circ.print_list.footer.label;"/>
+     <textbox id="footer" multiline="true" flex="1" context="clipboard"/>
+    </groupbox>
+   </vbox>
+  </hbox>
+ </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index 967ec6f916..d9837ccbc1 100644
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -4,1918 +4,1918 @@ dump('entering circ/util.js\n');
 if (typeof circ == 'undefined') { var circ = {}; }
 circ.util = {};
 
-circ.util.EXPORT_OK	= [
-	'offline_checkout_columns', 'offline_checkin_columns', 'offline_renew_columns', 'offline_inhouse_use_columns',
-	'columns', 'hold_columns', 'checkin_via_barcode', 'std_map_row_to_columns',
-	'show_last_few_circs', 'abort_transits', 'transit_columns', 'renew_via_barcode'
+circ.util.EXPORT_OK = [
+ 'offline_checkout_columns', 'offline_checkin_columns', 'offline_renew_columns', 'offline_inhouse_use_columns',
+ 'columns', 'hold_columns', 'checkin_via_barcode', 'std_map_row_to_columns',
+ 'show_last_few_circs', 'abort_transits', 'transit_columns', 'renew_via_barcode'
 ];
-circ.util.EXPORT_TAGS	= { ':all' : circ.util.EXPORT_OK };
+circ.util.EXPORT_TAGS = { ':all' : circ.util.EXPORT_OK };
 
 circ.util.abort_transits = function(selection_list) {
-	var obj = {};
-	JSAN.use('util.error'); obj.error = new util.error();
-	JSAN.use('util.network'); obj.network = new util.network();
-	JSAN.use('OpenILS.data'); obj.data = new OpenILS.data(); obj.data.init({'via':'stash'});
-	JSAN.use('util.functional');
-	var copies = util.functional.map_list( selection_list, function(o){return o.copy_id;}).join(', ');
-	var msg = document.getElementById('circStrings').getFormattedString('staff.circ.utils.abort_transits.confirm', [copies]);
-	var r = obj.error.yns_alert(
-		msg,
-		document.getElementById('circStrings').getString('staff.circ.utils.abort_transits.title'),
-		document.getElementById('circStrings').getString('staff.circ.utils.yes'),
-		document.getElementById('circStrings').getString('staff.circ.utils.no'),
-		null,
-		document.getElementById('circStrings').getString('staff.circ.confirm')
-	);
-	if (r == 0) {
-		try {
-			for (var i = 0; i < selection_list.length; i++) {
-				var copy_id = selection_list[i].copy_id;
-				var robj = obj.network.simple_request('FM_ATC_VOID',[ ses(), { 'copyid' : copy_id } ]);
-				if (typeof robj.ilsevent != 'undefined') {
-					switch(Number(robj.ilsevent)) {
-						case 1225 /* TRANSIT_ABORT_NOT_ALLOWED */ :
-							alert(document.getElementById('circString').getFormattedString('staff.circ.utils.abort_transits.not_allowed', [copy_id]) + '\n' + robj.desc);
-						break;
-						case 1504 /* ACTION_TRANSIT_COPY_NOT_FOUND */ :
-							alert(document.getElementById('circString').getString('staff.circ.utils.abort_transits.not_found'));
-						break;
-						case 5000 /* PERM_FAILURE */ :
-						break;
-						default:
-							throw(robj);
-						break;
-					}
-				}
-			}
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert(document.getElementById('circString').getString('staff.circ.utils.abort_transits.unexpected_error'),E);
-		}
-	}
+ var obj = {};
+ JSAN.use('util.error'); obj.error = new util.error();
+ JSAN.use('util.network'); obj.network = new util.network();
+ JSAN.use('OpenILS.data'); obj.data = new OpenILS.data(); obj.data.init({'via':'stash'});
+ JSAN.use('util.functional');
+ var copies = util.functional.map_list( selection_list, function(o){return o.copy_id;}).join(', ');
+ var msg = document.getElementById('circStrings').getFormattedString('staff.circ.utils.abort_transits.confirm', [copies]);
+ var r = obj.error.yns_alert(
+  msg,
+  document.getElementById('circStrings').getString('staff.circ.utils.abort_transits.title'),
+  document.getElementById('circStrings').getString('staff.circ.utils.yes'),
+  document.getElementById('circStrings').getString('staff.circ.utils.no'),
+  null,
+  document.getElementById('circStrings').getString('staff.circ.confirm')
+ );
+ if (r == 0) {
+  try {
+   for (var i = 0; i < selection_list.length; i++) {
+    var copy_id = selection_list[i].copy_id;
+    var robj = obj.network.simple_request('FM_ATC_VOID',[ ses(), { 'copyid' : copy_id } ]);
+    if (typeof robj.ilsevent != 'undefined') {
+     switch(Number(robj.ilsevent)) {
+      case 1225 /* TRANSIT_ABORT_NOT_ALLOWED */ :
+       alert(document.getElementById('circString').getFormattedString('staff.circ.utils.abort_transits.not_allowed', [copy_id]) + '\n' + robj.desc);
+      break;
+      case 1504 /* ACTION_TRANSIT_COPY_NOT_FOUND */ :
+       alert(document.getElementById('circString').getString('staff.circ.utils.abort_transits.not_found'));
+      break;
+      case 5000 /* PERM_FAILURE */ :
+      break;
+      default:
+       throw(robj);
+      break;
+     }
+    }
+   }
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert(document.getElementById('circString').getString('staff.circ.utils.abort_transits.unexpected_error'),E);
+  }
+ }
 };
 
 circ.util.show_copy_details = function(copy_id) {
-	var obj = {};
-	JSAN.use('util.error'); obj.error = new util.error();
-	JSAN.use('util.window'); obj.win = new util.window();
-	JSAN.use('util.network'); obj.network = new util.network();
-	JSAN.use('OpenILS.data'); obj.data = new OpenILS.data(); obj.data.init({'via':'stash'});
-
-	if (typeof copy_id == 'object' && copy_id != null) copy_id = copy_id.id();
-
-	try {
-		var url = xulG.url_prefix( urls.XUL_COPY_DETAILS ); // + '?copy_id=' + copy_id;
-		var my_xulG = obj.win.open( url, 'show_copy_details', 'chrome,resizable,modal', { 'copy_id' : copy_id } );
-
-		if (typeof my_xulG.retrieve_these_patrons == 'undefined') return;
-		var patrons = my_xulG.retrieve_these_patrons;
-		for (var j = 0; j < patrons.length; j++) {
-			if (typeof window.xulG == 'object' && typeof window.xulG.new_tab == 'function') {
-				try {
-					window.xulG.new_patron_tab( {}, { 'id' : patrons[j] } );
-				} catch(E) {
-					obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.utils.retrieve_patron.failure'), E);
-				}
-			}
-		}
-
-	} catch(E) {
-		obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.utils.retrieve_copy.failure'),E);
-	}
+ var obj = {};
+ JSAN.use('util.error'); obj.error = new util.error();
+ JSAN.use('util.window'); obj.win = new util.window();
+ JSAN.use('util.network'); obj.network = new util.network();
+ JSAN.use('OpenILS.data'); obj.data = new OpenILS.data(); obj.data.init({'via':'stash'});
+
+ if (typeof copy_id == 'object' && copy_id != null) copy_id = copy_id.id();
+
+ try {
+  var url = xulG.url_prefix( urls.XUL_COPY_DETAILS ); // + '?copy_id=' + copy_id;
+  var my_xulG = obj.win.open( url, 'show_copy_details', 'chrome,resizable,modal', { 'copy_id' : copy_id } );
+
+  if (typeof my_xulG.retrieve_these_patrons == 'undefined') return;
+  var patrons = my_xulG.retrieve_these_patrons;
+  for (var j = 0; j < patrons.length; j++) {
+   if (typeof window.xulG == 'object' && typeof window.xulG.new_tab == 'function') {
+    try {
+     window.xulG.new_patron_tab( {}, { 'id' : patrons[j] } );
+    } catch(E) {
+     obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.utils.retrieve_patron.failure'), E);
+    }
+   }
+  }
+
+ } catch(E) {
+  obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.utils.retrieve_copy.failure'),E);
+ }
 };
 
 
 circ.util.show_last_few_circs = function(selection_list) {
-	var obj = {};
-	JSAN.use('util.error'); obj.error = new util.error();
-	JSAN.use('util.window'); obj.win = new util.window();
-	JSAN.use('util.network'); obj.network = new util.network();
-	JSAN.use('OpenILS.data'); obj.data = new OpenILS.data(); obj.data.init({'via':'stash'});
-
-	for (var i = 0; i < selection_list.length; i++) {
-		try {
-			if (typeof selection_list[i].copy_id == 'undefined' || selection_list[i].copy_id == null) continue;
-			var url = xulG.url_prefix( urls.XUL_CIRC_SUMMARY ); // + '?copy_id=' + selection_list[i].copy_id + '&count=' + count;
-			var my_xulG = obj.win.open( url, 'show_last_few_circs', 'chrome,resizable,modal', { 'copy_id' : selection_list[i].copy_id } );
-
-			if (typeof my_xulG.retrieve_these_patrons == 'undefined') continue;
-			var patrons = my_xulG.retrieve_these_patrons;
-			for (var j = 0; j < patrons.length; j++) {
-				if (typeof window.xulG == 'object' && typeof window.xulG.new_tab == 'function') {
-					try {
-						window.xulG.new_patron_tab( {}, { 'id' : patrons[j] } );
-					} catch(E) {
-						obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.utils.retrieve_patron.failure') ,E);
-					}
-				}
-			}
-
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.utils.retrieve_circs.failure') ,E);
-		}
-	}
+ var obj = {};
+ JSAN.use('util.error'); obj.error = new util.error();
+ JSAN.use('util.window'); obj.win = new util.window();
+ JSAN.use('util.network'); obj.network = new util.network();
+ JSAN.use('OpenILS.data'); obj.data = new OpenILS.data(); obj.data.init({'via':'stash'});
+
+ for (var i = 0; i < selection_list.length; i++) {
+  try {
+   if (typeof selection_list[i].copy_id == 'undefined' || selection_list[i].copy_id == null) continue;
+   var url = xulG.url_prefix( urls.XUL_CIRC_SUMMARY ); // + '?copy_id=' + selection_list[i].copy_id + '&count=' + count;
+   var my_xulG = obj.win.open( url, 'show_last_few_circs', 'chrome,resizable,modal', { 'copy_id' : selection_list[i].copy_id } );
+
+   if (typeof my_xulG.retrieve_these_patrons == 'undefined') continue;
+   var patrons = my_xulG.retrieve_these_patrons;
+   for (var j = 0; j < patrons.length; j++) {
+    if (typeof window.xulG == 'object' && typeof window.xulG.new_tab == 'function') {
+     try {
+      window.xulG.new_patron_tab( {}, { 'id' : patrons[j] } );
+     } catch(E) {
+      obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.utils.retrieve_patron.failure') ,E);
+     }
+    }
+   }
+
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.utils.retrieve_circs.failure') ,E);
+  }
+ }
 };
 
 circ.util.offline_checkout_columns = function(modify,params) {
-	
-	var c = [
-		{
-			'id' : 'timestamp',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.timestamp'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.timestamp; }
-		},
-		{
-			'id' : 'checkout_time',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.checkout_time'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.checkout_time; }
-		},
-		{
-			'id' : 'type',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.type'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.type; }
-		},
-		{
-			'id' : 'noncat',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.noncat'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.noncat; }
-		},
-		{
-			'id' : 'noncat_type',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.noncat_type'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.noncat_type; }
-		},
-		{
-			'id' : 'noncat_count',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.count'),
-			'sort_type' : 'number',
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : false,
-			'render' : function(my) { return my.noncat_count; }
-		},
-		{
-			'id' : 'patron_barcode',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.patron_barcode'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.patron_barcode; }
-		},
-		{
-			'id' : 'barcode',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.item_barcode'),
-			'flex' : 2,
-			'primary' : true,
-			'hidden' : false,
-			'render' : function(my) { return my.barcode; }
-		},
-		{
-			'id' : 'due_date',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.due_date'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : false,
-			'render' : function(my) { return my.due_date; }
-		},
-		{
-			'id' : 'due_time',
-			'label' : document.getElementById('commonStrings').getString('staff.circ_label_due_time'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : false,
-			'render' : function(my) { return my.due_time; }
-		}
-
-	];
-	if (modify) for (var i = 0; i < c.length; i++) {
-		if (modify[ c[i].id ]) {
-			for (var j in modify[ c[i].id ]) {
-				c[i][j] = modify[ c[i].id ][j];
-			}
-		}
-	}
-	if (params) {
-		if (params.just_these) {
-			JSAN.use('util.functional');
-			var new_c = [];
-			for (var i = 0; i < params.just_these.length; i++) {
-				var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
-				new_c.push( function(y){ return y; }( x ) );
-			}
-			c = new_c;
-		}
-		if (params.except_these) {
-			JSAN.use('util.functional');
-			var new_c = [];
-			for (var i = 0; i < c.length; i++) {
-				var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);});
-				if (!x) new_c.push(c[i]);
-			}
-			c = new_c;
-		}
-
-	}
-	return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } );
+ 
+ var c = [
+  {
+   'id' : 'timestamp',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.timestamp'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.timestamp; }
+  },
+  {
+   'id' : 'checkout_time',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.checkout_time'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.checkout_time; }
+  },
+  {
+   'id' : 'type',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.type'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.type; }
+  },
+  {
+   'id' : 'noncat',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.noncat'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.noncat; }
+  },
+  {
+   'id' : 'noncat_type',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.noncat_type'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.noncat_type; }
+  },
+  {
+   'id' : 'noncat_count',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.count'),
+   'sort_type' : 'number',
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : false,
+   'render' : function(my) { return my.noncat_count; }
+  },
+  {
+   'id' : 'patron_barcode',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.patron_barcode'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.patron_barcode; }
+  },
+  {
+   'id' : 'barcode',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.item_barcode'),
+   'flex' : 2,
+   'primary' : true,
+   'hidden' : false,
+   'render' : function(my) { return my.barcode; }
+  },
+  {
+   'id' : 'due_date',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.due_date'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : false,
+   'render' : function(my) { return my.due_date; }
+  },
+  {
+   'id' : 'due_time',
+   'label' : document.getElementById('commonStrings').getString('staff.circ_label_due_time'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : false,
+   'render' : function(my) { return my.due_time; }
+  }
+
+ ];
+ if (modify) for (var i = 0; i < c.length; i++) {
+  if (modify[ c[i].id ]) {
+   for (var j in modify[ c[i].id ]) {
+    c[i][j] = modify[ c[i].id ][j];
+   }
+  }
+ }
+ if (params) {
+  if (params.just_these) {
+   JSAN.use('util.functional');
+   var new_c = [];
+   for (var i = 0; i < params.just_these.length; i++) {
+    var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
+    new_c.push( function(y){ return y; }( x ) );
+   }
+   c = new_c;
+  }
+  if (params.except_these) {
+   JSAN.use('util.functional');
+   var new_c = [];
+   for (var i = 0; i < c.length; i++) {
+    var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);});
+    if (!x) new_c.push(c[i]);
+   }
+   c = new_c;
+  }
+
+ }
+ return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } );
 };
 
 circ.util.offline_checkin_columns = function(modify,params) {
-	
-	var c = [
-		{
-			'id' : 'timestamp',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.timestamp'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.timestamp; }
-		},
-		{
-			'id' : 'backdate',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.backdate'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.backdate; }
-		},
-		{
-			'id' : 'type',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.type'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.type; }
-		},
-		{
-			'id' : 'barcode',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.item_barcode'),
-			'flex' : 2,
-			'primary' : true,
-			'hidden' : false,
-			'render' : function(my) { return my.barcode; }
-		}
-	];
-	if (modify) for (var i = 0; i < c.length; i++) {
-		if (modify[ c[i].id ]) {
-			for (var j in modify[ c[i].id ]) {
-				c[i][j] = modify[ c[i].id ][j];
-			}
-		}
-	}
-	if (params) {
-		if (params.just_these) {
-			JSAN.use('util.functional');
-			var new_c = [];
-			for (var i = 0; i < params.just_these.length; i++) {
-				var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
-				new_c.push( function(y){ return y; }( x ) );
-			}
-			c = new_c;
-		}
-		if (params.except_these) {
-			JSAN.use('util.functional');
-			var new_c = [];
-			for (var i = 0; i < c.length; i++) {
-				var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);});
-				if (!x) new_c.push(c[i]);
-			}
-			c = new_c;
-		}
-
-	}
-	return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } );
+ 
+ var c = [
+  {
+   'id' : 'timestamp',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.timestamp'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.timestamp; }
+  },
+  {
+   'id' : 'backdate',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.backdate'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.backdate; }
+  },
+  {
+   'id' : 'type',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.type'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.type; }
+  },
+  {
+   'id' : 'barcode',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.item_barcode'),
+   'flex' : 2,
+   'primary' : true,
+   'hidden' : false,
+   'render' : function(my) { return my.barcode; }
+  }
+ ];
+ if (modify) for (var i = 0; i < c.length; i++) {
+  if (modify[ c[i].id ]) {
+   for (var j in modify[ c[i].id ]) {
+    c[i][j] = modify[ c[i].id ][j];
+   }
+  }
+ }
+ if (params) {
+  if (params.just_these) {
+   JSAN.use('util.functional');
+   var new_c = [];
+   for (var i = 0; i < params.just_these.length; i++) {
+    var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
+    new_c.push( function(y){ return y; }( x ) );
+   }
+   c = new_c;
+  }
+  if (params.except_these) {
+   JSAN.use('util.functional');
+   var new_c = [];
+   for (var i = 0; i < c.length; i++) {
+    var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);});
+    if (!x) new_c.push(c[i]);
+   }
+   c = new_c;
+  }
+
+ }
+ return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } );
 };
 
 circ.util.offline_renew_columns = function(modify,params) {
-	
-	var c = [
-		{
-			'id' : 'timestamp',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.timestamp'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.timestamp; }
-		},
-		{
-			'id' : 'checkout_time',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.checkout_time'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.checkout_time; }
-		},
-		{
-			'id' : 'type',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.type'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.type; }
-		},
-		{
-			'id' : 'patron_barcode',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.patron_barcode'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.patron_barcode; }
-		},
-		{
-			'id' : 'barcode',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.item_barcode'),
-			'flex' : 2,
-			'primary' : true,
-			'hidden' : false,
-			'render' : function(my) { return my.barcode; }
-		},
-		{
-			'id' : 'due_date',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.due_date'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : false,
-			'render' : function(my) { return my.due_date; }
-		},
-		{
-			'id' : 'due_time',
-			'label' : document.getElementById('commonStrings').getString('staff.circ_label_due_time'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : false,
-			'render' : function(my) { return my.due_time; }
-		}
-	];
-	if (modify) for (var i = 0; i < c.length; i++) {
-		if (modify[ c[i].id ]) {
-			for (var j in modify[ c[i].id ]) {
-				c[i][j] = modify[ c[i].id ][j];
-			}
-		}
-	}
-	if (params) {
-		if (params.just_these) {
-			JSAN.use('util.functional');
-			var new_c = [];
-			for (var i = 0; i < params.just_these.length; i++) {
-				var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
-				new_c.push( function(y){ return y; }( x ) );
-			}
-			c = new_c;
-		}
-		if (params.except_these) {
-			JSAN.use('util.functional');
-			var new_c = [];
-			for (var i = 0; i < c.length; i++) {
-				var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);});
-				if (!x) new_c.push(c[i]);
-			}
-			c = new_c;
-		}
-
-	}
-	return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } );
+ 
+ var c = [
+  {
+   'id' : 'timestamp',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.timestamp'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.timestamp; }
+  },
+  {
+   'id' : 'checkout_time',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.checkout_time'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.checkout_time; }
+  },
+  {
+   'id' : 'type',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.type'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.type; }
+  },
+  {
+   'id' : 'patron_barcode',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.patron_barcode'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.patron_barcode; }
+  },
+  {
+   'id' : 'barcode',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.item_barcode'),
+   'flex' : 2,
+   'primary' : true,
+   'hidden' : false,
+   'render' : function(my) { return my.barcode; }
+  },
+  {
+   'id' : 'due_date',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.due_date'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : false,
+   'render' : function(my) { return my.due_date; }
+  },
+  {
+   'id' : 'due_time',
+   'label' : document.getElementById('commonStrings').getString('staff.circ_label_due_time'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : false,
+   'render' : function(my) { return my.due_time; }
+  }
+ ];
+ if (modify) for (var i = 0; i < c.length; i++) {
+  if (modify[ c[i].id ]) {
+   for (var j in modify[ c[i].id ]) {
+    c[i][j] = modify[ c[i].id ][j];
+   }
+  }
+ }
+ if (params) {
+  if (params.just_these) {
+   JSAN.use('util.functional');
+   var new_c = [];
+   for (var i = 0; i < params.just_these.length; i++) {
+    var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
+    new_c.push( function(y){ return y; }( x ) );
+   }
+   c = new_c;
+  }
+  if (params.except_these) {
+   JSAN.use('util.functional');
+   var new_c = [];
+   for (var i = 0; i < c.length; i++) {
+    var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);});
+    if (!x) new_c.push(c[i]);
+   }
+   c = new_c;
+  }
+
+ }
+ return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } );
 };
 
 circ.util.offline_inhouse_use_columns = function(modify,params) {
-	
-	var c = [
-		{
-			'id' : 'timestamp',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.timestamp'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.timestamp; }
-		},
-		{
-			'id' : 'use_time',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.use_time'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.use_time; }
-		},
-		{
-			'id' : 'type',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.type'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.type; }
-		},
-		{
-			'id' : 'count',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.count'),
-			'sort_type' : 'number',
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : false,
-			'render' : function(my) { return my.count; }
-		},
-		{
-			'id' : 'barcode',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.item_barcode'),
-			'flex' : 2,
-			'primary' : true,
-			'hidden' : false,
-			'render' : function(my) { return my.barcode; }
-		}
-	];
-	if (modify) for (var i = 0; i < c.length; i++) {
-		if (modify[ c[i].id ]) {
-			for (var j in modify[ c[i].id ]) {
-				c[i][j] = modify[ c[i].id ][j];
-			}
-		}
-	}
-	if (params) {
-		if (params.just_these) {
-			JSAN.use('util.functional');
-			var new_c = [];
-			for (var i = 0; i < params.just_these.length; i++) {
-				var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
-				new_c.push( function(y){ return y; }( x ) );
-			}
-			c = new_c;
-		}
-		if (params.except_these) {
-			JSAN.use('util.functional');
-			var new_c = [];
-			for (var i = 0; i < c.length; i++) {
-				var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);});
-				if (!x) new_c.push(c[i]);
-			}
-			c = new_c;
-		}
-
-	}
-	return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } );
+ 
+ var c = [
+  {
+   'id' : 'timestamp',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.timestamp'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.timestamp; }
+  },
+  {
+   'id' : 'use_time',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.use_time'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.use_time; }
+  },
+  {
+   'id' : 'type',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.type'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.type; }
+  },
+  {
+   'id' : 'count',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.count'),
+   'sort_type' : 'number',
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : false,
+   'render' : function(my) { return my.count; }
+  },
+  {
+   'id' : 'barcode',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.item_barcode'),
+   'flex' : 2,
+   'primary' : true,
+   'hidden' : false,
+   'render' : function(my) { return my.barcode; }
+  }
+ ];
+ if (modify) for (var i = 0; i < c.length; i++) {
+  if (modify[ c[i].id ]) {
+   for (var j in modify[ c[i].id ]) {
+    c[i][j] = modify[ c[i].id ][j];
+   }
+  }
+ }
+ if (params) {
+  if (params.just_these) {
+   JSAN.use('util.functional');
+   var new_c = [];
+   for (var i = 0; i < params.just_these.length; i++) {
+    var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
+    new_c.push( function(y){ return y; }( x ) );
+   }
+   c = new_c;
+  }
+  if (params.except_these) {
+   JSAN.use('util.functional');
+   var new_c = [];
+   for (var i = 0; i < c.length; i++) {
+    var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);});
+    if (!x) new_c.push(c[i]);
+   }
+   c = new_c;
+  }
+
+ }
+ return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } );
 };
 
 circ.util.columns = function(modify,params) {
-	
-	JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-	JSAN.use('util.network'); var network = new util.network();
-	JSAN.use('util.money');
-
-	var c = [
-		{
-			'id' : 'acp_id',
-			'label' : document.getElementById('commonStrings').getString('staff.acp_label_id'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.acp.id(); },
-			'persist' : 'hidden width ordinal'
-		},
-		{
-			'id' : 'circ_id',
-			'label' : document.getElementById('commonStrings').getString('staff.circ_label_id'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.circ ? my.circ.id() : ( my.acp.circulations() ? my.acp.circulations()[0].id() : ""); },
-			'persist' : 'hidden width ordinal'
-		},
-		{
-			'id' : 'mvr_doc_id',
-			'label' : document.getElementById('commonStrings').getString('staff.mvr_label_doc_id'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.mvr.doc_id(); },
-			'persist' : 'hidden width ordinal'
-		},
+ 
+ JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+ JSAN.use('util.network'); var network = new util.network();
+ JSAN.use('util.money');
+
+ var c = [
+  {
+   'id' : 'acp_id',
+   'label' : document.getElementById('commonStrings').getString('staff.acp_label_id'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.acp.id(); },
+   'persist' : 'hidden width ordinal'
+  },
+  {
+   'id' : 'circ_id',
+   'label' : document.getElementById('commonStrings').getString('staff.circ_label_id'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.circ ? my.circ.id() : ( my.acp.circulations() ? my.acp.circulations()[0].id() : ""); },
+   'persist' : 'hidden width ordinal'
+  },
+  {
+   'id' : 'mvr_doc_id',
+   'label' : document.getElementById('commonStrings').getString('staff.mvr_label_doc_id'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.mvr.doc_id(); },
+   'persist' : 'hidden width ordinal'
+  },
         {
-			'persist' : 'hidden width ordinal',
-			'id' : 'service',
-			'label' : 'Service',
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.service; }
+   'persist' : 'hidden width ordinal',
+   'id' : 'service',
+   'label' : 'Service',
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.service; }
         },
-		{
-			'id' : 'barcode',
-			'label' : document.getElementById('commonStrings').getString('staff.acp_label_barcode'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.acp.barcode(); },
-			'persist' : 'hidden width ordinal'
-		},
-		{
-			'id' : 'call_number',
-			'label' : document.getElementById('commonStrings').getString('staff.acp_label_call_number'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (my.acp && my.acp.call_number() == -1) {
-					return document.getElementById('circStrings').getString('staff.circ.utils.not_cataloged');
-				} else if (my.acp && my.acp.call_number() == -2) {
-					return document.getElementById('circStrings').getString('staff.circ.utils.retrieving');
-				} else {
-					if (!my.acn) {
-						var x = network.simple_request("FM_ACN_RETRIEVE.authoritative",[ my.acp.call_number() ]);
-						if (x.ilsevent) {
-							return document.getElementById('circStrings').getString('staff.circ.utils.not_cataloged');
-						} else {
-							my.acn = x; return x.label();
-						}
-					} else {
-						return my.acn.label();
-					}
-				}
-			},
-			'persist' : 'hidden width ordinal'
-		},
-		{
-			'id' : 'owning_lib',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.owning_lib'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (Number(my.acn.owning_lib())>=0) {
-					return data.hash.aou[ my.acn.owning_lib() ].shortname();
-				} else {
-					return my.acn.owning_lib().shortname();
-				}
-			},
-			'persist' : 'hidden width ordinal'
-		},
-		{
-			'id' : 'copy_number',
-			'label' : document.getElementById('commonStrings').getString('staff.acp_label_copy_number'),
-			'flex' : 1,
-			'sort_type' : 'number',
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.acp.copy_number(); },
-			'persist' : 'hidden width ordinal'
-		},
-		{
-			'id' : 'location',
-			'label' : document.getElementById('commonStrings').getString('staff.acp_label_location'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (Number(my.acp.location())>=0) {
-					return data.lookup("acpl", my.acp.location() ).name();
-				} else {
-					return my.acp.location().name();
-				}
-			},
-			'persist' : 'hidden width ordinal'
-		},
-		{
-			'id' : 'loan_duration',
-			'label' : document.getElementById('commonStrings').getString('staff.acp_label_loan_duration'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				switch(Number(my.acp.loan_duration())) {
-					case 1:
-						return document.getElementById('circStrings').getString('staff.circ.utils.loan_duration.short');
-						break;
-					case 2:
-						return document.getElementById('circStrings').getString('staff.circ.utils.loan_duration.normal');
-						break;
-					case 3:
-						return document.getElementById('circStrings').getString('staff.circ.utils.loan_duration.long');
-						break;
-				};
-			},
-			'persist' : 'hidden width ordinal'
-		},
-		{
-			'id' : 'circ_lib',
-			'label' : document.getElementById('commonStrings').getString('staff.acp_label_circ_lib'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (Number(my.acp.circ_lib())>=0) {
-					return data.hash.aou[ my.acp.circ_lib() ].shortname();
-				} else {
-					return my.acp.circ_lib().shortname();
-				}
-			},
-			'persist' : 'hidden width ordinal'
-		},
-		{
-			'id' : 'fine_level',
-			'label' : document.getElementById('commonStrings').getString('staff.acp_label_fine_level'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				switch(Number(my.acp.fine_level())) {
-					case 1:
-						return document.getElementById('circStrings').getString('staff.circ.utils.fine_level.low');
-						break;
-					case 2:
-						return document.getElementById('circStrings').getString('staff.circ.utils.fine_level.normal');
-						break;
-					case 3:
-						return document.getElementById('circStrings').getString('staff.circ.utils.fine_level.high');
-						break;
-				};
-			},
-			'persist' : 'hidden width ordinal'
-		},
-		{
-			'id' : 'circulate',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.circulate'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (get_bool( my.acp.circulate() )) {
-					return document.getElementById('circStrings').getString('staff.circ.utils.yes');
-				} else {
-					return document.getElementById('circStrings').getString('staff.circ.utils.no');
-				}
-			},
-			'persist' : 'hidden width ordinal'
-		},
-		{
-			'id' : 'deleted',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.deleted'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (get_bool( my.acp.deleted() )) {
-					return document.getElementById('circStrings').getString('staff.circ.utils.yes');
-				} else {
-					return document.getElementById('circStrings').getString('staff.circ.utils.no');
-				}
-			},
-			'persist' : 'hidden width ordinal'
-		},
-		{
-			'id' : 'holdable',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.holdable'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (get_bool( my.acp.holdable() )) {
-					return document.getElementById('circStrings').getString('staff.circ.utils.yes');
-				} else {
-					return document.getElementById('circStrings').getString('staff.circ.utils.no');
-				}
-			},
-			'persist' : 'hidden width ordinal'
-		},
-		{
-			'id' : 'opac_visible',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.opac_visible'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (get_bool( my.acp.opac_visible() )) {
-					return document.getElementById('circStrings').getString('staff.circ.utils.yes');
-				} else {
-					return document.getElementById('circStrings').getString('staff.circ.utils.no');
-				}
-			},
-			'persist' : 'hidden width ordinal'
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'ref',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.reference'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (get_bool( my.acp.ref() )) {
-					return document.getElementById('circStrings').getString('staff.circ.utils.yes');
-				} else {
-					return document.getElementById('circStrings').getString('staff.circ.utils.no');
-				}
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'deposit',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.deposit'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (get_bool( my.acp.deposit() )) {
-					return document.getElementById('circStrings').getString('staff.circ.utils.yes');
-				} else {
-					return document.getElementById('circStrings').getString('staff.circ.utils.no');
-				}
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'deposit_amount',
-			'label' : document.getElementById('commonStrings').getString('staff.acp_label_deposit_amount'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (my.acp.price() == null) {
-					return document.getElementById('circStrings').getString('staff.circ.utils.unset');
-				} else {
-					return util.money.sanitize(my.acp.deposit_amount());
-				}
-			},
-			'sort_type' : 'money'
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'price',
-			'label' : document.getElementById('commonStrings').getString('staff.acp_label_price'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (my.acp.price() == null) {
-					return document.getElementById('circStrings').getString('staff.circ.utils.unset');
-				} else {
-					return util.money.sanitize(my.acp.price());
-				}
-			},
-			'sort_type' : 'money'
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'circ_as_type',
-			'label' : document.getElementById('commonStrings').getString('staff.acp_label_circ_as_type'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.acp.circ_as_type(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'circ_modifier',
-			'label' : document.getElementById('commonStrings').getString('staff.acp_label_circ_modifier'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.acp.circ_modifier(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'checkout_lib',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.checkout_lib'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (my.circ) {
-					return data.hash.aou[ my.circ.circ_lib() ].shortname();
-				} else {
-					if (my.acp.circulations()) {
-						return data.hash.aou[ my.acp.circulations()[0].circ_lib() ].shortname();
-					} else {
-						return "";
-					}
-				}
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'xact_start_full',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.checkout_timestamp'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (my.circ) {
-					return my.circ.xact_start();
-				} else {
-					if (my.acp.circulations()) {
-						return my.acp.circulations()[0].xact_start();
-					}
-					else {
-						return  "";
-					}
-				}
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'checkin_time_full',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.checkin_timestamp'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (my.circ) {
-					return my.circ.checkin_time();
-				} else {
-					if (my.acp.circulations()) {
-						return my.acp.circulations()[0].checkin_time();
-					} else {
-						return "";
-					}
-				}
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'xact_start',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.xact_start'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (my.circ) {
-					return my.circ.xact_start().substr(0,10);
-				} else {
-					if (my.acp.circulations()) {
-						return my.acp.circulations()[0].xact_start().substr(0,10);
-					} else {
-						return "";
-					}
-				}
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'checkin_time',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.checkin_time'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (my.circ) {
-					return my.circ.checkin_time().substr(0,10);
-				} else {
-					if (my.acp.circulations()) {
-						return my.acp.circulations()[0].checkin_time().substr(0,10);
-					} else {
-						return "";
-					}
-				}
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'xact_finish',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.xact_finish'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.circ.xact_finish(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'due_date',
-			'label' : document.getElementById('commonStrings').getString('staff.circ_label_due_date'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (my.circ) {
-					return my.circ.due_date().substr(0,10);
-				} else {
-					if (my.acp.circulations()) {
-						return my.acp.circulations()[0].due_date().substr(0,10);
-					} else {
-						return "";
-					}
-				}
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'due_time',
-			'label' : document.getElementById('commonStrings').getString('staff.circ_label_due_time'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (my.circ) {
-					return my.circ.due_date().substr(11,8);
-				} else {
-					if (my.acp.circulations()) {
-						return my.acp.circulations()[0].due_date().substr(11,8);
-					} else {
-						return "";
-					}
-				}
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'create_date',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.create_date'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.acp.create_date().substr(0,10); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'edit_date',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.edit_date'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.acp.edit_date().substr(0,10); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'title',
-			'label' : document.getElementById('commonStrings').getString('staff.mvr_label_title'),
-			'flex' : 2,
-			'sort_type' : 'title',
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				try {  return my.mvr.title(); }
-				catch(E) { return my.acp.dummy_title(); }
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'author',
-			'label' : document.getElementById('commonStrings').getString('staff.mvr_label_author'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				try { return my.mvr.author(); }
-				catch(E) { return my.acp.dummy_author(); }
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'edition',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.edition'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.mvr.edition(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'isbn',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.isbn'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.mvr.isbn(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'pubdate',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.pubdate'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.mvr.pubdate(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'publisher',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.publisher'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.mvr.publisher(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'tcn',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.tcn'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.mvr.tcn(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'renewal_remaining',
-			'label' : document.getElementById('commonStrings').getString('staff.circ_label_renewal_remaining'),
-			'flex' : 0,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (my.circ) {
-					return my.circ.renewal_remaining();
-				} else {
-					if (my.acp.circulations()) {
-						return my.acp.circulations()[0].renewal_remaining();
-					} else {
-						return "";
-					}
-				}
-			},
-			'sort_type' : 'number'
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'stop_fines',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.stop_fines'),
-			'flex' : 0,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (my.circ) {
-					return my.circ.stop_fines();
-				} else {
-					if (my.acp.circulations()) {
-						return my.acp.circulations()[0].stop_fines();
-					} else {
-						return "";
-					}
-				}
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'stop_fines_time',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.stop_fines_time'),
-			'flex' : 0,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (my.circ) {
-					return my.circ.stop_fines_time();
-				} else {
-					if (my.acp.circulations()) {
-						return my.acp.circulations()[0].stop_fines_time();
-					} else {
-						return "";
-					}
-				}
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'status',
-			'label' : document.getElementById('commonStrings').getString('staff.acp_label_status'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (Number(my.acp.status())>=0) {
-					return data.hash.ccs[ my.acp.status() ].name();
-				} else {
-					return my.acp.status().name();
-				}
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'route_to',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.route_to'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.route_to.toString(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'message',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.message'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.message.toString(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'uses',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.uses'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.uses; },
-			'sort_type' : 'number'
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'alert_message',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.alert_message'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.acp.alert_message(); }
-		}
-	];
-	for (var i = 0; i < c.length; i++) {
-		if (modify[ c[i].id ]) {
-			for (var j in modify[ c[i].id ]) {
-				c[i][j] = modify[ c[i].id ][j];
-			}
-		}
-	}
-	if (params) {
-		if (params.just_these) {
-			JSAN.use('util.functional');
-			var new_c = [];
-			for (var i = 0; i < params.just_these.length; i++) {
-				var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
-				new_c.push( function(y){ return y; }( x ) );
-			}
-			c = new_c;
-		}
-		if (params.except_these) {
-			JSAN.use('util.functional');
-			var new_c = [];
-			for (var i = 0; i < c.length; i++) {
-				var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);});
-				if (!x) new_c.push(c[i]);
-			}
-			c = new_c;
-		}
-	}
-	return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } );
+  {
+   'id' : 'barcode',
+   'label' : document.getElementById('commonStrings').getString('staff.acp_label_barcode'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.acp.barcode(); },
+   'persist' : 'hidden width ordinal'
+  },
+  {
+   'id' : 'call_number',
+   'label' : document.getElementById('commonStrings').getString('staff.acp_label_call_number'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (my.acp && my.acp.call_number() == -1) {
+     return document.getElementById('circStrings').getString('staff.circ.utils.not_cataloged');
+    } else if (my.acp && my.acp.call_number() == -2) {
+     return document.getElementById('circStrings').getString('staff.circ.utils.retrieving');
+    } else {
+     if (!my.acn) {
+      var x = network.simple_request("FM_ACN_RETRIEVE.authoritative",[ my.acp.call_number() ]);
+      if (x.ilsevent) {
+       return document.getElementById('circStrings').getString('staff.circ.utils.not_cataloged');
+      } else {
+       my.acn = x; return x.label();
+      }
+     } else {
+      return my.acn.label();
+     }
+    }
+   },
+   'persist' : 'hidden width ordinal'
+  },
+  {
+   'id' : 'owning_lib',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.owning_lib'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (Number(my.acn.owning_lib())>=0) {
+     return data.hash.aou[ my.acn.owning_lib() ].shortname();
+    } else {
+     return my.acn.owning_lib().shortname();
+    }
+   },
+   'persist' : 'hidden width ordinal'
+  },
+  {
+   'id' : 'copy_number',
+   'label' : document.getElementById('commonStrings').getString('staff.acp_label_copy_number'),
+   'flex' : 1,
+   'sort_type' : 'number',
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.acp.copy_number(); },
+   'persist' : 'hidden width ordinal'
+  },
+  {
+   'id' : 'location',
+   'label' : document.getElementById('commonStrings').getString('staff.acp_label_location'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (Number(my.acp.location())>=0) {
+     return data.lookup("acpl", my.acp.location() ).name();
+    } else {
+     return my.acp.location().name();
+    }
+   },
+   'persist' : 'hidden width ordinal'
+  },
+  {
+   'id' : 'loan_duration',
+   'label' : document.getElementById('commonStrings').getString('staff.acp_label_loan_duration'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    switch(Number(my.acp.loan_duration())) {
+     case 1:
+      return document.getElementById('circStrings').getString('staff.circ.utils.loan_duration.short');
+      break;
+     case 2:
+      return document.getElementById('circStrings').getString('staff.circ.utils.loan_duration.normal');
+      break;
+     case 3:
+      return document.getElementById('circStrings').getString('staff.circ.utils.loan_duration.long');
+      break;
+    };
+   },
+   'persist' : 'hidden width ordinal'
+  },
+  {
+   'id' : 'circ_lib',
+   'label' : document.getElementById('commonStrings').getString('staff.acp_label_circ_lib'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (Number(my.acp.circ_lib())>=0) {
+     return data.hash.aou[ my.acp.circ_lib() ].shortname();
+    } else {
+     return my.acp.circ_lib().shortname();
+    }
+   },
+   'persist' : 'hidden width ordinal'
+  },
+  {
+   'id' : 'fine_level',
+   'label' : document.getElementById('commonStrings').getString('staff.acp_label_fine_level'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    switch(Number(my.acp.fine_level())) {
+     case 1:
+      return document.getElementById('circStrings').getString('staff.circ.utils.fine_level.low');
+      break;
+     case 2:
+      return document.getElementById('circStrings').getString('staff.circ.utils.fine_level.normal');
+      break;
+     case 3:
+      return document.getElementById('circStrings').getString('staff.circ.utils.fine_level.high');
+      break;
+    };
+   },
+   'persist' : 'hidden width ordinal'
+  },
+  {
+   'id' : 'circulate',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.circulate'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (get_bool( my.acp.circulate() )) {
+     return document.getElementById('circStrings').getString('staff.circ.utils.yes');
+    } else {
+     return document.getElementById('circStrings').getString('staff.circ.utils.no');
+    }
+   },
+   'persist' : 'hidden width ordinal'
+  },
+  {
+   'id' : 'deleted',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.deleted'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (get_bool( my.acp.deleted() )) {
+     return document.getElementById('circStrings').getString('staff.circ.utils.yes');
+    } else {
+     return document.getElementById('circStrings').getString('staff.circ.utils.no');
+    }
+   },
+   'persist' : 'hidden width ordinal'
+  },
+  {
+   'id' : 'holdable',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.holdable'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (get_bool( my.acp.holdable() )) {
+     return document.getElementById('circStrings').getString('staff.circ.utils.yes');
+    } else {
+     return document.getElementById('circStrings').getString('staff.circ.utils.no');
+    }
+   },
+   'persist' : 'hidden width ordinal'
+  },
+  {
+   'id' : 'opac_visible',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.opac_visible'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (get_bool( my.acp.opac_visible() )) {
+     return document.getElementById('circStrings').getString('staff.circ.utils.yes');
+    } else {
+     return document.getElementById('circStrings').getString('staff.circ.utils.no');
+    }
+   },
+   'persist' : 'hidden width ordinal'
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'ref',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.reference'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (get_bool( my.acp.ref() )) {
+     return document.getElementById('circStrings').getString('staff.circ.utils.yes');
+    } else {
+     return document.getElementById('circStrings').getString('staff.circ.utils.no');
+    }
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'deposit',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.deposit'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (get_bool( my.acp.deposit() )) {
+     return document.getElementById('circStrings').getString('staff.circ.utils.yes');
+    } else {
+     return document.getElementById('circStrings').getString('staff.circ.utils.no');
+    }
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'deposit_amount',
+   'label' : document.getElementById('commonStrings').getString('staff.acp_label_deposit_amount'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (my.acp.price() == null) {
+     return document.getElementById('circStrings').getString('staff.circ.utils.unset');
+    } else {
+     return util.money.sanitize(my.acp.deposit_amount());
+    }
+   },
+   'sort_type' : 'money'
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'price',
+   'label' : document.getElementById('commonStrings').getString('staff.acp_label_price'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (my.acp.price() == null) {
+     return document.getElementById('circStrings').getString('staff.circ.utils.unset');
+    } else {
+     return util.money.sanitize(my.acp.price());
+    }
+   },
+   'sort_type' : 'money'
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'circ_as_type',
+   'label' : document.getElementById('commonStrings').getString('staff.acp_label_circ_as_type'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.acp.circ_as_type(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'circ_modifier',
+   'label' : document.getElementById('commonStrings').getString('staff.acp_label_circ_modifier'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.acp.circ_modifier(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'checkout_lib',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.checkout_lib'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (my.circ) {
+     return data.hash.aou[ my.circ.circ_lib() ].shortname();
+    } else {
+     if (my.acp.circulations()) {
+      return data.hash.aou[ my.acp.circulations()[0].circ_lib() ].shortname();
+     } else {
+      return "";
+     }
+    }
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'xact_start_full',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.checkout_timestamp'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (my.circ) {
+     return my.circ.xact_start();
+    } else {
+     if (my.acp.circulations()) {
+      return my.acp.circulations()[0].xact_start();
+     }
+     else {
+      return  "";
+     }
+    }
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'checkin_time_full',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.checkin_timestamp'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (my.circ) {
+     return my.circ.checkin_time();
+    } else {
+     if (my.acp.circulations()) {
+      return my.acp.circulations()[0].checkin_time();
+     } else {
+      return "";
+     }
+    }
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'xact_start',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.xact_start'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (my.circ) {
+     return my.circ.xact_start().substr(0,10);
+    } else {
+     if (my.acp.circulations()) {
+      return my.acp.circulations()[0].xact_start().substr(0,10);
+     } else {
+      return "";
+     }
+    }
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'checkin_time',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.checkin_time'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (my.circ) {
+     return my.circ.checkin_time().substr(0,10);
+    } else {
+     if (my.acp.circulations()) {
+      return my.acp.circulations()[0].checkin_time().substr(0,10);
+     } else {
+      return "";
+     }
+    }
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'xact_finish',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.xact_finish'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.circ.xact_finish(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'due_date',
+   'label' : document.getElementById('commonStrings').getString('staff.circ_label_due_date'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (my.circ) {
+     return my.circ.due_date().substr(0,10);
+    } else {
+     if (my.acp.circulations()) {
+      return my.acp.circulations()[0].due_date().substr(0,10);
+     } else {
+      return "";
+     }
+    }
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'due_time',
+   'label' : document.getElementById('commonStrings').getString('staff.circ_label_due_time'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (my.circ) {
+     return my.circ.due_date().substr(11,8);
+    } else {
+     if (my.acp.circulations()) {
+      return my.acp.circulations()[0].due_date().substr(11,8);
+     } else {
+      return "";
+     }
+    }
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'create_date',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.create_date'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.acp.create_date().substr(0,10); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'edit_date',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.edit_date'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.acp.edit_date().substr(0,10); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'title',
+   'label' : document.getElementById('commonStrings').getString('staff.mvr_label_title'),
+   'flex' : 2,
+   'sort_type' : 'title',
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    try {  return my.mvr.title(); }
+    catch(E) { return my.acp.dummy_title(); }
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'author',
+   'label' : document.getElementById('commonStrings').getString('staff.mvr_label_author'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    try { return my.mvr.author(); }
+    catch(E) { return my.acp.dummy_author(); }
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'edition',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.edition'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.mvr.edition(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'isbn',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.isbn'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.mvr.isbn(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'pubdate',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.pubdate'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.mvr.pubdate(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'publisher',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.publisher'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.mvr.publisher(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'tcn',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.tcn'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.mvr.tcn(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'renewal_remaining',
+   'label' : document.getElementById('commonStrings').getString('staff.circ_label_renewal_remaining'),
+   'flex' : 0,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (my.circ) {
+     return my.circ.renewal_remaining();
+    } else {
+     if (my.acp.circulations()) {
+      return my.acp.circulations()[0].renewal_remaining();
+     } else {
+      return "";
+     }
+    }
+   },
+   'sort_type' : 'number'
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'stop_fines',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.stop_fines'),
+   'flex' : 0,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (my.circ) {
+     return my.circ.stop_fines();
+    } else {
+     if (my.acp.circulations()) {
+      return my.acp.circulations()[0].stop_fines();
+     } else {
+      return "";
+     }
+    }
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'stop_fines_time',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.stop_fines_time'),
+   'flex' : 0,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (my.circ) {
+     return my.circ.stop_fines_time();
+    } else {
+     if (my.acp.circulations()) {
+      return my.acp.circulations()[0].stop_fines_time();
+     } else {
+      return "";
+     }
+    }
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'status',
+   'label' : document.getElementById('commonStrings').getString('staff.acp_label_status'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (Number(my.acp.status())>=0) {
+     return data.hash.ccs[ my.acp.status() ].name();
+    } else {
+     return my.acp.status().name();
+    }
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'route_to',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.route_to'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.route_to.toString(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'message',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.message'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.message.toString(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'uses',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.uses'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.uses; },
+   'sort_type' : 'number'
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'alert_message',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.alert_message'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.acp.alert_message(); }
+  }
+ ];
+ for (var i = 0; i < c.length; i++) {
+  if (modify[ c[i].id ]) {
+   for (var j in modify[ c[i].id ]) {
+    c[i][j] = modify[ c[i].id ][j];
+   }
+  }
+ }
+ if (params) {
+  if (params.just_these) {
+   JSAN.use('util.functional');
+   var new_c = [];
+   for (var i = 0; i < params.just_these.length; i++) {
+    var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
+    new_c.push( function(y){ return y; }( x ) );
+   }
+   c = new_c;
+  }
+  if (params.except_these) {
+   JSAN.use('util.functional');
+   var new_c = [];
+   for (var i = 0; i < c.length; i++) {
+    var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);});
+    if (!x) new_c.push(c[i]);
+   }
+   c = new_c;
+  }
+ }
+ return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } );
 };
 
 circ.util.transit_columns = function(modify,params) {
-	
-	JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-
-	var c = [
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'transit_item_barcode',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.barcode'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.acp.barcode(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'transit_item_title',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.title'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				try { return my.mvr.title(); }
-				catch(E) { return my.acp.dummy_title(); }
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'transit_item_author',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.author'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				try { return my.mvr.author(); }
-				catch(E) { return my.acp.dummy_author(); }
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'transit_item_callnumber',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.callnumber'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.acn.label(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'transit_id',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.transit_id'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.atc.id(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'transit_source',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.transit_source'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : false,
-			'render' : function(my) {
-				if (typeof my.atc.source() == "object") {
-					return my.atc.source().shortname();
-				} else {
-					return data.hash.aou[ my.atc.source() ].shortname();
-				}
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'transit_source_send_time',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.transit_source_send_time'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : false,
-			'render' : function(my) { return my.atc.source_send_time(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'transit_dest_lib',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.transit_dest'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : false,
-			'render' : function(my) {
-				if (typeof my.atc.dest() == "object") {
-					return my.atc.dest().shortname();
-				} else {
-					return data.hash.aou[ my.atc.dest() ].shortname();
-				}
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'transit_dest_recv_time',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.transit_dest_recv_time'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : false,
-			'render' : function(my) { return my.atc.dest_recv_time(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'transit_target_copy',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.transit_target_copy'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.atc.target_copy(); }
-		},
-	];
-	for (var i = 0; i < c.length; i++) {
-		if (modify[ c[i].id ]) {
-			for (var j in modify[ c[i].id ]) {
-				c[i][j] = modify[ c[i].id ][j];
-			}
-		}
-	}
-	if (params) {
-		if (params.just_these) {
-			JSAN.use('util.functional');
-			var new_c = [];
-			for (var i = 0; i < params.just_these.length; i++) {
-				var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
-				new_c.push( function(y){ return y; }( x ) );
-			}
-			c = new_c;
-		}
-		if (params.except_these) {
-			JSAN.use('util.functional');
-			var new_c = [];
-			for (var i = 0; i < c.length; i++) {
-				var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);});
-				if (!x) new_c.push(c[i]);
-			}
-			c = new_c;
-		}
-
-	}
-	return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } );
+ 
+ JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+
+ var c = [
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'transit_item_barcode',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.barcode'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.acp.barcode(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'transit_item_title',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.title'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    try { return my.mvr.title(); }
+    catch(E) { return my.acp.dummy_title(); }
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'transit_item_author',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.author'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    try { return my.mvr.author(); }
+    catch(E) { return my.acp.dummy_author(); }
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'transit_item_callnumber',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.callnumber'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.acn.label(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'transit_id',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.transit_id'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.atc.id(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'transit_source',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.transit_source'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : false,
+   'render' : function(my) {
+    if (typeof my.atc.source() == "object") {
+     return my.atc.source().shortname();
+    } else {
+     return data.hash.aou[ my.atc.source() ].shortname();
+    }
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'transit_source_send_time',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.transit_source_send_time'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : false,
+   'render' : function(my) { return my.atc.source_send_time(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'transit_dest_lib',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.transit_dest'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : false,
+   'render' : function(my) {
+    if (typeof my.atc.dest() == "object") {
+     return my.atc.dest().shortname();
+    } else {
+     return data.hash.aou[ my.atc.dest() ].shortname();
+    }
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'transit_dest_recv_time',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.transit_dest_recv_time'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : false,
+   'render' : function(my) { return my.atc.dest_recv_time(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'transit_target_copy',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.transit_target_copy'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.atc.target_copy(); }
+  },
+ ];
+ for (var i = 0; i < c.length; i++) {
+  if (modify[ c[i].id ]) {
+   for (var j in modify[ c[i].id ]) {
+    c[i][j] = modify[ c[i].id ][j];
+   }
+  }
+ }
+ if (params) {
+  if (params.just_these) {
+   JSAN.use('util.functional');
+   var new_c = [];
+   for (var i = 0; i < params.just_these.length; i++) {
+    var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
+    new_c.push( function(y){ return y; }( x ) );
+   }
+   c = new_c;
+  }
+  if (params.except_these) {
+   JSAN.use('util.functional');
+   var new_c = [];
+   for (var i = 0; i < c.length; i++) {
+    var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);});
+    if (!x) new_c.push(c[i]);
+   }
+   c = new_c;
+  }
+
+ }
+ return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } );
 };
 
 circ.util.hold_columns = function(modify,params) {
-	
-	JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-
-	var c = [
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'request_lib',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.request_lib'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (Number(my.ahr.request_lib())>=0) {
-					return data.hash.aou[ my.ahr.request_lib() ].name();
-				} else {
-					return my.ahr.request_lib().name();
-				}
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'request_lib_shortname',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.request_lib_shortname'),
-			'flex' : 0,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (Number(my.ahr.request_lib())>=0) {
-					return data.hash.aou[ my.ahr.request_lib() ].shortname();
-				} else {
-					return my.ahr.request_lib().shortname();
-				}
-			}
-		},
-
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'request_timestamp',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.request_timestamp'),
-			'flex' : 0,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.ahr.request_time().toString(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'request_time',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.request_time'),
-			'flex' : 0,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.ahr.request_time().toString().substr(0,10); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'available_timestamp',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.available_timestamp'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (my.ahr.transit() && my.ahr.transit().dest_recv_time()) {
-					return my.ahr.transit().dest_recv_time().toString();
-				}
-				if (!my.ahr.transit() && my.ahr.capture_time()) {
-					return my.ahr.capture_time().toString();
-				}
-				return "";
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'available_time',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.available_time'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : false,
-			'render' : function(my) {
-				if (my.ahr.transit() && my.ahr.transit().dest_recv_time()) {
-					return my.ahr.transit().dest_recv_time().toString().substr(0,10);
-				}
-				if (!my.ahr.transit() && my.ahr.capture_time()) {
-					return my.ahr.capture_time().toString().substr(0,10);
-				}
-				return "";
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'capture_timestamp',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.capture_timestamp'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.ahr.capture_time() ? my.ahr.capture_time().toString() : ""; }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'capture_time',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.capture_time'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.ahr.capture_time() ? my.ahr.capture_time().toString().substr(0,10) : ""; }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'status',
-			'label' : document.getElementById('commonStrings').getString('staff.ahr_status_label'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : false,
-			'render' : function(my) {
-				switch (Number(my.status)) {
-					case 1:
-						return document.getElementById('circStrings').getString('staff.circ.utils.hold_status.1');
-						break;
-					case 2:
-						return document.getElementById('circStrings').getString('staff.circ.utils.hold_status.2');
-						break;
-					case 3:
-						return document.getElementById('circStrings').getString('staff.circ.utils.hold_status.3');
-						break;
-					case 4:
-						return document.getElementById('circStrings').getString('staff.circ.utils.hold_status.4');
-						break;
-					default:
-						return my.status;
-						break;
-				};
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'hold_type',
-			'label' : document.getElementById('commonStrings').getString('staff.ahr_hold_type_label'),
-			'flex' : 0,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.ahr.hold_type(); }
-		},
+ 
+ JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+
+ var c = [
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'request_lib',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.request_lib'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (Number(my.ahr.request_lib())>=0) {
+     return data.hash.aou[ my.ahr.request_lib() ].name();
+    } else {
+     return my.ahr.request_lib().name();
+    }
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'request_lib_shortname',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.request_lib_shortname'),
+   'flex' : 0,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (Number(my.ahr.request_lib())>=0) {
+     return data.hash.aou[ my.ahr.request_lib() ].shortname();
+    } else {
+     return my.ahr.request_lib().shortname();
+    }
+   }
+  },
+
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'request_timestamp',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.request_timestamp'),
+   'flex' : 0,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.ahr.request_time().toString(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'request_time',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.request_time'),
+   'flex' : 0,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.ahr.request_time().toString().substr(0,10); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'available_timestamp',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.available_timestamp'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (my.ahr.transit() && my.ahr.transit().dest_recv_time()) {
+     return my.ahr.transit().dest_recv_time().toString();
+    }
+    if (!my.ahr.transit() && my.ahr.capture_time()) {
+     return my.ahr.capture_time().toString();
+    }
+    return "";
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'available_time',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.available_time'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : false,
+   'render' : function(my) {
+    if (my.ahr.transit() && my.ahr.transit().dest_recv_time()) {
+     return my.ahr.transit().dest_recv_time().toString().substr(0,10);
+    }
+    if (!my.ahr.transit() && my.ahr.capture_time()) {
+     return my.ahr.capture_time().toString().substr(0,10);
+    }
+    return "";
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'capture_timestamp',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.capture_timestamp'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.ahr.capture_time() ? my.ahr.capture_time().toString() : ""; }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'capture_time',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.capture_time'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.ahr.capture_time() ? my.ahr.capture_time().toString().substr(0,10) : ""; }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'status',
+   'label' : document.getElementById('commonStrings').getString('staff.ahr_status_label'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : false,
+   'render' : function(my) {
+    switch (Number(my.status)) {
+     case 1:
+      return document.getElementById('circStrings').getString('staff.circ.utils.hold_status.1');
+      break;
+     case 2:
+      return document.getElementById('circStrings').getString('staff.circ.utils.hold_status.2');
+      break;
+     case 3:
+      return document.getElementById('circStrings').getString('staff.circ.utils.hold_status.3');
+      break;
+     case 4:
+      return document.getElementById('circStrings').getString('staff.circ.utils.hold_status.4');
+      break;
+     default:
+      return my.status;
+      break;
+    };
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'hold_type',
+   'label' : document.getElementById('commonStrings').getString('staff.ahr_hold_type_label'),
+   'flex' : 0,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.ahr.hold_type(); }
+  },
         {
-			'persist' : 'hidden width ordinal',
-			'id' : 'frozen',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.active'),
-			'flex' : 0,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (!get_bool( my.ahr.frozen() )) {
-					return document.getElementById('circStrings').getString('staff.circ.utils.yes');
-				} else {
-					return document.getElementById('circStrings').getString('staff.circ.utils.no');
-				}
-			}
+   'persist' : 'hidden width ordinal',
+   'id' : 'frozen',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.active'),
+   'flex' : 0,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (!get_bool( my.ahr.frozen() )) {
+     return document.getElementById('circStrings').getString('staff.circ.utils.yes');
+    } else {
+     return document.getElementById('circStrings').getString('staff.circ.utils.no');
+    }
+   }
         },
         {
-			'persist' : 'hidden width ordinal',
-			'id' : 'thaw_date',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.thaw_date'),
-			'flex' : 0,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (my.ahr.thaw_date() == null) {
-					return document.getElementById('circStrings').getString('staff.circ.utils.thaw_date.none');
-				} else {
-					return my.ahr.thaw_date().substr(0,10);
-				}
-			}
+   'persist' : 'hidden width ordinal',
+   'id' : 'thaw_date',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.thaw_date'),
+   'flex' : 0,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (my.ahr.thaw_date() == null) {
+     return document.getElementById('circStrings').getString('staff.circ.utils.thaw_date.none');
+    } else {
+     return my.ahr.thaw_date().substr(0,10);
+    }
+   }
         },
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'pickup_lib',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.pickup_lib'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (Number(my.ahr.pickup_lib())>=0) {
-					return data.hash.aou[ my.ahr.pickup_lib() ].name();
-				} else {
-					return my.ahr.pickup_lib().name();
-				}
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'pickup_lib_shortname',
-			'label' : document.getElementById('commonStrings').getString('staff.ahr_pickup_lib_label'),
-			'flex' : 0,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (Number(my.ahr.pickup_lib())>=0) {
-					return data.hash.aou[ my.ahr.pickup_lib() ].shortname();
-				} else {
-					return my.ahr.pickup_lib().shortname();
-				}
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'current_copy',
-			'label' : document.getElementById('commonStrings').getString('staff.ahr_current_copy_label'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (my.acp) {
-					return my.acp.barcode();
-				} else {
-					return document.getElementById('circStrings').getString('staff.circ.utils.current_copy.none');
-				}
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'current_copy_location', 
-			'label' : document.getElementById('commonStrings').getString('staff.ahr_current_copy_location_label'),
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'pickup_lib',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.pickup_lib'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (Number(my.ahr.pickup_lib())>=0) {
+     return data.hash.aou[ my.ahr.pickup_lib() ].name();
+    } else {
+     return my.ahr.pickup_lib().name();
+    }
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'pickup_lib_shortname',
+   'label' : document.getElementById('commonStrings').getString('staff.ahr_pickup_lib_label'),
+   'flex' : 0,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (Number(my.ahr.pickup_lib())>=0) {
+     return data.hash.aou[ my.ahr.pickup_lib() ].shortname();
+    } else {
+     return my.ahr.pickup_lib().shortname();
+    }
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'current_copy',
+   'label' : document.getElementById('commonStrings').getString('staff.ahr_current_copy_label'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (my.acp) {
+     return my.acp.barcode();
+    } else {
+     return document.getElementById('circStrings').getString('staff.circ.utils.current_copy.none');
+    }
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'current_copy_location', 
+   'label' : document.getElementById('commonStrings').getString('staff.ahr_current_copy_location_label'),
             'flex' : 1,
-			'primary' : false, 
+   'primary' : false, 
             'hidden' : true, 
             'render' : function(my) { 
                 if (!my.acp) { return ""; } else { if (Number(my.acp.location())>=0) return data.lookup("acpl", my.acp.location() ).name(); else return my.acp.location().name(); } 
             }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'email_notify',
-			'label' : document.getElementById('commonStrings').getString('staff.ahr_email_notify_label'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (get_bool(my.ahr.email_notify())) {
-					return document.getElementById('circStrings').getString('staff.circ.utils.yes');
-				} else {
-					return document.getElementById('circStrings').getString('staff.circ.utils.no');
-				}
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'expire_time',
-			'label' : document.getElementById('commonStrings').getString('staff.ahr_expire_time_label'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.ahr.expire_time(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'expire_date',
-			'label' : document.getElementById('commonStrings').getString('staff.ahr_expire_date_label'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.ahr.expire_time() ? my.ahr.expire_time().toString().substr(0,10) : ''; }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'fulfillment_time',
-			'label' : document.getElementById('commonStrings').getString('staff.ahr_fulfillment_time_label'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.ahr.fulfillment_time(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'holdable_formats',
-			'label' : document.getElementById('commonStrings').getString('staff.ahr_holdable_formats_label'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.ahr.holdable_formats(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'id',
-			'label' : document.getElementById('commonStrings').getString('staff.ahr_id_label'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.ahr.id(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'phone_notify',
-			'label' : document.getElementById('commonStrings').getString('staff.ahr_phone_notify_label'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.ahr.phone_notify(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'prev_check_time',
-			'label' : document.getElementById('commonStrings').getString('staff.ahr_prev_check_time_label'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.ahr.prev_check_time(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'requestor',
-			'label' : document.getElementById('commonStrings').getString('staff.ahr_requestor_label'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.ahr.requestor(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'selection_depth',
-			'label' : document.getElementById('commonStrings').getString('staff.ahr_selection_depth_label'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.ahr.selection_depth(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'target',
-			'label' : document.getElementById('commonStrings').getString('staff.ahr_target_label'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.ahr.target(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'usr',
-			'label' : document.getElementById('commonStrings').getString('staff.ahr_usr_label'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.ahr.usr(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'title',
-			'label' : document.getElementById('commonStrings').getString('staff.mvr_label_title'),
-			'flex' : 1,
-			'sort_type' : 'title',
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (my.mvr) {
-					return my.mvr.title();
-				} else {
-					return document.getElementById('circStrings').getString('staff.circ.utils.title.none');
-				}
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'author',
-			'label' : document.getElementById('commonStrings').getString('staff.mvr_label_author'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (my.mvr) {
-					return my.mvr.author();
-				} else {
-					return document.getElementById('circStrings').getString('staff.circ.utils.author.none');
-				}
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'edition',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.edition'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.mvr.edition(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'isbn',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.isbn'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.mvr.isbn(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'pubdate',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.pubdate'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.mvr.pubdate(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'publisher',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.publisher'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.mvr.publisher(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'tcn',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.tcn'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.mvr.tcn(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'notify_time',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.notify_time'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.ahr.notify_time(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'notify_count',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.notify_count'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.ahr.notify_count(); }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'transit_source',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.transit_source'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) {
-				if (my.ahr.transit()) {
-					return data.hash.aou[ my.ahr.transit().source() ].shortname();
-				} else {
-					return "";
-				}
-			}
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'transit_source_send_time',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.transit_source_send_time'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.ahr.transit() ?  my.ahr.transit().source_send_time() : ""; }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'transit_dest_lib',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.transit_dest'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.ahr.transit() ?  data.hash.aou[ my.ahr.transit().dest() ].shortname() : ""; }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'transit_dest_recv_time',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.transit_dest_recv_time'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.ahr.transit() ?  my.ahr.transit().dest_recv_time() : ""; }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'patron_barcode',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.patron_barcode'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.patron_barcode ? my.patron_barcode : ""; }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'patron_family_name',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.patron_family_name'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.patron_family_name ? my.patron_family_name : ""; }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'patron_first_given_name',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.patron_first_given_name'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.patron_first_given_name ? my.patron_first_given_name : ""; }
-		},
-		{
-			'persist' : 'hidden width ordinal',
-			'id' : 'callnumber',
-			'label' : document.getElementById('circStrings').getString('staff.circ.utils.callnumber'),
-			'flex' : 1,
-			'primary' : false,
-			'hidden' : true,
-			'render' : function(my) { return my.acn.label(); }
-		},
-	];
-	for (var i = 0; i < c.length; i++) {
-		if (modify[ c[i].id ]) {
-			for (var j in modify[ c[i].id ]) {
-				c[i][j] = modify[ c[i].id ][j];
-			}
-		}
-	}
-	if (params) {
-		if (params.just_these) {
-			JSAN.use('util.functional');
-			var new_c = [];
-			for (var i = 0; i < params.just_these.length; i++) {
-				var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
-				new_c.push( function(y){ return y; }( x ) );
-			}
-			c = new_c;
-		}
-		if (params.except_these) {
-			JSAN.use('util.functional');
-			var new_c = [];
-			for (var i = 0; i < c.length; i++) {
-				var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);});
-				if (!x) new_c.push(c[i]);
-			}
-			c = new_c;
-		}
-
-	}
-	return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } );
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'email_notify',
+   'label' : document.getElementById('commonStrings').getString('staff.ahr_email_notify_label'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (get_bool(my.ahr.email_notify())) {
+     return document.getElementById('circStrings').getString('staff.circ.utils.yes');
+    } else {
+     return document.getElementById('circStrings').getString('staff.circ.utils.no');
+    }
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'expire_time',
+   'label' : document.getElementById('commonStrings').getString('staff.ahr_expire_time_label'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.ahr.expire_time(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'expire_date',
+   'label' : document.getElementById('commonStrings').getString('staff.ahr_expire_date_label'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.ahr.expire_time() ? my.ahr.expire_time().toString().substr(0,10) : ''; }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'fulfillment_time',
+   'label' : document.getElementById('commonStrings').getString('staff.ahr_fulfillment_time_label'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.ahr.fulfillment_time(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'holdable_formats',
+   'label' : document.getElementById('commonStrings').getString('staff.ahr_holdable_formats_label'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.ahr.holdable_formats(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'id',
+   'label' : document.getElementById('commonStrings').getString('staff.ahr_id_label'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.ahr.id(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'phone_notify',
+   'label' : document.getElementById('commonStrings').getString('staff.ahr_phone_notify_label'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.ahr.phone_notify(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'prev_check_time',
+   'label' : document.getElementById('commonStrings').getString('staff.ahr_prev_check_time_label'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.ahr.prev_check_time(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'requestor',
+   'label' : document.getElementById('commonStrings').getString('staff.ahr_requestor_label'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.ahr.requestor(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'selection_depth',
+   'label' : document.getElementById('commonStrings').getString('staff.ahr_selection_depth_label'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.ahr.selection_depth(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'target',
+   'label' : document.getElementById('commonStrings').getString('staff.ahr_target_label'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.ahr.target(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'usr',
+   'label' : document.getElementById('commonStrings').getString('staff.ahr_usr_label'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.ahr.usr(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'title',
+   'label' : document.getElementById('commonStrings').getString('staff.mvr_label_title'),
+   'flex' : 1,
+   'sort_type' : 'title',
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (my.mvr) {
+     return my.mvr.title();
+    } else {
+     return document.getElementById('circStrings').getString('staff.circ.utils.title.none');
+    }
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'author',
+   'label' : document.getElementById('commonStrings').getString('staff.mvr_label_author'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (my.mvr) {
+     return my.mvr.author();
+    } else {
+     return document.getElementById('circStrings').getString('staff.circ.utils.author.none');
+    }
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'edition',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.edition'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.mvr.edition(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'isbn',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.isbn'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.mvr.isbn(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'pubdate',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.pubdate'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.mvr.pubdate(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'publisher',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.publisher'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.mvr.publisher(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'tcn',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.tcn'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.mvr.tcn(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'notify_time',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.notify_time'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.ahr.notify_time(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'notify_count',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.notify_count'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.ahr.notify_count(); }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'transit_source',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.transit_source'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) {
+    if (my.ahr.transit()) {
+     return data.hash.aou[ my.ahr.transit().source() ].shortname();
+    } else {
+     return "";
+    }
+   }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'transit_source_send_time',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.transit_source_send_time'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.ahr.transit() ?  my.ahr.transit().source_send_time() : ""; }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'transit_dest_lib',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.transit_dest'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.ahr.transit() ?  data.hash.aou[ my.ahr.transit().dest() ].shortname() : ""; }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'transit_dest_recv_time',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.transit_dest_recv_time'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.ahr.transit() ?  my.ahr.transit().dest_recv_time() : ""; }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'patron_barcode',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.offline.patron_barcode'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.patron_barcode ? my.patron_barcode : ""; }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'patron_family_name',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.patron_family_name'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.patron_family_name ? my.patron_family_name : ""; }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'patron_first_given_name',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.patron_first_given_name'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.patron_first_given_name ? my.patron_first_given_name : ""; }
+  },
+  {
+   'persist' : 'hidden width ordinal',
+   'id' : 'callnumber',
+   'label' : document.getElementById('circStrings').getString('staff.circ.utils.callnumber'),
+   'flex' : 1,
+   'primary' : false,
+   'hidden' : true,
+   'render' : function(my) { return my.acn.label(); }
+  },
+ ];
+ for (var i = 0; i < c.length; i++) {
+  if (modify[ c[i].id ]) {
+   for (var j in modify[ c[i].id ]) {
+    c[i][j] = modify[ c[i].id ][j];
+   }
+  }
+ }
+ if (params) {
+  if (params.just_these) {
+   JSAN.use('util.functional');
+   var new_c = [];
+   for (var i = 0; i < params.just_these.length; i++) {
+    var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
+    new_c.push( function(y){ return y; }( x ) );
+   }
+   c = new_c;
+  }
+  if (params.except_these) {
+   JSAN.use('util.functional');
+   var new_c = [];
+   for (var i = 0; i < c.length; i++) {
+    var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);});
+    if (!x) new_c.push(c[i]);
+   }
+   c = new_c;
+  }
+
+ }
+ return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } );
 };
 /*
 circ.util.std_map_row_to_column = function(error_value) {
-	return function(row,col) {
-		// row contains { 'my' : { 'acp' : {}, 'circ' : {}, 'mvr' : {} } }
-		// col contains one of the objects listed above in columns
-		
-		// mimicking some of the obj in circ.checkin and circ.checkout where map_row_to_column is usually defined
-		var obj = {};
-		JSAN.use('util.error'); obj.error = new util.error();
-		JSAN.use('OpenILS.data'); obj.data = new OpenILS.data(); obj.data.init({'via':'stash'});
-		JSAN.use('util.network'); obj.network = new util.network();
-		JSAN.use('util.money');
-
-		var my = row.my;
-		var value;
-		try {
-			value = eval( col.render );
-		} catch(E) {
-			obj.error.sdump('D_WARN','map_row_to_column: ' + E);
-			if (error_value) value = error_value; else value = '   ';
-		}
-		return value;
-	}
+ return function(row,col) {
+  // row contains { 'my' : { 'acp' : {}, 'circ' : {}, 'mvr' : {} } }
+  // col contains one of the objects listed above in columns
+  
+  // mimicking some of the obj in circ.checkin and circ.checkout where map_row_to_column is usually defined
+  var obj = {};
+  JSAN.use('util.error'); obj.error = new util.error();
+  JSAN.use('OpenILS.data'); obj.data = new OpenILS.data(); obj.data.init({'via':'stash'});
+  JSAN.use('util.network'); obj.network = new util.network();
+  JSAN.use('util.money');
+
+  var my = row.my;
+  var value;
+  try {
+   value = eval( col.render );
+  } catch(E) {
+   obj.error.sdump('D_WARN','map_row_to_column: ' + E);
+   if (error_value) value = error_value; else value = '   ';
+  }
+  return value;
+ }
 };
 */
 circ.util.std_map_row_to_columns = function(error_value) {
-	return function(row,cols) {
-		// row contains { 'my' : { 'acp' : {}, 'circ' : {}, 'mvr' : {} } }
-		// cols contains all of the objects listed above in columns
-		
-		var obj = {};
-		JSAN.use('util.error'); obj.error = new util.error();
-		JSAN.use('OpenILS.data'); obj.data = new OpenILS.data(); obj.data.init({'via':'stash'});
-		JSAN.use('util.network'); obj.network = new util.network();
-		JSAN.use('util.money');
-
-		var my = row.my;
-		var values = [];
-		var cmd = '';
-		try {
-			for (var i = 0; i < cols.length; i++) {
-				switch (typeof cols[i].render) {
-					case 'function': try { values[i] = cols[i].render(my); } catch(E) { values[i] = error_value; obj.error.sdump('D_COLUMN_RENDER_ERROR',E); } break;
-					case 'string' : cmd += 'try { ' + cols[i].render + '; values['+i+'] = v; } catch(E) { values['+i+'] = error_value; }'; break;
-					default: cmd += 'values['+i+'] = "??? '+(typeof cols[i].render)+'"; ';
-				}
-			}
-			if (cmd) eval( cmd );
-		} catch(E) {
-			obj.error.sdump('D_WARN','map_row_to_column: ' + E);
-			if (error_value) { value = error_value; } else { value = '   ' };
-		}
-		return values;
-	}
+ return function(row,cols) {
+  // row contains { 'my' : { 'acp' : {}, 'circ' : {}, 'mvr' : {} } }
+  // cols contains all of the objects listed above in columns
+  
+  var obj = {};
+  JSAN.use('util.error'); obj.error = new util.error();
+  JSAN.use('OpenILS.data'); obj.data = new OpenILS.data(); obj.data.init({'via':'stash'});
+  JSAN.use('util.network'); obj.network = new util.network();
+  JSAN.use('util.money');
+
+  var my = row.my;
+  var values = [];
+  var cmd = '';
+  try {
+   for (var i = 0; i < cols.length; i++) {
+    switch (typeof cols[i].render) {
+     case 'function': try { values[i] = cols[i].render(my); } catch(E) { values[i] = error_value; obj.error.sdump('D_COLUMN_RENDER_ERROR',E); } break;
+     case 'string' : cmd += 'try { ' + cols[i].render + '; values['+i+'] = v; } catch(E) { values['+i+'] = error_value; }'; break;
+     default: cmd += 'values['+i+'] = "??? '+(typeof cols[i].render)+'"; ';
+    }
+   }
+   if (cmd) eval( cmd );
+  } catch(E) {
+   obj.error.sdump('D_WARN','map_row_to_column: ' + E);
+   if (error_value) { value = error_value; } else { value = '   ' };
+  }
+  return values;
+ }
 };
 
 circ.util.checkin_via_barcode = function(session,params,backdate,auto_print,async) {
-	try {
-		JSAN.use('util.error'); var error = new util.error();
-		JSAN.use('util.network'); var network = new util.network();
-		JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-		JSAN.use('util.date'); JSAN.use('util.functional');
+ try {
+  JSAN.use('util.error'); var error = new util.error();
+  JSAN.use('util.network'); var network = new util.network();
+  JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+  JSAN.use('util.date'); JSAN.use('util.functional');
 
-		if (backdate && (backdate == util.date.formatted_date(new Date(),'%Y-%m-%d')) ) backdate = null;
+  if (backdate && (backdate == util.date.formatted_date(new Date(),'%Y-%m-%d')) ) backdate = null;
 
-		//var params = { 'barcode' : barcode };
-		if (backdate) params.backdate = util.date.formatted_date(backdate + ' 00:00:00','%{iso8601}');
+  //var params = { 'barcode' : barcode };
+  if (backdate) params.backdate = util.date.formatted_date(backdate + ' 00:00:00','%{iso8601}');
 
-		if (typeof params.disable_textbox == 'function') {
-			try { params.disable_textbox(); }
-			catch(E) { error.sdump('D_ERROR','params.disable_textbox() = ' + E); };
-		}
+  if (typeof params.disable_textbox == 'function') {
+   try { params.disable_textbox(); }
+   catch(E) { error.sdump('D_ERROR','params.disable_textbox() = ' + E); };
+  }
 
         function checkin_callback(req) {
             try {
@@ -1925,8 +1925,8 @@ circ.util.checkin_via_barcode = function(session,params,backdate,auto_print,asyn
                     try { params.checkin_result(r); }
                     catch(E) { error.sdump('D_ERROR','params.checkin_result() = ' + E); };
                 }
-				if (typeof async == 'function') async(check);
-				return check;
+    if (typeof async == 'function') async(check);
+    return check;
             } catch(E) {
                 JSAN.use('util.error'); var error = new util.error();
                 error.standard_unexpected_error_alert(document.getElementById('circStrings').getFormattedString('staff.circ.checkin.error', ['1']), E);
@@ -1938,522 +1938,522 @@ circ.util.checkin_via_barcode = function(session,params,backdate,auto_print,asyn
             }
         } 
 
-		var check = network.request(
-			api.CHECKIN_VIA_BARCODE.app,
-			api.CHECKIN_VIA_BARCODE.method,
-			[ session, util.functional.filter_object( params, function(i,o) { return typeof o != 'function'; } ) ],
-			async ? checkin_callback : null,
-			{
-				'title' : document.getElementById('circStrings').getString('staff.circ.utils.checkin.override'),
-				'overridable_events' : [
+  var check = network.request(
+   api.CHECKIN_VIA_BARCODE.app,
+   api.CHECKIN_VIA_BARCODE.method,
+   [ session, util.functional.filter_object( params, function(i,o) { return typeof o != 'function'; } ) ],
+   async ? checkin_callback : null,
+   {
+    'title' : document.getElementById('circStrings').getString('staff.circ.utils.checkin.override'),
+    'overridable_events' : [
                     null /* custom event */,
-					1203 /* COPY_BAD_STATUS */,
-					1213 /* PATRON_BARRED */,
-					1217 /* PATRON_INACTIVE */,
-					1224 /* PATRON_ACCOUNT_EXPIRED */,
-					1234 /* ITEM_DEPOSIT_PAID */,
-					7009 /* CIRC_CLAIMS_RETURNED */,
-					7010 /* COPY_ALERT_MESSAGE */,
-					7011 /* COPY_STATUS_LOST */,
-					7012 /* COPY_STATUS_MISSING */,
-					7013 /* PATRON_EXCEEDS_FINES */,
-				],
-				'text' : {
-					'1203' : function(r) {
-						return typeof r.payload.status() == 'object' ? r.payload.status().name() : data.hash.ccs[ r.payload.status() ].name();
-					},
-					'1234' : function(r) {
-						return document.getElementById('circStrings').getString('staff.circ.utils.checkin.override.item_deposit_paid.warning');
-					},
-					'7010' : function(r) {
-						return r.payload;
-					}
-				}
-			}
-		);
-		if (! async ) {
-			return checkin_callback( { 'getResultObject' : function() { return check; } } );
-		}
-
-
-	} catch(E) {
-		JSAN.use('util.error'); var error = new util.error();
-		error.standard_unexpected_error_alert(document.getElementById('circStrings').getFormattedString('staff.circ.checkin.error', ['2']), E);
-		if (typeof params.enable_textbox == 'function') {
-			try { params.enable_textbox(); } catch(E) { error.sdump('D_ERROR','params.disable_textbox() = ' + E); };
-		}
-		return null;
-	}
+     1203 /* COPY_BAD_STATUS */,
+     1213 /* PATRON_BARRED */,
+     1217 /* PATRON_INACTIVE */,
+     1224 /* PATRON_ACCOUNT_EXPIRED */,
+     1234 /* ITEM_DEPOSIT_PAID */,
+     7009 /* CIRC_CLAIMS_RETURNED */,
+     7010 /* COPY_ALERT_MESSAGE */,
+     7011 /* COPY_STATUS_LOST */,
+     7012 /* COPY_STATUS_MISSING */,
+     7013 /* PATRON_EXCEEDS_FINES */,
+    ],
+    'text' : {
+     '1203' : function(r) {
+      return typeof r.payload.status() == 'object' ? r.payload.status().name() : data.hash.ccs[ r.payload.status() ].name();
+     },
+     '1234' : function(r) {
+      return document.getElementById('circStrings').getString('staff.circ.utils.checkin.override.item_deposit_paid.warning');
+     },
+     '7010' : function(r) {
+      return r.payload;
+     }
+    }
+   }
+  );
+  if (! async ) {
+   return checkin_callback( { 'getResultObject' : function() { return check; } } );
+  }
+
+
+ } catch(E) {
+  JSAN.use('util.error'); var error = new util.error();
+  error.standard_unexpected_error_alert(document.getElementById('circStrings').getFormattedString('staff.circ.checkin.error', ['2']), E);
+  if (typeof params.enable_textbox == 'function') {
+   try { params.enable_textbox(); } catch(E) { error.sdump('D_ERROR','params.disable_textbox() = ' + E); };
+  }
+  return null;
+ }
 };
 
 circ.util.checkin_via_barcode2 = function(session,params,backdate,auto_print,check) {
-	try {
-		JSAN.use('util.error'); var error = new util.error();
-		JSAN.use('util.network'); var network = new util.network();
-		JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-		JSAN.use('util.date');
-
-		error.sdump('D_DEBUG','check = ' + error.pretty_print( js2JSON( check ) ) );
-
-		check.message = check.textcode;
-
-		if (check.payload && check.payload.copy) { check.copy = check.payload.copy; }
-		if (check.payload && check.payload.record) { check.record = check.payload.record; }
-		if (check.payload && check.payload.circ) { check.circ = check.payload.circ; }
-
-		if (!check.route_to) { check.route_to = '   '; }
-
-		if (document.getElementById('no_change_label')) {
-			document.getElementById('no_change_label').setAttribute('value','');
-			document.getElementById('no_change_label').setAttribute('hidden','true');
-		}
-
-		if (check.circ) {
-			network.simple_request('FM_MBTS_RETRIEVE.authoritative',[ses(),check.circ.id()], function(req) {
-				JSAN.use('util.money');
-				var bill = req.getResultObject();
-				if (Number(bill.balance_owed()) == 0) { return; }
-				if (document.getElementById('no_change_label')) {
-					var m = document.getElementById('no_change_label').getAttribute('value');
-					document.getElementById('no_change_label').setAttribute('value', m + document.getElementById('circStrings').getFormattedString('staff.circ.utils.billable.amount', [params.barcode, util.money.sanitize(bill.balance_owed())]) + '  ');
-					document.getElementById('no_change_label').setAttribute('hidden','false');
-				}
-			});
-		}
-
-		var msg = '';
-
-		if (check.payload && check.payload.cancelled_hold_transit) {
-			msg += document.getElementById('circStrings').getString('staff.circ.utils.transit_hold_cancelled');
-			msg += '\n\n';
-		}
-
-		/* SUCCESS  /  NO_CHANGE  /  ITEM_NOT_CATALOGED */
-		if (check.ilsevent == 0 || check.ilsevent == 3 || check.ilsevent == 1202) {
-			try { check.route_to = data.lookup('acpl', check.copy.location() ).name(); }
-			catch(E) {
-				msg += document.getElementById('commonStrings').getString('common.error');
-				msg += '\nFIXME: ' + E + '\n';
-			}
-			if (check.ilsevent == 3 /* NO_CHANGE */) {
-				//msg = 'This item is already checked in.\n';
-				if (document.getElementById('no_change_label')) {
-					var m = document.getElementById('no_change_label').getAttribute('value');
-					document.getElementById('no_change_label').setAttribute('value', m + document.getElementById('circStrings').getFormattedString('staff.circ.utils.item_checked_in', [params.barcode]) + '  ');
-					document.getElementById('no_change_label').setAttribute('hidden','false');
-				}
-			}
-			if (check.ilsevent == 1202 /* ITEM_NOT_CATALOGED */ && check.copy.status() != 11) {
-				var copy_status = (data.hash.ccs[ check.copy.status() ] ? data.hash.ccs[ check.copy.status() ].name() : check.copy.status().name() );
-				msg = document.getElementById('commonStrings').getString('common.error');
-				msg += '\nFIXME --';
-				msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.item_not_cataloged', [copy_status]);
-				msg + '\n';
-			}
-			switch(Number(check.copy.status())) {
-				case 0: /* AVAILABLE */
-				case 7: /* RESHELVING */
-					if (msg) {
-						msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.route_to.msg', [check.route_to]);
-						msg += '\n';
-					}
-				break;
-				case 8: /* ON HOLDS SHELF */
-					check.route_to = 'HOLDS SHELF';
-					if (check.payload.hold) {
-						if (check.payload.hold.pickup_lib() != data.list.au[0].ws_ou()) {
-							msg += document.getElementById('commonStrings').getString('common.error');
-							msg += '\nFIXME: ';
-							msg += document.getElementById('circStrings').getString('staff.circ.utils.route_item_error');
-							msg += '\n';
-						} else {
-							msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.route_to.msg', [check.route_to]);
-							msg += '.\n';
-						}
-					} else {
-						msg += document.getElementById('commonStrings').getString('common.error');
-						msg += '\nFIXME: ';
-						msg += document.getElementById('circStrings').getString('staff.circ.utils.route_item_status_error');
-						msg += '\n';
-					}
-					JSAN.use('util.date');
-					if (check.payload.hold) {
-						JSAN.use('patron.util');
-						msg += '\n';
-						msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.barcode', [check.payload.copy.barcode()]);
-						msg += '\n';
-						var payload_title  = (check.payload.record ? check.payload.record.title() : check.payload.copy.dummy_title() );
-						msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.title', [payload_title]);
-						msg += '\n';
-						var au_obj = patron.util.retrieve_fleshed_au_via_id( session, check.payload.hold.usr() );
-						msg += '\n';
+ try {
+  JSAN.use('util.error'); var error = new util.error();
+  JSAN.use('util.network'); var network = new util.network();
+  JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+  JSAN.use('util.date');
+
+  error.sdump('D_DEBUG','check = ' + error.pretty_print( js2JSON( check ) ) );
+
+  check.message = check.textcode;
+
+  if (check.payload && check.payload.copy) { check.copy = check.payload.copy; }
+  if (check.payload && check.payload.record) { check.record = check.payload.record; }
+  if (check.payload && check.payload.circ) { check.circ = check.payload.circ; }
+
+  if (!check.route_to) { check.route_to = '   '; }
+
+  if (document.getElementById('no_change_label')) {
+   document.getElementById('no_change_label').setAttribute('value','');
+   document.getElementById('no_change_label').setAttribute('hidden','true');
+  }
+
+  if (check.circ) {
+   network.simple_request('FM_MBTS_RETRIEVE.authoritative',[ses(),check.circ.id()], function(req) {
+    JSAN.use('util.money');
+    var bill = req.getResultObject();
+    if (Number(bill.balance_owed()) == 0) { return; }
+    if (document.getElementById('no_change_label')) {
+     var m = document.getElementById('no_change_label').getAttribute('value');
+     document.getElementById('no_change_label').setAttribute('value', m + document.getElementById('circStrings').getFormattedString('staff.circ.utils.billable.amount', [params.barcode, util.money.sanitize(bill.balance_owed())]) + '  ');
+     document.getElementById('no_change_label').setAttribute('hidden','false');
+    }
+   });
+  }
+
+  var msg = '';
+
+  if (check.payload && check.payload.cancelled_hold_transit) {
+   msg += document.getElementById('circStrings').getString('staff.circ.utils.transit_hold_cancelled');
+   msg += '\n\n';
+  }
+
+  /* SUCCESS  /  NO_CHANGE  /  ITEM_NOT_CATALOGED */
+  if (check.ilsevent == 0 || check.ilsevent == 3 || check.ilsevent == 1202) {
+   try { check.route_to = data.lookup('acpl', check.copy.location() ).name(); }
+   catch(E) {
+    msg += document.getElementById('commonStrings').getString('common.error');
+    msg += '\nFIXME: ' + E + '\n';
+   }
+   if (check.ilsevent == 3 /* NO_CHANGE */) {
+    //msg = 'This item is already checked in.\n';
+    if (document.getElementById('no_change_label')) {
+     var m = document.getElementById('no_change_label').getAttribute('value');
+     document.getElementById('no_change_label').setAttribute('value', m + document.getElementById('circStrings').getFormattedString('staff.circ.utils.item_checked_in', [params.barcode]) + '  ');
+     document.getElementById('no_change_label').setAttribute('hidden','false');
+    }
+   }
+   if (check.ilsevent == 1202 /* ITEM_NOT_CATALOGED */ && check.copy.status() != 11) {
+    var copy_status = (data.hash.ccs[ check.copy.status() ] ? data.hash.ccs[ check.copy.status() ].name() : check.copy.status().name() );
+    msg = document.getElementById('commonStrings').getString('common.error');
+    msg += '\nFIXME --';
+    msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.item_not_cataloged', [copy_status]);
+    msg + '\n';
+   }
+   switch(Number(check.copy.status())) {
+    case 0: /* AVAILABLE */
+    case 7: /* RESHELVING */
+     if (msg) {
+      msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.route_to.msg', [check.route_to]);
+      msg += '\n';
+     }
+    break;
+    case 8: /* ON HOLDS SHELF */
+     check.route_to = 'HOLDS SHELF';
+     if (check.payload.hold) {
+      if (check.payload.hold.pickup_lib() != data.list.au[0].ws_ou()) {
+       msg += document.getElementById('commonStrings').getString('common.error');
+       msg += '\nFIXME: ';
+       msg += document.getElementById('circStrings').getString('staff.circ.utils.route_item_error');
+       msg += '\n';
+      } else {
+       msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.route_to.msg', [check.route_to]);
+       msg += '.\n';
+      }
+     } else {
+      msg += document.getElementById('commonStrings').getString('common.error');
+      msg += '\nFIXME: ';
+      msg += document.getElementById('circStrings').getString('staff.circ.utils.route_item_status_error');
+      msg += '\n';
+     }
+     JSAN.use('util.date');
+     if (check.payload.hold) {
+      JSAN.use('patron.util');
+      msg += '\n';
+      msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.barcode', [check.payload.copy.barcode()]);
+      msg += '\n';
+      var payload_title  = (check.payload.record ? check.payload.record.title() : check.payload.copy.dummy_title() );
+      msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.title', [payload_title]);
+      msg += '\n';
+      var au_obj = patron.util.retrieve_fleshed_au_via_id( session, check.payload.hold.usr() );
+      msg += '\n';
                         if (au_obj.alias()) {
-    						msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.patron_alias',  [au_obj.alias()]);
+          msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.patron_alias',  [au_obj.alias()]);
                         } else {
-    						msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.patron',  [au_obj.family_name(), au_obj.first_given_name(), au_obj.second_given_name()]);
+          msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.patron',  [au_obj.family_name(), au_obj.first_given_name(), au_obj.second_given_name()]);
                         }
-						msg += '\n';
-						msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.barcode', [au_obj.card().barcode()]);
-						msg += '\n';
-						if (check.payload.hold.phone_notify()) {
-							msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.phone_notify', [check.payload.hold.phone_notify()]);
-							msg += '\n';
-						}
-						if (get_bool(check.payload.hold.email_notify())) {
-							var payload_email = au_obj.email() ? au_obj.email() : '';
-							msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.email_notify', [payload_email]);
-							msg += '\n';
-						}
-						msg += '\n';
-						msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.request_date', [util.date.formatted_date(check.payload.hold.request_time(),'%F')]);
-						msg += '\n';
-					}
-					var rv = 0;
-					msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.slip_date', [util.date.formatted_date(new Date(),'%F')]);
-					msg += '\n';
-					if (!auto_print) {
-						rv = error.yns_alert_formatted(
-							msg,
-							document.getElementById('circStrings').getString('staff.circ.utils.hold_slip'),
-							document.getElementById('circStrings').getString('staff.circ.utils.hold_slip.print.yes'),
-							document.getElementById('circStrings').getString('staff.circ.utils.hold_slip.print.no'),
-							null,
-							document.getElementById('circStrings').getString('staff.circ.confirm.msg'),
-							'/xul/server/skin/media/images/turtle.gif'
-						);
-					}
-					if (rv == 0) {
-						try {
-							JSAN.use('util.print'); var print = new util.print();
-							msg = msg.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\n/g,'<br/>');
-							print.simple( msg , { 'no_prompt' : true, 'content_type' : 'text/html' } );
-						} catch(E) {
-							var err_msg = document.getElementById('commonStrings').getString('common.error');
-							err_msg += '\nFIXME: ' + E + '\n';
-							dump(err_msg);
-							alert(err_msg);
-						}
-					}
-					msg = '';
-					if (document.getElementById('no_change_label')) {
-						var m = document.getElementById('no_change_label').getAttribute('value');
-						m += document.getElementById('circStrings').getFormattedString('staff.circ.utils.capture', [params.barcode]);
-						document.getElementById('no_change_label').setAttribute('value', m);
-						document.getElementById('no_change_label').setAttribute('hidden','false');
-					}
-				break;
-				case 6: /* IN TRANSIT */
-					check.route_to = 'TRANSIT SHELF??';
-					msg += document.getElementById('commonStrings').getString('common.error');
-					msg += "\nFIXME -- I didn't think we could get here.\n";
-				break;
-				case 11: /* CATALOGING */
-					check.route_to = 'CATALOGING';
-					if (document.getElementById('do_not_alert_on_precat')) {
-						var x = document.getElementById('do_not_alert_on_precat');
-						if (! x.checked) {
-							msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.route_to.msg', [check.route_to]);
-						}
-					} else {
-						msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.route_to.msg', [check.route_to]);
-					}
-					if (document.getElementById('no_change_label')) {
-						var m = document.getElementById('no_change_label').getAttribute('value');
-						var needs_cat = document.getElementById('circStrings').getFormattedString('staff.circ.utils.needs_cataloging', [params.barcode]);
-						document.getElementById('no_change_label').setAttribute('value', m + needs_cat + '  ');
-						document.getElementById('no_change_label').setAttribute('hidden','false');
-					}
-				break;
-				default:
-					msg += document.getElementById('commonStrings').getString('common.error');
-					var copy_status = data.hash.ccs[check.copy.status()] ? data.hash.ccs[check.copy.status()].name() : check.copy.status().name();
-					msg += '\n';
-					msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.copy_status.error', [copy_status]);
-					msg += '\n';
-					msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.route_to.msg', [check.route_to]);
-				break;
-			}
-			if (msg) {
-				error.yns_alert(
-					msg,
-					document.getElementById('circStrings').getString('staff.circ.alert'),
-					null,
-					document.getElementById('circStrings').getString('staff.circ.utils.msg.ok'),
-					null,
-					document.getElementById('circStrings').getString('staff.circ.confirm.msg')
-				);
-			}
-		} else /* ROUTE_ITEM */ if (check.ilsevent == 7000) {
-
-			var lib = data.hash.aou[ check.org ];
-			check.route_to = lib.shortname();
-			msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.route_to.destination', [check.route_to]);
-			msg += '\n\n';
-			msg += lib.name();
-			msg += '\n';
-			try {
-				if (lib.holds_address() ) {
-					var a = network.simple_request('FM_AOA_RETRIEVE',[ lib.holds_address() ]);
-					if (typeof a.ilsevent != 'undefined') throw(a);
-					if (a.street1()) msg += a.street1() + '\n';
-					if (a.street2()) msg += a.street2() + '\n';
-					msg += (a.city() ? a.city() + ', ' : '') + (a.state() ? a.state() + ' ' : '') + (a.post_code() ? a.post_code() : '') + '\n';
-				} else {
-					msg += document.getElementById('circStrings').getString('staff.circ.utils.route_to.no_address');
-					msg += '\n';
-				}
-			} catch(E) {
-				msg += document.getElementById('circStrings').getString('staff.circ.utils.route_to.no_address.error');
-				msg += '\n';
-				error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.utils.route_to.no_address.error'), E);
-			}
-			msg += '\n';
-			msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.barcode', [check.payload.copy.barcode()]);
-			msg += '\n';
-			var payload_title  = (check.payload.record ? check.payload.record.title() : check.payload.copy.dummy_title() );
-			msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.title', [payload_title]);
-			msg += '\n';
-			var payload_author = (check.payload.record ? check.payload.record.author() :check.payload.copy.dummy_author());
-			msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.author', [payload_author]);
-			msg += '\n';
-			JSAN.use('util.date');
-			if (check.payload.hold) {
-				JSAN.use('patron.util');
-				var au_obj = patron.util.retrieve_fleshed_au_via_id( session, check.payload.hold.usr() );
-				msg += '\n';
+      msg += '\n';
+      msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.barcode', [au_obj.card().barcode()]);
+      msg += '\n';
+      if (check.payload.hold.phone_notify()) {
+       msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.phone_notify', [check.payload.hold.phone_notify()]);
+       msg += '\n';
+      }
+      if (get_bool(check.payload.hold.email_notify())) {
+       var payload_email = au_obj.email() ? au_obj.email() : '';
+       msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.email_notify', [payload_email]);
+       msg += '\n';
+      }
+      msg += '\n';
+      msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.request_date', [util.date.formatted_date(check.payload.hold.request_time(),'%F')]);
+      msg += '\n';
+     }
+     var rv = 0;
+     msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.slip_date', [util.date.formatted_date(new Date(),'%F')]);
+     msg += '\n';
+     if (!auto_print) {
+      rv = error.yns_alert_formatted(
+       msg,
+       document.getElementById('circStrings').getString('staff.circ.utils.hold_slip'),
+       document.getElementById('circStrings').getString('staff.circ.utils.hold_slip.print.yes'),
+       document.getElementById('circStrings').getString('staff.circ.utils.hold_slip.print.no'),
+       null,
+       document.getElementById('circStrings').getString('staff.circ.confirm.msg'),
+       '/xul/server/skin/media/images/turtle.gif'
+      );
+     }
+     if (rv == 0) {
+      try {
+       JSAN.use('util.print'); var print = new util.print();
+       msg = msg.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\n/g,'<br/>');
+       print.simple( msg , { 'no_prompt' : true, 'content_type' : 'text/html' } );
+      } catch(E) {
+       var err_msg = document.getElementById('commonStrings').getString('common.error');
+       err_msg += '\nFIXME: ' + E + '\n';
+       dump(err_msg);
+       alert(err_msg);
+      }
+     }
+     msg = '';
+     if (document.getElementById('no_change_label')) {
+      var m = document.getElementById('no_change_label').getAttribute('value');
+      m += document.getElementById('circStrings').getFormattedString('staff.circ.utils.capture', [params.barcode]);
+      document.getElementById('no_change_label').setAttribute('value', m);
+      document.getElementById('no_change_label').setAttribute('hidden','false');
+     }
+    break;
+    case 6: /* IN TRANSIT */
+     check.route_to = 'TRANSIT SHELF??';
+     msg += document.getElementById('commonStrings').getString('common.error');
+     msg += "\nFIXME -- I didn't think we could get here.\n";
+    break;
+    case 11: /* CATALOGING */
+     check.route_to = 'CATALOGING';
+     if (document.getElementById('do_not_alert_on_precat')) {
+      var x = document.getElementById('do_not_alert_on_precat');
+      if (! x.checked) {
+       msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.route_to.msg', [check.route_to]);
+      }
+     } else {
+      msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.route_to.msg', [check.route_to]);
+     }
+     if (document.getElementById('no_change_label')) {
+      var m = document.getElementById('no_change_label').getAttribute('value');
+      var needs_cat = document.getElementById('circStrings').getFormattedString('staff.circ.utils.needs_cataloging', [params.barcode]);
+      document.getElementById('no_change_label').setAttribute('value', m + needs_cat + '  ');
+      document.getElementById('no_change_label').setAttribute('hidden','false');
+     }
+    break;
+    default:
+     msg += document.getElementById('commonStrings').getString('common.error');
+     var copy_status = data.hash.ccs[check.copy.status()] ? data.hash.ccs[check.copy.status()].name() : check.copy.status().name();
+     msg += '\n';
+     msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.copy_status.error', [copy_status]);
+     msg += '\n';
+     msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.route_to.msg', [check.route_to]);
+    break;
+   }
+   if (msg) {
+    error.yns_alert(
+     msg,
+     document.getElementById('circStrings').getString('staff.circ.alert'),
+     null,
+     document.getElementById('circStrings').getString('staff.circ.utils.msg.ok'),
+     null,
+     document.getElementById('circStrings').getString('staff.circ.confirm.msg')
+    );
+   }
+  } else /* ROUTE_ITEM */ if (check.ilsevent == 7000) {
+
+   var lib = data.hash.aou[ check.org ];
+   check.route_to = lib.shortname();
+   msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.route_to.destination', [check.route_to]);
+   msg += '\n\n';
+   msg += lib.name();
+   msg += '\n';
+   try {
+    if (lib.holds_address() ) {
+     var a = network.simple_request('FM_AOA_RETRIEVE',[ lib.holds_address() ]);
+     if (typeof a.ilsevent != 'undefined') throw(a);
+     if (a.street1()) msg += a.street1() + '\n';
+     if (a.street2()) msg += a.street2() + '\n';
+     msg += (a.city() ? a.city() + ', ' : '') + (a.state() ? a.state() + ' ' : '') + (a.post_code() ? a.post_code() : '') + '\n';
+    } else {
+     msg += document.getElementById('circStrings').getString('staff.circ.utils.route_to.no_address');
+     msg += '\n';
+    }
+   } catch(E) {
+    msg += document.getElementById('circStrings').getString('staff.circ.utils.route_to.no_address.error');
+    msg += '\n';
+    error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.utils.route_to.no_address.error'), E);
+   }
+   msg += '\n';
+   msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.barcode', [check.payload.copy.barcode()]);
+   msg += '\n';
+   var payload_title  = (check.payload.record ? check.payload.record.title() : check.payload.copy.dummy_title() );
+   msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.title', [payload_title]);
+   msg += '\n';
+   var payload_author = (check.payload.record ? check.payload.record.author() :check.payload.copy.dummy_author());
+   msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.author', [payload_author]);
+   msg += '\n';
+   JSAN.use('util.date');
+   if (check.payload.hold) {
+    JSAN.use('patron.util');
+    var au_obj = patron.util.retrieve_fleshed_au_via_id( session, check.payload.hold.usr() );
+    msg += '\n';
                 if (au_obj.alias()) {
                     msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.patron_alias',  [au_obj.alias()]);
                 } else {
-    				msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.patron', [au_obj.family_name(), au_obj.first_given_name(), au_obj.second_given_name()]);
+        msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.patron', [au_obj.family_name(), au_obj.first_given_name(), au_obj.second_given_name()]);
                 }
-				msg += '\n';
-				msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.barcode', [au_obj.card().barcode()]);
-				msg += '\n';
-				if (check.payload.hold.phone_notify()) {
-					msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.phone_notify', [check.payload.hold.phone_notify()]);
-					msg += '\n';
-				}
-				if (get_bool(check.payload.hold.email_notify())) {
-					var payload_email = au_obj.email() ? au_obj.email() : '';
-					msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.email_notify', [payload_email]);
-					msg += '\n';
-				}
-				msg += '\n';
-				msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.request_date', [util.date.formatted_date(check.payload.hold.request_time(),'%F')]);
-				msg += '\n';
-			}
-			var rv = 0;
-			msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.slip_date', [util.date.formatted_date(new Date(),'%F')]);
-			if (!auto_print) {
-				rv = error.yns_alert_formatted(
-					msg,
-					document.getElementById('circStrings').getString('staff.circ.utils.transit_slip'),
-					document.getElementById('circStrings').getString('staff.circ.utils.transit_slip.print.yes'),
-					document.getElementById('circStrings').getString('staff.circ.utils.transit_slip.print.no'),
-					null,
-					document.getElementById('circStrings').getString('staff.circ.confirm.msg'),
-					'/xul/server/skin/media/images/turtle.gif'
-				);
-			}
-
-			if (rv == 0) {
-				try {
-					JSAN.use('util.print'); var print = new util.print();
-					//print.simple( msg, { 'no_prompt' : true, 'content_type' : 'text/plain' } );
-					msg = msg.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\n/g,'<br/>');
-					print.simple( msg , { 'no_prompt' : true, 'content_type' : 'text/html' } );
-				} catch(E) {
-					var err_msg = document.getElementById('commonStrings').getString('common.error');
-					err_msg += '\nFIXME: ' + E + '\n';
-					dump(err_msg);
-					alert(err_msg);
-				}
-			}
-			if (document.getElementById('no_change_label')) {
-				var m = document.getElementById('no_change_label').getAttribute('value');
-				var trans_msg = document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.in_transit', [params.barcode]);
-				document.getElementById('no_change_label').setAttribute('value', m + trans_msg + '  ');
-				document.getElementById('no_change_label').setAttribute('hidden','false');
-			}
-
-		} else /* ASSET_COPY_NOT_FOUND */ if (check.ilsevent == 1502) {
-
-			check.route_to = 'CATALOGING';
-			var mis_scan_msg = document.getElementById('circStrings').getFormattedString('staff.circ.copy_status.status.copy_not_found', [params.barcode]);
-			error.yns_alert(
-				mis_scan_msg,
-				document.getElementById('circStrings').getString('staff.circ.alert'),
-				null,
-				document.getElementById('circStrings').getString('staff.circ.utils.msg.ok'),
-				null,
-				document.getElementById('circStrings').getString('staff.circ.confirm.msg')
-			);
-			if (document.getElementById('no_change_label')) {
-				var m = document.getElementById('no_change_label').getAttribute('value');
-				document.getElementById('no_change_label').setAttribute('value',m + mis_scan_msg + '  ');
-				document.getElementById('no_change_label').setAttribute('hidden','false');
-			}
-
-		} else /* HOLD_CAPTURE_DELAYED */ if (check.ilsevent == 7019) {
-
-			var rv = 0;
-			msg += document.getElementById('circStrings').getString('staff.circ.utils.hold_capture_delayed.description');
-			rv = error.yns_alert_formatted(
-				msg,
-				document.getElementById('circStrings').getString('staff.circ.utils.hold_capture_delayed.titlebar'),
-				document.getElementById('circStrings').getString('staff.circ.utils.hold_capture_delayed.prompt_for_nocapture'),
-				document.getElementById('circStrings').getString('staff.circ.utils.hold_capture_delayed.prompt_for_capture'),
-				null,
-				document.getElementById('circStrings').getString('staff.circ.confirm.msg'),
-				'/xul/server/skin/media/images/stop_sign.png'
-			);
-			params.capture = rv == 0 ? 'nocapture' : 'capture';
-
-			return circ.util.checkin_via_barcode(session,params,backdate,auto_print,false); 
-
-		} else /* NETWORK TIMEOUT */ if (check.ilsevent == -1) {
-			error.standard_network_error_alert(document.getElementById('circStrings').getString('staff.circ.checkin.suggest_offline'));
-		} else {
+    msg += '\n';
+    msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.barcode', [au_obj.card().barcode()]);
+    msg += '\n';
+    if (check.payload.hold.phone_notify()) {
+     msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.phone_notify', [check.payload.hold.phone_notify()]);
+     msg += '\n';
+    }
+    if (get_bool(check.payload.hold.email_notify())) {
+     var payload_email = au_obj.email() ? au_obj.email() : '';
+     msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.email_notify', [payload_email]);
+     msg += '\n';
+    }
+    msg += '\n';
+    msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.request_date', [util.date.formatted_date(check.payload.hold.request_time(),'%F')]);
+    msg += '\n';
+   }
+   var rv = 0;
+   msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.slip_date', [util.date.formatted_date(new Date(),'%F')]);
+   if (!auto_print) {
+    rv = error.yns_alert_formatted(
+     msg,
+     document.getElementById('circStrings').getString('staff.circ.utils.transit_slip'),
+     document.getElementById('circStrings').getString('staff.circ.utils.transit_slip.print.yes'),
+     document.getElementById('circStrings').getString('staff.circ.utils.transit_slip.print.no'),
+     null,
+     document.getElementById('circStrings').getString('staff.circ.confirm.msg'),
+     '/xul/server/skin/media/images/turtle.gif'
+    );
+   }
+
+   if (rv == 0) {
+    try {
+     JSAN.use('util.print'); var print = new util.print();
+     //print.simple( msg, { 'no_prompt' : true, 'content_type' : 'text/plain' } );
+     msg = msg.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\n/g,'<br/>');
+     print.simple( msg , { 'no_prompt' : true, 'content_type' : 'text/html' } );
+    } catch(E) {
+     var err_msg = document.getElementById('commonStrings').getString('common.error');
+     err_msg += '\nFIXME: ' + E + '\n';
+     dump(err_msg);
+     alert(err_msg);
+    }
+   }
+   if (document.getElementById('no_change_label')) {
+    var m = document.getElementById('no_change_label').getAttribute('value');
+    var trans_msg = document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.in_transit', [params.barcode]);
+    document.getElementById('no_change_label').setAttribute('value', m + trans_msg + '  ');
+    document.getElementById('no_change_label').setAttribute('hidden','false');
+   }
+
+  } else /* ASSET_COPY_NOT_FOUND */ if (check.ilsevent == 1502) {
+
+   check.route_to = 'CATALOGING';
+   var mis_scan_msg = document.getElementById('circStrings').getFormattedString('staff.circ.copy_status.status.copy_not_found', [params.barcode]);
+   error.yns_alert(
+    mis_scan_msg,
+    document.getElementById('circStrings').getString('staff.circ.alert'),
+    null,
+    document.getElementById('circStrings').getString('staff.circ.utils.msg.ok'),
+    null,
+    document.getElementById('circStrings').getString('staff.circ.confirm.msg')
+   );
+   if (document.getElementById('no_change_label')) {
+    var m = document.getElementById('no_change_label').getAttribute('value');
+    document.getElementById('no_change_label').setAttribute('value',m + mis_scan_msg + '  ');
+    document.getElementById('no_change_label').setAttribute('hidden','false');
+   }
+
+  } else /* HOLD_CAPTURE_DELAYED */ if (check.ilsevent == 7019) {
+
+   var rv = 0;
+   msg += document.getElementById('circStrings').getString('staff.circ.utils.hold_capture_delayed.description');
+   rv = error.yns_alert_formatted(
+    msg,
+    document.getElementById('circStrings').getString('staff.circ.utils.hold_capture_delayed.titlebar'),
+    document.getElementById('circStrings').getString('staff.circ.utils.hold_capture_delayed.prompt_for_nocapture'),
+    document.getElementById('circStrings').getString('staff.circ.utils.hold_capture_delayed.prompt_for_capture'),
+    null,
+    document.getElementById('circStrings').getString('staff.circ.confirm.msg'),
+    '/xul/server/skin/media/images/stop_sign.png'
+   );
+   params.capture = rv == 0 ? 'nocapture' : 'capture';
+
+   return circ.util.checkin_via_barcode(session,params,backdate,auto_print,false); 
+
+  } else /* NETWORK TIMEOUT */ if (check.ilsevent == -1) {
+   error.standard_network_error_alert(document.getElementById('circStrings').getString('staff.circ.checkin.suggest_offline'));
+  } else {
 
             if (check.ilsevent == null) { return null; /* handled */ }
-			switch (Number(check.ilsevent)) {
-				case 1203 /* COPY_BAD_STATUS */ :
-				case 1213 /* PATRON_BARRED */ :
-				case 1217 /* PATRON_INACTIVE */ :
-				case 1224 /* PATRON_ACCOUNT_EXPIRED */ :
-				case 1234 /* ITEM_DEPOSIT_PAID */ :
-				case 7009 /* CIRC_CLAIMS_RETURNED */ :
-				case 7010 /* COPY_ALERT_MESSAGE */ :
-				case 7011 /* COPY_STATUS_LOST */ :
-				case 7012 /* COPY_STATUS_MISSING */ :
-				case 7013 /* PATRON_EXCEEDS_FINES */ :
-					return null; /* handled */
-				break;
-			}
-
-			throw(check);
-
-		}
-
-		return check;
-	} catch(E) {
-		JSAN.use('util.error'); var error = new util.error();
-		error.standard_unexpected_error_alert(document.getElementById('circStrings').getFormattedString('staff.circ.checkin.error', ['3']), E);
-		return null;
-	}
+   switch (Number(check.ilsevent)) {
+    case 1203 /* COPY_BAD_STATUS */ :
+    case 1213 /* PATRON_BARRED */ :
+    case 1217 /* PATRON_INACTIVE */ :
+    case 1224 /* PATRON_ACCOUNT_EXPIRED */ :
+    case 1234 /* ITEM_DEPOSIT_PAID */ :
+    case 7009 /* CIRC_CLAIMS_RETURNED */ :
+    case 7010 /* COPY_ALERT_MESSAGE */ :
+    case 7011 /* COPY_STATUS_LOST */ :
+    case 7012 /* COPY_STATUS_MISSING */ :
+    case 7013 /* PATRON_EXCEEDS_FINES */ :
+     return null; /* handled */
+    break;
+   }
+
+   throw(check);
+
+  }
+
+  return check;
+ } catch(E) {
+  JSAN.use('util.error'); var error = new util.error();
+  error.standard_unexpected_error_alert(document.getElementById('circStrings').getFormattedString('staff.circ.checkin.error', ['3']), E);
+  return null;
+ }
 };
 
 circ.util.renew_via_barcode = function ( barcode, patron_id, async ) {
-	try {
-		var obj = {};
-		JSAN.use('util.network'); obj.network = new util.network();
-		JSAN.use('OpenILS.data'); obj.data = new OpenILS.data(); obj.data.stash_retrieve();
-
-		var params = { barcode: barcode };
-		if (patron_id) params.patron = patron_id;
-
-		function renew_callback(req) {
-			try {
-				var renew = req.getResultObject();
-				if (typeof renew.ilsevent != 'undefined') renew = [ renew ];
-				for (var j = 0; j < renew.length; j++) {
-					switch(renew[j].ilsevent == null ? null : Number(renew[j].ilsevent)) {
-						case 0 /* SUCCESS */ : break;
-						case null /* custom event */ : break;
-						case 5000 /* PERM_FAILURE */: break;
-						case 1212 /* PATRON_EXCEEDS_OVERDUE_COUNT */ : break;
-						case 1213 /* PATRON_BARRED */ : break;
-						case 1215 /* CIRC_EXCEEDS_COPY_RANGE */ : break;
-						case 1224 /* PATRON_ACCOUNT_EXPIRED */ : break;
+ try {
+  var obj = {};
+  JSAN.use('util.network'); obj.network = new util.network();
+  JSAN.use('OpenILS.data'); obj.data = new OpenILS.data(); obj.data.stash_retrieve();
+
+  var params = { barcode: barcode };
+  if (patron_id) params.patron = patron_id;
+
+  function renew_callback(req) {
+   try {
+    var renew = req.getResultObject();
+    if (typeof renew.ilsevent != 'undefined') renew = [ renew ];
+    for (var j = 0; j < renew.length; j++) {
+     switch(renew[j].ilsevent == null ? null : Number(renew[j].ilsevent)) {
+      case 0 /* SUCCESS */ : break;
+      case null /* custom event */ : break;
+      case 5000 /* PERM_FAILURE */: break;
+      case 1212 /* PATRON_EXCEEDS_OVERDUE_COUNT */ : break;
+      case 1213 /* PATRON_BARRED */ : break;
+      case 1215 /* CIRC_EXCEEDS_COPY_RANGE */ : break;
+      case 1224 /* PATRON_ACCOUNT_EXPIRED */ : break;
                         case 1232 /* ITEM_DEPOSIT_REQUIRED */ : break;
                         case 1233 /* ITEM_RENTAL_FEE_REQUIRED */ : break;
-					    case 1234 /* ITEM_DEPOSIT_PAID */ : break;
-						case 1500 /* ACTION_CIRCULATION_NOT_FOUND */ : break;
-						case 7002 /* PATRON_EXCEEDS_CHECKOUT_COUNT */ : break;
-						case 7003 /* COPY_CIRC_NOT_ALLOWED */ : break;
-						case 7004 /* COPY_NOT_AVAILABLE */ : break;
-						case 7006 /* COPY_IS_REFERENCE */ : break;
-						case 7007 /* COPY_NEEDED_FOR_HOLD */ : break;
-						case 7008 /* MAX_RENEWALS_REACHED */ : break;
-						case 7009 /* CIRC_CLAIMS_RETURNED */ : break;
-						case 7010 /* COPY_ALERT_MESSAGE */ : break;
-						case 7013 /* PATRON_EXCEEDS_FINES */ : break;
-						default:
-							throw(renew);
-						break;
-					}
-				}
-				if (typeof async == 'function') async(renew);
-				return renew;
-			} catch(E) {
-				JSAN.use('util.error'); var error = new util.error();
-				error.standard_unexpected_error_alert(document.getElementById('circStrings').getFormattedString('staff.circ.checkin.renew_failed.error', [barcode]), E);
-				return null;
-			}
-		}
-
-		var renew = obj.network.simple_request(
-			'CHECKOUT_RENEW',
-			[ ses(), params ],
-			async ? renew_callback : null,
-			{
-				'title' : document.getElementById('circStrings').getString('staff.circ.checkin.renew_failed.override'),
-				'overridable_events' : [
+         case 1234 /* ITEM_DEPOSIT_PAID */ : break;
+      case 1500 /* ACTION_CIRCULATION_NOT_FOUND */ : break;
+      case 7002 /* PATRON_EXCEEDS_CHECKOUT_COUNT */ : break;
+      case 7003 /* COPY_CIRC_NOT_ALLOWED */ : break;
+      case 7004 /* COPY_NOT_AVAILABLE */ : break;
+      case 7006 /* COPY_IS_REFERENCE */ : break;
+      case 7007 /* COPY_NEEDED_FOR_HOLD */ : break;
+      case 7008 /* MAX_RENEWALS_REACHED */ : break;
+      case 7009 /* CIRC_CLAIMS_RETURNED */ : break;
+      case 7010 /* COPY_ALERT_MESSAGE */ : break;
+      case 7013 /* PATRON_EXCEEDS_FINES */ : break;
+      default:
+       throw(renew);
+      break;
+     }
+    }
+    if (typeof async == 'function') async(renew);
+    return renew;
+   } catch(E) {
+    JSAN.use('util.error'); var error = new util.error();
+    error.standard_unexpected_error_alert(document.getElementById('circStrings').getFormattedString('staff.circ.checkin.renew_failed.error', [barcode]), E);
+    return null;
+   }
+  }
+
+  var renew = obj.network.simple_request(
+   'CHECKOUT_RENEW',
+   [ ses(), params ],
+   async ? renew_callback : null,
+   {
+    'title' : document.getElementById('circStrings').getString('staff.circ.checkin.renew_failed.override'),
+    'overridable_events' : [
                     null /* custom event */,
-					1212 /* PATRON_EXCEEDS_OVERDUE_COUNT */,
-					1213 /* PATRON_BARRED */,
-					1215 /* CIRC_EXCEEDS_COPY_RANGE */,
+     1212 /* PATRON_EXCEEDS_OVERDUE_COUNT */,
+     1213 /* PATRON_BARRED */,
+     1215 /* CIRC_EXCEEDS_COPY_RANGE */,
                     1232 /* ITEM_DEPOSIT_REQUIRED */,
                     1233 /* ITEM_RENTAL_FEE_REQUIRED */,
-					1234 /* ITEM_DEPOSIT_PAID */,
-					7002 /* PATRON_EXCEEDS_CHECKOUT_COUNT */,
-					7003 /* COPY_CIRC_NOT_ALLOWED */,
-					7004 /* COPY_NOT_AVAILABLE */,
-					7006 /* COPY_IS_REFERENCE */,
-					7007 /* COPY_NEEDED_FOR_HOLD */,
-					7008 /* MAX_RENEWALS_REACHED */,
-					7009 /* CIRC_CLAIMS_RETURNED */,
-					7010 /* COPY_ALERT_MESSAGE */,
-					7013 /* PATRON_EXCEEDS_FINES */,
-				],
-				'text' : {
-					'1212' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); },
-					'1213' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); },
-					'1215' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); },
+     1234 /* ITEM_DEPOSIT_PAID */,
+     7002 /* PATRON_EXCEEDS_CHECKOUT_COUNT */,
+     7003 /* COPY_CIRC_NOT_ALLOWED */,
+     7004 /* COPY_NOT_AVAILABLE */,
+     7006 /* COPY_IS_REFERENCE */,
+     7007 /* COPY_NEEDED_FOR_HOLD */,
+     7008 /* MAX_RENEWALS_REACHED */,
+     7009 /* CIRC_CLAIMS_RETURNED */,
+     7010 /* COPY_ALERT_MESSAGE */,
+     7013 /* PATRON_EXCEEDS_FINES */,
+    ],
+    'text' : {
+     '1212' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); },
+     '1213' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); },
+     '1215' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); },
                     '1232' : function(r) {
                         return document.getElementById('circStrings').getFormattedString('staff.circ.renew.override.item_deposit_required.warning.barcode', [barcode]);
                     },
                     '1233' : function(r) {
                         return document.getElementById('circStrings').getFormattedString('staff.circ.renew.override.item_rental_fee_required.warning.barcode', [barcode]);
                     },
-					'1234' : function(r) {
-						return document.getElementById('circStrings').getFormattedString('staff.circ.utils.checkin.override.item_deposit_paid.warning');
-					},
-					'7002' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); },
-					'7003' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); },
-					'7004' : function(r) {
-						return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode.status', [barcode, typeof r.payload.status() == 'object' ? r.payload.status().name() : obj.data.hash.ccs[ r.payload.status() ].name()]);
-					},
-					'7006' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); },
-					'7007' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); },
-					'7008' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); },
-					'7009' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); },
-					'7010' : function(r) {
-						return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode.msg', [barcode, r.payload]);
-					},
-					'7013' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); }
-				}
-			}
-		);
-		if (! async ) {
-			return renew_callback( { 'getResultObject' : function() { return renew; } } );
-		}
-
-	} catch(E) {
-		JSAN.use('util.error'); var error = new util.error();
-		error.standard_unexpected_error_alert(document.getElementById('circStrings').getFormattedString('staff.circ.checkin.renew_failed.error', [barcode]), E);
-		return null;
-	}
+     '1234' : function(r) {
+      return document.getElementById('circStrings').getFormattedString('staff.circ.utils.checkin.override.item_deposit_paid.warning');
+     },
+     '7002' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); },
+     '7003' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); },
+     '7004' : function(r) {
+      return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode.status', [barcode, typeof r.payload.status() == 'object' ? r.payload.status().name() : obj.data.hash.ccs[ r.payload.status() ].name()]);
+     },
+     '7006' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); },
+     '7007' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); },
+     '7008' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); },
+     '7009' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); },
+     '7010' : function(r) {
+      return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode.msg', [barcode, r.payload]);
+     },
+     '7013' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); }
+    }
+   }
+  );
+  if (! async ) {
+   return renew_callback( { 'getResultObject' : function() { return renew; } } );
+  }
+
+ } catch(E) {
+  JSAN.use('util.error'); var error = new util.error();
+  error.standard_unexpected_error_alert(document.getElementById('circStrings').getFormattedString('staff.circ.checkin.renew_failed.error', [barcode]), E);
+  return null;
+ }
 };
 
 dump('exiting circ/util.js\n');
diff --git a/Open-ILS/xul/staff_client/server/index.xhtml b/Open-ILS/xul/staff_client/server/index.xhtml
index 99f694ab20..bdc117e1da 100644
--- a/Open-ILS/xul/staff_client/server/index.xhtml
+++ b/Open-ILS/xul/staff_client/server/index.xhtml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <html xmlns='http://www.w3.org/1999/xhtml'>
diff --git a/Open-ILS/xul/staff_client/server/main/data.xul b/Open-ILS/xul/staff_client/server/main/data.xul
index 3b128e4cf2..f7032e4788 100644
--- a/Open-ILS/xul/staff_client/server/main/data.xul
+++ b/Open-ILS/xul/staff_client/server/main/data.xul
@@ -24,7 +24,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -32,161 +32,161 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="data_win" 
-	onload="try { data_init(); } catch(E) { alert(E); }"
-	title="&staff.auth.title;"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
-	<scripts id="openils_util_scripts"/>
-
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-
-		function data_init() {
-
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-			if (typeof JSAN == 'undefined') {
-				throw(document.getElementById("commonStrings").getString('common.jsan.missing'));
-			}
-			/////////////////////////////////////////////////////////////////////////////
-
-			JSAN.errorLevel = "die"; // none, warn, or die
-			JSAN.addRepository('/xul/server/');
-
-			function cache_me(msg,how) {
-				try {
-					switch(how) {
-						case 'jsan' : JSAN.use(msg); break;
-						case 'http' :
-							var x = new XMLHttpRequest();
-							x.open("GET",msg,true);
-							x.send(null);
-						break;
-					}
-					dump(msg + '\n');
-					var x = document.getElementById('data_progress');
-					if (x) {
-						x.appendChild( document.createTextNode( msg + ' ') );
-					}
-				} catch(E) {
-					dump(msg + '\n' + E);
-				}
-			}
-
-			// load these just so they'll get cached
-			//cache_me('/xul/server//util/exec.js','http');
-			//cache_me('/xul/server//util/barcode.js','http');  
-			//cache_me('/xul/server//util/controller.js','http');  
-			//cache_me('/xul/server//util/deck.js','http');  
-			//cache_me('/xul/server//util/fm_utils.js','http');  
-			//cache_me('/xul/server//util/list.js','http');  
-			//cache_me('/xul/server//util/network.js','http'); 
-			//cache_me('/xul/server//util/sound.js','http'); 
-			//cache_me('/xul/server//util/widgets.js','http');  
-			//cache_me('/xul/server//util/browser.js','http');  
-			//cache_me('/xul/server//util/error.js','http');  
-			//cache_me('/xul/server//util/file.js','http'); 
-			//cache_me('/xul/server//util/functional.js','http');  
-			//cache_me('/xul/server//util/money.js','http');  
-			//cache_me('/xul/server//util/print.js','http');  
-			//cache_me('/xul/server//util/text.js','http'); 
-			//cache_me('/xul/server//util/window.js','http'); 
-
-			cache_me('/xul/server/util/fancy_prompt.xul','http');
-			//cache_me('/xul/server/util/browser.xul','http');
-			//cache_me('/xul/server/util/rbrowser.xul','http');
-
-			//cache_me('/xul/server//patron/display.js','http');  
-			//cache_me('/xul/server//patron/bills.js','http');  
-			//cache_me('/xul/server//patron/holds.js','http');  
-			//cache_me('/xul/server//patron/items.js','http'); 
-			//cache_me('/xul/server//patron/search_form.js','http');  
-			//cache_me('/xul/server//patron/search_result.js','http');  
-			//cache_me('/xul/server//patron/summary.js','http'); 
-			//cache_me('/xul/server//patron/util.js','http'); 
-
-			//cache_me('/xul/server/patron/display.xul','http');  
-			//cache_me('/xul/server/patron/display_overlay.xul','http');  
-			//cache_me('/xul/server/patron/bills.xul','http');  
-			//cache_me('/xul/server/patron/bills_overlay.xul','http');  
-			//cache_me('/xul/server/patron/holds.xul','http');  
-			//cache_me('/xul/server/patron/holds_overlay.xul','http');  
-			//cache_me('/xul/server/patron/items.xul','http'); 
-			//cache_me('/xul/server/patron/items_overlay.xul','http'); 
-			//cache_me('/xul/server/patron/search_form.xul','http');  
-			//cache_me('/xul/server/patron/search_form_overlay.xul','http');  
-			//cache_me('/xul/server/patron/search_result.xul','http');  
-			//cache_me('/xul/server/patron/search_result_overlay.xul','http');  
-			//cache_me('/xul/server/patron/summary.xul','http'); 
-			//cache_me('/xul/server/patron/summary_overlay.xul','http'); 
-			//cache_me('/xul/server/patron/barcode_entry.xul','http');
-
-			//cache_me('/xul/server/patron/ue.xhtml','http');
-			//cache_me('/xul/server/admin/adminlib.js','http');
-			//cache_me('/xul/server/admin/admin.css','http');
-			//cache_me('/xul/server/patron/ue_config.js','http');
-			//cache_me('/xul/server/patron/ue_ui.js','http');
-			//cache_me('/xul/server/patron/ue.js','http');
-			//cache_me('/opac/common/js//config.js','http');
-			//cache_me('/opac/common/js/Cookie.js','http');
-			//cache_me('/opac/common/js/Cookies.js','http');
-			//cache_me('/opac/common/js/opac_utils.js','http');
-			//cache_me('/opac/common/js/init.js','http');
-			//cache_me('/opac/common/js/jscalendar/calendar-brown.css','http');
-			//cache_me('/opac/common/js/jscalendar/calendar.js','http');
-			//cache_me('/opac/common/js/jscalendar/lang/calendar-en.js','http');
-			//cache_me('/opac/common/js/jscalendar/calendar-setup.js','http');
-			//cache_me('/opac/common/js/jscalendar/img.gif','http');
-
-			//cache_me('/xul/server/skin/media/images/stop_sign.png','http');
-			//cache_me('/xul/server/skin/media/images/bad_barcode.png','http');
-			//cache_me('/xul/server/skin/media/images/grinder.gif','http');     
-			//cache_me('/xul/server/skin/media/images/patron_left_arrow.png','http');
-			//cache_me('/xul/server/skin/media/images/skull.png','http');
-			//cache_me('/xul/server/skin/media/images/tools.png','http');
-			//cache_me('/xul/server/skin/media/images/up_arrow.gif','http');
-			//cache_me('/xul/server/skin/media/images/book_question.png','http');
-			//cache_me('/xul/server/skin/media/images/down_arrow.gif','http');
-			//cache_me('/xul/server/skin/media/images/icon_delete.gif','http');
-			//cache_me('/xul/server/skin/media/images/patron_right_arrow.png','http');
-			//cache_me('/xul/server/skin/media/images/turtle.gif','http');
-			//cache_me('/xul/server/skin/media/audio/bonus.wav','http');
-			//cache_me('/xul/server/skin/media/audio/question.wav','http');
-			//cache_me('/xul/server/skin/media/audio/redalert.wav','http');
-			//cache_me('/xul/server/skin/media/audio/toggled.wav','http');
-
-			//cache_me('/xul/server//circ/checkin.js','http');  
-			//cache_me('/xul/server//circ/checkout.js','http');  
-			//cache_me('/xul/server//circ/copy_status.js','http'); 
-			//cache_me('/xul/server//circ/hold_capture.js','http'); 
-			//cache_me('/xul/server//circ/in_house_use.js','http');  
-			//cache_me('/xul/server//circ/util.js','http'); 
-
-			//cache_me('/xul/server/circ/checkout_overlay.xul','http');
-			//cache_me('/xul/server/circ/checkout.xul','http');
-			//cache_me('/xul/server/circ/checkin_overlay.xul','http');
-			//cache_me('/xul/server/circ/checkin.xul','http');
-			//cache_me('/xul/server/circ/circ_brief.xul','http');
-			//cache_me('/xul/server/circ/circ_summary.xul','http');
-			//cache_me('/xul/server/circ/copy_status.xul','http');
-			//cache_me('/xul/server/circ/copy_status_overlay.xul','http');
-
-			// ----
+ onload="try { data_init(); } catch(E) { alert(E); }"
+ title="&staff.auth.title;"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
+ <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
+ <scripts id="openils_util_scripts"/>
+
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+
+  function data_init() {
+
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
+   if (typeof JSAN == 'undefined') {
+    throw(document.getElementById("commonStrings").getString('common.jsan.missing'));
+   }
+   /////////////////////////////////////////////////////////////////////////////
+
+   JSAN.errorLevel = "die"; // none, warn, or die
+   JSAN.addRepository('/xul/server/');
+
+   function cache_me(msg,how) {
+    try {
+     switch(how) {
+      case 'jsan' : JSAN.use(msg); break;
+      case 'http' :
+       var x = new XMLHttpRequest();
+       x.open("GET",msg,true);
+       x.send(null);
+      break;
+     }
+     dump(msg + '\n');
+     var x = document.getElementById('data_progress');
+     if (x) {
+      x.appendChild( document.createTextNode( msg + ' ') );
+     }
+    } catch(E) {
+     dump(msg + '\n' + E);
+    }
+   }
+
+   // load these just so they'll get cached
+   //cache_me('/xul/server//util/exec.js','http');
+   //cache_me('/xul/server//util/barcode.js','http');  
+   //cache_me('/xul/server//util/controller.js','http');  
+   //cache_me('/xul/server//util/deck.js','http');  
+   //cache_me('/xul/server//util/fm_utils.js','http');  
+   //cache_me('/xul/server//util/list.js','http');  
+   //cache_me('/xul/server//util/network.js','http'); 
+   //cache_me('/xul/server//util/sound.js','http'); 
+   //cache_me('/xul/server//util/widgets.js','http');  
+   //cache_me('/xul/server//util/browser.js','http');  
+   //cache_me('/xul/server//util/error.js','http');  
+   //cache_me('/xul/server//util/file.js','http'); 
+   //cache_me('/xul/server//util/functional.js','http');  
+   //cache_me('/xul/server//util/money.js','http');  
+   //cache_me('/xul/server//util/print.js','http');  
+   //cache_me('/xul/server//util/text.js','http'); 
+   //cache_me('/xul/server//util/window.js','http'); 
+
+   cache_me('/xul/server/util/fancy_prompt.xul','http');
+   //cache_me('/xul/server/util/browser.xul','http');
+   //cache_me('/xul/server/util/rbrowser.xul','http');
+
+   //cache_me('/xul/server//patron/display.js','http');  
+   //cache_me('/xul/server//patron/bills.js','http');  
+   //cache_me('/xul/server//patron/holds.js','http');  
+   //cache_me('/xul/server//patron/items.js','http'); 
+   //cache_me('/xul/server//patron/search_form.js','http');  
+   //cache_me('/xul/server//patron/search_result.js','http');  
+   //cache_me('/xul/server//patron/summary.js','http'); 
+   //cache_me('/xul/server//patron/util.js','http'); 
+
+   //cache_me('/xul/server/patron/display.xul','http');  
+   //cache_me('/xul/server/patron/display_overlay.xul','http');  
+   //cache_me('/xul/server/patron/bills.xul','http');  
+   //cache_me('/xul/server/patron/bills_overlay.xul','http');  
+   //cache_me('/xul/server/patron/holds.xul','http');  
+   //cache_me('/xul/server/patron/holds_overlay.xul','http');  
+   //cache_me('/xul/server/patron/items.xul','http'); 
+   //cache_me('/xul/server/patron/items_overlay.xul','http'); 
+   //cache_me('/xul/server/patron/search_form.xul','http');  
+   //cache_me('/xul/server/patron/search_form_overlay.xul','http');  
+   //cache_me('/xul/server/patron/search_result.xul','http');  
+   //cache_me('/xul/server/patron/search_result_overlay.xul','http');  
+   //cache_me('/xul/server/patron/summary.xul','http'); 
+   //cache_me('/xul/server/patron/summary_overlay.xul','http'); 
+   //cache_me('/xul/server/patron/barcode_entry.xul','http');
+
+   //cache_me('/xul/server/patron/ue.xhtml','http');
+   //cache_me('/xul/server/admin/adminlib.js','http');
+   //cache_me('/xul/server/admin/admin.css','http');
+   //cache_me('/xul/server/patron/ue_config.js','http');
+   //cache_me('/xul/server/patron/ue_ui.js','http');
+   //cache_me('/xul/server/patron/ue.js','http');
+   //cache_me('/opac/common/js//config.js','http');
+   //cache_me('/opac/common/js/Cookie.js','http');
+   //cache_me('/opac/common/js/Cookies.js','http');
+   //cache_me('/opac/common/js/opac_utils.js','http');
+   //cache_me('/opac/common/js/init.js','http');
+   //cache_me('/opac/common/js/jscalendar/calendar-brown.css','http');
+   //cache_me('/opac/common/js/jscalendar/calendar.js','http');
+   //cache_me('/opac/common/js/jscalendar/lang/calendar-en.js','http');
+   //cache_me('/opac/common/js/jscalendar/calendar-setup.js','http');
+   //cache_me('/opac/common/js/jscalendar/img.gif','http');
+
+   //cache_me('/xul/server/skin/media/images/stop_sign.png','http');
+   //cache_me('/xul/server/skin/media/images/bad_barcode.png','http');
+   //cache_me('/xul/server/skin/media/images/grinder.gif','http');     
+   //cache_me('/xul/server/skin/media/images/patron_left_arrow.png','http');
+   //cache_me('/xul/server/skin/media/images/skull.png','http');
+   //cache_me('/xul/server/skin/media/images/tools.png','http');
+   //cache_me('/xul/server/skin/media/images/up_arrow.gif','http');
+   //cache_me('/xul/server/skin/media/images/book_question.png','http');
+   //cache_me('/xul/server/skin/media/images/down_arrow.gif','http');
+   //cache_me('/xul/server/skin/media/images/icon_delete.gif','http');
+   //cache_me('/xul/server/skin/media/images/patron_right_arrow.png','http');
+   //cache_me('/xul/server/skin/media/images/turtle.gif','http');
+   //cache_me('/xul/server/skin/media/audio/bonus.wav','http');
+   //cache_me('/xul/server/skin/media/audio/question.wav','http');
+   //cache_me('/xul/server/skin/media/audio/redalert.wav','http');
+   //cache_me('/xul/server/skin/media/audio/toggled.wav','http');
+
+   //cache_me('/xul/server//circ/checkin.js','http');  
+   //cache_me('/xul/server//circ/checkout.js','http');  
+   //cache_me('/xul/server//circ/copy_status.js','http'); 
+   //cache_me('/xul/server//circ/hold_capture.js','http'); 
+   //cache_me('/xul/server//circ/in_house_use.js','http');  
+   //cache_me('/xul/server//circ/util.js','http'); 
+
+   //cache_me('/xul/server/circ/checkout_overlay.xul','http');
+   //cache_me('/xul/server/circ/checkout.xul','http');
+   //cache_me('/xul/server/circ/checkin_overlay.xul','http');
+   //cache_me('/xul/server/circ/checkin.xul','http');
+   //cache_me('/xul/server/circ/circ_brief.xul','http');
+   //cache_me('/xul/server/circ/circ_summary.xul','http');
+   //cache_me('/xul/server/circ/copy_status.xul','http');
+   //cache_me('/xul/server/circ/copy_status_overlay.xul','http');
+
+   // ----
 
             JSAN.use('util.error'); 
             g.error = new util.error();
-			JSAN.use('OpenILS.data');
-			g.data = new OpenILS.data()
+   JSAN.use('OpenILS.data');
+   g.data = new OpenILS.data()
 
-			g.data.session = {};
-			g.data.session.key = xulG.auth.session.key;
-			g.data.session.authtime = xulG.auth.session.authtime;
-			g.data.stash('session');
+   g.data.session = {};
+   g.data.session.key = xulG.auth.session.key;
+   g.data.session.authtime = xulG.auth.session.authtime;
+   g.data.stash('session');
             g.data.on_error = function(E) {
                 try {
                     g.error.standard_unexpected_error_alert('Error during login sequence.  The client will logout after this dialog.',E);
@@ -205,7 +205,7 @@
                 }
                 return false;
             }
-			g.data.on_complete = function () {
+   g.data.on_complete = function () {
 
                 try {
 
@@ -215,7 +215,7 @@
 
                     document.getElementById('iframe').setAttribute(
                         'src',
-                        urls.XUL_OFFLINE_GENERATE_WIDGETS	
+                        urls.XUL_OFFLINE_GENERATE_WIDGETS 
                     );
 
                     document.getElementById('caption').setAttribute('label', document.getElementById('commonStrings').getString('staff.main.data.loaded'));
@@ -225,11 +225,11 @@
                 } catch(E) {
                     alert(E);
                 }
-			}
+   }
 
             g.open_menu = function() {
                 try {
-			        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+           netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
                     var mframe = xulG.window.open(urls.XUL_MENU_FRAME
                         + '?server='+window.escape(xulG.url),
                         'main'+xulG.window.window_name_increment(),'chrome,resizable'
@@ -240,19 +240,19 @@
                 }
             }
 
-			g.data.init();
-	
-			g.data.init_observer_functions();
+   g.data.init();
+ 
+   g.data.init_observer_functions();
 
-		}
-	]]>
-	</script>
+  }
+ ]]>
+ </script>
 
-	<groupbox id="data_groupbox" flex="1" class="my_overflow"> 
-		<caption id="caption" label="&staff.main.data.loading;"/> 
-		<description id="data_progress"/>
-		<iframe id="iframe" />
-	</groupbox>
+ <groupbox id="data_groupbox" flex="1" class="my_overflow"> 
+  <caption id="caption" label="&staff.main.data.loading;"/> 
+  <description id="data_progress"/>
+  <iframe id="iframe" />
+ </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/main/gen_offline_widgets.xul b/Open-ILS/xul/staff_client/server/main/gen_offline_widgets.xul
index 478b5160b0..1680dac9b8 100644
--- a/Open-ILS/xul/staff_client/server/main/gen_offline_widgets.xul
+++ b/Open-ILS/xul/staff_client/server/main/gen_offline_widgets.xul
@@ -17,7 +17,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -25,33 +25,33 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="gen_offline_menus_win" 
-	onload="try { my_init(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
-	<scripts id="openils_util_scripts"/>
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
+ <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
+ <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
 
         function my_init() {
             netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
-			if (typeof JSAN == 'undefined') {
-				throw(document.getElementById('commonStrings').getString('common.jsan.missing'));
-			}
-			/////////////////////////////////////////////////////////////////////////////
+   if (typeof JSAN == 'undefined') {
+    throw(document.getElementById('commonStrings').getString('common.jsan.missing'));
+   }
+   /////////////////////////////////////////////////////////////////////////////
 
-			JSAN.errorLevel = "die"; // none, warn, or die
-			JSAN.addRepository('/xul/server/');
+   JSAN.errorLevel = "die"; // none, warn, or die
+   JSAN.addRepository('/xul/server/');
 
-			JSAN.use('util.error'); g.error = new util.error();
-			JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-			JSAN.use('util.network'); g.network = new util.network();
+   JSAN.use('util.error'); g.error = new util.error();
+   JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+   JSAN.use('util.network'); g.network = new util.network();
 
             gen_offline_menus_init();
 
@@ -60,189 +60,189 @@
             g.data.stash('user_org_unit_opt_in_enabled');
         }
 
-		function gen_offline_menus_init() {
-
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-			JSAN.use('util.functional');
-
-			save_object('offline_ou_list', build_ou_list());
-
-			save_object('offline_pgt_list', build_pgt_list());
-
-			save_object('offline_cit_list', build_cit_list());
-
-			save_object('offline_cnct_list', build_cnct_list());
-
-			save_object('offline_asv_list', build_asv_list());
-
-			var server_time = g.network.request('open-ils.actor','opensrf.system.time',[]);
-			var local_time = parseInt( new Date().getTime() / 1000 );
-
-			var delta = server_time - local_time;
-
-			JSAN.use('util.file'); var file = new util.file('pending_xacts');
-			if (file._file.exists()) {
-				file.close();
-			} else {
-				file.close();
-				save_object('offline_delta', [ delta ]);
-			}
-
-			save_object('print_list_templates',g.data.print_list_templates);
-
-			$('placeholder').setAttribute('value', document.getElementById('commonStrings').getString('staff.main.gen_offline_widgets.synced'));
-
-		}
-
-		function $(id) {
-			return document.getElementById(id);
-		}
-
-		function save_object(filename,obj) {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			JSAN.use('util.file'); var file = new util.file(filename);
-			file.set_object(obj); file.close();
-		}
-
-		function build_ou_list() {
-			JSAN.use('util.fm_utils');
-			return [
-				util.functional.map_list( 
-					/*util.fm_utils.flatten_ou_branch(g.data.tree.aou)*/ g.data.list.aou,
-					function(obj) { 
-						var sname = obj.shortname();
-						for (i = sname.length; i < 20; i++) {
-							sname += ' ';
-						}
-						return [ 
-							obj.name() ? sname + ' ' + obj.name() : obj.shortname(),
-							obj.id(), 
-							( ! get_bool( g.data.hash.aout[ obj.ou_type() ].can_have_users() ) ),
-							( g.data.hash.aout[ obj.ou_type() ].depth() * 2),
-						]; 
-					}
-				),
-				g.data.list.au[0].ws_ou()
-			];
-		}
-
-		function build_pgt_list() {
-			var list = []; var added = {};
-
-			function walk(n) {
-				if (
-					(n.application_perm() == 'group_application.user.patron') ||
-					(n.application_perm() == null) ||
-					(n.application_perm() == '')
-				) {
-					if (typeof added[n.id()] == 'undefined') {
-						list.push(n); added[n.id()] = true;
-						var children = n.children();
-						if (children) for (var i = 0; i < children.length; i++) {
-							walk(children[i]);
-						}
-					}
-				} else if (n.parent() == null) {
-					var children = n.children();
-					if (children) for (var i = 0; i < children.length; i++) {
-						walk(children[i]);
-					}
-				}
-			}
-
-			walk(g.data.tree.pgt);
-
-			return [
-				util.functional.map_list( 
-					list,
-					function(obj) { return [ 
-						obj.description() ? obj.name() + ' : ' + obj.description() : obj.name(), 
-						obj.id() 
-					]; }
-				)
-			];
-		}
-
-		function build_cit_list() {
-			return [
-				util.functional.map_list( 
-					g.data.list.cit,
-					function(obj) { return [ 
-						obj.name(), 
-						obj.id() 
-					]; }
-				)
-			];
-		}
-
-		function build_cnct_list() {
-			JSAN.use('util.fm_utils');
-			return [
-				util.functional.map_list(
-					util.functional.filter_list(
-						g.data.list.cnct,
-						function(o) {
-							return util.fm_utils.compare_aou_a_is_b_or_ancestor(o.owning_lib(), g.data.list.au[0].ws_ou());
-						}
-					).sort(
-
-						function(a,b) {
-							try { 
-								return util.fm_utils.sort_func_aou_by_depth_and_then_string(
-									[ a.owning_lib(), a.name() ],
-									[ b.owning_lib(), b.name() ]
-								);
-							} catch(E) {
-								alert(document.getElementById('commonStrings').getString('staff.main.gen_offline_widgets.noncat_sort.error') + E);
-								return 0;
-							}
-						}
-
-					),
-					function(o) {
-						return [ g.data.hash.aou[ o.owning_lib() ].shortname() + ' : ' + o.name(), js2JSON( [ o.id(), o.circ_duration() ] ) ];
-					}
-				)
-			];
-		}
-
-		function build_asv_list() {
-			var obj = {};
-			/* loop through required surveys */
-			for (var i = 0; i < g.data.list.my_asv.length; i++) {
-				dump('i = ' + i + '\n');
-				var survey = g.data.list.my_asv[i];
-				obj[ survey.name() ] = {};
-				obj[ survey.name() ][ 'description' ] = survey.description();
-				obj[ survey.name() ][ 'questions' ] = [];
-
-				/* loop through survey questions */
-				for (var j = 0; j < survey.questions().length; j++) {
-					dump('\tj = ' + j + '\n');
-					var question = survey.questions()[j];
-					var q = {};
-					q[ 'question' ] = question.question();
-					q[ 'answers' ] = util.functional.map_list( 
-						question.answers(),
-						function(obj) { return [ 
-							obj.answer(), 
-							'[' + obj.id() + ',' 
-							+ obj.question() + ',' 
-							+ question.survey() + ']'
-						]; }
-					);
-					obj[ survey.name() ][ 'questions' ].push( q );
-				}
-			}
-			return obj;
-		}
-
-	]]>
-	</script>
-
-	<vbox flex="1">
-		<label id="placeholder"/>
-	</vbox>
+  function gen_offline_menus_init() {
+
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
+   JSAN.use('util.functional');
+
+   save_object('offline_ou_list', build_ou_list());
+
+   save_object('offline_pgt_list', build_pgt_list());
+
+   save_object('offline_cit_list', build_cit_list());
+
+   save_object('offline_cnct_list', build_cnct_list());
+
+   save_object('offline_asv_list', build_asv_list());
+
+   var server_time = g.network.request('open-ils.actor','opensrf.system.time',[]);
+   var local_time = parseInt( new Date().getTime() / 1000 );
+
+   var delta = server_time - local_time;
+
+   JSAN.use('util.file'); var file = new util.file('pending_xacts');
+   if (file._file.exists()) {
+    file.close();
+   } else {
+    file.close();
+    save_object('offline_delta', [ delta ]);
+   }
+
+   save_object('print_list_templates',g.data.print_list_templates);
+
+   $('placeholder').setAttribute('value', document.getElementById('commonStrings').getString('staff.main.gen_offline_widgets.synced'));
+
+  }
+
+  function $(id) {
+   return document.getElementById(id);
+  }
+
+  function save_object(filename,obj) {
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   JSAN.use('util.file'); var file = new util.file(filename);
+   file.set_object(obj); file.close();
+  }
+
+  function build_ou_list() {
+   JSAN.use('util.fm_utils');
+   return [
+    util.functional.map_list( 
+     /*util.fm_utils.flatten_ou_branch(g.data.tree.aou)*/ g.data.list.aou,
+     function(obj) { 
+      var sname = obj.shortname();
+      for (i = sname.length; i < 20; i++) {
+       sname += ' ';
+      }
+      return [ 
+       obj.name() ? sname + ' ' + obj.name() : obj.shortname(),
+       obj.id(), 
+       ( ! get_bool( g.data.hash.aout[ obj.ou_type() ].can_have_users() ) ),
+       ( g.data.hash.aout[ obj.ou_type() ].depth() * 2),
+      ]; 
+     }
+    ),
+    g.data.list.au[0].ws_ou()
+   ];
+  }
+
+  function build_pgt_list() {
+   var list = []; var added = {};
+
+   function walk(n) {
+    if (
+     (n.application_perm() == 'group_application.user.patron') ||
+     (n.application_perm() == null) ||
+     (n.application_perm() == '')
+    ) {
+     if (typeof added[n.id()] == 'undefined') {
+      list.push(n); added[n.id()] = true;
+      var children = n.children();
+      if (children) for (var i = 0; i < children.length; i++) {
+       walk(children[i]);
+      }
+     }
+    } else if (n.parent() == null) {
+     var children = n.children();
+     if (children) for (var i = 0; i < children.length; i++) {
+      walk(children[i]);
+     }
+    }
+   }
+
+   walk(g.data.tree.pgt);
+
+   return [
+    util.functional.map_list( 
+     list,
+     function(obj) { return [ 
+      obj.description() ? obj.name() + ' : ' + obj.description() : obj.name(), 
+      obj.id() 
+     ]; }
+    )
+   ];
+  }
+
+  function build_cit_list() {
+   return [
+    util.functional.map_list( 
+     g.data.list.cit,
+     function(obj) { return [ 
+      obj.name(), 
+      obj.id() 
+     ]; }
+    )
+   ];
+  }
+
+  function build_cnct_list() {
+   JSAN.use('util.fm_utils');
+   return [
+    util.functional.map_list(
+     util.functional.filter_list(
+      g.data.list.cnct,
+      function(o) {
+       return util.fm_utils.compare_aou_a_is_b_or_ancestor(o.owning_lib(), g.data.list.au[0].ws_ou());
+      }
+     ).sort(
+
+      function(a,b) {
+       try { 
+        return util.fm_utils.sort_func_aou_by_depth_and_then_string(
+         [ a.owning_lib(), a.name() ],
+         [ b.owning_lib(), b.name() ]
+        );
+       } catch(E) {
+        alert(document.getElementById('commonStrings').getString('staff.main.gen_offline_widgets.noncat_sort.error') + E);
+        return 0;
+       }
+      }
+
+     ),
+     function(o) {
+      return [ g.data.hash.aou[ o.owning_lib() ].shortname() + ' : ' + o.name(), js2JSON( [ o.id(), o.circ_duration() ] ) ];
+     }
+    )
+   ];
+  }
+
+  function build_asv_list() {
+   var obj = {};
+   /* loop through required surveys */
+   for (var i = 0; i < g.data.list.my_asv.length; i++) {
+    dump('i = ' + i + '\n');
+    var survey = g.data.list.my_asv[i];
+    obj[ survey.name() ] = {};
+    obj[ survey.name() ][ 'description' ] = survey.description();
+    obj[ survey.name() ][ 'questions' ] = [];
+
+    /* loop through survey questions */
+    for (var j = 0; j < survey.questions().length; j++) {
+     dump('\tj = ' + j + '\n');
+     var question = survey.questions()[j];
+     var q = {};
+     q[ 'question' ] = question.question();
+     q[ 'answers' ] = util.functional.map_list( 
+      question.answers(),
+      function(obj) { return [ 
+       obj.answer(), 
+       '[' + obj.id() + ',' 
+       + obj.question() + ',' 
+       + question.survey() + ']'
+      ]; }
+     );
+     obj[ survey.name() ][ 'questions' ].push( q );
+    }
+   }
+   return obj;
+  }
+
+ ]]>
+ </script>
+
+ <vbox flex="1">
+  <label id="placeholder"/>
+ </vbox>
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/main/verify_credentials.js b/Open-ILS/xul/staff_client/server/main/verify_credentials.js
index 72c768b9ff..1e755c0f0b 100644
--- a/Open-ILS/xul/staff_client/server/main/verify_credentials.js
+++ b/Open-ILS/xul/staff_client/server/main/verify_credentials.js
@@ -12,7 +12,7 @@ function verify_init() {
         JSAN.errorLevel = "die"; // none, warn, or die
         JSAN.addRepository('..');
 
-		JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.stash_retrieve();
+  JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.stash_retrieve();
         XML_HTTP_SERVER = data.server_unadorned;
 
         JSAN.use('util.network'); var net = new util.network();
diff --git a/Open-ILS/xul/staff_client/server/main/verify_credentials.xul b/Open-ILS/xul/staff_client/server/main/verify_credentials.xul
index 3581b575d5..193ee5974d 100644
--- a/Open-ILS/xul/staff_client/server/main/verify_credentials.xul
+++ b/Open-ILS/xul/staff_client/server/main/verify_credentials.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,27 +19,27 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="verify_win" onload="try { verify_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var G;</script>
-	<scripts id="openils_util_scripts"/>
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
+ <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var G;</script>
+ <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="verify_credentials.js"/>
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script type="text/javascript" src="verify_credentials.js"/>
 
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+ <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
-	<commandset id="verify_cmds">
-		<command id="cmd_verify" />
-		<command id="cmd_retrieve" />
-	</commandset>
+ <commandset id="verify_cmds">
+  <command id="cmd_verify" />
+  <command id="cmd_retrieve" />
+ </commandset>
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- CONTENT -->
-	<groupbox id="verify_groupbox" flex="1" style="overflow: auto;">
-		<caption id="verify_caption" label="&staff.auth.verify.caption;"/>
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- CONTENT -->
+ <groupbox id="verify_groupbox" flex="1" style="overflow: auto;">
+  <caption id="verify_caption" label="&staff.auth.verify.caption;"/>
         <grid>
             <columns> <column /> <column /> </columns>
             <rows>
@@ -67,7 +67,7 @@
         <vbox id="messages" flex="1" class="my_overflow">
             <label id="footer"/>
         </vbox>
-	</groupbox>
+ </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/main/ws_info.xul b/Open-ILS/xul/staff_client/server/main/ws_info.xul
index b629cebad7..d1433a37b8 100644
--- a/Open-ILS/xul/staff_client/server/main/ws_info.xul
+++ b/Open-ILS/xul/staff_client/server/main/ws_info.xul
@@ -17,7 +17,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -25,66 +25,66 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="wsinfo_win" 
-	onload="try { wsinfo_init(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
-	<scripts id="openils_util_scripts"/>
-
-	<script type='text/javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'/>
-	<script type="text/javascript" src="/opac/common/js/org_utils.js"/>
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-
-		function wsinfo_init() {
-
-			document.getElementById('register_btn').disabled = true;
-			document.getElementById('wsname').disabled = true;
-			document.getElementById('wsname').value = document.getElementById('commonStrings').getString('staff.main.gen_offline_widgets.please_wait');
-
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-			if (typeof JSAN == 'undefined') {
-				throw(document.getElementById("commonStrings").getString('common.jsan.missing'));
-			}
-			/////////////////////////////////////////////////////////////////////////////
-
-			JSAN.errorLevel = "die"; // none, warn, or die
-			JSAN.addRepository('/xul/server/');
-
-			JSAN.use('util.error'); g.error = new util.error();
-			JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-			JSAN.use('util.network'); g.network = new util.network();
-			JSAN.use('util.widgets');
-			JSAN.use('util.functional');
-			JSAN.use('util.fm_utils');
-
-			g.user = g.network.simple_request( 'FM_AU_RETRIEVE_VIA_SESSION', [ xulG.auth.session.key ] );
-
-			g.my_lib = g.user.home_ou();
-
-			g.aout_list = g.network.simple_request(
-				'FM_AOUT_RETRIEVE',
-				[ ]
-			);
-			g.aout_hash = {};
-			for (var i = 0; i < g.aout_list.length; i++) {
-				g.aout_hash[ g.aout_list[i].id() ] = g.aout_list[i];
-			}
-
-			var work_ous = g.network.simple_request(
-				'PERM_RETRIEVE_WORK_OU',
-				[ xulG.auth.session.key, 'REGISTER_WORKSTATION']
-			);
-			if (work_ous.length == 0) {
-				alert(document.getElementById('commonStrings').getString('staff.main.gen_offline_widgets.workstation_registration_denied'));
-				xulG.auth.logoff();
-				return;
-			}
+ onload="try { wsinfo_init(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
+ <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
+ <scripts id="openils_util_scripts"/>
+
+ <script type='text/javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'/>
+ <script type="text/javascript" src="/opac/common/js/org_utils.js"/>
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+
+  function wsinfo_init() {
+
+   document.getElementById('register_btn').disabled = true;
+   document.getElementById('wsname').disabled = true;
+   document.getElementById('wsname').value = document.getElementById('commonStrings').getString('staff.main.gen_offline_widgets.please_wait');
+
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
+   if (typeof JSAN == 'undefined') {
+    throw(document.getElementById("commonStrings").getString('common.jsan.missing'));
+   }
+   /////////////////////////////////////////////////////////////////////////////
+
+   JSAN.errorLevel = "die"; // none, warn, or die
+   JSAN.addRepository('/xul/server/');
+
+   JSAN.use('util.error'); g.error = new util.error();
+   JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+   JSAN.use('util.network'); g.network = new util.network();
+   JSAN.use('util.widgets');
+   JSAN.use('util.functional');
+   JSAN.use('util.fm_utils');
+
+   g.user = g.network.simple_request( 'FM_AU_RETRIEVE_VIA_SESSION', [ xulG.auth.session.key ] );
+
+   g.my_lib = g.user.home_ou();
+
+   g.aout_list = g.network.simple_request(
+    'FM_AOUT_RETRIEVE',
+    [ ]
+   );
+   g.aout_hash = {};
+   for (var i = 0; i < g.aout_list.length; i++) {
+    g.aout_hash[ g.aout_list[i].id() ] = g.aout_list[i];
+   }
+
+   var work_ous = g.network.simple_request(
+    'PERM_RETRIEVE_WORK_OU',
+    [ xulG.auth.session.key, 'REGISTER_WORKSTATION']
+   );
+   if (work_ous.length == 0) {
+    alert(document.getElementById('commonStrings').getString('staff.main.gen_offline_widgets.workstation_registration_denied'));
+    xulG.auth.logoff();
+    return;
+   }
             g.my_libs = [];
             for (var i = 0; i < work_ous.length; i++ ) {
                 var perm_depth = findOrgDepth( work_ous[i] );
@@ -96,97 +96,97 @@
                 if (!instanceOf(g.my_libs_tree,aou)) { /* FIXME - workaround for weird descendants call result */
                     g.my_libs_tree = g.my_libs_tree[0];
                 }
-			    g.my_libs = g.my_libs.concat( util.fm_utils.flatten_ou_branch( g.my_libs_tree ) );
+       g.my_libs = g.my_libs.concat( util.fm_utils.flatten_ou_branch( g.my_libs_tree ) );
             }
 
-			g.my_libs_shortname_hash = {};
-			g.my_libs_ou_hash = {};
-			for (var i = 0; i < g.my_libs.length; i++) {
-				g.my_libs_shortname_hash[ g.my_libs[i].id() ] = g.my_libs[i].shortname();
-				g.my_libs_ou_hash[ g.my_libs[i].id() ] = function(o){return o;}(g.my_libs[i]);
-			}
-
-			g.tb = document.getElementById('wsname');
-
-			render_menulist();
-
-			document.getElementById('register_btn').disabled = false;
-			document.getElementById('wsname').disabled = false;
-			document.getElementById('wsname').value = '';
-
-			document.getElementById('wsname').focus();
-		}
-
-		function render_menulist() {
-			var x = document.getElementById('placeholder');
-			util.widgets.remove_children( x );
-
-			var default_lib = g.my_lib; 
-			if ( !get_bool( g.aout_hash[ g.my_libs_ou_hash[ default_lib ].ou_type() ].can_have_users() ) ) {
-				default_lib = null;
-			}
-
-			g.ml = util.widgets.make_menulist( 
-				util.functional.map_list( 
-					util.fm_utils.flatten_ou_branch( g.my_libs_tree ),
-					function(obj) { 
-						if (!default_lib) {
-							if ( get_bool( g.aout_hash[ obj.ou_type() ].can_have_users() ) ) default_lib = obj.id();
-						}
-						return [ 
-							obj.shortname(), 
-							obj.id(), 
-							( !get_bool( g.aout_hash[ obj.ou_type() ].can_have_users() ) ),
-							( g.aout_hash[ obj.ou_type() ].depth() )
-						]; 
-					}
-				),
-				default_lib
-			);
-
-			x.appendChild( g.ml );
-		}
-
-		function register() {
-			try {
-				var robj = g.network.simple_request(
-					'AUTH_WORKSTATION',
-					[ xulG.auth.session.key, g.my_libs_shortname_hash[ g.ml.value ] + '-' + g.tb.value, g.ml.value ],
-					null,
-					{
-						'title' : document.getElementById('commonStrings').getString('staff.main.gen_offline_widgets.registration.override'),
-						'overridable_events' : [ 
-							1703 /* WORKSTATION_NAME_EXISTS */
-						]
-					}
-				);
-
-				if (typeof robj.ilsevent != 'undefined') {
-					switch(Number(robj.ilsevent)) {
-						case -1 : g.error.standard_network_error_alert(); break;
-						case 1703 /* WORKSTATION_NAME_EXISTS */ : /* handled with override request */ break;
+   g.my_libs_shortname_hash = {};
+   g.my_libs_ou_hash = {};
+   for (var i = 0; i < g.my_libs.length; i++) {
+    g.my_libs_shortname_hash[ g.my_libs[i].id() ] = g.my_libs[i].shortname();
+    g.my_libs_ou_hash[ g.my_libs[i].id() ] = function(o){return o;}(g.my_libs[i]);
+   }
+
+   g.tb = document.getElementById('wsname');
+
+   render_menulist();
+
+   document.getElementById('register_btn').disabled = false;
+   document.getElementById('wsname').disabled = false;
+   document.getElementById('wsname').value = '';
+
+   document.getElementById('wsname').focus();
+  }
+
+  function render_menulist() {
+   var x = document.getElementById('placeholder');
+   util.widgets.remove_children( x );
+
+   var default_lib = g.my_lib; 
+   if ( !get_bool( g.aout_hash[ g.my_libs_ou_hash[ default_lib ].ou_type() ].can_have_users() ) ) {
+    default_lib = null;
+   }
+
+   g.ml = util.widgets.make_menulist( 
+    util.functional.map_list( 
+     util.fm_utils.flatten_ou_branch( g.my_libs_tree ),
+     function(obj) { 
+      if (!default_lib) {
+       if ( get_bool( g.aout_hash[ obj.ou_type() ].can_have_users() ) ) default_lib = obj.id();
+      }
+      return [ 
+       obj.shortname(), 
+       obj.id(), 
+       ( !get_bool( g.aout_hash[ obj.ou_type() ].can_have_users() ) ),
+       ( g.aout_hash[ obj.ou_type() ].depth() )
+      ]; 
+     }
+    ),
+    default_lib
+   );
+
+   x.appendChild( g.ml );
+  }
+
+  function register() {
+   try {
+    var robj = g.network.simple_request(
+     'AUTH_WORKSTATION',
+     [ xulG.auth.session.key, g.my_libs_shortname_hash[ g.ml.value ] + '-' + g.tb.value, g.ml.value ],
+     null,
+     {
+      'title' : document.getElementById('commonStrings').getString('staff.main.gen_offline_widgets.registration.override'),
+      'overridable_events' : [ 
+       1703 /* WORKSTATION_NAME_EXISTS */
+      ]
+     }
+    );
+
+    if (typeof robj.ilsevent != 'undefined') {
+     switch(Number(robj.ilsevent)) {
+      case -1 : g.error.standard_network_error_alert(); break;
+      case 1703 /* WORKSTATION_NAME_EXISTS */ : /* handled with override request */ break;
                         case 1001 /* NO_SESSION */ : /* handled with request dialog */ break;
-						default: g.error.standard_unexpected_error_alert(document.getElementById('commonStrings').getFormattedString('staff.main.gen_offline_widgets.registration.error', ['1']), robj); break;
-					}
-				} else {
-					netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalPreferencesWrite UniversalBrowserWrite UniversalPreferencesRead UniversalBrowserRead");
-					g.data.ws_info[ xulG.auth.controller.view.server_prompt.value ] = { 
-						'name' : g.my_libs_shortname_hash[ g.ml.value ] + '-' + g.tb.value, 
-						'owning_lib' : g.ml.value,
-						'lib_shortname' : g.my_libs_shortname_hash[ g.ml.value ]
-					};
-					xulG.file.get('ws_info');
-					xulG.file.set_object(g.data.ws_info);
-					alert(document.getElementById('commonStrings').getString('staff.main.gen_offline_widgets.registration.success'));
-					xulG.auth.logoff();
-				}
-			} catch(E) {
-				g.error.standard_unexpected_error_alert(document.getElementById('commonStrings').getFormattedString('staff.main.gen_offline_widgets.registration.error', ['2']) ,E);
-			}
-		}
-
-	]]>
-	</script>
+      default: g.error.standard_unexpected_error_alert(document.getElementById('commonStrings').getFormattedString('staff.main.gen_offline_widgets.registration.error', ['1']), robj); break;
+     }
+    } else {
+     netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalPreferencesWrite UniversalBrowserWrite UniversalPreferencesRead UniversalBrowserRead");
+     g.data.ws_info[ xulG.auth.controller.view.server_prompt.value ] = { 
+      'name' : g.my_libs_shortname_hash[ g.ml.value ] + '-' + g.tb.value, 
+      'owning_lib' : g.ml.value,
+      'lib_shortname' : g.my_libs_shortname_hash[ g.ml.value ]
+     };
+     xulG.file.get('ws_info');
+     xulG.file.set_object(g.data.ws_info);
+     alert(document.getElementById('commonStrings').getString('staff.main.gen_offline_widgets.registration.success'));
+     xulG.auth.logoff();
+    }
+   } catch(E) {
+    g.error.standard_unexpected_error_alert(document.getElementById('commonStrings').getFormattedString('staff.main.gen_offline_widgets.registration.error', ['2']) ,E);
+   }
+  }
+
+ ]]>
+ </script>
 
     <vbox flex="1" class="my_overflow">
         <description id="desc" hidden="true">
diff --git a/Open-ILS/xul/staff_client/server/patron/barcode_entry.xul b/Open-ILS/xul/staff_client/server/patron/barcode_entry.xul
index 8dceab6bba..bc30acf3eb 100644
--- a/Open-ILS/xul/staff_client/server/patron/barcode_entry.xul
+++ b/Open-ILS/xul/staff_client/server/patron/barcode_entry.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,200 +19,200 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="patron_barcode_entry_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-		
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		    if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for patron/barcode_entry.xul');
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  function $(id) { return document.getElementById(id); }
+  
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+      if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for patron/barcode_entry.xul');
 
                 JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
 
-				var tb = document.getElementById('barcode_tb');
-				tb.addEventListener(
-					'keypress',
-					function(ev) {
-						if (ev.keyCode == 13 || ev.keyCode == 77) {
-							setTimeout(
-								function() {
-									submit();
-								}, 0
-							);
-						}
-					},
-					false
-				);
-				tb.focus();
-	
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+    var tb = document.getElementById('barcode_tb');
+    tb.addEventListener(
+     'keypress',
+     function(ev) {
+      if (ev.keyCode == 13 || ev.keyCode == 77) {
+       setTimeout(
+        function() {
+         submit();
+        }, 0
+       );
+      }
+     },
+     false
+    );
+    tb.focus();
+ 
+    if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
                     if (xul_param('perm_editor')) {
-					    try { window.xulG.set_tab_name($("patronStrings").getString('staff.patron.barcode_entry.user_permission_editor')); } catch(E) { alert(E); }
+         try { window.xulG.set_tab_name($("patronStrings").getString('staff.patron.barcode_entry.user_permission_editor')); } catch(E) { alert(E); }
                     } else {
-    					try { window.xulG.set_tab_name($("patronStrings").getString('staff.patron.barcode_entry.check_out')); } catch(E) { alert(E); }
+         try { window.xulG.set_tab_name($("patronStrings").getString('staff.patron.barcode_entry.check_out')); } catch(E) { alert(E); }
                     }
-				}
-
-				if (xul_param('error')) { 
-					var error = xul_param('error');
-					alert(error);
-				}
-
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/barcode_entry.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function submit() {
-			var tb;
-			try {
-				JSAN.use('util.sound'); var sound = new util.sound();
-				tb = document.getElementById('barcode_tb');
-				var barcode = tb.value;
-
-				barcode = String( barcode ).replace( /\s+/g, '' );
-
-				if (!barcode) { sound.bad(); add_msg($("patronStrings").getString('staff.patron.barcode_entry.no_barcode')); tb.select(); tb.focus(); return; }
-
-				JSAN.use('util.network'); var net = new util.network();
-
-				tb.disabled = true;
-				document.getElementById('progress').setAttribute('hidden','false');
-				net.simple_request('FM_AU_ID_RETRIEVE_VIA_BARCODE_OR_USERNAME',[ ses(), barcode, null ],
-					function(req) {
-						document.getElementById('progress').setAttribute('hidden','true');
-						tb.disabled = false; tb.select(); tb.focus(); ;
-						var robj = req.getResultObject();
-						if (typeof robj.ilsevent != 'undefined') {
-							sound.bad();
+    }
+
+    if (xul_param('error')) { 
+     var error = xul_param('error');
+     alert(error);
+    }
+
+   } catch(E) {
+    var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/barcode_entry.xul', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+
+  function submit() {
+   var tb;
+   try {
+    JSAN.use('util.sound'); var sound = new util.sound();
+    tb = document.getElementById('barcode_tb');
+    var barcode = tb.value;
+
+    barcode = String( barcode ).replace( /\s+/g, '' );
+
+    if (!barcode) { sound.bad(); add_msg($("patronStrings").getString('staff.patron.barcode_entry.no_barcode')); tb.select(); tb.focus(); return; }
+
+    JSAN.use('util.network'); var net = new util.network();
+
+    tb.disabled = true;
+    document.getElementById('progress').setAttribute('hidden','false');
+    net.simple_request('FM_AU_ID_RETRIEVE_VIA_BARCODE_OR_USERNAME',[ ses(), barcode, null ],
+     function(req) {
+      document.getElementById('progress').setAttribute('hidden','true');
+      tb.disabled = false; tb.select(); tb.focus(); ;
+      var robj = req.getResultObject();
+      if (typeof robj.ilsevent != 'undefined') {
+       sound.bad();
                             switch(Number(robj.ilsevent)) {
-							    case 1002 /* ACTOR_USER_NOT_FOUND */: 
-							        add_msg($("patronStrings").getFormattedString('staff.patron.barcode_entry.barcode_not_found', [barcode]));
+           case 1002 /* ACTOR_USER_NOT_FOUND */: 
+               add_msg($("patronStrings").getFormattedString('staff.patron.barcode_entry.barcode_not_found', [barcode]));
                                 break;
                                 default:
                                     add_msg($("patronStrings").getFormattedString('staff.patron.barcode_entry.barcode_retrieval_problem', [barcode, js2JSON(robj)]));
                             }
-							return;
-						}
+       return;
+      }
 
-						if (g.data.user_org_unit_opt_in_enabled) {
-							var r = net.simple_request('USER_ORG_UNIT_OPT_IN_CHECK',[ ses(), robj ]);
-							if (typeof r.ilsevent != 'undefined') {
-								throw(r);
-							} else {
+      if (g.data.user_org_unit_opt_in_enabled) {
+       var r = net.simple_request('USER_ORG_UNIT_OPT_IN_CHECK',[ ses(), robj ]);
+       if (typeof r.ilsevent != 'undefined') {
+        throw(r);
+       } else {
 
-								if (r == 0) {
+        if (r == 0) {
 
-									JSAN.use('patron.util');
-									var parts = patron.util.retrieve_name_via_id( ses(), robj );
+         JSAN.use('patron.util');
+         var parts = patron.util.retrieve_name_via_id( ses(), robj );
     
-									if (0 != g.error.yns_alert(
-											$("patronStrings").getFormattedString('staff.patron.barcode_entry.consent_from_patron',
-												[parts[0], parts[1] + (parts[2] ? ' ' + parts[2] : ''), g.data.hash.aou[ parts[3] ].name(), g.data.hash.aou[ parts[3] ].shortname()]),
-											$("patronStrings").getString('staff.patron.barcode_entry.patron_consent_title'),
-											$("patronStrings").getString('staff.patron.barcode_entry.patron_consent_accept'),
-											$("patronStrings").getString('staff.patron.barcode_entry.patron_consent_deny'), null,
-											$("patronStrings").getString('staff.patron.barcode_entry.patron_consent_confirm')
-										)
-									) {
-										tb.select(); tb.focus();
-										return;
-									} else {
-										var c = net.simple_request('USER_ORG_UNIT_OPT_IN_CREATE',[ ses(), robj ]);
-										if (typeof c.ilsevent != 'undefined') throw(r);
-									}
-								}
+         if (0 != g.error.yns_alert(
+           $("patronStrings").getFormattedString('staff.patron.barcode_entry.consent_from_patron',
+            [parts[0], parts[1] + (parts[2] ? ' ' + parts[2] : ''), g.data.hash.aou[ parts[3] ].name(), g.data.hash.aou[ parts[3] ].shortname()]),
+           $("patronStrings").getString('staff.patron.barcode_entry.patron_consent_title'),
+           $("patronStrings").getString('staff.patron.barcode_entry.patron_consent_accept'),
+           $("patronStrings").getString('staff.patron.barcode_entry.patron_consent_deny'), null,
+           $("patronStrings").getString('staff.patron.barcode_entry.patron_consent_confirm')
+          )
+         ) {
+          tb.select(); tb.focus();
+          return;
+         } else {
+          var c = net.simple_request('USER_ORG_UNIT_OPT_IN_CREATE',[ ses(), robj ]);
+          if (typeof c.ilsevent != 'undefined') throw(r);
+         }
+        }
     
-    						    sound.good();
-    						    spawn(barcode);
+              sound.good();
+              spawn(barcode);
                             }
                         } else {
-						    sound.good();
-						    spawn(barcode);
+          sound.good();
+          spawn(barcode);
                         }
-					}
-				);
-			} catch(E) {
-				tb.select(); tb.focus();
-				g.error.standard_unexpected_error_alert('barcode_entry.xul',E);
-			}
-		}
-
-		function add_msg(text) {
-			var x = document.getElementById('status');
-			var d = document.createElement('description');
-			x.appendChild(d);
-			d.appendChild( document.createTextNode( text ) );
-			d.setAttribute('style','color: red');
-		}
-
-		function spawn(barcode) {
+     }
+    );
+   } catch(E) {
+    tb.select(); tb.focus();
+    g.error.standard_unexpected_error_alert('barcode_entry.xul',E);
+   }
+  }
+
+  function add_msg(text) {
+   var x = document.getElementById('status');
+   var d = document.createElement('description');
+   x.appendChild(d);
+   d.appendChild( document.createTextNode( text ) );
+   d.setAttribute('style','color: red');
+  }
+
+  function spawn(barcode) {
             if (xul_param('perm_editor')) { spawn_perm_editor(barcode); } else { spawn_checkout(barcode); }
         }
 
-		function spawn_checkout(barcode) {
-			try {
-				var loc = urls.XUL_PATRON_DISPLAY; // + '?barcode=' + window.escape(barcode);
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab == 'function') {
-					window.xulG.set_tab( loc, {}, { 'barcode' : barcode } );
-				} else {
-					location.href = loc + '?barcode=' + window.escape(barcode);
-				}
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.barcode_entry.patron_display_error'),E);
-			}
-		}
-
-		function spawn_perm_editor(barcode) {
-			try {
-				JSAN.use('patron.util'); var patron_obj = patron.util.retrieve_fleshed_au_via_barcode( ses(), barcode );
-				var loc = urls.XUL_USER_PERM_EDITOR + '?ses=' + window.escape(ses()) + '&usr=' + patron_obj.id();
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab == 'function') {
-					window.xulG.set_tab( loc, {}, {} );
-				} else {
-					location.href = loc;
-				}
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.barcode_entry.user_perm_display_error'),E);
-			}
-		}
-
-
-		function default_focus() { try { setTimeout( function() { document.getElementById('barcode_tb').focus(); }, 0); } catch(E) {} }
-	]]>
-	</script>
-	
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
-
-	<vbox flex="1" class="my_overflow">
-		<groupbox orient="vertical" flex="1">
-			<caption label="&staff.pat.barcode_entry.retrieve_patron.label;" />
-			<hbox>
-				<label value="&staff.pat.barcode_entry.barcode.label;" accesskey="&staff.pat.barcode_entry.barcode.accesskey;" control="barcode_tb"/>
-				<textbox id="barcode_tb"  context="clipboard"/>
-				<button label="&staff.pat.barcode_entry.submit_btn.label;" accesskey="&staff.pat.barcode_entry.submit_btn.accesskey;" oncommand="submit();"/>
-			</hbox>
-			<label value="&staff.pat.barcode_entry.retrieving.label;" style="color: green" id="progress" hidden="true"/>
-			<vbox id="status">
-			</vbox>
-		</groupbox>
-	</vbox>
+  function spawn_checkout(barcode) {
+   try {
+    var loc = urls.XUL_PATRON_DISPLAY; // + '?barcode=' + window.escape(barcode);
+    if (typeof window.xulG == 'object' && typeof window.xulG.set_tab == 'function') {
+     window.xulG.set_tab( loc, {}, { 'barcode' : barcode } );
+    } else {
+     location.href = loc + '?barcode=' + window.escape(barcode);
+    }
+   } catch(E) {
+    g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.barcode_entry.patron_display_error'),E);
+   }
+  }
+
+  function spawn_perm_editor(barcode) {
+   try {
+    JSAN.use('patron.util'); var patron_obj = patron.util.retrieve_fleshed_au_via_barcode( ses(), barcode );
+    var loc = urls.XUL_USER_PERM_EDITOR + '?ses=' + window.escape(ses()) + '&usr=' + patron_obj.id();
+    if (typeof window.xulG == 'object' && typeof window.xulG.set_tab == 'function') {
+     window.xulG.set_tab( loc, {}, {} );
+    } else {
+     location.href = loc;
+    }
+   } catch(E) {
+    g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.barcode_entry.user_perm_display_error'),E);
+   }
+  }
+
+
+  function default_focus() { try { setTimeout( function() { document.getElementById('barcode_tb').focus(); }, 0); } catch(E) {} }
+ ]]>
+ </script>
+ 
+ <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+
+ <vbox flex="1" class="my_overflow">
+  <groupbox orient="vertical" flex="1">
+   <caption label="&staff.pat.barcode_entry.retrieve_patron.label;" />
+   <hbox>
+    <label value="&staff.pat.barcode_entry.barcode.label;" accesskey="&staff.pat.barcode_entry.barcode.accesskey;" control="barcode_tb"/>
+    <textbox id="barcode_tb"  context="clipboard"/>
+    <button label="&staff.pat.barcode_entry.submit_btn.label;" accesskey="&staff.pat.barcode_entry.submit_btn.accesskey;" oncommand="submit();"/>
+   </hbox>
+   <label value="&staff.pat.barcode_entry.retrieving.label;" style="color: green" id="progress" hidden="true"/>
+   <vbox id="status">
+   </vbox>
+  </groupbox>
+ </vbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/bill_cc_info.xul b/Open-ILS/xul/staff_client/server/patron/bill_cc_info.xul
index 5c4b3f9ff2..e14d664d4a 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill_cc_info.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill_cc_info.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,94 +20,94 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="patron_bill" title="&staff.patron.bill_cc_info.title;"
-	orient="vertical" style="overflow: auto"
-	onload="try{info_init(); font_helper();}catch(E){alert(E);}"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ orient="vertical" style="overflow: auto"
+ onload="try{info_init(); font_helper();}catch(E){alert(E);}"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-
-		function info_init() {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-			JSAN.errorLevel = "die"; // none, warn, or die
-			JSAN.addRepository('/xul/server/');
-			JSAN.use('util.error'); g.error = new util.error();
-			g.error.sdump('D_TRACE','my_init() for patron_display.xul');
-			g.OpenILS = {}; JSAN.use('OpenILS.data'); g.OpenILS.data = new OpenILS.data();
-			g.OpenILS.data.init({'via':'stash'});
-			g.payment_blob = { 'cancelled' : true };
-			g.OpenILS.data.temp = js2JSON( g.payment_blob );
-			g.OpenILS.data.stash('temp');
-
-			document.getElementById('cc_number').focus();
-		}
-
-		function info_finish() {
-			/* FIXME -- need unique temp space name */
-			delete( g.payment_blob.cancelled );
-			g.OpenILS.data.temp = js2JSON( g.payment_blob );
-			g.OpenILS.data.stash('temp');
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
-
-	<groupbox>
-		<caption label="&staff.patron.bill_cc_info.info.label;"/>
-		<grid>
-			<columns> <column flex="0" /> <column flex="0" /> </columns>
-			<rows>
-				<row>
-					<label value="&staff.patron.bill_cc_info.type.label;"/>
-					<menulist id="cc_type" oncommand="g.payment_blob.cc_type = this.value;">
-						<menupopup>
-							<menuitem label="&staff.patron.bill_cc_info.visa.label;" value="Visa"/>
-							<menuitem label="&staff.patron.bill_cc_info.mastercard.label;" value="Mastercard"/>
-							<menuitem label="&staff.patron.bill_cc_info.american_express.label;" value="American Express"/>
-							<menuitem label="&staff.patron.bill_cc_info.discover.label;" value="Discover"/>
-							<menuitem label="&staff.patron.bill_cc_info.other.label;" value="Other"/>
-						</menupopup>
-					</menulist>
-				</row>
-				<row>
-					<label value="&staff.patron.bill_cc_info.cc_number.value;"/>
-					<textbox id="cc_number" onchange="g.payment_blob.cc_number = event.target.value" context="clipboard"/>
-				</row>
-				<row>
-					<label value="&staff.patron.bill_cc_info.month_expire.value;"/>
-					<textbox id="expire_month" onchange="g.payment_blob.expire_month = event.target.value" context="clipboard"/>
-				</row>
-				<row>
-					<label value="&staff.patron.bill_cc_info.year_expire.value;"/>
-					<textbox id="expire_year" onchange="g.payment_blob.expire_year = event.target.value" context="clipboard"/>
-				</row>
-				<row>
-					<label value="&staff.patron.bill_cc_info.approval_code.value;"/>
-					<textbox id="approval_code" onchange="g.payment_blob.approval_code = event.target.value" context="clipboard"/>
-				</row>
-				<row>
-					<label value="&staff.patron.bill_cc_info.note.value;"/>
-					<textbox id="note" onchange="g.payment_blob.note = event.target.value" multiline="true" context="clipboard"/>
-				</row>
-			</rows>
-		</grid>
-		<hbox>
-			<spacer flex="1"/>
-			<button label="&staff.patron.bill_cc_info.cancel.label;" oncommand="window.close()" accesskey="&staff.patron.bill_cc_info.cancel.accesskey;"/>
-			<button label="&staff.patron.bill_cc_info.submit.label;" oncommand="info_finish(); window.close();" accesskey="&staff.patron.bill_cc_info.submit.accesskey;"/>
-		</hbox>
-	</groupbox>
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+
+ <script>
+ <![CDATA[
+  function $(id) { return document.getElementById(id); }
+
+  function info_init() {
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+   JSAN.errorLevel = "die"; // none, warn, or die
+   JSAN.addRepository('/xul/server/');
+   JSAN.use('util.error'); g.error = new util.error();
+   g.error.sdump('D_TRACE','my_init() for patron_display.xul');
+   g.OpenILS = {}; JSAN.use('OpenILS.data'); g.OpenILS.data = new OpenILS.data();
+   g.OpenILS.data.init({'via':'stash'});
+   g.payment_blob = { 'cancelled' : true };
+   g.OpenILS.data.temp = js2JSON( g.payment_blob );
+   g.OpenILS.data.stash('temp');
+
+   document.getElementById('cc_number').focus();
+  }
+
+  function info_finish() {
+   /* FIXME -- need unique temp space name */
+   delete( g.payment_blob.cancelled );
+   g.OpenILS.data.temp = js2JSON( g.payment_blob );
+   g.OpenILS.data.stash('temp');
+  }
+
+ ]]>
+ </script>
+
+ <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+
+ <groupbox>
+  <caption label="&staff.patron.bill_cc_info.info.label;"/>
+  <grid>
+   <columns> <column flex="0" /> <column flex="0" /> </columns>
+   <rows>
+    <row>
+     <label value="&staff.patron.bill_cc_info.type.label;"/>
+     <menulist id="cc_type" oncommand="g.payment_blob.cc_type = this.value;">
+      <menupopup>
+       <menuitem label="&staff.patron.bill_cc_info.visa.label;" value="Visa"/>
+       <menuitem label="&staff.patron.bill_cc_info.mastercard.label;" value="Mastercard"/>
+       <menuitem label="&staff.patron.bill_cc_info.american_express.label;" value="American Express"/>
+       <menuitem label="&staff.patron.bill_cc_info.discover.label;" value="Discover"/>
+       <menuitem label="&staff.patron.bill_cc_info.other.label;" value="Other"/>
+      </menupopup>
+     </menulist>
+    </row>
+    <row>
+     <label value="&staff.patron.bill_cc_info.cc_number.value;"/>
+     <textbox id="cc_number" onchange="g.payment_blob.cc_number = event.target.value" context="clipboard"/>
+    </row>
+    <row>
+     <label value="&staff.patron.bill_cc_info.month_expire.value;"/>
+     <textbox id="expire_month" onchange="g.payment_blob.expire_month = event.target.value" context="clipboard"/>
+    </row>
+    <row>
+     <label value="&staff.patron.bill_cc_info.year_expire.value;"/>
+     <textbox id="expire_year" onchange="g.payment_blob.expire_year = event.target.value" context="clipboard"/>
+    </row>
+    <row>
+     <label value="&staff.patron.bill_cc_info.approval_code.value;"/>
+     <textbox id="approval_code" onchange="g.payment_blob.approval_code = event.target.value" context="clipboard"/>
+    </row>
+    <row>
+     <label value="&staff.patron.bill_cc_info.note.value;"/>
+     <textbox id="note" onchange="g.payment_blob.note = event.target.value" multiline="true" context="clipboard"/>
+    </row>
+   </rows>
+  </grid>
+  <hbox>
+   <spacer flex="1"/>
+   <button label="&staff.patron.bill_cc_info.cancel.label;" oncommand="window.close()" accesskey="&staff.patron.bill_cc_info.cancel.accesskey;"/>
+   <button label="&staff.patron.bill_cc_info.submit.label;" oncommand="info_finish(); window.close();" accesskey="&staff.patron.bill_cc_info.submit.accesskey;"/>
+  </hbox>
+ </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/bill_check_info.xul b/Open-ILS/xul/staff_client/server/patron/bill_check_info.xul
index 153d90a338..57c6314e51 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill_check_info.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill_check_info.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,70 +20,70 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="patron_bill" title="&staff.patron.bill_check_info.title;"
-	orient="vertical" style="overflow: auto"
-	onload="try{info_init(); font_helper();}catch(E){alert(E);}"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ orient="vertical" style="overflow: auto"
+ onload="try{info_init(); font_helper();}catch(E){alert(E);}"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-
-		function info_init() {
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-			JSAN.errorLevel = "die"; // none, warn, or die
-			JSAN.addRepository('/xul/server/');
-			JSAN.use('util.error'); g.error = new util.error();
-			g.error.sdump('D_TRACE','my_init() for patron_display.xul');
-			g.OpenILS = {}; JSAN.use('OpenILS.data'); g.OpenILS.data = new OpenILS.data();
-			g.OpenILS.data.init({'via':'stash'});
-			g.payment_blob = { 'cancelled' : true };
-			g.OpenILS.data.temp = js2JSON( g.payment_blob );
-			g.OpenILS.data.stash('temp');
-
-			document.getElementById('check_number').focus();
-		}
-
-		function info_finish() {
-			/* FIXME -- need unique temp space name */
-			delete( g.payment_blob.cancelled );
-			g.OpenILS.data.temp = js2JSON( g.payment_blob );
-			g.OpenILS.data.stash('temp');
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
-
-	<groupbox>
-		<caption label="&staff.patron.bill_check_info.check_info.label;"/>
-		<grid>
-			<columns> <column flex="0" /> <column flex="0" /> </columns>
-			<rows>
-				<row>
-					<label value="&staff.patron.bill_check_info.check_number.value;"/>
-					<textbox id="check_number" onchange="g.payment_blob.check_number = event.target.value" context="clipboard"/>
-				</row>
-				<row>
-					<label value="&staff.patron.bill_check_info.note.value;"/>
-					<textbox id="note" onchange="g.payment_blob.note = event.target.value" multiline="true" context="clipboard"/>
-				</row>
-			</rows>
-		</grid>
-		<hbox>
-			<spacer flex="1"/>
-			<button label="&staff.patron.bill_check_info.cancel.label;" oncommand="window.close()" accesskey="&staff.patron.bill_check_info.cancel.accesskey;"/>
-			<button label="&staff.patron.bill_check_info.submit.label;" oncommand="info_finish(); window.close();" accesskey="&staff.patron.bill_check_info.submit.accesskey;"/>
-		</hbox>
-	</groupbox>
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+
+ <script>
+ <![CDATA[
+  function $(id) { return document.getElementById(id); }
+
+  function info_init() {
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+   JSAN.errorLevel = "die"; // none, warn, or die
+   JSAN.addRepository('/xul/server/');
+   JSAN.use('util.error'); g.error = new util.error();
+   g.error.sdump('D_TRACE','my_init() for patron_display.xul');
+   g.OpenILS = {}; JSAN.use('OpenILS.data'); g.OpenILS.data = new OpenILS.data();
+   g.OpenILS.data.init({'via':'stash'});
+   g.payment_blob = { 'cancelled' : true };
+   g.OpenILS.data.temp = js2JSON( g.payment_blob );
+   g.OpenILS.data.stash('temp');
+
+   document.getElementById('check_number').focus();
+  }
+
+  function info_finish() {
+   /* FIXME -- need unique temp space name */
+   delete( g.payment_blob.cancelled );
+   g.OpenILS.data.temp = js2JSON( g.payment_blob );
+   g.OpenILS.data.stash('temp');
+  }
+
+ ]]>
+ </script>
+
+ <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+
+ <groupbox>
+  <caption label="&staff.patron.bill_check_info.check_info.label;"/>
+  <grid>
+   <columns> <column flex="0" /> <column flex="0" /> </columns>
+   <rows>
+    <row>
+     <label value="&staff.patron.bill_check_info.check_number.value;"/>
+     <textbox id="check_number" onchange="g.payment_blob.check_number = event.target.value" context="clipboard"/>
+    </row>
+    <row>
+     <label value="&staff.patron.bill_check_info.note.value;"/>
+     <textbox id="note" onchange="g.payment_blob.note = event.target.value" multiline="true" context="clipboard"/>
+    </row>
+   </rows>
+  </grid>
+  <hbox>
+   <spacer flex="1"/>
+   <button label="&staff.patron.bill_check_info.cancel.label;" oncommand="window.close()" accesskey="&staff.patron.bill_check_info.cancel.accesskey;"/>
+   <button label="&staff.patron.bill_check_info.submit.label;" oncommand="info_finish(); window.close();" accesskey="&staff.patron.bill_check_info.submit.accesskey;"/>
+  </hbox>
+ </groupbox>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/bill_details.xul b/Open-ILS/xul/staff_client/server/patron/bill_details.xul
index cbc0a6f529..96fef12feb 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill_details.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill_details.xul
@@ -13,7 +13,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -22,339 +22,339 @@
 <?xul-overlay href="/xul/server/patron/bill_summary_overlay.xul"?>
 
 <window id="bill_details_win" width="700" height="550"
-	onload="try{ my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try{ my_init(); font_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-
-		function $(id) { return document.getElementById(id); }
-
-		function retrieve_patron() {
-			g.patron_id = xul_param('patron_id');
-
-			if (g.patron_id) {
-				JSAN.use('patron.util'); 
-				g.au_obj = patron.util.retrieve_fleshed_au_via_id( ses(), g.patron_id );
-				
-				$('patron_name').setAttribute('value', 
-					( g.au_obj.prefix() ? g.au_obj.prefix() + ' ' : '') + 
-					g.au_obj.family_name() + ', ' + 
-					g.au_obj.first_given_name() + ' ' +
-					( g.au_obj.second_given_name() ? g.au_obj.second_given_name() + ' ': '' ) +
-					( g.au_obj.suffix() ? g.au_obj.suffix() : '')
-					+ ' : ' + g.au_obj.card().barcode() 
-				);
-			}
-
-		}
-
-		function retrieve_mbts() {
-			g.network.simple_request('FM_MBTS_RETRIEVE.authoritative',[ses(),g.mbts_id],
-				function(req) {
-					try {
-						g.mbts = req.getResultObject();
-						$('mbts_id').value = g.mbts.id();
-						$('mbts_xact_type').value = g.mbts.xact_type();
-						$('mbts_xact_start').value = g.mbts.xact_start().toString().substr(0,19);
-						$('mbts_xact_finish').value = g.mbts.xact_finish() ? g.mbts.xact_finish().toString().substr(0,19) : '';
-						$('mbts_total_owed').value = g.mbts.total_owed() ? util.money.sanitize( g.mbts.total_owed() ) : '';
-						$('mbts_total_paid').value = g.mbts.total_paid() ? util.money.sanitize( g.mbts.total_paid() ) : '';
-						$('mbts_balance_owed').value = g.mbts.balance_owed() ? util.money.sanitize( g.mbts.balance_owed() ) : '';
-
-						switch(g.mbts.xact_type()) {
-							case 'circulation' : retrieve_circ(); break;
-							case 'grocery' : retrieve_grocery(); $('copy_summary_vbox').hidden = true; $('copy_summary_splitter').hidden = true; break;
-							default: $('copy_summary_vbox').hidden = true; $('copy_summary_splitter').hidden = true; break;
-						}
-
-					} catch(E) {
-						g.error.sdump('D_ERROR',E);
-					}
-				}
-			);
-		}
-
-		function retrieve_grocery() {
-			JSAN.use('util.widgets');
-			g.network.simple_request('FM_MG_RETRIEVE', [ ses(), g.mbts_id ],
-				function (req) {
-					var r_mg = req.getResultObject();
-					if (instanceOf(r_mg,mg)) {
-						$('billing_location').value = g.data.hash.aou[ r_mg.billing_location() ].shortname() + ' : ' + g.data.hash.aou[ r_mg.billing_location() ].name();
-					}
-				}
-			);
-		}
-
-		function retrieve_circ() {
-			JSAN.use('util.widgets');
-			g.network.simple_request('FM_CIRC_RETRIEVE_VIA_ID', [ ses(), g.mbts_id ],
-				function (req) {
-					var r_circ = req.getResultObject();
-					if (instanceOf(r_circ,circ)) {
-
-						$('title_label').hidden = false;
-						$('checked_out_label').hidden = false;
-						$('due_label').hidden = false;
-						$('checked_in_label').hidden = false;
-						$('checked_out').value = r_circ.xact_start() ? r_circ.xact_start().toString().substr(0,10) : '';
-						$('checked_in').value = r_circ.checkin_time() ? r_circ.checkin_time().toString().substr(0,10) : '';
-						$('due').value = r_circ.due_date() ? r_circ.due_date().toString().substr(0,10) : '';
-						$('billing_location').value = g.data.hash.aou[ r_circ.circ_lib() ].shortname() + ' : ' + g.data.hash.aou[ r_circ.circ_lib() ].name();
-						var r = '';
-						if (get_bool( r_circ.desk_renewal() ) ) r += 'DESK ';
-						if (get_bool(r_circ.opac_renewal() ) ) r += 'OPAC ';
-						if (get_bool(r_circ.phone_renewal() ) ) r += 'PHONE ';
-						$('renewal').value = r || 'No';
-
-						netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+
+  function $(id) { return document.getElementById(id); }
+
+  function retrieve_patron() {
+   g.patron_id = xul_param('patron_id');
+
+   if (g.patron_id) {
+    JSAN.use('patron.util'); 
+    g.au_obj = patron.util.retrieve_fleshed_au_via_id( ses(), g.patron_id );
+    
+    $('patron_name').setAttribute('value', 
+     ( g.au_obj.prefix() ? g.au_obj.prefix() + ' ' : '') + 
+     g.au_obj.family_name() + ', ' + 
+     g.au_obj.first_given_name() + ' ' +
+     ( g.au_obj.second_given_name() ? g.au_obj.second_given_name() + ' ': '' ) +
+     ( g.au_obj.suffix() ? g.au_obj.suffix() : '')
+     + ' : ' + g.au_obj.card().barcode() 
+    );
+   }
+
+  }
+
+  function retrieve_mbts() {
+   g.network.simple_request('FM_MBTS_RETRIEVE.authoritative',[ses(),g.mbts_id],
+    function(req) {
+     try {
+      g.mbts = req.getResultObject();
+      $('mbts_id').value = g.mbts.id();
+      $('mbts_xact_type').value = g.mbts.xact_type();
+      $('mbts_xact_start').value = g.mbts.xact_start().toString().substr(0,19);
+      $('mbts_xact_finish').value = g.mbts.xact_finish() ? g.mbts.xact_finish().toString().substr(0,19) : '';
+      $('mbts_total_owed').value = g.mbts.total_owed() ? util.money.sanitize( g.mbts.total_owed() ) : '';
+      $('mbts_total_paid').value = g.mbts.total_paid() ? util.money.sanitize( g.mbts.total_paid() ) : '';
+      $('mbts_balance_owed').value = g.mbts.balance_owed() ? util.money.sanitize( g.mbts.balance_owed() ) : '';
+
+      switch(g.mbts.xact_type()) {
+       case 'circulation' : retrieve_circ(); break;
+       case 'grocery' : retrieve_grocery(); $('copy_summary_vbox').hidden = true; $('copy_summary_splitter').hidden = true; break;
+       default: $('copy_summary_vbox').hidden = true; $('copy_summary_splitter').hidden = true; break;
+      }
+
+     } catch(E) {
+      g.error.sdump('D_ERROR',E);
+     }
+    }
+   );
+  }
+
+  function retrieve_grocery() {
+   JSAN.use('util.widgets');
+   g.network.simple_request('FM_MG_RETRIEVE', [ ses(), g.mbts_id ],
+    function (req) {
+     var r_mg = req.getResultObject();
+     if (instanceOf(r_mg,mg)) {
+      $('billing_location').value = g.data.hash.aou[ r_mg.billing_location() ].shortname() + ' : ' + g.data.hash.aou[ r_mg.billing_location() ].name();
+     }
+    }
+   );
+  }
+
+  function retrieve_circ() {
+   JSAN.use('util.widgets');
+   g.network.simple_request('FM_CIRC_RETRIEVE_VIA_ID', [ ses(), g.mbts_id ],
+    function (req) {
+     var r_circ = req.getResultObject();
+     if (instanceOf(r_circ,circ)) {
+
+      $('title_label').hidden = false;
+      $('checked_out_label').hidden = false;
+      $('due_label').hidden = false;
+      $('checked_in_label').hidden = false;
+      $('checked_out').value = r_circ.xact_start() ? r_circ.xact_start().toString().substr(0,10) : '';
+      $('checked_in').value = r_circ.checkin_time() ? r_circ.checkin_time().toString().substr(0,10) : '';
+      $('due').value = r_circ.due_date() ? r_circ.due_date().toString().substr(0,10) : '';
+      $('billing_location').value = g.data.hash.aou[ r_circ.circ_lib() ].shortname() + ' : ' + g.data.hash.aou[ r_circ.circ_lib() ].name();
+      var r = '';
+      if (get_bool( r_circ.desk_renewal() ) ) r += 'DESK ';
+      if (get_bool(r_circ.opac_renewal() ) ) r += 'OPAC ';
+      if (get_bool(r_circ.phone_renewal() ) ) r += 'PHONE ';
+      $('renewal').value = r || 'No';
+
+      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
                         var csb = $('copy_summary_vbox'); while (csb.firstChild) csb.removeChild(csb.lastChild);
                         var copy_summary = document.createElement('iframe'); csb.appendChild(copy_summary);
-						copy_summary.setAttribute('src',urls.XUL_COPY_SUMMARY); // + '?copy_id=' + r_circ.target_copy());
-						copy_summary.setAttribute('flex','1');
-						get_contentWindow(copy_summary).xulG = { 'copy_id' : r_circ.target_copy() };
-
-						g.network.simple_request(
-							'MODS_SLIM_RECORD_RETRIEVE_VIA_COPY.authoritative',
-							[ r_circ.target_copy() ],
-							function (rreq) {
-								var r_mvr = rreq.getResultObject();
-								if (instanceOf(r_mvr,mvr)) {
-									util.widgets.remove_children('title');
-									$('title').appendChild( document.createTextNode( String(r_mvr.title()).substr(0,50) ) );
-								} else {
-									g.network.simple_request(
-										'FM_ACP_RETRIEVE',
-										[ r_circ.target_copy() ],
-										function (rrreq) {
-											var r_acp = rrreq.getResultObject();
-											if (instanceOf(r_acp,acp)) {
-												util.widgets.remove_children('title');
-												$('title').appendChild( document.createTextNode( r_acp.dummy_title() ) );
-											}
-										}
-									);
-								}
-							}
-						);
-
-					}
-				}
-			);
-		}
-
-		function init_lists() {
-			JSAN.use('util.list'); 
-			g.bill_list = new util.list('bill_tree');
-			g.payment_list = new util.list('payment_tree');
-
-			g.bill_list.init( {
-				'columns' : patron.util.mb_columns({}),
-				'map_row_to_columns' : patron.util.std_map_row_to_columns(),
-				'on_select' : function(ev) {
-					JSAN.use('util.functional');
-					g.bill_list_selection = util.functional.map_list(
-						g.bill_list.retrieve_selection(),
-						function(o) { return o.getAttribute('retrieve_id'); }
-					);
-					$('void').disabled = g.bill_list_selection.length == 0;
-				},
-			} );
-
-			g.payment_list.init( {
-				'columns' : patron.util.mp_columns({}),
-				'map_row_to_columns' : patron.util.std_map_row_to_columns(),
-				'on_select' : function(ev) {
-					JSAN.use('util.functional');
-					g.payment_list_selection = util.functional.map_list(
-						g.payment_list.retrieve_selection(),
-						function(o) { return o.getAttribute('retrieve_id'); }
-					);
-				},
-			} );
-		}
-
-		function retrieve_mb() {
-			g.mb_list = g.network.simple_request( 'FM_MB_RETRIEVE_VIA_MBTS_ID.authoritative', [ ses(), g.mbts_id ] );
-			//g.error.sdump('D_DEBUG',g.error.pretty_print( js2JSON(g.mb_list) ));
-
-			var mb_funcs = [];
-
-			function gen_mb_func(i,r) {
-				return function() {
-					g.bill_list.append( { 'retrieve_id' : i, 'row' : { my : { 'mb' : r } } } );
-				}
-			}
-
-			for (var i = 0; i < g.mb_list.length; i++) {
-				mb_funcs.push( gen_mb_func(i,g.mb_list[i]) );
-			}
-
-			JSAN.use('util.exec');
-			var mb_exec = new util.exec(4); mb_exec.chain(mb_funcs);
-		}
-
-		function retrieve_mp() {
-			var mp_list = g.network.simple_request( 'FM_MP_RETRIEVE_VIA_MBTS_ID.authoritative', [ ses(), g.mbts_id ]);
-			//g.error.sdump('D_DEBUG',g.error.pretty_print( js2JSON(mp_list) ));
-
-			var mp_funcs = [];
-
-			function gen_mp_func(r) {
-				return function() {
-					g.payment_list.append( { 'retrieve_id' : r.id(), 'row' : { my : { 'mp' : r } } } );
-				}
-			}
-
-			for (var i = 0; i < mp_list.length; i++) {
-				mp_funcs.push( gen_mp_func(mp_list[i]) );
-			}
-
-			JSAN.use('util.exec');
-			var mp_exec = new util.exec(4); mp_exec.chain(mp_funcs);
-		}
-
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-
-				JSAN.use('util.error'); g.error = new util.error();
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('util.date');
-				JSAN.use('util.money');
-				JSAN.use('patron.util');
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-
-				g.error.sdump('D_TRACE','my_init() for bill_details.xul');
-
-				g.mbts_id = xul_param('mbts_id');
-
-				retrieve_patron();
-
-				retrieve_mbts();
-
-				init_lists();
-
-				retrieve_mb();
-				retrieve_mp();
-
-				$('void').addEventListener(
-					'command',
-					handle_void,
-					false
-				);
-
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.bill_details.my_init.error'),E); } catch(F) { alert(E); }
-			}
-		}
-
-		function handle_void() {
-			try {
-				var mb_list = util.functional.map_list(g.bill_list_selection, function(o){return g.mb_list[o];}); 
-				mb_list = util.functional.filter_list( mb_list, function(o) { return ! get_bool( o.voided() ) });
-
-				if (mb_list.length == 0) { alert($("patronStrings").getString('staff.patron.bill_details.handle_void.voided_billings.alert')); return; }
-
-				var sum = 0;
-				for (var i = 0; i < mb_list.length; i++) sum += util.money.dollars_float_to_cents_integer( mb_list[i].amount() );
-				sum = util.money.cents_as_dollars( sum );
-
-				var msg = $("patronStrings").getFormattedString('staff.patron.bill_details.handle_void.confirm_void_billing', sum);
-				var r = g.error.yns_alert(msg,
-					$("patronStrings").getString('staff.patron.bill_details.handle_void.confirm_void_billing_title'),
-					$("patronStrings").getString('staff.patron.bill_details.handle_void.confirm_void_billing_yes'),
-					$("patronStrings").getString('staff.patron.bill_details.handle_void.confirm_void_billing_no'),null,
-					$("patronStrings").getString('staff.patron.bill_details.handle_void.confirm_void_billing_confirm_message'));
-				if (r == 0) {
-					var robj = g.network.simple_request('FM_MB_VOID',[ses()].concat(util.functional.map_list(mb_list,function(o){return o.id();})));
-					if (robj.ilsevent) {
-						switch(Number(robj.ilsevent)) {
-							default: 
-								g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.bill_details.handle_void.voiding_error'),robj); 
-								retrieve_mbts();
-								g.bill_list.clear();
-								retrieve_mb();
-								if (typeof window.xulG == 'object' && typeof window.xulG.refresh == 'function') { window.xulG.refresh(); }
-								return; 
-							break;
-						}
-					}
-	
-					g.data.stash_retrieve(); if (! g.data.voided_billings ) g.data.voided_billings = []; 
-					for (var i = 0; i < mb_list.length; i++) {
-							g.data.voided_billings.push( mb_list[i] );
-					}
-					g.data.stash('voided_billings');
-					alert($("patronStrings").getString('staff.patron.bill_details.handle_void.billings_voided'));
-					retrieve_mbts();
-					g.bill_list.clear();
-					retrieve_mb();
-					if (typeof window.xulG == 'object' && typeof window.xulG.refresh == 'function') { window.xulG.refresh(); }
-				}
-
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert('bill_details.xul, handle_void:',E); } catch(F) { alert(E); }
-			}
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
-
-	<vbox flex="1" class="my_overflow">
-		<label id="patron_name" class="patronNameLarge"/>
-
-		<groupbox orient="vertical" flex="1" id="summary" />
-
-		<splitter><grippy/></splitter>
+      copy_summary.setAttribute('src',urls.XUL_COPY_SUMMARY); // + '?copy_id=' + r_circ.target_copy());
+      copy_summary.setAttribute('flex','1');
+      get_contentWindow(copy_summary).xulG = { 'copy_id' : r_circ.target_copy() };
+
+      g.network.simple_request(
+       'MODS_SLIM_RECORD_RETRIEVE_VIA_COPY.authoritative',
+       [ r_circ.target_copy() ],
+       function (rreq) {
+        var r_mvr = rreq.getResultObject();
+        if (instanceOf(r_mvr,mvr)) {
+         util.widgets.remove_children('title');
+         $('title').appendChild( document.createTextNode( String(r_mvr.title()).substr(0,50) ) );
+        } else {
+         g.network.simple_request(
+          'FM_ACP_RETRIEVE',
+          [ r_circ.target_copy() ],
+          function (rrreq) {
+           var r_acp = rrreq.getResultObject();
+           if (instanceOf(r_acp,acp)) {
+            util.widgets.remove_children('title');
+            $('title').appendChild( document.createTextNode( r_acp.dummy_title() ) );
+           }
+          }
+         );
+        }
+       }
+      );
+
+     }
+    }
+   );
+  }
+
+  function init_lists() {
+   JSAN.use('util.list'); 
+   g.bill_list = new util.list('bill_tree');
+   g.payment_list = new util.list('payment_tree');
+
+   g.bill_list.init( {
+    'columns' : patron.util.mb_columns({}),
+    'map_row_to_columns' : patron.util.std_map_row_to_columns(),
+    'on_select' : function(ev) {
+     JSAN.use('util.functional');
+     g.bill_list_selection = util.functional.map_list(
+      g.bill_list.retrieve_selection(),
+      function(o) { return o.getAttribute('retrieve_id'); }
+     );
+     $('void').disabled = g.bill_list_selection.length == 0;
+    },
+   } );
+
+   g.payment_list.init( {
+    'columns' : patron.util.mp_columns({}),
+    'map_row_to_columns' : patron.util.std_map_row_to_columns(),
+    'on_select' : function(ev) {
+     JSAN.use('util.functional');
+     g.payment_list_selection = util.functional.map_list(
+      g.payment_list.retrieve_selection(),
+      function(o) { return o.getAttribute('retrieve_id'); }
+     );
+    },
+   } );
+  }
+
+  function retrieve_mb() {
+   g.mb_list = g.network.simple_request( 'FM_MB_RETRIEVE_VIA_MBTS_ID.authoritative', [ ses(), g.mbts_id ] );
+   //g.error.sdump('D_DEBUG',g.error.pretty_print( js2JSON(g.mb_list) ));
+
+   var mb_funcs = [];
+
+   function gen_mb_func(i,r) {
+    return function() {
+     g.bill_list.append( { 'retrieve_id' : i, 'row' : { my : { 'mb' : r } } } );
+    }
+   }
+
+   for (var i = 0; i < g.mb_list.length; i++) {
+    mb_funcs.push( gen_mb_func(i,g.mb_list[i]) );
+   }
+
+   JSAN.use('util.exec');
+   var mb_exec = new util.exec(4); mb_exec.chain(mb_funcs);
+  }
+
+  function retrieve_mp() {
+   var mp_list = g.network.simple_request( 'FM_MP_RETRIEVE_VIA_MBTS_ID.authoritative', [ ses(), g.mbts_id ]);
+   //g.error.sdump('D_DEBUG',g.error.pretty_print( js2JSON(mp_list) ));
+
+   var mp_funcs = [];
+
+   function gen_mp_func(r) {
+    return function() {
+     g.payment_list.append( { 'retrieve_id' : r.id(), 'row' : { my : { 'mp' : r } } } );
+    }
+   }
+
+   for (var i = 0; i < mp_list.length; i++) {
+    mp_funcs.push( gen_mp_func(mp_list[i]) );
+   }
+
+   JSAN.use('util.exec');
+   var mp_exec = new util.exec(4); mp_exec.chain(mp_funcs);
+  }
+
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+
+    JSAN.use('util.error'); g.error = new util.error();
+    JSAN.use('util.network'); g.network = new util.network();
+    JSAN.use('util.date');
+    JSAN.use('util.money');
+    JSAN.use('patron.util');
+    JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+
+    g.error.sdump('D_TRACE','my_init() for bill_details.xul');
+
+    g.mbts_id = xul_param('mbts_id');
+
+    retrieve_patron();
+
+    retrieve_mbts();
+
+    init_lists();
+
+    retrieve_mb();
+    retrieve_mp();
+
+    $('void').addEventListener(
+     'command',
+     handle_void,
+     false
+    );
+
+   } catch(E) {
+    try { g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.bill_details.my_init.error'),E); } catch(F) { alert(E); }
+   }
+  }
+
+  function handle_void() {
+   try {
+    var mb_list = util.functional.map_list(g.bill_list_selection, function(o){return g.mb_list[o];}); 
+    mb_list = util.functional.filter_list( mb_list, function(o) { return ! get_bool( o.voided() ) });
+
+    if (mb_list.length == 0) { alert($("patronStrings").getString('staff.patron.bill_details.handle_void.voided_billings.alert')); return; }
+
+    var sum = 0;
+    for (var i = 0; i < mb_list.length; i++) sum += util.money.dollars_float_to_cents_integer( mb_list[i].amount() );
+    sum = util.money.cents_as_dollars( sum );
+
+    var msg = $("patronStrings").getFormattedString('staff.patron.bill_details.handle_void.confirm_void_billing', sum);
+    var r = g.error.yns_alert(msg,
+     $("patronStrings").getString('staff.patron.bill_details.handle_void.confirm_void_billing_title'),
+     $("patronStrings").getString('staff.patron.bill_details.handle_void.confirm_void_billing_yes'),
+     $("patronStrings").getString('staff.patron.bill_details.handle_void.confirm_void_billing_no'),null,
+     $("patronStrings").getString('staff.patron.bill_details.handle_void.confirm_void_billing_confirm_message'));
+    if (r == 0) {
+     var robj = g.network.simple_request('FM_MB_VOID',[ses()].concat(util.functional.map_list(mb_list,function(o){return o.id();})));
+     if (robj.ilsevent) {
+      switch(Number(robj.ilsevent)) {
+       default: 
+        g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.bill_details.handle_void.voiding_error'),robj); 
+        retrieve_mbts();
+        g.bill_list.clear();
+        retrieve_mb();
+        if (typeof window.xulG == 'object' && typeof window.xulG.refresh == 'function') { window.xulG.refresh(); }
+        return; 
+       break;
+      }
+     }
+ 
+     g.data.stash_retrieve(); if (! g.data.voided_billings ) g.data.voided_billings = []; 
+     for (var i = 0; i < mb_list.length; i++) {
+       g.data.voided_billings.push( mb_list[i] );
+     }
+     g.data.stash('voided_billings');
+     alert($("patronStrings").getString('staff.patron.bill_details.handle_void.billings_voided'));
+     retrieve_mbts();
+     g.bill_list.clear();
+     retrieve_mb();
+     if (typeof window.xulG == 'object' && typeof window.xulG.refresh == 'function') { window.xulG.refresh(); }
+    }
+
+   } catch(E) {
+    try { g.error.standard_unexpected_error_alert('bill_details.xul, handle_void:',E); } catch(F) { alert(E); }
+   }
+  }
+
+ ]]>
+ </script>
+
+ <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+
+ <vbox flex="1" class="my_overflow">
+  <label id="patron_name" class="patronNameLarge"/>
+
+  <groupbox orient="vertical" flex="1" id="summary" />
+
+  <splitter><grippy/></splitter>
 
         <vbox id="copy_summary_vbox" flex="1" />
 
-		<splitter id="copy_summary_splitter"><grippy/></splitter>
-
-			<groupbox orient="vertical" flex="2">
-				<caption label="&staff.patron.bill_details.bills.label;" style="color: red"/>
-				<tree id="bill_tree" flex="1" enableColumnDrag="true"/>
-				<hbox>
-					<button label="&staff.patron.bill_details.save_columns.label;" oncommand="g.bill_list.save_columns();"/>
-					<button label="&staff.patron.bill_details.copy_to_clipboard.label;" oncommand="g.bill_list.clipboard();"/>
-					<button label="&staff.patron.bill_details.print_export.label;" oncommand="try { g.bill_list.on_all_fleshed = function() { JSAN.use('util.print'); var p = new util.print(); p.simple( g.bill_list.dump_csv(), { 'content_type' : 'text/plain' } ); setTimeout( function() { g.bill_list.on_all_fleshed = null; }, 0); }; g.bill_list.full_retrieve(); } catch(E) { alert(E); }"/>
-					<spacer flex="1"/>
-					<button id="void" label="&staff.patron.bill_details.void_selection.label;" disabled="true"/>
-				</hbox>
-			</groupbox>
-
-			<splitter><grippy/></splitter>
-
-			<groupbox orient="vertical" flex="2">
-				<caption label="&staff.patron.bill_details.payments.label;" style="color: green"/>
-				<tree id="payment_tree" flex="1" enableColumnDrag="true"/>
-				<hbox>
-					<button label="&staff.patron.bill_details.save_columns.label;" oncommand="g.payment_list.save_columns();"/>
-					<button label="&staff.patron.bill_details.copy_to_clipboard.label;" oncommand="g.payment_list.clipboard();"/>
-					<button label="&staff.patron.bill_details.print_export.label;" oncommand="try { g.payment_list.on_all_fleshed = function() { JSAN.use('util.print'); var p = new util.print(); p.simple( g.payment_list.dump_csv(), { 'content_type' : 'text/plain' } ); setTimeout( function() { g.payment_list.on_all_fleshed = null; }, 0); }; g.payment_list.full_retrieve(); } catch(E) { alert(E); }"/>
-					<spacer flex="1"/>
-				</hbox>
-			</groupbox>
-
-		<hbox>
-			<button id="opac" label="&staff.patron.bill_details.show_in_catalog.label;" accesskey="&staff.patron.bill_details.show_in_catalog.accesskey;" hidden="true"/>
-			<spacer flex="1"/>
-			<button label="&staff.patron.bill_details.close_window.label;" oncommand="window.close()" accesskey="&staff.patron.bill_details.close_window.accesskey;"/>
-		</hbox>
-	</vbox>
+  <splitter id="copy_summary_splitter"><grippy/></splitter>
+
+   <groupbox orient="vertical" flex="2">
+    <caption label="&staff.patron.bill_details.bills.label;" style="color: red"/>
+    <tree id="bill_tree" flex="1" enableColumnDrag="true"/>
+    <hbox>
+     <button label="&staff.patron.bill_details.save_columns.label;" oncommand="g.bill_list.save_columns();"/>
+     <button label="&staff.patron.bill_details.copy_to_clipboard.label;" oncommand="g.bill_list.clipboard();"/>
+     <button label="&staff.patron.bill_details.print_export.label;" oncommand="try { g.bill_list.on_all_fleshed = function() { JSAN.use('util.print'); var p = new util.print(); p.simple( g.bill_list.dump_csv(), { 'content_type' : 'text/plain' } ); setTimeout( function() { g.bill_list.on_all_fleshed = null; }, 0); }; g.bill_list.full_retrieve(); } catch(E) { alert(E); }"/>
+     <spacer flex="1"/>
+     <button id="void" label="&staff.patron.bill_details.void_selection.label;" disabled="true"/>
+    </hbox>
+   </groupbox>
+
+   <splitter><grippy/></splitter>
+
+   <groupbox orient="vertical" flex="2">
+    <caption label="&staff.patron.bill_details.payments.label;" style="color: green"/>
+    <tree id="payment_tree" flex="1" enableColumnDrag="true"/>
+    <hbox>
+     <button label="&staff.patron.bill_details.save_columns.label;" oncommand="g.payment_list.save_columns();"/>
+     <button label="&staff.patron.bill_details.copy_to_clipboard.label;" oncommand="g.payment_list.clipboard();"/>
+     <button label="&staff.patron.bill_details.print_export.label;" oncommand="try { g.payment_list.on_all_fleshed = function() { JSAN.use('util.print'); var p = new util.print(); p.simple( g.payment_list.dump_csv(), { 'content_type' : 'text/plain' } ); setTimeout( function() { g.payment_list.on_all_fleshed = null; }, 0); }; g.payment_list.full_retrieve(); } catch(E) { alert(E); }"/>
+     <spacer flex="1"/>
+    </hbox>
+   </groupbox>
+
+  <hbox>
+   <button id="opac" label="&staff.patron.bill_details.show_in_catalog.label;" accesskey="&staff.patron.bill_details.show_in_catalog.accesskey;" hidden="true"/>
+   <spacer flex="1"/>
+   <button label="&staff.patron.bill_details.close_window.label;" oncommand="window.close()" accesskey="&staff.patron.bill_details.close_window.accesskey;"/>
+  </hbox>
+ </vbox>
 
 
 </window>
diff --git a/Open-ILS/xul/staff_client/server/patron/bill_history.xul b/Open-ILS/xul/staff_client/server/patron/bill_history.xul
index 69ba61d18c..05328745a8 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill_history.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill_history.xul
@@ -13,7 +13,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -22,344 +22,344 @@
 <?xul-overlay href="/xul/server/patron/bill_summary_overlay.xul"?>
 
 <window id="bill_history_win" width="700" height="550" oils_persist="sizemode width height"
-	onload="try{ my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try{ my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-
-		function $(id) { return document.getElementById(id); }
-
-		function retrieve_patron() {
-			g.patron_id = xul_param('patron_id');
-
-			if (g.patron_id) {
-				JSAN.use('patron.util'); 
-				g.au_obj = patron.util.retrieve_fleshed_au_via_id( ses(), g.patron_id );
-				
-				$('patron_name').setAttribute('value', 
-					( g.au_obj.prefix() ? g.au_obj.prefix() + ' ' : '') + 
-					g.au_obj.family_name() + ', ' + 
-					g.au_obj.first_given_name() + ' ' +
-					( g.au_obj.second_given_name() ? g.au_obj.second_given_name() + ' ' : '' ) +
-					( g.au_obj.suffix() ? g.au_obj.suffix() : '')
-					+ ' : ' + g.au_obj.card().barcode() 
-				);
-			}
-
-		}
-
-		function retrieve_mbts_for_list() {
-			//var method = 'FM_MBTS_IDS_RETRIEVE_ALL_HAVING_CHARGE';
-			var method = 'FM_MBTS_IDS_RETRIEVE_FOR_HISTORY.authoritative';
-			if (xul_param('current')) method = 'FM_MBTS_IDS_RETRIEVE_ALL_HAVING_BALANCE.authoritative';
-			g.mbts_ids = g.network.simple_request(method,[ses(),g.patron_id]);
-			if (g.mbts_ids.ilsevent) {
-				switch(Number(g.mbts_ids.ilsevent)) {
-					case -1: g.error.standard_network_error_alert($("patronStrings").getString('staff.patron.bill_history.retrieve_mbts_for_list.close_win_try_again')); break;
-					default: g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.bill_history.retrieve_mbts_for_list.close_win_try_again'),g.mbts_ids); break;
-				}
-			} else if (g.mbts_ids == null) {
-				g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.bill_history.retrieve_mbts_for_list.close_win_try_again'),null);
-			} else {
-				//g.mbts_ids.reverse();
-				var funcs = [];
-			
-						function gen_func(r) {
-							return function() {
-								if (typeof r == 'object') {
-									g.bill_list.append( 
-										{ 
-											'retrieve_id' : r.id(), 
-											'row' : { 
-												'my' : { 
-													'mbts' : r 
-												} 
-											} 
-										} 
-									);
-								} else {
-									g.bill_list.append( 
-										{ 
-											'retrieve_id' : r, 
-											'row' : { 
-												'my' : {} 
-											} 
-										} 
-									);
-								}
-							}
-						}
-			
-				for (var i = 0; i < g.mbts_ids.length; i++) {
-					dump('i = ' + i + ' g.mbts_ids[i] = ' + g.mbts_ids[i] + '\n');
-					funcs.push( gen_func(g.mbts_ids[i]) );
-				}
-				JSAN.use('util.exec'); var exec = new util.exec(4);
-				exec.on_error = function(E) { alert(E); return true; }
-				exec.chain(funcs);
-			}
-		}
-
-		function retrieve_specific_mbts() {
-			if (g.mbts_id) g.network.simple_request('FM_MBTS_RETRIEVE.authoritative',[ses(),g.mbts_id],
-				function(req) {
-					try {
-						g.mbts = req.getResultObject();
-						if (g.mbts.ilsevent) {
-							switch(Number(g.mbts.ilsevent)) {
-								case -1: g.error.standard_network_error_alert('mbts_id = ' + g.mbts_id); break;
-								default: g.error.standard_unexpected_error_alert('mbts_id = ' + g.mbts_id,g.mbts); break;
-							}
-						} else {
-							$('mbts_id').value = g.mbts_id;
-							$('mbts_xact_type').value = g.mbts.xact_type();
-							$('mbts_xact_start').value = g.mbts.xact_start().toString().substr(0,19);
-							$('mbts_xact_finish').value = g.mbts.xact_finish() ? g.mbts.xact_finish().toString().substr(0,19) : '';
-							$('mbts_total_owed').value = g.mbts.total_owed() ? util.money.sanitize( g.mbts.total_owed() ) : '';
-							$('mbts_total_paid').value = g.mbts.total_paid() ? util.money.sanitize( g.mbts.total_paid() ) : '';
-							$('mbts_balance_owed').value = g.mbts.balance_owed() ? util.money.sanitize( g.mbts.balance_owed() ) : '';
-						}
-					} catch(E) {
-						g.error.sdump('D_ERROR',E);
-					}
-				}
-			);
-		}
-
-		function retrieve_circ() {
-			JSAN.use('util.widgets');
-			util.widgets.remove_children('title');
-			$('title_label').hidden = true;
-			$('checked_out_label').hidden = true;
-			$('due_label').hidden = true;
-			$('checked_in_label').hidden = true;
-			$('checked_out').value = '';
-			$('checked_in').value = '';
-			$('due').value = '';
-			$('copy_summary').hidden=true;
-
-			g.network.simple_request('FM_CIRC_RETRIEVE_VIA_ID', [ ses(), g.mbts_id ],
-				function (req) {
-					var r_circ = req.getResultObject();
-					if (instanceOf(r_circ,circ)) {
-
-						$('title_label').hidden = false;
-						$('checked_out_label').hidden = false;
-						$('due_label').hidden = false;
-						$('checked_in_label').hidden = false;
-						$('checked_out').value = r_circ.xact_start() ? r_circ.xact_start().toString().substr(0,10) : '';
-						$('checked_in').value = r_circ.checkin_time() ? r_circ.checkin_time().toString().substr(0,10) : '';
-						$('due').value = r_circ.due_date() ? r_circ.due_date().toString().substr(0,10) : '';
-
-						netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-						$('copy_summary').setAttribute('src',urls.XUL_COPY_SUMMARY + '?copy_id=' + r_circ.target_copy());
-						//get_contentWindow($('copy_summary')).xulG = { 'copy_id' : r_circ.target_copy() };
-						$('copy_summary').hidden=false;
-
-						g.network.simple_request(
-							'MODS_SLIM_RECORD_RETRIEVE_VIA_COPY.authoritative',
-							[ r_circ.target_copy() ],
-							function (rreq) {
-								var r_mvr = rreq.getResultObject();
-								if (instanceOf(r_mvr,mvr)) {
-									$('title').appendChild( document.createTextNode( String(r_mvr.title()).substr(0,50) ) );
-								} else {
-									g.network.simple_request(
-										'FM_ACP_RETRIEVE',
-										[ r_circ.target_copy() ],
-										function (rrreq) {
-											var r_acp = rrreq.getResultObject();
-											if (instanceOf(r_acp,acp)) {
-												$('title').appendChild( document.createTextNode( r_acp.dummy_title() ) );
-											}
-										}
-									);
-								}
-							}
-						);
-
-					}
-				}
-			);
-		}
-
-		function init_lists() {
-			JSAN.use('util.list'); 
-			g.bill_list = new util.list('bill_tree');
-
-			g.bill_list.init( {
-				'columns' : patron.util.mbts_columns({}),
-				'map_row_to_columns' : patron.util.std_map_row_to_columns(' '),
-				'on_select' : function(ev) {
-					JSAN.use('util.functional');
-					g.bill_list_selection = util.functional.map_list(
-						g.bill_list.retrieve_selection(),
-						function(o) { return o.getAttribute('retrieve_id'); }
-					);
-					$('details').disabled = g.bill_list_selection.length == 0;
-					$('add').disabled = g.bill_list_selection.length == 0;
-					$('summary').hidden = g.bill_list_selection.length == 0;
-					$('copy_summary').hidden = g.bill_list_selection.length == 0;
-					g.mbts_id = g.bill_list_selection[0];
-					retrieve_specific_mbts();
-					retrieve_circ();
-				},
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+
+  function $(id) { return document.getElementById(id); }
+
+  function retrieve_patron() {
+   g.patron_id = xul_param('patron_id');
+
+   if (g.patron_id) {
+    JSAN.use('patron.util'); 
+    g.au_obj = patron.util.retrieve_fleshed_au_via_id( ses(), g.patron_id );
+    
+    $('patron_name').setAttribute('value', 
+     ( g.au_obj.prefix() ? g.au_obj.prefix() + ' ' : '') + 
+     g.au_obj.family_name() + ', ' + 
+     g.au_obj.first_given_name() + ' ' +
+     ( g.au_obj.second_given_name() ? g.au_obj.second_given_name() + ' ' : '' ) +
+     ( g.au_obj.suffix() ? g.au_obj.suffix() : '')
+     + ' : ' + g.au_obj.card().barcode() 
+    );
+   }
+
+  }
+
+  function retrieve_mbts_for_list() {
+   //var method = 'FM_MBTS_IDS_RETRIEVE_ALL_HAVING_CHARGE';
+   var method = 'FM_MBTS_IDS_RETRIEVE_FOR_HISTORY.authoritative';
+   if (xul_param('current')) method = 'FM_MBTS_IDS_RETRIEVE_ALL_HAVING_BALANCE.authoritative';
+   g.mbts_ids = g.network.simple_request(method,[ses(),g.patron_id]);
+   if (g.mbts_ids.ilsevent) {
+    switch(Number(g.mbts_ids.ilsevent)) {
+     case -1: g.error.standard_network_error_alert($("patronStrings").getString('staff.patron.bill_history.retrieve_mbts_for_list.close_win_try_again')); break;
+     default: g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.bill_history.retrieve_mbts_for_list.close_win_try_again'),g.mbts_ids); break;
+    }
+   } else if (g.mbts_ids == null) {
+    g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.bill_history.retrieve_mbts_for_list.close_win_try_again'),null);
+   } else {
+    //g.mbts_ids.reverse();
+    var funcs = [];
+   
+      function gen_func(r) {
+       return function() {
+        if (typeof r == 'object') {
+         g.bill_list.append( 
+          { 
+           'retrieve_id' : r.id(), 
+           'row' : { 
+            'my' : { 
+             'mbts' : r 
+            } 
+           } 
+          } 
+         );
+        } else {
+         g.bill_list.append( 
+          { 
+           'retrieve_id' : r, 
+           'row' : { 
+            'my' : {} 
+           } 
+          } 
+         );
+        }
+       }
+      }
+   
+    for (var i = 0; i < g.mbts_ids.length; i++) {
+     dump('i = ' + i + ' g.mbts_ids[i] = ' + g.mbts_ids[i] + '\n');
+     funcs.push( gen_func(g.mbts_ids[i]) );
+    }
+    JSAN.use('util.exec'); var exec = new util.exec(4);
+    exec.on_error = function(E) { alert(E); return true; }
+    exec.chain(funcs);
+   }
+  }
+
+  function retrieve_specific_mbts() {
+   if (g.mbts_id) g.network.simple_request('FM_MBTS_RETRIEVE.authoritative',[ses(),g.mbts_id],
+    function(req) {
+     try {
+      g.mbts = req.getResultObject();
+      if (g.mbts.ilsevent) {
+       switch(Number(g.mbts.ilsevent)) {
+        case -1: g.error.standard_network_error_alert('mbts_id = ' + g.mbts_id); break;
+        default: g.error.standard_unexpected_error_alert('mbts_id = ' + g.mbts_id,g.mbts); break;
+       }
+      } else {
+       $('mbts_id').value = g.mbts_id;
+       $('mbts_xact_type').value = g.mbts.xact_type();
+       $('mbts_xact_start').value = g.mbts.xact_start().toString().substr(0,19);
+       $('mbts_xact_finish').value = g.mbts.xact_finish() ? g.mbts.xact_finish().toString().substr(0,19) : '';
+       $('mbts_total_owed').value = g.mbts.total_owed() ? util.money.sanitize( g.mbts.total_owed() ) : '';
+       $('mbts_total_paid').value = g.mbts.total_paid() ? util.money.sanitize( g.mbts.total_paid() ) : '';
+       $('mbts_balance_owed').value = g.mbts.balance_owed() ? util.money.sanitize( g.mbts.balance_owed() ) : '';
+      }
+     } catch(E) {
+      g.error.sdump('D_ERROR',E);
+     }
+    }
+   );
+  }
+
+  function retrieve_circ() {
+   JSAN.use('util.widgets');
+   util.widgets.remove_children('title');
+   $('title_label').hidden = true;
+   $('checked_out_label').hidden = true;
+   $('due_label').hidden = true;
+   $('checked_in_label').hidden = true;
+   $('checked_out').value = '';
+   $('checked_in').value = '';
+   $('due').value = '';
+   $('copy_summary').hidden=true;
+
+   g.network.simple_request('FM_CIRC_RETRIEVE_VIA_ID', [ ses(), g.mbts_id ],
+    function (req) {
+     var r_circ = req.getResultObject();
+     if (instanceOf(r_circ,circ)) {
+
+      $('title_label').hidden = false;
+      $('checked_out_label').hidden = false;
+      $('due_label').hidden = false;
+      $('checked_in_label').hidden = false;
+      $('checked_out').value = r_circ.xact_start() ? r_circ.xact_start().toString().substr(0,10) : '';
+      $('checked_in').value = r_circ.checkin_time() ? r_circ.checkin_time().toString().substr(0,10) : '';
+      $('due').value = r_circ.due_date() ? r_circ.due_date().toString().substr(0,10) : '';
+
+      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+      $('copy_summary').setAttribute('src',urls.XUL_COPY_SUMMARY + '?copy_id=' + r_circ.target_copy());
+      //get_contentWindow($('copy_summary')).xulG = { 'copy_id' : r_circ.target_copy() };
+      $('copy_summary').hidden=false;
+
+      g.network.simple_request(
+       'MODS_SLIM_RECORD_RETRIEVE_VIA_COPY.authoritative',
+       [ r_circ.target_copy() ],
+       function (rreq) {
+        var r_mvr = rreq.getResultObject();
+        if (instanceOf(r_mvr,mvr)) {
+         $('title').appendChild( document.createTextNode( String(r_mvr.title()).substr(0,50) ) );
+        } else {
+         g.network.simple_request(
+          'FM_ACP_RETRIEVE',
+          [ r_circ.target_copy() ],
+          function (rrreq) {
+           var r_acp = rrreq.getResultObject();
+           if (instanceOf(r_acp,acp)) {
+            $('title').appendChild( document.createTextNode( r_acp.dummy_title() ) );
+           }
+          }
+         );
+        }
+       }
+      );
+
+     }
+    }
+   );
+  }
+
+  function init_lists() {
+   JSAN.use('util.list'); 
+   g.bill_list = new util.list('bill_tree');
+
+   g.bill_list.init( {
+    'columns' : patron.util.mbts_columns({}),
+    'map_row_to_columns' : patron.util.std_map_row_to_columns(' '),
+    'on_select' : function(ev) {
+     JSAN.use('util.functional');
+     g.bill_list_selection = util.functional.map_list(
+      g.bill_list.retrieve_selection(),
+      function(o) { return o.getAttribute('retrieve_id'); }
+     );
+     $('details').disabled = g.bill_list_selection.length == 0;
+     $('add').disabled = g.bill_list_selection.length == 0;
+     $('summary').hidden = g.bill_list_selection.length == 0;
+     $('copy_summary').hidden = g.bill_list_selection.length == 0;
+     g.mbts_id = g.bill_list_selection[0];
+     retrieve_specific_mbts();
+     retrieve_circ();
+    },
                 'retrieve_row' : function(params) {
                     var id = params.retrieve_id;
-					var row = params.row;
-					if (id) {
-						if (typeof row.my == 'undefined') row.my = {};
-						if ( typeof row.my.mbts == 'undefined' ) {
-							var mbts_obj = g.network.simple_request('FM_MBTS_RETRIEVE.authoritative',[ses(),id]);
-							row.my.mbts = mbts_obj;
-						}
-					}
-					if (typeof params.on_retrieve == 'function') {
-						params.on_retrieve(row);
-					}
+     var row = params.row;
+     if (id) {
+      if (typeof row.my == 'undefined') row.my = {};
+      if ( typeof row.my.mbts == 'undefined' ) {
+       var mbts_obj = g.network.simple_request('FM_MBTS_RETRIEVE.authoritative',[ses(),id]);
+       row.my.mbts = mbts_obj;
+      }
+     }
+     if (typeof params.on_retrieve == 'function') {
+      params.on_retrieve(row);
+     }
                     return row;
                 },
-			} );
-
-		}
-
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			    if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-
-				JSAN.use('util.error'); g.error = new util.error();
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('util.date');
-				JSAN.use('util.money');
-				JSAN.use('patron.util');
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-				//g.data.temp = ''; g.data.stash('temp');
-
-				g.error.sdump('D_TRACE','my_init() for bill_history.xul');
-
-				retrieve_patron();
-
-				init_lists();
-
-				retrieve_mbts_for_list();
-
-				$('details').addEventListener(
-					'command',
-					handle_details,
-					false
-				);
-
-				$('add').addEventListener(
-					'command',
-					handle_add,
-					false
-				);
-
-				if (xul_param('current')) {
-					$('caption').setAttribute('label',$("patronStrings").getString('staff.patron.bill_history.my_init.current_bills'));
-					document.title = $("patronStrings").getString('staff.patron.bill_history.my_init.current_bills');
-				} else {
-					$('caption').setAttribute('label',$("patronStrings").getString('staff.patron.bill_history.my_init.bill_history'));
-					document.title = $("patronStrings").getString('staff.patron.bill_history.my_init.bill_history');
-				}
-
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/bill_history.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function handle_add() {
-			if(g.bill_list_selection.length > 1)
-				var msg = $("patronStrings").getFormattedString('staff.patron.bill_history.handle_add.message_plural', [g.bill_list_selection]);
-			else
-				var msg = $("patronStrings").getFormattedString('staff.patron.bill_history.handle_add.message_singular', [g.bill_list_selection]);
-				
-			var r = g.error.yns_alert(msg,
-				$("patronStrings").getString('staff.patron.bill_history.handle_add.title'),
-				$("patronStrings").getString('staff.patron.bill_history.handle_add.btn_yes'),
-				$("patronStrings").getString('staff.patron.bill_history.handle_add.btn_no'),null,
-				$("patronStrings").getString('staff.patron.bill_history.handle_add.confirm_message'));
-			if (r == 0) {
-				JSAN.use('util.window');
-				var win = new util.window();
-				var w = win.open(
-					urls.XUL_PATRON_BILL_WIZARD,
-						//+ '?patron_id=' + window.escape(g.patron_id)
-						//+ '&xact_id=' + window.escape( g.bill_list_selection[0] ),
-					'billwizard',
-					'chrome,resizable,modal',
-					{ 'patron_id' : g.patron_id, 'xact_id' : g.bill_list_selection[0] }
-				);
-				g.bill_list.clear();
-				retrieve_mbts_for_list();
-				if (typeof window.refresh == 'function') window.refresh();
-				if (typeof window.xulG == 'object' && typeof window.xulG.refresh == 'function') window.xulG.refresh();
-			}
-		}
-
-		function handle_details() {
-			JSAN.use('util.window'); var win = new util.window();
-			var my_xulG = win.open(
-				urls.XUL_PATRON_BILL_DETAILS,
-				//+ '?patron_id=' + window.escape(g.patron_id)
-				//+ '&mbts_id=' + window.escape( g.bill_list_selection[0] ),
-				'test_billdetails',
-				'chrome,resizable',
-				{
-					'patron_id' : g.patron_id,
-					'mbts_id' : g.bill_list_selection[0],
-					'refresh' : function() { 
-						if (typeof window.refresh == 'function') window.refresh();
-						if (typeof window.xulG == 'object' && typeof window.xulG.refresh == 'function') window.xulG.refresh();
-					}, 
-				}
-			);
-		}
-
-		function print_bills() {
-			try {
+   } );
+
+  }
+
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+       if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+
+    JSAN.use('util.error'); g.error = new util.error();
+    JSAN.use('util.network'); g.network = new util.network();
+    JSAN.use('util.date');
+    JSAN.use('util.money');
+    JSAN.use('patron.util');
+    JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+    //g.data.temp = ''; g.data.stash('temp');
+
+    g.error.sdump('D_TRACE','my_init() for bill_history.xul');
+
+    retrieve_patron();
+
+    init_lists();
+
+    retrieve_mbts_for_list();
+
+    $('details').addEventListener(
+     'command',
+     handle_details,
+     false
+    );
+
+    $('add').addEventListener(
+     'command',
+     handle_add,
+     false
+    );
+
+    if (xul_param('current')) {
+     $('caption').setAttribute('label',$("patronStrings").getString('staff.patron.bill_history.my_init.current_bills'));
+     document.title = $("patronStrings").getString('staff.patron.bill_history.my_init.current_bills');
+    } else {
+     $('caption').setAttribute('label',$("patronStrings").getString('staff.patron.bill_history.my_init.bill_history'));
+     document.title = $("patronStrings").getString('staff.patron.bill_history.my_init.bill_history');
+    }
+
+   } catch(E) {
+    var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/bill_history.xul', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+
+  function handle_add() {
+   if(g.bill_list_selection.length > 1)
+    var msg = $("patronStrings").getFormattedString('staff.patron.bill_history.handle_add.message_plural', [g.bill_list_selection]);
+   else
+    var msg = $("patronStrings").getFormattedString('staff.patron.bill_history.handle_add.message_singular', [g.bill_list_selection]);
+    
+   var r = g.error.yns_alert(msg,
+    $("patronStrings").getString('staff.patron.bill_history.handle_add.title'),
+    $("patronStrings").getString('staff.patron.bill_history.handle_add.btn_yes'),
+    $("patronStrings").getString('staff.patron.bill_history.handle_add.btn_no'),null,
+    $("patronStrings").getString('staff.patron.bill_history.handle_add.confirm_message'));
+   if (r == 0) {
+    JSAN.use('util.window');
+    var win = new util.window();
+    var w = win.open(
+     urls.XUL_PATRON_BILL_WIZARD,
+      //+ '?patron_id=' + window.escape(g.patron_id)
+      //+ '&xact_id=' + window.escape( g.bill_list_selection[0] ),
+     'billwizard',
+     'chrome,resizable,modal',
+     { 'patron_id' : g.patron_id, 'xact_id' : g.bill_list_selection[0] }
+    );
+    g.bill_list.clear();
+    retrieve_mbts_for_list();
+    if (typeof window.refresh == 'function') window.refresh();
+    if (typeof window.xulG == 'object' && typeof window.xulG.refresh == 'function') window.xulG.refresh();
+   }
+  }
+
+  function handle_details() {
+   JSAN.use('util.window'); var win = new util.window();
+   var my_xulG = win.open(
+    urls.XUL_PATRON_BILL_DETAILS,
+    //+ '?patron_id=' + window.escape(g.patron_id)
+    //+ '&mbts_id=' + window.escape( g.bill_list_selection[0] ),
+    'test_billdetails',
+    'chrome,resizable',
+    {
+     'patron_id' : g.patron_id,
+     'mbts_id' : g.bill_list_selection[0],
+     'refresh' : function() { 
+      if (typeof window.refresh == 'function') window.refresh();
+      if (typeof window.xulG == 'object' && typeof window.xulG.refresh == 'function') window.xulG.refresh();
+     }, 
+    }
+   );
+  }
+
+  function print_bills() {
+   try {
                 var template = 'bills_historical'; if (xul_param('current')) template = 'bills_current';
                 JSAN.use('patron.util');
                 var params = { 
                     'patron' : patron.util.retrieve_au_via_id(ses(),g.patron_id), 
                     'template' : template
                 };
-				g.bill_list.print(params);
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.bill_history.print_bills.print_error'), E);
-			}
-		}
+    g.bill_list.print(params);
+   } catch(E) {
+    g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.bill_history.print_bills.print_error'), E);
+   }
+  }
 
-	]]>
-	</script>
+ ]]>
+ </script>
 
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+ <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
-	<vbox flex="1" class="my_overflow">
+ <vbox flex="1" class="my_overflow">
         <vbox id="v1" oils_persist="height" flex="1">
-    		<label id="patron_name" class="patronNameLarge"/>
-    		<groupbox orient="vertical" id="summary" hidden="true" flex="1"/>
+      <label id="patron_name" class="patronNameLarge"/>
+      <groupbox orient="vertical" id="summary" hidden="true" flex="1"/>
         </vbox>
 
-	    <splitter><grippy/></splitter>
+     <splitter><grippy/></splitter>
 
         <vbox id="v2" oils_persist="height" flex="1">
-       		<iframe id="copy_summary" hidden="true"/>
+         <iframe id="copy_summary" hidden="true"/>
         </vbox>
 
-		<splitter><grippy/></splitter>
+  <splitter><grippy/></splitter>
 
         <vbox id="v3" oils_persist="height" flex="3">
             <groupbox orient="vertical" flex="1">
@@ -379,7 +379,7 @@
                 <button label="&staff.patron.bill_history.close_window.label;" oncommand="window.close()" accesskey="&staff.patron.bill_history.close_window.accesskey;"/>
             </hbox>
         </vbox>
-	</vbox>
+ </vbox>
 
 
 </window>
diff --git a/Open-ILS/xul/staff_client/server/patron/bill_summary_overlay.xul b/Open-ILS/xul/staff_client/server/patron/bill_summary_overlay.xul
index dbb6da29da..68d4ea15d1 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill_summary_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill_summary_overlay.xul
@@ -1,60 +1,60 @@
 <?xml version="1.0"?>
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 <overlay id="bills_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-			<groupbox orient="vertical" flex="1" id="summary">
-				<caption label="Summary" />
-				<hbox>
-					<label class="header1" id="billing_location"/>
-				</hbox>
-				<grid flex="1">
-					<columns>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="2"/>
-					</columns>
-					<rows>
-						<row>
-							<label class="header" value="&staff.patron.bill_summary_overlay.bill_number.value;"/>
-							<label id="mbts_id" />
-							<label class="header" value="&staff.patron.bill_summary_overlay.total_billed.value;"/>
-							<label id="mbts_total_owed" />
-							<label class="header" id="title_label" value="&staff.patron.bill_summary_overlay.title.value;" hidden="true"/>
-							<description id="title"/>
-						</row>
-						<row>
-							<label class="header" value="&staff.patron.bill_summary_overlay.type.value;"/>
-							<label id="mbts_xact_type"/>
-							<label class="header" value="&staff.patron.bill_summary_overlay.total_paid.value;"/>
-							<label id="mbts_total_paid" />
-							<label class="header" id="checked_out_label" value="&staff.patron.bill_summary_overlay.checked_out.value;" hidden="true"/>
-							<label id="checked_out"/>
-						</row>
-						<row>
-							<label class="header" value="&staff.patron.bill_summary_overlay.start.value;"/>
-							<label id="mbts_xact_start"/>
-							<label class="header" value="&staff.patron.bill_summary_overlay.balance_owed.value;"/>
-							<label id="mbts_balance_owed" />
-							<label class="header" id="due_label" value="&staff.patron.bill_summary_overlay.due_date.value;" hidden="true"/>
-							<label id="due"/>
-						</row>
-						<row>
-							<label class="header" value="&staff.patron.bill_summary_overlay.finish.value;"/>
-							<label id="mbts_xact_finish"/>
-							<label class="header" value="&staff.patron.bill_summary_overlay.renewal.value;"/>
-							<label id="renewal"/>
-							<label class="header" id="checked_in_label" value="&staff.patron.bill_summary_overlay.checked_in.value;" hidden="true"/>
-							<label id="checked_in"/>
-						</row>
-					</rows>
-				</grid>
-			</groupbox>
+   <groupbox orient="vertical" flex="1" id="summary">
+    <caption label="Summary" />
+    <hbox>
+     <label class="header1" id="billing_location"/>
+    </hbox>
+    <grid flex="1">
+     <columns>
+      <column flex="1"/>
+      <column flex="1"/>
+      <column flex="1"/>
+      <column flex="1"/>
+      <column flex="1"/>
+      <column flex="2"/>
+     </columns>
+     <rows>
+      <row>
+       <label class="header" value="&staff.patron.bill_summary_overlay.bill_number.value;"/>
+       <label id="mbts_id" />
+       <label class="header" value="&staff.patron.bill_summary_overlay.total_billed.value;"/>
+       <label id="mbts_total_owed" />
+       <label class="header" id="title_label" value="&staff.patron.bill_summary_overlay.title.value;" hidden="true"/>
+       <description id="title"/>
+      </row>
+      <row>
+       <label class="header" value="&staff.patron.bill_summary_overlay.type.value;"/>
+       <label id="mbts_xact_type"/>
+       <label class="header" value="&staff.patron.bill_summary_overlay.total_paid.value;"/>
+       <label id="mbts_total_paid" />
+       <label class="header" id="checked_out_label" value="&staff.patron.bill_summary_overlay.checked_out.value;" hidden="true"/>
+       <label id="checked_out"/>
+      </row>
+      <row>
+       <label class="header" value="&staff.patron.bill_summary_overlay.start.value;"/>
+       <label id="mbts_xact_start"/>
+       <label class="header" value="&staff.patron.bill_summary_overlay.balance_owed.value;"/>
+       <label id="mbts_balance_owed" />
+       <label class="header" id="due_label" value="&staff.patron.bill_summary_overlay.due_date.value;" hidden="true"/>
+       <label id="due"/>
+      </row>
+      <row>
+       <label class="header" value="&staff.patron.bill_summary_overlay.finish.value;"/>
+       <label id="mbts_xact_finish"/>
+       <label class="header" value="&staff.patron.bill_summary_overlay.renewal.value;"/>
+       <label id="renewal"/>
+       <label class="header" id="checked_in_label" value="&staff.patron.bill_summary_overlay.checked_in.value;" hidden="true"/>
+       <label id="checked_in"/>
+      </row>
+     </rows>
+    </grid>
+   </groupbox>
 
 
 </overlay>
diff --git a/Open-ILS/xul/staff_client/server/patron/bill_wizard.xul b/Open-ILS/xul/staff_client/server/patron/bill_wizard.xul
index 85b10a6854..4da52f4f84 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill_wizard.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill_wizard.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -21,55 +21,55 @@
 <?xul-overlay href="/xul/server/patron/bill_summary_overlay.xul"?>
 
 <window id="patron_bill" title="&staff.patron.bill_wizard.title;"
-	orient="vertical" style="overflow: auto"
-	onload="try { patron_bill_init(); font_helper(); } catch(E) { alert(E); }" width="700" height="550"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ orient="vertical" style="overflow: auto"
+ onload="try { patron_bill_init(); font_helper(); } catch(E) { alert(E); }" width="700" height="550"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="/xul/server/patron/bill_wizard.js"/>
-	
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script type="text/javascript" src="/xul/server/patron/bill_wizard.js"/>
+ 
+ <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
-	<vbox flex="1">
+ <vbox flex="1">
 
-			<label id="patron_name" class="patronNameLarge"/>
+   <label id="patron_name" class="patronNameLarge"/>
 
-			<groupbox orient="vertical" flex="1" id="summary" hidden="true"/>
+   <groupbox orient="vertical" flex="1" id="summary" hidden="true"/>
 
-			<groupbox flex="1">
-				<caption label="&staff.patron.bill_wizard.create_bill.label;"/>
-				<grid>
-					<columns> <column flex="0" /> <column flex="0" /> </columns>
-					<rows id="page1_rows">
-						<row><label value="&staff.patron.bill_wizard.location.value;"/><textbox id="billing_location" disabled="true" context="clipboard" /></row>
-						<row><label value="&staff.patron.bill_wizard.transaction_type.value;"/>
-							<menulist id="xact_type">
-								<menupopup>
-									<menuitem label="&staff.patron.bill_wizard.grocery.label;" value="grocery" selected="true"/>
-									<menuitem label="&staff.patron.bill_wizard.circulation.label;" value="circulation" disabled="true"/>
-								</menupopup>
-							</menulist>
-						</row>
-						<row><label value="&staff.patron.bill_wizard.billing_type.label;"/>
-							<hbox id="menu_placeholder"/>
-						</row>
-						<row><label value="&staff.patron.bill_wizard.amount.value;"/><textbox id="bill_amount" context="clipboard" /></row>
-						<row><label value="&staff.patron.bill_wizard.note.value;"/><textbox id="bill_note" multiline="true" rows="5" context="clipboard" /></row>
-					</rows>
-				</grid>
-				<spacer flex="1"/>
-				<hbox>
-					<spacer flex="1"/>
-					<button label="&staff.patron.bill_wizard.cancel.label;" oncommand="window.close()" accesskey="&staff.patron.bill_wizard.cancel.accesskey;"/>
-					<button label="&staff.patron.bill_wizard.submit.label;" oncommand="patron_bill_finish(); window.close();" accesskey="&staff.patron.bill_wizard.submit.accesskey;"/>
-				</hbox>
-			</groupbox>
-	</vbox>
+   <groupbox flex="1">
+    <caption label="&staff.patron.bill_wizard.create_bill.label;"/>
+    <grid>
+     <columns> <column flex="0" /> <column flex="0" /> </columns>
+     <rows id="page1_rows">
+      <row><label value="&staff.patron.bill_wizard.location.value;"/><textbox id="billing_location" disabled="true" context="clipboard" /></row>
+      <row><label value="&staff.patron.bill_wizard.transaction_type.value;"/>
+       <menulist id="xact_type">
+        <menupopup>
+         <menuitem label="&staff.patron.bill_wizard.grocery.label;" value="grocery" selected="true"/>
+         <menuitem label="&staff.patron.bill_wizard.circulation.label;" value="circulation" disabled="true"/>
+        </menupopup>
+       </menulist>
+      </row>
+      <row><label value="&staff.patron.bill_wizard.billing_type.label;"/>
+       <hbox id="menu_placeholder"/>
+      </row>
+      <row><label value="&staff.patron.bill_wizard.amount.value;"/><textbox id="bill_amount" context="clipboard" /></row>
+      <row><label value="&staff.patron.bill_wizard.note.value;"/><textbox id="bill_note" multiline="true" rows="5" context="clipboard" /></row>
+     </rows>
+    </grid>
+    <spacer flex="1"/>
+    <hbox>
+     <spacer flex="1"/>
+     <button label="&staff.patron.bill_wizard.cancel.label;" oncommand="window.close()" accesskey="&staff.patron.bill_wizard.cancel.accesskey;"/>
+     <button label="&staff.patron.bill_wizard.submit.label;" oncommand="patron_bill_finish(); window.close();" accesskey="&staff.patron.bill_wizard.submit.accesskey;"/>
+    </hbox>
+   </groupbox>
+ </vbox>
 </window>
 
 
diff --git a/Open-ILS/xul/staff_client/server/patron/bills.js b/Open-ILS/xul/staff_client/server/patron/bills.js
index f8ef689b06..cdabe17ee8 100644
--- a/Open-ILS/xul/staff_client/server/patron/bills.js
+++ b/Open-ILS/xul/staff_client/server/patron/bills.js
@@ -5,682 +5,682 @@ function $(id) { return document.getElementById(id); }
 if (typeof patron == 'undefined') patron = {};
 patron.bills = function (params) {
 
-	var obj = this;
-	try { JSAN.use('util.error'); obj.error = new util.error(); } catch(E) { alert(E); }
-	try { JSAN.use('util.network'); obj.network = new util.network(); } catch(E) { alert(E); }
-	try { 
-		obj.OpenILS = {}; JSAN.use('OpenILS.data'); obj.OpenILS.data = new OpenILS.data(); obj.OpenILS.data.init({'via':'stash'}); 
-		obj.data = obj.OpenILS.data;
-		obj.data.voided_billings = []; obj.data.stash('voided_billings');
-	} catch(E) { 
-		alert(E); 
-	}
+ var obj = this;
+ try { JSAN.use('util.error'); obj.error = new util.error(); } catch(E) { alert(E); }
+ try { JSAN.use('util.network'); obj.network = new util.network(); } catch(E) { alert(E); }
+ try { 
+  obj.OpenILS = {}; JSAN.use('OpenILS.data'); obj.OpenILS.data = new OpenILS.data(); obj.OpenILS.data.init({'via':'stash'}); 
+  obj.data = obj.OpenILS.data;
+  obj.data.voided_billings = []; obj.data.stash('voided_billings');
+ } catch(E) { 
+  alert(E); 
+ }
 }
 
 patron.bills.prototype = {
 
-	'bill_map' : {},
+ 'bill_map' : {},
 
-	'current_payments' : [],
+ 'current_payments' : [],
 
     'SHOW_ME_THE_BILLS' : 'FM_MOBTS_HAVING_BALANCE.authoritative',
 
-	'refresh' : function(dont_show_me_the_money) {
-		var obj = this;
-		try {
+ 'refresh' : function(dont_show_me_the_money) {
+  var obj = this;
+  try {
                 if (document.getElementById('circulating_hint')) {
                     document.getElementById('circulating_hint').hidden = true;
                 }
 
-				obj.bills = obj.network.simple_request(
-					obj.SHOW_ME_THE_BILLS,
-					[ ses(), obj.patron_id ]
-				);
-				//alert('obj.bills = ' + js2JSON(obj.bills));
-
-				for (var i = 0; i < obj.bills.length; i++) {
-					if (instanceOf(obj.bills[i],mobts)) {
-						obj.bills[i] = { 'transaction' : obj.bills[i] }
-					} else if (instanceOf(obj.bills[i],mbts)) {
-						obj.bills[i] = { 'transaction' : obj.bills[i] }
-					} else {
-						var robj = obj.network.simple_request('FM_MBTS_RETRIEVE.authoritative',[ses(),obj.bills[i]]);
-						//alert('refresh robj = ' + js2JSON(robj));
-						obj.bills[i] = { 'transaction' : robj }
-					}
-				}
-
-				if (!dont_show_me_the_money) {
-					//alert('dont_show_me_the_money = ' + dont_show_me_the_money);
-					if (window.xulG && typeof window.xulG.on_money_change == 'function') {
-						try { window.xulG.on_money_change(obj.bills); } catch(E) { this.error.sdump('D_ERROR',E); }
-					}
-				}
-
-				var tbs = document.getElementsByTagName('textbox');
-				for (var i = 0; i < tbs.length; i++) {
-					tbs[i].value = ''; tbs[i].setAttribute('value','');
-				}
-				obj.init();
-				obj.controller.view.bill_payment_amount.focus();
-				obj.distribute_payment(obj.controller.view.bill_payment_amount);
-				obj.tally_selected();
-				obj.tally_voided();
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert('bills -> refresh',E);	
-		}
-	},
-
-	'init' : function( params ) {
-	
-		var obj = this;
-
-		try {
-				obj.init_controller( params );
-
-				obj.retrieve();
-
-				var total_owed = 0;
-
-				JSAN.use('util.money');
-
-				obj.current_payments = []; obj.list.clear();
-				//FIXME//.bills virtual field
-				for (var i = 0; i < obj.bills.length; i++) {
-					var rparams = obj.list.append( 
-						{ 'row' : 
-							{ 'my' : 
-								{ 'mobts' : obj.bills[i].transaction, 'circ' : obj.bills[i].circ, 'mvr' : obj.bills[i].record } 
-							}, 
-							'attributes' : { 'allowevents' : true } 
-						} 
-					);
-					var rnode = rparams.my_node;
-					obj.bill_map[ obj.bills[i].transaction.id() ] = obj.bills[i];
-					var cb = rnode.getElementsByTagName('checkbox')[0];
-					var tb = rnode.getElementsByTagName('textbox')[0];
-					var bo = obj.bills[i].transaction.balance_owed();
-					total_owed += util.money.dollars_float_to_cents_integer( bo );
-					var id = obj.bills[i].transaction.id();
-					obj.current_payments.push( { 'mobts_id' : id, 'balance_owed' : bo, 'checkbox' : cb, 'textbox' : tb } );
-				}
-				obj.controller.view.bill_total_owed.value = util.money.cents_as_dollars( total_owed );
-				obj.controller.view.bill_total_owed.setAttribute('value',obj.controller.view.bill_total_owed.value);
-				obj.distribute_payment(obj.controller.view.bill_payment_amount);
-				obj.controller.view.bill_payment_amount.select();
-				obj.tally_selected();
-				obj.tally_voided();
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert('bills -> init',E);	
-		}
-	},
-
-	'init_controller' : function( params ) {
-
-		var obj = this;
-
-		try {
-				if (obj._controller_inited) return;
-
-				obj.patron_id = obj.patron_id || params['patron_id'];
-
-				JSAN.use('util.list'); obj.list = new util.list('bill_list');
-
-				obj.list.init(
-					{
-						'columns' : [
-						/*
-								{
-									'id' : 'xact_dates', 'label' : document.getElementById('commonStrings').getString('staff.bills_xact_dates_label'), 'flex' : 1,
-									'primary' : false, 'hidden' : false, 'render' : 'obj.xact_dates_box(my.mobts)'
-								},
-						*/
-								{
-									'id' : 'notes', 'label' : document.getElementById('commonStrings').getString('staff.bills_information'), 'flex' : 2,
-									'primary' : false, 'hidden' : false, 'render' : 'obj.info_box(my)'
-								},
-								{
-									'id' : 'money', 'label' : $('patronStrings').getString('staff.patron.bills.init_controller.money_summary_label'), 'flex' : 1,
-									'primary' : false, 'hidden' : false, 'render' : 'obj.money_box(my.mobts)'
-								},
-								{
-									'id' : 'current_pay', 'label' : document.getElementById('commonStrings').getString('staff.bills_current_payment_label'), 'flex' : 0, 
-									'render' : 'obj.payment_box()'
-								}
-						],
-						'map_row_to_column' : obj.gen_map_row_to_column()
-					}
-				);
-
-				JSAN.use('util.controller'); obj.controller = new util.controller();
-				obj.controller.init(
-					{
-						'control_map' : {
-							'cmd_broken' : [
-								['command'],
-								function() { alert($("commonStrings").getString('common.unimplemented')); }
-							],
-							'cmd_bill_wizard' : [
-								['command'],
-								function() { 
-									try {
-										JSAN.use('util.window');
-										var win = new util.window();
-										var my_xulG = win.open(
-											urls.XUL_PATRON_BILL_WIZARD,
-												//+ '?patron_id=' + window.escape(obj.patron_id),
-											'billwizard',
-											'chrome,resizable,modal',
-											{ 'patron_id' : obj.patron_id }
-										);
-										obj.refresh();
-									} catch(E) {
-										obj.error.standard_unexpected_error_alert('bills -> cmd_bill_wizard',E);	
-									}
-								}
-							],
-							'cmd_bill_history' : [
-								['command'],
-								function() { 
-									try {
-										JSAN.use('util.window');
-										var win = new util.window();
-										//obj.OpenILS.data.init({'via':'stash'}); obj.OpenILS.data.temp = ''; obj.OpenILS.data.stash('temp');
-										var my_xulG = win.open(
-											urls.XUL_PATRON_BILL_HISTORY,
-												//+ '?patron_id=' + window.escape(obj.patron_id),
-											'billhistory',
-											//'chrome,resizable,modal'
-											'chrome,resizable',
-											{
-												'patron_id' : obj.patron_id,
-												'refresh' : function() { obj.refresh(); }
-											}
-										);
-									} catch(E) {
-										obj.error.standard_unexpected_error_alert('bills -> cmd_bill_history',E);	
-									}
-								}
-							],
-							'cmd_alternate_view' : [
-								['command'],
-								function() { 
-									try {
-										JSAN.use('util.window');
-										var win = new util.window();
-										//obj.OpenILS.data.init({'via':'stash'}); obj.OpenILS.data.temp = ''; obj.OpenILS.data.stash('temp');
-										var my_xulG = win.open(
-											urls.XUL_PATRON_BILL_HISTORY,
-												//+ '?current=1&patron_id=' + window.escape(obj.patron_id),
-											'billhistory',
-											//'chrome,resizable,modal'
-											'chrome,resizable',
-											{
-												'current' : 1,
-												'patron_id' : obj.patron_id,
-												'refresh' : function() { obj.refresh(); }
-											}
-										);
-									} catch(E) {
-										obj.error.standard_unexpected_error_alert('bills -> cmd_alternate_view',E);	
-									}
-								}
-							],
+    obj.bills = obj.network.simple_request(
+     obj.SHOW_ME_THE_BILLS,
+     [ ses(), obj.patron_id ]
+    );
+    //alert('obj.bills = ' + js2JSON(obj.bills));
+
+    for (var i = 0; i < obj.bills.length; i++) {
+     if (instanceOf(obj.bills[i],mobts)) {
+      obj.bills[i] = { 'transaction' : obj.bills[i] }
+     } else if (instanceOf(obj.bills[i],mbts)) {
+      obj.bills[i] = { 'transaction' : obj.bills[i] }
+     } else {
+      var robj = obj.network.simple_request('FM_MBTS_RETRIEVE.authoritative',[ses(),obj.bills[i]]);
+      //alert('refresh robj = ' + js2JSON(robj));
+      obj.bills[i] = { 'transaction' : robj }
+     }
+    }
+
+    if (!dont_show_me_the_money) {
+     //alert('dont_show_me_the_money = ' + dont_show_me_the_money);
+     if (window.xulG && typeof window.xulG.on_money_change == 'function') {
+      try { window.xulG.on_money_change(obj.bills); } catch(E) { this.error.sdump('D_ERROR',E); }
+     }
+    }
+
+    var tbs = document.getElementsByTagName('textbox');
+    for (var i = 0; i < tbs.length; i++) {
+     tbs[i].value = ''; tbs[i].setAttribute('value','');
+    }
+    obj.init();
+    obj.controller.view.bill_payment_amount.focus();
+    obj.distribute_payment(obj.controller.view.bill_payment_amount);
+    obj.tally_selected();
+    obj.tally_voided();
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert('bills -> refresh',E); 
+  }
+ },
+
+ 'init' : function( params ) {
+ 
+  var obj = this;
+
+  try {
+    obj.init_controller( params );
+
+    obj.retrieve();
+
+    var total_owed = 0;
+
+    JSAN.use('util.money');
+
+    obj.current_payments = []; obj.list.clear();
+    //FIXME//.bills virtual field
+    for (var i = 0; i < obj.bills.length; i++) {
+     var rparams = obj.list.append( 
+      { 'row' : 
+       { 'my' : 
+        { 'mobts' : obj.bills[i].transaction, 'circ' : obj.bills[i].circ, 'mvr' : obj.bills[i].record } 
+       }, 
+       'attributes' : { 'allowevents' : true } 
+      } 
+     );
+     var rnode = rparams.my_node;
+     obj.bill_map[ obj.bills[i].transaction.id() ] = obj.bills[i];
+     var cb = rnode.getElementsByTagName('checkbox')[0];
+     var tb = rnode.getElementsByTagName('textbox')[0];
+     var bo = obj.bills[i].transaction.balance_owed();
+     total_owed += util.money.dollars_float_to_cents_integer( bo );
+     var id = obj.bills[i].transaction.id();
+     obj.current_payments.push( { 'mobts_id' : id, 'balance_owed' : bo, 'checkbox' : cb, 'textbox' : tb } );
+    }
+    obj.controller.view.bill_total_owed.value = util.money.cents_as_dollars( total_owed );
+    obj.controller.view.bill_total_owed.setAttribute('value',obj.controller.view.bill_total_owed.value);
+    obj.distribute_payment(obj.controller.view.bill_payment_amount);
+    obj.controller.view.bill_payment_amount.select();
+    obj.tally_selected();
+    obj.tally_voided();
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert('bills -> init',E); 
+  }
+ },
+
+ 'init_controller' : function( params ) {
+
+  var obj = this;
+
+  try {
+    if (obj._controller_inited) return;
+
+    obj.patron_id = obj.patron_id || params['patron_id'];
+
+    JSAN.use('util.list'); obj.list = new util.list('bill_list');
+
+    obj.list.init(
+     {
+      'columns' : [
+      /*
+        {
+         'id' : 'xact_dates', 'label' : document.getElementById('commonStrings').getString('staff.bills_xact_dates_label'), 'flex' : 1,
+         'primary' : false, 'hidden' : false, 'render' : 'obj.xact_dates_box(my.mobts)'
+        },
+      */
+        {
+         'id' : 'notes', 'label' : document.getElementById('commonStrings').getString('staff.bills_information'), 'flex' : 2,
+         'primary' : false, 'hidden' : false, 'render' : 'obj.info_box(my)'
+        },
+        {
+         'id' : 'money', 'label' : $('patronStrings').getString('staff.patron.bills.init_controller.money_summary_label'), 'flex' : 1,
+         'primary' : false, 'hidden' : false, 'render' : 'obj.money_box(my.mobts)'
+        },
+        {
+         'id' : 'current_pay', 'label' : document.getElementById('commonStrings').getString('staff.bills_current_payment_label'), 'flex' : 0, 
+         'render' : 'obj.payment_box()'
+        }
+      ],
+      'map_row_to_column' : obj.gen_map_row_to_column()
+     }
+    );
+
+    JSAN.use('util.controller'); obj.controller = new util.controller();
+    obj.controller.init(
+     {
+      'control_map' : {
+       'cmd_broken' : [
+        ['command'],
+        function() { alert($("commonStrings").getString('common.unimplemented')); }
+       ],
+       'cmd_bill_wizard' : [
+        ['command'],
+        function() { 
+         try {
+          JSAN.use('util.window');
+          var win = new util.window();
+          var my_xulG = win.open(
+           urls.XUL_PATRON_BILL_WIZARD,
+            //+ '?patron_id=' + window.escape(obj.patron_id),
+           'billwizard',
+           'chrome,resizable,modal',
+           { 'patron_id' : obj.patron_id }
+          );
+          obj.refresh();
+         } catch(E) {
+          obj.error.standard_unexpected_error_alert('bills -> cmd_bill_wizard',E); 
+         }
+        }
+       ],
+       'cmd_bill_history' : [
+        ['command'],
+        function() { 
+         try {
+          JSAN.use('util.window');
+          var win = new util.window();
+          //obj.OpenILS.data.init({'via':'stash'}); obj.OpenILS.data.temp = ''; obj.OpenILS.data.stash('temp');
+          var my_xulG = win.open(
+           urls.XUL_PATRON_BILL_HISTORY,
+            //+ '?patron_id=' + window.escape(obj.patron_id),
+           'billhistory',
+           //'chrome,resizable,modal'
+           'chrome,resizable',
+           {
+            'patron_id' : obj.patron_id,
+            'refresh' : function() { obj.refresh(); }
+           }
+          );
+         } catch(E) {
+          obj.error.standard_unexpected_error_alert('bills -> cmd_bill_history',E); 
+         }
+        }
+       ],
+       'cmd_alternate_view' : [
+        ['command'],
+        function() { 
+         try {
+          JSAN.use('util.window');
+          var win = new util.window();
+          //obj.OpenILS.data.init({'via':'stash'}); obj.OpenILS.data.temp = ''; obj.OpenILS.data.stash('temp');
+          var my_xulG = win.open(
+           urls.XUL_PATRON_BILL_HISTORY,
+            //+ '?current=1&patron_id=' + window.escape(obj.patron_id),
+           'billhistory',
+           //'chrome,resizable,modal'
+           'chrome,resizable',
+           {
+            'current' : 1,
+            'patron_id' : obj.patron_id,
+            'refresh' : function() { obj.refresh(); }
+           }
+          );
+         } catch(E) {
+          obj.error.standard_unexpected_error_alert('bills -> cmd_alternate_view',E); 
+         }
+        }
+       ],
                             'cmd_print_bills' : [
                                 ['command'],
                                 function() {
-									try {
-										obj.print_bills();
-									} catch(E) {
-										obj.error.standard_unexpected_error_alert('bills -> cmd_print_bills',E);	
-									}
+         try {
+          obj.print_bills();
+         } catch(E) {
+          obj.error.standard_unexpected_error_alert('bills -> cmd_print_bills',E); 
+         }
 
                                 }
                             ],
-							'cmd_change_to_credit' : [
-								['command'],
-								function() {
-									try {
-										obj.change_to_credit();
-									} catch(E) {
-										obj.error.standard_unexpected_error_alert('bills -> cmd_change_to_credit',E);	
-									}
-								}
-							],
-							'cmd_bill_apply_payment' : [
-								['command'],
-								function() {
-									try { 
-										obj.apply_payment(); 
-									} catch(E) { 
-										obj.error.standard_unexpected_error_alert('bills -> cmd_bill_apply_payment',E);	
-									}
-								}
-							],
-							'cmd_check_all' : [
-								['command'],
-								function() {
-									for (var i = 0; i < obj.current_payments.length; i++) {
-										obj.current_payments[i].checkbox.setAttribute('checked',true); //checked = true;
-									}
-									obj.distribute_payment(obj.controller.view.bill_payment_amount);
-									obj.tally_selected();
-								}
-							],
-							'cmd_uncheck_all' : [
-								['command'],
-								function() {
-									for (var i = 0; i < obj.current_payments.length; i++) {
-										obj.current_payments[i].checkbox.setAttribute('checked',false); //checked = false;
-									}
-									obj.distribute_payment(obj.controller.view.bill_payment_amount);
-									obj.tally_selected();
-								}
-							],
-							'voided_balance' : [
-								['render'],
-								function(e) { return function() {}; }
-							],
-							'selected_balance' : [
-								['render'],
-								function(e) { return function() {}; }
-							],
-							'unselected_balance' : [
-								['render'],
-								function(e) { return function() {}; }
-							],
-							'bill_total_owed' : [
-								['render'],
-								function(e) { return function() {}; }
-							],
-							'payment_type' : [
-								['render'],
-								function(e) { return function() {}; }
-							],
-							'bill_payment_amount' : [
-								['change','keypress'],
-								function(ev) {
-									try {
-											if (ev.type == 'keypress') {
-												if (! (ev.keyCode == 13 /* enter */ || ev.keyCode == 77 /* mac enter */) ) {
-													return;	
-												}
-											}
-											if (ev.type == 'change' && obj.controller.view.payment_type.value == 'credit_payment') {
-												JSAN.use('util.money');
-												JSAN.use('patron.util'); var au_obj = patron.util.retrieve_au_via_id(ses(),obj.patron_id);
-												var proposed = util.money.dollars_float_to_cents_integer(ev.target.value);
-												var available = util.money.dollars_float_to_cents_integer(au_obj.credit_forward_balance());
-												if (proposed > available) {
-													alert($("patronStrings").getFormattedString('staff.patron.bills.bill_payment_amount.credit_amount', [au_obj.credit_forward_balance()]));
-													ev.target.value = util.money.cents_as_dollars( available );
-													ev.target.setAttribute('value',ev.target.value);
-												}
-											}
-											obj.distribute_payment(ev.target);
-											ev.target.select();
-											obj.tally_selected();
-									} catch(E) {
-										obj.error.standard_unexpected_error_alert('bills -> bill_payment_amount',E);	
-									}
-								} 
-							],
-							'bill_payment_applied' : [
-								['render'],
-								function(e) { return function() {}; }
-							],
-							'bill_change_amount' : [
-								['change'],
-								function(ev) {
-									try {
-											JSAN.use('util.money');
-											var tb = ev.target;
-											var proposed_change = util.money.dollars_float_to_cents_integer( tb.value );
-											var proposed_credit = 0;
-											obj.update_payment_applied();
-											var real_change = util.money.dollars_float_to_cents_integer( tb.value );
-											if ( proposed_change > real_change ) {
-												obj.error.sdump('D_ERROR',$("patronStrings").getString('staff.patron.bills.bill_change_amount.greedy'));
-												proposed_change = real_change;
-											} else if ( real_change > proposed_change ) {
-												proposed_credit = real_change - proposed_change;
-											}
-											tb.value = util.money.cents_as_dollars( proposed_change );
-											tb.setAttribute('value',tb.value);
-											obj.controller.view.bill_credit_amount.value = util.money.cents_as_dollars( proposed_credit );
-											obj.controller.view.bill_credit_amount.setAttribute(
-												'value',
-												obj.controller.view.bill_credit_amount.value
-											);
-									} catch(E) {
-										obj.error.standard_unexpected_error_alert('bills -> bill_change_amount',E);	
-									}
-								}
-							],
-							'bill_credit_amount' : [
-								['render'],
-								function(e) { return function() {}; }
-							],
-							'bill_new_balance' : [
-								['render'],
-								function(e) { return function() {}; }
-							]
-						}
-					}
-				);
-
-				obj.controller.render();
-				obj._controller_inited = true;
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert('bills -> init_controller',E);	
-		}
-
-	},
-
-	/*****************************************************************************************************************************/
-
-	'distribute_payment' : function(node) {
-		try {
-			var obj = this;
-			JSAN.use('util.money');
-			var tb = node;
-			tb.value = util.money.cents_as_dollars( util.money.dollars_float_to_cents_integer( tb.value ) );
-			tb.setAttribute('value', tb.value );
-			var total = util.money.dollars_float_to_cents_integer( tb.value );
-			if (total < 0) { tb.value = '0.00'; tb.setAttribute('value','0.00'); total = 0; }
-			for (var i = 0; i < obj.current_payments.length; i++) {
-					var bill = obj.current_payments[i];
-					if (bill.checkbox.checked || bill.checkbox.getAttribute('checked') == 'true') {
-						var bo = util.money.dollars_float_to_cents_integer( bill.balance_owed );
-						if ( bo > total ) {
-							bill.textbox.value = util.money.cents_as_dollars( total );
-							total = 0;
-						} else {
-							bill.textbox.value = util.money.cents_as_dollars( bo );
-							total = total - bo;
-						}
-					} else {
-						bill.textbox.value = '0.00';
-					}
-					bill.textbox.setAttribute('value',bill.textbox.value);
-			}
-			obj.update_payment_applied();
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert('bills -> distribute payment',E);
-		}
-	},
-
-	/*****************************************************************************************************************************/
-
-	'tally_selected' : function() {
-
-			var obj = this;
-			JSAN.use('util.money');
-			var selected_total = 0;
-			var unselected_total = 0;
-			//var s = '';
-
-			for (var i = 0; i < obj.current_payments.length; i++) {
-				var bill = obj.current_payments[i];
-				if (bill.checkbox.checked || bill.checkbox.getAttribute('checked') == 'true') {
-					var bo = util.money.dollars_float_to_cents_integer( bill.balance_owed );
-					selected_total += bo;
-					//s += ('tallying ' + i + ' : checked, bo = ' + bo + '  total = ' + selected_total + '\n');
-				} else {
-					var bo = util.money.dollars_float_to_cents_integer( bill.balance_owed );
-					unselected_total += bo;
-					//s += ('tallying ' + i + ' : not checked, total = ' + selected_total + '\n');
-				}
-			}
-			obj.controller.view.selected_balance.setAttribute('value', '$' + util.money.cents_as_dollars( selected_total ) );
-			obj.controller.view.unselected_balance.setAttribute('value', '$' + util.money.cents_as_dollars( unselected_total ) );
-			//dump(s); alert(s);
-	},
-
-	/*****************************************************************************************************************************/
-
-	'tally_voided' : function() {
-
-			var obj = this;
-			JSAN.use('util.money');
-			var voided_total = 0;
-
-			obj.data.stash_retrieve();
-
-			for (var i = 0; i < obj.data.voided_billings.length; i++) {
-				var billing = obj.data.voided_billings[i];
-				var bv = util.money.dollars_float_to_cents_integer( billing.amount() );
-				voided_total += bv;
-			}
-			obj.controller.view.voided_balance.setAttribute('value', '$' + util.money.cents_as_dollars( voided_total ) );
-	},
-
-	/*****************************************************************************************************************************/
-
-	'apply_payment' : function() {
-
-		var obj = this;
-		try {
-				var payment_blob = {};
-				JSAN.use('util.window');
-				var win = new util.window();
-				switch(obj.controller.view.payment_type.value) {
-					case 'credit_card_payment' :
-						obj.OpenILS.data.temp = '';
-						obj.OpenILS.data.stash('temp');
-						var my_xulG = win.open(
-							urls.XUL_PATRON_BILL_CC_INFO,
-							'billccinfo',
-							'chrome,resizable,modal'
-						);
-						obj.OpenILS.data.stash_retrieve();
-						//payment_blob = my_xulG.payment_blob; //JSON2js( obj.OpenILS.data.temp );
-						payment_blob = JSON2js( obj.OpenILS.data.temp );
-					break;
-					case 'check_payment' :
-						obj.OpenILS.data.temp = '';
-						obj.OpenILS.data.stash('temp');
-						var my_xulG = win.open(
-							urls.XUL_PATRON_BILL_CHECK_INFO,
-							'billcheckinfo',
-							'chrome,resizable,modal'
-						);
-						obj.OpenILS.data.stash_retrieve();
-						//payment_blob = my_xulG.payment_blob; //JSON2js( obj.OpenILS.data.temp );
-						payment_blob = JSON2js( obj.OpenILS.data.temp );
-					break;
-				}
-				if ((typeof payment_blob == 'undefined') || payment_blob=='' || payment_blob.cancelled=='true') { alert('cancelled'); return; }
-				payment_blob.userid = obj.patron_id;
-				payment_blob.note = payment_blob.note || '';
-				//payment_blob.cash_drawer = 1; // FIXME: get new Config() to work
-				payment_blob.payment_type = obj.controller.view.payment_type.value;
-				payment_blob.payments = [];
-				payment_blob.patron_credit = obj.controller.view.bill_credit_amount.value;
-				for (var i = 0; i < obj.current_payments.length; i++) {
-					var tb = obj.current_payments[ i ].textbox;
-					if ( !(tb.value == '0.00' || tb.value == '') ) {
-						payment_blob.payments.push( 
-							[
-								obj.current_payments[ i ].mobts_id,
-								tb.value
-							]
-						);
-					}
-				}
+       'cmd_change_to_credit' : [
+        ['command'],
+        function() {
+         try {
+          obj.change_to_credit();
+         } catch(E) {
+          obj.error.standard_unexpected_error_alert('bills -> cmd_change_to_credit',E); 
+         }
+        }
+       ],
+       'cmd_bill_apply_payment' : [
+        ['command'],
+        function() {
+         try { 
+          obj.apply_payment(); 
+         } catch(E) { 
+          obj.error.standard_unexpected_error_alert('bills -> cmd_bill_apply_payment',E); 
+         }
+        }
+       ],
+       'cmd_check_all' : [
+        ['command'],
+        function() {
+         for (var i = 0; i < obj.current_payments.length; i++) {
+          obj.current_payments[i].checkbox.setAttribute('checked',true); //checked = true;
+         }
+         obj.distribute_payment(obj.controller.view.bill_payment_amount);
+         obj.tally_selected();
+        }
+       ],
+       'cmd_uncheck_all' : [
+        ['command'],
+        function() {
+         for (var i = 0; i < obj.current_payments.length; i++) {
+          obj.current_payments[i].checkbox.setAttribute('checked',false); //checked = false;
+         }
+         obj.distribute_payment(obj.controller.view.bill_payment_amount);
+         obj.tally_selected();
+        }
+       ],
+       'voided_balance' : [
+        ['render'],
+        function(e) { return function() {}; }
+       ],
+       'selected_balance' : [
+        ['render'],
+        function(e) { return function() {}; }
+       ],
+       'unselected_balance' : [
+        ['render'],
+        function(e) { return function() {}; }
+       ],
+       'bill_total_owed' : [
+        ['render'],
+        function(e) { return function() {}; }
+       ],
+       'payment_type' : [
+        ['render'],
+        function(e) { return function() {}; }
+       ],
+       'bill_payment_amount' : [
+        ['change','keypress'],
+        function(ev) {
+         try {
+           if (ev.type == 'keypress') {
+            if (! (ev.keyCode == 13 /* enter */ || ev.keyCode == 77 /* mac enter */) ) {
+             return; 
+            }
+           }
+           if (ev.type == 'change' && obj.controller.view.payment_type.value == 'credit_payment') {
+            JSAN.use('util.money');
+            JSAN.use('patron.util'); var au_obj = patron.util.retrieve_au_via_id(ses(),obj.patron_id);
+            var proposed = util.money.dollars_float_to_cents_integer(ev.target.value);
+            var available = util.money.dollars_float_to_cents_integer(au_obj.credit_forward_balance());
+            if (proposed > available) {
+             alert($("patronStrings").getFormattedString('staff.patron.bills.bill_payment_amount.credit_amount', [au_obj.credit_forward_balance()]));
+             ev.target.value = util.money.cents_as_dollars( available );
+             ev.target.setAttribute('value',ev.target.value);
+            }
+           }
+           obj.distribute_payment(ev.target);
+           ev.target.select();
+           obj.tally_selected();
+         } catch(E) {
+          obj.error.standard_unexpected_error_alert('bills -> bill_payment_amount',E); 
+         }
+        } 
+       ],
+       'bill_payment_applied' : [
+        ['render'],
+        function(e) { return function() {}; }
+       ],
+       'bill_change_amount' : [
+        ['change'],
+        function(ev) {
+         try {
+           JSAN.use('util.money');
+           var tb = ev.target;
+           var proposed_change = util.money.dollars_float_to_cents_integer( tb.value );
+           var proposed_credit = 0;
+           obj.update_payment_applied();
+           var real_change = util.money.dollars_float_to_cents_integer( tb.value );
+           if ( proposed_change > real_change ) {
+            obj.error.sdump('D_ERROR',$("patronStrings").getString('staff.patron.bills.bill_change_amount.greedy'));
+            proposed_change = real_change;
+           } else if ( real_change > proposed_change ) {
+            proposed_credit = real_change - proposed_change;
+           }
+           tb.value = util.money.cents_as_dollars( proposed_change );
+           tb.setAttribute('value',tb.value);
+           obj.controller.view.bill_credit_amount.value = util.money.cents_as_dollars( proposed_credit );
+           obj.controller.view.bill_credit_amount.setAttribute(
+            'value',
+            obj.controller.view.bill_credit_amount.value
+           );
+         } catch(E) {
+          obj.error.standard_unexpected_error_alert('bills -> bill_change_amount',E); 
+         }
+        }
+       ],
+       'bill_credit_amount' : [
+        ['render'],
+        function(e) { return function() {}; }
+       ],
+       'bill_new_balance' : [
+        ['render'],
+        function(e) { return function() {}; }
+       ]
+      }
+     }
+    );
+
+    obj.controller.render();
+    obj._controller_inited = true;
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert('bills -> init_controller',E); 
+  }
+
+ },
+
+ /*****************************************************************************************************************************/
+
+ 'distribute_payment' : function(node) {
+  try {
+   var obj = this;
+   JSAN.use('util.money');
+   var tb = node;
+   tb.value = util.money.cents_as_dollars( util.money.dollars_float_to_cents_integer( tb.value ) );
+   tb.setAttribute('value', tb.value );
+   var total = util.money.dollars_float_to_cents_integer( tb.value );
+   if (total < 0) { tb.value = '0.00'; tb.setAttribute('value','0.00'); total = 0; }
+   for (var i = 0; i < obj.current_payments.length; i++) {
+     var bill = obj.current_payments[i];
+     if (bill.checkbox.checked || bill.checkbox.getAttribute('checked') == 'true') {
+      var bo = util.money.dollars_float_to_cents_integer( bill.balance_owed );
+      if ( bo > total ) {
+       bill.textbox.value = util.money.cents_as_dollars( total );
+       total = 0;
+      } else {
+       bill.textbox.value = util.money.cents_as_dollars( bo );
+       total = total - bo;
+      }
+     } else {
+      bill.textbox.value = '0.00';
+     }
+     bill.textbox.setAttribute('value',bill.textbox.value);
+   }
+   obj.update_payment_applied();
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert('bills -> distribute payment',E);
+  }
+ },
+
+ /*****************************************************************************************************************************/
+
+ 'tally_selected' : function() {
+
+   var obj = this;
+   JSAN.use('util.money');
+   var selected_total = 0;
+   var unselected_total = 0;
+   //var s = '';
+
+   for (var i = 0; i < obj.current_payments.length; i++) {
+    var bill = obj.current_payments[i];
+    if (bill.checkbox.checked || bill.checkbox.getAttribute('checked') == 'true') {
+     var bo = util.money.dollars_float_to_cents_integer( bill.balance_owed );
+     selected_total += bo;
+     //s += ('tallying ' + i + ' : checked, bo = ' + bo + '  total = ' + selected_total + '\n');
+    } else {
+     var bo = util.money.dollars_float_to_cents_integer( bill.balance_owed );
+     unselected_total += bo;
+     //s += ('tallying ' + i + ' : not checked, total = ' + selected_total + '\n');
+    }
+   }
+   obj.controller.view.selected_balance.setAttribute('value', '$' + util.money.cents_as_dollars( selected_total ) );
+   obj.controller.view.unselected_balance.setAttribute('value', '$' + util.money.cents_as_dollars( unselected_total ) );
+   //dump(s); alert(s);
+ },
+
+ /*****************************************************************************************************************************/
+
+ 'tally_voided' : function() {
+
+   var obj = this;
+   JSAN.use('util.money');
+   var voided_total = 0;
+
+   obj.data.stash_retrieve();
+
+   for (var i = 0; i < obj.data.voided_billings.length; i++) {
+    var billing = obj.data.voided_billings[i];
+    var bv = util.money.dollars_float_to_cents_integer( billing.amount() );
+    voided_total += bv;
+   }
+   obj.controller.view.voided_balance.setAttribute('value', '$' + util.money.cents_as_dollars( voided_total ) );
+ },
+
+ /*****************************************************************************************************************************/
+
+ 'apply_payment' : function() {
+
+  var obj = this;
+  try {
+    var payment_blob = {};
+    JSAN.use('util.window');
+    var win = new util.window();
+    switch(obj.controller.view.payment_type.value) {
+     case 'credit_card_payment' :
+      obj.OpenILS.data.temp = '';
+      obj.OpenILS.data.stash('temp');
+      var my_xulG = win.open(
+       urls.XUL_PATRON_BILL_CC_INFO,
+       'billccinfo',
+       'chrome,resizable,modal'
+      );
+      obj.OpenILS.data.stash_retrieve();
+      //payment_blob = my_xulG.payment_blob; //JSON2js( obj.OpenILS.data.temp );
+      payment_blob = JSON2js( obj.OpenILS.data.temp );
+     break;
+     case 'check_payment' :
+      obj.OpenILS.data.temp = '';
+      obj.OpenILS.data.stash('temp');
+      var my_xulG = win.open(
+       urls.XUL_PATRON_BILL_CHECK_INFO,
+       'billcheckinfo',
+       'chrome,resizable,modal'
+      );
+      obj.OpenILS.data.stash_retrieve();
+      //payment_blob = my_xulG.payment_blob; //JSON2js( obj.OpenILS.data.temp );
+      payment_blob = JSON2js( obj.OpenILS.data.temp );
+     break;
+    }
+    if ((typeof payment_blob == 'undefined') || payment_blob=='' || payment_blob.cancelled=='true') { alert('cancelled'); return; }
+    payment_blob.userid = obj.patron_id;
+    payment_blob.note = payment_blob.note || '';
+    //payment_blob.cash_drawer = 1; // FIXME: get new Config() to work
+    payment_blob.payment_type = obj.controller.view.payment_type.value;
+    payment_blob.payments = [];
+    payment_blob.patron_credit = obj.controller.view.bill_credit_amount.value;
+    for (var i = 0; i < obj.current_payments.length; i++) {
+     var tb = obj.current_payments[ i ].textbox;
+     if ( !(tb.value == '0.00' || tb.value == '') ) {
+      payment_blob.payments.push( 
+       [
+        obj.current_payments[ i ].mobts_id,
+        tb.value
+       ]
+      );
+     }
+    }
                 if ( payment_blob.payments.length == 0 && payment_blob.patron_credit == '0.00' ) {
                     alert($("patronStrings").getString('staff.patron.bills.apply_payment.nothing_applied'));
                     return;
                 }
-				if ( obj.pay( payment_blob ) ) {
-
-					obj.data.voided_billings = []; obj.data.stash('voided_billings');
-					obj.refresh();
-					try {
-						netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-						obj.data.stash_retrieve();
-						var template = 'bill_payment';
-						JSAN.use('patron.util'); JSAN.use('util.functional');
-						var params = { 
-							'patron' : patron.util.retrieve_fleshed_au_via_id(ses(),obj.patron_id), 
-							'lib' : obj.data.hash.aou[ obj.data.list.au[0].ws_ou() ],
-							'staff' : obj.data.list.au[0],
-							'header' : obj.data.print_list_templates[template].header,
-							'line_item' : obj.data.print_list_templates[template].line_item,
-							'footer' : obj.data.print_list_templates[template].footer,
-							'type' : obj.data.print_list_templates[template].type,
-							'list' : util.functional.map_list(
-								payment_blob.payments,
-								function(o) {
-									return {
-										'bill_id' : o[0],
-										'payment' : o[1],
-										'last_billing_type' : obj.bill_map[ o[0] ].transaction.last_billing_type(),
-										'last_billing_note' : obj.bill_map[ o[0] ].transaction.last_billing_note(),
-										'title' : typeof obj.bill_map[ o[0] ].title != 'undefined' ? obj.bill_map[ o[0] ].title : '', 
-										'barcode' : typeof obj.bill_map[ o[0] ].barcode != 'undefined' ? obj.bill_map[ o[0] ].barcode : ''
-									};
-								}
-							),
-							'data' : obj.previous_summary
-						};
-						obj.error.sdump('D_DEBUG',js2JSON(params));
-						if (document.getElementById('auto_print').checked) params.no_prompt = true;
-						JSAN.use('util.print'); var print = new util.print();
-						print.tree_list( params );
-					} catch(E) {
-						obj.error.standard_unexpected_error_alert('bill receipt', E);
-					}
-				}
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert('bills -> apply_payment',E);	
-		}
-	},
-
-	'pay' : function(payment_blob) {
-		var obj = this;
-		try {
+    if ( obj.pay( payment_blob ) ) {
+
+     obj.data.voided_billings = []; obj.data.stash('voided_billings');
+     obj.refresh();
+     try {
+      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+      obj.data.stash_retrieve();
+      var template = 'bill_payment';
+      JSAN.use('patron.util'); JSAN.use('util.functional');
+      var params = { 
+       'patron' : patron.util.retrieve_fleshed_au_via_id(ses(),obj.patron_id), 
+       'lib' : obj.data.hash.aou[ obj.data.list.au[0].ws_ou() ],
+       'staff' : obj.data.list.au[0],
+       'header' : obj.data.print_list_templates[template].header,
+       'line_item' : obj.data.print_list_templates[template].line_item,
+       'footer' : obj.data.print_list_templates[template].footer,
+       'type' : obj.data.print_list_templates[template].type,
+       'list' : util.functional.map_list(
+        payment_blob.payments,
+        function(o) {
+         return {
+          'bill_id' : o[0],
+          'payment' : o[1],
+          'last_billing_type' : obj.bill_map[ o[0] ].transaction.last_billing_type(),
+          'last_billing_note' : obj.bill_map[ o[0] ].transaction.last_billing_note(),
+          'title' : typeof obj.bill_map[ o[0] ].title != 'undefined' ? obj.bill_map[ o[0] ].title : '', 
+          'barcode' : typeof obj.bill_map[ o[0] ].barcode != 'undefined' ? obj.bill_map[ o[0] ].barcode : ''
+         };
+        }
+       ),
+       'data' : obj.previous_summary
+      };
+      obj.error.sdump('D_DEBUG',js2JSON(params));
+      if (document.getElementById('auto_print').checked) params.no_prompt = true;
+      JSAN.use('util.print'); var print = new util.print();
+      print.tree_list( params );
+     } catch(E) {
+      obj.error.standard_unexpected_error_alert('bill receipt', E);
+     }
+    }
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert('bills -> apply_payment',E); 
+  }
+ },
+
+ 'pay' : function(payment_blob) {
+  var obj = this;
+  try {
             var x = document.getElementById('annotate_payment');
             if (x && x.checked && (! payment_blob.note)) {
                 payment_blob.note = window.prompt($("patronStrings").getString('staff.patron.bills.pay.annotate_payment'),'', $("patronStrings").getString('staff.patron.bills.pay.annotate_payment.title'));
             }
-			obj.previous_summary = {
-				original_balance : obj.controller.view.bill_total_owed.value,
-				voided_balance : obj.controller.view.voided_balance.value,
-				payment_received : obj.controller.view.bill_payment_amount.value,
-				payment_applied : obj.controller.view.bill_payment_applied.value,
-				change_given : obj.controller.view.bill_change_amount.value,
-				credit_given : obj.controller.view.bill_credit_amount.value,
-				new_balance : obj.controller.view.bill_new_balance.value,
-				payment_type : obj.controller.view.payment_type.getAttribute('label'),
-				note : payment_blob.note
-			}
-			var robj = obj.network.request(
-				api.BILL_PAY.app,	
-				api.BILL_PAY.method,
-				[ ses(), payment_blob ]
-			);
-			if (robj == 1) { return true; } 
-			if (typeof robj.ilsevent != 'undefined') {
-				switch(Number(robj.ilsevent)) {
-					case 0 /* SUCCESS */ : return true; break;
-					case 1226 /* REFUND_EXCEEDS_DESK_PAYMENTS */ : alert($("patronStrings").getFormattedString('staff.patron.bills.pay.refund_exceeds_desk_payment', [robj.desc])); return false; break;
-					default: throw(robj); break;
-				}
-			}
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.bills.pay.payment_failed'),E);
-			return false;
-		}
-	},
-
-	'update_payment_applied' : function() {
-		var obj = this;
-		try {
-				JSAN.use('util.money');
-				var total_applied = 0;
-				for (var i = 0; i < obj.current_payments.length; i++) {
-					total_applied += util.money.dollars_float_to_cents_integer( obj.current_payments[ i ].textbox.value );
-				}
-				var total_payment = 0;
-				if (obj.controller.view.bill_payment_amount.value) {
-					try {
-						total_payment = util.money.dollars_float_to_cents_integer( obj.controller.view.bill_payment_amount.value );
-					} catch(E) {
-						obj.error.sdump('D_ERROR',E + '\n');
-					}
-				}
-				if ( total_applied > total_payment ) {
-					total_payment = total_applied;
-					obj.controller.view.bill_payment_amount.value = util.money.cents_as_dollars( total_applied );
-				}
-				obj.controller.view.bill_payment_applied.value = util.money.cents_as_dollars( total_applied );
-				obj.controller.view.bill_payment_applied.setAttribute('value', obj.controller.view.bill_payment_applied.value )
-				obj.controller.view.bill_credit_amount.value = '';
-				if (total_payment > total_applied ) {
-					obj.controller.view.bill_change_amount.value = util.money.cents_as_dollars( total_payment - total_applied);
-					obj.controller.view.bill_credit_amount.value = '0.00';
-				} else {
-					obj.controller.view.bill_change_amount.value = '0.00';
-					obj.controller.view.bill_credit_amount.value = '0.00';
-				}
-				var total_owed = util.money.dollars_float_to_cents_integer( obj.controller.view.bill_total_owed.value );
-				obj.controller.view.bill_new_balance.value = util.money.cents_as_dollars( total_owed - total_applied );
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert('bills -> update_payment_applied',E);	
-		}
-	},
-
-	'change_to_credit' : function() {
-		var obj = this;
-		try {
-				JSAN.use('util.money');
-				var tb = obj.controller.view.bill_change_amount;
-				var proposed_change = 0;
-				var proposed_credit = util.money.dollars_float_to_cents_integer( tb.value );
-				obj.update_payment_applied();
-				var real_change = util.money.dollars_float_to_cents_integer( tb.value );
-				if ( proposed_change > real_change ) {
-					obj.error.sdump('D_ERROR',$("patronStrings").getString('staff.patron.bills.bill_change_amount.greedy'));
-					proposed_change = real_change;
-				} else if ( real_change > proposed_change ) {
-					proposed_credit = real_change - proposed_change;
-				}
-				tb.value = util.money.cents_as_dollars( proposed_change );
-				tb.setAttribute('value',tb.value);
-				obj.controller.view.bill_credit_amount.value = util.money.cents_as_dollars( proposed_credit );
-				obj.controller.view.bill_credit_amount.setAttribute('value',obj.controller.view.bill_credit_amount.value);
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert('bills -> change_to_credit',E);	
-		}
-	},
-
-	'retrieve' : function() {
-		var obj = this;
-		try {
-				if (window.xulG && window.xulG.bills) {
-					obj.bills = window.xulG.bills;
-				} else {
-					obj.bills = obj.network.simple_request(
-						obj.SHOW_ME_THE_BILLS,	
-						[ ses(), obj.patron_id ]
-					);
-					for (var i = 0; i < obj.bills.length; i++) {
-						if (instanceOf(obj.bills[i],mobts)) {
-							obj.bills[i] = { 'transaction' : obj.bills[i] }
-						} else if (instanceOf(obj.bills[i],mbts)) {
-							obj.bills[i] = { 'transaction' : obj.bills[i] }
-						} else {
-							var robj = obj.network.simple_request('FM_MBTS_RETRIEVE.authoritative',[ses(),obj.bills[i]]);
-							//alert('robj = ' + js2JSON(robj));
-							obj.bills[i] = { 'transaction' : robj }
-						}
-					}
-				}
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert('bills -> retrieve',E);	
-		}
-	},
+   obj.previous_summary = {
+    original_balance : obj.controller.view.bill_total_owed.value,
+    voided_balance : obj.controller.view.voided_balance.value,
+    payment_received : obj.controller.view.bill_payment_amount.value,
+    payment_applied : obj.controller.view.bill_payment_applied.value,
+    change_given : obj.controller.view.bill_change_amount.value,
+    credit_given : obj.controller.view.bill_credit_amount.value,
+    new_balance : obj.controller.view.bill_new_balance.value,
+    payment_type : obj.controller.view.payment_type.getAttribute('label'),
+    note : payment_blob.note
+   }
+   var robj = obj.network.request(
+    api.BILL_PAY.app, 
+    api.BILL_PAY.method,
+    [ ses(), payment_blob ]
+   );
+   if (robj == 1) { return true; } 
+   if (typeof robj.ilsevent != 'undefined') {
+    switch(Number(robj.ilsevent)) {
+     case 0 /* SUCCESS */ : return true; break;
+     case 1226 /* REFUND_EXCEEDS_DESK_PAYMENTS */ : alert($("patronStrings").getFormattedString('staff.patron.bills.pay.refund_exceeds_desk_payment', [robj.desc])); return false; break;
+     default: throw(robj); break;
+    }
+   }
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.bills.pay.payment_failed'),E);
+   return false;
+  }
+ },
+
+ 'update_payment_applied' : function() {
+  var obj = this;
+  try {
+    JSAN.use('util.money');
+    var total_applied = 0;
+    for (var i = 0; i < obj.current_payments.length; i++) {
+     total_applied += util.money.dollars_float_to_cents_integer( obj.current_payments[ i ].textbox.value );
+    }
+    var total_payment = 0;
+    if (obj.controller.view.bill_payment_amount.value) {
+     try {
+      total_payment = util.money.dollars_float_to_cents_integer( obj.controller.view.bill_payment_amount.value );
+     } catch(E) {
+      obj.error.sdump('D_ERROR',E + '\n');
+     }
+    }
+    if ( total_applied > total_payment ) {
+     total_payment = total_applied;
+     obj.controller.view.bill_payment_amount.value = util.money.cents_as_dollars( total_applied );
+    }
+    obj.controller.view.bill_payment_applied.value = util.money.cents_as_dollars( total_applied );
+    obj.controller.view.bill_payment_applied.setAttribute('value', obj.controller.view.bill_payment_applied.value )
+    obj.controller.view.bill_credit_amount.value = '';
+    if (total_payment > total_applied ) {
+     obj.controller.view.bill_change_amount.value = util.money.cents_as_dollars( total_payment - total_applied);
+     obj.controller.view.bill_credit_amount.value = '0.00';
+    } else {
+     obj.controller.view.bill_change_amount.value = '0.00';
+     obj.controller.view.bill_credit_amount.value = '0.00';
+    }
+    var total_owed = util.money.dollars_float_to_cents_integer( obj.controller.view.bill_total_owed.value );
+    obj.controller.view.bill_new_balance.value = util.money.cents_as_dollars( total_owed - total_applied );
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert('bills -> update_payment_applied',E); 
+  }
+ },
+
+ 'change_to_credit' : function() {
+  var obj = this;
+  try {
+    JSAN.use('util.money');
+    var tb = obj.controller.view.bill_change_amount;
+    var proposed_change = 0;
+    var proposed_credit = util.money.dollars_float_to_cents_integer( tb.value );
+    obj.update_payment_applied();
+    var real_change = util.money.dollars_float_to_cents_integer( tb.value );
+    if ( proposed_change > real_change ) {
+     obj.error.sdump('D_ERROR',$("patronStrings").getString('staff.patron.bills.bill_change_amount.greedy'));
+     proposed_change = real_change;
+    } else if ( real_change > proposed_change ) {
+     proposed_credit = real_change - proposed_change;
+    }
+    tb.value = util.money.cents_as_dollars( proposed_change );
+    tb.setAttribute('value',tb.value);
+    obj.controller.view.bill_credit_amount.value = util.money.cents_as_dollars( proposed_credit );
+    obj.controller.view.bill_credit_amount.setAttribute('value',obj.controller.view.bill_credit_amount.value);
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert('bills -> change_to_credit',E); 
+  }
+ },
+
+ 'retrieve' : function() {
+  var obj = this;
+  try {
+    if (window.xulG && window.xulG.bills) {
+     obj.bills = window.xulG.bills;
+    } else {
+     obj.bills = obj.network.simple_request(
+      obj.SHOW_ME_THE_BILLS, 
+      [ ses(), obj.patron_id ]
+     );
+     for (var i = 0; i < obj.bills.length; i++) {
+      if (instanceOf(obj.bills[i],mobts)) {
+       obj.bills[i] = { 'transaction' : obj.bills[i] }
+      } else if (instanceOf(obj.bills[i],mbts)) {
+       obj.bills[i] = { 'transaction' : obj.bills[i] }
+      } else {
+       var robj = obj.network.simple_request('FM_MBTS_RETRIEVE.authoritative',[ses(),obj.bills[i]]);
+       //alert('robj = ' + js2JSON(robj));
+       obj.bills[i] = { 'transaction' : robj }
+      }
+     }
+    }
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert('bills -> retrieve',E); 
+  }
+ },
 
     'print_bills' : function() {
         var obj = this;
@@ -696,7 +696,7 @@ patron.bills.prototype = {
                 'line_item' : obj.data.print_list_templates[template].line_item,
                 'footer' : obj.data.print_list_templates[template].footer,
                 'type' : obj.data.print_list_templates[template].type,
-				'list' : util.functional.map_list(
+    'list' : util.functional.map_list(
                     obj.bills,
                     function(o) {
                         var id = o.transaction.id();
@@ -716,402 +716,402 @@ patron.bills.prototype = {
             print.tree_list( params );
 
         } catch(E) {
-			obj.error.standard_unexpected_error_alert('bills -> print_bills',E);	
+   obj.error.standard_unexpected_error_alert('bills -> print_bills',E); 
         }
     },
 
-	'xact_dates_box' : function ( mobts ) {
-		var obj = this;
-		try {
-				var grid = document.createElement('grid');
-					var cols = document.createElement('columns');
-					grid.appendChild( cols );
-						cols.appendChild( document.createElement('column') );
-						cols.appendChild( document.createElement('column') );
-					var rows = document.createElement('rows');
-					grid.appendChild( rows );
-						var row0 = document.createElement('row');
-						rows.appendChild( row0 );
-							var cb_r0_0 = document.createElement('checkbox');
-							row0.appendChild( cb_r0_0 );
-							cb_r0_0.setAttribute('checked',true);
-							var hb_r0_1 = document.createElement('hbox');
-							row0.appendChild( hb_r0_1 );
-								var label_r0_1 = document.createElement('label');
-								hb_r0_1.appendChild( label_r0_1 );
-								label_r0_1.setAttribute('value',document.getElementById('commonStrings').getString('staff.mbts_id_label'));
-								var label_r0_2 = document.createElement('label');
-								hb_r0_1.appendChild( label_r0_2 );
-								label_r0_2.setAttribute('value',mobts.id());
-						var row1 = document.createElement('row');
-						rows.appendChild( row1 );
-							var label_r1_1 = document.createElement('label');
-							row1.appendChild( label_r1_1 );
-							label_r1_1.setAttribute('value',document.getElementById('commonStrings').getString('staff.mbts_xact_start_label'));
-							var label_r1_2 = document.createElement('label');
-							row1.appendChild( label_r1_2 );
-							label_r1_2.setAttribute('value',mobts.xact_start().toString().substr(0,10));
-						var row2 = document.createElement('row');
-						rows.appendChild( row2 );
-							var label_r2_1 = document.createElement('label');
-							row2.appendChild( label_r2_1 );
-							label_r2_1.setAttribute('value',document.getElementById('commonStrings').getString('staff.mbts_xact_finish_label'));
-							var label_r2_2 = document.createElement('label');
-							row2.appendChild( label_r2_2 );
-							try { label_r2_2.setAttribute('value',mobts.xact_finish().toString().substr(0,10));
-							} catch(E) {}
-
-				return grid;
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert('bills -> xact_dates_box',E);	
-		}
-	},
-
-	'money_box' : function ( mobts ) {
-		var obj = this;
-		try {
-				JSAN.use('util.money');
-				var grid = document.createElement('grid');
-					var cols = document.createElement('columns');
-					grid.appendChild( cols );
-						cols.appendChild( document.createElement('column') );
-						cols.appendChild( document.createElement('column') );
-					var rows = document.createElement('rows');
-					grid.appendChild( rows );
-						var row1 = document.createElement('row');
-						rows.appendChild( row1 );
-							var label_r1_1 = document.createElement('label');
-							row1.appendChild( label_r1_1 );
-							label_r1_1.setAttribute('value',document.getElementById('commonStrings').getString('staff.mbts_total_owed_label'));
-							var label_r1_2 = document.createElement('label');
-							row1.appendChild( label_r1_2 );
-							label_r1_2.setAttribute('value','$' + util.money.sanitize(mobts.total_owed() || '0') );
-						var row2 = document.createElement('row');
-						rows.appendChild( row2 );
-							var label_r2_1 = document.createElement('label');
-							row2.appendChild( label_r2_1 );
-							label_r2_1.setAttribute('value',document.getElementById('commonStrings').getString('staff.mbts_total_paid_label'));
-							var label_r2_2 = document.createElement('label');
-							row2.appendChild( label_r2_2 );
-							label_r2_2.setAttribute('value','$' + util.money.sanitize(mobts.total_paid() || '0') );
-						var row3 = document.createElement('row');
-						rows.appendChild( row3 );
-							var label_r3_1 = document.createElement('label');
-							row3.appendChild( label_r3_1 );
-							label_r3_1.setAttribute('value',document.getElementById('commonStrings').getString('staff.mbts_balance_owed_label'));
-							label_r3_1.setAttribute('style','font-weight: bold');
-							var label_r3_2 = document.createElement('label');
-							row3.appendChild( label_r3_2 );
-							label_r3_2.setAttribute('value','$' + util.money.sanitize(mobts.balance_owed() || '0') );
-							label_r3_2.setAttribute('style','font-weight: bold');
-
-				return grid;
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert('bills -> money_box',E);	
-		}
-	},
-
-	'info_box' : function ( my ) {
-		var obj = this;
-		try {
-				var vbox = document.createElement('vbox');
-
-					var hbox = document.createElement('hbox');
-						vbox.appendChild( hbox ); hbox.flex = 1;
-
-						var cb = document.createElement('checkbox');
-						hbox.appendChild( cb ); 
-						if ( my.mobts.balance_owed() == 0 ) { 
-							cb.setAttribute('disabled', 'true'); 
-						} else { 
-							if (my.mobts.balance_owed() > 0) {
-								cb.setAttribute('checked', true); 
-							}
-						}
-						cb.addEventListener(
-							'command',
-							function() {
-								setTimeout(
-									function() {
-										obj.distribute_payment(obj.controller.view.bill_payment_amount);
-										obj.tally_selected();
-									}, 0
-								);
-							},
-							false
-						);
-
-
-					var grid = document.createElement('grid');
-						hbox.appendChild( grid );
-
-						var cols = document.createElement('columns');
-							grid.appendChild( cols );
-							cols.appendChild( document.createElement('column') );
-							cols.appendChild( document.createElement('column') );
-						var rows = document.createElement('rows');
-							grid.appendChild( rows );
-
-					var xact_type = document.createElement('row');
-					rows.appendChild( xact_type );
-
-						var xt_label = document.createElement('label');
-							xact_type.appendChild( xt_label );
-						var xt_value = document.createElement('description');
-							xact_type.appendChild( xt_value );
-
-					try {
-					switch(my.mobts.xact_type()) {
-						case 'circulation':
-							xt_label.setAttribute( 'value', $("patronStrings").getString('staff.patron.bills.info_box.label_value.title') );
-							obj.network.simple_request(
-								'FM_CIRC_RETRIEVE_VIA_ID',
-								[ ses(), my.mobts.id() ],
-								function (req) {
-									var r_circ = req.getResultObject();
-									if (instanceOf(r_circ,circ)) {
-										/*
-										xt_start.setAttribute('value','Checked Out: ' + r_circ.xact_start().toString().substr(0,10) );
-										if (r_circ.checkin_time()) {
-											xt_finish.setAttribute('value','Returned: ' + r_circ.checkin_time().toString().substr(0,10) );
-										} else {
-											xt_finish.setAttribute('value','Due: ' + r_circ.due_date().toString().substr(0,10) );
-										}
-										*/
-										if (! r_circ.checkin_time()) {
-											xt_value.setAttribute('style','background: red; color: white');
-											if (document.getElementById('circulating_hint')) {
-												document.getElementById('circulating_hint').hidden = false;
-											}
-										}
-										obj.network.simple_request(
-											'MODS_SLIM_RECORD_RETRIEVE_VIA_COPY',
-											[ r_circ.target_copy() ],
-											function (rreq) {
-												var r_mvr = rreq.getResultObject();
-												if (instanceOf(r_mvr,mvr)) {
-													xt_value.appendChild( document.createTextNode( String( r_mvr.title() ).substr(0,50) ) );
-													obj.bill_map[ my.mobts.id() ].title = r_mvr.title();
-												}
-											}
-										);
-										obj.network.simple_request(
-											'FM_ACP_RETRIEVE',
-											[ r_circ.target_copy() ],
-											function (rrreq) {
-												var r_acp = rrreq.getResultObject();
-												if (instanceOf(r_acp,acp)) {
-													xt_value.appendChild( document.createTextNode( r_acp.dummy_title() ) );
-													if (r_acp.dummy_title()) obj.bill_map[ my.mobts.id() ].title = r_acp.dummy_title();
-													obj.bill_map[ my.mobts.id() ].barcode = r_acp.barcode();
-												}
-											}
-										);
-									}
-								}
-							);
-						break;
-						default:
-								xt_label.setAttribute( 'value',
-									my.mvr ? $("patronStrings").getString('staff.patron.bills.info_box.label_value.title') : $("patronStrings").getString('staff.patron.bills.info_box.label_value.type') );
-								xt_value.appendChild( document.createTextNode( my.mvr ? my.mvr.title() : my.mobts.xact_type() ) );
-						break;
-					}
-					} catch(E) { alert(E); }
-
-					var last_billing = document.createElement('row');
-					rows.appendChild( last_billing );
-
-						var lb_label = document.createElement('label');
-							last_billing.appendChild( lb_label );
-							lb_label.setAttribute( 'value', $("patronStrings").getString('staff.patron.bills.info_box.label_value.last_billing') );
-
-						var lb_value = document.createElement('label');
-							last_billing.appendChild( lb_value );
-							if (my.mobts.last_billing_type()) 
-								lb_value.setAttribute( 'value', my.mobts.last_billing_type() );
-		/*
-					var last_payment = document.createElement('row');
-					rows.appendChild( last_payment );
-
-						var lp_label = document.createElement('label');
-							last_payment.appendChild( lp_label );
-							lp_label.setAttribute( 'value', 'Last Payment:' );
-
-						var lp_value = document.createElement('label');
-							last_payment.appendChild( lp_value );
-							if (my.mobts.last_payment_type()) 
-								lp_value.setAttribute( 'value', my.mobts.last_payment_type() );
-		*/
-					var btn_box = document.createElement('hbox');
-					vbox.appendChild( btn_box ); btn_box.flex = 1;
-							var btn = document.createElement('button');
-								btn_box.appendChild( btn );
-								btn.setAttribute( 'label', $("patronStrings").getString('staff.patron.bills.info_box.label_value.full_details') );
-								btn.setAttribute( 'name', 'full_details' );
-								btn.setAttribute( 'mobts_id', my.mobts.id() );	
-								btn.addEventListener(
-									'command',
-									function(ev) {
-										JSAN.use('util.window'); var win = new util.window();
-										var my_xulG = win.open(
-											urls.XUL_PATRON_BILL_DETAILS,
-											//+ '?patron_id=' + window.escape(obj.patron_id)
-											//+ '&mbts_id=' + window.escape(my.mobts.id()),
-											'test' + my.mobts.id(),
-											'chrome,resizable',
-											{
-												'patron_id' : obj.patron_id,
-												'mbts_id' : my.mobts.id(),
-												'refresh' : function() { obj.refresh(); },
-											}
-										);
-									},
-									false
-								);
-							var btn2 = document.createElement('button');
-								btn_box.appendChild( btn2 );
-								btn2.setAttribute( 'label', $("patronStrings").getString('staff.patron.bills.info_box.label_value.add_billing') );
-								btn2.setAttribute( 'mobts_id', my.mobts.id() );	
-								btn2.addEventListener(
-									'command',
-									function(ev) {
-										JSAN.use('util.window');
-										var win = new util.window();
-										var my_xulG = win.open(
-											urls.XUL_PATRON_BILL_WIZARD,
-												//+ '?patron_id=' + window.escape(obj.patron_id)
-												//+ '&xact_id=' + window.escape( my.mobts.id() ),
-											'billwizard',
-											'chrome,resizable,modal',
-											{
-												'patron_id' : obj.patron_id,
-												'xact_id' : my.mobts.id(),
-											}
-										);
-										obj.refresh();
-									},
-									false
-								);
-				if (my.mobts.balance_owed() < 0) {
-					var btn3 = document.createElement('button');
-					btn_box.appendChild( btn3 );
-					btn3.setAttribute( 'label', $("patronStrings").getString('staff.patron.bills.info_box.label_value.refund') );
-					btn3.setAttribute( 'mobts_id', my.mobts.id() );	
-					btn3.addEventListener(
-						'command',
-						function(ev) {
-							cb.setAttribute('checked',true);
-							obj.distribute_payment(obj.controller.view.bill_payment_amount);
-							obj.tally_selected();
-						},
-						false
-					);
-				}
-
-				var btn4 = document.createElement('button');
-				btn_box.appendChild( btn4 );
-				btn4.setAttribute( 'label', $("patronStrings").getString('staff.patron.bills.info_box.label_value.void_all_billings') );
-				btn4.setAttribute( 'mobts_id', my.mobts.id() );
-				btn4.addEventListener(
-					'command',
-					function(ev) {
-						obj.void_all_billings( my.mobts.id() );
-					},
-					false
-				);
-
-				return vbox;
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert('bills -> info_box',E);	
-		}
-	},
-
-	'payment_box' : function() {
-		try {
-			var vb = document.createElement('vbox');
-			var tb = document.createElement('textbox');
-			tb.setAttribute('readonly','true');
-			vb.appendChild(tb);
-			return vb;
-		} catch(E) {
-			this.error.standard_unexpected_error_alert('bills -> payment_box',E);	
-		}
-	},
-
-	'void_all_billings' : function(mobts_id) {
-		try {
-			var obj = this;
-			JSAN.use('util.functional');
-			
-			var mb_list = obj.network.simple_request( 'FM_MB_RETRIEVE_VIA_MBTS_ID.authoritative', [ ses(), mobts_id ] );
-			if (typeof mb_list.ilsevent != 'undefined') throw(mb_list);
-
-			mb_list = util.functional.filter_list( mb_list, function(o) { return ! get_bool( o.voided() ) });
-
-			if (mb_list.length == 0) { alert($("patronStrings").getString('staff.patron.bills.void_all_billings.all_voided')); return; }
-
-			var sum = 0;
-			for (var i = 0; i < mb_list.length; i++) sum += util.money.dollars_float_to_cents_integer( mb_list[i].amount() );
-			sum = util.money.cents_as_dollars( sum );
-
-			var msg = $("patronStrings").getFormattedString('staff.patron.bills.void_all_billings.void.message', [sum]);
-			var r = obj.error.yns_alert(msg,
-				$("patronStrings").getString('staff.patron.bills.void_all_billings.void.title'),
-				$("patronStrings").getString('staff.patron.bills.void_all_billings.void.yes'),
-				$("patronStrings").getString('staff.patron.bills.void_all_billings.void.no'), null,
-				$("patronStrings").getString('staff.patron.bills.void_all_billings.void.confirm_message'));
-			if (r == 0) {
-				var robj = obj.network.simple_request('FM_MB_VOID',[ses()].concat(util.functional.map_list(mb_list,function(o){return o.id();})));
-				if (robj.ilsevent) {
-					switch(Number(robj.ilsevent)) {
-						default: 
-							obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.bills.void_all_billings.error_voiding_bills'),robj); 
-							obj.refresh(); return; 
-						break;
-					}
-				}
-
-				obj.data.stash_retrieve(); if (! obj.data.voided_billings ) obj.data.voided_billings = []; 
-				for (var i = 0; i < mb_list.length; i++) {
-						obj.data.voided_billings.push( mb_list[i] );
-				}
-				obj.data.stash('voided_billings');
-				alert($("patronStrings").getString('staff.patron.bills.void_all_billings.billings_voided'));
-				obj.refresh();
-			}
-		} catch(E) {
-			try { obj.error.standard_unexpected_error_alert('bills.js, void_all_billings():',E); } catch(F) { alert(E); }
-		}
-
-	},
-	
-	'gen_map_row_to_column' : function() {
-		var obj = this;
-
-		try {
-
-		return function(row,col) {
-			// row contains { 'my' : { 'mobts' : ... } }
-			// col contains one of the objects listed above in columns
-
-			var my = row.my;
-			var value;
-			try {
-				value = eval( col.render );
-			} catch(E) {
-				try{obj.error.sdump('D_ERROR','map_row_to_column: ' + E);}
-				catch(P){dump('?map_row_to_column: ' + E + '\n');}
-				value = '???';
-			}
-			//dump('map_row_to_column: value = ' + value + '\n');
-			return value;
-		};
-
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert('bills -> gen_map_row_to_column',E);	
-		}
-	},
+ 'xact_dates_box' : function ( mobts ) {
+  var obj = this;
+  try {
+    var grid = document.createElement('grid');
+     var cols = document.createElement('columns');
+     grid.appendChild( cols );
+      cols.appendChild( document.createElement('column') );
+      cols.appendChild( document.createElement('column') );
+     var rows = document.createElement('rows');
+     grid.appendChild( rows );
+      var row0 = document.createElement('row');
+      rows.appendChild( row0 );
+       var cb_r0_0 = document.createElement('checkbox');
+       row0.appendChild( cb_r0_0 );
+       cb_r0_0.setAttribute('checked',true);
+       var hb_r0_1 = document.createElement('hbox');
+       row0.appendChild( hb_r0_1 );
+        var label_r0_1 = document.createElement('label');
+        hb_r0_1.appendChild( label_r0_1 );
+        label_r0_1.setAttribute('value',document.getElementById('commonStrings').getString('staff.mbts_id_label'));
+        var label_r0_2 = document.createElement('label');
+        hb_r0_1.appendChild( label_r0_2 );
+        label_r0_2.setAttribute('value',mobts.id());
+      var row1 = document.createElement('row');
+      rows.appendChild( row1 );
+       var label_r1_1 = document.createElement('label');
+       row1.appendChild( label_r1_1 );
+       label_r1_1.setAttribute('value',document.getElementById('commonStrings').getString('staff.mbts_xact_start_label'));
+       var label_r1_2 = document.createElement('label');
+       row1.appendChild( label_r1_2 );
+       label_r1_2.setAttribute('value',mobts.xact_start().toString().substr(0,10));
+      var row2 = document.createElement('row');
+      rows.appendChild( row2 );
+       var label_r2_1 = document.createElement('label');
+       row2.appendChild( label_r2_1 );
+       label_r2_1.setAttribute('value',document.getElementById('commonStrings').getString('staff.mbts_xact_finish_label'));
+       var label_r2_2 = document.createElement('label');
+       row2.appendChild( label_r2_2 );
+       try { label_r2_2.setAttribute('value',mobts.xact_finish().toString().substr(0,10));
+       } catch(E) {}
+
+    return grid;
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert('bills -> xact_dates_box',E); 
+  }
+ },
+
+ 'money_box' : function ( mobts ) {
+  var obj = this;
+  try {
+    JSAN.use('util.money');
+    var grid = document.createElement('grid');
+     var cols = document.createElement('columns');
+     grid.appendChild( cols );
+      cols.appendChild( document.createElement('column') );
+      cols.appendChild( document.createElement('column') );
+     var rows = document.createElement('rows');
+     grid.appendChild( rows );
+      var row1 = document.createElement('row');
+      rows.appendChild( row1 );
+       var label_r1_1 = document.createElement('label');
+       row1.appendChild( label_r1_1 );
+       label_r1_1.setAttribute('value',document.getElementById('commonStrings').getString('staff.mbts_total_owed_label'));
+       var label_r1_2 = document.createElement('label');
+       row1.appendChild( label_r1_2 );
+       label_r1_2.setAttribute('value','$' + util.money.sanitize(mobts.total_owed() || '0') );
+      var row2 = document.createElement('row');
+      rows.appendChild( row2 );
+       var label_r2_1 = document.createElement('label');
+       row2.appendChild( label_r2_1 );
+       label_r2_1.setAttribute('value',document.getElementById('commonStrings').getString('staff.mbts_total_paid_label'));
+       var label_r2_2 = document.createElement('label');
+       row2.appendChild( label_r2_2 );
+       label_r2_2.setAttribute('value','$' + util.money.sanitize(mobts.total_paid() || '0') );
+      var row3 = document.createElement('row');
+      rows.appendChild( row3 );
+       var label_r3_1 = document.createElement('label');
+       row3.appendChild( label_r3_1 );
+       label_r3_1.setAttribute('value',document.getElementById('commonStrings').getString('staff.mbts_balance_owed_label'));
+       label_r3_1.setAttribute('style','font-weight: bold');
+       var label_r3_2 = document.createElement('label');
+       row3.appendChild( label_r3_2 );
+       label_r3_2.setAttribute('value','$' + util.money.sanitize(mobts.balance_owed() || '0') );
+       label_r3_2.setAttribute('style','font-weight: bold');
+
+    return grid;
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert('bills -> money_box',E); 
+  }
+ },
+
+ 'info_box' : function ( my ) {
+  var obj = this;
+  try {
+    var vbox = document.createElement('vbox');
+
+     var hbox = document.createElement('hbox');
+      vbox.appendChild( hbox ); hbox.flex = 1;
+
+      var cb = document.createElement('checkbox');
+      hbox.appendChild( cb ); 
+      if ( my.mobts.balance_owed() == 0 ) { 
+       cb.setAttribute('disabled', 'true'); 
+      } else { 
+       if (my.mobts.balance_owed() > 0) {
+        cb.setAttribute('checked', true); 
+       }
+      }
+      cb.addEventListener(
+       'command',
+       function() {
+        setTimeout(
+         function() {
+          obj.distribute_payment(obj.controller.view.bill_payment_amount);
+          obj.tally_selected();
+         }, 0
+        );
+       },
+       false
+      );
+
+
+     var grid = document.createElement('grid');
+      hbox.appendChild( grid );
+
+      var cols = document.createElement('columns');
+       grid.appendChild( cols );
+       cols.appendChild( document.createElement('column') );
+       cols.appendChild( document.createElement('column') );
+      var rows = document.createElement('rows');
+       grid.appendChild( rows );
+
+     var xact_type = document.createElement('row');
+     rows.appendChild( xact_type );
+
+      var xt_label = document.createElement('label');
+       xact_type.appendChild( xt_label );
+      var xt_value = document.createElement('description');
+       xact_type.appendChild( xt_value );
+
+     try {
+     switch(my.mobts.xact_type()) {
+      case 'circulation':
+       xt_label.setAttribute( 'value', $("patronStrings").getString('staff.patron.bills.info_box.label_value.title') );
+       obj.network.simple_request(
+        'FM_CIRC_RETRIEVE_VIA_ID',
+        [ ses(), my.mobts.id() ],
+        function (req) {
+         var r_circ = req.getResultObject();
+         if (instanceOf(r_circ,circ)) {
+          /*
+          xt_start.setAttribute('value','Checked Out: ' + r_circ.xact_start().toString().substr(0,10) );
+          if (r_circ.checkin_time()) {
+           xt_finish.setAttribute('value','Returned: ' + r_circ.checkin_time().toString().substr(0,10) );
+          } else {
+           xt_finish.setAttribute('value','Due: ' + r_circ.due_date().toString().substr(0,10) );
+          }
+          */
+          if (! r_circ.checkin_time()) {
+           xt_value.setAttribute('style','background: red; color: white');
+           if (document.getElementById('circulating_hint')) {
+            document.getElementById('circulating_hint').hidden = false;
+           }
+          }
+          obj.network.simple_request(
+           'MODS_SLIM_RECORD_RETRIEVE_VIA_COPY',
+           [ r_circ.target_copy() ],
+           function (rreq) {
+            var r_mvr = rreq.getResultObject();
+            if (instanceOf(r_mvr,mvr)) {
+             xt_value.appendChild( document.createTextNode( String( r_mvr.title() ).substr(0,50) ) );
+             obj.bill_map[ my.mobts.id() ].title = r_mvr.title();
+            }
+           }
+          );
+          obj.network.simple_request(
+           'FM_ACP_RETRIEVE',
+           [ r_circ.target_copy() ],
+           function (rrreq) {
+            var r_acp = rrreq.getResultObject();
+            if (instanceOf(r_acp,acp)) {
+             xt_value.appendChild( document.createTextNode( r_acp.dummy_title() ) );
+             if (r_acp.dummy_title()) obj.bill_map[ my.mobts.id() ].title = r_acp.dummy_title();
+             obj.bill_map[ my.mobts.id() ].barcode = r_acp.barcode();
+            }
+           }
+          );
+         }
+        }
+       );
+      break;
+      default:
+        xt_label.setAttribute( 'value',
+         my.mvr ? $("patronStrings").getString('staff.patron.bills.info_box.label_value.title') : $("patronStrings").getString('staff.patron.bills.info_box.label_value.type') );
+        xt_value.appendChild( document.createTextNode( my.mvr ? my.mvr.title() : my.mobts.xact_type() ) );
+      break;
+     }
+     } catch(E) { alert(E); }
+
+     var last_billing = document.createElement('row');
+     rows.appendChild( last_billing );
+
+      var lb_label = document.createElement('label');
+       last_billing.appendChild( lb_label );
+       lb_label.setAttribute( 'value', $("patronStrings").getString('staff.patron.bills.info_box.label_value.last_billing') );
+
+      var lb_value = document.createElement('label');
+       last_billing.appendChild( lb_value );
+       if (my.mobts.last_billing_type()) 
+        lb_value.setAttribute( 'value', my.mobts.last_billing_type() );
+  /*
+     var last_payment = document.createElement('row');
+     rows.appendChild( last_payment );
+
+      var lp_label = document.createElement('label');
+       last_payment.appendChild( lp_label );
+       lp_label.setAttribute( 'value', 'Last Payment:' );
+
+      var lp_value = document.createElement('label');
+       last_payment.appendChild( lp_value );
+       if (my.mobts.last_payment_type()) 
+        lp_value.setAttribute( 'value', my.mobts.last_payment_type() );
+  */
+     var btn_box = document.createElement('hbox');
+     vbox.appendChild( btn_box ); btn_box.flex = 1;
+       var btn = document.createElement('button');
+        btn_box.appendChild( btn );
+        btn.setAttribute( 'label', $("patronStrings").getString('staff.patron.bills.info_box.label_value.full_details') );
+        btn.setAttribute( 'name', 'full_details' );
+        btn.setAttribute( 'mobts_id', my.mobts.id() ); 
+        btn.addEventListener(
+         'command',
+         function(ev) {
+          JSAN.use('util.window'); var win = new util.window();
+          var my_xulG = win.open(
+           urls.XUL_PATRON_BILL_DETAILS,
+           //+ '?patron_id=' + window.escape(obj.patron_id)
+           //+ '&mbts_id=' + window.escape(my.mobts.id()),
+           'test' + my.mobts.id(),
+           'chrome,resizable',
+           {
+            'patron_id' : obj.patron_id,
+            'mbts_id' : my.mobts.id(),
+            'refresh' : function() { obj.refresh(); },
+           }
+          );
+         },
+         false
+        );
+       var btn2 = document.createElement('button');
+        btn_box.appendChild( btn2 );
+        btn2.setAttribute( 'label', $("patronStrings").getString('staff.patron.bills.info_box.label_value.add_billing') );
+        btn2.setAttribute( 'mobts_id', my.mobts.id() ); 
+        btn2.addEventListener(
+         'command',
+         function(ev) {
+          JSAN.use('util.window');
+          var win = new util.window();
+          var my_xulG = win.open(
+           urls.XUL_PATRON_BILL_WIZARD,
+            //+ '?patron_id=' + window.escape(obj.patron_id)
+            //+ '&xact_id=' + window.escape( my.mobts.id() ),
+           'billwizard',
+           'chrome,resizable,modal',
+           {
+            'patron_id' : obj.patron_id,
+            'xact_id' : my.mobts.id(),
+           }
+          );
+          obj.refresh();
+         },
+         false
+        );
+    if (my.mobts.balance_owed() < 0) {
+     var btn3 = document.createElement('button');
+     btn_box.appendChild( btn3 );
+     btn3.setAttribute( 'label', $("patronStrings").getString('staff.patron.bills.info_box.label_value.refund') );
+     btn3.setAttribute( 'mobts_id', my.mobts.id() ); 
+     btn3.addEventListener(
+      'command',
+      function(ev) {
+       cb.setAttribute('checked',true);
+       obj.distribute_payment(obj.controller.view.bill_payment_amount);
+       obj.tally_selected();
+      },
+      false
+     );
+    }
+
+    var btn4 = document.createElement('button');
+    btn_box.appendChild( btn4 );
+    btn4.setAttribute( 'label', $("patronStrings").getString('staff.patron.bills.info_box.label_value.void_all_billings') );
+    btn4.setAttribute( 'mobts_id', my.mobts.id() );
+    btn4.addEventListener(
+     'command',
+     function(ev) {
+      obj.void_all_billings( my.mobts.id() );
+     },
+     false
+    );
+
+    return vbox;
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert('bills -> info_box',E); 
+  }
+ },
+
+ 'payment_box' : function() {
+  try {
+   var vb = document.createElement('vbox');
+   var tb = document.createElement('textbox');
+   tb.setAttribute('readonly','true');
+   vb.appendChild(tb);
+   return vb;
+  } catch(E) {
+   this.error.standard_unexpected_error_alert('bills -> payment_box',E); 
+  }
+ },
+
+ 'void_all_billings' : function(mobts_id) {
+  try {
+   var obj = this;
+   JSAN.use('util.functional');
+   
+   var mb_list = obj.network.simple_request( 'FM_MB_RETRIEVE_VIA_MBTS_ID.authoritative', [ ses(), mobts_id ] );
+   if (typeof mb_list.ilsevent != 'undefined') throw(mb_list);
+
+   mb_list = util.functional.filter_list( mb_list, function(o) { return ! get_bool( o.voided() ) });
+
+   if (mb_list.length == 0) { alert($("patronStrings").getString('staff.patron.bills.void_all_billings.all_voided')); return; }
+
+   var sum = 0;
+   for (var i = 0; i < mb_list.length; i++) sum += util.money.dollars_float_to_cents_integer( mb_list[i].amount() );
+   sum = util.money.cents_as_dollars( sum );
+
+   var msg = $("patronStrings").getFormattedString('staff.patron.bills.void_all_billings.void.message', [sum]);
+   var r = obj.error.yns_alert(msg,
+    $("patronStrings").getString('staff.patron.bills.void_all_billings.void.title'),
+    $("patronStrings").getString('staff.patron.bills.void_all_billings.void.yes'),
+    $("patronStrings").getString('staff.patron.bills.void_all_billings.void.no'), null,
+    $("patronStrings").getString('staff.patron.bills.void_all_billings.void.confirm_message'));
+   if (r == 0) {
+    var robj = obj.network.simple_request('FM_MB_VOID',[ses()].concat(util.functional.map_list(mb_list,function(o){return o.id();})));
+    if (robj.ilsevent) {
+     switch(Number(robj.ilsevent)) {
+      default: 
+       obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.bills.void_all_billings.error_voiding_bills'),robj); 
+       obj.refresh(); return; 
+      break;
+     }
+    }
+
+    obj.data.stash_retrieve(); if (! obj.data.voided_billings ) obj.data.voided_billings = []; 
+    for (var i = 0; i < mb_list.length; i++) {
+      obj.data.voided_billings.push( mb_list[i] );
+    }
+    obj.data.stash('voided_billings');
+    alert($("patronStrings").getString('staff.patron.bills.void_all_billings.billings_voided'));
+    obj.refresh();
+   }
+  } catch(E) {
+   try { obj.error.standard_unexpected_error_alert('bills.js, void_all_billings():',E); } catch(F) { alert(E); }
+  }
+
+ },
+ 
+ 'gen_map_row_to_column' : function() {
+  var obj = this;
+
+  try {
+
+  return function(row,col) {
+   // row contains { 'my' : { 'mobts' : ... } }
+   // col contains one of the objects listed above in columns
+
+   var my = row.my;
+   var value;
+   try {
+    value = eval( col.render );
+   } catch(E) {
+    try{obj.error.sdump('D_ERROR','map_row_to_column: ' + E);}
+    catch(P){dump('?map_row_to_column: ' + E + '\n');}
+    value = '???';
+   }
+   //dump('map_row_to_column: value = ' + value + '\n');
+   return value;
+  };
+
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert('bills -> gen_map_row_to_column',E); 
+  }
+ },
 
 }
 
diff --git a/Open-ILS/xul/staff_client/server/patron/bills.xul b/Open-ILS/xul/staff_client/server/patron/bills.xul
index a151a0cdf3..4a5d8f8afd 100644
--- a/Open-ILS/xul/staff_client/server/patron/bills.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bills.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -21,69 +21,69 @@
 <?xul-overlay href="/xul/server/patron/bills_overlay.xul"?>
 
 <window id="bills_win" 
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-		
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for bills.xul');
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  function $(id) { return document.getElementById(id); }
+  
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for bills.xul');
 
-				JSAN.use('patron.bills'); g.bills = new patron.bills();
-				g.bills.init( 
-					{ 
-						'patron_id' : xul_param('patron_id'), 
-					} 
-				);
-				window.refresh = function(p) { g.bills.refresh(p); }
+    JSAN.use('patron.bills'); g.bills = new patron.bills();
+    g.bills.init( 
+     { 
+      'patron_id' : xul_param('patron_id'), 
+     } 
+    );
+    window.refresh = function(p) { g.bills.refresh(p); }
 
-				document.getElementById('bill_payment_amount').focus();
-	
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/bills.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
+    document.getElementById('bill_payment_amount').focus();
+ 
+   } catch(E) {
+    var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/bills.xul', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
 
-		function default_focus() {
-			try {
-				document.getElementById('bill_payment_amount').focus();
-			} catch(E) {
-				try { g.error.sdump('D_ERROR','bill default_focus: ' + js2JSON(E)); } catch(F) { dump(E); }
-			}
-		}
-	]]>
-	</script>
+  function default_focus() {
+   try {
+    document.getElementById('bill_payment_amount').focus();
+   } catch(E) {
+    try { g.error.sdump('D_ERROR','bill default_focus: ' + js2JSON(E)); } catch(F) { dump(E); }
+   }
+  }
+ ]]>
+ </script>
 
-	<commandset id="bills_cmds">
-		<command id="cmd_bill_wizard" />
-		<command id="cmd_bill_history" />
-		<command id="cmd_bill_apply_payment" />
-		<command id="cmd_change_to_credit" />
-		<command id="cmd_uncheck_all" />
-		<command id="cmd_check_all" />
-		<command id="cmd_print_bills" />
-		<command id="cmd_alternate_view" />
-	</commandset>
-	
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+ <commandset id="bills_cmds">
+  <command id="cmd_bill_wizard" />
+  <command id="cmd_bill_history" />
+  <command id="cmd_bill_apply_payment" />
+  <command id="cmd_change_to_credit" />
+  <command id="cmd_uncheck_all" />
+  <command id="cmd_check_all" />
+  <command id="cmd_print_bills" />
+  <command id="cmd_alternate_view" />
+ </commandset>
+ 
+ <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
-	<box id="bills_main" />
+ <box id="bills_main" />
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/bills_overlay.xul b/Open-ILS/xul/staff_client/server/patron/bills_overlay.xul
index a73a687629..6686b43040 100644
--- a/Open-ILS/xul/staff_client/server/patron/bills_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bills_overlay.xul
@@ -1,120 +1,120 @@
 <?xml version="1.0"?>
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 <overlay id="bills_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading bills_overlay.xul\n');</script>
 
 <commandset id="bills_cmds" />
 
 <box id="bills_main" flex="1" orient="vertical" class="my_overflow">
-	<vbox id="bills_top_ui" />
-	<hbox>
-		<label style="font-weight: bold;" value="&staff.patron.bills_overlay.selected_balance.value;"/><label id="selected_balance"/>
-		<label style="font-weight: bold;" value="&staff.patron.bills_overlay.unselected.value;"/><label id="unselected_balance"/>
-		<label style="font-weight: bold;" value="&staff.patron.bills_overlay.voided.value;"/><label id="voided_balance"/>
-		<spacer flex="1"/>
-		<label id="circulating_hint" hidden="true" style="background: red; color: white" value="&staff.patron.bills_overlay.still_checked_out.label;"/>
-	</hbox>
-	<listbox id="bill_list" flex="1"/>
-	<hbox>
-		<button command="cmd_uncheck_all" label="&staff.patron.bills_overlay.uncheck_all.label;"/>
-		<button command="cmd_check_all" label="&staff.patron.bills_overlay.check_all.label;"/>
-		<spacer flex="1"/>
-		<button command="cmd_print_bills" label="&staff.patron.bills_overlay.print_bills.label;"/>
-		<button command="cmd_alternate_view" label="&staff.patron.bills_overlay.alternate_view.label;" accesskey="&staff.patron.bills_overlay.alternate_view.accesskey;"/>
-	</hbox>
+ <vbox id="bills_top_ui" />
+ <hbox>
+  <label style="font-weight: bold;" value="&staff.patron.bills_overlay.selected_balance.value;"/><label id="selected_balance"/>
+  <label style="font-weight: bold;" value="&staff.patron.bills_overlay.unselected.value;"/><label id="unselected_balance"/>
+  <label style="font-weight: bold;" value="&staff.patron.bills_overlay.voided.value;"/><label id="voided_balance"/>
+  <spacer flex="1"/>
+  <label id="circulating_hint" hidden="true" style="background: red; color: white" value="&staff.patron.bills_overlay.still_checked_out.label;"/>
+ </hbox>
+ <listbox id="bill_list" flex="1"/>
+ <hbox>
+  <button command="cmd_uncheck_all" label="&staff.patron.bills_overlay.uncheck_all.label;"/>
+  <button command="cmd_check_all" label="&staff.patron.bills_overlay.check_all.label;"/>
+  <spacer flex="1"/>
+  <button command="cmd_print_bills" label="&staff.patron.bills_overlay.print_bills.label;"/>
+  <button command="cmd_alternate_view" label="&staff.patron.bills_overlay.alternate_view.label;" accesskey="&staff.patron.bills_overlay.alternate_view.accesskey;"/>
+ </hbox>
 </box>
 
 <vbox id="bills_top_ui">
-	<hbox>
-		<groupbox>
-			<caption label="&staff.patron.bills_overlay.summary.label;"/>
-			<grid>
-				<columns><column /><column /></columns>                                 
-				<rows>
-					<row>
-						<label value="&staff.patron.bills_overlay.net_balance.value;"/>
-	
-						<textbox id="bill_total_owed" value="" readonly="true"  context="clipboard"/>
-					</row>
-					<row>
-						<label value="&staff.patron.bills_overlay.payment_applied.value;"/>
-			
-						<textbox id="bill_payment_applied" readonly="true" context="clipboard"/>
-					</row>
-					<row>
-						<label value="&staff.patron.bills_overlay.new_balance.value;" 
-							style="font-family: bold" />
-	
-						<textbox id="bill_new_balance" readonly="true" context="clipboard"/>
-					</row>
-				</rows>
-			</grid>
-		</groupbox>
-		<spacer flex="2"/>
-		<groupbox>
-			<caption label="&staff.patron.bills_overlay.pay_bill.label;"/>
-			<grid>
-				<columns><column /><column /></columns>                                 
-				<rows>
-					<row>
-						<label value="&staff.patron.bills_overlay.payment_type.value;" 
-							accesskey="&staff.patron.bills_overlay.payment_type.accesskey;" control="payment_type" />
-						<menulist id="payment_type">
-							<menupopup id="payment_type_menupopup">
-								<menuitem id="payment_type_menuitem1" label="&staff.patron.bills_overlay.cash.label;" value="cash_payment"/>
-								<menuitem id="payment_type_menuitem2" label="&staff.patron.bills_overlay.check.label;" value="check_payment"/>
-								<menuitem id="payment_type_menuitem3" label="&staff.patron.bills_overlay.credit_card.label;" value="credit_card_payment"/>
-								<!--
-								<menuitem id="payment_type_menuitem4" label="Patron Credit" value="credit_payment" />
-								-->
-								<menuitem id="payment_type_menuitem5" label="&staff.patron.bills_overlay.word.label;" value="work_payment"/>
-								<menuitem id="payment_type_menuitem6" label="&staff.patron.bills_overlay.forgive.label;" value="forgive_payment"/>
-								<menuitem id="payment_type_menuitem7" label="&staff.patron.bills_overlay.goods.label;" value="goods_payment"/>
-							</menupopup>
-						</menulist>
-					</row>
-					<row>
-						<label value="&staff.patron.bills_overlay.payment_received.value;" style="font-weight: bold"
-							accesskey="&staff.patron.bills_overlay.payment_received.accesskey;" control="bill_payment_amount" />
-			
-						<textbox id="bill_payment_amount" style="border: solid thick black" context="clipboard"/>
-					</row>
-					<row>
-						<label value="&staff.patron.bills_overlay.payment_applied.value;"/>
-			
-						<textbox id="bpato" observes="bill_payment_applied"  context="clipboard"/>
-					</row>
-					<row>
-						<label value="&staff.patron.bills_overlay.change.value;" control="bill_change_amount" style="font-weight: bold" />
-	
-						<hbox>
-							<textbox id="bill_change_amount" readonly="true" context="clipboard"/>
-						</hbox>
-					</row>
-					<row class="hide_patron_credit" hidden="true">
-						<label value="&staff.patron.bills_overlay.patron_credit.value;" 
-							style="font-family: bold" />
-	
-						<textbox id="bill_credit_amount" readonly="true" context="clipboard"/>
-					</row>
-				</rows>
-			</grid>
-		</groupbox>
-	</hbox>
-	<hbox>
-		<button id="bill_wizard" label="&staff.patron.bills_overlay.bill_patron.label;" accesskey="&staff.patron.bills_overlay.bill_patron.accesskey;" command="cmd_bill_wizard"/>
-		<button id="bill_history" label="&staff.patron.bills_overlay.history.label;" accesskey="&staff.patron.bills_overlay.history.accesskey;" command="cmd_bill_history"/>
-		<spacer flex="2"/>
-		<checkbox id="annotate_payment" label="&staff.patron.bills_overlay.annotate_payment.label;" oils_persist="checked" checked="false" />
-		<checkbox id="auto_print" label="&staff.patron.bills_overlay.auto_print.label;" oils_persist="checked" checked="true" />
-		<button class="hide_patron_credit" hidden="true" disabled="true" id="change_to_credit" label="&staff.patron.bills_overlay.convert_change_to_credit.label;" command="cmd_change_to_credit"/>
-		<button id="bill_apply_payment" label="&staff.patron.bills_overlay.apply_payment.label;" accesskey="&staff.patron.bills_overlay.apply_payment.accesskey;" command="cmd_bill_apply_payment"/>
-	</hbox>
-	<label value=" "/>
+ <hbox>
+  <groupbox>
+   <caption label="&staff.patron.bills_overlay.summary.label;"/>
+   <grid>
+    <columns><column /><column /></columns>                                 
+    <rows>
+     <row>
+      <label value="&staff.patron.bills_overlay.net_balance.value;"/>
+ 
+      <textbox id="bill_total_owed" value="" readonly="true"  context="clipboard"/>
+     </row>
+     <row>
+      <label value="&staff.patron.bills_overlay.payment_applied.value;"/>
+   
+      <textbox id="bill_payment_applied" readonly="true" context="clipboard"/>
+     </row>
+     <row>
+      <label value="&staff.patron.bills_overlay.new_balance.value;" 
+       style="font-family: bold" />
+ 
+      <textbox id="bill_new_balance" readonly="true" context="clipboard"/>
+     </row>
+    </rows>
+   </grid>
+  </groupbox>
+  <spacer flex="2"/>
+  <groupbox>
+   <caption label="&staff.patron.bills_overlay.pay_bill.label;"/>
+   <grid>
+    <columns><column /><column /></columns>                                 
+    <rows>
+     <row>
+      <label value="&staff.patron.bills_overlay.payment_type.value;" 
+       accesskey="&staff.patron.bills_overlay.payment_type.accesskey;" control="payment_type" />
+      <menulist id="payment_type">
+       <menupopup id="payment_type_menupopup">
+        <menuitem id="payment_type_menuitem1" label="&staff.patron.bills_overlay.cash.label;" value="cash_payment"/>
+        <menuitem id="payment_type_menuitem2" label="&staff.patron.bills_overlay.check.label;" value="check_payment"/>
+        <menuitem id="payment_type_menuitem3" label="&staff.patron.bills_overlay.credit_card.label;" value="credit_card_payment"/>
+        <!--
+        <menuitem id="payment_type_menuitem4" label="Patron Credit" value="credit_payment" />
+        -->
+        <menuitem id="payment_type_menuitem5" label="&staff.patron.bills_overlay.word.label;" value="work_payment"/>
+        <menuitem id="payment_type_menuitem6" label="&staff.patron.bills_overlay.forgive.label;" value="forgive_payment"/>
+        <menuitem id="payment_type_menuitem7" label="&staff.patron.bills_overlay.goods.label;" value="goods_payment"/>
+       </menupopup>
+      </menulist>
+     </row>
+     <row>
+      <label value="&staff.patron.bills_overlay.payment_received.value;" style="font-weight: bold"
+       accesskey="&staff.patron.bills_overlay.payment_received.accesskey;" control="bill_payment_amount" />
+   
+      <textbox id="bill_payment_amount" style="border: solid thick black" context="clipboard"/>
+     </row>
+     <row>
+      <label value="&staff.patron.bills_overlay.payment_applied.value;"/>
+   
+      <textbox id="bpato" observes="bill_payment_applied"  context="clipboard"/>
+     </row>
+     <row>
+      <label value="&staff.patron.bills_overlay.change.value;" control="bill_change_amount" style="font-weight: bold" />
+ 
+      <hbox>
+       <textbox id="bill_change_amount" readonly="true" context="clipboard"/>
+      </hbox>
+     </row>
+     <row class="hide_patron_credit" hidden="true">
+      <label value="&staff.patron.bills_overlay.patron_credit.value;" 
+       style="font-family: bold" />
+ 
+      <textbox id="bill_credit_amount" readonly="true" context="clipboard"/>
+     </row>
+    </rows>
+   </grid>
+  </groupbox>
+ </hbox>
+ <hbox>
+  <button id="bill_wizard" label="&staff.patron.bills_overlay.bill_patron.label;" accesskey="&staff.patron.bills_overlay.bill_patron.accesskey;" command="cmd_bill_wizard"/>
+  <button id="bill_history" label="&staff.patron.bills_overlay.history.label;" accesskey="&staff.patron.bills_overlay.history.accesskey;" command="cmd_bill_history"/>
+  <spacer flex="2"/>
+  <checkbox id="annotate_payment" label="&staff.patron.bills_overlay.annotate_payment.label;" oils_persist="checked" checked="false" />
+  <checkbox id="auto_print" label="&staff.patron.bills_overlay.auto_print.label;" oils_persist="checked" checked="true" />
+  <button class="hide_patron_credit" hidden="true" disabled="true" id="change_to_credit" label="&staff.patron.bills_overlay.convert_change_to_credit.label;" command="cmd_change_to_credit"/>
+  <button id="bill_apply_payment" label="&staff.patron.bills_overlay.apply_payment.label;" accesskey="&staff.patron.bills_overlay.apply_payment.accesskey;" command="cmd_bill_apply_payment"/>
+ </hbox>
+ <label value=" "/>
 </vbox>
 
 
diff --git a/Open-ILS/xul/staff_client/server/patron/display.js b/Open-ILS/xul/staff_client/server/patron/display.js
index d7606e74a6..b4f9bbd789 100644
--- a/Open-ILS/xul/staff_client/server/patron/display.js
+++ b/Open-ILS/xul/staff_client/server/patron/display.js
@@ -5,102 +5,102 @@ function $(id) { return document.getElementById(id); }
 if (typeof patron == 'undefined') patron = {};
 patron.display = function (params) {
 
-	JSAN.use('util.error'); this.error = new util.error();
-	JSAN.use('util.window'); this.window = new util.window();
-	JSAN.use('util.network'); this.network = new util.network();
-	this.w = window;
+ JSAN.use('util.error'); this.error = new util.error();
+ JSAN.use('util.window'); this.window = new util.window();
+ JSAN.use('util.network'); this.network = new util.network();
+ this.w = window;
 }
 
 patron.display.prototype = {
 
-	'retrieve_ids' : [],
-	'stop_checkouts' : false,
-	'check_stop_checkouts' : function() { return this.stop_checkouts; },
+ 'retrieve_ids' : [],
+ 'stop_checkouts' : false,
+ 'check_stop_checkouts' : function() { return this.stop_checkouts; },
 
-	'init' : function( params ) {
+ 'init' : function( params ) {
 
-		var obj = this;
+  var obj = this;
 
-		obj.barcode = params['barcode'];
-		obj.id = params['id'];
+  obj.barcode = params['barcode'];
+  obj.id = params['id'];
 
-		JSAN.use('OpenILS.data'); this.OpenILS = {}; 
-		obj.OpenILS.data = new OpenILS.data(); obj.OpenILS.data.init({'via':'stash'});
-		
-		//var horizontal_interface = String( obj.OpenILS.data.hash.aous['ui.circ.patron_summary.horizontal'] ) == 'true';
-		//document.getElementById('ui.circ.patron_summary.horizontal').setAttribute('orient', horizontal_interface ? 'vertical' : 'horizontal');
-		//document.getElementById('pdms1').setAttribute('orient', horizontal_interface ? 'vertical' : 'horizontal');
-		
-		JSAN.use('util.deck'); 
-		obj.right_deck = new util.deck('patron_right_deck');
-		obj.left_deck = new util.deck('patron_left_deck');
+  JSAN.use('OpenILS.data'); this.OpenILS = {}; 
+  obj.OpenILS.data = new OpenILS.data(); obj.OpenILS.data.init({'via':'stash'});
+  
+  //var horizontal_interface = String( obj.OpenILS.data.hash.aous['ui.circ.patron_summary.horizontal'] ) == 'true';
+  //document.getElementById('ui.circ.patron_summary.horizontal').setAttribute('orient', horizontal_interface ? 'vertical' : 'horizontal');
+  //document.getElementById('pdms1').setAttribute('orient', horizontal_interface ? 'vertical' : 'horizontal');
+  
+  JSAN.use('util.deck'); 
+  obj.right_deck = new util.deck('patron_right_deck');
+  obj.left_deck = new util.deck('patron_left_deck');
 
-		function spawn_checkout_interface() {
-	            try { document.getElementById("PatronNavBarScrollbox").ensureElementIsVisible( document.getElementById("PatronNavBar_checkout" ) ); } catch(E) {};
+  function spawn_checkout_interface() {
+             try { document.getElementById("PatronNavBarScrollbox").ensureElementIsVisible( document.getElementById("PatronNavBar_checkout" ) ); } catch(E) {};
                 obj.reset_nav_styling('cmd_patron_checkout',true);
-			var frame = obj.right_deck.set_iframe(
-				urls.XUL_CHECKOUT,
-				{},
-				{ 
-					'set_tab' : xulG.set_tab,
-					'patron_id' : obj.patron.id(),
-					'check_stop_checkouts' : function() { return obj.check_stop_checkouts(); },
-					'on_list_change' : function(checkout) {
-						netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-						var x = obj.summary_window.g.summary.controller.view.patron_checkouts;
-						var n = Number(x.getAttribute('value'));
-						x.setAttribute('value',n+1);
-					},
-					'on_list_change_old' : function(checkout) {
-					
-						/* this stops noncats from getting pushed into Items Out */
-						if (!checkout.circ.id()) return; 
-
-						netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-						obj.summary_window.g.summary.controller.render('patron_checkouts');
-						obj.summary_window.g.summary.controller.render('patron_standing_penalties');
-						if (obj.items_window) {
-							obj.items_window.g.items.list.append(
-								{
-									'row' : {
-										'my' : {
-											'circ_id' : checkout.circ.id()
-										}
-									}
-								}
-							)
-						}
-					}
-				}
-			);
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			obj.checkout_window = get_contentWindow(frame);
-		}
-
-		JSAN.use('util.controller'); obj.controller = new util.controller();
-		obj.controller.init(
-			{
-				control_map : {
-					'cmd_broken' : [
-						['command'],
-						function() { alert($("commonStrings").getString('common.unimplemented')); }
-					],
-					'cmd_patron_retrieve' : [
-						['command'],
-						function(ev) {
-							if (typeof window.xulG == 'object' && typeof window.xulG.new_tab == 'function') {
-								for (var i = 0; i < obj.retrieve_ids.length; i++) {	
-									try {
-										window.xulG.new_patron_tab(
-											{}, { 'id' : obj.retrieve_ids[i] }
-										);
-									} catch(E) {
-										alert(E);
-									}
-								}
-							}
-						}
-					],
+   var frame = obj.right_deck.set_iframe(
+    urls.XUL_CHECKOUT,
+    {},
+    { 
+     'set_tab' : xulG.set_tab,
+     'patron_id' : obj.patron.id(),
+     'check_stop_checkouts' : function() { return obj.check_stop_checkouts(); },
+     'on_list_change' : function(checkout) {
+      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+      var x = obj.summary_window.g.summary.controller.view.patron_checkouts;
+      var n = Number(x.getAttribute('value'));
+      x.setAttribute('value',n+1);
+     },
+     'on_list_change_old' : function(checkout) {
+     
+      /* this stops noncats from getting pushed into Items Out */
+      if (!checkout.circ.id()) return; 
+
+      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+      obj.summary_window.g.summary.controller.render('patron_checkouts');
+      obj.summary_window.g.summary.controller.render('patron_standing_penalties');
+      if (obj.items_window) {
+       obj.items_window.g.items.list.append(
+        {
+         'row' : {
+          'my' : {
+           'circ_id' : checkout.circ.id()
+          }
+         }
+        }
+       )
+      }
+     }
+    }
+   );
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   obj.checkout_window = get_contentWindow(frame);
+  }
+
+  JSAN.use('util.controller'); obj.controller = new util.controller();
+  obj.controller.init(
+   {
+    control_map : {
+     'cmd_broken' : [
+      ['command'],
+      function() { alert($("commonStrings").getString('common.unimplemented')); }
+     ],
+     'cmd_patron_retrieve' : [
+      ['command'],
+      function(ev) {
+       if (typeof window.xulG == 'object' && typeof window.xulG.new_tab == 'function') {
+        for (var i = 0; i < obj.retrieve_ids.length; i++) { 
+         try {
+          window.xulG.new_patron_tab(
+           {}, { 'id' : obj.retrieve_ids[i] }
+          );
+         } catch(E) {
+          alert(E);
+         }
+        }
+       }
+      }
+     ],
                     'cmd_patron_merge' : [
                         ['command'],
                         function(ev) {
@@ -119,230 +119,230 @@ patron.display.prototype = {
                             document.getElementById('splitter_grippy').doCommand();
                         }
                     ],
-					'cmd_search_form' : [
-						['command'],
-						function(ev) {
-							obj.controller.view.cmd_search_form.setAttribute('disabled','true');
-							obj.left_deck.node.selectedIndex = 0;
-							obj.controller.view.patron_name.setAttribute('value', $("patronStrings").getString('staff.patron.display.cmd_search_form.no_patron'));
-							removeCSSClass(document.documentElement,'PATRON_HAS_BILLS');
-							removeCSSClass(document.documentElement,'PATRON_HAS_OVERDUES');
-							removeCSSClass(document.documentElement,'PATRON_HAS_NOTES');
-							removeCSSClass(document.documentElement,'PATRON_EXCEEDS_CHECKOUT_COUNT');
-							removeCSSClass(document.documentElement,'PATRON_EXCEEDS_OVERDUE_COUNT');
-							removeCSSClass(document.documentElement,'PATRON_EXCEEDS_FINES');
-							removeCSSClass(document.documentElement,'NO_PENALTIES');
-							removeCSSClass(document.documentElement,'ONE_PENALTY');
-							removeCSSClass(document.documentElement,'MULTIPLE_PENALTIES');
-							removeCSSClass(document.documentElement,'PATRON_HAS_ALERT');
-							removeCSSClass(document.documentElement,'PATRON_BARRED');
-							removeCSSClass(document.documentElement,'PATRON_INACTIVE');
-							removeCSSClass(document.documentElement,'PATRON_EXPIRED');
-							removeCSSClass(document.documentElement,'PATRON_HAS_INVALID_DOB');
-							removeCSSClass(document.documentElement,'PATRON_JUVENILE');
-							removeCSSClass(document.documentElement,'PATRON_HAS_INVALID_ADDRESS');
-							removeCSSClass(document.documentElement,'PATRON_AGE_GE_65');
-							removeCSSClass(document.documentElement,'PATRON_AGE_LT_65');
-							removeCSSClass(document.documentElement,'PATRON_AGE_GE_24');
-							removeCSSClass(document.documentElement,'PATRON_AGE_LT_24');
-							removeCSSClass(document.documentElement,'PATRON_AGE_GE_21');
-							removeCSSClass(document.documentElement,'PATRON_AGE_LT_21');
-							removeCSSClass(document.documentElement,'PATRON_AGE_GE_18');
-							removeCSSClass(document.documentElement,'PATRON_AGE_LT_18');
-							removeCSSClass(document.documentElement,'PATRON_AGE_GE_13');
-							removeCSSClass(document.documentElement,'PATRON_AGE_LT_13');
-							removeCSSClass(document.documentElement,'PATRON_NET_ACCESS_1');
-							removeCSSClass(document.documentElement,'PATRON_NET_ACCESS_2');
-							removeCSSClass(document.documentElement,'PATRON_NET_ACCESS_3');
-						}
-					],
-					'cmd_patron_refresh' : [
-						['command'],
-						function(ev) {
+     'cmd_search_form' : [
+      ['command'],
+      function(ev) {
+       obj.controller.view.cmd_search_form.setAttribute('disabled','true');
+       obj.left_deck.node.selectedIndex = 0;
+       obj.controller.view.patron_name.setAttribute('value', $("patronStrings").getString('staff.patron.display.cmd_search_form.no_patron'));
+       removeCSSClass(document.documentElement,'PATRON_HAS_BILLS');
+       removeCSSClass(document.documentElement,'PATRON_HAS_OVERDUES');
+       removeCSSClass(document.documentElement,'PATRON_HAS_NOTES');
+       removeCSSClass(document.documentElement,'PATRON_EXCEEDS_CHECKOUT_COUNT');
+       removeCSSClass(document.documentElement,'PATRON_EXCEEDS_OVERDUE_COUNT');
+       removeCSSClass(document.documentElement,'PATRON_EXCEEDS_FINES');
+       removeCSSClass(document.documentElement,'NO_PENALTIES');
+       removeCSSClass(document.documentElement,'ONE_PENALTY');
+       removeCSSClass(document.documentElement,'MULTIPLE_PENALTIES');
+       removeCSSClass(document.documentElement,'PATRON_HAS_ALERT');
+       removeCSSClass(document.documentElement,'PATRON_BARRED');
+       removeCSSClass(document.documentElement,'PATRON_INACTIVE');
+       removeCSSClass(document.documentElement,'PATRON_EXPIRED');
+       removeCSSClass(document.documentElement,'PATRON_HAS_INVALID_DOB');
+       removeCSSClass(document.documentElement,'PATRON_JUVENILE');
+       removeCSSClass(document.documentElement,'PATRON_HAS_INVALID_ADDRESS');
+       removeCSSClass(document.documentElement,'PATRON_AGE_GE_65');
+       removeCSSClass(document.documentElement,'PATRON_AGE_LT_65');
+       removeCSSClass(document.documentElement,'PATRON_AGE_GE_24');
+       removeCSSClass(document.documentElement,'PATRON_AGE_LT_24');
+       removeCSSClass(document.documentElement,'PATRON_AGE_GE_21');
+       removeCSSClass(document.documentElement,'PATRON_AGE_LT_21');
+       removeCSSClass(document.documentElement,'PATRON_AGE_GE_18');
+       removeCSSClass(document.documentElement,'PATRON_AGE_LT_18');
+       removeCSSClass(document.documentElement,'PATRON_AGE_GE_13');
+       removeCSSClass(document.documentElement,'PATRON_AGE_LT_13');
+       removeCSSClass(document.documentElement,'PATRON_NET_ACCESS_1');
+       removeCSSClass(document.documentElement,'PATRON_NET_ACCESS_2');
+       removeCSSClass(document.documentElement,'PATRON_NET_ACCESS_3');
+      }
+     ],
+     'cmd_patron_refresh' : [
+      ['command'],
+      function(ev) {
                             try { document.getElementById("PatronNavBarScrollbox").ensureElementIsVisible( document.getElementById("PatronNavBar_refresh" ) ); } catch(E) {};
-							obj.network.simple_request(
-								'RECALCULATE_STANDING_PENALTIES',
-								[ ses(), obj.patron.id() ]
-							);
-							obj.refresh_all();
-						}
-					],
-					'cmd_patron_checkout' : [
-						['command'],
+       obj.network.simple_request(
+        'RECALCULATE_STANDING_PENALTIES',
+        [ ses(), obj.patron.id() ]
+       );
+       obj.refresh_all();
+      }
+     ],
+     'cmd_patron_checkout' : [
+      ['command'],
                         function(ev) {
-    			            obj.reset_nav_styling('cmd_patron_checkout');
+                   obj.reset_nav_styling('cmd_patron_checkout');
                             spawn_checkout_interface();
                         }
-					],
-					'cmd_patron_items' : [
-						['command'],
-						function(ev) {
+     ],
+     'cmd_patron_items' : [
+      ['command'],
+      function(ev) {
                             try { document.getElementById("PatronNavBarScrollbox").ensureElementIsVisible( document.getElementById("PatronNavBar_items" ) ); } catch(E) {};
-							obj.reset_nav_styling('cmd_patron_items');
-							var frame = obj.right_deck.set_iframe(
-								urls.XUL_PATRON_ITEMS,
-								//+ '?patron_id=' + window.escape( obj.patron.id() ),
-								{},
-								{
-									'patron_id' : obj.patron.id(),
-									'on_list_change' : function(b) {
-										netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-										obj.summary_window.g.summary.controller.render('patron_checkouts');
-										obj.summary_window.g.summary.controller.render('patron_standing_penalties');
-										obj.summary_window.g.summary.controller.render('patron_bill');
-										obj.bill_window.g.bills.refresh(true);
-									},
-									'url_prefix' : xulG.url_prefix,
-									'new_tab' : xulG.new_tab,
-									'new_patron_tab' : xulG.new_patron_tab
-								}
-							);
-							netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-							obj.items_window = get_contentWindow(frame);
-						}
-					],
-					'cmd_patron_edit' : [
-						['command'],
-						function(ev) {
+       obj.reset_nav_styling('cmd_patron_items');
+       var frame = obj.right_deck.set_iframe(
+        urls.XUL_PATRON_ITEMS,
+        //+ '?patron_id=' + window.escape( obj.patron.id() ),
+        {},
+        {
+         'patron_id' : obj.patron.id(),
+         'on_list_change' : function(b) {
+          netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+          obj.summary_window.g.summary.controller.render('patron_checkouts');
+          obj.summary_window.g.summary.controller.render('patron_standing_penalties');
+          obj.summary_window.g.summary.controller.render('patron_bill');
+          obj.bill_window.g.bills.refresh(true);
+         },
+         'url_prefix' : xulG.url_prefix,
+         'new_tab' : xulG.new_tab,
+         'new_patron_tab' : xulG.new_patron_tab
+        }
+       );
+       netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+       obj.items_window = get_contentWindow(frame);
+      }
+     ],
+     'cmd_patron_edit' : [
+      ['command'],
+      function(ev) {
                                 try { document.getElementById("PatronNavBarScrollbox").ensureElementIsVisible( document.getElementById("PatronNavBar_edit" ) ); } catch(E) {};
-								obj.reset_nav_styling('cmd_patron_edit');
-
-								function spawn_search(s) {
-									obj.error.sdump('D_TRACE', $("commonStrings").getFormattedString('staff.patron.display.cmd_patron_edit.edit_search', [js2JSON(s)]) ); 
-									obj.OpenILS.data.stash_retrieve();
-									xulG.new_patron_tab( {}, { 'doit' : 1, 'query' : s } );
-								}
-
-								function spawn_editor(p) {
-									var url = urls.XUL_PATRON_EDIT;
-									//var param_count = 0;
-									//for (var i in p) {
-									//	if (param_count++ == 0) url += '?'; else url += '&';
-									//	url += i + '=' + window.escape(p[i]);
-									//}
-									var loc = xulG.url_prefix( urls.XUL_REMOTE_BROWSER ); // + '?url=' + window.escape( url );
-									xulG.new_tab(
-										loc, 
-										{}, 
-										{ 
-											'url' : url,
-											'show_print_button' : true , 
-											'tab_name' : $("patronStrings").getString('staff.patron.display.spawn_editor.editing_related_patron'),
-											'passthru_content_params' : {
-												'spawn_search' : spawn_search,
-												'spawn_editor' : spawn_editor,
-												'url_prefix' : xulG.url_prefix,
-												'new_tab' : xulG.new_tab,
-									            'new_patron_tab' : xulG.new_patron_tab,
-												'params' : p
-											}
-										}
-									);
-								}
-
-							obj.right_deck.set_iframe(
-								urls.XUL_REMOTE_BROWSER + '?patron_edit=1',
-								//+ '?url=' + window.escape( 
-								//	urls.XUL_PATRON_EDIT
-								//	+ '?ses=' + window.escape( ses() )
-								//	+ '&usr=' + window.escape( obj.patron.id() )
-								//),
-								{}, {
-									'url' : urls.XUL_PATRON_EDIT,
-									'show_print_button' : true,
-									'passthru_content_params' : {
-										'params' : {
-											'ses' : ses(),
-											'usr' : obj.patron.id()
-										},
-										'on_save' : function(p) {
-											try {
-												if (obj.barcode) obj.barcode = p.card().barcode();
-												netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-												//obj.summary_window.g.summary.retrieve();
-												obj.refresh_all();
-											} catch(E) {
-												alert(E);
-											}
-										},
-										'spawn_search' : spawn_search,
-										'spawn_editor' : spawn_editor,
-										'url_prefix' : xulG.url_prefix,
-										'new_tab' : xulG.new_tab,
-									    'new_patron_tab' : xulG.new_patron_tab
-									}
-								}
-							);
-						}
-					],
+        obj.reset_nav_styling('cmd_patron_edit');
+
+        function spawn_search(s) {
+         obj.error.sdump('D_TRACE', $("commonStrings").getFormattedString('staff.patron.display.cmd_patron_edit.edit_search', [js2JSON(s)]) ); 
+         obj.OpenILS.data.stash_retrieve();
+         xulG.new_patron_tab( {}, { 'doit' : 1, 'query' : s } );
+        }
+
+        function spawn_editor(p) {
+         var url = urls.XUL_PATRON_EDIT;
+         //var param_count = 0;
+         //for (var i in p) {
+         // if (param_count++ == 0) url += '?'; else url += '&';
+         // url += i + '=' + window.escape(p[i]);
+         //}
+         var loc = xulG.url_prefix( urls.XUL_REMOTE_BROWSER ); // + '?url=' + window.escape( url );
+         xulG.new_tab(
+          loc, 
+          {}, 
+          { 
+           'url' : url,
+           'show_print_button' : true , 
+           'tab_name' : $("patronStrings").getString('staff.patron.display.spawn_editor.editing_related_patron'),
+           'passthru_content_params' : {
+            'spawn_search' : spawn_search,
+            'spawn_editor' : spawn_editor,
+            'url_prefix' : xulG.url_prefix,
+            'new_tab' : xulG.new_tab,
+                     'new_patron_tab' : xulG.new_patron_tab,
+            'params' : p
+           }
+          }
+         );
+        }
+
+       obj.right_deck.set_iframe(
+        urls.XUL_REMOTE_BROWSER + '?patron_edit=1',
+        //+ '?url=' + window.escape( 
+        // urls.XUL_PATRON_EDIT
+        // + '?ses=' + window.escape( ses() )
+        // + '&usr=' + window.escape( obj.patron.id() )
+        //),
+        {}, {
+         'url' : urls.XUL_PATRON_EDIT,
+         'show_print_button' : true,
+         'passthru_content_params' : {
+          'params' : {
+           'ses' : ses(),
+           'usr' : obj.patron.id()
+          },
+          'on_save' : function(p) {
+           try {
+            if (obj.barcode) obj.barcode = p.card().barcode();
+            netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+            //obj.summary_window.g.summary.retrieve();
+            obj.refresh_all();
+           } catch(E) {
+            alert(E);
+           }
+          },
+          'spawn_search' : spawn_search,
+          'spawn_editor' : spawn_editor,
+          'url_prefix' : xulG.url_prefix,
+          'new_tab' : xulG.new_tab,
+             'new_patron_tab' : xulG.new_patron_tab
+         }
+        }
+       );
+      }
+     ],
                     'cmd_patron_other' : [
-						['command'],
-						function(ev) {
+      ['command'],
+      function(ev) {
                             try { document.getElementById("PatronNavBarScrollbox").ensureElementIsVisible( document.getElementById("PatronNavBar_other" ) ); } catch(E) {};
-							obj.reset_nav_styling('cmd_patron_other');
+       obj.reset_nav_styling('cmd_patron_other');
                             try { document.getElementById('PatronNavBar_other').firstChild.showPopup(); } catch(E) {};
                         }
                     ],
-					'cmd_patron_info_notes' : [
-						['command'],
-						function(ev) {
-							obj.right_deck.set_iframe(
+     'cmd_patron_info_notes' : [
+      ['command'],
+      function(ev) {
+       obj.right_deck.set_iframe(
                                 urls.XUL_PATRON_INFO_NOTES,
-								{},
-								{
-									'patron_id' : obj.patron.id(),
-									'url_prefix' : xulG.url_prefix,
-									'new_tab' : xulG.new_tab,
-									'new_patron_tab' : xulG.new_patron_tab
-								}
-							);
-						}
-					],
-					'cmd_patron_info_stats' : [
-						['command'],
-						function(ev) {
-							obj.right_deck.set_iframe(
+        {},
+        {
+         'patron_id' : obj.patron.id(),
+         'url_prefix' : xulG.url_prefix,
+         'new_tab' : xulG.new_tab,
+         'new_patron_tab' : xulG.new_patron_tab
+        }
+       );
+      }
+     ],
+     'cmd_patron_info_stats' : [
+      ['command'],
+      function(ev) {
+       obj.right_deck.set_iframe(
                                 urls.XUL_PATRON_INFO_STAT_CATS,
-								{},
-								{
-									'patron_id' : obj.patron.id(),
-									'url_prefix' : xulG.url_prefix,
-									'new_tab' : xulG.new_tab,
-									'new_patron_tab' : xulG.new_patron_tab
-								}
-							);
-						}
-					],
-					'cmd_patron_info_surveys' : [
-						['command'],
-						function(ev) {
-							obj.right_deck.set_iframe(
+        {},
+        {
+         'patron_id' : obj.patron.id(),
+         'url_prefix' : xulG.url_prefix,
+         'new_tab' : xulG.new_tab,
+         'new_patron_tab' : xulG.new_patron_tab
+        }
+       );
+      }
+     ],
+     'cmd_patron_info_surveys' : [
+      ['command'],
+      function(ev) {
+       obj.right_deck.set_iframe(
                                 urls.XUL_PATRON_INFO_SURVEYS,
-								{},
-								{
-									'patron_id' : obj.patron.id(),
-									'url_prefix' : xulG.url_prefix,
-									'new_tab' : xulG.new_tab,
-									'new_patron_tab' : xulG.new_patron_tab
-								}
-							);
-						}
-					],
-					'cmd_patron_info_groups' : [
-						['command'],
-						function(ev) {
-							obj.right_deck.set_iframe(
+        {},
+        {
+         'patron_id' : obj.patron.id(),
+         'url_prefix' : xulG.url_prefix,
+         'new_tab' : xulG.new_tab,
+         'new_patron_tab' : xulG.new_patron_tab
+        }
+       );
+      }
+     ],
+     'cmd_patron_info_groups' : [
+      ['command'],
+      function(ev) {
+       obj.right_deck.set_iframe(
                                 urls.XUL_PATRON_INFO_GROUP,
-								{},
-								{
-									'patron_id' : obj.patron.id(),
-									'url_prefix' : xulG.url_prefix,
-									'new_tab' : xulG.new_tab,
-									'new_patron_tab' : xulG.new_patron_tab
-								}
-							);
-						}
-					],
+        {},
+        {
+         'patron_id' : obj.patron.id(),
+         'url_prefix' : xulG.url_prefix,
+         'new_tab' : xulG.new_tab,
+         'new_patron_tab' : xulG.new_patron_tab
+        }
+       );
+      }
+     ],
                     'cmd_patron_alert' : [
                         ['command'],
                         function(ev) {
@@ -353,20 +353,20 @@ patron.display.prototype = {
                             }
                         }
                     ],
-					'cmd_patron_exit' : [
-						['command'],
-						function(ev) {
-							xulG.set_tab(urls.XUL_PATRON_BARCODE_ENTRY,{},{});
-						}
-					],
-					'cmd_patron_holds' : [
-						['command'],
-						function(ev) {
+     'cmd_patron_exit' : [
+      ['command'],
+      function(ev) {
+       xulG.set_tab(urls.XUL_PATRON_BARCODE_ENTRY,{},{});
+      }
+     ],
+     'cmd_patron_holds' : [
+      ['command'],
+      function(ev) {
                             try {
                                 try { document.getElementById("PatronNavBarScrollbox").ensureElementIsVisible( document.getElementById("PatronNavBar_holds" ) ); } catch(E) {};
                                 obj.reset_nav_styling('cmd_patron_holds');
                                 obj.right_deck.set_iframe(
-                                    urls.XUL_PATRON_HOLDS,	
+                                    urls.XUL_PATRON_HOLDS, 
                                     //+ '?patron_id=' + window.escape( obj.patron.id() ),
                                     {},
                                     {
@@ -381,60 +381,60 @@ patron.display.prototype = {
                                         },
                                         'url_prefix' : xulG.url_prefix,
                                         'new_tab' : xulG.new_tab,
-									    'new_patron_tab' : xulG.new_patron_tab
+             'new_patron_tab' : xulG.new_patron_tab
                                     }
                                 );
                             } catch(E) {
                                 alert(E);
                             }
-						}
-					],
-					'cmd_patron_bills' : [
-						['command'],
-						function(ev) {
+      }
+     ],
+     'cmd_patron_bills' : [
+      ['command'],
+      function(ev) {
                             try { document.getElementById("PatronNavBarScrollbox").ensureElementIsVisible( document.getElementById("PatronNavBar_bills" ) ); } catch(E) {};
-							obj.reset_nav_styling('cmd_patron_bills');
-							var f = obj.right_deck.set_iframe(
-								urls.XUL_PATRON_BILLS,
-								//+ '?patron_id=' + window.escape( obj.patron.id() ),
-								{},
-								{
-									'patron_id' : obj.patron.id(),
-									'url_prefix' : xulG.url_prefix,
-									'on_money_change' : function(b) {
-										//alert('test');
-										netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-										//obj.summary_window.g.summary.retrieve(true);
-										//obj.items_window.g.items.retrieve(true);
-										obj.refresh_all();
-									}
-								}
-							);
-							netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-							obj.bill_window = get_contentWindow(f);
-						}
-					],
-					'patron_name' : [
-						['render'],
-						function(e) {
-							return function() { 
-								e.setAttribute('value',
-									( obj.patron.prefix() ? obj.patron.prefix() + ' ' : '') + 
-									obj.patron.family_name() + ', ' + 
-									obj.patron.first_given_name() + ' ' +
-									( obj.patron.second_given_name() ? obj.patron.second_given_name() + ' ' : '' ) +
-									( obj.patron.suffix() ? obj.patron.suffix() : '')
-								);
-								JSAN.use('patron.util'); patron.util.set_penalty_css(obj.patron);
-							};
-						}
-					],
-					'PatronNavBar' : [
-						['render'],
-						function(e) {
-							return function() {}
-						}
-					],
+       obj.reset_nav_styling('cmd_patron_bills');
+       var f = obj.right_deck.set_iframe(
+        urls.XUL_PATRON_BILLS,
+        //+ '?patron_id=' + window.escape( obj.patron.id() ),
+        {},
+        {
+         'patron_id' : obj.patron.id(),
+         'url_prefix' : xulG.url_prefix,
+         'on_money_change' : function(b) {
+          //alert('test');
+          netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+          //obj.summary_window.g.summary.retrieve(true);
+          //obj.items_window.g.items.retrieve(true);
+          obj.refresh_all();
+         }
+        }
+       );
+       netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+       obj.bill_window = get_contentWindow(f);
+      }
+     ],
+     'patron_name' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        e.setAttribute('value',
+         ( obj.patron.prefix() ? obj.patron.prefix() + ' ' : '') + 
+         obj.patron.family_name() + ', ' + 
+         obj.patron.first_given_name() + ' ' +
+         ( obj.patron.second_given_name() ? obj.patron.second_given_name() + ' ' : '' ) +
+         ( obj.patron.suffix() ? obj.patron.suffix() : '')
+        );
+        JSAN.use('patron.util'); patron.util.set_penalty_css(obj.patron);
+       };
+      }
+     ],
+     'PatronNavBar' : [
+      ['render'],
+      function(e) {
+       return function() {}
+      }
+     ],
                     'cmd_verify_credentials' : [
                         ['command'],
                         function() {
@@ -459,7 +459,7 @@ patron.display.prototype = {
                         function() {
                             function penalty_interface() {
                                 try { document.getElementById("PatronNavBarScrollbox").ensureElementIsVisible( document.getElementById("PatronNavBar_messages" ) ); } catch(E) {};
-							    obj.reset_nav_styling('cmd_standing_penalties');
+           obj.reset_nav_styling('cmd_standing_penalties');
                                 return obj.right_deck.reset_iframe(
                                     urls.XUL_STANDING_PENALTIES,
                                     {},
@@ -474,9 +474,9 @@ patron.display.prototype = {
                             penalty_interface();
                         } 
                     ]
-				}
-			}
-		);
+    }
+   }
+  );
 
         var x = document.getElementById("PatronNavBar_checkout");
         x.addEventListener( 'focus', function(xx) { return function() { try { document.getElementById("PatronNavBarScrollbox").ensureElementIsVisible(xx); } catch(E) {}; } }(x), false);
@@ -495,167 +495,167 @@ patron.display.prototype = {
         var x = document.getElementById("PatronNavBar_messages");
         x.addEventListener( 'focus', function(xx) { return function() { try { document.getElementById("PatronNavBarScrollbox").ensureElementIsVisible(xx); } catch(E) {}; } }(x), false);
 
-		if (obj.barcode || obj.id) {
-			if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-				try { window.xulG.set_tab_name($("patronStrings").getString('staff.patron.display.init.retrieving_patron')); } catch(E) { alert(E); }
-			}
-
-			obj.controller.view.PatronNavBar.selectedIndex = 1;
-			JSAN.use('util.widgets'); 
-			util.widgets.enable_accesskeys_in_node_and_children(
-				obj.controller.view.PatronNavBar.lastChild
-			);
-			util.widgets.disable_accesskeys_in_node_and_children(
-				obj.controller.view.PatronNavBar.firstChild
-			);
-			obj.controller.view.cmd_patron_refresh.setAttribute('disabled','true');
-			obj.controller.view.cmd_patron_checkout.setAttribute('disabled','true');
-			obj.controller.view.cmd_patron_items.setAttribute('disabled','true');
-			obj.controller.view.cmd_patron_holds.setAttribute('disabled','true');
-			obj.controller.view.cmd_patron_bills.setAttribute('disabled','true');
-			obj.controller.view.cmd_patron_edit.setAttribute('disabled','true');
-			obj.controller.view.patron_name.setAttribute('value', $("patronStrings").getString('staff.patron.display.init.retrieving'));
-			document.documentElement.setAttribute('class','');
-			var frame = obj.left_deck.set_iframe(
-				urls.XUL_PATRON_SUMMARY,
-				{},
-				{
+  if (obj.barcode || obj.id) {
+   if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+    try { window.xulG.set_tab_name($("patronStrings").getString('staff.patron.display.init.retrieving_patron')); } catch(E) { alert(E); }
+   }
+
+   obj.controller.view.PatronNavBar.selectedIndex = 1;
+   JSAN.use('util.widgets'); 
+   util.widgets.enable_accesskeys_in_node_and_children(
+    obj.controller.view.PatronNavBar.lastChild
+   );
+   util.widgets.disable_accesskeys_in_node_and_children(
+    obj.controller.view.PatronNavBar.firstChild
+   );
+   obj.controller.view.cmd_patron_refresh.setAttribute('disabled','true');
+   obj.controller.view.cmd_patron_checkout.setAttribute('disabled','true');
+   obj.controller.view.cmd_patron_items.setAttribute('disabled','true');
+   obj.controller.view.cmd_patron_holds.setAttribute('disabled','true');
+   obj.controller.view.cmd_patron_bills.setAttribute('disabled','true');
+   obj.controller.view.cmd_patron_edit.setAttribute('disabled','true');
+   obj.controller.view.patron_name.setAttribute('value', $("patronStrings").getString('staff.patron.display.init.retrieving'));
+   document.documentElement.setAttribute('class','');
+   var frame = obj.left_deck.set_iframe(
+    urls.XUL_PATRON_SUMMARY,
+    {},
+    {
                     'display_window' : window,
-					'barcode' : obj.barcode,
-					'id' : obj.id,
+     'barcode' : obj.barcode,
+     'id' : obj.id,
                     'refresh' : function() { obj.refresh_all(); },
-					'on_finished' : function(patron) {
-
-						obj.patron = patron; obj.controller.render();
-
-						obj.controller.view.cmd_patron_refresh.setAttribute('disabled','false');
-						obj.controller.view.cmd_patron_checkout.setAttribute('disabled','false');
-						obj.controller.view.cmd_patron_items.setAttribute('disabled','false');
-						obj.controller.view.cmd_patron_holds.setAttribute('disabled','false');
-						obj.controller.view.cmd_patron_bills.setAttribute('disabled','false');
-						obj.controller.view.cmd_patron_edit.setAttribute('disabled','false');
-
-						if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-							try { 
-								window.xulG.set_tab_name(
-									$("patronStrings").getString('staff.patron.display.tab_name')
-										+ ' ' + patron.family_name() + ', ' + patron.first_given_name() + ' ' 
-										+ (patron.second_given_name() ? patron.second_given_name() : '' ) 
-								); 
-							} catch(E) { 
-								obj.error.sdump('D_ERROR',E);
-							}
-						}
-
-						if (!obj._checkout_spawned) {
-							spawn_checkout_interface();
-							obj._checkout_spawned = true;
-						}
-
-						obj.network.simple_request(
-							'FM_AHR_COUNT_RETRIEVE.authoritative',
-							[ ses(), patron.id() ],
-							function(req) {
-								try {
-									var msg = ''; obj.stop_checkouts = false;
-									if (patron.alert_message())
-										msg += $("patronStrings").getFormattedString('staff.patron.display.init.network_request.alert_message', [patron.alert_message()]);
-									//alert('obj.barcode = ' + obj.barcode);
-									if (obj.barcode) {
-										if (patron.cards()) for (var i = 0; i < patron.cards().length; i++) {
-											//alert('card #'+i+' == ' + js2JSON(patron.cards()[i]));
-											if ( (patron.cards()[i].barcode()==obj.barcode) && ( ! get_bool(patron.cards()[i].active()) ) ) {
-												msg += $("patronStrings").getString('staff.patron.display.init.network_request.inactive_card');
-												obj.stop_checkouts = true;
-											}
-										}
-									}
-									if (get_bool(patron.barred())) {
-										msg += $("patronStrings").getString('staff.patron.display.init.network_request.account_barred');
-										obj.stop_checkouts = true;
-									}
-									if (!get_bool(patron.active())) {
-										msg += $("patronStrings").getString('staff.patron.display.init.network_request.account_inactive');
-										obj.stop_checkouts = true;
-									}
-									if (patron.expire_date()) {
-										var now = new Date();
-										now = now.getTime()/1000;
-
-										var expire_parts = patron.expire_date().substr(0,10).split('-');
-										expire_parts[1] = expire_parts[1] - 1;
-
-										var expire = new Date();
-										expire.setFullYear(expire_parts[0], expire_parts[1], expire_parts[2]);
-										expire = expire.getTime()/1000
-
-										if (expire < now) {
-											msg += $("patronStrings").getString('staff.patron.display.init.network_request.account_expired');
-										obj.stop_checkouts = true;
-										}
-									}
-								    var penalties = obj.patron.standing_penalties();
-								    for (var i = 0; i < penalties.length; i++) {
+     'on_finished' : function(patron) {
+
+      obj.patron = patron; obj.controller.render();
+
+      obj.controller.view.cmd_patron_refresh.setAttribute('disabled','false');
+      obj.controller.view.cmd_patron_checkout.setAttribute('disabled','false');
+      obj.controller.view.cmd_patron_items.setAttribute('disabled','false');
+      obj.controller.view.cmd_patron_holds.setAttribute('disabled','false');
+      obj.controller.view.cmd_patron_bills.setAttribute('disabled','false');
+      obj.controller.view.cmd_patron_edit.setAttribute('disabled','false');
+
+      if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+       try { 
+        window.xulG.set_tab_name(
+         $("patronStrings").getString('staff.patron.display.tab_name')
+          + ' ' + patron.family_name() + ', ' + patron.first_given_name() + ' ' 
+          + (patron.second_given_name() ? patron.second_given_name() : '' ) 
+        ); 
+       } catch(E) { 
+        obj.error.sdump('D_ERROR',E);
+       }
+      }
+
+      if (!obj._checkout_spawned) {
+       spawn_checkout_interface();
+       obj._checkout_spawned = true;
+      }
+
+      obj.network.simple_request(
+       'FM_AHR_COUNT_RETRIEVE.authoritative',
+       [ ses(), patron.id() ],
+       function(req) {
+        try {
+         var msg = ''; obj.stop_checkouts = false;
+         if (patron.alert_message())
+          msg += $("patronStrings").getFormattedString('staff.patron.display.init.network_request.alert_message', [patron.alert_message()]);
+         //alert('obj.barcode = ' + obj.barcode);
+         if (obj.barcode) {
+          if (patron.cards()) for (var i = 0; i < patron.cards().length; i++) {
+           //alert('card #'+i+' == ' + js2JSON(patron.cards()[i]));
+           if ( (patron.cards()[i].barcode()==obj.barcode) && ( ! get_bool(patron.cards()[i].active()) ) ) {
+            msg += $("patronStrings").getString('staff.patron.display.init.network_request.inactive_card');
+            obj.stop_checkouts = true;
+           }
+          }
+         }
+         if (get_bool(patron.barred())) {
+          msg += $("patronStrings").getString('staff.patron.display.init.network_request.account_barred');
+          obj.stop_checkouts = true;
+         }
+         if (!get_bool(patron.active())) {
+          msg += $("patronStrings").getString('staff.patron.display.init.network_request.account_inactive');
+          obj.stop_checkouts = true;
+         }
+         if (patron.expire_date()) {
+          var now = new Date();
+          now = now.getTime()/1000;
+
+          var expire_parts = patron.expire_date().substr(0,10).split('-');
+          expire_parts[1] = expire_parts[1] - 1;
+
+          var expire = new Date();
+          expire.setFullYear(expire_parts[0], expire_parts[1], expire_parts[2]);
+          expire = expire.getTime()/1000
+
+          if (expire < now) {
+           msg += $("patronStrings").getString('staff.patron.display.init.network_request.account_expired');
+          obj.stop_checkouts = true;
+          }
+         }
+            var penalties = obj.patron.standing_penalties();
+            for (var i = 0; i < penalties.length; i++) {
                                         if (penalties[i].standing_penalty().block_list()) {
                                             msg += obj.OpenILS.data.hash.aou[ penalties[i].org_unit() ].shortname() + ' : ' + penalties[i].standing_penalty().label() + '<br/>';
                                         }
                                     }
-									var holds = req.getResultObject();
-									if (holds.ready && holds.ready > 0) {
-										msg += $("patronStrings").getFormattedString('staff.patron.display.init.holds_ready', [holds.ready]);
-									}
-									if (msg) {
-										if (msg != obj.old_msg) {
-											//obj.error.yns_alert(msg,'Alert Message','OK',null,null,'Check here to confirm this message.');
-											document.documentElement.firstChild.focus();
-											var data_url = window.escape("<img src='" + xulG.url_prefix('/xul/server/skin/media/images/stop_sign.png') + "'/>" + '<h1>'
-												+ $("patronStrings").getString('staff.patron.display.init.network_request.window_title') + '</h1><blockquote><p>' + msg + '</p>\r\n\r\n<pre>'
-												+ $("patronStrings").getString('staff.patron.display.init.network_request.window_message') + '</pre></blockquote>');
-											obj.right_deck.set_iframe('data:text/html,'+data_url,{},{});
-											obj.old_msg = msg;
+         var holds = req.getResultObject();
+         if (holds.ready && holds.ready > 0) {
+          msg += $("patronStrings").getFormattedString('staff.patron.display.init.holds_ready', [holds.ready]);
+         }
+         if (msg) {
+          if (msg != obj.old_msg) {
+           //obj.error.yns_alert(msg,'Alert Message','OK',null,null,'Check here to confirm this message.');
+           document.documentElement.firstChild.focus();
+           var data_url = window.escape("<img src='" + xulG.url_prefix('/xul/server/skin/media/images/stop_sign.png') + "'/>" + '<h1>'
+            + $("patronStrings").getString('staff.patron.display.init.network_request.window_title') + '</h1><blockquote><p>' + msg + '</p>\r\n\r\n<pre>'
+            + $("patronStrings").getString('staff.patron.display.init.network_request.window_message') + '</pre></blockquote>');
+           obj.right_deck.set_iframe('data:text/html,'+data_url,{},{});
+           obj.old_msg = msg;
                                             obj.msg_url = data_url;
-										} else {
-											obj.error.sdump('D_TRACE',$("patronStrings").getFormattedString('staff.patron.display.init.network_request.dump_error_message', [msg]));
-										}
-									}
-									if (obj.stop_checkouts && obj.checkout_window) {
-										setTimeout( function() {
-											try {
-												netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-												obj.checkout_window.g.checkout.check_disable();
-											} catch(E) { }
-										}, 1000);
-									}
-								} catch(E) {
-									obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.display.init.network_request.error_showing_alert'),E);
-								}
-							}
-						);
-
-					},
-					'on_error' : function(E) {
-						try {
-							var error;
-							if (typeof E.ilsevent != 'undefined') {
-								error = E.textcode;
-							} else {
-								error = js2JSON(E).substr(0,100);
-							}
-							location.href = urls.XUL_PATRON_BARCODE_ENTRY + '?error=' + window.escape(error);
-						} catch(F) {
-							alert(F);
-						}
-					}
-				}
-			);
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			obj.summary_window = get_contentWindow(frame);
-		} else {
-			obj.render_search_form(params);
-		}
-	},
-
-	'reset_nav_styling' : function(btn,dont_hide_summary) {
+          } else {
+           obj.error.sdump('D_TRACE',$("patronStrings").getFormattedString('staff.patron.display.init.network_request.dump_error_message', [msg]));
+          }
+         }
+         if (obj.stop_checkouts && obj.checkout_window) {
+          setTimeout( function() {
+           try {
+            netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+            obj.checkout_window.g.checkout.check_disable();
+           } catch(E) { }
+          }, 1000);
+         }
+        } catch(E) {
+         obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.display.init.network_request.error_showing_alert'),E);
+        }
+       }
+      );
+
+     },
+     'on_error' : function(E) {
+      try {
+       var error;
+       if (typeof E.ilsevent != 'undefined') {
+        error = E.textcode;
+       } else {
+        error = js2JSON(E).substr(0,100);
+       }
+       location.href = urls.XUL_PATRON_BARCODE_ENTRY + '?error=' + window.escape(error);
+      } catch(F) {
+       alert(F);
+      }
+     }
+    }
+   );
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   obj.summary_window = get_contentWindow(frame);
+  } else {
+   obj.render_search_form(params);
+  }
+ },
+
+ 'reset_nav_styling' : function(btn,dont_hide_summary) {
         try {
             this.controller.view.cmd_patron_checkout.setAttribute('style','');
             this.controller.view.cmd_patron_items.setAttribute('style','');
@@ -677,119 +677,119 @@ patron.display.prototype = {
         } catch(E) {
             alert(E);
         }
-	},
-
-	'render_search_form' : function(params) {
-		var obj = this;
-			if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-				try { window.xulG.set_tab_name($("patronStrings").getString('staff.patron.display.render_search_form.patron_search')); } catch(E) { alert(E); }
-			}
-
-			obj.controller.view.PatronNavBar.selectedIndex = 0;
-			obj.controller.view.cmd_patron_retrieve.setAttribute('disabled','true');
-			obj.controller.view.cmd_patron_merge.setAttribute('disabled','true');
-			obj.controller.view.cmd_search_form.setAttribute('disabled','true');
-
-		    var horizontal_interface = String( obj.OpenILS.data.hash.aous['ui.circ.patron_summary.horizontal'] ) == 'true';
-			var loc = horizontal_interface ? urls.XUL_PATRON_HORIZONTAL_SEARCH_FORM : urls.XUL_PATRON_SEARCH_FORM; 
-			var my_xulG = {
-				'clear_left_deck' : function() {
-					setTimeout( function() {
-						obj.left_deck.clear_all_except(loc);
-						obj.render_search_form(params);
-					}, 0);
-				},
-				'on_submit' : function(query) {
-					obj.controller.view.cmd_patron_retrieve.setAttribute('disabled','true');
-			        obj.controller.view.cmd_patron_merge.setAttribute('disabled','true');
-					var list_frame = obj.right_deck.reset_iframe(
-						urls.XUL_PATRON_SEARCH_RESULT, // + '?' + query,
-						{},
-						{
-							'query' : query,
-							'on_select' : function(list) {
-								if (!list) return;
-								if (list.length < 1) return;
-								obj.controller.view.cmd_patron_retrieve.setAttribute('disabled','false');
-								if (list.length > 1) obj.controller.view.cmd_patron_merge.setAttribute('disabled','false');
-								obj.controller.view.cmd_search_form.setAttribute('disabled','false');
-								obj.retrieve_ids = list;
-								obj.controller.view.patron_name.setAttribute('value',$("patronStrings").getString('staff.patron.display.init.retrieving'));
-								document.documentElement.setAttribute('class','');
-								setTimeout(
-									function() {
-										var frame = obj.left_deck.set_iframe(
-											urls.XUL_PATRON_SUMMARY + '?id=' + window.escape(list[0]),
-											{},
-											{
-												//'id' : list[0],
-												'on_finished' : function(patron) {
-													obj.patron = patron;
-													obj.controller.render();
-												}
-											}
-										);
-										netscape.security.PrivilegeManager.enablePrivilege(
-											"UniversalXPConnect"
-										);
-										obj.summary_window = get_contentWindow(frame);
-										obj.patron = obj.summary_window.g.summary.patron;
-										obj.controller.render('patron_name');
-									}, 0
-								);
-							}
-						}
-					);
-					netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-					obj.search_result = get_contentWindow(list_frame);
-				}
-			};
-
-			if (params['query']) {
-				my_xulG.query = JSON2js(params['query']);
-				if (params.doit) my_xulG.doit = 1;
-			}
-
-			var form_frame = obj.left_deck.set_iframe(
-				loc,
-				{},
-				my_xulG
-			);
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			obj.search_window = get_contentWindow(form_frame);
-			obj._checkout_spawned = true;
-	},
-
-	'_checkout_spawned' : false,
-
-	'refresh_deck' : function(url) {
-		var obj = this;
-		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-		for (var i = 0; i < obj.right_deck.node.childNodes.length; i++) {
-			try {
-				var f = obj.right_deck.node.childNodes[i];
-				var w = get_contentWindow(f);
-				if (url) {
-					if (w.location.href == url) w.refresh(true);
-				} else {
-					if (typeof w.refresh == 'function') {
-						w.refresh(true);
-					}
-				}
-
-			} catch(E) {
-				obj.error.sdump('D_ERROR','refresh_deck: ' + E + '\n');
-			}
-		}
-	},
-	
-	'refresh_all' : function() {
-		var obj = this;
-		obj.controller.view.patron_name.setAttribute('value', $("patronStrings").getString('staff.patron.display.init.retrieving'));
-		document.documentElement.setAttribute('class','');
-		try { obj.summary_window.refresh(); } catch(E) { obj.error.sdump('D_ERROR', E + '\n'); }
-		try { obj.refresh_deck(); } catch(E) { obj.error.sdump('D_ERROR', E + '\n'); }
-	},
+ },
+
+ 'render_search_form' : function(params) {
+  var obj = this;
+   if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+    try { window.xulG.set_tab_name($("patronStrings").getString('staff.patron.display.render_search_form.patron_search')); } catch(E) { alert(E); }
+   }
+
+   obj.controller.view.PatronNavBar.selectedIndex = 0;
+   obj.controller.view.cmd_patron_retrieve.setAttribute('disabled','true');
+   obj.controller.view.cmd_patron_merge.setAttribute('disabled','true');
+   obj.controller.view.cmd_search_form.setAttribute('disabled','true');
+
+      var horizontal_interface = String( obj.OpenILS.data.hash.aous['ui.circ.patron_summary.horizontal'] ) == 'true';
+   var loc = horizontal_interface ? urls.XUL_PATRON_HORIZONTAL_SEARCH_FORM : urls.XUL_PATRON_SEARCH_FORM; 
+   var my_xulG = {
+    'clear_left_deck' : function() {
+     setTimeout( function() {
+      obj.left_deck.clear_all_except(loc);
+      obj.render_search_form(params);
+     }, 0);
+    },
+    'on_submit' : function(query) {
+     obj.controller.view.cmd_patron_retrieve.setAttribute('disabled','true');
+           obj.controller.view.cmd_patron_merge.setAttribute('disabled','true');
+     var list_frame = obj.right_deck.reset_iframe(
+      urls.XUL_PATRON_SEARCH_RESULT, // + '?' + query,
+      {},
+      {
+       'query' : query,
+       'on_select' : function(list) {
+        if (!list) return;
+        if (list.length < 1) return;
+        obj.controller.view.cmd_patron_retrieve.setAttribute('disabled','false');
+        if (list.length > 1) obj.controller.view.cmd_patron_merge.setAttribute('disabled','false');
+        obj.controller.view.cmd_search_form.setAttribute('disabled','false');
+        obj.retrieve_ids = list;
+        obj.controller.view.patron_name.setAttribute('value',$("patronStrings").getString('staff.patron.display.init.retrieving'));
+        document.documentElement.setAttribute('class','');
+        setTimeout(
+         function() {
+          var frame = obj.left_deck.set_iframe(
+           urls.XUL_PATRON_SUMMARY + '?id=' + window.escape(list[0]),
+           {},
+           {
+            //'id' : list[0],
+            'on_finished' : function(patron) {
+             obj.patron = patron;
+             obj.controller.render();
+            }
+           }
+          );
+          netscape.security.PrivilegeManager.enablePrivilege(
+           "UniversalXPConnect"
+          );
+          obj.summary_window = get_contentWindow(frame);
+          obj.patron = obj.summary_window.g.summary.patron;
+          obj.controller.render('patron_name');
+         }, 0
+        );
+       }
+      }
+     );
+     netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+     obj.search_result = get_contentWindow(list_frame);
+    }
+   };
+
+   if (params['query']) {
+    my_xulG.query = JSON2js(params['query']);
+    if (params.doit) my_xulG.doit = 1;
+   }
+
+   var form_frame = obj.left_deck.set_iframe(
+    loc,
+    {},
+    my_xulG
+   );
+   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+   obj.search_window = get_contentWindow(form_frame);
+   obj._checkout_spawned = true;
+ },
+
+ '_checkout_spawned' : false,
+
+ 'refresh_deck' : function(url) {
+  var obj = this;
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  for (var i = 0; i < obj.right_deck.node.childNodes.length; i++) {
+   try {
+    var f = obj.right_deck.node.childNodes[i];
+    var w = get_contentWindow(f);
+    if (url) {
+     if (w.location.href == url) w.refresh(true);
+    } else {
+     if (typeof w.refresh == 'function') {
+      w.refresh(true);
+     }
+    }
+
+   } catch(E) {
+    obj.error.sdump('D_ERROR','refresh_deck: ' + E + '\n');
+   }
+  }
+ },
+ 
+ 'refresh_all' : function() {
+  var obj = this;
+  obj.controller.view.patron_name.setAttribute('value', $("patronStrings").getString('staff.patron.display.init.retrieving'));
+  document.documentElement.setAttribute('class','');
+  try { obj.summary_window.refresh(); } catch(E) { obj.error.sdump('D_ERROR', E + '\n'); }
+  try { obj.refresh_deck(); } catch(E) { obj.error.sdump('D_ERROR', E + '\n'); }
+ },
 }
 
 dump('exiting patron/display.js\n');
diff --git a/Open-ILS/xul/staff_client/server/patron/display.xul b/Open-ILS/xul/staff_client/server/patron/display.xul
index aa768f92a4..161af9f546 100644
--- a/Open-ILS/xul/staff_client/server/patron/display.xul
+++ b/Open-ILS/xul/staff_client/server/patron/display.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -21,98 +21,98 @@
 <?xul-overlay href="/xul/server/patron/display_overlay.xul"?>
 
 <window id="patron_display_win" 
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
-	<scripts id="openils_util_scripts"/>
-
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="/xul/server/patron/display.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-	
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for patron_display.xul');
-
-				JSAN.use('patron.display'); g.patron = new patron.display();
-				g.patron.init( { 
-					'barcode' : xul_param('barcode'),
-					'id' : xul_param('id'),
-					'query' : xul_param('query'),
-					'doit' : xul_param('doit')
-				} );
-
-			//document.documentElement.style.setProperty('font-size-adjust','1','important');
-
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/display.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function default_focus() {
-			setTimeout(
-				function() {
-					try {
-						netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-						var node = g.patron.right_deck.node.selectedPanel;
-						if (node && get_contentWindow(node) && typeof get_contentWindow(node).default_focus == 'function') {
-							get_contentWindow(node).default_focus();
-						} else {
-							var node = g.patron.left_deck.node.selectedPanel;
-							if (node && get_contentWindow(node) && typeof get_contentWindow(node).default_focus == 'function') {
-								get_contentWindow(node).default_focus();
-							}
-						}
-					} catch(E) {
-						g.error.sdump('D_ERROR','default_focus(): ' + js2JSON(E));
-					}
-				}, 0
-			);
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
-
-	<commandset id="patron_display_cmds">
-		<command id="cmd_patron_refresh" />
-		<command id="cmd_patron_checkout" />
-		<command id="cmd_patron_items" />
-		<command id="cmd_patron_holds" />
-		<command id="cmd_patron_bills" />
-		<command id="cmd_patron_edit" />
-		<command id="cmd_patron_info_notes" />
-		<command id="cmd_patron_info_stats" />
-		<command id="cmd_patron_info_surveys" />
-		<command id="cmd_patron_info_groups" />
-		<command id="cmd_patron_other" />
-		<command id="cmd_patron_alert" />
-		<command id="cmd_patron_exit" />
-		<command id="cmd_patron_retrieve" />
-		<command id="cmd_patron_merge" />
-		<command id="cmd_patron_toggle_summary" />
-		<command id="cmd_search_form" />
-		<command id="cmd_verify_credentials" />
-		<command id="cmd_perm_editor" />
-		<command id="cmd_standing_penalties" />
-	</commandset>
-
-	<box id="patron_display_main" class="my_overflow" />
+ onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
+ <script type="text/javascript">
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+ </script>
+ <scripts id="openils_util_scripts"/>
+
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script type="text/javascript" src="/xul/server/patron/display.js"/>
+ <script>
+ <![CDATA[
+  function $(id) { return document.getElementById(id); }
+ 
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for patron_display.xul');
+
+    JSAN.use('patron.display'); g.patron = new patron.display();
+    g.patron.init( { 
+     'barcode' : xul_param('barcode'),
+     'id' : xul_param('id'),
+     'query' : xul_param('query'),
+     'doit' : xul_param('doit')
+    } );
+
+   //document.documentElement.style.setProperty('font-size-adjust','1','important');
+
+   } catch(E) {
+    var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/display.xul', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+
+  function default_focus() {
+   setTimeout(
+    function() {
+     try {
+      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+      var node = g.patron.right_deck.node.selectedPanel;
+      if (node && get_contentWindow(node) && typeof get_contentWindow(node).default_focus == 'function') {
+       get_contentWindow(node).default_focus();
+      } else {
+       var node = g.patron.left_deck.node.selectedPanel;
+       if (node && get_contentWindow(node) && typeof get_contentWindow(node).default_focus == 'function') {
+        get_contentWindow(node).default_focus();
+       }
+      }
+     } catch(E) {
+      g.error.sdump('D_ERROR','default_focus(): ' + js2JSON(E));
+     }
+    }, 0
+   );
+  }
+
+ ]]>
+ </script>
+
+ <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+
+ <commandset id="patron_display_cmds">
+  <command id="cmd_patron_refresh" />
+  <command id="cmd_patron_checkout" />
+  <command id="cmd_patron_items" />
+  <command id="cmd_patron_holds" />
+  <command id="cmd_patron_bills" />
+  <command id="cmd_patron_edit" />
+  <command id="cmd_patron_info_notes" />
+  <command id="cmd_patron_info_stats" />
+  <command id="cmd_patron_info_surveys" />
+  <command id="cmd_patron_info_groups" />
+  <command id="cmd_patron_other" />
+  <command id="cmd_patron_alert" />
+  <command id="cmd_patron_exit" />
+  <command id="cmd_patron_retrieve" />
+  <command id="cmd_patron_merge" />
+  <command id="cmd_patron_toggle_summary" />
+  <command id="cmd_search_form" />
+  <command id="cmd_verify_credentials" />
+  <command id="cmd_perm_editor" />
+  <command id="cmd_standing_penalties" />
+ </commandset>
+
+ <box id="patron_display_main" class="my_overflow" />
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/display_horiz.xul b/Open-ILS/xul/staff_client/server/patron/display_horiz.xul
index 115b8df711..c7758ab3cb 100644
--- a/Open-ILS/xul/staff_client/server/patron/display_horiz.xul
+++ b/Open-ILS/xul/staff_client/server/patron/display_horiz.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -21,98 +21,98 @@
 <?xul-overlay href="/xul/server/patron/display_horiz_overlay.xul"?>
 
 <window id="patron_display_win" 
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
-	<scripts id="openils_util_scripts"/>
-
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="/xul/server/patron/display.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-	
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for patron_display.xul');
-
-				JSAN.use('patron.display'); g.patron = new patron.display();
-				g.patron.init( { 
-					'barcode' : xul_param('barcode'),
-					'id' : xul_param('id'),
-					'query' : xul_param('query'),
-					'doit' : xul_param('doit')
-				} );
-
-			//document.documentElement.style.setProperty('font-size-adjust','1','important');
-
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/display.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function default_focus() {
-			setTimeout(
-				function() {
-					try {
-						netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-						var node = g.patron.right_deck.node.selectedPanel;
-						if (node && get_contentWindow(node) && typeof get_contentWindow(node).default_focus == 'function') {
-							get_contentWindow(node).default_focus();
-						} else {
-							var node = g.patron.left_deck.node.selectedPanel;
-							if (node && get_contentWindow(node) && typeof get_contentWindow(node).default_focus == 'function') {
-								get_contentWindow(node).default_focus();
-							}
-						}
-					} catch(E) {
-						g.error.sdump('D_ERROR','default_focus(): ' + js2JSON(E));
-					}
-				}, 0
-			);
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
-
-	<commandset id="patron_display_cmds">
-		<command id="cmd_patron_refresh" />
-		<command id="cmd_patron_checkout" />
-		<command id="cmd_patron_items" />
-		<command id="cmd_patron_holds" />
-		<command id="cmd_patron_bills" />
-		<command id="cmd_patron_edit" />
-		<command id="cmd_patron_info_notes" />
-		<command id="cmd_patron_info_stats" />
-		<command id="cmd_patron_info_surveys" />
-		<command id="cmd_patron_info_groups" />
-		<command id="cmd_patron_other" />
-		<command id="cmd_patron_alert" />
-		<command id="cmd_patron_exit" />
-		<command id="cmd_patron_retrieve" />
-		<command id="cmd_patron_merge" />
-		<command id="cmd_patron_toggle_summary" />
-		<command id="cmd_search_form" />
-		<command id="cmd_verify_credentials" />
-		<command id="cmd_perm_editor" />
-		<command id="cmd_standing_penalties" />
-	</commandset>
-
-	<box id="patron_display_main" class="my_overflow" />
+ onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
+ <script type="text/javascript">
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+ </script>
+ <scripts id="openils_util_scripts"/>
+
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script type="text/javascript" src="/xul/server/patron/display.js"/>
+ <script>
+ <![CDATA[
+  function $(id) { return document.getElementById(id); }
+ 
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for patron_display.xul');
+
+    JSAN.use('patron.display'); g.patron = new patron.display();
+    g.patron.init( { 
+     'barcode' : xul_param('barcode'),
+     'id' : xul_param('id'),
+     'query' : xul_param('query'),
+     'doit' : xul_param('doit')
+    } );
+
+   //document.documentElement.style.setProperty('font-size-adjust','1','important');
+
+   } catch(E) {
+    var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/display.xul', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+
+  function default_focus() {
+   setTimeout(
+    function() {
+     try {
+      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+      var node = g.patron.right_deck.node.selectedPanel;
+      if (node && get_contentWindow(node) && typeof get_contentWindow(node).default_focus == 'function') {
+       get_contentWindow(node).default_focus();
+      } else {
+       var node = g.patron.left_deck.node.selectedPanel;
+       if (node && get_contentWindow(node) && typeof get_contentWindow(node).default_focus == 'function') {
+        get_contentWindow(node).default_focus();
+       }
+      }
+     } catch(E) {
+      g.error.sdump('D_ERROR','default_focus(): ' + js2JSON(E));
+     }
+    }, 0
+   );
+  }
+
+ ]]>
+ </script>
+
+ <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+
+ <commandset id="patron_display_cmds">
+  <command id="cmd_patron_refresh" />
+  <command id="cmd_patron_checkout" />
+  <command id="cmd_patron_items" />
+  <command id="cmd_patron_holds" />
+  <command id="cmd_patron_bills" />
+  <command id="cmd_patron_edit" />
+  <command id="cmd_patron_info_notes" />
+  <command id="cmd_patron_info_stats" />
+  <command id="cmd_patron_info_surveys" />
+  <command id="cmd_patron_info_groups" />
+  <command id="cmd_patron_other" />
+  <command id="cmd_patron_alert" />
+  <command id="cmd_patron_exit" />
+  <command id="cmd_patron_retrieve" />
+  <command id="cmd_patron_merge" />
+  <command id="cmd_patron_toggle_summary" />
+  <command id="cmd_search_form" />
+  <command id="cmd_verify_credentials" />
+  <command id="cmd_perm_editor" />
+  <command id="cmd_standing_penalties" />
+ </commandset>
+
+ <box id="patron_display_main" class="my_overflow" />
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/display_horiz_overlay.xul b/Open-ILS/xul/staff_client/server/patron/display_horiz_overlay.xul
index 2997df287f..ecdaa98405 100644
--- a/Open-ILS/xul/staff_client/server/patron/display_horiz_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/display_horiz_overlay.xul
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 <overlay id="patron_display_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading patron/display_overlay.xul\n');</script>
 
@@ -11,27 +11,27 @@
 
 <box id="patron_display_main" flex="1" orient="vertical">
 <vbox id="pdm2" flex="1">
-	<hbox id="pdm2hb1">
-		<hbox>
-			<label id="patron_name" class="patronNameLarge" tooltiptext="&staff.patron_display.name.label;" value="&staff.patron.display_overlay.none_selected.value;" flex="1"/>
-		</hbox>
-		<deck id="PatronNavBar" flex="1" class="my_overflow" />
-	</hbox>
-	<hbox id="pdm2hb1a">
-		<label class="hideme barred_indicator" value="&staff.patron.display_overlay.barred.value;"/>
-		<label class="hideme expired_indicator" value="&staff.patron.display_overlay.expired.value;"/>
-		<label class="hideme inactive_indicator" value="&staff.patron.display_overlay.inactive.value;"/>
-		<label class="hideme juvenile_indicator" value="&staff.patron.display_overlay.juvenile.value;"/>
-		<label class="hideme alert_indicator" value="&staff.patron.display_overlay.alert.value;"/>
-		<label class="hideme note_indicator" value="&staff.patron.display_overlay.see_notes.value;"/>
-		<label class="hideme max_bills_indicator" value="&staff.patron.display_overlay.max_bills.value;"/>
-		<label class="hideme max_overdues_indicator" value="&staff.patron.display_overlay.max_overdues.value;"/>
-		<label class="hideme bills_indicator" value="&staff.patron.display_overlay.has_bills.value;"/>
-		<label class="hideme overdues_indicator" value="&staff.patron.display_overlay.has_overdues.value;"/>
-		<label class="hideme invalid_dob_indicator" value="&staff.patron.display_overlay.invalid_dob.value;"/>
-		<label class="hideme invalid_address_indicator" value="&staff.patron.display_overlay.invalid_address.value;"/>
-	</hbox>
-	<vbox id="PatronNotNavBar" flex="1" class="my_bg">
+ <hbox id="pdm2hb1">
+  <hbox>
+   <label id="patron_name" class="patronNameLarge" tooltiptext="&staff.patron_display.name.label;" value="&staff.patron.display_overlay.none_selected.value;" flex="1"/>
+  </hbox>
+  <deck id="PatronNavBar" flex="1" class="my_overflow" />
+ </hbox>
+ <hbox id="pdm2hb1a">
+  <label class="hideme barred_indicator" value="&staff.patron.display_overlay.barred.value;"/>
+  <label class="hideme expired_indicator" value="&staff.patron.display_overlay.expired.value;"/>
+  <label class="hideme inactive_indicator" value="&staff.patron.display_overlay.inactive.value;"/>
+  <label class="hideme juvenile_indicator" value="&staff.patron.display_overlay.juvenile.value;"/>
+  <label class="hideme alert_indicator" value="&staff.patron.display_overlay.alert.value;"/>
+  <label class="hideme note_indicator" value="&staff.patron.display_overlay.see_notes.value;"/>
+  <label class="hideme max_bills_indicator" value="&staff.patron.display_overlay.max_bills.value;"/>
+  <label class="hideme max_overdues_indicator" value="&staff.patron.display_overlay.max_overdues.value;"/>
+  <label class="hideme bills_indicator" value="&staff.patron.display_overlay.has_bills.value;"/>
+  <label class="hideme overdues_indicator" value="&staff.patron.display_overlay.has_overdues.value;"/>
+  <label class="hideme invalid_dob_indicator" value="&staff.patron.display_overlay.invalid_dob.value;"/>
+  <label class="hideme invalid_address_indicator" value="&staff.patron.display_overlay.invalid_address.value;"/>
+ </hbox>
+ <vbox id="PatronNotNavBar" flex="1" class="my_bg">
         <hbox id="left_deck_vbox" flex="1" oils_persist="height"> 
             <deck id="patron_left_deck" oils_persist="height"/>
         </hbox>
@@ -39,7 +39,7 @@
         <hbox id="right_deck_vbox" flex="8" oils_persist="height">
             <deck id="patron_right_deck" oils_persist="height"/>
         </hbox>
-	</vbox>
+ </vbox>
 </vbox>
 </box>
 
@@ -50,8 +50,8 @@
 </deck>
 
 <deck id="PatronNavBar">
-	<hbox id="PatronNavBar0" flex="1"/>
-	<hbox id="PatronNavBar1" flex="1"/>
+ <hbox id="PatronNavBar0" flex="1"/>
+ <hbox id="PatronNavBar1" flex="1"/>
 </deck>
 
 <hbox id="PatronNavBar1" flex="1">
@@ -120,10 +120,10 @@
 <hbox id="PatronNavBar0" flex="1">
     <vbox flex="1">
         <hbox flex="1">
-        	<spacer flex="1"/>
-        	<button id="pnb1b2" label="&staff.patron.display_overlay.merge_patrons.label;" accesskey="&staff.patron.display_overlay.merge_patrons.accesskey;" command="cmd_patron_merge"/>
-        	<button id="pnb1b0" label="&staff.patron.display_overlay.search_form.label;" accesskey="&staff.patron.display_overlay.search_form.accesskey;" command="cmd_search_form"/>
-        	<button id="pnb1b1" label="&staff.patron.display_overlay.retrieve_patron.label;" accesskey="&staff.patron.display_overlay.retrieve_patron.accesskey;" command="cmd_patron_retrieve"/>
+         <spacer flex="1"/>
+         <button id="pnb1b2" label="&staff.patron.display_overlay.merge_patrons.label;" accesskey="&staff.patron.display_overlay.merge_patrons.accesskey;" command="cmd_patron_merge"/>
+         <button id="pnb1b0" label="&staff.patron.display_overlay.search_form.label;" accesskey="&staff.patron.display_overlay.search_form.accesskey;" command="cmd_search_form"/>
+         <button id="pnb1b1" label="&staff.patron.display_overlay.retrieve_patron.label;" accesskey="&staff.patron.display_overlay.retrieve_patron.accesskey;" command="cmd_patron_retrieve"/>
         </hbox>
         <label value=" "/>
     </vbox>
diff --git a/Open-ILS/xul/staff_client/server/patron/display_overlay.xul b/Open-ILS/xul/staff_client/server/patron/display_overlay.xul
index cf49f55a8e..0143db85e6 100644
--- a/Open-ILS/xul/staff_client/server/patron/display_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/display_overlay.xul
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 <overlay id="patron_display_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading patron/display_overlay.xul\n');</script>
 
@@ -11,27 +11,27 @@
 
 <box id="patron_display_main" flex="1" orient="vertical">
 <vbox id="pdm2" flex="1">
-	<hbox id="pdm2hb1">
-		<hbox>
-			<label id="patron_name" class="patronNameLarge" tooltiptext="&staff.patron_display.name.label;" value="&staff.patron.display_overlay.none_selected.value;" flex="1"/>
-		</hbox>
-		<deck id="PatronNavBar" flex="1" class="my_overflow" />
-	</hbox>
-	<hbox id="pdm2hb1a">
-		<label class="hideme barred_indicator" value="&staff.patron.display_overlay.barred.value;"/>
-		<label class="hideme expired_indicator" value="&staff.patron.display_overlay.expired.value;"/>
-		<label class="hideme inactive_indicator" value="&staff.patron.display_overlay.inactive.value;"/>
-		<label class="hideme juvenile_indicator" value="&staff.patron.display_overlay.juvenile.value;"/>
-		<label class="hideme alert_indicator" value="&staff.patron.display_overlay.alert.value;"/>
-		<label class="hideme note_indicator" value="&staff.patron.display_overlay.see_notes.value;"/>
-		<label class="hideme max_bills_indicator" value="&staff.patron.display_overlay.max_bills.value;"/>
-		<label class="hideme max_overdues_indicator" value="&staff.patron.display_overlay.max_overdues.value;"/>
-		<label class="hideme bills_indicator" value="&staff.patron.display_overlay.has_bills.value;"/>
-		<label class="hideme overdues_indicator" value="&staff.patron.display_overlay.has_overdues.value;"/>
-		<label class="hideme invalid_dob_indicator" value="&staff.patron.display_overlay.invalid_dob.value;"/>
-		<label class="hideme invalid_address_indicator" value="&staff.patron.display_overlay.invalid_address.value;"/>
-	</hbox>
-	<hbox id="PatronNotNavBar" flex="1" class="my_bg">
+ <hbox id="pdm2hb1">
+  <hbox>
+   <label id="patron_name" class="patronNameLarge" tooltiptext="&staff.patron_display.name.label;" value="&staff.patron.display_overlay.none_selected.value;" flex="1"/>
+  </hbox>
+  <deck id="PatronNavBar" flex="1" class="my_overflow" />
+ </hbox>
+ <hbox id="pdm2hb1a">
+  <label class="hideme barred_indicator" value="&staff.patron.display_overlay.barred.value;"/>
+  <label class="hideme expired_indicator" value="&staff.patron.display_overlay.expired.value;"/>
+  <label class="hideme inactive_indicator" value="&staff.patron.display_overlay.inactive.value;"/>
+  <label class="hideme juvenile_indicator" value="&staff.patron.display_overlay.juvenile.value;"/>
+  <label class="hideme alert_indicator" value="&staff.patron.display_overlay.alert.value;"/>
+  <label class="hideme note_indicator" value="&staff.patron.display_overlay.see_notes.value;"/>
+  <label class="hideme max_bills_indicator" value="&staff.patron.display_overlay.max_bills.value;"/>
+  <label class="hideme max_overdues_indicator" value="&staff.patron.display_overlay.max_overdues.value;"/>
+  <label class="hideme bills_indicator" value="&staff.patron.display_overlay.has_bills.value;"/>
+  <label class="hideme overdues_indicator" value="&staff.patron.display_overlay.has_overdues.value;"/>
+  <label class="hideme invalid_dob_indicator" value="&staff.patron.display_overlay.invalid_dob.value;"/>
+  <label class="hideme invalid_address_indicator" value="&staff.patron.display_overlay.invalid_address.value;"/>
+ </hbox>
+ <hbox id="PatronNotNavBar" flex="1" class="my_bg">
         <vbox id="left_deck_vbox" flex="1" oils_persist="width"> 
             <deck id="patron_left_deck" oils_persist="width"/>
         </vbox>
@@ -39,7 +39,7 @@
         <vbox id="right_deck_vbox" flex="3" oils_persist="width">
             <deck id="patron_right_deck" oils_persist="width"/>
         </vbox>
-	</hbox>
+ </hbox>
 </vbox>
 </box>
 
@@ -50,8 +50,8 @@
 </deck>
 
 <deck id="PatronNavBar">
-	<hbox id="PatronNavBar0" flex="1"/>
-	<hbox id="PatronNavBar1" flex="1"/>
+ <hbox id="PatronNavBar0" flex="1"/>
+ <hbox id="PatronNavBar1" flex="1"/>
 </deck>
 
 <hbox id="PatronNavBar1" flex="1">
@@ -120,10 +120,10 @@
 <hbox id="PatronNavBar0" flex="1">
     <vbox flex="1">
         <hbox flex="1">
-        	<spacer flex="1"/>
-        	<button id="pnb1b2" label="&staff.patron.display_overlay.merge_patrons.label;" accesskey="&staff.patron.display_overlay.merge_patrons.accesskey;" command="cmd_patron_merge"/>
-        	<button id="pnb1b0" label="&staff.patron.display_overlay.search_form.label;" accesskey="&staff.patron.display_overlay.search_form.accesskey;" command="cmd_search_form"/>
-        	<button id="pnb1b1" label="&staff.patron.display_overlay.retrieve_patron.label;" accesskey="&staff.patron.display_overlay.retrieve_patron.accesskey;" command="cmd_patron_retrieve"/>
+         <spacer flex="1"/>
+         <button id="pnb1b2" label="&staff.patron.display_overlay.merge_patrons.label;" accesskey="&staff.patron.display_overlay.merge_patrons.accesskey;" command="cmd_patron_merge"/>
+         <button id="pnb1b0" label="&staff.patron.display_overlay.search_form.label;" accesskey="&staff.patron.display_overlay.search_form.accesskey;" command="cmd_search_form"/>
+         <button id="pnb1b1" label="&staff.patron.display_overlay.retrieve_patron.label;" accesskey="&staff.patron.display_overlay.retrieve_patron.accesskey;" command="cmd_patron_retrieve"/>
         </hbox>
         <label value=" "/>
     </vbox>
diff --git a/Open-ILS/xul/staff_client/server/patron/hold_notices.xul b/Open-ILS/xul/staff_client/server/patron/hold_notices.xul
index a39f6bfd40..58998e4ccf 100644
--- a/Open-ILS/xul/staff_client/server/patron/hold_notices.xul
+++ b/Open-ILS/xul/staff_client/server/patron/hold_notices.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,225 +20,225 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="hold_notices_win" width="700" height="550" oils_persist="sizemode width height"
-	onload="try{ my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }" title="&staff.patron.hold_notices.title;"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try{ my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }" title="&staff.patron.hold_notices.title;"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
 
-		function $(id) { return document.getElementById(id); }
+  function $(id) { return document.getElementById(id); }
 
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
 
-				JSAN.use('util.error'); g.error = new util.error();
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('util.date'); JSAN.use('util.money'); JSAN.use('patron.util');
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+    JSAN.use('util.error'); g.error = new util.error();
+    JSAN.use('util.network'); g.network = new util.network();
+    JSAN.use('util.date'); JSAN.use('util.money'); JSAN.use('patron.util');
+    JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
 
-				g.error.sdump('D_TRACE','my_init() for hold_notices.xul');
+    g.error.sdump('D_TRACE','my_init() for hold_notices.xul');
 
-				g.ahr_id = xul_param('ahr_id');
-				g.ahr = g.network.simple_request('FM_AHR_RETRIEVE',[ ses(), g.ahr_id ]);
-				if (typeof g.ahr.ilsevent != 'undefined') { throw(g.ahr); }
-				g.ahr = g.ahr[0];
+    g.ahr_id = xul_param('ahr_id');
+    g.ahr = g.network.simple_request('FM_AHR_RETRIEVE',[ ses(), g.ahr_id ]);
+    if (typeof g.ahr.ilsevent != 'undefined') { throw(g.ahr); }
+    g.ahr = g.ahr[0];
 
-				render_patron();
+    render_patron();
 
-				a_list_of_one();
+    a_list_of_one();
 
-				var x = document.getElementById('bib_brief_box'); while (x.firstChild) x.removeChild(x.lastChild);
+    var x = document.getElementById('bib_brief_box'); while (x.firstChild) x.removeChild(x.lastChild);
                 var bib_brief = document.createElement('iframe'); x.appendChild(bib_brief);
                 bib_brief.setAttribute('flex',1);
                 bib_brief.setAttribute('src',urls.XUL_BIB_BRIEF); 
-				get_contentWindow(bib_brief).xulG = { 'docid' : g.ahr.target() };
-
-				refresh();
-
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert('/xul/server/patron/hold_notices.xul',E); } catch(E) { alert('FIXME: ' + js2JSON(E)); }
-			}
-		}
-
-		function render_patron() {
-			if (g.ahr.usr()) {
-				JSAN.use('patron.util'); 
-				var au_obj = patron.util.retrieve_fleshed_au_via_id( ses(), g.ahr.usr() );
-				
-				$('patron_name').setAttribute('value', 
-					( au_obj.prefix() ? au_obj.prefix() + ' ' : '') + 
-					au_obj.family_name() + ', ' + 
-					au_obj.first_given_name() + ' ' +
-					( au_obj.second_given_name() ? au_obj.second_given_name() + ' ' : '' ) +
-					( au_obj.suffix() ? au_obj.suffix() : '')
-					+ ' : ' + au_obj.card().barcode() 
-				);
-			}
-		}
-
-		function a_list_of_one() {
-			JSAN.use('circ.util');
-			var columns = circ.util.hold_columns( 
-				{ 
-					'status' : { 'hidden' : true },
-					'request_time' : { 'hidden' : false },
-					'pickup_lib_shortname' : { 'hidden' : false },
-					'current_copy' : { 'hidden' : false },
-					'phone_notify' : { 'hidden' : false },
-					'email_notify' : { 'hidden' : false },
-				} 
-			);
-			JSAN.use('util.list'); g.list = new util.list('holds_list');
-			g.list.init(
-				{
-					'columns' : columns,
-					'map_row_to_columns' : circ.util.std_map_row_to_columns(),
-					'retrieve_row' : function(params) {
-						var row = params.row;
-						try {
-							switch(row.my.ahr.hold_type()) {
-								case 'M' :
-									row.my.mvr = g.network.request(
-										api.MODS_SLIM_METARECORD_RETRIEVE.app,
-										api.MODS_SLIM_METARECORD_RETRIEVE.method,
-										[ row.my.ahr.target() ]
-									);
-								break;
-								default:
-									row.my.mvr = g.network.simple_request(
-										'MODS_SLIM_RECORD_RETRIEVE.authoritative',
-										[ row.my.ahr.target() ]
-									);
-									if (row.my.ahr.current_copy()) {
-										row.my.acp = g.network.simple_request( 'FM_ACP_RETRIEVE', [ row.my.ahr.current_copy() ]);
-									}
-								break;
-							}
-						} catch(E) {
-							g.error.sdump('D_ERROR','retrieve_row: ' + E );
-						}
-						if (typeof params.on_retrieve == 'function') {
-							params.on_retrieve(row);
-						}
-						return row;
-					},
-				}
-			);
-			g.list.append(
-				{
-					'row' : {
-						'my' : {
-							'ahr' : g.ahr,
-						}
-					},
-					'no_auto_select' : true,
-				}
-			);
-		}
-
-		function refresh() {
-			retrieve_notifications(); render_notifications();
-		}
-
-		function retrieve_notifications() {
-			g.notifications = g.network.simple_request('FM_AHN_RETRIEVE_VIA_AHR',[ ses(), g.ahr_id ]).reverse();
-		}
-
-		function apply(node,field,value) {
-			util.widgets.apply(
-				node,'name',field,
-				function(n) {
-					switch(n.nodeName) {
-						case 'description' : n.appendChild( document.createTextNode( value ) ); break;
-						case 'label' : n.value = value; break;
-						default : n.value = value; break;
-					}
-				}
-			);
-		}
-
-		function render_notifications() {
-			JSAN.use('util.widgets'); util.widgets.remove_children('notifications_panel');
-			var np = $('notifications_panel');
-
-			for (var i = 0; i < g.notifications.length; i++) {
-
-				/* template */
-				var node = $('notification_template').cloneNode(true); np.appendChild(node); node.hidden = false;
-				util.widgets.apply(node,'name','notify_time',
-					function(n){
+    get_contentWindow(bib_brief).xulG = { 'docid' : g.ahr.target() };
+
+    refresh();
+
+   } catch(E) {
+    try { g.error.standard_unexpected_error_alert('/xul/server/patron/hold_notices.xul',E); } catch(E) { alert('FIXME: ' + js2JSON(E)); }
+   }
+  }
+
+  function render_patron() {
+   if (g.ahr.usr()) {
+    JSAN.use('patron.util'); 
+    var au_obj = patron.util.retrieve_fleshed_au_via_id( ses(), g.ahr.usr() );
+    
+    $('patron_name').setAttribute('value', 
+     ( au_obj.prefix() ? au_obj.prefix() + ' ' : '') + 
+     au_obj.family_name() + ', ' + 
+     au_obj.first_given_name() + ' ' +
+     ( au_obj.second_given_name() ? au_obj.second_given_name() + ' ' : '' ) +
+     ( au_obj.suffix() ? au_obj.suffix() : '')
+     + ' : ' + au_obj.card().barcode() 
+    );
+   }
+  }
+
+  function a_list_of_one() {
+   JSAN.use('circ.util');
+   var columns = circ.util.hold_columns( 
+    { 
+     'status' : { 'hidden' : true },
+     'request_time' : { 'hidden' : false },
+     'pickup_lib_shortname' : { 'hidden' : false },
+     'current_copy' : { 'hidden' : false },
+     'phone_notify' : { 'hidden' : false },
+     'email_notify' : { 'hidden' : false },
+    } 
+   );
+   JSAN.use('util.list'); g.list = new util.list('holds_list');
+   g.list.init(
+    {
+     'columns' : columns,
+     'map_row_to_columns' : circ.util.std_map_row_to_columns(),
+     'retrieve_row' : function(params) {
+      var row = params.row;
+      try {
+       switch(row.my.ahr.hold_type()) {
+        case 'M' :
+         row.my.mvr = g.network.request(
+          api.MODS_SLIM_METARECORD_RETRIEVE.app,
+          api.MODS_SLIM_METARECORD_RETRIEVE.method,
+          [ row.my.ahr.target() ]
+         );
+        break;
+        default:
+         row.my.mvr = g.network.simple_request(
+          'MODS_SLIM_RECORD_RETRIEVE.authoritative',
+          [ row.my.ahr.target() ]
+         );
+         if (row.my.ahr.current_copy()) {
+          row.my.acp = g.network.simple_request( 'FM_ACP_RETRIEVE', [ row.my.ahr.current_copy() ]);
+         }
+        break;
+       }
+      } catch(E) {
+       g.error.sdump('D_ERROR','retrieve_row: ' + E );
+      }
+      if (typeof params.on_retrieve == 'function') {
+       params.on_retrieve(row);
+      }
+      return row;
+     },
+    }
+   );
+   g.list.append(
+    {
+     'row' : {
+      'my' : {
+       'ahr' : g.ahr,
+      }
+     },
+     'no_auto_select' : true,
+    }
+   );
+  }
+
+  function refresh() {
+   retrieve_notifications(); render_notifications();
+  }
+
+  function retrieve_notifications() {
+   g.notifications = g.network.simple_request('FM_AHN_RETRIEVE_VIA_AHR',[ ses(), g.ahr_id ]).reverse();
+  }
+
+  function apply(node,field,value) {
+   util.widgets.apply(
+    node,'name',field,
+    function(n) {
+     switch(n.nodeName) {
+      case 'description' : n.appendChild( document.createTextNode( value ) ); break;
+      case 'label' : n.value = value; break;
+      default : n.value = value; break;
+     }
+    }
+   );
+  }
+
+  function render_notifications() {
+   JSAN.use('util.widgets'); util.widgets.remove_children('notifications_panel');
+   var np = $('notifications_panel');
+
+   for (var i = 0; i < g.notifications.length; i++) {
+
+    /* template */
+    var node = $('notification_template').cloneNode(true); np.appendChild(node); node.hidden = false;
+    util.widgets.apply(node,'name','notify_time',
+     function(n){
                         n.setAttribute(
                             "tooltiptext", 
                             $("patronStrings").getFormattedString('staff.patron.hold_notices.tooltiptext',[g.notifications[i].id(), g.notifications[i].hold(), g.notifications[i].notify_staff()])
                         );
                     }
-				);
-				apply(node,'method',g.notifications[i].method ? g.notifications[i].method() : '');
-				apply(node,'note',g.notifications[i].note() ? g.notifications[i].note() : '');
-				apply(node,'notify_time',g.notifications[i].notify_time() ? g.notifications[i].notify_time().toString().substr(0,10) : '');
-			}
-
-		}
-		
-		function new_notification() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalBrowserWrite");
-				var xml = '<groupbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1">';
-				xml += '<caption label="' + $("patronStrings").getString('staff.patron.hold_notices.new_notification_record') + '"/><grid flex="1"><columns><column/><column flex="1"/></columns><rows>';
-				xml += '<row><label value="' + $("patronStrings").getString('staff.patron.hold_notices.method') + '"/><textbox id="method" name="fancy_data" context="clipboard"/></row>';
-				xml += '<row><label value="' + $("patronStrings").getString('staff.patron.hold_notices.note') + '"/><textbox multiline="true" id="note" name="fancy_data" context="clipboard"/></row>';
-				xml += '<row><spacer/><hbox><button label="' + $("patronStrings").getString('staff.patron.hold_notices.cancel') + '" name="fancy_cancel" ';
-				xml += 'accesskey="' + $("patronStrings").getString('staff.patron.hold_notices.cancel_accesskey') + '"/>';
-				xml += '<button label="' + $("patronStrings").getString('staff.patron.hold_notices.add_notif_record') + '" ';
-				xml += 'accesskey="' + $("patronStrings").getString('staff.patron.hold_notices.add_notif_record_accesskey') + '" name="fancy_submit"/></hbox></row></rows></grid></groupbox>';
-				JSAN.use('util.window'); var win = new util.window();
-				var fancy_prompt_data = win.open(
-					urls.XUL_FANCY_PROMPT,
-					'fancy_prompt', 'chrome,resizable,modal,width=700,height=500',
-					{ 'xml' : xml, 'focus' : 'method', 'title' : $("patronStrings").getString('staff.patron.hold_notices.add_notif_record') }
-				);
-				if (fancy_prompt_data.fancy_status == 'complete') {
-					var notification = new ahn();
-					notification.isnew(1);
-					notification.hold(g.ahr_id);
-					notification.method( fancy_prompt_data.method );
-					notification.note( fancy_prompt_data.note );
-					var r = g.network.simple_request('FM_AHN_CREATE',[ ses(), notification ]); if (typeof r.ilsevent != 'undefined') throw(r);
-					setTimeout(function(){refresh();},0);
-				}
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.hold_notices.new_notification.not_created'),E);
-				setTimeout(function(){refresh();},0);
-			}
-		}
-
-	]]>
-	</script>
-
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
-
-	<stack hidden="true" id="notification_template" flex="1">
-		<groupbox flex="1" style="background-color: black;"/>
-		<groupbox flex="1" style="background-color: #FFDE00; -moz-border-radius-topright: 35px;" >
-			<hbox>
-				<description name="method" label="&staff.patron.hold_notices.method.label;" style="font-weight: bold"/>
-				<spacer flex="1"/>
-				<description name="notify_time" style="font-weight: bold"/>
-			</hbox>
-			<description name="note"/>
-		</groupbox>
-	</stack>
+    );
+    apply(node,'method',g.notifications[i].method ? g.notifications[i].method() : '');
+    apply(node,'note',g.notifications[i].note() ? g.notifications[i].note() : '');
+    apply(node,'notify_time',g.notifications[i].notify_time() ? g.notifications[i].notify_time().toString().substr(0,10) : '');
+   }
+
+  }
+  
+  function new_notification() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalBrowserWrite");
+    var xml = '<groupbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1">';
+    xml += '<caption label="' + $("patronStrings").getString('staff.patron.hold_notices.new_notification_record') + '"/><grid flex="1"><columns><column/><column flex="1"/></columns><rows>';
+    xml += '<row><label value="' + $("patronStrings").getString('staff.patron.hold_notices.method') + '"/><textbox id="method" name="fancy_data" context="clipboard"/></row>';
+    xml += '<row><label value="' + $("patronStrings").getString('staff.patron.hold_notices.note') + '"/><textbox multiline="true" id="note" name="fancy_data" context="clipboard"/></row>';
+    xml += '<row><spacer/><hbox><button label="' + $("patronStrings").getString('staff.patron.hold_notices.cancel') + '" name="fancy_cancel" ';
+    xml += 'accesskey="' + $("patronStrings").getString('staff.patron.hold_notices.cancel_accesskey') + '"/>';
+    xml += '<button label="' + $("patronStrings").getString('staff.patron.hold_notices.add_notif_record') + '" ';
+    xml += 'accesskey="' + $("patronStrings").getString('staff.patron.hold_notices.add_notif_record_accesskey') + '" name="fancy_submit"/></hbox></row></rows></grid></groupbox>';
+    JSAN.use('util.window'); var win = new util.window();
+    var fancy_prompt_data = win.open(
+     urls.XUL_FANCY_PROMPT,
+     'fancy_prompt', 'chrome,resizable,modal,width=700,height=500',
+     { 'xml' : xml, 'focus' : 'method', 'title' : $("patronStrings").getString('staff.patron.hold_notices.add_notif_record') }
+    );
+    if (fancy_prompt_data.fancy_status == 'complete') {
+     var notification = new ahn();
+     notification.isnew(1);
+     notification.hold(g.ahr_id);
+     notification.method( fancy_prompt_data.method );
+     notification.note( fancy_prompt_data.note );
+     var r = g.network.simple_request('FM_AHN_CREATE',[ ses(), notification ]); if (typeof r.ilsevent != 'undefined') throw(r);
+     setTimeout(function(){refresh();},0);
+    }
+   } catch(E) {
+    g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.hold_notices.new_notification.not_created'),E);
+    setTimeout(function(){refresh();},0);
+   }
+  }
+
+ ]]>
+ </script>
+
+ <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
+ <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+
+ <stack hidden="true" id="notification_template" flex="1">
+  <groupbox flex="1" style="background-color: black;"/>
+  <groupbox flex="1" style="background-color: #FFDE00; -moz-border-radius-topright: 35px;" >
+   <hbox>
+    <description name="method" label="&staff.patron.hold_notices.method.label;" style="font-weight: bold"/>
+    <spacer flex="1"/>
+    <description name="notify_time" style="font-weight: bold"/>
+   </hbox>
+   <description name="note"/>
+  </groupbox>
+ </stack>
 
     <vbox id="v1" flex="1" oils_persist="height">
         <label id="patron_name" class="patronNameLarge"/>
@@ -256,12 +256,12 @@
             <spacer flex="1"/>
             <button label="&staff.patron.hold_notices.close_window.label;" accesskey="&staff.patron.hold_notices.close_window.accesskey;" oncommand="window.close()"/>
         </hbox>
-	</vbox>
+ </vbox>
 
     <splitter><grippy/></splitter>
 
-	<vbox oils_persist="height" flex="9" class="my_overflow" id="notifications_panel">
-	</vbox>
+ <vbox oils_persist="height" flex="9" class="my_overflow" id="notifications_panel">
+ </vbox>
 
 
 </window>
diff --git a/Open-ILS/xul/staff_client/server/patron/holds.js b/Open-ILS/xul/staff_client/server/patron/holds.js
index 41faa754cb..fd4d2523b5 100644
--- a/Open-ILS/xul/staff_client/server/patron/holds.js
+++ b/Open-ILS/xul/staff_client/server/patron/holds.js
@@ -5,9 +5,9 @@ function $(id) { return document.getElementById(id); }
 if (typeof patron == 'undefined') patron = {};
 patron.holds = function (params) {
 
-	JSAN.use('util.error'); this.error = new util.error();
-	JSAN.use('util.network'); this.network = new util.network();
-	JSAN.use('OpenILS.data'); this.data = new OpenILS.data(); this.data.init({'via':'stash'});
+ JSAN.use('util.error'); this.error = new util.error();
+ JSAN.use('util.network'); this.network = new util.network();
+ JSAN.use('OpenILS.data'); this.data = new OpenILS.data(); this.data.init({'via':'stash'});
 }
 
 patron.holds.prototype = {
@@ -19,315 +19,315 @@ patron.holds.prototype = {
         'current' : { 'limit' : 50, 'offset' : 0 }
     },
 
-	'filter_lib' : null,
+ 'filter_lib' : null,
 
-	'retrieve_ids' : [],
+ 'retrieve_ids' : [],
 
-	'holds_map' : {},
+ 'holds_map' : {},
 
     'flatten_copy' : function(hold) {
         try { if ( hold.current_copy() && typeof hold.current_copy() == 'object') hold.current_copy( hold.current_copy().id() ); } catch(E) { alert('FIXME: Error flattening hold before hold update: ' + E); }
         return hold;
     },
 
-	'init' : function( params ) {
+ 'init' : function( params ) {
 
-		var obj = this;
+  var obj = this;
 
-		obj.patron_id = params['patron_id'];
-		obj.patron_barcode = params['patron_barcode'];
-		obj.docid = params['docid'];
-		obj.shelf = params['shelf'];
-		obj.tree_id = params['tree_id'];
+  obj.patron_id = params['patron_id'];
+  obj.patron_barcode = params['patron_barcode'];
+  obj.docid = params['docid'];
+  obj.shelf = params['shelf'];
+  obj.tree_id = params['tree_id'];
 
-		JSAN.use('circ.util');
-		var columns = circ.util.hold_columns( 
-			{ 
-				'title' : { 'hidden' : false, 'flex' : '3' },
-				'request_time' : { 'hidden' : false },
-				'pickup_lib_shortname' : { 'hidden' : false },
-				'hold_type' : { 'hidden' : false },
-				'current_copy' : { 'hidden' : false },
-				'capture_time' : { 'hidden' : false },
-				'notify_time' : { 'hidden' : false },
-				'notify_count' : { 'hidden' : false }
-			} 
-		);
+  JSAN.use('circ.util');
+  var columns = circ.util.hold_columns( 
+   { 
+    'title' : { 'hidden' : false, 'flex' : '3' },
+    'request_time' : { 'hidden' : false },
+    'pickup_lib_shortname' : { 'hidden' : false },
+    'hold_type' : { 'hidden' : false },
+    'current_copy' : { 'hidden' : false },
+    'capture_time' : { 'hidden' : false },
+    'notify_time' : { 'hidden' : false },
+    'notify_count' : { 'hidden' : false }
+   } 
+  );
 
-		JSAN.use('util.list'); obj.list = new util.list( obj.tree_id || 'holds_list');
-		obj.list.init(
-			{
-				'columns' : columns,
-				'map_row_to_columns' : circ.util.std_map_row_to_columns(),
-				'retrieve_row' : function(params) {
-					var row = params.row;
-					try {
-						obj.network.simple_request('FM_AHR_BLOB_RETRIEVE.authoritative', [ ses(), row.my.hold_id ],
-							function(blob_req) {
-								try {
-									var blob = blob_req.getResultObject();
-									if (typeof blob.ilsevent != 'undefined') throw(blob);
-									row.my.ahr = blob.hold;
-									row.my.status = blob.status;
+  JSAN.use('util.list'); obj.list = new util.list( obj.tree_id || 'holds_list');
+  obj.list.init(
+   {
+    'columns' : columns,
+    'map_row_to_columns' : circ.util.std_map_row_to_columns(),
+    'retrieve_row' : function(params) {
+     var row = params.row;
+     try {
+      obj.network.simple_request('FM_AHR_BLOB_RETRIEVE.authoritative', [ ses(), row.my.hold_id ],
+       function(blob_req) {
+        try {
+         var blob = blob_req.getResultObject();
+         if (typeof blob.ilsevent != 'undefined') throw(blob);
+         row.my.ahr = blob.hold;
+         row.my.status = blob.status;
                                     row.my.ahr.status( blob.status );
-									row.my.acp = blob.copy;
-									row.my.acn = blob.volume;
-									row.my.mvr = blob.mvr;
-									row.my.patron_family_name = blob.patron_last;
-									row.my.patron_first_given_name = blob.patron_first;
-									row.my.patron_barcode = blob.patron_barcode;
+         row.my.acp = blob.copy;
+         row.my.acn = blob.volume;
+         row.my.mvr = blob.mvr;
+         row.my.patron_family_name = blob.patron_last;
+         row.my.patron_first_given_name = blob.patron_first;
+         row.my.patron_barcode = blob.patron_barcode;
 
-									var copy_id = row.my.ahr.current_copy();
-									if (typeof copy_id == 'object') {
-										if (copy_id == null) {
-											if (typeof row.my.acp == 'object' && row.my.acp != null) copy_id = row.my.acp.id();
-										} else {
-											copy_id = copy_id.id();
-										}
-									} else {
-										copy_id = row.my.acp.id();
-									}
+         var copy_id = row.my.ahr.current_copy();
+         if (typeof copy_id == 'object') {
+          if (copy_id == null) {
+           if (typeof row.my.acp == 'object' && row.my.acp != null) copy_id = row.my.acp.id();
+          } else {
+           copy_id = copy_id.id();
+          }
+         } else {
+          copy_id = row.my.acp.id();
+         }
 
-									obj.holds_map[ row.my.ahr.id() ] = row.my.ahr;
-									params.row_node.setAttribute('retrieve_id', 
-										js2JSON({
-											'copy_id':copy_id,
+         obj.holds_map[ row.my.ahr.id() ] = row.my.ahr;
+         params.row_node.setAttribute('retrieve_id', 
+          js2JSON({
+           'copy_id':copy_id,
                                             'barcode':row.my.acp ? row.my.acp.barcode() : null,
-											'id':row.my.ahr.id(),
-											'type':row.my.ahr.hold_type(),
-											'target':row.my.ahr.target(),
-											'usr':row.my.ahr.usr()
-										})
-									);
-									if (typeof params.on_retrieve == 'function') { params.on_retrieve(row); }
+           'id':row.my.ahr.id(),
+           'type':row.my.ahr.hold_type(),
+           'target':row.my.ahr.target(),
+           'usr':row.my.ahr.usr()
+          })
+         );
+         if (typeof params.on_retrieve == 'function') { params.on_retrieve(row); }
 
-								} catch(E) {
-									obj.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.holds.init.hold_num_error', [row.my.hold_id]), E);
-								}
-							}
-						);
-					} catch(E) {
-						obj.error.sdump('D_ERROR','retrieve_row: ' + E );
-					}
-					return row;
-				},
-				'on_select' : function(ev) {
-					JSAN.use('util.functional');
-					var sel = obj.list.retrieve_selection();
-					obj.controller.view.sel_clip.setAttribute('disabled',sel.length < 1);
-					obj.retrieve_ids = util.functional.map_list(
-						sel,
-						function(o) { return JSON2js( o.getAttribute('retrieve_id') ); }
-					);
-					if (obj.retrieve_ids.length > 0) {
-						obj.controller.view.sel_mark_items_damaged.setAttribute('disabled','false');
-						obj.controller.view.sel_mark_items_missing.setAttribute('disabled','false');
-						obj.controller.view.sel_copy_details.setAttribute('disabled','false');
-						obj.controller.view.sel_patron.setAttribute('disabled','false');
-						obj.controller.view.cmd_retrieve_patron.setAttribute('disabled','false');
-						obj.controller.view.cmd_holds_edit_pickup_lib.setAttribute('disabled','false');
-						obj.controller.view.cmd_holds_edit_phone_notify.setAttribute('disabled','false');
-						obj.controller.view.cmd_holds_edit_email_notify.setAttribute('disabled','false');
-						obj.controller.view.cmd_holds_edit_selection_depth.setAttribute('disabled','false');
-						obj.controller.view.cmd_holds_edit_expire_time.setAttribute('disabled','false');
-						obj.controller.view.cmd_holds_edit_thaw_date.setAttribute('disabled','false');
-						obj.controller.view.cmd_holds_activate.setAttribute('disabled','false');
-						obj.controller.view.cmd_holds_suspend.setAttribute('disabled','false');
-						obj.controller.view.cmd_show_notifications.setAttribute('disabled','false');
-						obj.controller.view.cmd_holds_retarget.setAttribute('disabled','false');
-						obj.controller.view.cmd_holds_cancel.setAttribute('disabled','false');
-						obj.controller.view.cmd_show_catalog.setAttribute('disabled','false');
-					} else {
-						obj.controller.view.sel_mark_items_damaged.setAttribute('disabled','true');
-						obj.controller.view.sel_mark_items_missing.setAttribute('disabled','true');
-						obj.controller.view.sel_copy_details.setAttribute('disabled','true');
-						obj.controller.view.sel_patron.setAttribute('disabled','true');
-						obj.controller.view.cmd_retrieve_patron.setAttribute('disabled','true');
-						obj.controller.view.cmd_holds_edit_pickup_lib.setAttribute('disabled','true');
-						obj.controller.view.cmd_holds_edit_phone_notify.setAttribute('disabled','true');
-						obj.controller.view.cmd_holds_edit_email_notify.setAttribute('disabled','true');
-						obj.controller.view.cmd_holds_edit_selection_depth.setAttribute('disabled','true');
-						obj.controller.view.cmd_holds_edit_expire_time.setAttribute('disabled','true');
-						obj.controller.view.cmd_holds_edit_thaw_date.setAttribute('disabled','true');
-						obj.controller.view.cmd_holds_activate.setAttribute('disabled','true');
-						obj.controller.view.cmd_holds_suspend.setAttribute('disabled','true');
-						obj.controller.view.cmd_show_notifications.setAttribute('disabled','true');
-						obj.controller.view.cmd_holds_retarget.setAttribute('disabled','true');
-						obj.controller.view.cmd_holds_cancel.setAttribute('disabled','true');
-						obj.controller.view.cmd_show_catalog.setAttribute('disabled','true');
-					}
-				}
-			}
-		);
-		
-		JSAN.use('util.controller'); obj.controller = new util.controller();
-		obj.controller.init(
-			{
-				'control_map' : {
-					'save_columns' : [ [ 'command' ], function() { obj.list.save_columns(); } ],
-					'sel_clip' : [
-						['command'],
-						function() { obj.list.clipboard(); }
-					],
-					'cmd_broken' : [
-						['command'],
-						function() { alert($("commonStrings").getString('common.unimplemented')); }
-					],
-					'sel_patron' : [
-						['command'],
-						function() {
-							JSAN.use('circ.util');
-							circ.util.show_last_few_circs(obj.retrieve_ids);
-						}
-					],
-					'sel_mark_items_damaged' : [
-						['command'],
-						function() {
-							JSAN.use('cat.util'); JSAN.use('util.functional');
-							cat.util.mark_item_damaged( util.functional.map_list( obj.retrieve_ids, function(o) { return o.copy_id; } ) );
-						}
-					],
-					'sel_mark_items_missing' : [
-						['command'],
-						function() {
-							JSAN.use('cat.util'); JSAN.use('util.functional');
-							cat.util.mark_item_missing( util.functional.map_list( obj.retrieve_ids, function(o) { return o.copy_id; } ) );
-						}
-					],
-					'sel_copy_details' : [
-						['command'],
-						function() {
-							JSAN.use('circ.util');
-							for (var i = 0; i < obj.retrieve_ids.length; i++) {
-								if (obj.retrieve_ids[i].copy_id) circ.util.show_copy_details( obj.retrieve_ids[i].copy_id );
-							}
-						}
-					],
-					'cmd_holds_print' : [
-						['command'],
-						function() {
-							try {
-								JSAN.use('patron.util');
-								var params = { 
-									'patron' : patron.util.retrieve_au_via_id(ses(),obj.patron_id), 
-									'template' : 'holds'
-								};
-								obj.list.print(params);
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert('print 1',E);
-							}
-						}
-					],
+        } catch(E) {
+         obj.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.holds.init.hold_num_error', [row.my.hold_id]), E);
+        }
+       }
+      );
+     } catch(E) {
+      obj.error.sdump('D_ERROR','retrieve_row: ' + E );
+     }
+     return row;
+    },
+    'on_select' : function(ev) {
+     JSAN.use('util.functional');
+     var sel = obj.list.retrieve_selection();
+     obj.controller.view.sel_clip.setAttribute('disabled',sel.length < 1);
+     obj.retrieve_ids = util.functional.map_list(
+      sel,
+      function(o) { return JSON2js( o.getAttribute('retrieve_id') ); }
+     );
+     if (obj.retrieve_ids.length > 0) {
+      obj.controller.view.sel_mark_items_damaged.setAttribute('disabled','false');
+      obj.controller.view.sel_mark_items_missing.setAttribute('disabled','false');
+      obj.controller.view.sel_copy_details.setAttribute('disabled','false');
+      obj.controller.view.sel_patron.setAttribute('disabled','false');
+      obj.controller.view.cmd_retrieve_patron.setAttribute('disabled','false');
+      obj.controller.view.cmd_holds_edit_pickup_lib.setAttribute('disabled','false');
+      obj.controller.view.cmd_holds_edit_phone_notify.setAttribute('disabled','false');
+      obj.controller.view.cmd_holds_edit_email_notify.setAttribute('disabled','false');
+      obj.controller.view.cmd_holds_edit_selection_depth.setAttribute('disabled','false');
+      obj.controller.view.cmd_holds_edit_expire_time.setAttribute('disabled','false');
+      obj.controller.view.cmd_holds_edit_thaw_date.setAttribute('disabled','false');
+      obj.controller.view.cmd_holds_activate.setAttribute('disabled','false');
+      obj.controller.view.cmd_holds_suspend.setAttribute('disabled','false');
+      obj.controller.view.cmd_show_notifications.setAttribute('disabled','false');
+      obj.controller.view.cmd_holds_retarget.setAttribute('disabled','false');
+      obj.controller.view.cmd_holds_cancel.setAttribute('disabled','false');
+      obj.controller.view.cmd_show_catalog.setAttribute('disabled','false');
+     } else {
+      obj.controller.view.sel_mark_items_damaged.setAttribute('disabled','true');
+      obj.controller.view.sel_mark_items_missing.setAttribute('disabled','true');
+      obj.controller.view.sel_copy_details.setAttribute('disabled','true');
+      obj.controller.view.sel_patron.setAttribute('disabled','true');
+      obj.controller.view.cmd_retrieve_patron.setAttribute('disabled','true');
+      obj.controller.view.cmd_holds_edit_pickup_lib.setAttribute('disabled','true');
+      obj.controller.view.cmd_holds_edit_phone_notify.setAttribute('disabled','true');
+      obj.controller.view.cmd_holds_edit_email_notify.setAttribute('disabled','true');
+      obj.controller.view.cmd_holds_edit_selection_depth.setAttribute('disabled','true');
+      obj.controller.view.cmd_holds_edit_expire_time.setAttribute('disabled','true');
+      obj.controller.view.cmd_holds_edit_thaw_date.setAttribute('disabled','true');
+      obj.controller.view.cmd_holds_activate.setAttribute('disabled','true');
+      obj.controller.view.cmd_holds_suspend.setAttribute('disabled','true');
+      obj.controller.view.cmd_show_notifications.setAttribute('disabled','true');
+      obj.controller.view.cmd_holds_retarget.setAttribute('disabled','true');
+      obj.controller.view.cmd_holds_cancel.setAttribute('disabled','true');
+      obj.controller.view.cmd_show_catalog.setAttribute('disabled','true');
+     }
+    }
+   }
+  );
+  
+  JSAN.use('util.controller'); obj.controller = new util.controller();
+  obj.controller.init(
+   {
+    'control_map' : {
+     'save_columns' : [ [ 'command' ], function() { obj.list.save_columns(); } ],
+     'sel_clip' : [
+      ['command'],
+      function() { obj.list.clipboard(); }
+     ],
+     'cmd_broken' : [
+      ['command'],
+      function() { alert($("commonStrings").getString('common.unimplemented')); }
+     ],
+     'sel_patron' : [
+      ['command'],
+      function() {
+       JSAN.use('circ.util');
+       circ.util.show_last_few_circs(obj.retrieve_ids);
+      }
+     ],
+     'sel_mark_items_damaged' : [
+      ['command'],
+      function() {
+       JSAN.use('cat.util'); JSAN.use('util.functional');
+       cat.util.mark_item_damaged( util.functional.map_list( obj.retrieve_ids, function(o) { return o.copy_id; } ) );
+      }
+     ],
+     'sel_mark_items_missing' : [
+      ['command'],
+      function() {
+       JSAN.use('cat.util'); JSAN.use('util.functional');
+       cat.util.mark_item_missing( util.functional.map_list( obj.retrieve_ids, function(o) { return o.copy_id; } ) );
+      }
+     ],
+     'sel_copy_details' : [
+      ['command'],
+      function() {
+       JSAN.use('circ.util');
+       for (var i = 0; i < obj.retrieve_ids.length; i++) {
+        if (obj.retrieve_ids[i].copy_id) circ.util.show_copy_details( obj.retrieve_ids[i].copy_id );
+       }
+      }
+     ],
+     'cmd_holds_print' : [
+      ['command'],
+      function() {
+       try {
+        JSAN.use('patron.util');
+        var params = { 
+         'patron' : patron.util.retrieve_au_via_id(ses(),obj.patron_id), 
+         'template' : 'holds'
+        };
+        obj.list.print(params);
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert('print 1',E);
+       }
+      }
+     ],
                     'cmd_csv_to_clipboard' : [ ['command'], function() { obj.list.dump_csv_to_clipboard(); } ],
-					'cmd_csv_to_printer' : [ ['command'], function() { obj.list.dump_csv_to_printer(); } ],
-					'cmd_csv_to_file' : [ ['command'], function() { obj.list.dump_csv_to_file( { 'defaultFileName' : 'holds.txt' } ); } ],
+     'cmd_csv_to_printer' : [ ['command'], function() { obj.list.dump_csv_to_printer(); } ],
+     'cmd_csv_to_file' : [ ['command'], function() { obj.list.dump_csv_to_file( { 'defaultFileName' : 'holds.txt' } ); } ],
 
-					'cmd_show_notifications' : [
-						['command'],
-						function() {
-							try {
-								JSAN.use('util.window'); var win = new util.window();
-								for (var i = 0; i < obj.retrieve_ids.length; i++) {
-									netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-									win.open(
-										xulG.url_prefix(urls.XUL_HOLD_NOTICES), // + '?ahr_id=' + obj.retrieve_ids[i].id,
-										'hold_notices_' + obj.retrieve_ids[i].id,
-										'chrome,resizable',
-										{ 'ahr_id' : obj.retrieve_ids[i].id }
-									);
-								}
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.holds.show_notifications.error_rendering_notifs'),E);
-							}
-						}
-					],
-					'cmd_holds_edit_selection_depth' : [
-						['command'],
-						function() {
-							try {
-								JSAN.use('util.widgets'); JSAN.use('util.functional'); 
-								var ws_type = obj.data.hash.aout[ obj.data.hash.aou[ obj.data.list.au[0].ws_ou() ].ou_type() ];
-								var list = util.functional.map_list(
-									util.functional.filter_list(	
-										obj.data.list.aout,
-										function(o) {
-											if (o.depth() > ws_type.depth()) return false;
-											if (o.depth() < ws_type.depth()) return true;
-											return (o.id() == ws_type.id());
-										}
-									),
-									function(o) { 
-										return [
-											o.opac_label(),
-											o.id(),
-											false,
-											( o.depth() * 2),
-										]; 
-									}
-								);
-								ml = util.widgets.make_menulist( list, obj.data.list.au[0].ws_ou() );
-								ml.setAttribute('id','selection');
-								ml.setAttribute('name','fancy_data');
-								var xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: vertical">';
-								xml += '<description>' + $("patronStrings").getString('staff.patron.holds.holds_edit_selection_depth.choose_hold_range') + '</description>';
-								xml += util.widgets.serialize_node(ml);
-								xml += '</vbox>';
-								var bot_xml = '<hbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: vertical">';
-								bot_xml += '<spacer flex="1"/><button label="'+ $("patronStrings").getString('staff.patron.holds.holds_edit_selection_depth.done.label') +'"';
-								bot_xml += 'accesskey="'+ $("patronStrings").getString('staff.patron.holds.holds_edit_selection_depth.done.accesskey') +'" name="fancy_submit"/>';
-								bot_xml += '<button label="'+ $("patronStrings").getString('staff.patron.holds.holds_edit_selection_depth.cancel.label') +'"';
-								bot_xml += 'accesskey="'+ $("patronStrings").getString('staff.patron.holds.holds_edit_selection_depth.cancel.accesskey') +'" name="fancy_cancel"/></hbox>';
-								netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
-								//obj.data.temp_mid = xml; obj.data.stash('temp_mid');
-								//obj.data.temp_bot = bot_xml; obj.data.stash('temp_bot');
-								JSAN.use('util.window'); var win = new util.window();
-								var fancy_prompt_data = win.open(
-									urls.XUL_FANCY_PROMPT,
-									//+ '?xml_in_stash=temp_mid'
-									//+ '&bottom_xml_in_stash=temp_bot'
-									//+ '&title=' + window.escape('Choose a Pick Up Library'),
-									'fancy_prompt', 'chrome,resizable,modal',
-									{ 'xml' : xml, 'bottom_xml' : bot_xml, 'title' : $("patronStrings").getString('staff.patron.holds.holds_edit_selection_depth.choose_library') }
-								);
-								if (fancy_prompt_data.fancy_status == 'incomplete') { return; }
-								var selection = fancy_prompt_data.selection;
+     'cmd_show_notifications' : [
+      ['command'],
+      function() {
+       try {
+        JSAN.use('util.window'); var win = new util.window();
+        for (var i = 0; i < obj.retrieve_ids.length; i++) {
+         netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+         win.open(
+          xulG.url_prefix(urls.XUL_HOLD_NOTICES), // + '?ahr_id=' + obj.retrieve_ids[i].id,
+          'hold_notices_' + obj.retrieve_ids[i].id,
+          'chrome,resizable',
+          { 'ahr_id' : obj.retrieve_ids[i].id }
+         );
+        }
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.holds.show_notifications.error_rendering_notifs'),E);
+       }
+      }
+     ],
+     'cmd_holds_edit_selection_depth' : [
+      ['command'],
+      function() {
+       try {
+        JSAN.use('util.widgets'); JSAN.use('util.functional'); 
+        var ws_type = obj.data.hash.aout[ obj.data.hash.aou[ obj.data.list.au[0].ws_ou() ].ou_type() ];
+        var list = util.functional.map_list(
+         util.functional.filter_list( 
+          obj.data.list.aout,
+          function(o) {
+           if (o.depth() > ws_type.depth()) return false;
+           if (o.depth() < ws_type.depth()) return true;
+           return (o.id() == ws_type.id());
+          }
+         ),
+         function(o) { 
+          return [
+           o.opac_label(),
+           o.id(),
+           false,
+           ( o.depth() * 2),
+          ]; 
+         }
+        );
+        ml = util.widgets.make_menulist( list, obj.data.list.au[0].ws_ou() );
+        ml.setAttribute('id','selection');
+        ml.setAttribute('name','fancy_data');
+        var xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: vertical">';
+        xml += '<description>' + $("patronStrings").getString('staff.patron.holds.holds_edit_selection_depth.choose_hold_range') + '</description>';
+        xml += util.widgets.serialize_node(ml);
+        xml += '</vbox>';
+        var bot_xml = '<hbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: vertical">';
+        bot_xml += '<spacer flex="1"/><button label="'+ $("patronStrings").getString('staff.patron.holds.holds_edit_selection_depth.done.label') +'"';
+        bot_xml += 'accesskey="'+ $("patronStrings").getString('staff.patron.holds.holds_edit_selection_depth.done.accesskey') +'" name="fancy_submit"/>';
+        bot_xml += '<button label="'+ $("patronStrings").getString('staff.patron.holds.holds_edit_selection_depth.cancel.label') +'"';
+        bot_xml += 'accesskey="'+ $("patronStrings").getString('staff.patron.holds.holds_edit_selection_depth.cancel.accesskey') +'" name="fancy_cancel"/></hbox>';
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
+        //obj.data.temp_mid = xml; obj.data.stash('temp_mid');
+        //obj.data.temp_bot = bot_xml; obj.data.stash('temp_bot');
+        JSAN.use('util.window'); var win = new util.window();
+        var fancy_prompt_data = win.open(
+         urls.XUL_FANCY_PROMPT,
+         //+ '?xml_in_stash=temp_mid'
+         //+ '&bottom_xml_in_stash=temp_bot'
+         //+ '&title=' + window.escape('Choose a Pick Up Library'),
+         'fancy_prompt', 'chrome,resizable,modal',
+         { 'xml' : xml, 'bottom_xml' : bot_xml, 'title' : $("patronStrings").getString('staff.patron.holds.holds_edit_selection_depth.choose_library') }
+        );
+        if (fancy_prompt_data.fancy_status == 'incomplete') { return; }
+        var selection = fancy_prompt_data.selection;
                 
-								var hold_list = util.functional.map_list(obj.retrieve_ids, function(o){return o.id;}).join(', ');
-								var msg = '';
-								if(obj.retrieve_ids.length > 1) {
-									msg = $("patronStrings").getformattedString('staff.patron.holds.holds_edit_selection_depth.modify_holds_message.plural', [hold_list, obj.data.hash.aout[selection].opac_label()])
-								} else {
-									msg = $("patronStrings").getformattedString('staff.patron.holds.holds_edit_selection_depth.modify_holds_message.singular', [hold_list, obj.data.hash.aout[selection].opac_label()])
-								}
+        var hold_list = util.functional.map_list(obj.retrieve_ids, function(o){return o.id;}).join(', ');
+        var msg = '';
+        if(obj.retrieve_ids.length > 1) {
+         msg = $("patronStrings").getformattedString('staff.patron.holds.holds_edit_selection_depth.modify_holds_message.plural', [hold_list, obj.data.hash.aout[selection].opac_label()])
+        } else {
+         msg = $("patronStrings").getformattedString('staff.patron.holds.holds_edit_selection_depth.modify_holds_message.singular', [hold_list, obj.data.hash.aout[selection].opac_label()])
+        }
                     
-								var r = obj.error.yns_alert(msg,
-										$("patronStrings").getString('staff.patron.holds.holds_edit_selection_depth.modify_holds_title'),
-										$("commonStrings").getString('common.yes'),
-										$("commonStrings").getString('common.no'),
-										null,
-										$("commonStrings").getString('common.check_to_confirm')
-								);
-								if (r == 0) {
-									for (var i = 0; i < obj.retrieve_ids.length; i++) {
-										var hold = obj.holds_map[ obj.retrieve_ids[i].id ];
-										hold.selection_depth( obj.data.hash.aout[selection].depth() ); hold.ischanged('1');
+        var r = obj.error.yns_alert(msg,
+          $("patronStrings").getString('staff.patron.holds.holds_edit_selection_depth.modify_holds_title'),
+          $("commonStrings").getString('common.yes'),
+          $("commonStrings").getString('common.no'),
+          null,
+          $("commonStrings").getString('common.check_to_confirm')
+        );
+        if (r == 0) {
+         for (var i = 0; i < obj.retrieve_ids.length; i++) {
+          var hold = obj.holds_map[ obj.retrieve_ids[i].id ];
+          hold.selection_depth( obj.data.hash.aout[selection].depth() ); hold.ischanged('1');
                                         hold = obj.flatten_copy(hold);
-										var robj = obj.network.simple_request('FM_AHR_UPDATE',[ ses(), hold ]);
-										if (typeof robj.ilsevent != 'undefined') throw(robj);
-									}
-									obj.clear_and_retrieve(true);
-								}
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.holds.holds_not_modified'),E);
-							}
-						}
-					],
+          var robj = obj.network.simple_request('FM_AHR_UPDATE',[ ses(), hold ]);
+          if (typeof robj.ilsevent != 'undefined') throw(robj);
+         }
+         obj.clear_and_retrieve(true);
+        }
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.holds.holds_not_modified'),E);
+       }
+      }
+     ],
 
-					'cmd_holds_edit_pickup_lib' : [
-						['command'],
-						function() {
-							try {
-								JSAN.use('util.widgets'); JSAN.use('util.functional'); 
+     'cmd_holds_edit_pickup_lib' : [
+      ['command'],
+      function() {
+       try {
+        JSAN.use('util.widgets'); JSAN.use('util.functional'); 
                                 
                                 var deny_edit_because_of_transit = false;
                                 for (var i = 0; i < obj.retrieve_ids.length; i++) {
@@ -339,205 +339,205 @@ patron.holds.prototype = {
                                     return;
                                 }
 
-								var list = util.functional.map_list(
-									obj.data.list.aou,
-									function(o) { 
-										var sname = o.shortname(); for (i = sname.length; i < 20; i++) sname += ' ';
-										return [
-											o.name() ? sname + ' ' + o.name() : o.shortname(),
-											o.id(),
-											( obj.data.hash.aout[ o.ou_type() ].can_have_users() == 0),
-											( obj.data.hash.aout[ o.ou_type() ].depth() * 2),
-										]; 
-									}
-								);
-								ml = util.widgets.make_menulist( list, obj.data.list.au[0].ws_ou() );
-								ml.setAttribute('id','lib');
-								ml.setAttribute('name','fancy_data');
-								var xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: vertical">';
-								xml += '<description>'+$("patronStrings").getString('staff.patron.holds.holds_edit_pickup_lib.new_pickup_lib.description')+'</description>';
-								xml += util.widgets.serialize_node(ml);
-								xml += '</vbox>';
-								var bot_xml = '<hbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: vertical">';
-								bot_xml += '<spacer flex="1"/><button label="'+ $("patronStrings").getString('staff.patron.holds.holds_edit_pickup_lib.done.label') +'"';
-								bot_xml += ' accesskey="'+$("patronStrings").getString('staff.patron.holds.holds_edit_pickup_lib.done.accesskey')+'" name="fancy_submit"/>';
-								bot_xml += '<button label="'+$("patronStrings").getString('staff.patron.holds.holds_edit_pickup_lib.cancel.label')+'"';
-								bot_xml += ' accesskey="'+$("patronStrings").getString('staff.patron.holds.holds_edit_pickup_lib.cancel.accesskey')+'" name="fancy_cancel"/></hbox>';
-								netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
-								//obj.data.temp_mid = xml; obj.data.stash('temp_mid');
-								//obj.data.temp_bot = bot_xml; obj.data.stash('temp_bot');
-								JSAN.use('util.window'); var win = new util.window();
-								var fancy_prompt_data = win.open(
-									urls.XUL_FANCY_PROMPT,
-									//+ '?xml_in_stash=temp_mid'
-									//+ '&bottom_xml_in_stash=temp_bot'
-									//+ '&title=' + window.escape('Choose a Pick Up Library'),
-									'fancy_prompt', 'chrome,resizable,modal',
-									{ 'xml' : xml, 'bottom_xml' : bot_xml, 'title' : $("patronStrings").getString('staff.patron.holds.holds_edit_pickup_lib.choose_lib') }
-								);
-								if (fancy_prompt_data.fancy_status == 'incomplete') { return; }
-								var pickup_lib = fancy_prompt_data.lib;
+        var list = util.functional.map_list(
+         obj.data.list.aou,
+         function(o) { 
+          var sname = o.shortname(); for (i = sname.length; i < 20; i++) sname += ' ';
+          return [
+           o.name() ? sname + ' ' + o.name() : o.shortname(),
+           o.id(),
+           ( obj.data.hash.aout[ o.ou_type() ].can_have_users() == 0),
+           ( obj.data.hash.aout[ o.ou_type() ].depth() * 2),
+          ]; 
+         }
+        );
+        ml = util.widgets.make_menulist( list, obj.data.list.au[0].ws_ou() );
+        ml.setAttribute('id','lib');
+        ml.setAttribute('name','fancy_data');
+        var xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: vertical">';
+        xml += '<description>'+$("patronStrings").getString('staff.patron.holds.holds_edit_pickup_lib.new_pickup_lib.description')+'</description>';
+        xml += util.widgets.serialize_node(ml);
+        xml += '</vbox>';
+        var bot_xml = '<hbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: vertical">';
+        bot_xml += '<spacer flex="1"/><button label="'+ $("patronStrings").getString('staff.patron.holds.holds_edit_pickup_lib.done.label') +'"';
+        bot_xml += ' accesskey="'+$("patronStrings").getString('staff.patron.holds.holds_edit_pickup_lib.done.accesskey')+'" name="fancy_submit"/>';
+        bot_xml += '<button label="'+$("patronStrings").getString('staff.patron.holds.holds_edit_pickup_lib.cancel.label')+'"';
+        bot_xml += ' accesskey="'+$("patronStrings").getString('staff.patron.holds.holds_edit_pickup_lib.cancel.accesskey')+'" name="fancy_cancel"/></hbox>';
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
+        //obj.data.temp_mid = xml; obj.data.stash('temp_mid');
+        //obj.data.temp_bot = bot_xml; obj.data.stash('temp_bot');
+        JSAN.use('util.window'); var win = new util.window();
+        var fancy_prompt_data = win.open(
+         urls.XUL_FANCY_PROMPT,
+         //+ '?xml_in_stash=temp_mid'
+         //+ '&bottom_xml_in_stash=temp_bot'
+         //+ '&title=' + window.escape('Choose a Pick Up Library'),
+         'fancy_prompt', 'chrome,resizable,modal',
+         { 'xml' : xml, 'bottom_xml' : bot_xml, 'title' : $("patronStrings").getString('staff.patron.holds.holds_edit_pickup_lib.choose_lib') }
+        );
+        if (fancy_prompt_data.fancy_status == 'incomplete') { return; }
+        var pickup_lib = fancy_prompt_data.lib;
                 
-								var hold_list = util.functional.map_list(obj.retrieve_ids, function(o){return o.id;}).join(', ');
-								var msg = '';
-								if(obj.retrieve_ids.length > 1) {
-									msg = $("patronStrings").getFormattedString('staff.patron.holds.holds_edit_pickup_lib.change_pickup_lib_message.plural',[hold_list, obj.data.hash.aou[pickup_lib].shortname()]);
-								} else {
-									msg = $("patronStrings").getFormattedString('staff.patron.holds.holds_edit_pickup_lib.change_pickup_lib_message.singular',[hold_list, obj.data.hash.aou[pickup_lib].shortname()]);
-								}
-								var r = obj.error.yns_alert(msg,
-										$("patronStrings").getString('staff.patron.holds.holds_edit_pickup_lib.change_pickup_lib_title'),
-										$("commonStrings").getString('common.yes'),
-										$("commonStrings").getString('common.no'),
-										null,
-										$("commonStrings").getString('common.check_to_confirm')
-								);
-								if (r == 0) {
-									for (var i = 0; i < obj.retrieve_ids.length; i++) {
-										var hold = obj.holds_map[ obj.retrieve_ids[i].id ];
-										hold.pickup_lib(  pickup_lib ); hold.ischanged('1');
+        var hold_list = util.functional.map_list(obj.retrieve_ids, function(o){return o.id;}).join(', ');
+        var msg = '';
+        if(obj.retrieve_ids.length > 1) {
+         msg = $("patronStrings").getFormattedString('staff.patron.holds.holds_edit_pickup_lib.change_pickup_lib_message.plural',[hold_list, obj.data.hash.aou[pickup_lib].shortname()]);
+        } else {
+         msg = $("patronStrings").getFormattedString('staff.patron.holds.holds_edit_pickup_lib.change_pickup_lib_message.singular',[hold_list, obj.data.hash.aou[pickup_lib].shortname()]);
+        }
+        var r = obj.error.yns_alert(msg,
+          $("patronStrings").getString('staff.patron.holds.holds_edit_pickup_lib.change_pickup_lib_title'),
+          $("commonStrings").getString('common.yes'),
+          $("commonStrings").getString('common.no'),
+          null,
+          $("commonStrings").getString('common.check_to_confirm')
+        );
+        if (r == 0) {
+         for (var i = 0; i < obj.retrieve_ids.length; i++) {
+          var hold = obj.holds_map[ obj.retrieve_ids[i].id ];
+          hold.pickup_lib(  pickup_lib ); hold.ischanged('1');
                                         hold = obj.flatten_copy(hold);
-										var robj = obj.network.simple_request('FM_AHR_UPDATE',[ ses(), hold ]);
-										if (typeof robj.ilsevent != 'undefined') throw(robj);
-									}
-									obj.clear_and_retrieve(true);
-								}
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.holds.holds_not_modified'),E);
-							}
-						}
-					],
-					'cmd_holds_edit_phone_notify' : [
-						['command'],
-						function() {
-							try {
-								var xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: vertical">';
-								xml += '<description>'+$("patronStrings").getString('staff.patron.holds.holds_edit_phone_notify.new_phone_number')+'</description>';
-								xml += '<textbox id="phone" name="fancy_data" context="clipboard"/>';
-								xml += '</vbox>';
-								var bot_xml = '<hbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: vertical">';
-								bot_xml += '<spacer flex="1"/><button label="'+$("patronStrings").getString('staff.patron.holds.holds_edit_phone_notify.btn_done.label')+'"';
-								bot_xml += ' accesskey="'+$("patronStrings").getString('staff.patron.holds.holds_edit_phone_notify.btn_done.accesskey')+'" name="fancy_submit"/>';
-								bot_xml += '<button label="'+$("patronStrings").getString('staff.patron.holds.holds_edit_phone_notify.btn_cancel.label')+'"';
-								bot_xml += ' accesskey="'+$("patronStrings").getString('staff.patron.holds.holds_edit_phone_notify.btn_cancel.accesskey')+'" name="fancy_cancel"/></hbox>';
-								netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
-								//obj.data.temp_mid = xml; obj.data.stash('temp_mid');
-								//obj.data.temp_bot = bot_xml; obj.data.stash('temp_bot');
-								JSAN.use('util.window'); var win = new util.window();
-								var fancy_prompt_data = win.open(
-									urls.XUL_FANCY_PROMPT,
-									//+ '?xml_in_stash=temp_mid'
-									//+ '&bottom_xml_in_stash=temp_bot'
-									//+ '&title=' + window.escape('Choose a Hold Notification Phone Number')
-									//+ '&focus=phone',
-									'fancy_prompt', 'chrome,resizable,modal',
-									{ 'xml' : xml, 'bottom_xml' : bot_xml, 'title' : $("patronStrings").getString('staff.patron.holds.holds_edit_phone_notify.choose_phone_number'), 'focus' : 'phone' }
-								);
-								if (fancy_prompt_data.fancy_status == 'incomplete') { return; }
-								var phone = fancy_prompt_data.phone;
+          var robj = obj.network.simple_request('FM_AHR_UPDATE',[ ses(), hold ]);
+          if (typeof robj.ilsevent != 'undefined') throw(robj);
+         }
+         obj.clear_and_retrieve(true);
+        }
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.holds.holds_not_modified'),E);
+       }
+      }
+     ],
+     'cmd_holds_edit_phone_notify' : [
+      ['command'],
+      function() {
+       try {
+        var xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: vertical">';
+        xml += '<description>'+$("patronStrings").getString('staff.patron.holds.holds_edit_phone_notify.new_phone_number')+'</description>';
+        xml += '<textbox id="phone" name="fancy_data" context="clipboard"/>';
+        xml += '</vbox>';
+        var bot_xml = '<hbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: vertical">';
+        bot_xml += '<spacer flex="1"/><button label="'+$("patronStrings").getString('staff.patron.holds.holds_edit_phone_notify.btn_done.label')+'"';
+        bot_xml += ' accesskey="'+$("patronStrings").getString('staff.patron.holds.holds_edit_phone_notify.btn_done.accesskey')+'" name="fancy_submit"/>';
+        bot_xml += '<button label="'+$("patronStrings").getString('staff.patron.holds.holds_edit_phone_notify.btn_cancel.label')+'"';
+        bot_xml += ' accesskey="'+$("patronStrings").getString('staff.patron.holds.holds_edit_phone_notify.btn_cancel.accesskey')+'" name="fancy_cancel"/></hbox>';
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
+        //obj.data.temp_mid = xml; obj.data.stash('temp_mid');
+        //obj.data.temp_bot = bot_xml; obj.data.stash('temp_bot');
+        JSAN.use('util.window'); var win = new util.window();
+        var fancy_prompt_data = win.open(
+         urls.XUL_FANCY_PROMPT,
+         //+ '?xml_in_stash=temp_mid'
+         //+ '&bottom_xml_in_stash=temp_bot'
+         //+ '&title=' + window.escape('Choose a Hold Notification Phone Number')
+         //+ '&focus=phone',
+         'fancy_prompt', 'chrome,resizable,modal',
+         { 'xml' : xml, 'bottom_xml' : bot_xml, 'title' : $("patronStrings").getString('staff.patron.holds.holds_edit_phone_notify.choose_phone_number'), 'focus' : 'phone' }
+        );
+        if (fancy_prompt_data.fancy_status == 'incomplete') { return; }
+        var phone = fancy_prompt_data.phone;
 
-								var hold_list = util.functional.map_list(obj.retrieve_ids, function(o){return o.id;}).join(', ');
-								var msg = '';
-								if(obj.retrieve_ids.length > 1) {
-									msg = $("patronStrings").getFormattedString('staff.patron.holds.holds_edit_phone_notify.confirm_phone_number_change.plural',[hold_list, phone]);
-								} else {
-									msg = $("patronStrings").getFormattedString('staff.patron.holds.holds_edit_phone_notify.confirm_phone_number_change.singular',[hold_list, phone]);
-								}
-								var r = obj.error.yns_alert(msg,
-										$("patronStrings").getString('staff.patron.holds.holds_edit_phone_notify.modifying_holds_title'),
-										$("commonStrings").getString('common.yes'),
-										$("commonStrings").getString('common.no'),
-										null,
-										$("commonStrings").getString('common.check_to_confirm')
-								);
-								if (r == 0) {
-									for (var i = 0; i < obj.retrieve_ids.length; i++) {
-										var hold = obj.holds_map[ obj.retrieve_ids[i].id ];
-										hold.phone_notify(  phone ); hold.ischanged('1');
+        var hold_list = util.functional.map_list(obj.retrieve_ids, function(o){return o.id;}).join(', ');
+        var msg = '';
+        if(obj.retrieve_ids.length > 1) {
+         msg = $("patronStrings").getFormattedString('staff.patron.holds.holds_edit_phone_notify.confirm_phone_number_change.plural',[hold_list, phone]);
+        } else {
+         msg = $("patronStrings").getFormattedString('staff.patron.holds.holds_edit_phone_notify.confirm_phone_number_change.singular',[hold_list, phone]);
+        }
+        var r = obj.error.yns_alert(msg,
+          $("patronStrings").getString('staff.patron.holds.holds_edit_phone_notify.modifying_holds_title'),
+          $("commonStrings").getString('common.yes'),
+          $("commonStrings").getString('common.no'),
+          null,
+          $("commonStrings").getString('common.check_to_confirm')
+        );
+        if (r == 0) {
+         for (var i = 0; i < obj.retrieve_ids.length; i++) {
+          var hold = obj.holds_map[ obj.retrieve_ids[i].id ];
+          hold.phone_notify(  phone ); hold.ischanged('1');
                                         hold = obj.flatten_copy(hold);
-										var robj = obj.network.simple_request('FM_AHR_UPDATE',[ ses(), hold ]);
-										if (typeof robj.ilsevent != 'undefined') throw(robj);
-									}
-									obj.clear_and_retrieve(true);
-								}
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.holds.holds_not_modified'),E);
-							}
-						}
-					],
-					'cmd_holds_edit_email_notify' : [
-						['command'],
-						function() {
-							try {
-								var xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: vertical">';
-								xml += '<description>'+$("patronStrings").getString('staff.patron.holds.holds_edit_email_notify.description')+'</description>';
-								xml += '<hbox><button value="email" label="'+$("patronStrings").getString('staff.patron.holds.holds_edit_email_notify.btn_email.label')+'"';
-								xml += ' accesskey="'+$("patronStrings").getString('staff.patron.holds.holds_edit_email_notify.btn_email.accesskey')+'" name="fancy_submit"/>';
-								xml += '<button value="noemail" label="'+$("patronStrings").getString('staff.patron.holds.holds_edit_email_notify.btn_no_email.label')+'"';
-								xml += '  accesskey="'+$("patronStrings").getString('staff.patron.holds.holds_edit_email_notify.btn_no_email.accesskey')+'" name="fancy_submit"/></hbox>';
-								xml += '</vbox>';
-								var bot_xml = '<hbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: vertical">';
-								bot_xml += '<spacer flex="1"/><button label="'+$("patronStrings").getString('staff.patron.holds.holds_edit_email_notify.btn_cancel.label')+'"';
-								bot_xml += ' accesskey="'+$("patronStrings").getString('staff.patron.holds.holds_edit_email_notify.btn_cancel.accesskey')+'" name="fancy_cancel"/></hbox>';
-								netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
-								//obj.data.temp_mid = xml; obj.data.stash('temp_mid');
-								//obj.data.temp_bot = bot_xml; obj.data.stash('temp_bot');
-								JSAN.use('util.window'); var win = new util.window();
-								var fancy_prompt_data = win.open(
-									urls.XUL_FANCY_PROMPT,
-									//+ '?xml_in_stash=temp_mid'
-									//+ '&bottom_xml_in_stash=temp_bot'
-									//+ '&title=' + window.escape('Set Email Notification for Holds'),
-									'fancy_prompt', 'chrome,resizable,modal',
-									{ 'xml' : xml, 'bottom_xml' : bot_xml, 'title' : $("patronStrings").getString('staff.patron.holds.holds_edit_email_notify.set_notifs') }
-								);
-								if (fancy_prompt_data.fancy_status == 'incomplete') { return; }
-								var email = fancy_prompt_data.fancy_submit == 'email' ? get_db_true() : get_db_false();
+          var robj = obj.network.simple_request('FM_AHR_UPDATE',[ ses(), hold ]);
+          if (typeof robj.ilsevent != 'undefined') throw(robj);
+         }
+         obj.clear_and_retrieve(true);
+        }
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.holds.holds_not_modified'),E);
+       }
+      }
+     ],
+     'cmd_holds_edit_email_notify' : [
+      ['command'],
+      function() {
+       try {
+        var xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: vertical">';
+        xml += '<description>'+$("patronStrings").getString('staff.patron.holds.holds_edit_email_notify.description')+'</description>';
+        xml += '<hbox><button value="email" label="'+$("patronStrings").getString('staff.patron.holds.holds_edit_email_notify.btn_email.label')+'"';
+        xml += ' accesskey="'+$("patronStrings").getString('staff.patron.holds.holds_edit_email_notify.btn_email.accesskey')+'" name="fancy_submit"/>';
+        xml += '<button value="noemail" label="'+$("patronStrings").getString('staff.patron.holds.holds_edit_email_notify.btn_no_email.label')+'"';
+        xml += '  accesskey="'+$("patronStrings").getString('staff.patron.holds.holds_edit_email_notify.btn_no_email.accesskey')+'" name="fancy_submit"/></hbox>';
+        xml += '</vbox>';
+        var bot_xml = '<hbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: vertical">';
+        bot_xml += '<spacer flex="1"/><button label="'+$("patronStrings").getString('staff.patron.holds.holds_edit_email_notify.btn_cancel.label')+'"';
+        bot_xml += ' accesskey="'+$("patronStrings").getString('staff.patron.holds.holds_edit_email_notify.btn_cancel.accesskey')+'" name="fancy_cancel"/></hbox>';
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
+        //obj.data.temp_mid = xml; obj.data.stash('temp_mid');
+        //obj.data.temp_bot = bot_xml; obj.data.stash('temp_bot');
+        JSAN.use('util.window'); var win = new util.window();
+        var fancy_prompt_data = win.open(
+         urls.XUL_FANCY_PROMPT,
+         //+ '?xml_in_stash=temp_mid'
+         //+ '&bottom_xml_in_stash=temp_bot'
+         //+ '&title=' + window.escape('Set Email Notification for Holds'),
+         'fancy_prompt', 'chrome,resizable,modal',
+         { 'xml' : xml, 'bottom_xml' : bot_xml, 'title' : $("patronStrings").getString('staff.patron.holds.holds_edit_email_notify.set_notifs') }
+        );
+        if (fancy_prompt_data.fancy_status == 'incomplete') { return; }
+        var email = fancy_prompt_data.fancy_submit == 'email' ? get_db_true() : get_db_false();
 
-								var hold_list = util.functional.map_list( obj.retrieve_ids, function(o){return o.id;}).join(', ');
-								var msg = '';
-								if(get_bool(email)) {
-									if(obj.retrieve_ids.length > 1) {
-										msg = $("patronStrings").getFormattedString('staff.patron.holds.holds_edit_email_notify.enable_email.plural', [hold_list]);
-									} else {
-										msg = $("patronStrings").getFormattedString('staff.patron.holds.holds_edit_email_notify.enable_email.singular', [hold_list]);
-									}
-								} else {
-									if(obj.retrieve_ids.length > 1) {
-										msg = $("patronStrings").getFormattedString('staff.patron.holds.holds_edit_email_notify.disable_email.plural', [hold_list]);
-									} else {
-										msg = $("patronStrings").getFormattedString('staff.patron.holds.holds_edit_email_notify.disable_email.singular', [hold_list]);
-									}
-								}
-										
-								var r = obj.error.yns_alert(msg,
-										$("patronStrings").getString('staff.patron.holds.holds_edit_email_notify.mod_holds_title'),
-										$("commonStrings").getString('common.yes'),
-										$("commonStrings").getString('common.no'),
-										null,
-										$("commonStrings").getString('common.check_to_confirm')
-								);
-								if (r == 0) {
-									for (var i = 0; i < obj.retrieve_ids.length; i++) {
-										var hold = obj.holds_map[ obj.retrieve_ids[i].id ];
-										hold.email_notify(  email ); hold.ischanged('1');
+        var hold_list = util.functional.map_list( obj.retrieve_ids, function(o){return o.id;}).join(', ');
+        var msg = '';
+        if(get_bool(email)) {
+         if(obj.retrieve_ids.length > 1) {
+          msg = $("patronStrings").getFormattedString('staff.patron.holds.holds_edit_email_notify.enable_email.plural', [hold_list]);
+         } else {
+          msg = $("patronStrings").getFormattedString('staff.patron.holds.holds_edit_email_notify.enable_email.singular', [hold_list]);
+         }
+        } else {
+         if(obj.retrieve_ids.length > 1) {
+          msg = $("patronStrings").getFormattedString('staff.patron.holds.holds_edit_email_notify.disable_email.plural', [hold_list]);
+         } else {
+          msg = $("patronStrings").getFormattedString('staff.patron.holds.holds_edit_email_notify.disable_email.singular', [hold_list]);
+         }
+        }
+          
+        var r = obj.error.yns_alert(msg,
+          $("patronStrings").getString('staff.patron.holds.holds_edit_email_notify.mod_holds_title'),
+          $("commonStrings").getString('common.yes'),
+          $("commonStrings").getString('common.no'),
+          null,
+          $("commonStrings").getString('common.check_to_confirm')
+        );
+        if (r == 0) {
+         for (var i = 0; i < obj.retrieve_ids.length; i++) {
+          var hold = obj.holds_map[ obj.retrieve_ids[i].id ];
+          hold.email_notify(  email ); hold.ischanged('1');
                                         hold = obj.flatten_copy(hold);
-										var robj = obj.network.simple_request('FM_AHR_UPDATE',[ ses(), hold ]);
-										if (typeof robj.ilsevent != 'undefined') throw(robj);
-									}
-									obj.clear_and_retrieve(true);
-								}
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.holds.holds_not_modified'),E);
-							}
-						}
-					],
+          var robj = obj.network.simple_request('FM_AHR_UPDATE',[ ses(), hold ]);
+          if (typeof robj.ilsevent != 'undefined') throw(robj);
+         }
+         obj.clear_and_retrieve(true);
+        }
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.holds.holds_not_modified'),E);
+       }
+      }
+     ],
                     'cmd_holds_suspend' : [
-						['command'],
-						function() {
-							try {
+      ['command'],
+      function() {
+       try {
                                 var hold_list = util.functional.map_list( obj.retrieve_ids, function(o){return o.id;}).join(', '); 
-								var r = obj.error.yns_alert(
+        var r = obj.error.yns_alert(
                                     obj.retrieve_ids.length > 1 ?
                                     document.getElementById('circStrings').getFormattedString('staff.circ.holds.suspend.prompt.plural',[hold_list]) :
                                     document.getElementById('circStrings').getFormattedString('staff.circ.holds.suspend.prompt',[hold_list]),
@@ -547,39 +547,39 @@ patron.holds.prototype = {
                                     null,
                                     document.getElementById('commonStrings').getString('common.confirm')
                                 );
-								if (r == 0) {
+        if (r == 0) {
                                     var already_suspended = [];
-									for (var i = 0; i < obj.retrieve_ids.length; i++) {
-										var hold = obj.holds_map[ obj.retrieve_ids[i].id ];
+         for (var i = 0; i < obj.retrieve_ids.length; i++) {
+          var hold = obj.holds_map[ obj.retrieve_ids[i].id ];
                                         if ( get_bool( hold.frozen() ) ) {
                                             already_suspended.push( hold.id() );
                                             continue; 
                                         }
-										hold.frozen('t'); 
-										hold.thaw_date(null);
-										hold.ischanged('1');
+          hold.frozen('t'); 
+          hold.thaw_date(null);
+          hold.ischanged('1');
                                         hold = obj.flatten_copy(hold);
-										var robj = obj.network.simple_request('FM_AHR_UPDATE',[ ses(), hold ]);
-										if (typeof robj.ilsevent != 'undefined') throw(robj);
-									}
+          var robj = obj.network.simple_request('FM_AHR_UPDATE',[ ses(), hold ]);
+          if (typeof robj.ilsevent != 'undefined') throw(robj);
+         }
                                     if (already_suspended.length == 1) {
                                         alert( document.getElementById('circStrings').getFormattedString('staff.circ.holds.already_suspended',[already_suspended[0]]) );
                                     } else if (already_suspended.length > 1) {
                                         alert( document.getElementById('circStrings').getFormattedString('staff.circ.holds.already_suspended.plural',[already_suspended.join(', ')]) );
                                     }
-									obj.clear_and_retrieve(true);
-								}
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.holds.unexpected_error.not_likely_suspended'),E);
-							}
-						}
-					],
+         obj.clear_and_retrieve(true);
+        }
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.holds.unexpected_error.not_likely_suspended'),E);
+       }
+      }
+     ],
                     'cmd_holds_activate' : [
-						['command'],
-						function() {
-							try {
+      ['command'],
+      function() {
+       try {
                                 var hold_list = util.functional.map_list( obj.retrieve_ids, function(o){return o.id;}).join(', '); 
-								var r = obj.error.yns_alert(
+        var r = obj.error.yns_alert(
                                     obj.retrieve_ids.length > 1 ?
                                     document.getElementById('circStrings').getFormattedString('staff.circ.holds.activate.prompt.plural',[hold_list]) :
                                     document.getElementById('circStrings').getFormattedString('staff.circ.holds.activate.prompt',[hold_list]),
@@ -589,37 +589,37 @@ patron.holds.prototype = {
                                     null,
                                     document.getElementById('commonStrings').getString('common.confirm')
                                 );
-								if (r == 0) {
+        if (r == 0) {
                                     var already_activated = [];
-									for (var i = 0; i < obj.retrieve_ids.length; i++) {
-										var hold = obj.holds_map[ obj.retrieve_ids[i].id ];
+         for (var i = 0; i < obj.retrieve_ids.length; i++) {
+          var hold = obj.holds_map[ obj.retrieve_ids[i].id ];
                                         if ( ! get_bool( hold.frozen() ) ) {
                                             already_activated.push( hold.id() );
                                             continue; 
                                         }
-										hold.frozen('f'); 
-										hold.thaw_date(null);
-										hold.ischanged('1');
+          hold.frozen('f'); 
+          hold.thaw_date(null);
+          hold.ischanged('1');
                                         hold = obj.flatten_copy(hold);
-										var robj = obj.network.simple_request('FM_AHR_UPDATE',[ ses(), hold ]);
-										if (typeof robj.ilsevent != 'undefined') throw(robj);
-									}
+          var robj = obj.network.simple_request('FM_AHR_UPDATE',[ ses(), hold ]);
+          if (typeof robj.ilsevent != 'undefined') throw(robj);
+         }
                                     if (already_activated.length == 1) {
                                         alert( document.getElementById('circStrings').getFormattedString('staff.circ.holds.already_activated',[already_activated[0]]) );
                                     } else if (already_activated.length > 1) {
                                         alert( document.getElementById('circStrings').getFormattedString('staff.circ.holds.already_activated.plural',[already_activated.join(', ')]) );
                                     }
-									obj.clear_and_retrieve(true);
-								}
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.holds.unexpected_error.not_likely_activated'),E);
-							}
-						}
-					],
+         obj.clear_and_retrieve(true);
+        }
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.holds.unexpected_error.not_likely_activated'),E);
+       }
+      }
+     ],
                     'cmd_holds_edit_thaw_date' : [
-						['command'],
-						function() {
-							try {
+      ['command'],
+      function() {
+       try {
                                 JSAN.use('util.date');
                                 function check_date(value) {
                                     try {
@@ -635,12 +635,12 @@ patron.holds.prototype = {
                                 }
 
                                 var hold_ids = util.functional.map_list( obj.retrieve_ids, function(o){return o.id;}).join(', ');
-								var msg_singular = document.getElementById('circStrings').getFormattedString('staff.circ.holds.activation_date.prompt',[hold_ids]);
-								var msg_plural = document.getElementById('circStrings').getFormattedString('staff.circ.holds.activation_date.prompt',[hold_ids]);
+        var msg_singular = document.getElementById('circStrings').getFormattedString('staff.circ.holds.activation_date.prompt',[hold_ids]);
+        var msg_plural = document.getElementById('circStrings').getFormattedString('staff.circ.holds.activation_date.prompt',[hold_ids]);
                                 var msg = obj.retrieve_ids.length > 1 ? msg_plural : msg_singular;
                                 var value = 'YYYY-MM-DD';
                                 var title = document.getElementById('circStrings').getString('staff.circ.holds.modifying_holds');
-								var thaw_date; var invalid = true;
+        var thaw_date; var invalid = true;
                                 while(invalid) {
                                     thaw_date = window.prompt(msg,value,title);
                                     if (thaw_date) {
@@ -658,17 +658,17 @@ patron.holds.prototype = {
                                         var robj = obj.network.simple_request('FM_AHR_UPDATE',[ ses(), hold ]);
                                         if (typeof robj.ilsevent != 'undefined') throw(robj);
                                     }
-									obj.clear_and_retrieve(true);
+         obj.clear_and_retrieve(true);
                                 }
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.holds.unexpected_error.not_likely_modified'),E);
-							}
-						}
-					],
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.holds.unexpected_error.not_likely_modified'),E);
+       }
+      }
+     ],
                     'cmd_holds_edit_expire_time' : [
-						['command'],
-						function() {
-							try {
+      ['command'],
+      function() {
+       try {
                                 JSAN.use('util.date');
                                 function check_date(value) {
                                     try {
@@ -684,12 +684,12 @@ patron.holds.prototype = {
                                 }
 
                                 var hold_ids = util.functional.map_list( obj.retrieve_ids, function(o){return o.id;}).join(', ');
-								var msg_singular = document.getElementById('circStrings').getFormattedString('staff.circ.holds.expire_time.prompt',[hold_ids]);
-								var msg_plural = document.getElementById('circStrings').getFormattedString('staff.circ.holds.expire_time.prompt',[hold_ids]);
+        var msg_singular = document.getElementById('circStrings').getFormattedString('staff.circ.holds.expire_time.prompt',[hold_ids]);
+        var msg_plural = document.getElementById('circStrings').getFormattedString('staff.circ.holds.expire_time.prompt',[hold_ids]);
                                 var msg = obj.retrieve_ids.length > 1 ? msg_plural : msg_singular;
                                 var value = 'YYYY-MM-DD';
                                 var title = document.getElementById('circStrings').getString('staff.circ.holds.modifying_holds');
-								var expire_time; var invalid = true;
+        var expire_time; var invalid = true;
                                 while(invalid) {
                                     expire_time = window.prompt(msg,value,title);
                                     if (expire_time) {
@@ -706,86 +706,86 @@ patron.holds.prototype = {
                                         var robj = obj.network.simple_request('FM_AHR_UPDATE',[ ses(), hold ]);
                                         if (typeof robj.ilsevent != 'undefined') throw(robj);
                                     }
-									obj.clear_and_retrieve(true);
+         obj.clear_and_retrieve(true);
                                 }
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.holds.unexpected_error.not_likely_modified'),E);
-							}
-						}
-					],
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.holds.unexpected_error.not_likely_modified'),E);
+       }
+      }
+     ],
 
 
 
-					'cmd_holds_retarget' : [
-						['command'],
-						function() {
-							try {
-								JSAN.use('util.functional');
+     'cmd_holds_retarget' : [
+      ['command'],
+      function() {
+       try {
+        JSAN.use('util.functional');
 
-								var hold_list = util.functional.map_list( obj.retrieve_ids, function(o){return o.id;}).join(', ');
-								var msg = '';
-								if(obj.retrieve_ids.length > 1) {
-									msg = $("patronStrings").getFormattedString('staff.patron.holds.holds_retarget.reset_hold_message.plural',[hold_list]);
-								} else {
-									msg = $("patronStrings").getFormattedString('staff.patron.holds.holds_retarget.reset_hold_message.singular',[hold_list]);
-								}
-								var r = obj.error.yns_alert(msg,
-										$("patronStrings").getString('staff.patron.holds.holds_retarget.reset_hold_title'),
-										$("commonStrings").getString('common.yes'),
-										$("commonStrings").getString('common.no'),
-										null,
-										$("commonStrings").getString('common.check_to_confirm')
-								);
-								if (r == 0) {
-									for (var i = 0; i < obj.retrieve_ids.length; i++) {
-										var robj = obj.network.simple_request('FM_AHR_RESET',[ ses(), obj.retrieve_ids[i].id]);
-										if (typeof robj.ilsevent != 'undefined') throw(robj);
-									}
-									obj.clear_and_retrieve();
-								}
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.holds.holds_retarget.holds_not_reset'),E);
-							}
+        var hold_list = util.functional.map_list( obj.retrieve_ids, function(o){return o.id;}).join(', ');
+        var msg = '';
+        if(obj.retrieve_ids.length > 1) {
+         msg = $("patronStrings").getFormattedString('staff.patron.holds.holds_retarget.reset_hold_message.plural',[hold_list]);
+        } else {
+         msg = $("patronStrings").getFormattedString('staff.patron.holds.holds_retarget.reset_hold_message.singular',[hold_list]);
+        }
+        var r = obj.error.yns_alert(msg,
+          $("patronStrings").getString('staff.patron.holds.holds_retarget.reset_hold_title'),
+          $("commonStrings").getString('common.yes'),
+          $("commonStrings").getString('common.no'),
+          null,
+          $("commonStrings").getString('common.check_to_confirm')
+        );
+        if (r == 0) {
+         for (var i = 0; i < obj.retrieve_ids.length; i++) {
+          var robj = obj.network.simple_request('FM_AHR_RESET',[ ses(), obj.retrieve_ids[i].id]);
+          if (typeof robj.ilsevent != 'undefined') throw(robj);
+         }
+         obj.clear_and_retrieve();
+        }
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.holds.holds_retarget.holds_not_reset'),E);
+       }
 
-						}
-					],
+      }
+     ],
 
-					'cmd_holds_cancel' : [
-						['command'],
-						function() {
-							try {
-								JSAN.use('util.functional');
+     'cmd_holds_cancel' : [
+      ['command'],
+      function() {
+       try {
+        JSAN.use('util.functional');
 
-								var hold_list = util.functional.map_list( obj.retrieve_ids, function(o){return o.id;}).join(', ');
-								var msg = '';
-								if(obj.retrieve_ids.length > 1 ) {
-									msg = $("patronStrings").getFormattedString('staff.patron.holds.holds_cancel.cancel_hold_message.plural', [hold_list]);
-								} else {
-									msg = $("patronStrings").getFormattedString('staff.patron.holds.holds_cancel.cancel_hold_message.singular', [hold_list]);
-								}
-								var r = obj.error.yns_alert(msg,
-										$("patronStrings").getString('staff.patron.holds.holds_cancel.cancel_hold_title'),
-										$("commonStrings").getString('common.yes'),
-										$("commonStrings").getString('common.no'),
-										null,
-										$("commonStrings").getString('common.check_to_confirm')
-								);
-								if (r == 0) {
+        var hold_list = util.functional.map_list( obj.retrieve_ids, function(o){return o.id;}).join(', ');
+        var msg = '';
+        if(obj.retrieve_ids.length > 1 ) {
+         msg = $("patronStrings").getFormattedString('staff.patron.holds.holds_cancel.cancel_hold_message.plural', [hold_list]);
+        } else {
+         msg = $("patronStrings").getFormattedString('staff.patron.holds.holds_cancel.cancel_hold_message.singular', [hold_list]);
+        }
+        var r = obj.error.yns_alert(msg,
+          $("patronStrings").getString('staff.patron.holds.holds_cancel.cancel_hold_title'),
+          $("commonStrings").getString('common.yes'),
+          $("commonStrings").getString('common.no'),
+          null,
+          $("commonStrings").getString('common.check_to_confirm')
+        );
+        if (r == 0) {
                                     var transits = [];
-									for (var i = 0; i < obj.retrieve_ids.length; i++) {
+         for (var i = 0; i < obj.retrieve_ids.length; i++) {
                                         if (obj.holds_map[ obj.retrieve_ids[i].id ].transit()) {
                                             transits.push( obj.retrieve_ids[i].barcode );
                                         }
-										var robj = obj.network.simple_request('FM_AHR_CANCEL',[ ses(), obj.retrieve_ids[i].id]);
-										if (typeof robj.ilsevent != 'undefined') throw(robj);
-									}
+          var robj = obj.network.simple_request('FM_AHR_CANCEL',[ ses(), obj.retrieve_ids[i].id]);
+          if (typeof robj.ilsevent != 'undefined') throw(robj);
+         }
                                     if (transits.length > 0) {
                                         var msg2 = $("patronStrings").getFormattedString('staff.patron.holds.holds_cancel.cancel_for_barcodes', [transits.join(', ')]);
                                         var r2 = obj.error.yns_alert(msg2,
                                             $("patronStrings").getString('staff.patron.holds.holds_cancel.cancel_for_barcodes.title'),
                                             $("commonStrings").getString('common.yes'),
                                             $("commonStrings").getString('common.no'),
-											null,
+           null,
                                             $("commonStrings").getString('common.check_to_confirm'));
                                         if (r2 == 0) {
                                             try {
@@ -802,89 +802,89 @@ patron.holds.prototype = {
                                                                 throw(robj);
                                                             break;
                                                         }
-										            }
+                      }
                                                 }
                                             } catch(E) {
                                                obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.holds.holds_cancel.hold_transits_not_cancelled'),E);
                                             }
                                         }
                                     }
-									obj.clear_and_retrieve();
-								}
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.holds.holds_cancel.hold_not_cancelled'),E);
-							}
-						}
-					],
-					'cmd_retrieve_patron' : [
-						['command'],
-						function() {
-							try {
-								var seen = {};
-								for (var i = 0; i < obj.retrieve_ids.length; i++) {
-									var patron_id = obj.retrieve_ids[i].usr;
-									if (seen[patron_id]) continue; seen[patron_id] = true;
-									xulG.new_patron_tab(
-										{}, 
-										{ 'id' : patron_id }
-									);
-								}
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert('',E);
-							}
-						}
-					],
-					'cmd_show_catalog' : [
-						['command'],
-						function() {
-							try {
-								for (var i = 0; i < obj.retrieve_ids.length; i++) {
-									var htarget = obj.retrieve_ids[i].target;
-									var htype = obj.retrieve_ids[i].type;
-									var opac_url;
-									switch(htype) {
-										case 'M' :
-											opac_url = xulG.url_prefix( urls.opac_rresult ) + '?m=' + htarget;
-										break;
-										case 'T' : 
-											opac_url = xulG.url_prefix( urls.opac_rdetail ) + '?r=' + htarget;
-										break;
-										case 'V' :
-											var my_acn = obj.network.simple_request( 'FM_ACN_RETRIEVE.authoritative', [ htarget ]);
-											opac_url = xulG.url_prefix( urls.opac_rdetail) + '?r=' + my_acn.record();
-										break;
-										case 'C' :
-											var my_acp = obj.network.simple_request( 'FM_ACP_RETRIEVE', [ htarget ]);
-											var my_acn;
-											if (typeof my_acp.call_number() == 'object') {
-												my_acn = my.acp.call_number();
-											} else {
-												my_acn = obj.network.simple_request( 'FM_ACN_RETRIEVE.authoritative', 
-													[ my_acp.call_number() ]);
-											}
-											opac_url = xulG.url_prefix( urls.opac_rdetail) + '?r=' + my_acn.record();
-										break;
-										default:
-											obj.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.holds.show_catalog.unknown_htype', [htype]), obj.retrieve_ids[i]);
-											continue;
-										break;
-									}
-									var content_params = { 
-										'session' : ses(),
-										'authtime' : ses('authtime'),
-										'opac_url' : opac_url
-									};
-									xulG.new_tab(
-										xulG.url_prefix(urls.XUL_OPAC_WRAPPER), 
-										{'tab_name': htype == 'M' ? 'Catalog' : $("patronStrings").getString('staff.patron.holds.show_catalog.retrieving_title') },
-										content_params
-									);
-								}
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert('',E);
-							}
-						}
-					],
+         obj.clear_and_retrieve();
+        }
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.holds.holds_cancel.hold_not_cancelled'),E);
+       }
+      }
+     ],
+     'cmd_retrieve_patron' : [
+      ['command'],
+      function() {
+       try {
+        var seen = {};
+        for (var i = 0; i < obj.retrieve_ids.length; i++) {
+         var patron_id = obj.retrieve_ids[i].usr;
+         if (seen[patron_id]) continue; seen[patron_id] = true;
+         xulG.new_patron_tab(
+          {}, 
+          { 'id' : patron_id }
+         );
+        }
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert('',E);
+       }
+      }
+     ],
+     'cmd_show_catalog' : [
+      ['command'],
+      function() {
+       try {
+        for (var i = 0; i < obj.retrieve_ids.length; i++) {
+         var htarget = obj.retrieve_ids[i].target;
+         var htype = obj.retrieve_ids[i].type;
+         var opac_url;
+         switch(htype) {
+          case 'M' :
+           opac_url = xulG.url_prefix( urls.opac_rresult ) + '?m=' + htarget;
+          break;
+          case 'T' : 
+           opac_url = xulG.url_prefix( urls.opac_rdetail ) + '?r=' + htarget;
+          break;
+          case 'V' :
+           var my_acn = obj.network.simple_request( 'FM_ACN_RETRIEVE.authoritative', [ htarget ]);
+           opac_url = xulG.url_prefix( urls.opac_rdetail) + '?r=' + my_acn.record();
+          break;
+          case 'C' :
+           var my_acp = obj.network.simple_request( 'FM_ACP_RETRIEVE', [ htarget ]);
+           var my_acn;
+           if (typeof my_acp.call_number() == 'object') {
+            my_acn = my.acp.call_number();
+           } else {
+            my_acn = obj.network.simple_request( 'FM_ACN_RETRIEVE.authoritative', 
+             [ my_acp.call_number() ]);
+           }
+           opac_url = xulG.url_prefix( urls.opac_rdetail) + '?r=' + my_acn.record();
+          break;
+          default:
+           obj.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.holds.show_catalog.unknown_htype', [htype]), obj.retrieve_ids[i]);
+           continue;
+          break;
+         }
+         var content_params = { 
+          'session' : ses(),
+          'authtime' : ses('authtime'),
+          'opac_url' : opac_url
+         };
+         xulG.new_tab(
+          xulG.url_prefix(urls.XUL_OPAC_WRAPPER), 
+          {'tab_name': htype == 'M' ? 'Catalog' : $("patronStrings").getString('staff.patron.holds.show_catalog.retrieving_title') },
+          content_params
+         );
+        }
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert('',E);
+       }
+      }
+     ],
                     'fetch_more' : [
                         ['command'],
                         function() {
@@ -932,9 +932,9 @@ patron.holds.prototype = {
 
                         }
                     ]
-				}
-			}
-		);
+    }
+   }
+  );
         
         obj.determine_hold_interface_type();
         var x_fetch_more = document.getElementById('fetch_more');
@@ -978,9 +978,9 @@ patron.holds.prototype = {
                 obj.controller.view.cmd_holds_edit_pickup_lib.setAttribute('disabled','true');
                 obj.controller.view.cmd_holds_edit_phone_notify.setAttribute('disabled','true');
                 obj.controller.view.cmd_holds_edit_email_notify.setAttribute('disabled','true');
-				obj.controller.view.cmd_holds_edit_thaw_date.setAttribute('disabled','true');
-				obj.controller.view.cmd_holds_activate.setAttribute('disabled','true');
-				obj.controller.view.cmd_holds_suspend.setAttribute('disabled','true');
+    obj.controller.view.cmd_holds_edit_thaw_date.setAttribute('disabled','true');
+    obj.controller.view.cmd_holds_activate.setAttribute('disabled','true');
+    obj.controller.view.cmd_holds_suspend.setAttribute('disabled','true');
                 obj.controller.view.cmd_holds_edit_selection_depth.setAttribute('disabled','true');
                 obj.controller.view.cmd_show_notifications.setAttribute('disabled','true');
                 obj.controller.view.cmd_holds_retarget.setAttribute('disabled','true');
@@ -988,21 +988,21 @@ patron.holds.prototype = {
                 obj.controller.view.cmd_show_catalog.setAttribute('disabled','true');
             }, 0
         );
-	},
+ },
 
     'determine_hold_interface_type' : function() {
-		var obj = this;
+  var obj = this;
         if (obj.patron_id) { /*************************************************** PATRON ******************************/
             obj.hold_interface_type = 'patron';
-		} else if (obj.docid) { /*************************************************** RECORD ******************************/
+  } else if (obj.docid) { /*************************************************** RECORD ******************************/
             obj.hold_interface_type = 'record';
-		} else if (obj.pull) { /*************************************************** PULL ******************************/
+  } else if (obj.pull) { /*************************************************** PULL ******************************/
             obj.hold_interface_type = 'pull';
-		} else if (obj.shelf) { /*************************************************** HOLD SHELF ******************************/
+  } else if (obj.shelf) { /*************************************************** HOLD SHELF ******************************/
             obj.hold_interface_type = 'shelf';
-		} else { /*************************************************** PULL ******************************/
+  } else { /*************************************************** PULL ******************************/
             obj.hold_interface_type = 'pull';
-		}
+  }
     },
 
     'clear_and_retrieve' : function(dont_show_me_the_list_change) {
@@ -1011,21 +1011,21 @@ patron.holds.prototype = {
         this.retrieve(dont_show_me_the_list_change);
     },
 
-	'retrieve' : function(dont_show_me_the_list_change) {
-		var obj = this; var holds = [];
-		if (window.xulG && window.xulG.holds) {
-			holds = window.xulG.holds;
-		} else {
-			var method; var params = [ ses() ];
+ 'retrieve' : function(dont_show_me_the_list_change) {
+  var obj = this; var holds = [];
+  if (window.xulG && window.xulG.holds) {
+   holds = window.xulG.holds;
+  } else {
+   var method; var params = [ ses() ];
             switch(obj.hold_interface_type) {
                 case 'patron' :
-				    method = 'FM_AHR_ID_LIST_RETRIEVE_VIA_AU.authoritative'; 
-    				params.push( obj.patron_id ); 
-    				obj.controller.view.cmd_retrieve_patron.setAttribute('hidden','true');
+        method = 'FM_AHR_ID_LIST_RETRIEVE_VIA_AU.authoritative'; 
+        params.push( obj.patron_id ); 
+        obj.controller.view.cmd_retrieve_patron.setAttribute('hidden','true');
                 break;
                 case 'record' :
-				    method = 'FM_AHR_RETRIEVE_ALL_VIA_BRE'; 
-    				params.push( obj.docid ); 
+        method = 'FM_AHR_RETRIEVE_ALL_VIA_BRE'; 
+        params.push( obj.docid ); 
                     var x_lib_filter = document.getElementById('lib_filter_checkbox');
                     var x_lib_type_menu = document.getElementById('lib_type_menu');
                     if (x_lib_filter) {
@@ -1037,24 +1037,24 @@ patron.holds.prototype = {
                             }
                         }
                     }
-    				obj.controller.view.cmd_retrieve_patron.setAttribute('hidden','false');
+        obj.controller.view.cmd_retrieve_patron.setAttribute('hidden','false');
                 break;
                 case 'shelf' : 
-				    method = 'FM_AHR_ID_LIST_ONSHELF_RETRIEVE';
+        method = 'FM_AHR_ID_LIST_ONSHELF_RETRIEVE';
                     params.push( obj.filter_lib || obj.data.list.au[0].ws_ou() ); 
-    				obj.controller.view.cmd_retrieve_patron.setAttribute('hidden','false');
+        obj.controller.view.cmd_retrieve_patron.setAttribute('hidden','false');
                 break;
                 case 'pull' : 
                 default:
-				    method = 'FM_AHR_ID_LIST_PULL_LIST'; 
-    				params.push( obj.pull_from_shelf_interface.current.limit ); params.push( obj.pull_from_shelf_interface.current.offset );
-				    //obj.controller.view.cmd_retrieve_patron.setAttribute('hidden','false');
+        method = 'FM_AHR_ID_LIST_PULL_LIST'; 
+        params.push( obj.pull_from_shelf_interface.current.limit ); params.push( obj.pull_from_shelf_interface.current.offset );
+        //obj.controller.view.cmd_retrieve_patron.setAttribute('hidden','false');
                 break;
-			}
-			var robj = obj.network.simple_request( method, params );
-			if (robj != null && typeof robj.ilsevent != 'undefined') throw(robj);
-			if (method == 'FM_AHR_RETRIEVE_ALL_VIA_BRE') {
-				holds = [];
+   }
+   var robj = obj.network.simple_request( method, params );
+   if (robj != null && typeof robj.ilsevent != 'undefined') throw(robj);
+   if (method == 'FM_AHR_RETRIEVE_ALL_VIA_BRE') {
+    holds = [];
                 if (robj != null) {
                     holds = holds.concat( robj.copy_holds );
                     holds = holds.concat( robj.volume_holds );
@@ -1062,7 +1062,7 @@ patron.holds.prototype = {
                     holds = holds.concat( robj.metarecord_holds );
                     holds = holds.sort();
                 }
-			} else {
+   } else {
                 if (robj == null ) {
                     holds = [];
                 } else {
@@ -1072,9 +1072,9 @@ patron.holds.prototype = {
                         holds = robj;
                     }
                 }
-			}
-			//alert('method = ' + method + ' params = ' + js2JSON(params));
-		}
+   }
+   //alert('method = ' + method + ' params = ' + js2JSON(params));
+  }
 
         var x_fetch_more = document.getElementById('fetch_more');
         if (holds.length == 0) {
@@ -1089,48 +1089,48 @@ patron.holds.prototype = {
     'render' : function(holds,dont_show_me_the_list_change) {
         var obj = this;
 
-		function list_append(hold_id) {
-			obj.list.append(
-				{
-					'row' : {
-						'my' : {
-							'hold_id' : hold_id
-						}
-					}
-				}
-			);
-		}
+  function list_append(hold_id) {
+   obj.list.append(
+    {
+     'row' : {
+      'my' : {
+       'hold_id' : hold_id
+      }
+     }
+    }
+   );
+  }
 
-		function gen_list_append(hold) {
-			return function() {
-				if (typeof obj.controller.view.lib_menu == 'undefined') {
-					list_append(typeof hold == 'object' ? hold.id() : hold);
-				} else {
-					list_append(typeof hold == 'object' ? hold.id() : hold);
-				}
-			};
-		}
+  function gen_list_append(hold) {
+   return function() {
+    if (typeof obj.controller.view.lib_menu == 'undefined') {
+     list_append(typeof hold == 'object' ? hold.id() : hold);
+    } else {
+     list_append(typeof hold == 'object' ? hold.id() : hold);
+    }
+   };
+  }
 
-		//obj.list.clear();
+  //obj.list.clear();
 
-		JSAN.use('util.exec'); var exec = new util.exec(2);
-		var rows = [];
-		for (var i in holds) {
-			rows.push( gen_list_append(holds[i]) );
-		}
-		exec.chain( rows );
-	
-		if (!dont_show_me_the_list_change) {
-			if (window.xulG && typeof window.xulG.on_list_change == 'function') {
-				try { window.xulG.on_list_change(holds); } catch(E) { this.error.sdump('D_ERROR',E); }
-			}
-		}
-	},
+  JSAN.use('util.exec'); var exec = new util.exec(2);
+  var rows = [];
+  for (var i in holds) {
+   rows.push( gen_list_append(holds[i]) );
+  }
+  exec.chain( rows );
+ 
+  if (!dont_show_me_the_list_change) {
+   if (window.xulG && typeof window.xulG.on_list_change == 'function') {
+    try { window.xulG.on_list_change(holds); } catch(E) { this.error.sdump('D_ERROR',E); }
+   }
+  }
+ },
 
-	'render_lib_menus' : function(types) {
-		try {
-			var obj = this;
-			JSAN.use('util.widgets'); JSAN.use('util.functional'); JSAN.use('util.fm_utils');
+ 'render_lib_menus' : function(types) {
+  try {
+   var obj = this;
+   JSAN.use('util.widgets'); JSAN.use('util.functional'); JSAN.use('util.fm_utils');
 
             var x = document.getElementById('lib_type_menu');
             if (types) {
@@ -1140,33 +1140,33 @@ patron.holds.prototype = {
             }
             x.setAttribute('oncommand','g.holds.clear_and_retrieve()');
 
-			x = document.getElementById('lib_menu_placeholder');
-			util.widgets.remove_children( x );
+   x = document.getElementById('lib_menu_placeholder');
+   util.widgets.remove_children( x );
 
             JSAN.use('util.file');
-			var file = new util.file('offline_ou_list'); 
-			if (file._file.exists()) {
-				var list_data = file.get_object(); file.close();
-				var ml = util.widgets.make_menulist( list_data[0], obj.data.list.au[0].ws_ou() );
+   var file = new util.file('offline_ou_list'); 
+   if (file._file.exists()) {
+    var list_data = file.get_object(); file.close();
+    var ml = util.widgets.make_menulist( list_data[0], obj.data.list.au[0].ws_ou() );
                 ml.setAttribute('id','lib_menu');
                 x.appendChild( ml );
-    			ml.addEventListener(
-    				'command',
-    				function(ev) {
-    					obj.filter_lib = ev.target.value;
-    					obj.clear_and_retrieve();
-    				},
-    				false
-    			);
-    			obj.controller.view.lib_menu = ml;
-			} else {
-				throw($("patronStrings").getString('staff.patron.holds.lib_menus.missing_library_list'));
-			}
+       ml.addEventListener(
+        'command',
+        function(ev) {
+         obj.filter_lib = ev.target.value;
+         obj.clear_and_retrieve();
+        },
+        false
+       );
+       obj.controller.view.lib_menu = ml;
+   } else {
+    throw($("patronStrings").getString('staff.patron.holds.lib_menus.missing_library_list'));
+   }
 
-		} catch(E) {
-			this.error.standard_unexpected_error_alert('rendering lib menu',E);
-		}
-	}
+  } catch(E) {
+   this.error.standard_unexpected_error_alert('rendering lib menu',E);
+  }
+ }
 }
 
 dump('exiting patron.holds.js\n');
diff --git a/Open-ILS/xul/staff_client/server/patron/holds.xul b/Open-ILS/xul/staff_client/server/patron/holds.xul
index ab830c0054..c20e1e4c27 100644
--- a/Open-ILS/xul/staff_client/server/patron/holds.xul
+++ b/Open-ILS/xul/staff_client/server/patron/holds.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -21,92 +21,92 @@
 <?xul-overlay href="/xul/server/patron/holds_overlay.xul"?>
 
 <window id="holds_win" 
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="/xul/server/util/network.js"/>
-	<script type="text/javascript" src="/xul/server/patron/holds.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-		
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for holds.xul');
-
-				JSAN.use('patron.holds'); g.holds = new patron.holds();
-				g.holds.init( 
-					{ 
-						'patron_id' : xul_param('patron_id'), 
-						'patron_barcode' : xul_param('patron_barcode'), 
-						'docid' : xul_param('docid'),
-						'shelf' : xul_param('shelf'),
-						'pull' : xul_param('pull'),
-					} 
-				);
-				window.refresh = function(p) { g.holds.list.clear(); g.holds.retrieve(p); }
-
-				default_focus();
-
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/holds.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function default_focus() { try { document.getElementById('holds_print').focus(); } catch(E) { } }
-
-	]]>
-	</script>
-
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale' -->/patron.properties"/>
-
-	<commandset id="holds_cmds">
-		<command id="sel_mark_items_damaged" disabled="true"/>
-		<command id="sel_mark_items_missing" disabled="true"/>
-		<command id="sel_copy_details" disabled="true"/>
-		<command id="sel_patron" disabled="true"/>
-		<command id="sel_clip" />
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script type="text/javascript" src="/xul/server/util/network.js"/>
+ <script type="text/javascript" src="/xul/server/patron/holds.js"/>
+ <script>
+ <![CDATA[
+  function $(id) { return document.getElementById(id); }
+  
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for holds.xul');
+
+    JSAN.use('patron.holds'); g.holds = new patron.holds();
+    g.holds.init( 
+     { 
+      'patron_id' : xul_param('patron_id'), 
+      'patron_barcode' : xul_param('patron_barcode'), 
+      'docid' : xul_param('docid'),
+      'shelf' : xul_param('shelf'),
+      'pull' : xul_param('pull'),
+     } 
+    );
+    window.refresh = function(p) { g.holds.list.clear(); g.holds.retrieve(p); }
+
+    default_focus();
+
+   } catch(E) {
+    var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/holds.xul', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+
+  function default_focus() { try { document.getElementById('holds_print').focus(); } catch(E) { } }
+
+ ]]>
+ </script>
+
+ <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
+ <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
+ <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale' -->/patron.properties"/>
+
+ <commandset id="holds_cmds">
+  <command id="sel_mark_items_damaged" disabled="true"/>
+  <command id="sel_mark_items_missing" disabled="true"/>
+  <command id="sel_copy_details" disabled="true"/>
+  <command id="sel_patron" disabled="true"/>
+  <command id="sel_clip" />
         <command id="cmd_csv_to_clipboard" />
-		<command id="cmd_csv_to_printer" />
-		<command id="cmd_csv_to_file" />
-
-		<command id="cmd_holds_print" />
-		<command id="cmd_show_catalog" />
-		<command id="cmd_retrieve_patron" />
-		<command id="cmd_show_notifications" />
-		<command id="cmd_holds_edit_pickup_lib" />
-		<command id="cmd_holds_edit_phone_notify" />
-		<command id="cmd_holds_edit_email_notify" />
-		<command id="cmd_holds_edit_thaw_date" />
-		<command id="cmd_holds_edit_expire_time" />
-		<command id="cmd_holds_activate" />
-		<command id="cmd_holds_suspend" />
-		<command id="cmd_holds_edit_selection_depth" />
-		<command id="cmd_broken" disabled="true" hidden="true"/>
-		<command id="cmd_holds_retarget"/>
-		<command id="cmd_holds_cancel" />
-		<command id="cmd_search_opac" />
-		<command id="save_columns" />
-	</commandset>
-
-	<popupset id="holds_popupset"/>
-
-	<box id="holds_main" />
+  <command id="cmd_csv_to_printer" />
+  <command id="cmd_csv_to_file" />
+
+  <command id="cmd_holds_print" />
+  <command id="cmd_show_catalog" />
+  <command id="cmd_retrieve_patron" />
+  <command id="cmd_show_notifications" />
+  <command id="cmd_holds_edit_pickup_lib" />
+  <command id="cmd_holds_edit_phone_notify" />
+  <command id="cmd_holds_edit_email_notify" />
+  <command id="cmd_holds_edit_thaw_date" />
+  <command id="cmd_holds_edit_expire_time" />
+  <command id="cmd_holds_activate" />
+  <command id="cmd_holds_suspend" />
+  <command id="cmd_holds_edit_selection_depth" />
+  <command id="cmd_broken" disabled="true" hidden="true"/>
+  <command id="cmd_holds_retarget"/>
+  <command id="cmd_holds_cancel" />
+  <command id="cmd_search_opac" />
+  <command id="save_columns" />
+ </commandset>
+
+ <popupset id="holds_popupset"/>
+
+ <box id="holds_main" />
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/holds_overlay.xul b/Open-ILS/xul/staff_client/server/patron/holds_overlay.xul
index 5e0473e4e3..5f22f65b5c 100644
--- a/Open-ILS/xul/staff_client/server/patron/holds_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/holds_overlay.xul
@@ -1,59 +1,59 @@
 <?xml version="1.0"?>
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 <overlay id="holds_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading holds_overlay.xul\n');</script>
 
 <commandset id="holds_cmds" />
 
 <popupset id="holds_popupset">
-	<popup id="holds_actions" position="at_pointer"> 
-		<menuitem command="sel_clip" label="&staff.circ.holds.copy_to_clipboard;" accesskey="&staff.circ.holds.copy_to_clipboard.accesskey;" />
-		<menuitem label="&staff.circ.holds.show_in_catalog;" command="cmd_show_catalog" accesskey="&staff.circ.holds.show_in_catalog.accesskey;"/>
-		<menuitem command="sel_copy_details" label="&staff.circ.holds.show_item_details;" accesskey="&staff.circ.holds.show_item_details.accesskey;" />
-		<menuitem command="sel_patron" label="&staff.circ.holds.show_last_few_circulations;" accesskey="&staff.circ.holds.show_last_few_circulations.accesskey;"/>
-		<menuseparator />
-		<menuitem label="&staff.circ.holds.retrieve_patron;" command="cmd_retrieve_patron" accesskey="&staff.circ.holds.retrieve_patron.accesskey;"/>
-		<menuitem label="&staff.circ.holds.show_notices;" command="cmd_show_notifications" accesskey="&staff.circ.holds.show_notices.accesskey;" />
-		<menuseparator />
-		<menuitem label="&staff.circ.holds.edit_pickup_library;" command="cmd_holds_edit_pickup_lib" accesskey="&staff.circ.holds.edit_pickup_library.accesskey;"/>
-		<menuitem label="&staff.circ.holds.edit_phone_notification;" command="cmd_holds_edit_phone_notify" accesskey="&staff.circ.holds.edit_phone_notification.accesskey;"/>
-		<menuitem label="&staff.circ.holds.set_email_notification;" command="cmd_holds_edit_email_notify" accesskey="&staff.circ.holds.set_email_notification.accesskey;"/>
-		<menuitem label="&staff.circ.holds.edit_expire_time;" command="cmd_holds_edit_expire_time" accesskey="&staff.circ.holds.edit_expire_time.accesskey;"/>
-		<menuitem label="&staff.circ.holds.edit_activation_date;" command="cmd_holds_edit_thaw_date" accesskey="&staff.circ.holds.edit_activation_date.accesskey;"/>
-		<menuitem label="&staff.circ.holds.activate_hold;" command="cmd_holds_activate" accesskey="&staff.circ.holds.activate_hold.accesskey;"/>
-		<menuitem label="&staff.circ.holds.suspend_hold;" command="cmd_holds_suspend" accesskey="&staff.circ.holds.suspend_hold.accesskey;"/>
-		<menuitem label="&staff.circ.holds.edit_hold_range;" class="edit_hold_range" command="cmd_holds_edit_selection_depth" accesskey="&staff.circ.holds.edit_hold_range.accesskey;"/>
-		<menuitem label="&staff.circ.holds.edit_hold_focus;" class="edit_hold_focus" command="cmd_broken" accesskey="&staff.circ.holds.edit_hold_focus.accesskey;"/>
-		<menuseparator />
-		<menuitem command="sel_mark_items_damaged" label="&staff.circ.holds.mark_item_damaged;" accesskey="&staff.circ.holds.mark_item_damaged.accesskey;"/>
-		<menuitem command="sel_mark_items_missing" label="&staff.circ.holds.mark_item_missing;" accesskey="&staff.circ.holds.mark_item_missing.accesskey;"/>
-		<menuitem label="&staff.circ.holds.retarget;" command="cmd_holds_retarget" accesskey="&staff.circ.holds.retarget.accesskey;"/>
-		<menuitem label="&staff.circ.holds.cancel;" command="cmd_holds_cancel" accesskey="&staff.circ.holds.cancel.accesskey;"/>
-		<menuseparator />
-		<menuitem command="save_columns" label="&staff.circ.holds.save_columns;" accesskey="&staff.circ.holds.save_columns.accesskey;"/>
-	</popup>
+ <popup id="holds_actions" position="at_pointer"> 
+  <menuitem command="sel_clip" label="&staff.circ.holds.copy_to_clipboard;" accesskey="&staff.circ.holds.copy_to_clipboard.accesskey;" />
+  <menuitem label="&staff.circ.holds.show_in_catalog;" command="cmd_show_catalog" accesskey="&staff.circ.holds.show_in_catalog.accesskey;"/>
+  <menuitem command="sel_copy_details" label="&staff.circ.holds.show_item_details;" accesskey="&staff.circ.holds.show_item_details.accesskey;" />
+  <menuitem command="sel_patron" label="&staff.circ.holds.show_last_few_circulations;" accesskey="&staff.circ.holds.show_last_few_circulations.accesskey;"/>
+  <menuseparator />
+  <menuitem label="&staff.circ.holds.retrieve_patron;" command="cmd_retrieve_patron" accesskey="&staff.circ.holds.retrieve_patron.accesskey;"/>
+  <menuitem label="&staff.circ.holds.show_notices;" command="cmd_show_notifications" accesskey="&staff.circ.holds.show_notices.accesskey;" />
+  <menuseparator />
+  <menuitem label="&staff.circ.holds.edit_pickup_library;" command="cmd_holds_edit_pickup_lib" accesskey="&staff.circ.holds.edit_pickup_library.accesskey;"/>
+  <menuitem label="&staff.circ.holds.edit_phone_notification;" command="cmd_holds_edit_phone_notify" accesskey="&staff.circ.holds.edit_phone_notification.accesskey;"/>
+  <menuitem label="&staff.circ.holds.set_email_notification;" command="cmd_holds_edit_email_notify" accesskey="&staff.circ.holds.set_email_notification.accesskey;"/>
+  <menuitem label="&staff.circ.holds.edit_expire_time;" command="cmd_holds_edit_expire_time" accesskey="&staff.circ.holds.edit_expire_time.accesskey;"/>
+  <menuitem label="&staff.circ.holds.edit_activation_date;" command="cmd_holds_edit_thaw_date" accesskey="&staff.circ.holds.edit_activation_date.accesskey;"/>
+  <menuitem label="&staff.circ.holds.activate_hold;" command="cmd_holds_activate" accesskey="&staff.circ.holds.activate_hold.accesskey;"/>
+  <menuitem label="&staff.circ.holds.suspend_hold;" command="cmd_holds_suspend" accesskey="&staff.circ.holds.suspend_hold.accesskey;"/>
+  <menuitem label="&staff.circ.holds.edit_hold_range;" class="edit_hold_range" command="cmd_holds_edit_selection_depth" accesskey="&staff.circ.holds.edit_hold_range.accesskey;"/>
+  <menuitem label="&staff.circ.holds.edit_hold_focus;" class="edit_hold_focus" command="cmd_broken" accesskey="&staff.circ.holds.edit_hold_focus.accesskey;"/>
+  <menuseparator />
+  <menuitem command="sel_mark_items_damaged" label="&staff.circ.holds.mark_item_damaged;" accesskey="&staff.circ.holds.mark_item_damaged.accesskey;"/>
+  <menuitem command="sel_mark_items_missing" label="&staff.circ.holds.mark_item_missing;" accesskey="&staff.circ.holds.mark_item_missing.accesskey;"/>
+  <menuitem label="&staff.circ.holds.retarget;" command="cmd_holds_retarget" accesskey="&staff.circ.holds.retarget.accesskey;"/>
+  <menuitem label="&staff.circ.holds.cancel;" command="cmd_holds_cancel" accesskey="&staff.circ.holds.cancel.accesskey;"/>
+  <menuseparator />
+  <menuitem command="save_columns" label="&staff.circ.holds.save_columns;" accesskey="&staff.circ.holds.save_columns.accesskey;"/>
+ </popup>
 </popupset>
 
 
 <box id="holds_main" flex="1" orient="vertical" class="my_overflow">
-	<vbox id="cmvb1" flex="1"/>
+ <vbox id="cmvb1" flex="1"/>
 </box>
 
 <vbox id="cmvb1" flex="1">
-	<groupbox id="cmgb1" flex="1" orient="vertical">
-		<caption label="&staff.patron_navbar.holds;" />
-		<vbox flex="0">
-			<hbox id="holds_top_ui" />
-		</vbox>
-		<tree id="holds_list" flex="1" enableColumnDrag="true" context="holds_actions"/>
-		<vbox flex="0">
-			<hbox id="holds_bottom_ui" />
-		</vbox>
-	</groupbox>
+ <groupbox id="cmgb1" flex="1" orient="vertical">
+  <caption label="&staff.patron_navbar.holds;" />
+  <vbox flex="0">
+   <hbox id="holds_top_ui" />
+  </vbox>
+  <tree id="holds_list" flex="1" enableColumnDrag="true" context="holds_actions"/>
+  <vbox flex="0">
+   <hbox id="holds_bottom_ui" />
+  </vbox>
+ </groupbox>
 </vbox>
 
 <hbox id="holds_top_ui" flex="1">
@@ -71,7 +71,7 @@
     </menulist>
     <vbox id="lib_menu_placeholder" hidden="true"/>
     <button id="fetch_more" label="&staff.patron.holds_overlay.fetch_more.label;" accesskey="&staff.patron.holds_overlay.fetch_more.accesskey;" hidden="true"/>
-	<spacer flex="1"/>
+ <spacer flex="1"/>
     <menubar>
         <menu label="&staff.patron.holds_overlay.actions_for_holds.label;" accesskey="&staff.patron.holds_overlay.actions_for_holds.accesskey;">
             <menupopup>
@@ -86,7 +86,7 @@
                 <menuitem label="&staff.circ.holds.edit_pickup_library;" command="cmd_holds_edit_pickup_lib" accesskey="&staff.circ.holds.edit_pickup_library.accesskey;"/>
                 <menuitem label="&staff.circ.holds.edit_phone_notification;" command="cmd_holds_edit_phone_notify" accesskey="&staff.circ.holds.edit_phone_notification.accesskey;"/>
                 <menuitem label="&staff.circ.holds.set_email_notification;" command="cmd_holds_edit_email_notify" accesskey="&staff.circ.holds.set_email_notification.accesskey;"/>
-		        <menuitem label="&staff.circ.holds.edit_expire_time;" command="cmd_holds_edit_expire_time" accesskey="&staff.circ.holds.edit_expire_time.accesskey;"/>
+          <menuitem label="&staff.circ.holds.edit_expire_time;" command="cmd_holds_edit_expire_time" accesskey="&staff.circ.holds.edit_expire_time.accesskey;"/>
                 <menuitem label="&staff.circ.holds.edit_activation_date;" command="cmd_holds_edit_thaw_date" accesskey="&staff.circ.holds.edit_activation_date.accesskey;"/>
                 <menuitem label="&staff.circ.holds.activate_hold;" command="cmd_holds_activate" accesskey="&staff.circ.holds.activate_hold.accesskey;"/>
                 <menuitem label="&staff.circ.holds.suspend_hold;" command="cmd_holds_suspend" accesskey="&staff.circ.holds.suspend_hold.accesskey;"/>
@@ -118,8 +118,8 @@
         </menupopup>
     </button>
 
-	<button id="holds_print" label="&staff.patron.holds_overlay.print.label;" command="cmd_holds_print" accesskey="&staff.patron.holds_overlay.print.accesskey;" />
-	<spacer flex="1"/>
+ <button id="holds_print" label="&staff.patron.holds_overlay.print.label;" command="cmd_holds_print" accesskey="&staff.patron.holds_overlay.print.accesskey;" />
+ <spacer flex="1"/>
 </hbox>
 
 </overlay>
diff --git a/Open-ILS/xul/staff_client/server/patron/info_group.xul b/Open-ILS/xul/staff_client/server/patron/info_group.xul
index ced297f4fb..65d3a8c2d0 100644
--- a/Open-ILS/xul/staff_client/server/patron/info_group.xul
+++ b/Open-ILS/xul/staff_client/server/patron/info_group.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,196 +20,196 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="patron_info_group_win" width="700" height="550"
-	onload="try{ my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try{ my_init(); font_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-
-		function $(id) { return document.getElementById(id); }
-
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-
-				JSAN.use('util.error'); g.error = new util.error();
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('util.date'); JSAN.use('util.money'); JSAN.use('patron.util'); JSAN.use('util.functional');
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-
-				g.error.sdump('D_TRACE','my_init() for patron_info_group.xul');
-
-				g.patron_id = xul_param('patron_id');
-
-				tree_init();
-
-				refresh();
-
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/info_group.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function tree_init() {
-				JSAN.use('OpenILS.data'); g.OpenILS = {}; 
-				g.OpenILS.data = new OpenILS.data(); g.OpenILS.data.init({'via':'stash'});
-
-				JSAN.use('util.list'); g.list = new util.list('patron_list');
-
-				JSAN.use('patron.util');
-				var columns = patron.util.columns(
-					{
-						'active' : { 'hidden' : 'false' },
-						'barred' : { 'hidden' : 'false' },
-						'family_name' : { 'hidden' : 'false' },
-						'first_given_name' : { 'hidden' : 'false' },
-						'second_given_name' : { 'hidden' : 'false' },
-						'dob' : { 'hidden' : 'false' },
-						'master_account' : { 'hidden' : 'false' },
-					}
-				);
-				g.list.init(
-					{
-						'columns' : columns,
-						'map_row_to_columns' : patron.util.std_map_row_to_columns(),
-						'retrieve_row' : function(params) {
-							var id = params.retrieve_id;
-							var au_obj = patron.util.retrieve_fleshed_au_via_id( ses(), id );
-
-							var row = params.row;
-							if (typeof row.my == 'undefined') row.my = {};
-							row.my.au = au_obj;
-							if (typeof params.on_retrieve == 'function') {
-								params.on_retrieve(row);
-							}
-							return row;
-						},
-						'on_select' : function(ev) {
-							JSAN.use('util.functional');
-							var sel = g.list.retrieve_selection();
-							g.sel_list = util.functional.map_list(
-								sel,
-								function(o) { return o.getAttribute('retrieve_id'); }
-							);
-							if (g.sel_list.length > 0) {
-								$('retrieve_p').disabled = false;
-								$('retrieve_p').setAttribute('disabled','false');
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+
+  function $(id) { return document.getElementById(id); }
+
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+
+    JSAN.use('util.error'); g.error = new util.error();
+    JSAN.use('util.network'); g.network = new util.network();
+    JSAN.use('util.date'); JSAN.use('util.money'); JSAN.use('patron.util'); JSAN.use('util.functional');
+    JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+
+    g.error.sdump('D_TRACE','my_init() for patron_info_group.xul');
+
+    g.patron_id = xul_param('patron_id');
+
+    tree_init();
+
+    refresh();
+
+   } catch(E) {
+    var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/info_group.xul', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+
+  function tree_init() {
+    JSAN.use('OpenILS.data'); g.OpenILS = {}; 
+    g.OpenILS.data = new OpenILS.data(); g.OpenILS.data.init({'via':'stash'});
+
+    JSAN.use('util.list'); g.list = new util.list('patron_list');
+
+    JSAN.use('patron.util');
+    var columns = patron.util.columns(
+     {
+      'active' : { 'hidden' : 'false' },
+      'barred' : { 'hidden' : 'false' },
+      'family_name' : { 'hidden' : 'false' },
+      'first_given_name' : { 'hidden' : 'false' },
+      'second_given_name' : { 'hidden' : 'false' },
+      'dob' : { 'hidden' : 'false' },
+      'master_account' : { 'hidden' : 'false' },
+     }
+    );
+    g.list.init(
+     {
+      'columns' : columns,
+      'map_row_to_columns' : patron.util.std_map_row_to_columns(),
+      'retrieve_row' : function(params) {
+       var id = params.retrieve_id;
+       var au_obj = patron.util.retrieve_fleshed_au_via_id( ses(), id );
+
+       var row = params.row;
+       if (typeof row.my == 'undefined') row.my = {};
+       row.my.au = au_obj;
+       if (typeof params.on_retrieve == 'function') {
+        params.on_retrieve(row);
+       }
+       return row;
+      },
+      'on_select' : function(ev) {
+       JSAN.use('util.functional');
+       var sel = g.list.retrieve_selection();
+       g.sel_list = util.functional.map_list(
+        sel,
+        function(o) { return o.getAttribute('retrieve_id'); }
+       );
+       if (g.sel_list.length > 0) {
+        $('retrieve_p').disabled = false;
+        $('retrieve_p').setAttribute('disabled','false');
                                 if (g.sel_list.length > 1) {
-								    $('merge_p').disabled = false;
-    								$('merge_p').setAttribute('disabled','false');
+            $('merge_p').disabled = false;
+            $('merge_p').setAttribute('disabled','false');
                                 }
-								$('clone').disabled = false;
-								$('clone').setAttribute('disabled','false');
-								$('remove').disabled = false;
-								$('remove').setAttribute('disabled','false');
-								$('move').disabled = false;
-								$('move').setAttribute('disabled','false');
-							} else {
-								$('retrieve_p').disabled = true;
-								$('retrieve_p').setAttribute('disabled','true');
-								$('merge_p').disabled = true;
-								$('merge_p').setAttribute('disabled','true');
-								$('clone').disabled = true;
-								$('clone').setAttribute('disabled','true');
-								$('remove').disabled = true;
-								$('remove').setAttribute('disabled','true');
-								$('move').disabled = true;
-								$('move').setAttribute('disabled','true');
-							}
-						}
-					}
-				);
-				$('retrieve_p').disabled = true;
-				$('retrieve_p').setAttribute('disabled','true');
-				$('merge_p').disabled = true;
-				$('merge_p').setAttribute('disabled','true');
-				$('clone').disabled = true;
-				$('clone').setAttribute('disabled','true');
-				$('remove').disabled = true;
-				$('remove').setAttribute('disabled','true');
-				$('move').disabled = true;
-				$('move').setAttribute('disabled','true');
-				setTimeout( function() { $('patron_list').focus(); }, 0 );
-		}
-
-		function refresh() {
-			retrieve_group_members();
-		}
-
-		function retrieve_group_members() {
-			try {
-				JSAN.use('util.functional'); JSAN.use('patron.util');
-				g.group_members = [];
-				var p = patron.util.retrieve_au_via_id(ses(),g.patron_id);
-				if ((p == null) || (typeof p.ilsevent != 'undefined') ) throw(p);
-				var robj = g.network.simple_request(
-					'FM_AU_LIST_RETRIEVE_VIA_GROUP.authoritative',
-					[ ses(), p.usrgroup() ]
-				);
-				if ((robj == null) || (typeof robj.ilsevent != 'undefined') ) throw(robj);
-				var ids = util.functional.filter_list( robj, function(o) { return o != g.patron_id; });
-
-				g.list.clear();
-
-				var funcs = [];
-
-					function gen_func(r) {
-						return function() {
-							g.list.append( { 'retrieve_id' : r, 'row' : {} } );
-						}
-					}
-
-				funcs.push( gen_func(g.patron_id) );
-				for (var i = 0; i < ids.length; i++) {
-					funcs.push( gen_func(ids[i]) );
-				}
-				JSAN.use('util.exec'); var exec = new util.exec(4);
-				exec.chain( funcs );
-
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_group.retrieve_group_members.failure'),E);
-			}
-		}
-
-		function retrieve_patron() {
-			try {
-				if (! g.sel_list ) return;
-				if (typeof window.xulG == 'object' && typeof window.xulG.new_patron_tab == 'function') {
-					for (var i = 0; i < g.sel_list.length; i++) {	
-						try {
-							window.xulG.new_patron_tab(
-								{ 'tab_name' : $("patronStrings").getString('staff.patron.info_group.retrieve_patron.tab_name') }, 
-								{ 
-									'id' : g.sel_list[i],
-									'url_prefix' : xulG.url_prefix,
-									'new_tab' : xulG.new_tab,
+        $('clone').disabled = false;
+        $('clone').setAttribute('disabled','false');
+        $('remove').disabled = false;
+        $('remove').setAttribute('disabled','false');
+        $('move').disabled = false;
+        $('move').setAttribute('disabled','false');
+       } else {
+        $('retrieve_p').disabled = true;
+        $('retrieve_p').setAttribute('disabled','true');
+        $('merge_p').disabled = true;
+        $('merge_p').setAttribute('disabled','true');
+        $('clone').disabled = true;
+        $('clone').setAttribute('disabled','true');
+        $('remove').disabled = true;
+        $('remove').setAttribute('disabled','true');
+        $('move').disabled = true;
+        $('move').setAttribute('disabled','true');
+       }
+      }
+     }
+    );
+    $('retrieve_p').disabled = true;
+    $('retrieve_p').setAttribute('disabled','true');
+    $('merge_p').disabled = true;
+    $('merge_p').setAttribute('disabled','true');
+    $('clone').disabled = true;
+    $('clone').setAttribute('disabled','true');
+    $('remove').disabled = true;
+    $('remove').setAttribute('disabled','true');
+    $('move').disabled = true;
+    $('move').setAttribute('disabled','true');
+    setTimeout( function() { $('patron_list').focus(); }, 0 );
+  }
+
+  function refresh() {
+   retrieve_group_members();
+  }
+
+  function retrieve_group_members() {
+   try {
+    JSAN.use('util.functional'); JSAN.use('patron.util');
+    g.group_members = [];
+    var p = patron.util.retrieve_au_via_id(ses(),g.patron_id);
+    if ((p == null) || (typeof p.ilsevent != 'undefined') ) throw(p);
+    var robj = g.network.simple_request(
+     'FM_AU_LIST_RETRIEVE_VIA_GROUP.authoritative',
+     [ ses(), p.usrgroup() ]
+    );
+    if ((robj == null) || (typeof robj.ilsevent != 'undefined') ) throw(robj);
+    var ids = util.functional.filter_list( robj, function(o) { return o != g.patron_id; });
+
+    g.list.clear();
+
+    var funcs = [];
+
+     function gen_func(r) {
+      return function() {
+       g.list.append( { 'retrieve_id' : r, 'row' : {} } );
+      }
+     }
+
+    funcs.push( gen_func(g.patron_id) );
+    for (var i = 0; i < ids.length; i++) {
+     funcs.push( gen_func(ids[i]) );
+    }
+    JSAN.use('util.exec'); var exec = new util.exec(4);
+    exec.chain( funcs );
+
+   } catch(E) {
+    g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_group.retrieve_group_members.failure'),E);
+   }
+  }
+
+  function retrieve_patron() {
+   try {
+    if (! g.sel_list ) return;
+    if (typeof window.xulG == 'object' && typeof window.xulG.new_patron_tab == 'function') {
+     for (var i = 0; i < g.sel_list.length; i++) { 
+      try {
+       window.xulG.new_patron_tab(
+        { 'tab_name' : $("patronStrings").getString('staff.patron.info_group.retrieve_patron.tab_name') }, 
+        { 
+         'id' : g.sel_list[i],
+         'url_prefix' : xulG.url_prefix,
+         'new_tab' : xulG.new_tab,
                                     'set_tab' : xulG.set_tab
-								}
-							);
-						} catch(E) {
-							g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_group.retrieve_patron.failed_retrieving_patron'),E);
-						}
-					}
-				}
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_group.retrieve_patron.failed_retrieving_patrons'),E);
-			}
-		}
+        }
+       );
+      } catch(E) {
+       g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_group.retrieve_patron.failed_retrieving_patron'),E);
+      }
+     }
+    }
+   } catch(E) {
+    g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_group.retrieve_patron.failed_retrieving_patrons'),E);
+   }
+  }
 
         function merge_patrons() {
-			try {
-				if (! g.sel_list ) return;
+   try {
+    if (! g.sel_list ) return;
                 JSAN.use('patron.util'); 
                 var result = patron.util.merge(g.sel_list);
                 if (result) {
@@ -224,264 +224,264 @@
                         refresh();
                     }
                 }
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_group.merge_patrons.failed_merging_patrons'),E);
-			}
+   } catch(E) {
+    g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_group.merge_patrons.failed_merging_patrons'),E);
+   }
         }
 
-		function clone_patron() {
-			if (! g.sel_list ) return;
-			try {
-				for (var i = 0; i < g.sel_list.length; i++) {	
-					var loc = xulG.url_prefix( urls.XUL_REMOTE_BROWSER ); 
-						//+ '?url=' + window.escape( urls.XUL_PATRON_EDIT + '?ses=' 
-						//+ window.escape( ses() ) + '&clone=' + g.sel_list[i] );
-					if (typeof window.xulG == 'object' && typeof window.xulG.new_tab == 'function') xulG.new_tab(
-						loc, 
-						{}, 
-						{ 
-							'url' : urls.XUL_PATRON_EDIT, // + '?ses=' + window.escape(ses()) + '&clone=' + g.sel_list[i],
-							'show_print_button' : true , 
-							'tab_name' : $("patronStrings").getString('staff.patron.info_group.clone_patron.register_clone.tab_name'),
-							'passthru_content_params' : {
-								'ses' : ses(),
-								'clone' : g.sel_list[i],
-								'spawn_search' : spawn_search,
-								'spawn_editor' : spawn_editor,
-								'on_save' : function() { refresh(); },
-								'url_prefix' : xulG.url_prefix,
-								'new_tab' : xulG.new_tab,
-							},
-							'url_prefix' : xulG.url_prefix,
-							'new_tab' : xulG.new_tab,
-						}
-					);
-				}
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_group.clone_patron.error_spawning_editors'),E);
-			}
-		}
-
-		function spawn_editor(p) {
-			var url = urls.XUL_PATRON_EDIT;
-			var passthru = {
-				'spawn_search' : spawn_search,
-				'spawn_editor' : spawn_editor,
-				'on_save' : function() { refresh(); },
-				'url_prefix' : xulG.url_prefix,
-				'new_tab' : xulG.new_tab,
-			};
-			for (var i in p) {
-				passthru[i] = p[i];
-			}
-			var loc = xulG.url_prefix( urls.XUL_REMOTE_BROWSER ); // + '?url=' + window.escape( url );
-			if (typeof window.xulG == 'object' && typeof window.xulG.new_tab == 'function') xulG.new_tab(
-				loc, 
-				{}, 
-				{ 
-					'url' : url,
-					'show_print_button' : true , 
-					'tab_name' : $("patronStrings").getString('staff.patron.info_group.spwan_editor.editing_patron'),
-					'passthru_content_params' : passthru,
-					'url_prefix' : xulG.url_prefix,
-					'new_tab' : xulG.new_tab,
-				}
-			);
-
-		}
-
-		function spawn_search(s) {
-			try {
-				g.error.sdump('D_TRACE', 'Editor would like to search for: ' + js2JSON(s) ); 
-				if (typeof window.xulG == 'object' && typeof window.xulG.new_patron_tab == 'function') 
-					xulG.new_patron_tab( {}, {'doit':1,'query':s} );
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_group.spwan_search'),E);
-			}
-		}
-
-		function remove_patron() {
-			if (! g.sel_list ) return;
-			var msg = '';
-			for (var i = 0 ; i < g.sel_list.length; i++)
-				if (g.sel_list[i] == g.patron_id)
-					msg = $("patronStrings").getString('staff.patron.info_group.remove_patron.warning_message');
-					
-			var c = window.confirm($("patronStrings").getFormattedString('staff.patron.info_group.remove_patron.warning_message_confirm', [msg]));
-			if (c) {
-				for (var i = 0; i < g.sel_list.length; i++) {	
-					var robj = g.network.simple_request('FM_AU_NEW_USERGROUP', [ ses(), g.sel_list[i], get_db_true() ]);
-					if (typeof robj.ilsevent != 'undefined') {
-						g.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.info_group.remove_patron.error_removing_patron', [g.sel_list[i]]), robj);
-					}
-				}
-				alert($("patronStrings").getString('staff.patron.info_group.remove_patron.patrons_removed_from_group')); 
-				/* FIXME - xulrunner bug if this alert comes after refresh? */
-				/* that's okay, because now that we're on a distributed database, we want human delay to mitigate race conditions */
-				refresh();
-			} else {
-				alert($("patronStrings").getString('staff.patron.info_group.remove_patron.patrons_not_removed_from_group'));
-			}
-		}
-
-		function link_patron(direction) {
-			try {
-				if (! g.sel_list ) { g.sel_list = []; g.sel_list[0] = g.patron_id; }
-				if (direction == null) throw($("patronStrings").getString('staff.patron.info_group.link_patron.null_not_allowed'));
-				var first_msg; var second_msg;
-				switch(direction) {
-					case true:
-						first_msg = "-->";
-						break;
-					case false:
-						first_msg = "<--";
-						break;
-					default:
-						throw($("patronStrings").getString('staff.patron.info_group.link_patron.invalid_parameter'));
-						break;
-				}
-				var barcode = window.prompt($("patronStrings").getString('staff.patron.info_group.link_patron.scan_patron_barcode'),'',first_msg);
-				if (!barcode) return;
-				JSAN.use('patron.util');
-				var patron_b = patron.util.retrieve_fleshed_au_via_barcode(ses(),barcode);
-				if (typeof patron_b.ilsevent != 'undefined') throw(patron_b);
-
-				if (g.sel_list.length == 0) g.sel_list[0] = g.patron_id;
-				for (var i = 0; i < g.sel_list.length; i++) {	
-
-					var patron_a = patron.util.retrieve_fleshed_au_via_id(ses(),g.sel_list[i]);
-					if (typeof patron_a.ilsevent != 'undefined') throw(patron_a);
-					switch(direction) {
-						case true:
-							second_msg = $("patronStrings").getFormattedString('staff.patron.info_group.link_patron.move_patron_to_new_usergroup',[patron_a.card().barcode(), patron_b.card().barcode()]);
-							break;
-						case false:
-							second_msg = $("patronStrings").getFormattedString('staff.patron.info_group.link_patron.move_patron_to_new_usergroup',[patron_b.card().barcode(), patron_a.card().barcode()]);
-							break;
-					}
-
-					netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
-					var top_xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: auto"><description>' + second_msg + '</description>';
-					top_xml += '<hbox><spacer flex="1"/><button label="'+$("patronStrings").getString('staff.patron.info_group.link_patron.move.label')+'"';
-					top_xml += ' accesskey="'+$("patronStrings").getString('staff.patron.info_group.link_patron.move.accesskey')+'" name="fancy_submit"/>';
-					top_xml += '<button label="'+$("patronStrings").getString('staff.patron.info_group.link_patron.done.label')+'"';
-					top_xml += ' accesskey="'+$("patronStrings").getString('staff.patron.info_group.link_patron.done.accesskey')+'" name="fancy_cancel"/></hbox></vbox>';
-					var xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: vertical"><hbox flex="1">';
-					/************/
-					xml += '<vbox flex="1">';
-					xml += '<hbox><spacer flex="1"/>';
-					if (direction) {
-						xml += '<image src="/xul/server/skin/media/images/patron_right_arrow.png"/>';
-					} else {
-						xml += '<image src="/xul/server/skin/media/images/patron_left_arrow.png"/>';
-					}
-					xml += '</hbox>';
-					xml += '<iframe style="min-height: 100px" flex="1" src="' + xulG.url_prefix( urls.XUL_PATRON_SUMMARY );
-					xml += '?show_name=1&amp;id=' + g.sel_list[i] + '"/>';
-					xml += '</vbox>';
-					xml += '<vbox flex="1">';
-					xml += '<hbox>';
-					if (direction) {
-						xml += '<image src="/xul/server/skin/media/images/patron_right_arrow.png"/>';
-					} else {
-						xml += '<image src="/xul/server/skin/media/images/patron_left_arrow.png"/>';
-					}
-					xml += '<spacer flex="1"/></hbox>';
-					xml += '<iframe style="min-height: 100px" flex="1" src="' + xulG.url_prefix( urls.XUL_PATRON_SUMMARY );
-					xml += '?show_name=1&amp;id=' + patron_b.id() + '"/>';
-					xml += '</vbox>';
-					/************/
-					xml += '</hbox></vbox>';
-					
-					var bot_xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: auto"><hbox>';
-					bot_xml += '</hbox></vbox>';
-		
-					//g.data.temp_top = top_xml; g.data.stash('temp_top');
-					//g.data.temp_mid = xml; g.data.stash('temp_mid');
-					//g.data.temp_bot = bot_xml; g.data.stash('temp_bot');
-					JSAN.use('util.window'); var win = new util.window();
-					var fancy_prompt_data = win.open(
-						urls.XUL_FANCY_PROMPT,
-						//+ '?xml_in_stash=temp_mid'
-						//+ '&top_xml_in_stash=temp_top'
-						//+ '&bottom_xml_in_stash=temp_bot'
-						//+ '&title=' + window.escape('Move Patron into a Usergroup'),
-						'fancy_prompt', 'chrome,resizable,modal,width=700,height=500',
-						{ 'xml' : xml, 'top_xml' : top_xml, 'bottom_xml' : bot_xml, 'title' : $("patronStrings").getString('staff.patron.info_group.link_patron.move_patron_to_usergroup')}
-					);
-					if (fancy_prompt_data.fancy_status == 'incomplete') { continue; }
-					else {
-						var patron_c;
-						switch(direction) {
-							case true:
-								patron_a.usrgroup( patron_b.usrgroup() );
-								patron_a.ischanged( '1' );
-								patron_c = patron_a;
-							break;
-							case false:
-								patron_b.usrgroup( patron_a.usrgroup() );
-								patron_b.ischanged( '1' );
-								patron_c = patron_b;
-							break;
-						}
-						var robj = g.network.simple_request('FM_AU_UPDATE',[ ses(), patron_c ]);
-						if (typeof robj.ilsevent != 'undefined') g.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.info_group.link_patron.error_linking_patron', [g.sel_list[i]]), robj);
-					}
-				}
-				alert($("patronStrings").getString('staff.patron.info_group.link_patron.usergroups_updated'));
-				refresh();
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_group.link_patron.error_linking_patrons'),E);
-				refresh();
-			}
-		}
-
-	]]>
-	</script>
-	
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
-
-	<commandset id="info_group_cmds">
-		<command id="clone" accesskey="&staff.patron.info_group.clone.accesskey;" label="&staff.patron.info_group.clone.label;" oncommand="try{clone_patron();}catch(E){alert('FIXME:'+E);}"/>
-		<command id="remove" accesskey="&staff.patron.info_group.remove.accesskey;" label="&staff.patron.info_group.remove.label;" oncommand="try{remove_patron();}catch(E){alert('FIXME:'+E);}"/>
-		<command id="move" accesskey="&staff.patron.info_group.move.accesskey;" label="&staff.patron.info_group.move.label;" oncommand="try{link_patron(true);}catch(E){alert('FIXME:'+E);}"/>	
-		<command id="add" accesskey="&staff.patron.info_group.add.accesskey;" label="&staff.patron.info_group.add.label;" oncommand="try{link_patron(false);}catch(E){alert('FIXME:'+E);}"/>	
-		<command id="retrieve_p" label="&staff.patron.info_group.retrieve_p.label;" accesskey="&staff.patron.info_group.retrieve_p.accesskey;" oncommand="try{retrieve_patron();}catch(E){alert(E);}"/>
-		<command id="merge_p" label="&staff.patron.info_group.merge_patrons.label;" accesskey="&staff.patron.info_group.merge_patrons.accesskey;" oncommand="try{merge_patrons();}catch(E){alert(E);}"/>
-	</commandset>
-
-	<popupset id="info_group_popupset">
-		<popup id="info_group_actions" position="at_pointer"> 
-			<menuitem command="clone" />
-			<menuitem command="remove" />
-			<menuitem command="move" />
-			<menuitem command="add" />
-			<menuitem command="retrieve_p" />
-			<menuitem command="merge_p" />
-		</popup>
-	</popupset>
-
-	<vbox flex="1" class="my_overflow" id="group_panel">
-		<groupbox flex="1">
-			<caption label="&staff.patron.info_group.group_member.label;"/>
-			<hbox>
-				<spacer flex="1"/>
-				<menubar id="ml">
-					<menu label="&staff.patron.info_group.choose_an_action.label;" accesskey="&staff.patron.info_group.choose_an_action.accesskey;" value="0">
-						<menupopup>
-							<menuitem command="clone" />
-							<menuitem command="remove" />
-							<menuitem command="move" />
-							<menuitem command="add" />
-							<menuitem command="retrieve_p" />
-							<menuitem command="merge_p" />
-						</menupopup>
-					</menu>
-				</menubar>
-			</hbox>
-			<tree id="patron_list" flex="1" enableColumnDrag="true" seltype="multiple" context="info_group_actions"/>
-		</groupbox>
-	</vbox>
+  function clone_patron() {
+   if (! g.sel_list ) return;
+   try {
+    for (var i = 0; i < g.sel_list.length; i++) { 
+     var loc = xulG.url_prefix( urls.XUL_REMOTE_BROWSER ); 
+      //+ '?url=' + window.escape( urls.XUL_PATRON_EDIT + '?ses=' 
+      //+ window.escape( ses() ) + '&clone=' + g.sel_list[i] );
+     if (typeof window.xulG == 'object' && typeof window.xulG.new_tab == 'function') xulG.new_tab(
+      loc, 
+      {}, 
+      { 
+       'url' : urls.XUL_PATRON_EDIT, // + '?ses=' + window.escape(ses()) + '&clone=' + g.sel_list[i],
+       'show_print_button' : true , 
+       'tab_name' : $("patronStrings").getString('staff.patron.info_group.clone_patron.register_clone.tab_name'),
+       'passthru_content_params' : {
+        'ses' : ses(),
+        'clone' : g.sel_list[i],
+        'spawn_search' : spawn_search,
+        'spawn_editor' : spawn_editor,
+        'on_save' : function() { refresh(); },
+        'url_prefix' : xulG.url_prefix,
+        'new_tab' : xulG.new_tab,
+       },
+       'url_prefix' : xulG.url_prefix,
+       'new_tab' : xulG.new_tab,
+      }
+     );
+    }
+   } catch(E) {
+    g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_group.clone_patron.error_spawning_editors'),E);
+   }
+  }
+
+  function spawn_editor(p) {
+   var url = urls.XUL_PATRON_EDIT;
+   var passthru = {
+    'spawn_search' : spawn_search,
+    'spawn_editor' : spawn_editor,
+    'on_save' : function() { refresh(); },
+    'url_prefix' : xulG.url_prefix,
+    'new_tab' : xulG.new_tab,
+   };
+   for (var i in p) {
+    passthru[i] = p[i];
+   }
+   var loc = xulG.url_prefix( urls.XUL_REMOTE_BROWSER ); // + '?url=' + window.escape( url );
+   if (typeof window.xulG == 'object' && typeof window.xulG.new_tab == 'function') xulG.new_tab(
+    loc, 
+    {}, 
+    { 
+     'url' : url,
+     'show_print_button' : true , 
+     'tab_name' : $("patronStrings").getString('staff.patron.info_group.spwan_editor.editing_patron'),
+     'passthru_content_params' : passthru,
+     'url_prefix' : xulG.url_prefix,
+     'new_tab' : xulG.new_tab,
+    }
+   );
+
+  }
+
+  function spawn_search(s) {
+   try {
+    g.error.sdump('D_TRACE', 'Editor would like to search for: ' + js2JSON(s) ); 
+    if (typeof window.xulG == 'object' && typeof window.xulG.new_patron_tab == 'function') 
+     xulG.new_patron_tab( {}, {'doit':1,'query':s} );
+   } catch(E) {
+    g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_group.spwan_search'),E);
+   }
+  }
+
+  function remove_patron() {
+   if (! g.sel_list ) return;
+   var msg = '';
+   for (var i = 0 ; i < g.sel_list.length; i++)
+    if (g.sel_list[i] == g.patron_id)
+     msg = $("patronStrings").getString('staff.patron.info_group.remove_patron.warning_message');
+     
+   var c = window.confirm($("patronStrings").getFormattedString('staff.patron.info_group.remove_patron.warning_message_confirm', [msg]));
+   if (c) {
+    for (var i = 0; i < g.sel_list.length; i++) { 
+     var robj = g.network.simple_request('FM_AU_NEW_USERGROUP', [ ses(), g.sel_list[i], get_db_true() ]);
+     if (typeof robj.ilsevent != 'undefined') {
+      g.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.info_group.remove_patron.error_removing_patron', [g.sel_list[i]]), robj);
+     }
+    }
+    alert($("patronStrings").getString('staff.patron.info_group.remove_patron.patrons_removed_from_group')); 
+    /* FIXME - xulrunner bug if this alert comes after refresh? */
+    /* that's okay, because now that we're on a distributed database, we want human delay to mitigate race conditions */
+    refresh();
+   } else {
+    alert($("patronStrings").getString('staff.patron.info_group.remove_patron.patrons_not_removed_from_group'));
+   }
+  }
+
+  function link_patron(direction) {
+   try {
+    if (! g.sel_list ) { g.sel_list = []; g.sel_list[0] = g.patron_id; }
+    if (direction == null) throw($("patronStrings").getString('staff.patron.info_group.link_patron.null_not_allowed'));
+    var first_msg; var second_msg;
+    switch(direction) {
+     case true:
+      first_msg = "-->";
+      break;
+     case false:
+      first_msg = "<--";
+      break;
+     default:
+      throw($("patronStrings").getString('staff.patron.info_group.link_patron.invalid_parameter'));
+      break;
+    }
+    var barcode = window.prompt($("patronStrings").getString('staff.patron.info_group.link_patron.scan_patron_barcode'),'',first_msg);
+    if (!barcode) return;
+    JSAN.use('patron.util');
+    var patron_b = patron.util.retrieve_fleshed_au_via_barcode(ses(),barcode);
+    if (typeof patron_b.ilsevent != 'undefined') throw(patron_b);
+
+    if (g.sel_list.length == 0) g.sel_list[0] = g.patron_id;
+    for (var i = 0; i < g.sel_list.length; i++) { 
+
+     var patron_a = patron.util.retrieve_fleshed_au_via_id(ses(),g.sel_list[i]);
+     if (typeof patron_a.ilsevent != 'undefined') throw(patron_a);
+     switch(direction) {
+      case true:
+       second_msg = $("patronStrings").getFormattedString('staff.patron.info_group.link_patron.move_patron_to_new_usergroup',[patron_a.card().barcode(), patron_b.card().barcode()]);
+       break;
+      case false:
+       second_msg = $("patronStrings").getFormattedString('staff.patron.info_group.link_patron.move_patron_to_new_usergroup',[patron_b.card().barcode(), patron_a.card().barcode()]);
+       break;
+     }
+
+     netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserWrite');
+     var top_xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: auto"><description>' + second_msg + '</description>';
+     top_xml += '<hbox><spacer flex="1"/><button label="'+$("patronStrings").getString('staff.patron.info_group.link_patron.move.label')+'"';
+     top_xml += ' accesskey="'+$("patronStrings").getString('staff.patron.info_group.link_patron.move.accesskey')+'" name="fancy_submit"/>';
+     top_xml += '<button label="'+$("patronStrings").getString('staff.patron.info_group.link_patron.done.label')+'"';
+     top_xml += ' accesskey="'+$("patronStrings").getString('staff.patron.info_group.link_patron.done.accesskey')+'" name="fancy_cancel"/></hbox></vbox>';
+     var xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: vertical"><hbox flex="1">';
+     /************/
+     xml += '<vbox flex="1">';
+     xml += '<hbox><spacer flex="1"/>';
+     if (direction) {
+      xml += '<image src="/xul/server/skin/media/images/patron_right_arrow.png"/>';
+     } else {
+      xml += '<image src="/xul/server/skin/media/images/patron_left_arrow.png"/>';
+     }
+     xml += '</hbox>';
+     xml += '<iframe style="min-height: 100px" flex="1" src="' + xulG.url_prefix( urls.XUL_PATRON_SUMMARY );
+     xml += '?show_name=1&amp;id=' + g.sel_list[i] + '"/>';
+     xml += '</vbox>';
+     xml += '<vbox flex="1">';
+     xml += '<hbox>';
+     if (direction) {
+      xml += '<image src="/xul/server/skin/media/images/patron_right_arrow.png"/>';
+     } else {
+      xml += '<image src="/xul/server/skin/media/images/patron_left_arrow.png"/>';
+     }
+     xml += '<spacer flex="1"/></hbox>';
+     xml += '<iframe style="min-height: 100px" flex="1" src="' + xulG.url_prefix( urls.XUL_PATRON_SUMMARY );
+     xml += '?show_name=1&amp;id=' + patron_b.id() + '"/>';
+     xml += '</vbox>';
+     /************/
+     xml += '</hbox></vbox>';
+     
+     var bot_xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: auto"><hbox>';
+     bot_xml += '</hbox></vbox>';
+  
+     //g.data.temp_top = top_xml; g.data.stash('temp_top');
+     //g.data.temp_mid = xml; g.data.stash('temp_mid');
+     //g.data.temp_bot = bot_xml; g.data.stash('temp_bot');
+     JSAN.use('util.window'); var win = new util.window();
+     var fancy_prompt_data = win.open(
+      urls.XUL_FANCY_PROMPT,
+      //+ '?xml_in_stash=temp_mid'
+      //+ '&top_xml_in_stash=temp_top'
+      //+ '&bottom_xml_in_stash=temp_bot'
+      //+ '&title=' + window.escape('Move Patron into a Usergroup'),
+      'fancy_prompt', 'chrome,resizable,modal,width=700,height=500',
+      { 'xml' : xml, 'top_xml' : top_xml, 'bottom_xml' : bot_xml, 'title' : $("patronStrings").getString('staff.patron.info_group.link_patron.move_patron_to_usergroup')}
+     );
+     if (fancy_prompt_data.fancy_status == 'incomplete') { continue; }
+     else {
+      var patron_c;
+      switch(direction) {
+       case true:
+        patron_a.usrgroup( patron_b.usrgroup() );
+        patron_a.ischanged( '1' );
+        patron_c = patron_a;
+       break;
+       case false:
+        patron_b.usrgroup( patron_a.usrgroup() );
+        patron_b.ischanged( '1' );
+        patron_c = patron_b;
+       break;
+      }
+      var robj = g.network.simple_request('FM_AU_UPDATE',[ ses(), patron_c ]);
+      if (typeof robj.ilsevent != 'undefined') g.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.info_group.link_patron.error_linking_patron', [g.sel_list[i]]), robj);
+     }
+    }
+    alert($("patronStrings").getString('staff.patron.info_group.link_patron.usergroups_updated'));
+    refresh();
+   } catch(E) {
+    g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_group.link_patron.error_linking_patrons'),E);
+    refresh();
+   }
+  }
+
+ ]]>
+ </script>
+ 
+ <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+
+ <commandset id="info_group_cmds">
+  <command id="clone" accesskey="&staff.patron.info_group.clone.accesskey;" label="&staff.patron.info_group.clone.label;" oncommand="try{clone_patron();}catch(E){alert('FIXME:'+E);}"/>
+  <command id="remove" accesskey="&staff.patron.info_group.remove.accesskey;" label="&staff.patron.info_group.remove.label;" oncommand="try{remove_patron();}catch(E){alert('FIXME:'+E);}"/>
+  <command id="move" accesskey="&staff.patron.info_group.move.accesskey;" label="&staff.patron.info_group.move.label;" oncommand="try{link_patron(true);}catch(E){alert('FIXME:'+E);}"/> 
+  <command id="add" accesskey="&staff.patron.info_group.add.accesskey;" label="&staff.patron.info_group.add.label;" oncommand="try{link_patron(false);}catch(E){alert('FIXME:'+E);}"/> 
+  <command id="retrieve_p" label="&staff.patron.info_group.retrieve_p.label;" accesskey="&staff.patron.info_group.retrieve_p.accesskey;" oncommand="try{retrieve_patron();}catch(E){alert(E);}"/>
+  <command id="merge_p" label="&staff.patron.info_group.merge_patrons.label;" accesskey="&staff.patron.info_group.merge_patrons.accesskey;" oncommand="try{merge_patrons();}catch(E){alert(E);}"/>
+ </commandset>
+
+ <popupset id="info_group_popupset">
+  <popup id="info_group_actions" position="at_pointer"> 
+   <menuitem command="clone" />
+   <menuitem command="remove" />
+   <menuitem command="move" />
+   <menuitem command="add" />
+   <menuitem command="retrieve_p" />
+   <menuitem command="merge_p" />
+  </popup>
+ </popupset>
+
+ <vbox flex="1" class="my_overflow" id="group_panel">
+  <groupbox flex="1">
+   <caption label="&staff.patron.info_group.group_member.label;"/>
+   <hbox>
+    <spacer flex="1"/>
+    <menubar id="ml">
+     <menu label="&staff.patron.info_group.choose_an_action.label;" accesskey="&staff.patron.info_group.choose_an_action.accesskey;" value="0">
+      <menupopup>
+       <menuitem command="clone" />
+       <menuitem command="remove" />
+       <menuitem command="move" />
+       <menuitem command="add" />
+       <menuitem command="retrieve_p" />
+       <menuitem command="merge_p" />
+      </menupopup>
+     </menu>
+    </menubar>
+   </hbox>
+   <tree id="patron_list" flex="1" enableColumnDrag="true" seltype="multiple" context="info_group_actions"/>
+  </groupbox>
+ </vbox>
 
 
 </window>
diff --git a/Open-ILS/xul/staff_client/server/patron/info_notes.xul b/Open-ILS/xul/staff_client/server/patron/info_notes.xul
index ad56fc1a55..fd3d2b4b62 100644
--- a/Open-ILS/xul/staff_client/server/patron/info_notes.xul
+++ b/Open-ILS/xul/staff_client/server/patron/info_notes.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,240 +20,240 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="patron_info_win" width="700" height="550"
-	onload="try{ my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try{ my_init(); font_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client';
-		var IAMXUL = true;
-		var g = {};
-	</script>
-	<scripts id="openils_util_scripts"/>
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
+ <script type="text/javascript">
+  var myPackageDir = 'open_ils_staff_client';
+  var IAMXUL = true;
+  var g = {};
+ </script>
+ <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
 
-		function $(id) { return document.getElementById(id); }
+  function $(id) { return document.getElementById(id); }
 
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
 
-				JSAN.use('util.error'); g.error = new util.error();
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('util.date'); JSAN.use('util.money'); JSAN.use('patron.util');
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+    JSAN.use('util.error'); g.error = new util.error();
+    JSAN.use('util.network'); g.network = new util.network();
+    JSAN.use('util.date'); JSAN.use('util.money'); JSAN.use('patron.util');
+    JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
 
-				g.error.sdump('D_TRACE','my_init() for patron_info.xul');
+    g.error.sdump('D_TRACE','my_init() for patron_info.xul');
 
-				g.patron_id = xul_param('patron_id');
+    g.patron_id = xul_param('patron_id');
 
-				g.new_note = false;
+    g.new_note = false;
 
-				refresh();
+    refresh();
 
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/info_notes.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
+   } catch(E) {
+    var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/info_notes.xul', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
 
-		function refresh() {
-			retrieve_notes(); render_notes();
-		}
+  function refresh() {
+   retrieve_notes(); render_notes();
+  }
 
-		function retrieve_notes() {
-			if (g.new_note) {
-				g.notes = g.network.simple_request('FM_AUN_RETRIEVE_ALL.authoritative',[ ses(), { 'patronid' : g.patron_id } ]).reverse();
-				g.new_note = false;
-			} else {
-				g.notes = g.network.simple_request('FM_AUN_RETRIEVE_ALL.authoritative',[ ses(), { 'patronid' : g.patron_id } ]).reverse();
-			}
-		}
+  function retrieve_notes() {
+   if (g.new_note) {
+    g.notes = g.network.simple_request('FM_AUN_RETRIEVE_ALL.authoritative',[ ses(), { 'patronid' : g.patron_id } ]).reverse();
+    g.new_note = false;
+   } else {
+    g.notes = g.network.simple_request('FM_AUN_RETRIEVE_ALL.authoritative',[ ses(), { 'patronid' : g.patron_id } ]).reverse();
+   }
+  }
 
-		function apply(node,field,value) {
-			util.widgets.apply(
-				node,'name',field,
-				function(n) {
-					switch(n.nodeName) {
-						case 'description' : n.appendChild( document.createTextNode( value ) ); break;
-						case 'label' : n.value = value; break;
-						default : n.value = value; break;
-					}
-				}
-			);
-		}
+  function apply(node,field,value) {
+   util.widgets.apply(
+    node,'name',field,
+    function(n) {
+     switch(n.nodeName) {
+      case 'description' : n.appendChild( document.createTextNode( value ) ); break;
+      case 'label' : n.value = value; break;
+      default : n.value = value; break;
+     }
+    }
+   );
+  }
 
-		function render_notes() {
-			JSAN.use('util.widgets'); util.widgets.remove_children('notes_panel');
-			var np = $('notes_panel');
-			var hbox = document.createElement('hbox'); np.appendChild(hbox);
-			var btn = document.createElement('button'); hbox.appendChild(btn);
-			btn.setAttribute('label', $("patronStrings").getString('staff.patron.info_notes.render_notes.add_new_note.label'));
-			btn.setAttribute('accesskey', $("patronStrings").getString('staff.patron.info_notes.render_notes.add_new_note.accesskey'));
-			btn.setAttribute('oncommand','new_note()');
+  function render_notes() {
+   JSAN.use('util.widgets'); util.widgets.remove_children('notes_panel');
+   var np = $('notes_panel');
+   var hbox = document.createElement('hbox'); np.appendChild(hbox);
+   var btn = document.createElement('button'); hbox.appendChild(btn);
+   btn.setAttribute('label', $("patronStrings").getString('staff.patron.info_notes.render_notes.add_new_note.label'));
+   btn.setAttribute('accesskey', $("patronStrings").getString('staff.patron.info_notes.render_notes.add_new_note.accesskey'));
+   btn.setAttribute('oncommand','new_note()');
 
-			for (var i = 0; i < g.notes.length; i++) {
+   for (var i = 0; i < g.notes.length; i++) {
 
-				/* template */
-				var node = $('note_template').cloneNode(true); np.appendChild(node); node.hidden = false;
-				apply(node,'create_date',g.notes[i].create_date().toString().substr(0,10));
-				util.widgets.apply(node,'name','create_date',
-					function(n){n.setAttribute("tooltiptext", $("patronStrings").getFormattedString('staff.patron.info_notes.render_notes.tooltiptext', [g.notes[i].id(), g.notes[i].creator()]));}
-				);
-				apply(node,'title',g.notes[i].title());
-				if (get_bool(g.notes[i].pub())) {
-					apply(node, 'pub', $("patronStrings").getString('staff.patron.info_notes.render_notes.pub.patron_visible'));
-				} else {
-					apply(node, 'pub', $("patronStrings").getString('staff.patron.info_notes.render_notes.pub.staff_only') );
-				}
-				apply(node,'value',g.notes[i].value());
-				apply(node,'id',g.notes[i].id());
-				apply(node,'creator',g.notes[i].creator());
+    /* template */
+    var node = $('note_template').cloneNode(true); np.appendChild(node); node.hidden = false;
+    apply(node,'create_date',g.notes[i].create_date().toString().substr(0,10));
+    util.widgets.apply(node,'name','create_date',
+     function(n){n.setAttribute("tooltiptext", $("patronStrings").getFormattedString('staff.patron.info_notes.render_notes.tooltiptext', [g.notes[i].id(), g.notes[i].creator()]));}
+    );
+    apply(node,'title',g.notes[i].title());
+    if (get_bool(g.notes[i].pub())) {
+     apply(node, 'pub', $("patronStrings").getString('staff.patron.info_notes.render_notes.pub.patron_visible'));
+    } else {
+     apply(node, 'pub', $("patronStrings").getString('staff.patron.info_notes.render_notes.pub.staff_only') );
+    }
+    apply(node,'value',g.notes[i].value());
+    apply(node,'id',g.notes[i].id());
+    apply(node,'creator',g.notes[i].creator());
 
-				/* button bar */
-				var hb = document.createElement('hbox');
-				np.appendChild(hb);
-				var btn1 = document.createElement('button');
-				hb.appendChild(btn1);
-				btn1.setAttribute('label',$("patronStrings").getString('staff.patron.info_notes.render_notes.btn1.delete_note.label'));
-				btn1.setAttribute('image',"/xul/server/skin/media/images/up_arrow.gif");
+    /* button bar */
+    var hb = document.createElement('hbox');
+    np.appendChild(hb);
+    var btn1 = document.createElement('button');
+    hb.appendChild(btn1);
+    btn1.setAttribute('label',$("patronStrings").getString('staff.patron.info_notes.render_notes.btn1.delete_note.label'));
+    btn1.setAttribute('image',"/xul/server/skin/media/images/up_arrow.gif");
 
-				btn1.addEventListener(
-					'command',
-					function(id){ 
-						return function() { 
-							var r = g.error.yns_alert(
-								$("patronStrings").getFormattedString('staff.patron.info_notes.render_notes.delete_note_message',[g.notes[id].title(), g.notes[id].create_date().toString().substr(0,10)]),
-								$("patronStrings").getString('staff.patron.info_notes.render_notes.delete_note_title'),
-								$("commonStrings").getString('common.yes'),
-								$("commonStrings").getString('common.no'),
-								null,
-								$("commonStrings").getString('common.check_to_confirm')
-							); 
-							if (r == 0) {
-								g.network.simple_request('FM_AUN_DELETE',[ses(),g.notes[id].id()]);
-								setTimeout(function(){ 
-									g.new_note = true;
-									alert($("patronStrings").getString('staff.patron.info_notes.render_notes.note_deleted'));
-									refresh();
-								},0);
-							}
-						}
-					 }
-					(i), false
-					);
-					var btn2 = document.createElement('button');
-					hb.appendChild(btn2);
-					btn2.setAttribute('label',$("patronStrings").getString('staff.patron.info_notes.render_notes.btn2.print_note.label'));
-					btn2.setAttribute('image',"/xul/server/skin/media/images/up_arrow.gif");
+    btn1.addEventListener(
+     'command',
+     function(id){ 
+      return function() { 
+       var r = g.error.yns_alert(
+        $("patronStrings").getFormattedString('staff.patron.info_notes.render_notes.delete_note_message',[g.notes[id].title(), g.notes[id].create_date().toString().substr(0,10)]),
+        $("patronStrings").getString('staff.patron.info_notes.render_notes.delete_note_title'),
+        $("commonStrings").getString('common.yes'),
+        $("commonStrings").getString('common.no'),
+        null,
+        $("commonStrings").getString('common.check_to_confirm')
+       ); 
+       if (r == 0) {
+        g.network.simple_request('FM_AUN_DELETE',[ses(),g.notes[id].id()]);
+        setTimeout(function(){ 
+         g.new_note = true;
+         alert($("patronStrings").getString('staff.patron.info_notes.render_notes.note_deleted'));
+         refresh();
+        },0);
+       }
+      }
+      }
+     (i), false
+     );
+     var btn2 = document.createElement('button');
+     hb.appendChild(btn2);
+     btn2.setAttribute('label',$("patronStrings").getString('staff.patron.info_notes.render_notes.btn2.print_note.label'));
+     btn2.setAttribute('image',"/xul/server/skin/media/images/up_arrow.gif");
 
-					btn2.addEventListener(
-						'command',
-						function(id){ return function() { 
-							try {
-								JSAN.use('patron.util'); 
-								var patron_obj = patron.util.retrieve_fleshed_au_via_id(ses(),g.patron_id);
-								var staff_obj = patron.util.retrieve_name_via_id( ses(), g.notes[id].creator() );
-								JSAN.use('util.print');
-								var p = new util.print();
-								p.simple(
-									'<hr/>'
-									+ '<p>'+ $("patronStrings").getString('staff.patron.info_notes.render_notes.pertaining_to') + ' ' + 
-										( patron_obj.prefix() ? patron_obj.prefix() + ' ' : '') + 
-										patron_obj.family_name() + ', ' + 
-										patron_obj.first_given_name() + ' ' +
-										( patron_obj.second_given_name() ? patron_obj.second_given_name() + ' ' : '' ) +
-										( patron_obj.suffix() ? patron_obj.suffix() : '')
-										+ ' : ' 
-									+ patron_obj.card().barcode() + '</p>'
-									+ '<p><b>"' + g.notes[id].title() + '"</b>'
-									+ $("patronStrings").getFormattedString('staff.patron.info_notes.render_notes.created_on', [g.notes[id].create_date().toString().substr(0,10), staff_obj[0], g.data.hash.aou[ staff_obj[3] ].shortname()]) 
-									+ '</p><p>'
-									+ g.notes[id].value()
-									+ '</p><hr/>'
-								);
-							} catch(E) {
-								g.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.info_notes.render_notes.printing_note_num', [g.notes[id].id()]), E);
-							}
-						}
-					}(i), false
-				);
-			}
+     btn2.addEventListener(
+      'command',
+      function(id){ return function() { 
+       try {
+        JSAN.use('patron.util'); 
+        var patron_obj = patron.util.retrieve_fleshed_au_via_id(ses(),g.patron_id);
+        var staff_obj = patron.util.retrieve_name_via_id( ses(), g.notes[id].creator() );
+        JSAN.use('util.print');
+        var p = new util.print();
+        p.simple(
+         '<hr/>'
+         + '<p>'+ $("patronStrings").getString('staff.patron.info_notes.render_notes.pertaining_to') + ' ' + 
+          ( patron_obj.prefix() ? patron_obj.prefix() + ' ' : '') + 
+          patron_obj.family_name() + ', ' + 
+          patron_obj.first_given_name() + ' ' +
+          ( patron_obj.second_given_name() ? patron_obj.second_given_name() + ' ' : '' ) +
+          ( patron_obj.suffix() ? patron_obj.suffix() : '')
+          + ' : ' 
+         + patron_obj.card().barcode() + '</p>'
+         + '<p><b>"' + g.notes[id].title() + '"</b>'
+         + $("patronStrings").getFormattedString('staff.patron.info_notes.render_notes.created_on', [g.notes[id].create_date().toString().substr(0,10), staff_obj[0], g.data.hash.aou[ staff_obj[3] ].shortname()]) 
+         + '</p><p>'
+         + g.notes[id].value()
+         + '</p><hr/>'
+        );
+       } catch(E) {
+        g.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.info_notes.render_notes.printing_note_num', [g.notes[id].id()]), E);
+       }
+      }
+     }(i), false
+    );
+   }
 
-		}
-		
-		function new_note() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalBrowserWrite");
-				var xml = '<groupbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1">';
-				xml += '<caption label="'+$("patronStrings").getString('staff.patron.info_notes.new_note.label')+'"/><grid flex="1"><columns><column/><column flex="1"/></columns><rows><row>';
-				xml += '<label value="'+$("patronStrings").getString('staff.patron.info_notes.new_note.patron_visible.value')+'"/><checkbox id="pub" name="fancy_data"/></row>';
-				xml += '<row><label value="'+$("patronStrings").getString('staff.patron.info_notes.new_note.title.value')+'"/><textbox id="title" name="fancy_data" context="clipboard"/></row>';
-				xml += '<row><label value="'+$("patronStrings").getString('staff.patron.info_notes.new_note.note.value')+'"/><textbox multiline="true" id="note" name="fancy_data" context="clipboard"/></row>';
-				xml += '<row><spacer/><hbox><button label="'+$("patronStrings").getString('staff.patron.info_notes.new_note.cancel.label')+'" name="fancy_cancel"';
-				xml += ' accesskey="'+$("patronStrings").getString('staff.patron.info_notes.new_note.cancel.accesskey')+'"/>';
-				xml += '<button label="'+$("patronStrings").getString('staff.patron.info_notes.new_note.add.label')+'"';
-				xml += ' accesskey="'+$("patronStrings").getString('staff.patron.info_notes.new_note.add.accesskey')+'" name="fancy_submit"/></hbox></row></rows></grid></groupbox>';
-				//g.data.init({'via':'stash'});
-				//g.data.temp_note_xml = xml; g.data.stash('temp_note_xml');
-				JSAN.use('util.window'); var win = new util.window();
-				var fancy_prompt_data = win.open(
-					urls.XUL_FANCY_PROMPT,
-					//+ '?xml_in_stash=temp_note_xml'
-					//+ '&focus=' + window.escape('title')
-					//+ '&title=' + window.escape('Add Note'),
-					'fancy_prompt', 'chrome,resizable,modal,width=700,height=500',
-					{ 'xml' : xml, 'focus' : 'title', 'title' : $("patronStrings").getString('staff.patron.info_notes.new_note.add_note_title') }
-				);
-				if (fancy_prompt_data.fancy_status == 'complete') {
-					//alert(js2JSON(g.data.fancy_prompt_data));
-					var note = new aun();
-					note.isnew(1);
-					note.title( fancy_prompt_data.title );
-					note.value( fancy_prompt_data.note );
-					note.pub( get_bool( fancy_prompt_data.pub ) ? get_db_true() : get_db_false() );
-					note.usr( g.patron_id );
-					var r = g.network.simple_request('FM_AUN_CREATE',[ ses(), note ]);
-					if (typeof r.ilsevent != 'undefined') throw(r);
-					setTimeout(function(){
-						g.new_note = true;
-						alert($("patronStrings").getString('staff.patron.info_notes.new_note.add_note_title'));
-						refresh();
-					},0);
-				}
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_notes.new_note.note_not_created'),E);
-			}
-		}
+  }
+  
+  function new_note() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalBrowserWrite");
+    var xml = '<groupbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1">';
+    xml += '<caption label="'+$("patronStrings").getString('staff.patron.info_notes.new_note.label')+'"/><grid flex="1"><columns><column/><column flex="1"/></columns><rows><row>';
+    xml += '<label value="'+$("patronStrings").getString('staff.patron.info_notes.new_note.patron_visible.value')+'"/><checkbox id="pub" name="fancy_data"/></row>';
+    xml += '<row><label value="'+$("patronStrings").getString('staff.patron.info_notes.new_note.title.value')+'"/><textbox id="title" name="fancy_data" context="clipboard"/></row>';
+    xml += '<row><label value="'+$("patronStrings").getString('staff.patron.info_notes.new_note.note.value')+'"/><textbox multiline="true" id="note" name="fancy_data" context="clipboard"/></row>';
+    xml += '<row><spacer/><hbox><button label="'+$("patronStrings").getString('staff.patron.info_notes.new_note.cancel.label')+'" name="fancy_cancel"';
+    xml += ' accesskey="'+$("patronStrings").getString('staff.patron.info_notes.new_note.cancel.accesskey')+'"/>';
+    xml += '<button label="'+$("patronStrings").getString('staff.patron.info_notes.new_note.add.label')+'"';
+    xml += ' accesskey="'+$("patronStrings").getString('staff.patron.info_notes.new_note.add.accesskey')+'" name="fancy_submit"/></hbox></row></rows></grid></groupbox>';
+    //g.data.init({'via':'stash'});
+    //g.data.temp_note_xml = xml; g.data.stash('temp_note_xml');
+    JSAN.use('util.window'); var win = new util.window();
+    var fancy_prompt_data = win.open(
+     urls.XUL_FANCY_PROMPT,
+     //+ '?xml_in_stash=temp_note_xml'
+     //+ '&focus=' + window.escape('title')
+     //+ '&title=' + window.escape('Add Note'),
+     'fancy_prompt', 'chrome,resizable,modal,width=700,height=500',
+     { 'xml' : xml, 'focus' : 'title', 'title' : $("patronStrings").getString('staff.patron.info_notes.new_note.add_note_title') }
+    );
+    if (fancy_prompt_data.fancy_status == 'complete') {
+     //alert(js2JSON(g.data.fancy_prompt_data));
+     var note = new aun();
+     note.isnew(1);
+     note.title( fancy_prompt_data.title );
+     note.value( fancy_prompt_data.note );
+     note.pub( get_bool( fancy_prompt_data.pub ) ? get_db_true() : get_db_false() );
+     note.usr( g.patron_id );
+     var r = g.network.simple_request('FM_AUN_CREATE',[ ses(), note ]);
+     if (typeof r.ilsevent != 'undefined') throw(r);
+     setTimeout(function(){
+      g.new_note = true;
+      alert($("patronStrings").getString('staff.patron.info_notes.new_note.add_note_title'));
+      refresh();
+     },0);
+    }
+   } catch(E) {
+    g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_notes.new_note.note_not_created'),E);
+   }
+  }
 
-	]]>
-	</script>
-	
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+ ]]>
+ </script>
+ 
+ <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
-	<stack hidden="true" id="note_template" flex="1">
-		<groupbox flex="1" style="background-color: black;"/>
-		<groupbox flex="1" style="background-color: #FFDE00; -moz-border-radius-topright: 35px;" >
-			<hbox>
-				<description name="title" style="font-weight: bold"/>
-				<spacer flex="1"/>
-				<description name="create_date" style="font-weight: bold"/>
-				<description name="pub" style="font-weight: bold"/>
-			</hbox>
-			<description name="value"/>
-		</groupbox>
-	</stack>
+ <stack hidden="true" id="note_template" flex="1">
+  <groupbox flex="1" style="background-color: black;"/>
+  <groupbox flex="1" style="background-color: #FFDE00; -moz-border-radius-topright: 35px;" >
+   <hbox>
+    <description name="title" style="font-weight: bold"/>
+    <spacer flex="1"/>
+    <description name="create_date" style="font-weight: bold"/>
+    <description name="pub" style="font-weight: bold"/>
+   </hbox>
+   <description name="value"/>
+  </groupbox>
+ </stack>
 
-	<vbox flex="1" class="my_overflow" id="notes_panel">
-	</vbox>
+ <vbox flex="1" class="my_overflow" id="notes_panel">
+ </vbox>
 
 
 </window>
diff --git a/Open-ILS/xul/staff_client/server/patron/info_stat_cats.xul b/Open-ILS/xul/staff_client/server/patron/info_stat_cats.xul
index 0b6cbd0cd2..e009c28f07 100644
--- a/Open-ILS/xul/staff_client/server/patron/info_stat_cats.xul
+++ b/Open-ILS/xul/staff_client/server/patron/info_stat_cats.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,185 +20,185 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="patron_info_stat_cats_win" width="700" height="550"
-	onload="try{ my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try{ my_init(); font_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-
-		function $(id) { return document.getElementById(id); }
-
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-
-				JSAN.use('util.error'); g.error = new util.error();
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('util.date'); JSAN.use('util.money'); JSAN.use('patron.util'); JSAN.use('util.functional');
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-
-				g.error.sdump('D_TRACE','my_init() for patron_info_stat_cats.xul');
-
-				g.patron_id = xul_param('patron_id');
-
-				refresh();
-
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/info_stat_cats', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function refresh() {
-			retrieve_fleshed_patron(); render_stat_cats();
-		}
-
-		function retrieve_fleshed_patron() {
-			try {
-
-				g.patron = patron.util.retrieve_fleshed_au_via_id(ses(), g.patron_id);
-				if (g.patron.ilsevent) throw(g.patron);
-
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_stat_cats.retrieve_fleshed_patron.failed'),E);
-				g.patron = null;
-			}
-
-		}
-
-		function apply(node,field,value) {
-			util.widgets.apply(
-				node,'name',field,
-				function(n) {
-					switch(n.nodeName) {
-						case 'description' : n.appendChild( document.createTextNode( value ) ); break;
-						case 'label' : n.value = value; break;
-						default : n.value = value; break;
-					}
-				}
-			);
-		}
-
-		function render_stat_cats() {
-			JSAN.use('util.widgets'); util.widgets.remove_children('stat_cats_panel');
-			if (!g.patron) return;
-			var sp = $('stat_cats_panel');
-			var my_actsc = g.data.list.my_actsc;
-			/* I'm throwing all the patron's stat cat entry maps in here, and pruning it as we go through my_actsc.  Those left behind are "foreign" stat cats that need to pulled from the server. */
-			var scem_hash = {}; 
-			for (var i = 0; i < g.patron.stat_cat_entries().length; i++) {
-				scem_hash[ g.patron.stat_cat_entries()[i].stat_cat() ] = function(a){ return g.patron.stat_cat_entries()[a]; }(i);
-			}
-
-			for (var i = 0; i < my_actsc.length; i++) {
-
-				/* template */
-				var actsc_node = $('actsc_template').cloneNode(true);
-				sp.appendChild(actsc_node);
-				actsc_node.hidden = false;
-				apply(actsc_node,'name',my_actsc[i].name());
-				if (get_bool(my_actsc[i].opac_visible())) {
-					apply(actsc_node, 'opac', $("patronStrings").getString('staff.patron.info_stat_cats.render_stat_cats.opac_visible'));
-				} else {
-					apply(actsc_node, 'opac', $("patronStrings").getString('staff.patron.info_stat_cats.render_stat_cats.not_opac_visible'));
-				}
-				apply(actsc_node,'owner',g.data.hash.aou[my_actsc[i].owner()].shortname());
-
-				var nl = actsc_node.getElementsByAttribute('name','entry');
-				var entry_placeholder;
-				if (nl.length>0) entry_placeholder = nl[0];
-
-				if (entry_placeholder && scem_hash[ my_actsc[i].id() ]) {
-
-					/* template */
-					var actsce_node = $('actsce_template').cloneNode(true); entry_placeholder.appendChild(actsce_node); actsce_node.hidden = false;
-					var sc_id = my_actsc[i].id();
-					var scem = scem_hash[ sc_id ];
-					apply(actsce_node,'value',scem.stat_cat_entry());
-					delete scem_hash[ sc_id ];
-
-				}
-			}
-
-			for (var i in scem_hash) {
-
-				try {
-
-				var sc_id = scem_hash[i].stat_cat();
-				if (sc_id == null || sc_id == '') throw(scem_hash[i]);
-				var sc = g.network.simple_request('FM_ACTSC_RETRIEVE_BATCH', [ ses(), [ sc_id ] ]);
-				if (!sc || typeof sc.ilsevent != 'undefined') { throw(sc); continue; }
-				sc = sc[0];
-
-				/* template */
-				var actsc_node = $('actsc_template').cloneNode(true);
-				sp.appendChild(actsc_node);
-				actsc_node.hidden = false;
-
-				apply(actsc_node,'name',sc.name());
-				if (get_bool(sc.opac_visible())) {
-					apply(actsc_node, 'opac', $("patronStrings").getString('staff.patron.info_stat_cats.render_stat_cats.opac_visible'));
-				} else {
-					apply(actsc_node, 'opac', $("patronStrings").getString('staff.patron.info_stat_cats.render_stat_cats.not_opac_visible'));
-				}
-				apply(actsc_node,'owner',g.data.hash.aou[sc.owner()].shortname());
-
-				var nl = actsc_node.getElementsByAttribute('name','entry');
-				var entry_placeholder;
-				if (nl.length>0) entry_placeholder = nl[0];
-
-				if (entry_placeholder) {
-
-					/* template */
-					var actsce_node = $('actsce_template').cloneNode(true);
-					entry_placeholder.appendChild(actsce_node);
-					actsce_node.hidden = false;
-
-					var scem = scem_hash[ i ];
-					apply(actsce_node,'value',scem.stat_cat_entry());
-
-				}
-
-				} catch(E) {
-					g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_stat_cats.render_stat_cats.rendering_exception'),E);
-				}
-			}
-		}
-		
-	]]>
-	</script>
-	
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
-
-	<stack hidden="true" id="actsc_template" flex="1">
-		<groupbox flex="1" style="background-color: black;"/>
-		<groupbox flex="1" style="background-color: #99CC66; -moz-border-radius-topright: 35px;" >
-			<hbox>
-				<description name="name" style="font-weight: bold"/>
-				<spacer flex="1"/>
-				<description name="opac" style="font-weight: bold"/>
-				<description name="owner" style="font-weight: bold"/>
-			</hbox>
-			<vbox name="entry"/>
-		</groupbox>
-	</stack>
-
-	<hbox hidden="true" id="actsce_template" flex="1">
-		<description name="value"/>
-	</hbox>
-
-	<vbox flex="1" class="my_overflow" id="stat_cats_panel">
-	</vbox>
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+
+  function $(id) { return document.getElementById(id); }
+
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+
+    JSAN.use('util.error'); g.error = new util.error();
+    JSAN.use('util.network'); g.network = new util.network();
+    JSAN.use('util.date'); JSAN.use('util.money'); JSAN.use('patron.util'); JSAN.use('util.functional');
+    JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+
+    g.error.sdump('D_TRACE','my_init() for patron_info_stat_cats.xul');
+
+    g.patron_id = xul_param('patron_id');
+
+    refresh();
+
+   } catch(E) {
+    var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/info_stat_cats', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+
+  function refresh() {
+   retrieve_fleshed_patron(); render_stat_cats();
+  }
+
+  function retrieve_fleshed_patron() {
+   try {
+
+    g.patron = patron.util.retrieve_fleshed_au_via_id(ses(), g.patron_id);
+    if (g.patron.ilsevent) throw(g.patron);
+
+   } catch(E) {
+    g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_stat_cats.retrieve_fleshed_patron.failed'),E);
+    g.patron = null;
+   }
+
+  }
+
+  function apply(node,field,value) {
+   util.widgets.apply(
+    node,'name',field,
+    function(n) {
+     switch(n.nodeName) {
+      case 'description' : n.appendChild( document.createTextNode( value ) ); break;
+      case 'label' : n.value = value; break;
+      default : n.value = value; break;
+     }
+    }
+   );
+  }
+
+  function render_stat_cats() {
+   JSAN.use('util.widgets'); util.widgets.remove_children('stat_cats_panel');
+   if (!g.patron) return;
+   var sp = $('stat_cats_panel');
+   var my_actsc = g.data.list.my_actsc;
+   /* I'm throwing all the patron's stat cat entry maps in here, and pruning it as we go through my_actsc.  Those left behind are "foreign" stat cats that need to pulled from the server. */
+   var scem_hash = {}; 
+   for (var i = 0; i < g.patron.stat_cat_entries().length; i++) {
+    scem_hash[ g.patron.stat_cat_entries()[i].stat_cat() ] = function(a){ return g.patron.stat_cat_entries()[a]; }(i);
+   }
+
+   for (var i = 0; i < my_actsc.length; i++) {
+
+    /* template */
+    var actsc_node = $('actsc_template').cloneNode(true);
+    sp.appendChild(actsc_node);
+    actsc_node.hidden = false;
+    apply(actsc_node,'name',my_actsc[i].name());
+    if (get_bool(my_actsc[i].opac_visible())) {
+     apply(actsc_node, 'opac', $("patronStrings").getString('staff.patron.info_stat_cats.render_stat_cats.opac_visible'));
+    } else {
+     apply(actsc_node, 'opac', $("patronStrings").getString('staff.patron.info_stat_cats.render_stat_cats.not_opac_visible'));
+    }
+    apply(actsc_node,'owner',g.data.hash.aou[my_actsc[i].owner()].shortname());
+
+    var nl = actsc_node.getElementsByAttribute('name','entry');
+    var entry_placeholder;
+    if (nl.length>0) entry_placeholder = nl[0];
+
+    if (entry_placeholder && scem_hash[ my_actsc[i].id() ]) {
+
+     /* template */
+     var actsce_node = $('actsce_template').cloneNode(true); entry_placeholder.appendChild(actsce_node); actsce_node.hidden = false;
+     var sc_id = my_actsc[i].id();
+     var scem = scem_hash[ sc_id ];
+     apply(actsce_node,'value',scem.stat_cat_entry());
+     delete scem_hash[ sc_id ];
+
+    }
+   }
+
+   for (var i in scem_hash) {
+
+    try {
+
+    var sc_id = scem_hash[i].stat_cat();
+    if (sc_id == null || sc_id == '') throw(scem_hash[i]);
+    var sc = g.network.simple_request('FM_ACTSC_RETRIEVE_BATCH', [ ses(), [ sc_id ] ]);
+    if (!sc || typeof sc.ilsevent != 'undefined') { throw(sc); continue; }
+    sc = sc[0];
+
+    /* template */
+    var actsc_node = $('actsc_template').cloneNode(true);
+    sp.appendChild(actsc_node);
+    actsc_node.hidden = false;
+
+    apply(actsc_node,'name',sc.name());
+    if (get_bool(sc.opac_visible())) {
+     apply(actsc_node, 'opac', $("patronStrings").getString('staff.patron.info_stat_cats.render_stat_cats.opac_visible'));
+    } else {
+     apply(actsc_node, 'opac', $("patronStrings").getString('staff.patron.info_stat_cats.render_stat_cats.not_opac_visible'));
+    }
+    apply(actsc_node,'owner',g.data.hash.aou[sc.owner()].shortname());
+
+    var nl = actsc_node.getElementsByAttribute('name','entry');
+    var entry_placeholder;
+    if (nl.length>0) entry_placeholder = nl[0];
+
+    if (entry_placeholder) {
+
+     /* template */
+     var actsce_node = $('actsce_template').cloneNode(true);
+     entry_placeholder.appendChild(actsce_node);
+     actsce_node.hidden = false;
+
+     var scem = scem_hash[ i ];
+     apply(actsce_node,'value',scem.stat_cat_entry());
+
+    }
+
+    } catch(E) {
+     g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_stat_cats.render_stat_cats.rendering_exception'),E);
+    }
+   }
+  }
+  
+ ]]>
+ </script>
+ 
+ <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+
+ <stack hidden="true" id="actsc_template" flex="1">
+  <groupbox flex="1" style="background-color: black;"/>
+  <groupbox flex="1" style="background-color: #99CC66; -moz-border-radius-topright: 35px;" >
+   <hbox>
+    <description name="name" style="font-weight: bold"/>
+    <spacer flex="1"/>
+    <description name="opac" style="font-weight: bold"/>
+    <description name="owner" style="font-weight: bold"/>
+   </hbox>
+   <vbox name="entry"/>
+  </groupbox>
+ </stack>
+
+ <hbox hidden="true" id="actsce_template" flex="1">
+  <description name="value"/>
+ </hbox>
+
+ <vbox flex="1" class="my_overflow" id="stat_cats_panel">
+ </vbox>
 
 
 </window>
diff --git a/Open-ILS/xul/staff_client/server/patron/info_surveys.xul b/Open-ILS/xul/staff_client/server/patron/info_surveys.xul
index 3d38bac7c7..9abbdc587d 100644
--- a/Open-ILS/xul/staff_client/server/patron/info_surveys.xul
+++ b/Open-ILS/xul/staff_client/server/patron/info_surveys.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,175 +20,175 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="patron_info_surveys_win" width="700" height="550"
-	onload="try{ my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try{ my_init(); font_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-
-		function $(id) { return document.getElementById(id); }
-
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-
-				JSAN.use('util.error'); g.error = new util.error();
-				JSAN.use('util.network'); g.network = new util.network();
-				JSAN.use('util.date'); JSAN.use('util.money'); JSAN.use('util.functional');
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
-
-				g.error.sdump('D_TRACE','my_init() for patron_info_surveys.xul');
-
-				g.patron_id = xul_param('patron_id');
-
-				refresh();
-
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/info_surveys.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function refresh() {
-			retrieve_surveys(); render_surveys();
-		}
-
-		function retrieve_surveys() {
-			try {
-				var surveys = g.data.list.my_asv;
-				g.survey_responses = {};
-				for (var i = 0; i < surveys.length; i++) {
-					var responses = g.network.simple_request(
-						'FM_ASVR_RETRIEVE',
-						[ ses(), surveys[i].id(), g.patron_id ]
-					);
-					g.survey_responses[ surveys[i].id() ] = responses;
-				}
-			} catch(E) {
-				g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_surveys.retrieve_surveys.failed'),E);
-			}
-
-		}
-
-		function apply(node,field,value) {
-			util.widgets.apply(
-				node,'name',field,
-				function(n) {
-					switch(n.nodeName) {
-						case 'description' : n.appendChild( document.createTextNode( value ) ); break;
-						case 'label' : n.value = value; break;
-						default : n.value = value; break;
-					}
-				}
-			);
-		}
-
-		function render_surveys() {
-			JSAN.use('util.widgets'); util.widgets.remove_children('surveys_panel');
-			var sp = $('surveys_panel');
-
-			for (var i in g.survey_responses) {
-
-				/* template */
-				var asv_node = $('asv_template').cloneNode(true); sp.appendChild(asv_node); asv_node.hidden = false;
-				apply(asv_node,'id',g.data.hash.asv[i].id());
-				apply(asv_node,'description',g.data.hash.asv[i].description());
-				if (g.data.hash.asv[i].required()) {
-					apply(asv_node, 'required', $("patronStrings").getString('staff.patron.info_surveys.render_surveys.required'));
-				} else {
-					apply(asv_node, 'required', $("patronStrings").getString('staff.patron.info_surveys.render_surveys.not_required'));
-				}
-				if (g.data.hash.asv[i].opac()) {
-					apply(asv_node, 'opac', $("patronStrings").getString('staff.patron.info_stat_cats.render_stat_cats.opac_visible'));
-				} else {
-					apply(asv_node, 'opac', $("patronStrings").getString('staff.patron.info_stat_cats.render_stat_cats.not_opac_visible'));
-				}
-
-				var nl = asv_node.getElementsByAttribute('name','questions');
-				var question_placeholder;
-				if (nl.length>0) question_placeholder = nl[0];
-				if (question_placeholder) {
-
-					var questions = g.data.hash.asv[i].questions();
-					for (var j = 0; j < questions.length; j++) {
-
-						/* template */
-						var asvq_node = $('asvq_template').cloneNode(true);
-						question_placeholder.appendChild(asvq_node);
-						asvq_node.hidden = false;
-
-						apply(asvq_node,'ordinal',j+1);
-						apply(asvq_node,'question',questions[j].question());
-
-						var nl2 = asvq_node.getElementsByAttribute('name','answer');
-						var answer_placeholder;
-						if (nl2.length>0) answer_placeholder = nl2[0];
-						if (answer_placeholder && g.survey_responses[i].length > 0) {
-
-							/* template */
-							var asva_node = $('asva_template').cloneNode(true); answer_placeholder.appendChild(asva_node); asva_node.hidden = false;
-
-							var last_response = g.survey_responses[i][ g.survey_responses[i].length - 1 ];
-							var date = last_response.effective_date() ? last_response.effective_date() : last_response.answer_date();
-							date = util.date.formatted_date( date, '%D' );
-							var answer = util.functional.find_id_object_in_list( questions[j].answers(), last_response.answer() );
-
-							apply(asva_node,'answer',answer.answer());
-							apply(asva_node,'date',date);
-						}
-					}
-
-				}
-
-			}
-
-		}
-		
-	]]>
-	</script>
-
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
-	
-	<stack hidden="true" id="asv_template" flex="1">
-		<groupbox flex="1" style="background-color: black;"/>
-		<groupbox flex="1" style="background-color: #CC9966; -moz-border-radius-topright: 35px;" >
-			<hbox>
-				<label value="&staff.patron.info_surveys.survey_number.value;" style="font-weight: bold"/>
-				<label name="id" style="font-weight: bold"/>
-				<description name="description" style="font-weight: bold"/>
-				<spacer flex="1"/>
-				<description name="required" style="font-weight: bold"/>
-				<description name="opac" style="font-weight: bold"/>
-			</hbox>
-			<vbox name="questions"/>
-		</groupbox>
-	</stack>
-
-	<grid hidden="true" id="asvq_template" flex="1">
-		<columns><column/><column flex="1"/></columns>
-		<rows>
-			<row><label name="ordinal"/><label name="question"/></row>
-			<row><spacer /><vbox name="answer"/></row>
-		</rows>
-	</grid>
-
-	<hbox hidden="true" id="asva_template" flex="1">
-		<label value="&staff.patron.info_surveys.last_answered.value;"/><label name="date"/>
-		<label value="&staff.patron.info_surveys.answer.value;"/><description style="font-weight: bold" name="answer"/>
-	</hbox>
-
-	<vbox flex="1" class="my_overflow" id="surveys_panel">
-	</vbox>
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+
+  function $(id) { return document.getElementById(id); }
+
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+
+    JSAN.use('util.error'); g.error = new util.error();
+    JSAN.use('util.network'); g.network = new util.network();
+    JSAN.use('util.date'); JSAN.use('util.money'); JSAN.use('util.functional');
+    JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+
+    g.error.sdump('D_TRACE','my_init() for patron_info_surveys.xul');
+
+    g.patron_id = xul_param('patron_id');
+
+    refresh();
+
+   } catch(E) {
+    var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/info_surveys.xul', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+
+  function refresh() {
+   retrieve_surveys(); render_surveys();
+  }
+
+  function retrieve_surveys() {
+   try {
+    var surveys = g.data.list.my_asv;
+    g.survey_responses = {};
+    for (var i = 0; i < surveys.length; i++) {
+     var responses = g.network.simple_request(
+      'FM_ASVR_RETRIEVE',
+      [ ses(), surveys[i].id(), g.patron_id ]
+     );
+     g.survey_responses[ surveys[i].id() ] = responses;
+    }
+   } catch(E) {
+    g.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.info_surveys.retrieve_surveys.failed'),E);
+   }
+
+  }
+
+  function apply(node,field,value) {
+   util.widgets.apply(
+    node,'name',field,
+    function(n) {
+     switch(n.nodeName) {
+      case 'description' : n.appendChild( document.createTextNode( value ) ); break;
+      case 'label' : n.value = value; break;
+      default : n.value = value; break;
+     }
+    }
+   );
+  }
+
+  function render_surveys() {
+   JSAN.use('util.widgets'); util.widgets.remove_children('surveys_panel');
+   var sp = $('surveys_panel');
+
+   for (var i in g.survey_responses) {
+
+    /* template */
+    var asv_node = $('asv_template').cloneNode(true); sp.appendChild(asv_node); asv_node.hidden = false;
+    apply(asv_node,'id',g.data.hash.asv[i].id());
+    apply(asv_node,'description',g.data.hash.asv[i].description());
+    if (g.data.hash.asv[i].required()) {
+     apply(asv_node, 'required', $("patronStrings").getString('staff.patron.info_surveys.render_surveys.required'));
+    } else {
+     apply(asv_node, 'required', $("patronStrings").getString('staff.patron.info_surveys.render_surveys.not_required'));
+    }
+    if (g.data.hash.asv[i].opac()) {
+     apply(asv_node, 'opac', $("patronStrings").getString('staff.patron.info_stat_cats.render_stat_cats.opac_visible'));
+    } else {
+     apply(asv_node, 'opac', $("patronStrings").getString('staff.patron.info_stat_cats.render_stat_cats.not_opac_visible'));
+    }
+
+    var nl = asv_node.getElementsByAttribute('name','questions');
+    var question_placeholder;
+    if (nl.length>0) question_placeholder = nl[0];
+    if (question_placeholder) {
+
+     var questions = g.data.hash.asv[i].questions();
+     for (var j = 0; j < questions.length; j++) {
+
+      /* template */
+      var asvq_node = $('asvq_template').cloneNode(true);
+      question_placeholder.appendChild(asvq_node);
+      asvq_node.hidden = false;
+
+      apply(asvq_node,'ordinal',j+1);
+      apply(asvq_node,'question',questions[j].question());
+
+      var nl2 = asvq_node.getElementsByAttribute('name','answer');
+      var answer_placeholder;
+      if (nl2.length>0) answer_placeholder = nl2[0];
+      if (answer_placeholder && g.survey_responses[i].length > 0) {
+
+       /* template */
+       var asva_node = $('asva_template').cloneNode(true); answer_placeholder.appendChild(asva_node); asva_node.hidden = false;
+
+       var last_response = g.survey_responses[i][ g.survey_responses[i].length - 1 ];
+       var date = last_response.effective_date() ? last_response.effective_date() : last_response.answer_date();
+       date = util.date.formatted_date( date, '%D' );
+       var answer = util.functional.find_id_object_in_list( questions[j].answers(), last_response.answer() );
+
+       apply(asva_node,'answer',answer.answer());
+       apply(asva_node,'date',date);
+      }
+     }
+
+    }
+
+   }
+
+  }
+  
+ ]]>
+ </script>
+
+ <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+ 
+ <stack hidden="true" id="asv_template" flex="1">
+  <groupbox flex="1" style="background-color: black;"/>
+  <groupbox flex="1" style="background-color: #CC9966; -moz-border-radius-topright: 35px;" >
+   <hbox>
+    <label value="&staff.patron.info_surveys.survey_number.value;" style="font-weight: bold"/>
+    <label name="id" style="font-weight: bold"/>
+    <description name="description" style="font-weight: bold"/>
+    <spacer flex="1"/>
+    <description name="required" style="font-weight: bold"/>
+    <description name="opac" style="font-weight: bold"/>
+   </hbox>
+   <vbox name="questions"/>
+  </groupbox>
+ </stack>
+
+ <grid hidden="true" id="asvq_template" flex="1">
+  <columns><column/><column flex="1"/></columns>
+  <rows>
+   <row><label name="ordinal"/><label name="question"/></row>
+   <row><spacer /><vbox name="answer"/></row>
+  </rows>
+ </grid>
+
+ <hbox hidden="true" id="asva_template" flex="1">
+  <label value="&staff.patron.info_surveys.last_answered.value;"/><label name="date"/>
+  <label value="&staff.patron.info_surveys.answer.value;"/><description style="font-weight: bold" name="answer"/>
+ </hbox>
+
+ <vbox flex="1" class="my_overflow" id="surveys_panel">
+ </vbox>
 
 
 </window>
diff --git a/Open-ILS/xul/staff_client/server/patron/items.js b/Open-ILS/xul/staff_client/server/patron/items.js
index ce474f70c7..75ed43c8b8 100644
--- a/Open-ILS/xul/staff_client/server/patron/items.js
+++ b/Open-ILS/xul/staff_client/server/patron/items.js
@@ -5,278 +5,278 @@ function $(id) { return document.getElementById(id); }
 if (typeof patron == 'undefined') patron = {};
 patron.items = function (params) {
 
-	JSAN.use('util.error'); this.error = new util.error();
-	JSAN.use('util.network'); this.network = new util.network();
-	JSAN.use('OpenILS.data'); this.data = new OpenILS.data(); this.data.init({'via':'stash'});
+ JSAN.use('util.error'); this.error = new util.error();
+ JSAN.use('util.network'); this.network = new util.network();
+ JSAN.use('OpenILS.data'); this.data = new OpenILS.data(); this.data.init({'via':'stash'});
 }
 
 patron.items.prototype = {
 
-	'list_circ_map' : {},
-
-	'init' : function( params ) {
-
-		var obj = this;
-
-		obj.patron_id = params['patron_id'];
-
-		obj.init_lists();
-
-		JSAN.use('util.controller'); obj.controller = new util.controller();
-		obj.controller.init(
-			{
-				'control_map' : {
-					'save_columns' : [ [ 'command' ], function() { obj.list.save_columns(); } ],
-					'save_columns2' : [ [ 'command' ], function() { obj.list2.save_columns(); } ],
-					'cmd_broken' : [ ['command'], function() { alert('Not Yet Implemented'); } ],
-					'sel_clip' : [ ['command'], function() { obj.list.clipboard(); } ],
-					'sel_clip2' : [ ['command'], function() { obj.list2.clipboard(); } ],
-					'sel_patron' : [ ['command'], function() { JSAN.use('circ.util'); circ.util.show_last_few_circs(obj.retrieve_ids); } ],
-					'sel_bucket' : [
-						['command'],
-						function() {
-							JSAN.use('cat.util');
-							cat.util.add_copies_to_bucket(util.functional.map_list( obj.retrieve_ids, function(o) { return o.copy_id; } ) );
-						}
-					],
-					'sel_bucket2' : [
-						['command'],
-						function() {
-							JSAN.use('cat.util');
-							cat.util.add_copies_to_bucket(util.functional.map_list( obj.retrieve_ids2, function(o) { return o.copy_id; } ) );
-						}
-					],
-					'sel_mark_items_damaged' : [
-						['command'],
-						function() {
-							JSAN.use('cat.util'); JSAN.use('util.functional');
-							cat.util.mark_item_damaged( util.functional.map_list( obj.retrieve_ids, function(o) { return o.copy_id; } ) );
-						}
-					],
-					'sel_mark_items_missing' : [
-						['command'],
-						function() {
-							JSAN.use('cat.util'); JSAN.use('util.functional');
-							cat.util.mark_item_missing( util.functional.map_list( obj.retrieve_ids, function(o) { return o.copy_id; } ) );
-						}
-					],
-					'sel_mark_items_damaged2' : [
-						['command'],
-						function() {
-							JSAN.use('cat.util'); JSAN.use('util.functional');
-							cat.util.mark_item_damaged( util.functional.map_list( obj.retrieve_ids2, function(o) { return o.copy_id; } ) );
-						}
-					],
-					'sel_mark_items_missing2' : [
-						['command'],
-						function() {
-							JSAN.use('cat.util'); JSAN.use('util.functional');
-							cat.util.mark_item_missing( util.functional.map_list( obj.retrieve_ids2, function(o) { return o.copy_id; } ) );
-						}
-					],
-					'sel_copy_details' : [ ['command'],
-						function() {
-							JSAN.use('circ.util');
-							for (var i = 0; i < obj.retrieve_ids.length; i++) { circ.util.show_copy_details( obj.retrieve_ids[i].copy_id ); }
-						}
-					],
-					'sel_patron2' : [ ['command'], function() { JSAN.use('circ.util'); circ.util.show_last_few_circs(obj.retrieve_ids2); } ],
-					'sel_copy_details2' : [ ['command'],
-						function() {
-							JSAN.use('circ.util');
-							for (var i = 0; i < obj.retrieve_ids2.length; i++) { circ.util.show_copy_details( obj.retrieve_ids2[i].copy_id ); }
-						}
-					],
-					'cmd_items_print' : [ ['command'], function() { obj.items_print(1); } ],
-					'cmd_items_print2' : [ ['command'], function() { obj.items_print(2); } ],
-					'cmd_items_export' : [ ['command'], function() { obj.items_export(1); } ],
-					'cmd_items_export2' : [ ['command'], function() { obj.items_export(2); } ],
-					'cmd_items_renew' : [ ['command'], function() { obj.items_renew(1); /* obj.retrieve();*/ } ],
-					'cmd_items_renew_all' : [ ['command'], function() { obj.items_renew_all(); } ],
-					'cmd_items_renew2' : [ ['command'], function() { obj.items_renew(2); /* obj.retrieve();*/ } ],
-					'cmd_items_edit' : [ ['command'], function() { obj.items_edit(1);  /*obj.retrieve();*/ } ],
-					'cmd_items_edit2' : [ ['command'], function() { obj.items_edit(2);  /*obj.retrieve();*/ } ],
-					'cmd_items_mark_lost' : [ ['command'], function() { obj.items_mark_lost(1);  /*obj.retrieve();*/ } ],
-					'cmd_items_mark_lost2' : [ ['command'], function() { obj.items_mark_lost(2);  /*obj.retrieve();*/ } ],
-					'cmd_items_claimed_returned' : [ ['command'], function() { obj.items_claimed_returned(1);  /*obj.retrieve();*/ } ],
-					'cmd_items_claimed_returned2' : [ ['command'], function() { obj.items_claimed_returned(2);  /*obj.retrieve();*/ } ],
-					'cmd_items_checkin' : [ ['command'], function() { obj.items_checkin(1);  /*obj.retrieve();*/ } ],
-					'cmd_items_checkin2' : [ ['command'], function() { obj.items_checkin(2);  /*obj.retrieve();*/ } ],
-					'cmd_show_catalog' : [ ['command'], function() { obj.show_catalog(1); } ],
-					'cmd_show_catalog2' : [ ['command'], function() { obj.show_catalog(2); } ],
-					'cmd_add_billing' : [ ['command'], function() { obj.add_billing(1);  /*obj.retrieve();*/ } ],
-					'cmd_add_billing2' : [ ['command'], function() { obj.add_billing(2);  /*obj.retrieve();*/ } ],
-					'cmd_show_noncats' : [ ['command'], function() { obj.show_noncats(); } ]
-				}
-			}
-		);
-
-		obj.retrieve();
-
-		obj.controller.view.sel_mark_items_damaged.setAttribute('disabled','true');
-		obj.controller.view.sel_mark_items_missing.setAttribute('disabled','true');
-		obj.controller.view.sel_mark_items_damaged2.setAttribute('disabled','true');
-		obj.controller.view.sel_mark_items_missing2.setAttribute('disabled','true');
-		obj.controller.view.sel_clip.setAttribute('disabled','true');
-		obj.controller.view.sel_clip2.setAttribute('disabled','true');
-		obj.controller.view.sel_bucket.setAttribute('disabled','true');
-		obj.controller.view.sel_bucket2.setAttribute('disabled','true');
-		obj.controller.view.sel_copy_details.setAttribute('disabled','true');
-		obj.controller.view.sel_patron.setAttribute('disabled','true');
-		obj.controller.view.sel_copy_details2.setAttribute('disabled','true');
-		obj.controller.view.sel_patron2.setAttribute('disabled','true');
-		obj.controller.view.cmd_items_claimed_returned.setAttribute('disabled','true');
-		obj.controller.view.cmd_items_renew.setAttribute('disabled','true');
-		obj.controller.view.cmd_items_checkin.setAttribute('disabled','true');
-		obj.controller.view.cmd_items_edit.setAttribute('disabled','true');
-		obj.controller.view.cmd_items_mark_lost.setAttribute('disabled','true');
-		obj.controller.view.cmd_show_catalog.setAttribute('disabled','true');
-		obj.controller.view.cmd_items_claimed_returned2.setAttribute('disabled','true');
-		obj.controller.view.cmd_items_renew2.setAttribute('disabled','true');
-		obj.controller.view.cmd_items_checkin2.setAttribute('disabled','true');
-		obj.controller.view.cmd_items_edit2.setAttribute('disabled','true');
-		obj.controller.view.cmd_items_mark_lost2.setAttribute('disabled','true');
-		obj.controller.view.cmd_show_catalog2.setAttribute('disabled','true');
-	},
-
-	'show_noncats' : function() {
-		var obj = this; var checkout = {};
-		try {
-			var robj = obj.network.simple_request('FM_ANCC_RETRIEVE_VIA_USER.authoritative',[ ses(), obj.patron_id ]);
-			if (typeof robj.ilsevent != 'undefined') throw(robj);
-
-			for (var ii = 0; ii < robj.length; ii++) {
-				try {
-					var nc_circ = obj.network.simple_request('FM_ANCC_RETRIEVE_VIA_ID',[ ses(), robj[ii] ]);
-					if (typeof nc_circ.ilsevent != 'undefined') throw(nc_circ);
-					var fake_circ = new aoc();
-					fake_circ.circ_lib( nc_circ.circ_lib() );
-					fake_circ.circ_staff( nc_circ.staff() );
-					fake_circ.usr( nc_circ.patron() );
-					fake_circ.xact_start( nc_circ.circ_time() );
-					fake_circ.renewal_remaining(0);
-					fake_circ.stop_fines('Non-Cataloged');
-						
-					JSAN.use('util.date');
-					var c = nc_circ.circ_time();
-					var d = c == "now" ? new Date() : util.date.db_date2Date( c );
-					var t = obj.data.hash.cnct[ nc_circ.item_type() ];
-					if (!t) {
-						var robj2 = obj.network.simple_request('FM_CNCT_RETRIEVE',[ nc_circ.circ_lib() ]);
-						if (typeof robj2.ilsevent != 'undefined') throw(robj);
-						obj.data.stash_retrieve();
-						for (var j = 0; j < robj2.length; j++) {
-							if (! obj.data.hash.cnct[ robj2[j].id() ] ) {
-								obj.data.hash.cnct[ robj2[j].id() ] = robj2[j];
-								obj.data.list.cnct.push( robj2[j] );
-							}
-						}
-						obj.data.stash('hash','list');
-						t = obj.data.hash.cnct[ nc_circ.item_type() ];
-					}
-					var cd = t.circ_duration() || $("patronStrings").getString('staff.patron.items.show_noncats.14_days');
-					var i = util.date.interval_to_seconds( cd ) * 1000;
-					d.setTime( Date.parse(d) + i );
-					fake_circ.due_date( util.date.formatted_date(d,'%F') );
-	
-					var fake_record = new mvr();
-					fake_record.title( obj.data.hash.cnct[ nc_circ.item_type() ].name());
-	
-					var fake_copy = new acp();
-					fake_copy.barcode( '' );
-					fake_copy.circ_lib( nc_circ.circ_lib() );
-
-					obj.list.append( { 'row' : { 'my' : { 'circ' : fake_circ, 'mvr' : fake_record, 'acp' : fake_copy } }, 'to_bottom' : true, 'no_auto_select' : true } );
-
-				} catch(F) {
-					obj.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.items.show_noncats.err_showing_noncat', [robj[ii].id()]),F);
-				}
-			}
-
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.items.show_noncats.err_showing_circulations'),E);
-		}
-	},
-
-	'items_print' : function(which) {
-		var obj = this;
-		try {
-			var list = (which==2 ? obj.list2 : obj.list);
+ 'list_circ_map' : {},
+
+ 'init' : function( params ) {
+
+  var obj = this;
+
+  obj.patron_id = params['patron_id'];
+
+  obj.init_lists();
+
+  JSAN.use('util.controller'); obj.controller = new util.controller();
+  obj.controller.init(
+   {
+    'control_map' : {
+     'save_columns' : [ [ 'command' ], function() { obj.list.save_columns(); } ],
+     'save_columns2' : [ [ 'command' ], function() { obj.list2.save_columns(); } ],
+     'cmd_broken' : [ ['command'], function() { alert('Not Yet Implemented'); } ],
+     'sel_clip' : [ ['command'], function() { obj.list.clipboard(); } ],
+     'sel_clip2' : [ ['command'], function() { obj.list2.clipboard(); } ],
+     'sel_patron' : [ ['command'], function() { JSAN.use('circ.util'); circ.util.show_last_few_circs(obj.retrieve_ids); } ],
+     'sel_bucket' : [
+      ['command'],
+      function() {
+       JSAN.use('cat.util');
+       cat.util.add_copies_to_bucket(util.functional.map_list( obj.retrieve_ids, function(o) { return o.copy_id; } ) );
+      }
+     ],
+     'sel_bucket2' : [
+      ['command'],
+      function() {
+       JSAN.use('cat.util');
+       cat.util.add_copies_to_bucket(util.functional.map_list( obj.retrieve_ids2, function(o) { return o.copy_id; } ) );
+      }
+     ],
+     'sel_mark_items_damaged' : [
+      ['command'],
+      function() {
+       JSAN.use('cat.util'); JSAN.use('util.functional');
+       cat.util.mark_item_damaged( util.functional.map_list( obj.retrieve_ids, function(o) { return o.copy_id; } ) );
+      }
+     ],
+     'sel_mark_items_missing' : [
+      ['command'],
+      function() {
+       JSAN.use('cat.util'); JSAN.use('util.functional');
+       cat.util.mark_item_missing( util.functional.map_list( obj.retrieve_ids, function(o) { return o.copy_id; } ) );
+      }
+     ],
+     'sel_mark_items_damaged2' : [
+      ['command'],
+      function() {
+       JSAN.use('cat.util'); JSAN.use('util.functional');
+       cat.util.mark_item_damaged( util.functional.map_list( obj.retrieve_ids2, function(o) { return o.copy_id; } ) );
+      }
+     ],
+     'sel_mark_items_missing2' : [
+      ['command'],
+      function() {
+       JSAN.use('cat.util'); JSAN.use('util.functional');
+       cat.util.mark_item_missing( util.functional.map_list( obj.retrieve_ids2, function(o) { return o.copy_id; } ) );
+      }
+     ],
+     'sel_copy_details' : [ ['command'],
+      function() {
+       JSAN.use('circ.util');
+       for (var i = 0; i < obj.retrieve_ids.length; i++) { circ.util.show_copy_details( obj.retrieve_ids[i].copy_id ); }
+      }
+     ],
+     'sel_patron2' : [ ['command'], function() { JSAN.use('circ.util'); circ.util.show_last_few_circs(obj.retrieve_ids2); } ],
+     'sel_copy_details2' : [ ['command'],
+      function() {
+       JSAN.use('circ.util');
+       for (var i = 0; i < obj.retrieve_ids2.length; i++) { circ.util.show_copy_details( obj.retrieve_ids2[i].copy_id ); }
+      }
+     ],
+     'cmd_items_print' : [ ['command'], function() { obj.items_print(1); } ],
+     'cmd_items_print2' : [ ['command'], function() { obj.items_print(2); } ],
+     'cmd_items_export' : [ ['command'], function() { obj.items_export(1); } ],
+     'cmd_items_export2' : [ ['command'], function() { obj.items_export(2); } ],
+     'cmd_items_renew' : [ ['command'], function() { obj.items_renew(1); /* obj.retrieve();*/ } ],
+     'cmd_items_renew_all' : [ ['command'], function() { obj.items_renew_all(); } ],
+     'cmd_items_renew2' : [ ['command'], function() { obj.items_renew(2); /* obj.retrieve();*/ } ],
+     'cmd_items_edit' : [ ['command'], function() { obj.items_edit(1);  /*obj.retrieve();*/ } ],
+     'cmd_items_edit2' : [ ['command'], function() { obj.items_edit(2);  /*obj.retrieve();*/ } ],
+     'cmd_items_mark_lost' : [ ['command'], function() { obj.items_mark_lost(1);  /*obj.retrieve();*/ } ],
+     'cmd_items_mark_lost2' : [ ['command'], function() { obj.items_mark_lost(2);  /*obj.retrieve();*/ } ],
+     'cmd_items_claimed_returned' : [ ['command'], function() { obj.items_claimed_returned(1);  /*obj.retrieve();*/ } ],
+     'cmd_items_claimed_returned2' : [ ['command'], function() { obj.items_claimed_returned(2);  /*obj.retrieve();*/ } ],
+     'cmd_items_checkin' : [ ['command'], function() { obj.items_checkin(1);  /*obj.retrieve();*/ } ],
+     'cmd_items_checkin2' : [ ['command'], function() { obj.items_checkin(2);  /*obj.retrieve();*/ } ],
+     'cmd_show_catalog' : [ ['command'], function() { obj.show_catalog(1); } ],
+     'cmd_show_catalog2' : [ ['command'], function() { obj.show_catalog(2); } ],
+     'cmd_add_billing' : [ ['command'], function() { obj.add_billing(1);  /*obj.retrieve();*/ } ],
+     'cmd_add_billing2' : [ ['command'], function() { obj.add_billing(2);  /*obj.retrieve();*/ } ],
+     'cmd_show_noncats' : [ ['command'], function() { obj.show_noncats(); } ]
+    }
+   }
+  );
+
+  obj.retrieve();
+
+  obj.controller.view.sel_mark_items_damaged.setAttribute('disabled','true');
+  obj.controller.view.sel_mark_items_missing.setAttribute('disabled','true');
+  obj.controller.view.sel_mark_items_damaged2.setAttribute('disabled','true');
+  obj.controller.view.sel_mark_items_missing2.setAttribute('disabled','true');
+  obj.controller.view.sel_clip.setAttribute('disabled','true');
+  obj.controller.view.sel_clip2.setAttribute('disabled','true');
+  obj.controller.view.sel_bucket.setAttribute('disabled','true');
+  obj.controller.view.sel_bucket2.setAttribute('disabled','true');
+  obj.controller.view.sel_copy_details.setAttribute('disabled','true');
+  obj.controller.view.sel_patron.setAttribute('disabled','true');
+  obj.controller.view.sel_copy_details2.setAttribute('disabled','true');
+  obj.controller.view.sel_patron2.setAttribute('disabled','true');
+  obj.controller.view.cmd_items_claimed_returned.setAttribute('disabled','true');
+  obj.controller.view.cmd_items_renew.setAttribute('disabled','true');
+  obj.controller.view.cmd_items_checkin.setAttribute('disabled','true');
+  obj.controller.view.cmd_items_edit.setAttribute('disabled','true');
+  obj.controller.view.cmd_items_mark_lost.setAttribute('disabled','true');
+  obj.controller.view.cmd_show_catalog.setAttribute('disabled','true');
+  obj.controller.view.cmd_items_claimed_returned2.setAttribute('disabled','true');
+  obj.controller.view.cmd_items_renew2.setAttribute('disabled','true');
+  obj.controller.view.cmd_items_checkin2.setAttribute('disabled','true');
+  obj.controller.view.cmd_items_edit2.setAttribute('disabled','true');
+  obj.controller.view.cmd_items_mark_lost2.setAttribute('disabled','true');
+  obj.controller.view.cmd_show_catalog2.setAttribute('disabled','true');
+ },
+
+ 'show_noncats' : function() {
+  var obj = this; var checkout = {};
+  try {
+   var robj = obj.network.simple_request('FM_ANCC_RETRIEVE_VIA_USER.authoritative',[ ses(), obj.patron_id ]);
+   if (typeof robj.ilsevent != 'undefined') throw(robj);
+
+   for (var ii = 0; ii < robj.length; ii++) {
+    try {
+     var nc_circ = obj.network.simple_request('FM_ANCC_RETRIEVE_VIA_ID',[ ses(), robj[ii] ]);
+     if (typeof nc_circ.ilsevent != 'undefined') throw(nc_circ);
+     var fake_circ = new aoc();
+     fake_circ.circ_lib( nc_circ.circ_lib() );
+     fake_circ.circ_staff( nc_circ.staff() );
+     fake_circ.usr( nc_circ.patron() );
+     fake_circ.xact_start( nc_circ.circ_time() );
+     fake_circ.renewal_remaining(0);
+     fake_circ.stop_fines('Non-Cataloged');
+      
+     JSAN.use('util.date');
+     var c = nc_circ.circ_time();
+     var d = c == "now" ? new Date() : util.date.db_date2Date( c );
+     var t = obj.data.hash.cnct[ nc_circ.item_type() ];
+     if (!t) {
+      var robj2 = obj.network.simple_request('FM_CNCT_RETRIEVE',[ nc_circ.circ_lib() ]);
+      if (typeof robj2.ilsevent != 'undefined') throw(robj);
+      obj.data.stash_retrieve();
+      for (var j = 0; j < robj2.length; j++) {
+       if (! obj.data.hash.cnct[ robj2[j].id() ] ) {
+        obj.data.hash.cnct[ robj2[j].id() ] = robj2[j];
+        obj.data.list.cnct.push( robj2[j] );
+       }
+      }
+      obj.data.stash('hash','list');
+      t = obj.data.hash.cnct[ nc_circ.item_type() ];
+     }
+     var cd = t.circ_duration() || $("patronStrings").getString('staff.patron.items.show_noncats.14_days');
+     var i = util.date.interval_to_seconds( cd ) * 1000;
+     d.setTime( Date.parse(d) + i );
+     fake_circ.due_date( util.date.formatted_date(d,'%F') );
+ 
+     var fake_record = new mvr();
+     fake_record.title( obj.data.hash.cnct[ nc_circ.item_type() ].name());
+ 
+     var fake_copy = new acp();
+     fake_copy.barcode( '' );
+     fake_copy.circ_lib( nc_circ.circ_lib() );
+
+     obj.list.append( { 'row' : { 'my' : { 'circ' : fake_circ, 'mvr' : fake_record, 'acp' : fake_copy } }, 'to_bottom' : true, 'no_auto_select' : true } );
+
+    } catch(F) {
+     obj.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.items.show_noncats.err_showing_noncat', [robj[ii].id()]),F);
+    }
+   }
+
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.items.show_noncats.err_showing_circulations'),E);
+  }
+ },
+
+ 'items_print' : function(which) {
+  var obj = this;
+  try {
+   var list = (which==2 ? obj.list2 : obj.list);
             JSAN.use('patron.util');
             var params = { 
                 'patron' : patron.util.retrieve_fleshed_au_via_id(ses(),obj.patron_id), 
                 'template' : 'items_out'
             };
             list.print( params );
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert('printing 1',E);
-		}
-	},
-
-	'items_export' : function(which) {
-		var obj = this;
-		try {
-			var list = (which==2 ? obj.list2 : obj.list);
-			list.dump_csv_to_clipboard();
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert('export 1',E);
-		}
-	},
-
-	'items_renew_all' : function() {
-		try {
-			var obj = this; var list = obj.list;
-			if (list.on_all_fleshed != null) {
-				var r = window.confirm($("patronStrings").getString('staff.patron.items.items_renew_all.list_is_busy'));
-				if (!r) return;
-			}
-			var r = window.confirm($("patronStrings").getString('staff.patron.items.items_renew_all.renew_items_in_list'));
-			if (!r) return;
-			function flesh_callback() {
-				try {
-					obj.list.select_all();
-					obj.items_renew(1,true);	
-					setTimeout(function(){list.on_all_fleshed = null; /* obj.retrieve();*/ },0);
-				} catch(E) {
-					obj.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.items.items_renew_all.items_not_renewed', ['2']),E);
-				}
-			}
-			list.on_all_fleshed = flesh_callback;
-			list.full_retrieve();
-		} catch(E) {
-			this.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.items.items_renew_all.items_not_renewed', ['1']),E);
-		}
-	},
-
-	'items_renew' : function(which,skip_prompt) {
-		var obj = this;
-		try{
-			JSAN.use('circ.util');
-			var retrieve_ids = ( which == 2 ? obj.retrieve_ids2 : obj.retrieve_ids );
-			if (!retrieve_ids || retrieve_ids.length == 0) return;
-			JSAN.use('util.functional');
-			if (!skip_prompt) {
-				var msg = '';
-				if(retrieve_ids.length > 1) {
-					msg += $("patronStrings").getFormattedString('staff.patron.items.items_renew.renew_item_plural',[util.functional.map_list( retrieve_ids, function(o){return o.barcode;}).join(', ')]);
-				} else {
-					msg += $("patronStrings").getFormattedString('staff.patron.items.items_renew.renew_item_singular', [util.functional.map_list( retrieve_ids, function(o){return o.barcode;}).join(', ')]);
-				}
-				var r = window.confirm(msg);
-				if (!r) { return; }
-			}
-
-			var count = 0;
-
-			function gen_renew(bc,circ_id) {
-				var x = document.getElementById('renew_msgs');
-				if (x) {
-					var l = document.createElement('label');
-					l.setAttribute('value', $("patronStrings").getFormattedString('staff.patron.items.items_renew.renewing',[bc]));
-					x.appendChild(l);
-				}
-				var renew = circ.util.renew_via_barcode( bc, obj.patron_id, 
-					function(r) {
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert('printing 1',E);
+  }
+ },
+
+ 'items_export' : function(which) {
+  var obj = this;
+  try {
+   var list = (which==2 ? obj.list2 : obj.list);
+   list.dump_csv_to_clipboard();
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert('export 1',E);
+  }
+ },
+
+ 'items_renew_all' : function() {
+  try {
+   var obj = this; var list = obj.list;
+   if (list.on_all_fleshed != null) {
+    var r = window.confirm($("patronStrings").getString('staff.patron.items.items_renew_all.list_is_busy'));
+    if (!r) return;
+   }
+   var r = window.confirm($("patronStrings").getString('staff.patron.items.items_renew_all.renew_items_in_list'));
+   if (!r) return;
+   function flesh_callback() {
+    try {
+     obj.list.select_all();
+     obj.items_renew(1,true); 
+     setTimeout(function(){list.on_all_fleshed = null; /* obj.retrieve();*/ },0);
+    } catch(E) {
+     obj.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.items.items_renew_all.items_not_renewed', ['2']),E);
+    }
+   }
+   list.on_all_fleshed = flesh_callback;
+   list.full_retrieve();
+  } catch(E) {
+   this.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.items.items_renew_all.items_not_renewed', ['1']),E);
+  }
+ },
+
+ 'items_renew' : function(which,skip_prompt) {
+  var obj = this;
+  try{
+   JSAN.use('circ.util');
+   var retrieve_ids = ( which == 2 ? obj.retrieve_ids2 : obj.retrieve_ids );
+   if (!retrieve_ids || retrieve_ids.length == 0) return;
+   JSAN.use('util.functional');
+   if (!skip_prompt) {
+    var msg = '';
+    if(retrieve_ids.length > 1) {
+     msg += $("patronStrings").getFormattedString('staff.patron.items.items_renew.renew_item_plural',[util.functional.map_list( retrieve_ids, function(o){return o.barcode;}).join(', ')]);
+    } else {
+     msg += $("patronStrings").getFormattedString('staff.patron.items.items_renew.renew_item_singular', [util.functional.map_list( retrieve_ids, function(o){return o.barcode;}).join(', ')]);
+    }
+    var r = window.confirm(msg);
+    if (!r) { return; }
+   }
+
+   var count = 0;
+
+   function gen_renew(bc,circ_id) {
+    var x = document.getElementById('renew_msgs');
+    if (x) {
+     var l = document.createElement('label');
+     l.setAttribute('value', $("patronStrings").getFormattedString('staff.patron.items.items_renew.renewing',[bc]));
+     x.appendChild(l);
+    }
+    var renew = circ.util.renew_via_barcode( bc, obj.patron_id, 
+     function(r) {
                         try {
                             if ( (typeof r[0].ilsevent != 'undefined' && r[0].ilsevent == 0) ) {
                                 l.setAttribute('value', $("patronStrings").getFormattedString('staff.patron.items.items_renew.renewed',[bc]));
@@ -297,96 +297,96 @@ patron.items.prototype = {
                             }
                             obj.refresh(circ_id);
                         } catch(E) {
-   					       obj.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.items.items_renew.err_in_renew_via_barcode',[bc]), E);
+               obj.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.items.items_renew.err_in_renew_via_barcode',[bc]), E);
                         }
-					} 
-				);
-			}
-
-			for (var i = 0; i < retrieve_ids.length; i++) {
-				try {
-					count++;
-					var barcode = retrieve_ids[i].barcode;
-					var circ_id = retrieve_ids[i].circ_id;
-					gen_renew(barcode,circ_id);
-				} catch(E) {
-					obj.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.items.items_renew.no_renew_for_barcode',[barcode]), E);
-				}
-			}
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.items.items_renew.no_renew'),E);
-		}
-	},
-
-	'items_edit' : function(which) {
-			var obj = this;
-			try {
-				var retrieve_ids = ( which == 2 ? obj.retrieve_ids2 : obj.retrieve_ids );
-				if (!retrieve_ids || retrieve_ids.length == 0) return;
-				function check_date(value) {
-					JSAN.use('util.date');
-					try {
-						if (! util.date.check('YYYY-MM-DD',value) ) { 
-							throw($("patronStrings").getString('staff.patron.items.items_edit.invalid_date')); 
-						}
-						if (util.date.check_past('YYYY-MM-DD',value) ) { 
-							throw($("patronStrings").getString('staff.patron.items.items_edit.need_later_date')); 
-						}
-						/*
-						if ( util.date.formatted_date(new Date(),'%F') == value) { 
-							throw('Due date needs to be after today.'); 
-						}
-						*/
-						return true;
-					} catch(E) {
-						alert(E);
-						return false;
-					}
-				}
-
-				JSAN.use('util.functional');
-				var title = '';
-				if (retrieve_ids.length > 1) {
-					title += $("patronStrings").getString('staff.patron.items.items_edit.edit_due_date.plural');
-				} else {
-					title += $("patronStrings").getString('staff.patron.items.items_edit.edit_due_date.singular');
-				}
-				var value = 'YYYY-MM-DD';
-				var text = $("patronStrings").getFormattedString('staff.patron.items.items_edit.new_due_date', [util.functional.map_list(retrieve_ids,function(o){return o.barcode;}).join(', ')]);
-				var due_date; var invalid = true;
-				while(invalid) {
-					due_date = window.prompt(text,value,title);
-					if (due_date) {
-						invalid = ! check_date(due_date);
-					} else {
-						invalid = false;
-					}
-				}
-				if (due_date) {
-					var circs = util.functional.map_list(retrieve_ids,function(o){return o.circ_id;});
-					for (var i = 0; i < circs.length; i++) {
-						var robj = obj.network.simple_request('FM_CIRC_EDIT_DUE_DATE',[ses(),circs[i],due_date]);
-						if (typeof robj.ilsevent != 'undefined') { if (robj.ilsevent != 0) throw(robj); }
-					}
-				}
-				for (var i = 0; i < obj.retrieve_ids.length; i++) {
-					obj.refresh(retrieve_ids[i].circ_id);
-				}
-			} catch(E) {
-				obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.items.items_edit.dates_not_modified'),E);
-			}
-	},
-
-	'items_mark_lost' : function(which) {
-		var obj = this;
-		try {
-			var retrieve_ids = ( which == 2 ? obj.retrieve_ids2 : obj.retrieve_ids );
-			if (!retrieve_ids || retrieve_ids.length == 0) return;
-			for (var i = 0; i < retrieve_ids.length; i++) {
-				var barcode = retrieve_ids[i].barcode;
-				dump($("patronStrings").getFormattedString('staff.patron.items.items_edit.mark_barcode_lost', [barcode]));
-				var robj = obj.network.simple_request( 'MARK_ITEM_LOST', [ ses(), { barcode: barcode } ]);
-				if (typeof robj.ilsevent != 'undefined') { 
+     } 
+    );
+   }
+
+   for (var i = 0; i < retrieve_ids.length; i++) {
+    try {
+     count++;
+     var barcode = retrieve_ids[i].barcode;
+     var circ_id = retrieve_ids[i].circ_id;
+     gen_renew(barcode,circ_id);
+    } catch(E) {
+     obj.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.items.items_renew.no_renew_for_barcode',[barcode]), E);
+    }
+   }
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.items.items_renew.no_renew'),E);
+  }
+ },
+
+ 'items_edit' : function(which) {
+   var obj = this;
+   try {
+    var retrieve_ids = ( which == 2 ? obj.retrieve_ids2 : obj.retrieve_ids );
+    if (!retrieve_ids || retrieve_ids.length == 0) return;
+    function check_date(value) {
+     JSAN.use('util.date');
+     try {
+      if (! util.date.check('YYYY-MM-DD',value) ) { 
+       throw($("patronStrings").getString('staff.patron.items.items_edit.invalid_date')); 
+      }
+      if (util.date.check_past('YYYY-MM-DD',value) ) { 
+       throw($("patronStrings").getString('staff.patron.items.items_edit.need_later_date')); 
+      }
+      /*
+      if ( util.date.formatted_date(new Date(),'%F') == value) { 
+       throw('Due date needs to be after today.'); 
+      }
+      */
+      return true;
+     } catch(E) {
+      alert(E);
+      return false;
+     }
+    }
+
+    JSAN.use('util.functional');
+    var title = '';
+    if (retrieve_ids.length > 1) {
+     title += $("patronStrings").getString('staff.patron.items.items_edit.edit_due_date.plural');
+    } else {
+     title += $("patronStrings").getString('staff.patron.items.items_edit.edit_due_date.singular');
+    }
+    var value = 'YYYY-MM-DD';
+    var text = $("patronStrings").getFormattedString('staff.patron.items.items_edit.new_due_date', [util.functional.map_list(retrieve_ids,function(o){return o.barcode;}).join(', ')]);
+    var due_date; var invalid = true;
+    while(invalid) {
+     due_date = window.prompt(text,value,title);
+     if (due_date) {
+      invalid = ! check_date(due_date);
+     } else {
+      invalid = false;
+     }
+    }
+    if (due_date) {
+     var circs = util.functional.map_list(retrieve_ids,function(o){return o.circ_id;});
+     for (var i = 0; i < circs.length; i++) {
+      var robj = obj.network.simple_request('FM_CIRC_EDIT_DUE_DATE',[ses(),circs[i],due_date]);
+      if (typeof robj.ilsevent != 'undefined') { if (robj.ilsevent != 0) throw(robj); }
+     }
+    }
+    for (var i = 0; i < obj.retrieve_ids.length; i++) {
+     obj.refresh(retrieve_ids[i].circ_id);
+    }
+   } catch(E) {
+    obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.items.items_edit.dates_not_modified'),E);
+   }
+ },
+
+ 'items_mark_lost' : function(which) {
+  var obj = this;
+  try {
+   var retrieve_ids = ( which == 2 ? obj.retrieve_ids2 : obj.retrieve_ids );
+   if (!retrieve_ids || retrieve_ids.length == 0) return;
+   for (var i = 0; i < retrieve_ids.length; i++) {
+    var barcode = retrieve_ids[i].barcode;
+    dump($("patronStrings").getFormattedString('staff.patron.items.items_edit.mark_barcode_lost', [barcode]));
+    var robj = obj.network.simple_request( 'MARK_ITEM_LOST', [ ses(), { barcode: barcode } ]);
+    if (typeof robj.ilsevent != 'undefined') { 
                     switch(Number(robj.ilsevent)) {
                         case 7018 /* COPY_MARKED_LOST */ :
                             alert( $("patronStrings").getFormattedString('staff.patron.items.items_edit.item_barcode', [barcode, robj.desc]) );
@@ -394,440 +394,440 @@ patron.items.prototype = {
                         default: throw(robj);
                     }
                 } else {
-    				obj.refresh(retrieve_ids[i].circ_id,true);
+        obj.refresh(retrieve_ids[i].circ_id,true);
                 }
-			}
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.items.items_edit.items_not_marked_lost'),E);
-		}
-	},
-
-	'items_claimed_returned' : function(which) {
-		var obj = this;
-		try {
-			JSAN.use('util.date');
-			var retrieve_ids = ( which == 2 ? obj.retrieve_ids2 : obj.retrieve_ids );
-			if (!retrieve_ids || retrieve_ids.length == 0) return;
-			function check_date(value) {
-				try {
-					if (! util.date.check('YYYY-MM-DD',value) ) { 
-						throw($("patronStrings").getString('staff.patron.items.items_edit.invalid_date')); 
-					}
-					if ( util.date.formatted_date(new Date(),'%F') == value) { 
-						return true;
-					}
-					if (! util.date.check_past('YYYY-MM-DD',value) ) { 
-						throw($("patronStrings").getString('staff.patron.items.items_claimed_returned.date_cannot_be_in_future')); 
-					}
-					return true;
-				} catch(E) {
-					alert(E);
-					return false;
-				}
-			}
-
-			JSAN.use('util.functional');
-			var title = $("patronStrings").getString('staff.patron.items.items_claimed_returned.claimed_returned');
-			var value = 'YYYY-MM-DD';
-			var text = $("patronStrings").getFormattedString('staff.patron.items.items_claimed_returned.enter_returned_date',
-				[util.functional.map_list(retrieve_ids,function(o){return o.barcode;}).join(', ')]);
-			var backdate; var invalid = true;
-			while(invalid) {
-				backdate = window.prompt(text,value,title);
-				if (backdate) {
-					invalid = ! check_date(backdate);
-				} else {
-					invalid = false;
-				}
-			}
-			//alert('backdate = ' + backdate);
-			if (backdate) {
-				backdate = util.date.formatted_date(backdate + ' 00:00:00','%{iso8601}');
-				var barcodes = util.functional.map_list(retrieve_ids,function(o){return o.barcode;});
-				for (var i = 0; i < barcodes.length; i++) {
-					var robj = obj.network.simple_request(
-						'MARK_ITEM_CLAIM_RETURNED', 
-						[ ses(), { barcode: barcodes[i], backdate: backdate } ]
-					);
-					if (typeof robj.ilsevent != 'undefined') { if (robj.ilsevent != 0) throw(robj); }
-				}
-			}
-			for (var i = 0; i < retrieve_ids.length; i++) obj.refresh(retrieve_ids[i].circ_id,true);
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.items.items_claimed_returned.not_marked_claimed_returned'),E);
-		}
-	},
-
-	'items_checkin' : function(which) {
-		var obj = this;
-		try {
-			var retrieve_ids = ( which == 2 ? obj.retrieve_ids2 : obj.retrieve_ids );
-			if (!retrieve_ids || retrieve_ids.length == 0) return;
-			JSAN.use('util.functional');
-			var msg = '';
-			if (retrieve_ids.length > 1) {
-				msg += $("patronStrings").getFormattedString('staff.patron.items.items_checkin.confirm_item_check_in.plural',
-					[util.functional.map_list( retrieve_ids, function(o){return o.barcode;}).join(', ')]);
-			} else {
-				msg += $("patronStrings").getFormattedString('staff.patron.items.items_checkin.confirm_item_check_in.singular',
-					[util.functional.map_list( retrieve_ids, function(o){return o.barcode;}).join(', ')]);
-			}
-			var r = window.confirm(msg);
-			if (!r) { return; }
-			JSAN.use('circ.util');
-			for (var i = 0; i < retrieve_ids.length; i++) {
-				var copy_id = retrieve_ids[i].copy_id;
-				dump('Check in copy_id = ' + copy_id + ' barcode = ' + retrieve_ids[i].barcode + '\n');
-				var robj = circ.util.checkin_via_barcode(
-					ses(), { 'copy_id' : copy_id }
-				);
-				/* circ.util.checkin_via_barcode handles errors currently */
-			}
-			obj.retrieve();
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.items.items_checkin.no_checkin'),E);
-		}
-	},
-
-	'show_catalog' : function(which) {
-		var obj = this;
-		try {
-			var retrieve_ids = ( which == 2 ? obj.retrieve_ids2 : obj.retrieve_ids );
-			if (!retrieve_ids || retrieve_ids.length == 0) return;
-			for (var i = 0; i < retrieve_ids.length; i++) {
-				var doc_id = retrieve_ids[i].doc_id;
-				if (!doc_id) {
-					alert($("patronStrings").getFormattedString('staff.patron.items.show_catalog.barcode_not_cataloged', [retrieve_ids[i].barcode]));
-					continue;
-				}
-				var opac_url = xulG.url_prefix( urls.opac_rdetail ) + '?r=' + doc_id;
-				var content_params = { 
-					'session' : ses(),
-					'authtime' : ses('authtime'),
-					'opac_url' : opac_url
-				};
-				xulG.new_tab(
-					xulG.url_prefix(urls.XUL_OPAC_WRAPPER), 
-					{'tab_name': $("patronStrings").getString('staff.patron.items.show_catalog.retrieving_title')}, 
-					content_params
-				);
-			}
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert('',E);
-		}
-	},
-
-	'add_billing' : function(which) {
-		var obj = this;
-		try {
-			var retrieve_ids = ( which == 2 ? obj.retrieve_ids2 : obj.retrieve_ids );
-			if (!retrieve_ids || retrieve_ids.length == 0) return;
-			JSAN.use('util.window'); var win = new util.window();
-			for (var i = 0; i < retrieve_ids.length; i++) {
-				var circ_id = retrieve_ids[i].circ_id;
-				var my_xulG = win.open(
-					urls.XUL_PATRON_BILL_WIZARD,
-						//+ '?patron_id=' + window.escape(obj.patron_id)
-						//+ '&xact_id=' + window.escape( circ_id ),
-					'billwizard',
-					'chrome,resizable,modal',
-					{ 'patron_id' : obj.patron_id, 'xact_id' : circ_id }
-				);
-			}
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert('',E);
-		}
-	},
-
-	'init_lists' : function() {
-		var obj = this;
-
-		JSAN.use('circ.util');
-		var columns = circ.util.columns( 
-			{ 
-				'barcode' : { 'hidden' : false },
-				'checkout_lib' : { 'hidden' : false },
-				'circ_lib' : { 'hidden' : false },
-				'title' : { 'hidden' : false, 'flex' : '3' },
-				'due_date' : { 'hidden' : false },
-				'renewal_remaining' : { 'hidden' : false },
-				'stop_fines' : { 'hidden' : false }
-			} 
-		);
-		var columns2 = circ.util.columns( 
-			{ 
-				'barcode' : { 'hidden' : false },
-				'checkout_lib' : { 'hidden' : false },
-				'circ_lib' : { 'hidden' : false },
-				'title' : { 'hidden' : false, 'flex' : '3' },
-				'checkin_time' : { 'hidden' : false },
-				'stop_fines' : { 'hidden' : false }
-			} 
-		);
-
-		function retrieve_row(params) {
+   }
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.items.items_edit.items_not_marked_lost'),E);
+  }
+ },
+
+ 'items_claimed_returned' : function(which) {
+  var obj = this;
+  try {
+   JSAN.use('util.date');
+   var retrieve_ids = ( which == 2 ? obj.retrieve_ids2 : obj.retrieve_ids );
+   if (!retrieve_ids || retrieve_ids.length == 0) return;
+   function check_date(value) {
+    try {
+     if (! util.date.check('YYYY-MM-DD',value) ) { 
+      throw($("patronStrings").getString('staff.patron.items.items_edit.invalid_date')); 
+     }
+     if ( util.date.formatted_date(new Date(),'%F') == value) { 
+      return true;
+     }
+     if (! util.date.check_past('YYYY-MM-DD',value) ) { 
+      throw($("patronStrings").getString('staff.patron.items.items_claimed_returned.date_cannot_be_in_future')); 
+     }
+     return true;
+    } catch(E) {
+     alert(E);
+     return false;
+    }
+   }
+
+   JSAN.use('util.functional');
+   var title = $("patronStrings").getString('staff.patron.items.items_claimed_returned.claimed_returned');
+   var value = 'YYYY-MM-DD';
+   var text = $("patronStrings").getFormattedString('staff.patron.items.items_claimed_returned.enter_returned_date',
+    [util.functional.map_list(retrieve_ids,function(o){return o.barcode;}).join(', ')]);
+   var backdate; var invalid = true;
+   while(invalid) {
+    backdate = window.prompt(text,value,title);
+    if (backdate) {
+     invalid = ! check_date(backdate);
+    } else {
+     invalid = false;
+    }
+   }
+   //alert('backdate = ' + backdate);
+   if (backdate) {
+    backdate = util.date.formatted_date(backdate + ' 00:00:00','%{iso8601}');
+    var barcodes = util.functional.map_list(retrieve_ids,function(o){return o.barcode;});
+    for (var i = 0; i < barcodes.length; i++) {
+     var robj = obj.network.simple_request(
+      'MARK_ITEM_CLAIM_RETURNED', 
+      [ ses(), { barcode: barcodes[i], backdate: backdate } ]
+     );
+     if (typeof robj.ilsevent != 'undefined') { if (robj.ilsevent != 0) throw(robj); }
+    }
+   }
+   for (var i = 0; i < retrieve_ids.length; i++) obj.refresh(retrieve_ids[i].circ_id,true);
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.items.items_claimed_returned.not_marked_claimed_returned'),E);
+  }
+ },
+
+ 'items_checkin' : function(which) {
+  var obj = this;
+  try {
+   var retrieve_ids = ( which == 2 ? obj.retrieve_ids2 : obj.retrieve_ids );
+   if (!retrieve_ids || retrieve_ids.length == 0) return;
+   JSAN.use('util.functional');
+   var msg = '';
+   if (retrieve_ids.length > 1) {
+    msg += $("patronStrings").getFormattedString('staff.patron.items.items_checkin.confirm_item_check_in.plural',
+     [util.functional.map_list( retrieve_ids, function(o){return o.barcode;}).join(', ')]);
+   } else {
+    msg += $("patronStrings").getFormattedString('staff.patron.items.items_checkin.confirm_item_check_in.singular',
+     [util.functional.map_list( retrieve_ids, function(o){return o.barcode;}).join(', ')]);
+   }
+   var r = window.confirm(msg);
+   if (!r) { return; }
+   JSAN.use('circ.util');
+   for (var i = 0; i < retrieve_ids.length; i++) {
+    var copy_id = retrieve_ids[i].copy_id;
+    dump('Check in copy_id = ' + copy_id + ' barcode = ' + retrieve_ids[i].barcode + '\n');
+    var robj = circ.util.checkin_via_barcode(
+     ses(), { 'copy_id' : copy_id }
+    );
+    /* circ.util.checkin_via_barcode handles errors currently */
+   }
+   obj.retrieve();
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.items.items_checkin.no_checkin'),E);
+  }
+ },
+
+ 'show_catalog' : function(which) {
+  var obj = this;
+  try {
+   var retrieve_ids = ( which == 2 ? obj.retrieve_ids2 : obj.retrieve_ids );
+   if (!retrieve_ids || retrieve_ids.length == 0) return;
+   for (var i = 0; i < retrieve_ids.length; i++) {
+    var doc_id = retrieve_ids[i].doc_id;
+    if (!doc_id) {
+     alert($("patronStrings").getFormattedString('staff.patron.items.show_catalog.barcode_not_cataloged', [retrieve_ids[i].barcode]));
+     continue;
+    }
+    var opac_url = xulG.url_prefix( urls.opac_rdetail ) + '?r=' + doc_id;
+    var content_params = { 
+     'session' : ses(),
+     'authtime' : ses('authtime'),
+     'opac_url' : opac_url
+    };
+    xulG.new_tab(
+     xulG.url_prefix(urls.XUL_OPAC_WRAPPER), 
+     {'tab_name': $("patronStrings").getString('staff.patron.items.show_catalog.retrieving_title')}, 
+     content_params
+    );
+   }
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert('',E);
+  }
+ },
+
+ 'add_billing' : function(which) {
+  var obj = this;
+  try {
+   var retrieve_ids = ( which == 2 ? obj.retrieve_ids2 : obj.retrieve_ids );
+   if (!retrieve_ids || retrieve_ids.length == 0) return;
+   JSAN.use('util.window'); var win = new util.window();
+   for (var i = 0; i < retrieve_ids.length; i++) {
+    var circ_id = retrieve_ids[i].circ_id;
+    var my_xulG = win.open(
+     urls.XUL_PATRON_BILL_WIZARD,
+      //+ '?patron_id=' + window.escape(obj.patron_id)
+      //+ '&xact_id=' + window.escape( circ_id ),
+     'billwizard',
+     'chrome,resizable,modal',
+     { 'patron_id' : obj.patron_id, 'xact_id' : circ_id }
+    );
+   }
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert('',E);
+  }
+ },
+
+ 'init_lists' : function() {
+  var obj = this;
+
+  JSAN.use('circ.util');
+  var columns = circ.util.columns( 
+   { 
+    'barcode' : { 'hidden' : false },
+    'checkout_lib' : { 'hidden' : false },
+    'circ_lib' : { 'hidden' : false },
+    'title' : { 'hidden' : false, 'flex' : '3' },
+    'due_date' : { 'hidden' : false },
+    'renewal_remaining' : { 'hidden' : false },
+    'stop_fines' : { 'hidden' : false }
+   } 
+  );
+  var columns2 = circ.util.columns( 
+   { 
+    'barcode' : { 'hidden' : false },
+    'checkout_lib' : { 'hidden' : false },
+    'circ_lib' : { 'hidden' : false },
+    'title' : { 'hidden' : false, 'flex' : '3' },
+    'checkin_time' : { 'hidden' : false },
+    'stop_fines' : { 'hidden' : false }
+   } 
+  );
+
+  function retrieve_row(params) {
             try { 
-    			var row = params.row;
+       var row = params.row;
 
-    			if (!row.my.circ_id) {
-    				if (typeof params.on_retrieve == 'function') { 
+       if (!row.my.circ_id) {
+        if (typeof params.on_retrieve == 'function') { 
                         params.on_retrieve(row); 
                     }
-    				return row;
-    			}
+        return row;
+       }
     
-    			if (!row.my.circ) {
-    				obj.network.simple_request(
-    					'FM_CIRC_DETAILS.authoritative',
-    					[ row.my.circ_id ],
-    					function(req) {
-    						try { 
-    							var robj = req.getResultObject();
-    							if (typeof robj.ilsevent != 'undefined') throw(robj);
-    							if (typeof robj.ilsevent == 'null') throw('null result');
-    							row.my.circ = robj.circ;
-    							row.my.acp = robj.copy;
-    							row.my.mvr = robj.mvr;
-    							row.my.acn = robj.volume;
+       if (!row.my.circ) {
+        obj.network.simple_request(
+         'FM_CIRC_DETAILS.authoritative',
+         [ row.my.circ_id ],
+         function(req) {
+          try { 
+           var robj = req.getResultObject();
+           if (typeof robj.ilsevent != 'undefined') throw(robj);
+           if (typeof robj.ilsevent == 'null') throw('null result');
+           row.my.circ = robj.circ;
+           row.my.acp = robj.copy;
+           row.my.mvr = robj.mvr;
+           row.my.acn = robj.volume;
                                 row.my.record = robj.record;
-    	
-    							var copy_id = row.my.circ.target_copy();
-    							if (typeof copy_id == 'object') {
-    								if (copy_id != null) {
-    									copy_id = copy_id.id();
-    								} else {
-    									if (typeof robj.copy == 'object' && robj.copy != null) copy_id = robj.copy.id();
-    								}
-    							} else {
-    									if (typeof robj.copy == 'object' && robj.copy != null) copy_id = robj.copy.id();
-    							}
-    							
-    							params.row_node.setAttribute( 'retrieve_id', js2JSON({'copy_id':copy_id,'circ_id':row.my.circ.id(),'barcode':row.my.acp.barcode(),'doc_id': ( row.my.record ? row.my.record.id() : null ) }) );
-    		
-    							if (typeof params.on_retrieve == 'function') {
-    								params.on_retrieve(row);
-    							}
-    						} catch(E) {
-    							obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.items.retrieve_row.callback_error'), E);
-    						}
-    					}
-    				);
-    			} else {
+     
+           var copy_id = row.my.circ.target_copy();
+           if (typeof copy_id == 'object') {
+            if (copy_id != null) {
+             copy_id = copy_id.id();
+            } else {
+             if (typeof robj.copy == 'object' && robj.copy != null) copy_id = robj.copy.id();
+            }
+           } else {
+             if (typeof robj.copy == 'object' && robj.copy != null) copy_id = robj.copy.id();
+           }
+           
+           params.row_node.setAttribute( 'retrieve_id', js2JSON({'copy_id':copy_id,'circ_id':row.my.circ.id(),'barcode':row.my.acp.barcode(),'doc_id': ( row.my.record ? row.my.record.id() : null ) }) );
+      
+           if (typeof params.on_retrieve == 'function') {
+            params.on_retrieve(row);
+           }
+          } catch(E) {
+           obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.items.retrieve_row.callback_error'), E);
+          }
+         }
+        );
+       } else {
                     var copy_id = row.my.circ ? row.my.circ.target_copy() : null;
-    				if (typeof copy_id == 'object') {
-    					if (copy_id != null) {
-    						copy_id = copy_id.id();
-    					} else {
-    						if (typeof row.my.acp == 'object' && row.my.acp != null) copy_id = row.my.acp.id();
-    					}
-    				} else {
-    						if (typeof row.my.acp == 'object' && row.my.acp != null) copy_id = row.my.acp.id();
-    				}
+        if (typeof copy_id == 'object') {
+         if (copy_id != null) {
+          copy_id = copy_id.id();
+         } else {
+          if (typeof row.my.acp == 'object' && row.my.acp != null) copy_id = row.my.acp.id();
+         }
+        } else {
+          if (typeof row.my.acp == 'object' && row.my.acp != null) copy_id = row.my.acp.id();
+        }
  
-    				params.row_node.setAttribute( 'retrieve_id', js2JSON({'copy_id':row.my.acp.id(),'circ_id':row.my.circ.id(),'barcode':row.my.acp.barcode(),'doc_id': (row.my.record ? row.my.record.id() : null) }) );
-    				if (typeof params.on_retrieve == 'function') {
-    					params.on_retrieve(row);
-    				}
-    			}
+        params.row_node.setAttribute( 'retrieve_id', js2JSON({'copy_id':row.my.acp.id(),'circ_id':row.my.circ.id(),'barcode':row.my.acp.barcode(),'doc_id': (row.my.record ? row.my.record.id() : null) }) );
+        if (typeof params.on_retrieve == 'function') {
+         params.on_retrieve(row);
+        }
+       }
     
-    			return row;
+       return row;
             } catch(E) {
                 obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.items.retrieve_row.error_in_retrieve_row'),E);
                 return params.row;
             }
-		}
-
-		JSAN.use('util.list'); obj.list = new util.list('items_list');
-		obj.list.init(
-			{
-				'columns' : columns,
-				'map_row_to_columns' : circ.util.std_map_row_to_columns(),
-				'retrieve_row' : retrieve_row,
-				'on_select' : function(ev) {
-					JSAN.use('util.functional');
-					var sel = obj.list.retrieve_selection();
-					obj.controller.view.sel_clip.setAttribute('disabled',sel.length < 1);
-					var list = util.functional.map_list(
-						sel,
-						function(o) { return JSON2js( o.getAttribute('retrieve_id') ); }
-					);
-					if (typeof obj.on_select == 'function') {
-						obj.on_select(list);
-					}
-					if (typeof window.xulG == 'object' && typeof window.xulG.on_select == 'function') {
-						obj.error.sdump('D_PATRON','patron.items: Calling external .on_select()\n');
-						window.xulG.on_select(list);
-					} else {
-						obj.error.sdump('D_PATRON','patron.items: No external .on_select()\n');
-					}
-				}
-			}
-		);
-		
-		obj.list2 = new util.list('items_list2');
-		obj.list2.init(
-			{
-				'columns' : columns2,
-				'map_row_to_columns' : circ.util.std_map_row_to_columns(),
-				'retrieve_row' : retrieve_row,
-				'on_select' : function(ev) {
-					JSAN.use('util.functional');
-					var sel = obj.list2.retrieve_selection();
-					obj.controller.view.sel_clip2.setAttribute('disabled',sel.length < 1);
-					var list = util.functional.map_list(
-						sel,
-						function(o) { return JSON2js( o.getAttribute('retrieve_id') ); }
-					);
-					if (typeof obj.on_select2 == 'function') {
-						obj.on_select2(list);
-					}
-				}
-			}
-		);
-	},
-
-	'refresh' : function(circ_id,move_to_bottom_list) {
-		var obj = this;
-		try {
-			var nparams = obj.list_circ_map[circ_id];
+  }
+
+  JSAN.use('util.list'); obj.list = new util.list('items_list');
+  obj.list.init(
+   {
+    'columns' : columns,
+    'map_row_to_columns' : circ.util.std_map_row_to_columns(),
+    'retrieve_row' : retrieve_row,
+    'on_select' : function(ev) {
+     JSAN.use('util.functional');
+     var sel = obj.list.retrieve_selection();
+     obj.controller.view.sel_clip.setAttribute('disabled',sel.length < 1);
+     var list = util.functional.map_list(
+      sel,
+      function(o) { return JSON2js( o.getAttribute('retrieve_id') ); }
+     );
+     if (typeof obj.on_select == 'function') {
+      obj.on_select(list);
+     }
+     if (typeof window.xulG == 'object' && typeof window.xulG.on_select == 'function') {
+      obj.error.sdump('D_PATRON','patron.items: Calling external .on_select()\n');
+      window.xulG.on_select(list);
+     } else {
+      obj.error.sdump('D_PATRON','patron.items: No external .on_select()\n');
+     }
+    }
+   }
+  );
+  
+  obj.list2 = new util.list('items_list2');
+  obj.list2.init(
+   {
+    'columns' : columns2,
+    'map_row_to_columns' : circ.util.std_map_row_to_columns(),
+    'retrieve_row' : retrieve_row,
+    'on_select' : function(ev) {
+     JSAN.use('util.functional');
+     var sel = obj.list2.retrieve_selection();
+     obj.controller.view.sel_clip2.setAttribute('disabled',sel.length < 1);
+     var list = util.functional.map_list(
+      sel,
+      function(o) { return JSON2js( o.getAttribute('retrieve_id') ); }
+     );
+     if (typeof obj.on_select2 == 'function') {
+      obj.on_select2(list);
+     }
+    }
+   }
+  );
+ },
+
+ 'refresh' : function(circ_id,move_to_bottom_list) {
+  var obj = this;
+  try {
+   var nparams = obj.list_circ_map[circ_id];
             if (move_to_bottom_list) { 
                 obj.list_circ_map[circ_id].my_node.setAttribute('hidden','true');
-				var nparams2 = obj.list2.append( { 'row' : { 'my' : { 'circ_id' : circ_id } },  'to_bottom' : true, 'which_list' : 1 } );
-				obj.list_circ_map[circ_id] = nparams2; 
+    var nparams2 = obj.list2.append( { 'row' : { 'my' : { 'circ_id' : circ_id } },  'to_bottom' : true, 'which_list' : 1 } );
+    obj.list_circ_map[circ_id] = nparams2; 
             } else {
-    			var which_list = nparams.which_list;
+       var which_list = nparams.which_list;
                 switch(which_list) {
                     case 1:
-					case '1':
+     case '1':
                         setTimeout(function(){try{obj.list2.refresh_row(nparams);}catch(E){
-													obj.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.items.refresh.error_refreshing_row2', [circ_id, nparams]),E);}},1000);
+             obj.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.items.refresh.error_refreshing_row2', [circ_id, nparams]),E);}},1000);
                         break;
                     default:
                         setTimeout(function(){try{obj.list.refresh_row(nparams);}catch(E){
-													obj.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.items.refresh.error_refreshing_row2', [circ_id, nparams]),E);}},1000);
+             obj.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.items.refresh.error_refreshing_row2', [circ_id, nparams]),E);}},1000);
                         break;
                 }
             }
-		} catch(E) {
-			obj.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.items.refresh.error_refreshing_row', [circ_id, nparams]),E);
-		}
-	},
-
-	'retrieve' : function(dont_show_me_the_list_change) {
-		var obj = this;
-		if (window.xulG && window.xulG.checkouts) {
-			obj.checkouts = window.xulG.checkouts;
-		} else {
-			obj.checkouts = [];
-			obj.checkouts2 = [];
-			var robj = obj.network.simple_request(
-				'FM_CIRC_RETRIEVE_VIA_USER.authoritative',
-				[ ses(), obj.patron_id ]
-			);
-			if (typeof robj.ilsevent!='undefined') {
-				obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.items.retrieve.err_retrieving_circulations'),E);
-			} else {
-				obj.checkouts = obj.checkouts.concat( robj.overdue );
-				obj.checkouts = obj.checkouts.concat( robj.out );
-				obj.checkouts2 = obj.checkouts2.concat( robj.lost );
-				obj.checkouts2 = obj.checkouts2.concat( robj.claims_returned );
-				obj.checkouts2 = obj.checkouts2.concat( robj.long_overdue );
-			}
-			var robj = obj.network.simple_request(
-				'FM_CIRC_IN_WITH_FINES_VIA_USER.authoritative',
-				[ ses(), obj.patron_id ]
-			);
-			if (typeof robj.ilsevent!='undefined') {
-				obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.items.retrieve.err_retrieving_circulations'),E);
-			} else {
-				obj.checkouts2 = obj.checkouts2.concat( robj.lost );
-				obj.checkouts2 = obj.checkouts2.concat( robj.claims_returned );
-				obj.checkouts2 = obj.checkouts2.concat( robj.long_overdue );
-			}
-		}
-
-		function gen_list_append(circ_id,which_list) {
-			return function() {
-				try {
-					var nparams;
-					switch(which_list) {
-						case 1:
-							nparams = obj.list2.append( { 'row' : { 'my' : { 'circ_id' : circ_id } },  'to_bottom' : true, 'which_list' : which_list } );
-						break;
-						default:
-							nparams = obj.list.append( { 'row' : { 'my' : { 'circ_id' : circ_id } }, 'to_bottom' : true, 'which_list' : which_list } );
-						break;
-					}
-					if (nparams) {
-						obj.list_circ_map[circ_id] = nparams; // unlike item status interface, each circ should be in this list only once
-					} else {
-						throw('typeof nparams = ' + typeof nparams);
-					}
-				} catch(E) {
-					obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.items.gen_list_append.error'),E);
-				}
-			};
-		}
-
-		obj.list.clear(); obj.list2.clear();
-
-		JSAN.use('util.exec'); var exec = new util.exec();
-		var rows = [];
-		for (var i in obj.checkouts) {
-			rows.push( gen_list_append(obj.checkouts[i],0) );
-		}
-		for (var i in obj.checkouts2) {
-			rows.push( gen_list_append(obj.checkouts2[i],1) );
-		}
-		exec.chain( rows );
-		if (!dont_show_me_the_list_change) {
-			if (window.xulG && typeof window.xulG.on_list_change == 'function') {
-				try { window.xulG.on_list_change(obj.checkouts); } catch(E) { this.error.sdump('D_ERROR',E); }
-			}
-		}
-	},
-
-	'on_select' : function(list) {
-
-		dump('patron.items.on_select list = ' + js2JSON(list) + '\n');
-
-		var obj = this;
-
-		obj.controller.view.cmd_items_claimed_returned.setAttribute('disabled','false');
-		obj.controller.view.cmd_items_renew.setAttribute('disabled','false');
-		obj.controller.view.cmd_items_checkin.setAttribute('disabled','false');
-		obj.controller.view.cmd_items_edit.setAttribute('disabled','false');
-		obj.controller.view.cmd_items_mark_lost.setAttribute('disabled','false');
-		obj.controller.view.cmd_show_catalog.setAttribute('disabled','false');
-		obj.controller.view.sel_copy_details.setAttribute('disabled','false');
-		obj.controller.view.sel_bucket.setAttribute('disabled','false');
-		obj.controller.view.sel_patron.setAttribute('disabled','false');
-		obj.controller.view.sel_mark_items_damaged.setAttribute('disabled','false');
-		obj.controller.view.sel_mark_items_missing.setAttribute('disabled','false');
-
-		obj.retrieve_ids = list;
-	},
-
-	'on_select2' : function(list) {
-	
-		dump('patron.items.on_select2 list = ' + js2JSON(list) + '\n');
-
-		var obj = this;
-
-		obj.controller.view.cmd_items_claimed_returned2.setAttribute('disabled','false');
-		obj.controller.view.cmd_items_renew2.setAttribute('disabled','false');
-		obj.controller.view.cmd_items_checkin2.setAttribute('disabled','false');
-		obj.controller.view.cmd_items_edit2.setAttribute('disabled','false');
-		obj.controller.view.cmd_items_mark_lost2.setAttribute('disabled','false');
-		obj.controller.view.cmd_show_catalog2.setAttribute('disabled','false');
-		obj.controller.view.sel_copy_details2.setAttribute('disabled','false');
-		obj.controller.view.sel_bucket2.setAttribute('disabled','false');
-		obj.controller.view.sel_patron2.setAttribute('disabled','false');
-		obj.controller.view.sel_mark_items_damaged2.setAttribute('disabled','false');
-		obj.controller.view.sel_mark_items_missing2.setAttribute('disabled','false');
-
-		this.retrieve_ids2 = list;
-	}
+  } catch(E) {
+   obj.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.items.refresh.error_refreshing_row', [circ_id, nparams]),E);
+  }
+ },
+
+ 'retrieve' : function(dont_show_me_the_list_change) {
+  var obj = this;
+  if (window.xulG && window.xulG.checkouts) {
+   obj.checkouts = window.xulG.checkouts;
+  } else {
+   obj.checkouts = [];
+   obj.checkouts2 = [];
+   var robj = obj.network.simple_request(
+    'FM_CIRC_RETRIEVE_VIA_USER.authoritative',
+    [ ses(), obj.patron_id ]
+   );
+   if (typeof robj.ilsevent!='undefined') {
+    obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.items.retrieve.err_retrieving_circulations'),E);
+   } else {
+    obj.checkouts = obj.checkouts.concat( robj.overdue );
+    obj.checkouts = obj.checkouts.concat( robj.out );
+    obj.checkouts2 = obj.checkouts2.concat( robj.lost );
+    obj.checkouts2 = obj.checkouts2.concat( robj.claims_returned );
+    obj.checkouts2 = obj.checkouts2.concat( robj.long_overdue );
+   }
+   var robj = obj.network.simple_request(
+    'FM_CIRC_IN_WITH_FINES_VIA_USER.authoritative',
+    [ ses(), obj.patron_id ]
+   );
+   if (typeof robj.ilsevent!='undefined') {
+    obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.items.retrieve.err_retrieving_circulations'),E);
+   } else {
+    obj.checkouts2 = obj.checkouts2.concat( robj.lost );
+    obj.checkouts2 = obj.checkouts2.concat( robj.claims_returned );
+    obj.checkouts2 = obj.checkouts2.concat( robj.long_overdue );
+   }
+  }
+
+  function gen_list_append(circ_id,which_list) {
+   return function() {
+    try {
+     var nparams;
+     switch(which_list) {
+      case 1:
+       nparams = obj.list2.append( { 'row' : { 'my' : { 'circ_id' : circ_id } },  'to_bottom' : true, 'which_list' : which_list } );
+      break;
+      default:
+       nparams = obj.list.append( { 'row' : { 'my' : { 'circ_id' : circ_id } }, 'to_bottom' : true, 'which_list' : which_list } );
+      break;
+     }
+     if (nparams) {
+      obj.list_circ_map[circ_id] = nparams; // unlike item status interface, each circ should be in this list only once
+     } else {
+      throw('typeof nparams = ' + typeof nparams);
+     }
+    } catch(E) {
+     obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.items.gen_list_append.error'),E);
+    }
+   };
+  }
+
+  obj.list.clear(); obj.list2.clear();
+
+  JSAN.use('util.exec'); var exec = new util.exec();
+  var rows = [];
+  for (var i in obj.checkouts) {
+   rows.push( gen_list_append(obj.checkouts[i],0) );
+  }
+  for (var i in obj.checkouts2) {
+   rows.push( gen_list_append(obj.checkouts2[i],1) );
+  }
+  exec.chain( rows );
+  if (!dont_show_me_the_list_change) {
+   if (window.xulG && typeof window.xulG.on_list_change == 'function') {
+    try { window.xulG.on_list_change(obj.checkouts); } catch(E) { this.error.sdump('D_ERROR',E); }
+   }
+  }
+ },
+
+ 'on_select' : function(list) {
+
+  dump('patron.items.on_select list = ' + js2JSON(list) + '\n');
+
+  var obj = this;
+
+  obj.controller.view.cmd_items_claimed_returned.setAttribute('disabled','false');
+  obj.controller.view.cmd_items_renew.setAttribute('disabled','false');
+  obj.controller.view.cmd_items_checkin.setAttribute('disabled','false');
+  obj.controller.view.cmd_items_edit.setAttribute('disabled','false');
+  obj.controller.view.cmd_items_mark_lost.setAttribute('disabled','false');
+  obj.controller.view.cmd_show_catalog.setAttribute('disabled','false');
+  obj.controller.view.sel_copy_details.setAttribute('disabled','false');
+  obj.controller.view.sel_bucket.setAttribute('disabled','false');
+  obj.controller.view.sel_patron.setAttribute('disabled','false');
+  obj.controller.view.sel_mark_items_damaged.setAttribute('disabled','false');
+  obj.controller.view.sel_mark_items_missing.setAttribute('disabled','false');
+
+  obj.retrieve_ids = list;
+ },
+
+ 'on_select2' : function(list) {
+ 
+  dump('patron.items.on_select2 list = ' + js2JSON(list) + '\n');
+
+  var obj = this;
+
+  obj.controller.view.cmd_items_claimed_returned2.setAttribute('disabled','false');
+  obj.controller.view.cmd_items_renew2.setAttribute('disabled','false');
+  obj.controller.view.cmd_items_checkin2.setAttribute('disabled','false');
+  obj.controller.view.cmd_items_edit2.setAttribute('disabled','false');
+  obj.controller.view.cmd_items_mark_lost2.setAttribute('disabled','false');
+  obj.controller.view.cmd_show_catalog2.setAttribute('disabled','false');
+  obj.controller.view.sel_copy_details2.setAttribute('disabled','false');
+  obj.controller.view.sel_bucket2.setAttribute('disabled','false');
+  obj.controller.view.sel_patron2.setAttribute('disabled','false');
+  obj.controller.view.sel_mark_items_damaged2.setAttribute('disabled','false');
+  obj.controller.view.sel_mark_items_missing2.setAttribute('disabled','false');
+
+  this.retrieve_ids2 = list;
+ }
 
 }
 
diff --git a/Open-ILS/xul/staff_client/server/patron/items.xul b/Open-ILS/xul/staff_client/server/patron/items.xul
index f7ef88ad18..e8a21c8525 100644
--- a/Open-ILS/xul/staff_client/server/patron/items.xul
+++ b/Open-ILS/xul/staff_client/server/patron/items.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -21,96 +21,96 @@
 <?xul-overlay href="/xul/server/patron/items_overlay.xul"?>
 
 <window id="items_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="/xul/server/patron/items.js"/>
-	<script>
-	<![CDATA[
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				try { g.error.sdump('D_TRACE','my_init() for items.xul'); } catch(E) { dump(E); }
-
-				JSAN.use('patron.items'); g.items = new patron.items();
-				g.items.init( 
-					{ 
-						'patron_id' : xul_param('patron_id'), 
-					} 
-				);
-				
-				window.refresh = function (p) { g.items.retrieve(p); }
-
-				default_focus();
-
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/items.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-
-		function default_focus() { try { var x = document.getElementById('noncat'); x.focus(); } catch(E) { try { g.error.sdump('D_ERROR','item.xul, default_focus: ' + E); } catch(F) { dump(E); } } }
-
-	]]>
-	</script>
-
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
-
-	<commandset id="items_cmds">
-		<command id="save_columns" />
-		<command id="sel_bucket" disabled="true"/>
-		<command id="sel_clip" />
-		<command id="sel_copy_details"/>
-		<command id="sel_patron"/>
-		<command id="cmd_items_print" />
-		<command id="cmd_items_export" />
-		<command id="cmd_items_renew" />
-		<command id="cmd_items_renew_all" />
-		<command id="cmd_items_claimed_returned" />
-		<command id="cmd_items_checkin" />
-		<command id="cmd_items_edit" />
-		<command id="cmd_items_mark_lost" />
-		<command id="cmd_show_catalog" />
-		<command id="cmd_add_billing" />
-		<command id="sel_mark_items_damaged" disabled="true"/>
-		<command id="sel_mark_items_missing" disabled="true"/>
-		
-		<command id="cmd_show_noncats" />
-
-		<command id="save_columns2" />
-		<command id="sel_bucket2" disabled="true"/>
-		<command id="sel_clip2" />
-		<command id="sel_copy_details2"/>
-		<command id="sel_patron2"/>
-		<command id="cmd_items_print2" />
-		<command id="cmd_items_export2" />
-		<command id="cmd_items_renew2" />
-		<command id="cmd_items_claimed_returned2" />
-		<command id="cmd_items_checkin2" />
-		<command id="cmd_items_edit2" />
-		<command id="cmd_items_mark_lost2" />
-		<command id="cmd_show_catalog2" />
-		<command id="cmd_add_billing2" />
-		<command id="sel_mark_items_damaged2" disabled="true"/>
-		<command id="sel_mark_items_missing2" disabled="true"/>
-	</commandset>
-
-	<popupset id="items_popupset"/>
-
-	<box id="items_main" />
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script type="text/javascript" src="/xul/server/patron/items.js"/>
+ <script>
+ <![CDATA[
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    try { g.error.sdump('D_TRACE','my_init() for items.xul'); } catch(E) { dump(E); }
+
+    JSAN.use('patron.items'); g.items = new patron.items();
+    g.items.init( 
+     { 
+      'patron_id' : xul_param('patron_id'), 
+     } 
+    );
+    
+    window.refresh = function (p) { g.items.retrieve(p); }
+
+    default_focus();
+
+   } catch(E) {
+    var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/items.xul', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+
+  function default_focus() { try { var x = document.getElementById('noncat'); x.focus(); } catch(E) { try { g.error.sdump('D_ERROR','item.xul, default_focus: ' + E); } catch(F) { dump(E); } } }
+
+ ]]>
+ </script>
+
+ <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
+ <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
+ <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+
+ <commandset id="items_cmds">
+  <command id="save_columns" />
+  <command id="sel_bucket" disabled="true"/>
+  <command id="sel_clip" />
+  <command id="sel_copy_details"/>
+  <command id="sel_patron"/>
+  <command id="cmd_items_print" />
+  <command id="cmd_items_export" />
+  <command id="cmd_items_renew" />
+  <command id="cmd_items_renew_all" />
+  <command id="cmd_items_claimed_returned" />
+  <command id="cmd_items_checkin" />
+  <command id="cmd_items_edit" />
+  <command id="cmd_items_mark_lost" />
+  <command id="cmd_show_catalog" />
+  <command id="cmd_add_billing" />
+  <command id="sel_mark_items_damaged" disabled="true"/>
+  <command id="sel_mark_items_missing" disabled="true"/>
+  
+  <command id="cmd_show_noncats" />
+
+  <command id="save_columns2" />
+  <command id="sel_bucket2" disabled="true"/>
+  <command id="sel_clip2" />
+  <command id="sel_copy_details2"/>
+  <command id="sel_patron2"/>
+  <command id="cmd_items_print2" />
+  <command id="cmd_items_export2" />
+  <command id="cmd_items_renew2" />
+  <command id="cmd_items_claimed_returned2" />
+  <command id="cmd_items_checkin2" />
+  <command id="cmd_items_edit2" />
+  <command id="cmd_items_mark_lost2" />
+  <command id="cmd_show_catalog2" />
+  <command id="cmd_add_billing2" />
+  <command id="sel_mark_items_damaged2" disabled="true"/>
+  <command id="sel_mark_items_missing2" disabled="true"/>
+ </commandset>
+
+ <popupset id="items_popupset"/>
+
+ <box id="items_main" />
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/items_overlay.xul b/Open-ILS/xul/staff_client/server/patron/items_overlay.xul
index 4669680014..1a9ebaa18a 100644
--- a/Open-ILS/xul/staff_client/server/patron/items_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/items_overlay.xul
@@ -1,142 +1,142 @@
 <?xml version="1.0"?>
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 <overlay id="items_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading items_overlay.xul\n');</script>
 
 <commandset id="items_cmds" />
 
 <popupset id="items_popupset">
-	<popup id="items_actions" position="at_pointer"> 
-		<menuitem command="sel_clip" label="&staff.patron.items_overlay.sel_clip.label;" accesskey="&staff.patron.items_overlay.sel_clip.accesskey;"/>
-		<menuitem command="sel_bucket" label="&staff.patron.items_overlay.sel_bucket.label;" accesskey="&staff.patron.items_overlay.sel_bucket.accesskey;"/>
-		<menuitem label="&staff.patron.items_overlay.show_catalog.label;" command="cmd_show_catalog" />
-		<menuitem command="sel_copy_details" label="&staff.patron.items_overlay.sel_copy_details.label;" accesskey="&staff.patron.items_overlay.sel_copy_details.accesskey;" />
-		<menuitem command="sel_patron" label="&staff.patron.items_overlay.sel_patron.label;" accesskey="&staff.patron.items_overlay.sel_patron.accesskey;"/>
-		<menuseparator />
-		<menuitem label="&staff.patron.items_overlay.items_edit.label;" command="cmd_items_edit" />
-		<menuitem label="&staff.patron.items_overlay.items_mark_lost.label;" command="cmd_items_mark_lost" />
-		<menuitem label="&staff.patron.items_overlay.items_claimed_returned.label;" command="cmd_items_claimed_returned" />
-		<menuitem label="&staff.patron.items_overlay.items_renew.label;" command="cmd_items_renew" />
-		<menuitem label="&staff.patron.items_overlay.items_renew_all.label;" command="cmd_items_renew_all" hidden="false"/>
-		<menuitem label="&staff.patron.items_overlay.items_checkin.label;" command="cmd_items_checkin" />
-		<menuitem label="&staff.patron.items_overlay.add_billing.label;" command="cmd_add_billing" />
-		<menuseparator />
-		<menuitem command="save_columns" label="&staff.patron.items_overlay.save_columns.label;"/>
-	</popup>
-	<popup id="items_actions2" position="at_pointer"> 
-		<menuitem command="sel_clip2" label="&staff.patron.items_overlay.sel_clip.label;" accesskey="&staff.patron.items_overlay.sel_clip.accesskey;" />
-		<menuitem command="sel_bucket2" label="&staff.patron.items_overlay.sel_bucket.label;" accesskey="&staff.patron.items_overlay.sel_bucket.accesskey;"/>
-		<menuitem label="&staff.patron.items_overlay.show_catalog.label;" command="cmd_show_catalog2" />
-		<menuitem command="sel_copy_details2" label="&staff.patron.items_overlay.sel_copy_details.label;" accesskey="&staff.patron.items_overlay.sel_copy_details.accesskey;" />
-		<menuitem command="sel_patron2" label="&staff.patron.items_overlay.sel_patron.label;" accesskey="&staff.patron.items_overlay.sel_patron.accesskey;"/>
-		<menuseparator />
-		<menuitem label="&staff.patron.items_overlay.items_edit.label;" command="cmd_items_edit2" />
-		<menuitem label="&staff.patron.items_overlay.items_mark_lost.label;" command="cmd_items_mark_lost2" />
-		<menuitem label="&staff.patron.items_overlay.items_claimed_returned.label;" command="cmd_items_claimed_returned2" />
-		<menuitem label="&staff.patron.items_overlay.items_renew.label;" command="cmd_items_renew2" />
-		<menuitem label="&staff.patron.items_overlay.items_checkin.label;" command="cmd_items_checkin2" />
-		<menuitem label="&staff.patron.items_overlay.add_billing.label;" command="cmd_add_billing2" />
-		<menuseparator />
-		<menuitem command="save_columns2" label="&staff.patron.items_overlay.save_columns.label;"/>
-	</popup>
+ <popup id="items_actions" position="at_pointer"> 
+  <menuitem command="sel_clip" label="&staff.patron.items_overlay.sel_clip.label;" accesskey="&staff.patron.items_overlay.sel_clip.accesskey;"/>
+  <menuitem command="sel_bucket" label="&staff.patron.items_overlay.sel_bucket.label;" accesskey="&staff.patron.items_overlay.sel_bucket.accesskey;"/>
+  <menuitem label="&staff.patron.items_overlay.show_catalog.label;" command="cmd_show_catalog" />
+  <menuitem command="sel_copy_details" label="&staff.patron.items_overlay.sel_copy_details.label;" accesskey="&staff.patron.items_overlay.sel_copy_details.accesskey;" />
+  <menuitem command="sel_patron" label="&staff.patron.items_overlay.sel_patron.label;" accesskey="&staff.patron.items_overlay.sel_patron.accesskey;"/>
+  <menuseparator />
+  <menuitem label="&staff.patron.items_overlay.items_edit.label;" command="cmd_items_edit" />
+  <menuitem label="&staff.patron.items_overlay.items_mark_lost.label;" command="cmd_items_mark_lost" />
+  <menuitem label="&staff.patron.items_overlay.items_claimed_returned.label;" command="cmd_items_claimed_returned" />
+  <menuitem label="&staff.patron.items_overlay.items_renew.label;" command="cmd_items_renew" />
+  <menuitem label="&staff.patron.items_overlay.items_renew_all.label;" command="cmd_items_renew_all" hidden="false"/>
+  <menuitem label="&staff.patron.items_overlay.items_checkin.label;" command="cmd_items_checkin" />
+  <menuitem label="&staff.patron.items_overlay.add_billing.label;" command="cmd_add_billing" />
+  <menuseparator />
+  <menuitem command="save_columns" label="&staff.patron.items_overlay.save_columns.label;"/>
+ </popup>
+ <popup id="items_actions2" position="at_pointer"> 
+  <menuitem command="sel_clip2" label="&staff.patron.items_overlay.sel_clip.label;" accesskey="&staff.patron.items_overlay.sel_clip.accesskey;" />
+  <menuitem command="sel_bucket2" label="&staff.patron.items_overlay.sel_bucket.label;" accesskey="&staff.patron.items_overlay.sel_bucket.accesskey;"/>
+  <menuitem label="&staff.patron.items_overlay.show_catalog.label;" command="cmd_show_catalog2" />
+  <menuitem command="sel_copy_details2" label="&staff.patron.items_overlay.sel_copy_details.label;" accesskey="&staff.patron.items_overlay.sel_copy_details.accesskey;" />
+  <menuitem command="sel_patron2" label="&staff.patron.items_overlay.sel_patron.label;" accesskey="&staff.patron.items_overlay.sel_patron.accesskey;"/>
+  <menuseparator />
+  <menuitem label="&staff.patron.items_overlay.items_edit.label;" command="cmd_items_edit2" />
+  <menuitem label="&staff.patron.items_overlay.items_mark_lost.label;" command="cmd_items_mark_lost2" />
+  <menuitem label="&staff.patron.items_overlay.items_claimed_returned.label;" command="cmd_items_claimed_returned2" />
+  <menuitem label="&staff.patron.items_overlay.items_renew.label;" command="cmd_items_renew2" />
+  <menuitem label="&staff.patron.items_overlay.items_checkin.label;" command="cmd_items_checkin2" />
+  <menuitem label="&staff.patron.items_overlay.add_billing.label;" command="cmd_add_billing2" />
+  <menuseparator />
+  <menuitem command="save_columns2" label="&staff.patron.items_overlay.save_columns.label;"/>
+ </popup>
 
 </popupset>
 
 
 <box id="items_main" flex="1" orient="vertical" class="my_overflow">
-	<vbox id="cmvb1" flex="1"/>
+ <vbox id="cmvb1" flex="1"/>
 </box>
 
 <vbox id="cmvb1" flex="1">
-	<groupbox id="cmgb1" flex="1">
-		<caption label="&staff.patron_navbar.items;" />
-		<vbox flex="0">
-			<hbox id="items_top_ui" />
-		</vbox>
-		<vbox id="renew_msgs" />
-		<tree id="items_list" flex="1" enableColumnDrag="true" context="items_actions"/>
-		<vbox flex="0">
-			<hbox id="items_bottom_ui" />
-		</vbox>
-	</groupbox>
-	<splitter><grippy/></splitter>
-	<groupbox flex="1">
-		<caption label="&staff.patron_navbar.items.problem_items.caption;" />
-		<vbox flex="0">
-			<hbox id="items_top_ui2" />
-		</vbox>
-		<tree id="items_list2" flex="1" enableColumnDrag="true" context="items_actions2"/>
-		<vbox flex="0">
-			<hbox id="items_bottom_ui2" />
-		</vbox>
-	</groupbox>
+ <groupbox id="cmgb1" flex="1">
+  <caption label="&staff.patron_navbar.items;" />
+  <vbox flex="0">
+   <hbox id="items_top_ui" />
+  </vbox>
+  <vbox id="renew_msgs" />
+  <tree id="items_list" flex="1" enableColumnDrag="true" context="items_actions"/>
+  <vbox flex="0">
+   <hbox id="items_bottom_ui" />
+  </vbox>
+ </groupbox>
+ <splitter><grippy/></splitter>
+ <groupbox flex="1">
+  <caption label="&staff.patron_navbar.items.problem_items.caption;" />
+  <vbox flex="0">
+   <hbox id="items_top_ui2" />
+  </vbox>
+  <tree id="items_list2" flex="1" enableColumnDrag="true" context="items_actions2"/>
+  <vbox flex="0">
+   <hbox id="items_bottom_ui2" />
+  </vbox>
+ </groupbox>
 </vbox>
 
 <hbox id="items_top_ui" flex="1">
-	<spacer id="pcii3s" flex="1"/>
-	<menubar>
-		<menu label="&staff.patron.items_overlay.actions_for_selected_items.label;" accesskey="&staff.patron.items_overlay.actions_for_selected_items.accesskey;">
-			<menupopup>
-				<menuitem command="sel_clip" label="&staff.patron.items_overlay.sel_clip.label;" accesskey="&staff.patron.items_overlay.sel_clip.accesskey;"/>
-				<menuitem command="sel_bucket" label="&staff.patron.items_overlay.sel_bucket.label;" accesskey="&staff.patron.items_overlay.sel_bucket.accesskey;"/>
-				<menuitem label="&staff.patron.items_overlay.show_catalog.label;" command="cmd_show_catalog" />
-				<menuitem command="sel_copy_details" label="&staff.patron.items_overlay.sel_copy_details.label;" accesskey="&staff.patron.items_overlay.sel_copy_details.accesskey;" />
-				<menuitem command="sel_patron" label="&staff.patron.items_overlay.sel_patron.label;" accesskey="&staff.patron.items_overlay.sel_patron.accesskey;"/>
-				<menuseparator />
-				<menuitem label="&staff.patron.items_overlay.items_edit.label;" command="cmd_items_edit" />
-				<menuitem label="&staff.patron.items_overlay.items_mark_lost.label;" command="cmd_items_mark_lost" />
-				<menuitem label="&staff.patron.items_overlay.items_claimed_returned.label;" command="cmd_items_claimed_returned" />
-				<menuitem label="&staff.patron.items_overlay.items_renew.label;" command="cmd_items_renew" />
-				<menuitem label="&staff.patron.items_overlay.items_renew_all.label;" command="cmd_items_renew_all" hidden="false"/>
-				<menuitem label="&staff.patron.items_overlay.items_checkin.label;" command="cmd_items_checkin" />
-				<menuitem label="&staff.patron.items_overlay.add_billing.label;" command="cmd_add_billing" />
-				<menuseparator />
-				<menuitem command="save_columns" label="&staff.patron.items_overlay.save_columns.label;"/>
-			</menupopup>
-		</menu>
-	</menubar>
+ <spacer id="pcii3s" flex="1"/>
+ <menubar>
+  <menu label="&staff.patron.items_overlay.actions_for_selected_items.label;" accesskey="&staff.patron.items_overlay.actions_for_selected_items.accesskey;">
+   <menupopup>
+    <menuitem command="sel_clip" label="&staff.patron.items_overlay.sel_clip.label;" accesskey="&staff.patron.items_overlay.sel_clip.accesskey;"/>
+    <menuitem command="sel_bucket" label="&staff.patron.items_overlay.sel_bucket.label;" accesskey="&staff.patron.items_overlay.sel_bucket.accesskey;"/>
+    <menuitem label="&staff.patron.items_overlay.show_catalog.label;" command="cmd_show_catalog" />
+    <menuitem command="sel_copy_details" label="&staff.patron.items_overlay.sel_copy_details.label;" accesskey="&staff.patron.items_overlay.sel_copy_details.accesskey;" />
+    <menuitem command="sel_patron" label="&staff.patron.items_overlay.sel_patron.label;" accesskey="&staff.patron.items_overlay.sel_patron.accesskey;"/>
+    <menuseparator />
+    <menuitem label="&staff.patron.items_overlay.items_edit.label;" command="cmd_items_edit" />
+    <menuitem label="&staff.patron.items_overlay.items_mark_lost.label;" command="cmd_items_mark_lost" />
+    <menuitem label="&staff.patron.items_overlay.items_claimed_returned.label;" command="cmd_items_claimed_returned" />
+    <menuitem label="&staff.patron.items_overlay.items_renew.label;" command="cmd_items_renew" />
+    <menuitem label="&staff.patron.items_overlay.items_renew_all.label;" command="cmd_items_renew_all" hidden="false"/>
+    <menuitem label="&staff.patron.items_overlay.items_checkin.label;" command="cmd_items_checkin" />
+    <menuitem label="&staff.patron.items_overlay.add_billing.label;" command="cmd_add_billing" />
+    <menuseparator />
+    <menuitem command="save_columns" label="&staff.patron.items_overlay.save_columns.label;"/>
+   </menupopup>
+  </menu>
+ </menubar>
 </hbox>
 
 <hbox id="items_top_ui2" flex="1">
-	<spacer id="pcii3s2" flex="1"/>
-	<menubar>
-		<menu label="&staff.patron.items_overlay.actions_for_selected_items.label;" old_accesskey="&staff.patron.items_overlay.actions_for_selected_items.accesskey;">
-			<menupopup>
-				<menuitem command="sel_clip2" label="&staff.patron.items_overlay.sel_clip.label;" accesskey="&staff.patron.items_overlay.sel_clip.accesskey;" />
-				<menuitem command="sel_bucket2" label="&staff.patron.items_overlay.sel_bucket.label;" accesskey="&staff.patron.items_overlay.sel_bucket.accesskey;"/>
-				<menuitem label="&staff.patron.items_overlay.show_catalog.label;" command="cmd_show_catalog2" />
-				<menuitem command="sel_copy_details2" label="&staff.patron.items_overlay.sel_copy_details.label;" accesskey="&staff.patron.items_overlay.sel_copy_details.accesskey;" />
-				<menuitem command="sel_patron2" label="&staff.patron.items_overlay.sel_patron.label;" accesskey="&staff.patron.items_overlay.sel_patron.accesskey;"/>
-				<menuseparator />
-				<menuitem label="&staff.patron.items_overlay.items_edit.label;" command="cmd_items_edit2" />
-				<menuitem label="&staff.patron.items_overlay.items_mark_lost.label;" command="cmd_items_mark_lost2" />
-				<menuitem label="&staff.patron.items_overlay.items_claimed_returned.label;" command="cmd_items_claimed_returned2" />
-				<menuitem label="&staff.patron.items_overlay.items_renew.label;" command="cmd_items_renew2" />
-				<menuitem label="&staff.patron.items_overlay.items_checkin.label;" command="cmd_items_checkin2" />
-				<menuitem label="&staff.patron.items_overlay.add_billing.label;" command="cmd_add_billing2" />
-				<menuseparator />
-				<menuitem command="save_columns2" label="&staff.patron.items_overlay.save_columns.label;"/>
-			</menupopup>
-		</menu>
-	</menubar>
+ <spacer id="pcii3s2" flex="1"/>
+ <menubar>
+  <menu label="&staff.patron.items_overlay.actions_for_selected_items.label;" old_accesskey="&staff.patron.items_overlay.actions_for_selected_items.accesskey;">
+   <menupopup>
+    <menuitem command="sel_clip2" label="&staff.patron.items_overlay.sel_clip.label;" accesskey="&staff.patron.items_overlay.sel_clip.accesskey;" />
+    <menuitem command="sel_bucket2" label="&staff.patron.items_overlay.sel_bucket.label;" accesskey="&staff.patron.items_overlay.sel_bucket.accesskey;"/>
+    <menuitem label="&staff.patron.items_overlay.show_catalog.label;" command="cmd_show_catalog2" />
+    <menuitem command="sel_copy_details2" label="&staff.patron.items_overlay.sel_copy_details.label;" accesskey="&staff.patron.items_overlay.sel_copy_details.accesskey;" />
+    <menuitem command="sel_patron2" label="&staff.patron.items_overlay.sel_patron.label;" accesskey="&staff.patron.items_overlay.sel_patron.accesskey;"/>
+    <menuseparator />
+    <menuitem label="&staff.patron.items_overlay.items_edit.label;" command="cmd_items_edit2" />
+    <menuitem label="&staff.patron.items_overlay.items_mark_lost.label;" command="cmd_items_mark_lost2" />
+    <menuitem label="&staff.patron.items_overlay.items_claimed_returned.label;" command="cmd_items_claimed_returned2" />
+    <menuitem label="&staff.patron.items_overlay.items_renew.label;" command="cmd_items_renew2" />
+    <menuitem label="&staff.patron.items_overlay.items_checkin.label;" command="cmd_items_checkin2" />
+    <menuitem label="&staff.patron.items_overlay.add_billing.label;" command="cmd_add_billing2" />
+    <menuseparator />
+    <menuitem command="save_columns2" label="&staff.patron.items_overlay.save_columns.label;"/>
+   </menupopup>
+  </menu>
+ </menubar>
 </hbox>
 
 
 <hbox id="items_bottom_ui" flex="1">
-	<button id="noncat" label="&staff.patron.items_overlay.show_noncats.label;" command="cmd_show_noncats" accesskey="&staff.patron.items_overlay.show_noncats.accesskey;"/>
-	<spacer flex="1"/>
-	<button id="items_print" label="&staff.patron_display.items.print_receipt.label;" command="cmd_items_print" accesskey="&staff.patron_display.items.print_receipt.accesskey;" />
-	<button id="items_export" label="&staff.patron.items_overlay.items_export.label;" command="cmd_items_export" accesskey=""/>
+ <button id="noncat" label="&staff.patron.items_overlay.show_noncats.label;" command="cmd_show_noncats" accesskey="&staff.patron.items_overlay.show_noncats.accesskey;"/>
+ <spacer flex="1"/>
+ <button id="items_print" label="&staff.patron_display.items.print_receipt.label;" command="cmd_items_print" accesskey="&staff.patron_display.items.print_receipt.accesskey;" />
+ <button id="items_export" label="&staff.patron.items_overlay.items_export.label;" command="cmd_items_export" accesskey=""/>
 </hbox>
 
 <hbox id="items_bottom_ui2" flex="1">
-	<spacer flex="1"/>
-	<button id="items_print2" label="&staff.patron_display.items.print_receipt.label;" command="cmd_items_print2" old_accesskey="&staff.patron_display.items.print_receipt.accesskey;" />
-	<button id="items_export2" label="&staff.patron.items_overlay.items_export.label;" command="cmd_items_export2" accesskey=""/>
+ <spacer flex="1"/>
+ <button id="items_print2" label="&staff.patron_display.items.print_receipt.label;" command="cmd_items_print2" old_accesskey="&staff.patron_display.items.print_receipt.accesskey;" />
+ <button id="items_export2" label="&staff.patron.items_overlay.items_export.label;" command="cmd_items_export2" accesskey=""/>
 </hbox>
 
 </overlay>
diff --git a/Open-ILS/xul/staff_client/server/patron/search_form.js b/Open-ILS/xul/staff_client/server/patron/search_form.js
index 76759047c5..1fb11bdad7 100644
--- a/Open-ILS/xul/staff_client/server/patron/search_form.js
+++ b/Open-ILS/xul/staff_client/server/patron/search_form.js
@@ -3,230 +3,230 @@ dump('entering patron/search_form.js\n');
 if (typeof patron == 'undefined') patron = {};
 patron.search_form = function (params) {
 
-	JSAN.use('util.error'); this.error = new util.error();
-	JSAN.use('util.network'); this.network = new util.network();
-	this.w = window;
+ JSAN.use('util.error'); this.error = new util.error();
+ JSAN.use('util.network'); this.network = new util.network();
+ this.w = window;
 }
 
 patron.search_form.prototype = {
 
-	'init' : function( params ) {
+ 'init' : function( params ) {
 
-		var obj = this;
+  var obj = this;
 
-		JSAN.use('OpenILS.data'); this.OpenILS = {}; 
-		obj.OpenILS.data = new OpenILS.data(); obj.OpenILS.data.init({'via':'stash'});
+  JSAN.use('OpenILS.data'); this.OpenILS = {}; 
+  obj.OpenILS.data = new OpenILS.data(); obj.OpenILS.data.init({'via':'stash'});
 
-		JSAN.use('util.controller'); obj.controller = new util.controller();
-		obj.controller.init(
-			{
-				control_map : {
-					'cmd_broken' : [
-						['command'],
-						function() { alert($("commonStrings").getString('common.unimplemented')); }
-					],
-					'cmd_patron_search_submit' : [
-						['command'],
-						function() {
-							obj.submit();
-						}
-					],
-					'cmd_patron_search_clear' : [
-						['command'],
-						function() { 
-							obj.controller.render(); 
-							window.xulG.clear_left_deck();
-						}
-					],
-					'family_name' : [
-						['render'],
-						function(e) {
-							return function() {
-								if (params.query&&params.query.family_name) {
-									e.setAttribute('value',params.query.family_name);
-									e.value = params.query.family_name;
-								} else {
-									e.value = '';
-								}
-							};
-						}
-					],
-					'first_given_name' : [
-						['render'],
-						function(e) {
-							return function() {
-								if (params.query&&params.query.first_given_name) {
-									e.setAttribute('value',params.query.first_given_name);
-									e.value = params.query.first_given_name;
-								} else {
-									e.value = '';
-								}
-							};
-						}
-					],
-					'second_given_name' : [
-						['render'],
-						function(e) {
-							return function() {
-								if (params.query&&params.query.second_given_name) {
-									e.setAttribute('value',params.query.second_given_name);
-									e.value = params.query.second_given_name;
-								} else {
-									e.value = '';
-								}
-							};
-						}
-					],
-					'alias' : [
-						['render'],
-						function(e) {
-							return function() {
-								if (params.query&&params.query.alias) {
-									e.setAttribute('value',params.query.alias);
-									e.value = params.query.alias;
-								} else {
-									e.value = '';
-								}
-							};
-						}
-					],
-					'usrname' : [
-						['render'],
-						function(e) {
-							return function() {
-								if (params.query&&params.query.usrname) {
-									e.setAttribute('value',params.query.usrname);
-									e.value = params.query.usrname;
-								} else {
-									e.value = '';
-								}
-							};
-						}
-					],
-					'card' : [
-						['render'],
-						function(e) {
-							return function() {
-								if (params.query&&params.query.card) {
-									e.setAttribute('value',params.query.card);
-									e.value = params.query.card;
-								} else {
-									e.value = '';
-								}
-							};
-						}
-					],
-					'email' : [
-						['render'],
-						function(e) {
-							return function() {
-								if (params.query&&params.query.email) {
-									e.setAttribute('value',params.query.email);
-									e.value = params.query.email;
-								} else {
-									e.value = '';
-								}
-							};
-						}
-					],
-					'phone' : [
-						['render'],
-						function(e) {
-							return function() {
-								if (params.query&&params.query.phone) {
-									e.setAttribute('value',params.query.phone);
-									e.value = params.query.phone;
-								} else {
-									e.value = '';
-								}
-							};
-						}
-					],
-					'ident' : [
-						['render'],
-						function(e) {
-							return function() {
-								if (params.query&&params.query.ident) {
-									e.setAttribute('value',params.query.ident);
-									e.value = params.query.ident;
-								} else if (params.query&&params.query.ident_value) {
-									e.setAttribute('value',params.query.ident_value);
-									e.value = params.query.ident_value;
-								} else if (params.query&&params.query.ident_value2) {
-									e.setAttribute('value',params.query.ident_value2);
-									e.value = params.query.ident_value2;
-								} else {
-									e.value = '';
-								}
-							};
-						}
-					],
-					'street1' : [
-						['render'],
-						function(e) {
-							return function() {
-								if (params.query&&params.query.street1) {
-									e.setAttribute('value',params.query.street1);
-									e.value = params.query.street1;
-								} else {
-									e.value = '';
-								}
-							};
-						}
-					],
-					'street2' : [
-						['render'],
-						function(e) {
-							return function() {
-								if (params.query&&params.query.street2) {
-									e.setAttribute('value',params.query.street2);
-									e.value = params.query.street2;
-								} else {
-									e.value = '';
-								}
-							};
-						}
-					],
-					'city' : [
-						['render'],
-						function(e) {
-							return function() {
-								if (params.query&&params.query.city) {
-									e.setAttribute('value',params.query.city);
-									e.value = params.query.city;
-								} else {
-									e.value = '';
-								}
-							};
-						}
-					],
-					'state' : [
-						['render'],
-						function(e) {
-							return function() {
-								if (params.query&&params.query.state) {
-									e.setAttribute('value',params.query.state);
-									e.value = params.query.state;
-								} else {
-									e.value = '';
-								}
-							};
-						}
-					],
-					'post_code' : [
-						['render'],
-						function(e) {
-							return function() {
-								if (params.query&&params.query.post_code) {
-									e.setAttribute('value',params.query.post_code);
-									e.value = params.query.post_code;
-								} else {
-									e.value = '';
-								}
-							};
-						}
-					],
-					'inactive' : [ ['render'], function(e) { 
+  JSAN.use('util.controller'); obj.controller = new util.controller();
+  obj.controller.init(
+   {
+    control_map : {
+     'cmd_broken' : [
+      ['command'],
+      function() { alert($("commonStrings").getString('common.unimplemented')); }
+     ],
+     'cmd_patron_search_submit' : [
+      ['command'],
+      function() {
+       obj.submit();
+      }
+     ],
+     'cmd_patron_search_clear' : [
+      ['command'],
+      function() { 
+       obj.controller.render(); 
+       window.xulG.clear_left_deck();
+      }
+     ],
+     'family_name' : [
+      ['render'],
+      function(e) {
+       return function() {
+        if (params.query&&params.query.family_name) {
+         e.setAttribute('value',params.query.family_name);
+         e.value = params.query.family_name;
+        } else {
+         e.value = '';
+        }
+       };
+      }
+     ],
+     'first_given_name' : [
+      ['render'],
+      function(e) {
+       return function() {
+        if (params.query&&params.query.first_given_name) {
+         e.setAttribute('value',params.query.first_given_name);
+         e.value = params.query.first_given_name;
+        } else {
+         e.value = '';
+        }
+       };
+      }
+     ],
+     'second_given_name' : [
+      ['render'],
+      function(e) {
+       return function() {
+        if (params.query&&params.query.second_given_name) {
+         e.setAttribute('value',params.query.second_given_name);
+         e.value = params.query.second_given_name;
+        } else {
+         e.value = '';
+        }
+       };
+      }
+     ],
+     'alias' : [
+      ['render'],
+      function(e) {
+       return function() {
+        if (params.query&&params.query.alias) {
+         e.setAttribute('value',params.query.alias);
+         e.value = params.query.alias;
+        } else {
+         e.value = '';
+        }
+       };
+      }
+     ],
+     'usrname' : [
+      ['render'],
+      function(e) {
+       return function() {
+        if (params.query&&params.query.usrname) {
+         e.setAttribute('value',params.query.usrname);
+         e.value = params.query.usrname;
+        } else {
+         e.value = '';
+        }
+       };
+      }
+     ],
+     'card' : [
+      ['render'],
+      function(e) {
+       return function() {
+        if (params.query&&params.query.card) {
+         e.setAttribute('value',params.query.card);
+         e.value = params.query.card;
+        } else {
+         e.value = '';
+        }
+       };
+      }
+     ],
+     'email' : [
+      ['render'],
+      function(e) {
+       return function() {
+        if (params.query&&params.query.email) {
+         e.setAttribute('value',params.query.email);
+         e.value = params.query.email;
+        } else {
+         e.value = '';
+        }
+       };
+      }
+     ],
+     'phone' : [
+      ['render'],
+      function(e) {
+       return function() {
+        if (params.query&&params.query.phone) {
+         e.setAttribute('value',params.query.phone);
+         e.value = params.query.phone;
+        } else {
+         e.value = '';
+        }
+       };
+      }
+     ],
+     'ident' : [
+      ['render'],
+      function(e) {
+       return function() {
+        if (params.query&&params.query.ident) {
+         e.setAttribute('value',params.query.ident);
+         e.value = params.query.ident;
+        } else if (params.query&&params.query.ident_value) {
+         e.setAttribute('value',params.query.ident_value);
+         e.value = params.query.ident_value;
+        } else if (params.query&&params.query.ident_value2) {
+         e.setAttribute('value',params.query.ident_value2);
+         e.value = params.query.ident_value2;
+        } else {
+         e.value = '';
+        }
+       };
+      }
+     ],
+     'street1' : [
+      ['render'],
+      function(e) {
+       return function() {
+        if (params.query&&params.query.street1) {
+         e.setAttribute('value',params.query.street1);
+         e.value = params.query.street1;
+        } else {
+         e.value = '';
+        }
+       };
+      }
+     ],
+     'street2' : [
+      ['render'],
+      function(e) {
+       return function() {
+        if (params.query&&params.query.street2) {
+         e.setAttribute('value',params.query.street2);
+         e.value = params.query.street2;
+        } else {
+         e.value = '';
+        }
+       };
+      }
+     ],
+     'city' : [
+      ['render'],
+      function(e) {
+       return function() {
+        if (params.query&&params.query.city) {
+         e.setAttribute('value',params.query.city);
+         e.value = params.query.city;
+        } else {
+         e.value = '';
+        }
+       };
+      }
+     ],
+     'state' : [
+      ['render'],
+      function(e) {
+       return function() {
+        if (params.query&&params.query.state) {
+         e.setAttribute('value',params.query.state);
+         e.value = params.query.state;
+        } else {
+         e.value = '';
+        }
+       };
+      }
+     ],
+     'post_code' : [
+      ['render'],
+      function(e) {
+       return function() {
+        if (params.query&&params.query.post_code) {
+         e.setAttribute('value',params.query.post_code);
+         e.value = params.query.post_code;
+        } else {
+         e.value = '';
+        }
+       };
+      }
+     ],
+     'inactive' : [ ['render'], function(e) { 
                             return function() {}; 
                         } 
                     ],
@@ -234,19 +234,19 @@ patron.search_form.prototype = {
                             return function() {};
                         }
                     ],
-				}
-			}
-		);
+    }
+   }
+  );
 
-		obj.controller.render();
-		var nl = document.getElementsByTagName('textbox');
-		for (var i = 0; i < nl.length; i++) {
-			nl[i].addEventListener('keypress',function(ev){
-				if (ev.target.tagName != 'textbox') return;
-				if (ev.keyCode == 13 /* enter */ || ev.keyCode == 77 /* enter on a mac */) setTimeout( function() { obj.submit(); }, 0);
-			},false);
-		}
-		document.getElementById('family_name').focus();
+  obj.controller.render();
+  var nl = document.getElementsByTagName('textbox');
+  for (var i = 0; i < nl.length; i++) {
+   nl[i].addEventListener('keypress',function(ev){
+    if (ev.target.tagName != 'textbox') return;
+    if (ev.keyCode == 13 /* enter */ || ev.keyCode == 77 /* enter on a mac */) setTimeout( function() { obj.submit(); }, 0);
+   },false);
+  }
+  document.getElementById('family_name').focus();
 
         JSAN.use('util.file'); JSAN.use('util.widgets'); JSAN.use('util.functional');
         util.widgets.remove_children(obj.controller.view.search_depth);
@@ -272,13 +272,13 @@ patron.search_form.prototype = {
         ml.setAttribute('id','search_depth_ml');
         obj.controller.view.search_depth.appendChild(ml);
 
-		var file = new util.file('patron_search_prefs.'+obj.OpenILS.data.server_unadorned);
-		util.widgets.load_attributes(file);
-		ml.value = ml.getAttribute('value');
-		if (! ml.value) {
-			ml.value = 0
-			ml.setAttribute('value',ml.value);
-		}
+  var file = new util.file('patron_search_prefs.'+obj.OpenILS.data.server_unadorned);
+  util.widgets.load_attributes(file);
+  ml.value = ml.getAttribute('value');
+  if (! ml.value) {
+   ml.value = 0
+   ml.setAttribute('value',ml.value);
+  }
 
         var cb = obj.controller.view.inactive;
         cb.addEventListener('command',function() { 
@@ -289,56 +289,56 @@ patron.search_form.prototype = {
         );
         cb.checked = cb.getAttribute('value') == "true" ? true : false;
 
-	},
+ },
 
-	'on_submit' : function(q) {
-		var msg = 'Query = ' + q;
-		this.error.sdump('D_PATRON', msg);
-	},
+ 'on_submit' : function(q) {
+  var msg = 'Query = ' + q;
+  this.error.sdump('D_PATRON', msg);
+ },
 
-	'submit' : function() {
-		window.xulG.clear_left_deck();
-		var obj = this;
-		var query = {};
-		for (var i = 0; i < obj.controller.render_list.length; i++) {
-    		var id = obj.controller.render_list[i][0];
-    		var node = document.getElementById(id);
-			if (node && node.value != '') {
-				if (id == 'inactive') {
-					query[id] = node.getAttribute('value');
-					obj.error.sdump('D_DEBUG','id = ' + id + '  value = ' + node.getAttribute('value') + '\n');
+ 'submit' : function() {
+  window.xulG.clear_left_deck();
+  var obj = this;
+  var query = {};
+  for (var i = 0; i < obj.controller.render_list.length; i++) {
+      var id = obj.controller.render_list[i][0];
+      var node = document.getElementById(id);
+   if (node && node.value != '') {
+    if (id == 'inactive') {
+     query[id] = node.getAttribute('value');
+     obj.error.sdump('D_DEBUG','id = ' + id + '  value = ' + node.getAttribute('value') + '\n');
                 } else {
                     if (id == 'search_depth') {
                         query[id] = node.firstChild.getAttribute('value'); 
-    				} else {
-     					var value = node.value.replace(/^\s+/,'').replace(/[\\\s]+$/,'');
-    					//value = value.replace(/\d/g,'');
-    					switch(id) {
-    						case 'family_name' :
-    						case 'first_given_name' :
-    						case 'second_given_name' :
-    							value = value.replace(/^[\d\s]+/g,'').replace(/[\d\s]+$/g,'')
-    						break;
-    					}
-    					if (value != '') {
-    						query[id] = value;
-    						obj.error.sdump('D_DEBUG','id = ' + id + '  value = ' + value + '\n');
-    					}
-    				}
+        } else {
+          var value = node.value.replace(/^\s+/,'').replace(/[\\\s]+$/,'');
+         //value = value.replace(/\d/g,'');
+         switch(id) {
+          case 'family_name' :
+          case 'first_given_name' :
+          case 'second_given_name' :
+           value = value.replace(/^[\d\s]+/g,'').replace(/[\d\s]+$/g,'')
+          break;
+         }
+         if (value != '') {
+          query[id] = value;
+          obj.error.sdump('D_DEBUG','id = ' + id + '  value = ' + value + '\n');
+         }
+        }
                 }
-			}
-		}
-		if (typeof obj.on_submit == 'function') {
-			obj.on_submit(query);
-		}
-		if (typeof window.xulG == 'object' 
-			&& typeof window.xulG.on_submit == 'function') {
-			obj.error.sdump('D_PATRON','patron.search_form: Calling external .on_submit()\n');
-			window.xulG.on_submit(query);
-		} else {
-			obj.error.sdump('D_PATRON','patron.search_form: No external .on_query()\n');
-		}
-	},
+   }
+  }
+  if (typeof obj.on_submit == 'function') {
+   obj.on_submit(query);
+  }
+  if (typeof window.xulG == 'object' 
+   && typeof window.xulG.on_submit == 'function') {
+   obj.error.sdump('D_PATRON','patron.search_form: Calling external .on_submit()\n');
+   window.xulG.on_submit(query);
+  } else {
+   obj.error.sdump('D_PATRON','patron.search_form: No external .on_query()\n');
+  }
+ },
 
 }
 
diff --git a/Open-ILS/xul/staff_client/server/patron/search_form.xul b/Open-ILS/xul/staff_client/server/patron/search_form.xul
index 494e4cb9c6..c10dc89735 100644
--- a/Open-ILS/xul/staff_client/server/patron/search_form.xul
+++ b/Open-ILS/xul/staff_client/server/patron/search_form.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -21,78 +21,78 @@
 <?xul-overlay href="/xul/server/patron/search_form_overlay.xul"?>
 
 <window id="patron_search_form_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-		
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for patron_search_form.xul');
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  function $(id) { return document.getElementById(id); }
+  
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for patron_search_form.xul');
 
-				g.cgi = new CGI();
-				var keys = g.cgi.keys();
-				var query = {};
-				for (var i = 0; i < keys.length; i++) {
-					query[keys[i]] = g.cgi.param(keys[i]);
-				}
-				if (xulG.query) {
-					for (var i in xulG.query) {
+    g.cgi = new CGI();
+    var keys = g.cgi.keys();
+    var query = {};
+    for (var i = 0; i < keys.length; i++) {
+     query[keys[i]] = g.cgi.param(keys[i]);
+    }
+    if (xulG.query) {
+     for (var i in xulG.query) {
                         if (typeof xulG.query[i] == 'object') { xulG.query[i] = xulG.query[i].value; }
-						query[i] = xulG.query[i];
-					}
-				}
+      query[i] = xulG.query[i];
+     }
+    }
 
-				JSAN.use('patron.search_form'); g.search_form = new patron.search_form();
-				g.search_form.init( { 'query' : query } );
+    JSAN.use('patron.search_form'); g.search_form = new patron.search_form();
+    g.search_form.init( { 'query' : query } );
 
-				if (g.cgi.param('doit')||xulG.doit) {
-					g.search_form.submit();
-				}
-	
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/search_form.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-		
-		function default_focus() {
-			setTimeout(
-				function() {
-					try {
-						netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-						document.getElementById('family_name').focus();
-					} catch(E) {
-						g.error.sdump('D_ERROR','default_focus(): ' + js2JSON(E));
-					}
-				}, 0
-			);
-		}
+    if (g.cgi.param('doit')||xulG.doit) {
+     g.search_form.submit();
+    }
+ 
+   } catch(E) {
+    var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/search_form.xul', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+  
+  function default_focus() {
+   setTimeout(
+    function() {
+     try {
+      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+      document.getElementById('family_name').focus();
+     } catch(E) {
+      g.error.sdump('D_ERROR','default_focus(): ' + js2JSON(E));
+     }
+    }, 0
+   );
+  }
 
 
-	]]>
-	</script>
-	
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+ ]]>
+ </script>
+ 
+ <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
-	<commandset id="patron_search_form_cmds">
-	</commandset>
+ <commandset id="patron_search_form_cmds">
+ </commandset>
 
-	<box id="patron_search_form_main" />
+ <box id="patron_search_form_main" />
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/search_form_horiz.xul b/Open-ILS/xul/staff_client/server/patron/search_form_horiz.xul
index 245f4b5e82..589715c935 100644
--- a/Open-ILS/xul/staff_client/server/patron/search_form_horiz.xul
+++ b/Open-ILS/xul/staff_client/server/patron/search_form_horiz.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -20,78 +20,78 @@
 <?xul-overlay href="/xul/server/patron/search_form_horiz_overlay.xul"?>
 
 <window id="patron_search_form_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-		
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for patron_search_form.xul');
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  function $(id) { return document.getElementById(id); }
+  
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for patron_search_form.xul');
 
-				g.cgi = new CGI();
-				var keys = g.cgi.keys();
-				var query = {};
-				for (var i = 0; i < keys.length; i++) {
-					query[keys[i]] = g.cgi.param(keys[i]);
-				}
-				if (xulG.query) {
-					for (var i in xulG.query) {
+    g.cgi = new CGI();
+    var keys = g.cgi.keys();
+    var query = {};
+    for (var i = 0; i < keys.length; i++) {
+     query[keys[i]] = g.cgi.param(keys[i]);
+    }
+    if (xulG.query) {
+     for (var i in xulG.query) {
                         if (typeof xulG.query[i] == 'object') { xulG.query[i] = xulG.query[i].value; }
-						query[i] = xulG.query[i];
-					}
-				}
+      query[i] = xulG.query[i];
+     }
+    }
 
-				JSAN.use('patron.search_form'); g.search_form = new patron.search_form();
-				g.search_form.init( { 'query' : query } );
+    JSAN.use('patron.search_form'); g.search_form = new patron.search_form();
+    g.search_form.init( { 'query' : query } );
 
-				if (g.cgi.param('doit')||xulG.doit) {
-					g.search_form.submit();
-				}
-	
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/search_form_horiz.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-		
-		function default_focus() {
-			setTimeout(
-				function() {
-					try {
-						netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-						document.getElementById('family_name').focus();
-					} catch(E) {
-						g.error.sdump('D_ERROR','default_focus(): ' + js2JSON(E));
-					}
-				}, 0
-			);
-		}
+    if (g.cgi.param('doit')||xulG.doit) {
+     g.search_form.submit();
+    }
+ 
+   } catch(E) {
+    var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/search_form_horiz.xul', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+  
+  function default_focus() {
+   setTimeout(
+    function() {
+     try {
+      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+      document.getElementById('family_name').focus();
+     } catch(E) {
+      g.error.sdump('D_ERROR','default_focus(): ' + js2JSON(E));
+     }
+    }, 0
+   );
+  }
 
 
-	]]>
-	</script>
-	
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+ ]]>
+ </script>
+ 
+ <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
-	<commandset id="patron_search_form_cmds">
-	</commandset>
+ <commandset id="patron_search_form_cmds">
+ </commandset>
 
-	<box id="patron_search_form_main" />
+ <box id="patron_search_form_main" />
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/search_form_horiz_overlay.xul b/Open-ILS/xul/staff_client/server/patron/search_form_horiz_overlay.xul
index 3ccb7c7af5..99ae32af59 100644
--- a/Open-ILS/xul/staff_client/server/patron/search_form_horiz_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/search_form_horiz_overlay.xul
@@ -6,18 +6,18 @@
 
 
 <overlay id="patron_search_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading patron/search_overlay.xul\n');</script>
 
 <commandset id="patron_search_form_cmds">
-	<command id="cmd_patron_search_submit" />
-	<command id="cmd_patron_search_clear" />
+ <command id="cmd_patron_search_submit" />
+ <command id="cmd_patron_search_clear" />
 </commandset>
 
 <box id="patron_search_form_main" orient="vertical" class="my_overflow">
-	<groupbox id="psgf_gb">
-		<caption id="psgf_gbc" label='&staff.patron_search_form.caption;' />
+ <groupbox id="psgf_gb">
+  <caption id="psgf_gbc" label='&staff.patron_search_form.caption;' />
         <hbox>
             <hbox>
                 <label control="inactive" accesskey="&staff.patron.search_form_overlay.inactive.accesskey;" value="&staff.patron.search_form_overlay.inactive.value;"/>
@@ -39,88 +39,88 @@
                     command="cmd_patron_search_clear"/>
             </vbox>
         </hbox>
-	</groupbox>
+ </groupbox>
 </box>
 
 <!-- group 0 = user  group 1 = address  group 2 = phone, ident -->
 
 <grid id="psg">
-	<columns id="psc">
-		<column id="psc1"/>
-		<column id="psc2" flex="1"/>
-		<column id="psc3"/>
-		<column id="psc4" flex="1"/>
-		<column id="psc5"/>
-		<column id="psc6" flex="1"/>
-		<column id="psc7"/>
-		<column id="psc8" flex="1"/>
-	</columns>
-	<rows id="psr">
-		<row id="psr1">
-			<label id="psl1" control="family_name" 
-				value="&staff.patron_search_form.family_name.label;" 
-				accesskey="&staff.patron_search_form.family_name.accesskey;"/>
-			<textbox id="family_name" group="0" context="clipboard"/>
-			<label id="psl7" control="street1" 
-				value="&staff.patron_search_form.street1.label;" 
-				accesskey="&staff.patron_search_form.street1.accesskey;"/>
-			<textbox id="street1" group="1" context="clipboard"/>
-			<label id="psl5" control="phone" 
-				value="&staff.patron_search_form.phone.label;" 
-				accesskey="&staff.patron_search_form.phone.accesskey;"/>
-			<textbox id="phone" group="2" context="clipboard"/>
-			<label id="psl6c" control="card" 
-				value="&staff.patron_search_form.card.label;" 
-				accesskey="&staff.patron_search_form.card.accesskey;"/>
-			<textbox id="card" group="0" context="clipboard"/>
-		</row>
-		<row id="psr2">
-			<label id="psl2" control="first_given_name" 
-				value="&staff.patron_search_form.first_given_name.label;" 
-				accesskey="&staff.patron_search_form.first_given_name.accesskey;"/>
-			<textbox id="first_given_name" group="0" context="clipboard"/>
-			<label id="psl8" control="street2" 
-				value="&staff.patron_search_form.street2.label;" 
-				accesskey="&staff.patron_search_form.street2.accesskey;"/>
-			<textbox id="street2" group="1" context="clipboard"/>
-			<label id="psl4" control="email" 
-				value="&staff.patron_search_form.email.label;" 
-				accesskey="&staff.patron_search_form.email.accesskey;"/>
-			<textbox id="email" group="0" context="clipboard"/>
-			<label id="psl6b" control="usrname" 
-				value="&staff.patron_search_form.usrname.label;" 
-				accesskey="&staff.patron_search_form.usrname.accesskey;"/>
-			<textbox id="usrname" group="0" context="clipboard"/>
-		</row>
-		<row id="psr3">
-			<label id="psl3" control="second_given_name" 
-				value="&staff.patron_search_form.second_given_name.label;" 
-				accesskey="&staff.patron_search_form.second_given_name.accesskey;"/>
-			<textbox id="second_given_name" group="0" context="clipboard"/>
-			<label id="psl9" control="city" 
-				value="&staff.patron_search_form.city.label;" 
-				accesskey="&staff.patron_search_form.city.accesskey;"/>
-			<textbox id="city" group="1" context="clipboard"/>
-			<label id="psl10" control="state" 
-				value="&staff.patron_search_form.state.label;" 
-				accesskey="&staff.patron_search_form.state.accesskey;"/>
-			<textbox id="state" group="1" context="clipboard"/>
-			<label id="psl6" control="ident" 
-				value="&staff.patron_search_form.ident.label;" 
-				accesskey="&staff.patron_search_form.ident.accesskey;"/>
-			<textbox id="ident" group="2" context="clipboard"/>
-		</row>
-		<row id="psr14">
-			<label id="psl14" control="alias" 
-				value="&staff.patron_search_form.alias.label;" 
-				accesskey="&staff.patron_search_form.alias.accesskey;"/>
-			<textbox id="alias" group="0" context="clipboard"/>
-			<label id="psl11" control="post_code" 
-				value="&staff.patron_search_form.post_code.label;" 
-				accesskey="&staff.patron_search_form.post_code.accesskey;"/>
-			<textbox id="post_code" group="1" context="clipboard"/>
-		</row>
-	</rows>
+ <columns id="psc">
+  <column id="psc1"/>
+  <column id="psc2" flex="1"/>
+  <column id="psc3"/>
+  <column id="psc4" flex="1"/>
+  <column id="psc5"/>
+  <column id="psc6" flex="1"/>
+  <column id="psc7"/>
+  <column id="psc8" flex="1"/>
+ </columns>
+ <rows id="psr">
+  <row id="psr1">
+   <label id="psl1" control="family_name" 
+    value="&staff.patron_search_form.family_name.label;" 
+    accesskey="&staff.patron_search_form.family_name.accesskey;"/>
+   <textbox id="family_name" group="0" context="clipboard"/>
+   <label id="psl7" control="street1" 
+    value="&staff.patron_search_form.street1.label;" 
+    accesskey="&staff.patron_search_form.street1.accesskey;"/>
+   <textbox id="street1" group="1" context="clipboard"/>
+   <label id="psl5" control="phone" 
+    value="&staff.patron_search_form.phone.label;" 
+    accesskey="&staff.patron_search_form.phone.accesskey;"/>
+   <textbox id="phone" group="2" context="clipboard"/>
+   <label id="psl6c" control="card" 
+    value="&staff.patron_search_form.card.label;" 
+    accesskey="&staff.patron_search_form.card.accesskey;"/>
+   <textbox id="card" group="0" context="clipboard"/>
+  </row>
+  <row id="psr2">
+   <label id="psl2" control="first_given_name" 
+    value="&staff.patron_search_form.first_given_name.label;" 
+    accesskey="&staff.patron_search_form.first_given_name.accesskey;"/>
+   <textbox id="first_given_name" group="0" context="clipboard"/>
+   <label id="psl8" control="street2" 
+    value="&staff.patron_search_form.street2.label;" 
+    accesskey="&staff.patron_search_form.street2.accesskey;"/>
+   <textbox id="street2" group="1" context="clipboard"/>
+   <label id="psl4" control="email" 
+    value="&staff.patron_search_form.email.label;" 
+    accesskey="&staff.patron_search_form.email.accesskey;"/>
+   <textbox id="email" group="0" context="clipboard"/>
+   <label id="psl6b" control="usrname" 
+    value="&staff.patron_search_form.usrname.label;" 
+    accesskey="&staff.patron_search_form.usrname.accesskey;"/>
+   <textbox id="usrname" group="0" context="clipboard"/>
+  </row>
+  <row id="psr3">
+   <label id="psl3" control="second_given_name" 
+    value="&staff.patron_search_form.second_given_name.label;" 
+    accesskey="&staff.patron_search_form.second_given_name.accesskey;"/>
+   <textbox id="second_given_name" group="0" context="clipboard"/>
+   <label id="psl9" control="city" 
+    value="&staff.patron_search_form.city.label;" 
+    accesskey="&staff.patron_search_form.city.accesskey;"/>
+   <textbox id="city" group="1" context="clipboard"/>
+   <label id="psl10" control="state" 
+    value="&staff.patron_search_form.state.label;" 
+    accesskey="&staff.patron_search_form.state.accesskey;"/>
+   <textbox id="state" group="1" context="clipboard"/>
+   <label id="psl6" control="ident" 
+    value="&staff.patron_search_form.ident.label;" 
+    accesskey="&staff.patron_search_form.ident.accesskey;"/>
+   <textbox id="ident" group="2" context="clipboard"/>
+  </row>
+  <row id="psr14">
+   <label id="psl14" control="alias" 
+    value="&staff.patron_search_form.alias.label;" 
+    accesskey="&staff.patron_search_form.alias.accesskey;"/>
+   <textbox id="alias" group="0" context="clipboard"/>
+   <label id="psl11" control="post_code" 
+    value="&staff.patron_search_form.post_code.label;" 
+    accesskey="&staff.patron_search_form.post_code.accesskey;"/>
+   <textbox id="post_code" group="1" context="clipboard"/>
+  </row>
+ </rows>
 </grid>
 
 
diff --git a/Open-ILS/xul/staff_client/server/patron/search_form_overlay.xul b/Open-ILS/xul/staff_client/server/patron/search_form_overlay.xul
index b2b820b4bf..cd8bafe04a 100644
--- a/Open-ILS/xul/staff_client/server/patron/search_form_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/search_form_overlay.xul
@@ -6,138 +6,138 @@
 
 
 <overlay id="patron_search_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading patron/search_overlay.xul\n');</script>
 
 <commandset id="patron_search_form_cmds">
-	<command id="cmd_patron_search_submit" />
-	<command id="cmd_patron_search_clear" />
+ <command id="cmd_patron_search_submit" />
+ <command id="cmd_patron_search_clear" />
 </commandset>
 
 <box id="patron_search_form_main" orient="vertical" class="my_overflow">
-	<groupbox id="psgf_gb">
-		<caption id="psgf_gbc" label='&staff.patron_search_form.caption;' />
-		<grid id="psg" />
-	</groupbox>
+ <groupbox id="psgf_gb">
+  <caption id="psgf_gbc" label='&staff.patron_search_form.caption;' />
+  <grid id="psg" />
+ </groupbox>
 </box>
 
 <!-- group 0 = user  group 1 = address  group 2 = phone, ident -->
 
 <grid id="psg">
-	<columns id="psc">
-		<column id="psc1"/>
-		<column id="psc2" flex="1"/>
-	</columns>
-	<rows id="psr">
-		<row>
-			<label control="inactive" accesskey="&staff.patron.search_form_overlay.inactive.accesskey;" value="&staff.patron.search_form_overlay.inactive.value;"/>
-			<checkbox id="inactive" />
+ <columns id="psc">
+  <column id="psc1"/>
+  <column id="psc2" flex="1"/>
+ </columns>
+ <rows id="psr">
+  <row>
+   <label control="inactive" accesskey="&staff.patron.search_form_overlay.inactive.accesskey;" value="&staff.patron.search_form_overlay.inactive.value;"/>
+   <checkbox id="inactive" />
         </row>
         <row>
-			<label control="search_range_menu" value="&staff.patron.search_form_overlay.search_range_menu.value;"/>
+   <label control="search_range_menu" value="&staff.patron.search_form_overlay.search_range_menu.value;"/>
             <hbox id="search_depth" />
-		</row>
-		<row id="psr1">
-			<label id="psl1" control="family_name" 
-				value="&staff.patron_search_form.family_name.label;" 
-				accesskey="&staff.patron_search_form.family_name.accesskey;"/>
-			<textbox id="family_name" group="0" context="clipboard"/>
-		</row>
-		<row id="psr2">
-			<label id="psl2" control="first_given_name" 
-				value="&staff.patron_search_form.first_given_name.label;" 
-				accesskey="&staff.patron_search_form.first_given_name.accesskey;"/>
-			<textbox id="first_given_name" group="0" context="clipboard"/>
-		</row>
-		<row id="psr3">
-			<label id="psl3" control="second_given_name" 
-				value="&staff.patron_search_form.second_given_name.label;" 
-				accesskey="&staff.patron_search_form.second_given_name.accesskey;"/>
-			<textbox id="second_given_name" group="0" context="clipboard"/>
-		</row>
-		<row id="psr14">
-			<label id="psl14" control="alias" 
-				value="&staff.patron_search_form.alias.label;" 
-				accesskey="&staff.patron_search_form.alias.accesskey;"/>
-			<textbox id="alias" group="0" context="clipboard"/>
-		</row>
-		<row id="psr4">
-			<label id="psl4" control="email" 
-				value="&staff.patron_search_form.email.label;" 
-				accesskey="&staff.patron_search_form.email.accesskey;"/>
-			<textbox id="email" group="0" context="clipboard"/>
-		</row>
-		<row id="psr5">
-			<label id="psl5" control="phone" 
-				value="&staff.patron_search_form.phone.label;" 
-				accesskey="&staff.patron_search_form.phone.accesskey;"/>
-			<textbox id="phone" group="2" context="clipboard"/>
-		</row>
-		<row id="psr6">
-			<label id="psl6" control="ident" 
-				value="&staff.patron_search_form.ident.label;" 
-				accesskey="&staff.patron_search_form.ident.accesskey;"/>
-			<textbox id="ident" group="2" context="clipboard"/>
-		</row>
-		<row id="psr6b">
-			<label id="psl6b" control="usrname" 
-				value="&staff.patron_search_form.usrname.label;" 
-				accesskey="&staff.patron_search_form.usrname.accesskey;"/>
-			<textbox id="usrname" group="0" context="clipboard"/>
-		</row>
-		<row id="psr6c">
-			<label id="psl6c" control="card" 
-				value="&staff.patron_search_form.card.label;" 
-				accesskey="&staff.patron_search_form.card.accesskey;"/>
-			<textbox id="card" group="0" context="clipboard"/>
-		</row>
-		<row id="psr6a">
-			<label id="psl6a" value=" "/>
-		</row>
-		<row id="psr7">
-			<label id="psl7" control="street1" 
-				value="&staff.patron_search_form.street1.label;" 
-				accesskey="&staff.patron_search_form.street1.accesskey;"/>
-			<textbox id="street1" group="1" context="clipboard"/>
-		</row>
-		<row id="psr8">
-			<label id="psl8" control="street2" 
-				value="&staff.patron_search_form.street2.label;" 
-				accesskey="&staff.patron_search_form.street2.accesskey;"/>
-			<textbox id="street2" group="1" context="clipboard"/>
-		</row>
-		<row id="psr9">
-			<label id="psl9" control="city" 
-				value="&staff.patron_search_form.city.label;" 
-				accesskey="&staff.patron_search_form.city.accesskey;"/>
-			<textbox id="city" group="1" context="clipboard"/>
-		</row>
-		<row id="psr10" hidden="true">
-			<label id="psl10" control="state" 
-				value="&staff.patron_search_form.state.label;" 
-				accesskey="&staff.patron_search_form.state.accesskey;"/>
-			<textbox id="state" group="1" context="clipboard"/>
-		</row>
-		<row id="psr11">
-			<label id="psl11" control="post_code" 
-				value="&staff.patron_search_form.post_code.label;" 
-				accesskey="&staff.patron_search_form.post_code.accesskey;"/>
-			<textbox id="post_code" group="1" context="clipboard"/>
-		</row>
-		<row id="psr12">
-			<spacer id="pss12"/>
-			<button id="search" label="&staff.patron_search_form.search.label;" 
-				accesskey="&staff.patron_search_form.search.accesskey;"
-				command="cmd_patron_search_submit"/>
-		</row>
-		<row id="psr13">
-			<spacer id="pss13"/>
-			<button id="clear" label="&staff.patron_search_form.clear.label;" 
-				accesskey="&staff.patron_search_form.clear.accesskey;"
-				command="cmd_patron_search_clear"/>
-		</row>
-	</rows>
+  </row>
+  <row id="psr1">
+   <label id="psl1" control="family_name" 
+    value="&staff.patron_search_form.family_name.label;" 
+    accesskey="&staff.patron_search_form.family_name.accesskey;"/>
+   <textbox id="family_name" group="0" context="clipboard"/>
+  </row>
+  <row id="psr2">
+   <label id="psl2" control="first_given_name" 
+    value="&staff.patron_search_form.first_given_name.label;" 
+    accesskey="&staff.patron_search_form.first_given_name.accesskey;"/>
+   <textbox id="first_given_name" group="0" context="clipboard"/>
+  </row>
+  <row id="psr3">
+   <label id="psl3" control="second_given_name" 
+    value="&staff.patron_search_form.second_given_name.label;" 
+    accesskey="&staff.patron_search_form.second_given_name.accesskey;"/>
+   <textbox id="second_given_name" group="0" context="clipboard"/>
+  </row>
+  <row id="psr14">
+   <label id="psl14" control="alias" 
+    value="&staff.patron_search_form.alias.label;" 
+    accesskey="&staff.patron_search_form.alias.accesskey;"/>
+   <textbox id="alias" group="0" context="clipboard"/>
+  </row>
+  <row id="psr4">
+   <label id="psl4" control="email" 
+    value="&staff.patron_search_form.email.label;" 
+    accesskey="&staff.patron_search_form.email.accesskey;"/>
+   <textbox id="email" group="0" context="clipboard"/>
+  </row>
+  <row id="psr5">
+   <label id="psl5" control="phone" 
+    value="&staff.patron_search_form.phone.label;" 
+    accesskey="&staff.patron_search_form.phone.accesskey;"/>
+   <textbox id="phone" group="2" context="clipboard"/>
+  </row>
+  <row id="psr6">
+   <label id="psl6" control="ident" 
+    value="&staff.patron_search_form.ident.label;" 
+    accesskey="&staff.patron_search_form.ident.accesskey;"/>
+   <textbox id="ident" group="2" context="clipboard"/>
+  </row>
+  <row id="psr6b">
+   <label id="psl6b" control="usrname" 
+    value="&staff.patron_search_form.usrname.label;" 
+    accesskey="&staff.patron_search_form.usrname.accesskey;"/>
+   <textbox id="usrname" group="0" context="clipboard"/>
+  </row>
+  <row id="psr6c">
+   <label id="psl6c" control="card" 
+    value="&staff.patron_search_form.card.label;" 
+    accesskey="&staff.patron_search_form.card.accesskey;"/>
+   <textbox id="card" group="0" context="clipboard"/>
+  </row>
+  <row id="psr6a">
+   <label id="psl6a" value=" "/>
+  </row>
+  <row id="psr7">
+   <label id="psl7" control="street1" 
+    value="&staff.patron_search_form.street1.label;" 
+    accesskey="&staff.patron_search_form.street1.accesskey;"/>
+   <textbox id="street1" group="1" context="clipboard"/>
+  </row>
+  <row id="psr8">
+   <label id="psl8" control="street2" 
+    value="&staff.patron_search_form.street2.label;" 
+    accesskey="&staff.patron_search_form.street2.accesskey;"/>
+   <textbox id="street2" group="1" context="clipboard"/>
+  </row>
+  <row id="psr9">
+   <label id="psl9" control="city" 
+    value="&staff.patron_search_form.city.label;" 
+    accesskey="&staff.patron_search_form.city.accesskey;"/>
+   <textbox id="city" group="1" context="clipboard"/>
+  </row>
+  <row id="psr10" hidden="true">
+   <label id="psl10" control="state" 
+    value="&staff.patron_search_form.state.label;" 
+    accesskey="&staff.patron_search_form.state.accesskey;"/>
+   <textbox id="state" group="1" context="clipboard"/>
+  </row>
+  <row id="psr11">
+   <label id="psl11" control="post_code" 
+    value="&staff.patron_search_form.post_code.label;" 
+    accesskey="&staff.patron_search_form.post_code.accesskey;"/>
+   <textbox id="post_code" group="1" context="clipboard"/>
+  </row>
+  <row id="psr12">
+   <spacer id="pss12"/>
+   <button id="search" label="&staff.patron_search_form.search.label;" 
+    accesskey="&staff.patron_search_form.search.accesskey;"
+    command="cmd_patron_search_submit"/>
+  </row>
+  <row id="psr13">
+   <spacer id="pss13"/>
+   <button id="clear" label="&staff.patron_search_form.clear.label;" 
+    accesskey="&staff.patron_search_form.clear.accesskey;"
+    command="cmd_patron_search_clear"/>
+  </row>
+ </rows>
 </grid>
 
 
diff --git a/Open-ILS/xul/staff_client/server/patron/search_result.js b/Open-ILS/xul/staff_client/server/patron/search_result.js
index 44ba0a0ae0..fe7b2ee09a 100644
--- a/Open-ILS/xul/staff_client/server/patron/search_result.js
+++ b/Open-ILS/xul/staff_client/server/patron/search_result.js
@@ -5,233 +5,233 @@ function $(id) { return document.getElementById(id); }
 if (typeof patron == 'undefined') patron = {};
 patron.search_result = function (params) {
 
-	JSAN.use('util.error'); this.error = new util.error();
-	JSAN.use('util.network'); this.network = new util.network();
-	this.w = window;
+ JSAN.use('util.error'); this.error = new util.error();
+ JSAN.use('util.network'); this.network = new util.network();
+ this.w = window;
 }
 
 patron.search_result.prototype = {
 
-	'result_cap' : 50,
-
-	'init' : function( params ) {
-
-		var obj = this;
-
-		obj.query = params['query'];
-
-		JSAN.use('OpenILS.data'); this.OpenILS = {}; 
-		obj.OpenILS.data = new OpenILS.data(); obj.OpenILS.data.init({'via':'stash'});
-
-		JSAN.use('util.list'); obj.list = new util.list('patron_list');
-
-		JSAN.use('patron.util');
-		var columns = patron.util.columns(
-			{
-				/* 'active' : { 'hidden' : 'false' }, */
-				'barred' : { 'hidden' : 'false' },
-				'family_name' : { 'hidden' : 'false' },
-				'first_given_name' : { 'hidden' : 'false' },
-				'second_given_name' : { 'hidden' : 'false' },
-				'dob' : { 'hidden' : 'false' }
-			},
-			{
-				'except_these' : [
-					'barcode',
-				]
-			}
-		);
-		obj.list.init(
-			{
-				'columns' : columns,
-				'map_row_to_columns' : patron.util.std_map_row_to_columns(),
-				'retrieve_row' : function(params) {
-					var id = params.retrieve_id;
-					var au_obj = patron.util.retrieve_au_via_id( ses(), id,
-						function(req) {
-							try {
-								var row = params.row;
-								if (typeof row.my == 'undefined') row.my = {};
-								row.my.au = req.getResultObject();
-								if (typeof params.on_retrieve == 'function') {
-									params.on_retrieve(row);
-								} else {
-									alert($("patronStrings").getFormattedString('staff.patron.search_result.init.typeof_params', [typeof params.on_retrieve]));
-								}
-							} catch(E) {
-								alert('error: ' + E);
-							}
-						}
-					);
-				},
-				'on_select' : function(ev) {
-					JSAN.use('util.functional');
-					var sel = obj.list.retrieve_selection();
-					var list = util.functional.map_list(
-						sel,
-						function(o) { return o.getAttribute('retrieve_id'); }
-					);
-					obj.controller.view.cmd_sel_clip.setAttribute('disabled', list.length < 1 );
-					if (typeof obj.on_select == 'function') {
-						obj.on_select(list);
-					}
-					if (typeof window.xulG == 'object' && typeof window.xulG.on_select == 'function') {
-						obj.error.sdump('D_PATRON','patron.search_result: Calling external .on_select()\n');
-						window.xulG.on_select(list);
-					} else {
-						obj.error.sdump('D_PATRON','patron.search_result: No external .on_select()\n');
-					}
-				}
-			}
-		);
-		JSAN.use('util.controller'); obj.controller = new util.controller();
-		obj.controller.init(
-			{
-				control_map : {
-					'cmd_broken' : [
-						['command'],
-						function() { alert($("commonStrings").getString('common.unimplemented')); }
-					],
-					'cmd_search_print' : [
-						['command'],
-						function() {
+ 'result_cap' : 50,
+
+ 'init' : function( params ) {
+
+  var obj = this;
+
+  obj.query = params['query'];
+
+  JSAN.use('OpenILS.data'); this.OpenILS = {}; 
+  obj.OpenILS.data = new OpenILS.data(); obj.OpenILS.data.init({'via':'stash'});
+
+  JSAN.use('util.list'); obj.list = new util.list('patron_list');
+
+  JSAN.use('patron.util');
+  var columns = patron.util.columns(
+   {
+    /* 'active' : { 'hidden' : 'false' }, */
+    'barred' : { 'hidden' : 'false' },
+    'family_name' : { 'hidden' : 'false' },
+    'first_given_name' : { 'hidden' : 'false' },
+    'second_given_name' : { 'hidden' : 'false' },
+    'dob' : { 'hidden' : 'false' }
+   },
+   {
+    'except_these' : [
+     'barcode',
+    ]
+   }
+  );
+  obj.list.init(
+   {
+    'columns' : columns,
+    'map_row_to_columns' : patron.util.std_map_row_to_columns(),
+    'retrieve_row' : function(params) {
+     var id = params.retrieve_id;
+     var au_obj = patron.util.retrieve_au_via_id( ses(), id,
+      function(req) {
+       try {
+        var row = params.row;
+        if (typeof row.my == 'undefined') row.my = {};
+        row.my.au = req.getResultObject();
+        if (typeof params.on_retrieve == 'function') {
+         params.on_retrieve(row);
+        } else {
+         alert($("patronStrings").getFormattedString('staff.patron.search_result.init.typeof_params', [typeof params.on_retrieve]));
+        }
+       } catch(E) {
+        alert('error: ' + E);
+       }
+      }
+     );
+    },
+    'on_select' : function(ev) {
+     JSAN.use('util.functional');
+     var sel = obj.list.retrieve_selection();
+     var list = util.functional.map_list(
+      sel,
+      function(o) { return o.getAttribute('retrieve_id'); }
+     );
+     obj.controller.view.cmd_sel_clip.setAttribute('disabled', list.length < 1 );
+     if (typeof obj.on_select == 'function') {
+      obj.on_select(list);
+     }
+     if (typeof window.xulG == 'object' && typeof window.xulG.on_select == 'function') {
+      obj.error.sdump('D_PATRON','patron.search_result: Calling external .on_select()\n');
+      window.xulG.on_select(list);
+     } else {
+      obj.error.sdump('D_PATRON','patron.search_result: No external .on_select()\n');
+     }
+    }
+   }
+  );
+  JSAN.use('util.controller'); obj.controller = new util.controller();
+  obj.controller.init(
+   {
+    control_map : {
+     'cmd_broken' : [
+      ['command'],
+      function() { alert($("commonStrings").getString('common.unimplemented')); }
+     ],
+     'cmd_search_print' : [
+      ['command'],
+      function() {
                             try {
-								var p = { 
-									'template' : 'patron'
-								};
-								obj.list.print( p );
+        var p = { 
+         'template' : 'patron'
+        };
+        obj.list.print( p );
                             } catch(E) {
-								obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.search_result.init.search_print'),E);
+        obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.search_result.init.search_print'),E);
                             }
-						}
-					],
-					'cmd_sel_clip' : [
-						['command'],
-						function() {
-							try {
-								obj.list.clipboard();
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.search_result.init.search_clipboard'),E);
-							}
-						}
-					],
-					'cmd_save_cols' : [
-						['command'],
-						function() {
-							try {
-								obj.list.save_columns();
-							} catch(E) {
-								obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.search_result.init.search_saving_columns'),E);
-							}
-						}
-					],
-				}
-			}
-		);
-
-		if (obj.query) obj.search(obj.query);
-	},
-
-	'search' : function(query) {
-		var obj = this;
-		var search_hash = {};
-		obj.search_term_count = 0;
-		var inactive = false;
+      }
+     ],
+     'cmd_sel_clip' : [
+      ['command'],
+      function() {
+       try {
+        obj.list.clipboard();
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.search_result.init.search_clipboard'),E);
+       }
+      }
+     ],
+     'cmd_save_cols' : [
+      ['command'],
+      function() {
+       try {
+        obj.list.save_columns();
+       } catch(E) {
+        obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.search_result.init.search_saving_columns'),E);
+       }
+      }
+     ],
+    }
+   }
+  );
+
+  if (obj.query) obj.search(obj.query);
+ },
+
+ 'search' : function(query) {
+  var obj = this;
+  var search_hash = {};
+  obj.search_term_count = 0;
+  var inactive = false;
         var search_depth = 0;
-		for (var i in query) {
-			switch( i ) {
+  for (var i in query) {
+   switch( i ) {
                 case 'card':
-					search_hash[ i ] = {};
-					search_hash[ i ].value = query[i];
-					search_hash[i].group = 3; 
-					obj.search_term_count++;
-				break;
-
-				case 'phone': case 'ident': 
-				
-					search_hash[ i ] = {};
-					search_hash[ i ].value = query[i];
-					search_hash[i].group = 2; 
-					obj.search_term_count++;
-				break;
-
-				case 'street1': case 'street2': case 'city': case 'state': case 'post_code': 
-				
-					search_hash[ i ] = {};
-					search_hash[ i ].value = query[i];
-					search_hash[i].group = 1; 
-					obj.search_term_count++;
-				break;
-
-				case 'family_name': case 'first_given_name': case 'second_given_name': case 'email': case 'alias': case 'usrname':
-
-					search_hash[ i ] = {};
-					search_hash[ i ].value = query[i];
-					search_hash[i].group = 0; 
-					obj.search_term_count++;
-				break;
-
-				case 'inactive':
-					if (query[i] == 'checked' || query[i] == 'true') inactive = true;
-				break;
+     search_hash[ i ] = {};
+     search_hash[ i ].value = query[i];
+     search_hash[i].group = 3; 
+     obj.search_term_count++;
+    break;
+
+    case 'phone': case 'ident': 
+    
+     search_hash[ i ] = {};
+     search_hash[ i ].value = query[i];
+     search_hash[i].group = 2; 
+     obj.search_term_count++;
+    break;
+
+    case 'street1': case 'street2': case 'city': case 'state': case 'post_code': 
+    
+     search_hash[ i ] = {};
+     search_hash[ i ].value = query[i];
+     search_hash[i].group = 1; 
+     obj.search_term_count++;
+    break;
+
+    case 'family_name': case 'first_given_name': case 'second_given_name': case 'email': case 'alias': case 'usrname':
+
+     search_hash[ i ] = {};
+     search_hash[ i ].value = query[i];
+     search_hash[i].group = 0; 
+     obj.search_term_count++;
+    break;
+
+    case 'inactive':
+     if (query[i] == 'checked' || query[i] == 'true') inactive = true;
+    break;
 
                 case 'search_depth':
                     search_depth = function(a){return a;}(query[i]);
                 break;
-			}
-		}
-		try {
-			var results = [];
-
-			var params = [ ses(), search_hash, obj.result_cap + 1, [ 'family_name ASC', 'first_given_name ASC', 'second_given_name ASC', 'dob DESC' ] ];
-			if (inactive) {
-				params.push(1);
-				if (document.getElementById('active')) {
-					document.getElementById('active').setAttribute('hidden','false');
-					document.getElementById('active').hidden = false;
-				}
-			} else {
+   }
+  }
+  try {
+   var results = [];
+
+   var params = [ ses(), search_hash, obj.result_cap + 1, [ 'family_name ASC', 'first_given_name ASC', 'second_given_name ASC', 'dob DESC' ] ];
+   if (inactive) {
+    params.push(1);
+    if (document.getElementById('active')) {
+     document.getElementById('active').setAttribute('hidden','false');
+     document.getElementById('active').hidden = false;
+    }
+   } else {
                 params.push(0);
             }
             params.push(search_depth);
-			if (obj.search_term_count > 0) {
-				//alert('search params = ' + obj.error.pretty_print( js2JSON( params ) ) );
-				results = this.network.simple_request( 'FM_AU_IDS_RETRIEVE_VIA_HASH', params );
+   if (obj.search_term_count > 0) {
+    //alert('search params = ' + obj.error.pretty_print( js2JSON( params ) ) );
+    results = this.network.simple_request( 'FM_AU_IDS_RETRIEVE_VIA_HASH', params );
                 if ( results == null ) results = [];
-				if (typeof results.ilsevent != 'undefined') throw(results);
-				if (results.length == 0) {
-					alert($("patronStrings").getString('staff.patron.search_result.search.no_patrons_found'));
-					return;
-				}
-				if (results.length == obj.result_cap+1) {
-					results.pop();
-					alert($("patronStrings").getFormattedString('staff.patron.search_result.search.capped_results', [obj.result_cap]));
-				}
-			} else {
-				alert($("patronStrings").getString('staff.patron.search_result.search.enter_search_terms'));
-				return;
-			}
+    if (typeof results.ilsevent != 'undefined') throw(results);
+    if (results.length == 0) {
+     alert($("patronStrings").getString('staff.patron.search_result.search.no_patrons_found'));
+     return;
+    }
+    if (results.length == obj.result_cap+1) {
+     results.pop();
+     alert($("patronStrings").getFormattedString('staff.patron.search_result.search.capped_results', [obj.result_cap]));
+    }
+   } else {
+    alert($("patronStrings").getString('staff.patron.search_result.search.enter_search_terms'));
+    return;
+   }
 
             obj.list.clear();
-			//this.list.append( { 'retrieve_id' : results[i], 'row' : {} } );
-			var funcs = [];
-
-				function gen_func(r) {
-					return function() {
-						obj.list.append( { 'retrieve_id' : r, 'row' : {}, 'to_bottom' : true, 'no_auto_select' : true } );
-					}
-				}
-
-			for (var i = 0; i < results.length; i++) {
-				funcs.push( gen_func(results[i]) );
-			}
-			JSAN.use('util.exec'); var exec = new util.exec(4);
-			exec.chain( funcs );
-
-		} catch(E) {
-			this.error.standard_unexpected_error_alert('patron.search_result.search',E);
-		}
-	}
+   //this.list.append( { 'retrieve_id' : results[i], 'row' : {} } );
+   var funcs = [];
+
+    function gen_func(r) {
+     return function() {
+      obj.list.append( { 'retrieve_id' : r, 'row' : {}, 'to_bottom' : true, 'no_auto_select' : true } );
+     }
+    }
+
+   for (var i = 0; i < results.length; i++) {
+    funcs.push( gen_func(results[i]) );
+   }
+   JSAN.use('util.exec'); var exec = new util.exec(4);
+   exec.chain( funcs );
+
+  } catch(E) {
+   this.error.standard_unexpected_error_alert('patron.search_result.search',E);
+  }
+ }
 
 }
 
diff --git a/Open-ILS/xul/staff_client/server/patron/search_result.xul b/Open-ILS/xul/staff_client/server/patron/search_result.xul
index 53b7781180..48f9a3c910 100644
--- a/Open-ILS/xul/staff_client/server/patron/search_result.xul
+++ b/Open-ILS/xul/staff_client/server/patron/search_result.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -21,69 +21,69 @@
 <?xul-overlay href="/xul/server/patron/search_result_overlay.xul"?>
 
 <window id="patron_search_result_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
-	<scripts id="openils_util_scripts"/>
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
+ <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
+ <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-		
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for patron_search_result.xul');
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  function $(id) { return document.getElementById(id); }
+  
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for patron_search_result.xul');
 
-				g.cgi = new CGI();
-				var keys = g.cgi.keys();
-				var query = {};
-				for (var i = 0; i < keys.length; i++) {
-					query[keys[i]] = g.cgi.param(keys[i]);
-				}
-				if (typeof xulG != 'undefined') if (xulG.query) {
-					for (var i in xulG.query) {
-						query[i] = xulG.query[i];
-					}
-				}
+    g.cgi = new CGI();
+    var keys = g.cgi.keys();
+    var query = {};
+    for (var i = 0; i < keys.length; i++) {
+     query[keys[i]] = g.cgi.param(keys[i]);
+    }
+    if (typeof xulG != 'undefined') if (xulG.query) {
+     for (var i in xulG.query) {
+      query[i] = xulG.query[i];
+     }
+    }
 
-				JSAN.use('patron.search_result'); g.search_result = new patron.search_result();
-				g.search_result.init( { 'query' : query } );
-	
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/search_result.xul', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
+    JSAN.use('patron.search_result'); g.search_result = new patron.search_result();
+    g.search_result.init( { 'query' : query } );
+ 
+   } catch(E) {
+    var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/search_result.xul', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
 
-	]]>
-	</script>
+ ]]>
+ </script>
 
-	<commandset id="patron_search_result_cmds">
-		<command id="cmd_patron_refresh" />
-		<command id="cmd_patron_checkout" />
-		<command id="cmd_patron_items" />
-		<command id="cmd_patron_holds" />
-		<command id="cmd_patron_bills" />
-		<command id="cmd_patron_edit" />
-		<command id="cmd_patron_info" />
-		<command id="cmd_search_print" />
-		<command id="cmd_sel_clip" disabled="true"/>
-		<command id="cmd_save_cols" />
-	</commandset>
+ <commandset id="patron_search_result_cmds">
+  <command id="cmd_patron_refresh" />
+  <command id="cmd_patron_checkout" />
+  <command id="cmd_patron_items" />
+  <command id="cmd_patron_holds" />
+  <command id="cmd_patron_bills" />
+  <command id="cmd_patron_edit" />
+  <command id="cmd_patron_info" />
+  <command id="cmd_search_print" />
+  <command id="cmd_sel_clip" disabled="true"/>
+  <command id="cmd_save_cols" />
+ </commandset>
 
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+ <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
-	<box id="patron_search_result_main" />
+ <box id="patron_search_result_main" />
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/search_result_overlay.xul b/Open-ILS/xul/staff_client/server/patron/search_result_overlay.xul
index 3e9680c2d8..f6249b5fa9 100644
--- a/Open-ILS/xul/staff_client/server/patron/search_result_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/search_result_overlay.xul
@@ -1,24 +1,24 @@
 <?xml version="1.0"?>
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 <overlay id="patron_search_result_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading patron/search_result_overlay.xul\n');</script>
 
 <commandset id="patron_search_result_cmds" />
 
-	<box id="patron_search_result_main" flex="1">
-		<vbox flex="1">
-			<tree id="patron_list" flex="1" enableColumnDrag="true" seltype="multiple"/>
-			<hbox>
-				<spacer flex="1"/>
-				<button label="&staff.patron.search_result_overlay.save_cols.label;" command="cmd_save_cols"/>
-				<button label="&staff.patron.search_result_overlay.copy_to_clipboard.label;" command="cmd_sel_clip"/>
-				<button label="&staff.patron.search_result_overlay.print.label;" command="cmd_search_print" />
-			</hbox>
-		</vbox>
-	</box>
+ <box id="patron_search_result_main" flex="1">
+  <vbox flex="1">
+   <tree id="patron_list" flex="1" enableColumnDrag="true" seltype="multiple"/>
+   <hbox>
+    <spacer flex="1"/>
+    <button label="&staff.patron.search_result_overlay.save_cols.label;" command="cmd_save_cols"/>
+    <button label="&staff.patron.search_result_overlay.copy_to_clipboard.label;" command="cmd_sel_clip"/>
+    <button label="&staff.patron.search_result_overlay.print.label;" command="cmd_search_print" />
+   </hbox>
+  </vbox>
+ </box>
 
 </overlay>
diff --git a/Open-ILS/xul/staff_client/server/patron/standing_penalties.js b/Open-ILS/xul/staff_client/server/patron/standing_penalties.js
index 437a370ce3..d8dfa50a74 100644
--- a/Open-ILS/xul/staff_client/server/patron/standing_penalties.js
+++ b/Open-ILS/xul/staff_client/server/patron/standing_penalties.js
@@ -12,7 +12,7 @@ function penalty_init() {
         JSAN.errorLevel = "die"; // none, warn, or die
         JSAN.addRepository('..');
 
-		JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.stash_retrieve();
+  JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.stash_retrieve();
         XML_HTTP_SERVER = data.server_unadorned;
 
         JSAN.use('util.error'); var error = new util.error();
diff --git a/Open-ILS/xul/staff_client/server/patron/standing_penalties.xul b/Open-ILS/xul/staff_client/server/patron/standing_penalties.xul
index 143a96022d..f15603fde6 100644
--- a/Open-ILS/xul/staff_client/server/patron/standing_penalties.xul
+++ b/Open-ILS/xul/staff_client/server/patron/standing_penalties.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,28 +19,28 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="penalty_win" onload="try { penalty_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
-	<script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var G;</script>
-	<scripts id="openils_util_scripts"/>
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
+ <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var G;</script>
+ <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script type="text/javascript" src="standing_penalties.js"/>
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script type="text/javascript" src="standing_penalties.js"/>
 
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+ <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
-	<commandset id="penalty_cmds">
-		<command id="cmd_apply_penalty" />
-		<command id="cmd_remove_penalty" />
-		<command id="cmd_edit_penalty" />
-	</commandset>
+ <commandset id="penalty_cmds">
+  <command id="cmd_apply_penalty" />
+  <command id="cmd_remove_penalty" />
+  <command id="cmd_edit_penalty" />
+ </commandset>
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- CONTENT -->
-	<groupbox id="penalty_groupbox" flex="1" class="my_overflow">
-		<caption id="penalty_caption" label="&staff.patron_display.penalty.caption;"/>
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- CONTENT -->
+ <groupbox id="penalty_groupbox" flex="1" class="my_overflow">
+  <caption id="penalty_caption" label="&staff.patron_display.penalty.caption;"/>
         <vbox flex="0">
             <hbox flex="1">
                 <menubar>
@@ -63,7 +63,7 @@
             </hbox>
         </vbox>
         <tree id="ausp_list" flex="1" enableColumnDrag="true" context="ausp_actions"/>
-	</groupbox>
+ </groupbox>
 
     <popupset id="csp_popupset">
         <popup id="ausp_actions" position="at_pointer">
diff --git a/Open-ILS/xul/staff_client/server/patron/summary.js b/Open-ILS/xul/staff_client/server/patron/summary.js
index 7f846813a7..c5de9161e0 100644
--- a/Open-ILS/xul/staff_client/server/patron/summary.js
+++ b/Open-ILS/xul/staff_client/server/patron/summary.js
@@ -6,124 +6,124 @@ var patronStrings = $('patronStrings');
 if (typeof patron == 'undefined') patron = {};
 patron.summary = function (params) {
 
-	JSAN.use('util.error'); this.error = new util.error();
-	JSAN.use('util.window'); this.window = new util.window();
-	JSAN.use('util.network'); this.network = new util.network();
-	this.w = window;
+ JSAN.use('util.error'); this.error = new util.error();
+ JSAN.use('util.window'); this.window = new util.window();
+ JSAN.use('util.network'); this.network = new util.network();
+ this.w = window;
 }
 
 patron.summary.prototype = {
 
-	'init' : function( params ) {
-
-		var obj = this;
-
-		obj.barcode = params['barcode'];
-		obj.id = params['id'];
-		if (params['show_name']) {
-			document.getElementById('patron_name').hidden = false;
-			document.getElementById('patron_name').setAttribute('hidden','false');
-		}
-
-		JSAN.use('OpenILS.data'); this.OpenILS = {}; 
-		obj.OpenILS.data = new OpenILS.data(); obj.OpenILS.data.init({'via':'stash'});
-
-		JSAN.use('util.controller'); obj.controller = new util.controller();
-		obj.controller.init(
-			{
-				control_map : {
-					'cmd_broken' : [
-						['command'],
-						function() { alert($("commonStrings").getString('common.unimplemented')); }
-					],
-					'patron_alert' : [
-						['render'],
-						function(e) {
-							return function() {
-								JSAN.use('util.widgets');
-								util.widgets.remove_children( e );
-								if (obj.patron.alert_message()) {
-									e.appendChild(
-										document.createTextNode(
-											obj.patron.alert_message()
-										)
-									);
-									e.parentNode.hidden = false;
-								} else {
-									e.parentNode.hidden = true;
-								}
-							};
-						}
-					],
-					'patron_usrname' : [
-						['render'],
-						function(e) {
-							return function() {
-								e.setAttribute('value',obj.patron.usrname());
-							};
-						}
-					],
-					'patron_profile' : [
-						['render'],
-						function(e) {
-							return function() { 
-								e.setAttribute('value',
-									obj.OpenILS.data.hash.pgt[
-										obj.patron.profile()
-									].name()
-								);
-							};
-						}
-					],
-					'patron_net_access' : [
-						['render'],
-						function(e) {
-							return function() { 
-								e.setAttribute('value',
-									patronStrings.getString('staff.patron.summary.patron_net_access') + 
-									' ' + obj.OpenILS.data.hash.cnal[
-										obj.patron.net_access_level()
-									].name()
-								);
-							};
-						}
-					],
-					'patron_standing_penalties' : [
-						['render'],
-						function(e) {
-							return function() {
-								JSAN.use('util.widgets');
-								util.widgets.remove_children(e);
-								var penalties = obj.patron.standing_penalties();
+ 'init' : function( params ) {
+
+  var obj = this;
+
+  obj.barcode = params['barcode'];
+  obj.id = params['id'];
+  if (params['show_name']) {
+   document.getElementById('patron_name').hidden = false;
+   document.getElementById('patron_name').setAttribute('hidden','false');
+  }
+
+  JSAN.use('OpenILS.data'); this.OpenILS = {}; 
+  obj.OpenILS.data = new OpenILS.data(); obj.OpenILS.data.init({'via':'stash'});
+
+  JSAN.use('util.controller'); obj.controller = new util.controller();
+  obj.controller.init(
+   {
+    control_map : {
+     'cmd_broken' : [
+      ['command'],
+      function() { alert($("commonStrings").getString('common.unimplemented')); }
+     ],
+     'patron_alert' : [
+      ['render'],
+      function(e) {
+       return function() {
+        JSAN.use('util.widgets');
+        util.widgets.remove_children( e );
+        if (obj.patron.alert_message()) {
+         e.appendChild(
+          document.createTextNode(
+           obj.patron.alert_message()
+          )
+         );
+         e.parentNode.hidden = false;
+        } else {
+         e.parentNode.hidden = true;
+        }
+       };
+      }
+     ],
+     'patron_usrname' : [
+      ['render'],
+      function(e) {
+       return function() {
+        e.setAttribute('value',obj.patron.usrname());
+       };
+      }
+     ],
+     'patron_profile' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        e.setAttribute('value',
+         obj.OpenILS.data.hash.pgt[
+          obj.patron.profile()
+         ].name()
+        );
+       };
+      }
+     ],
+     'patron_net_access' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        e.setAttribute('value',
+         patronStrings.getString('staff.patron.summary.patron_net_access') + 
+         ' ' + obj.OpenILS.data.hash.cnal[
+          obj.patron.net_access_level()
+         ].name()
+        );
+       };
+      }
+     ],
+     'patron_standing_penalties' : [
+      ['render'],
+      function(e) {
+       return function() {
+        JSAN.use('util.widgets');
+        util.widgets.remove_children(e);
+        var penalties = obj.patron.standing_penalties();
                                 if (penalties.length == 0) {
-									var row = document.createElement('row');
-									var label = document.createElement('label');
+         var row = document.createElement('row');
+         var label = document.createElement('label');
                                     label.setAttribute('value',patronStrings.getString('staff.patron.summary.standing_penalty.none'));
                                     addCSSClass(label,'NO_PENALTY');
-									row.appendChild(label);
-									e.appendChild(row);
+         row.appendChild(label);
+         e.appendChild(row);
                                 }
-								for (var i = 0; i < penalties.length; i++) {
+        for (var i = 0; i < penalties.length; i++) {
 
-									var row = document.createElement('row');
-									var label = document.createElement('label');
+         var row = document.createElement('row');
+         var label = document.createElement('label');
 
-									//x.setAttribute('value',penalties[i].penalty_type());
-									label.setAttribute('value',penalties[i].standing_penalty().label());
-									row.appendChild(label);
+         //x.setAttribute('value',penalties[i].penalty_type());
+         label.setAttribute('value',penalties[i].standing_penalty().label());
+         row.appendChild(label);
 
-    								var button = document.createElement('button');
-	    							button.setAttribute('label', patronStrings.getString('staff.patron.summary.standing_penalty.remove'));
+            var button = document.createElement('button');
+            button.setAttribute('label', patronStrings.getString('staff.patron.summary.standing_penalty.remove'));
                                     button.setAttribute('image','/xul/server/skin/media/images/icon_delete.gif');
-	    							button.setAttribute('disabled','true');
-	    							button.setAttribute('hidden','true');
+            button.setAttribute('disabled','true');
+            button.setAttribute('hidden','true');
                                     button.setAttribute('retrieve_ausp_id',penalties[i].id());
-		    						row.appendChild(button);
+            row.appendChild(button);
 
                                     // XXX check a permission here? How to fire the remove action ??? XXX
                                     if (penalties[i].standing_penalty().id() > 100) {
-	    							    button.setAttribute('disabled','false');
-	    							    button.setAttribute('hidden','false');
+                button.setAttribute('disabled','false');
+                button.setAttribute('hidden','false');
                                         button.addEventListener(
                                             'command',
                                             function(ev) {
@@ -164,30 +164,30 @@ patron.summary.prototype = {
                                         if (penalties[i].standing_penalty().block_list().match(/CIRC/)) addCSSClass(label,'PENALTY_CIRC');
                                     }
 
-									e.appendChild(row);
-								}
-							};
-						}
-					],
-					'patron_credit' : [
-						['render'],
-						function(e) {
-							return function() { 
-								JSAN.use('util.money');
-								e.setAttribute('value',
-									'$' + 
-									util.money.sanitize(
-										obj.patron.credit_forward_balance()
-									)
-								);
-							};
-						}
-					],
-					'patron_bill' : [
-						['render'],
-						function(e) {
-							return function() { 
-								e.setAttribute('value','...');
+         e.appendChild(row);
+        }
+       };
+      }
+     ],
+     'patron_credit' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        JSAN.use('util.money');
+        e.setAttribute('value',
+         '$' + 
+         util.money.sanitize(
+          obj.patron.credit_forward_balance()
+         )
+        );
+       };
+      }
+     ],
+     'patron_bill' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        e.setAttribute('value','...');
                                 var under_btn; 
                                 if (xulG) {
                                     if (xulG.display_window) {
@@ -195,52 +195,52 @@ patron.summary.prototype = {
                                         if (under_btn) under_btn.setAttribute('value','...');
                                     }
                                 }
-								obj.network.simple_request(
-									'FM_MOUS_RETRIEVE.authoritative',
-									[ ses(), obj.patron.id() ],
-									function(req) {
-										JSAN.use('util.money');
-										var robj = req.getResultObject();
-										e.setAttribute('value', patronStrings.getFormattedString('staff.patron.summary.patron_bill.money', [util.money.sanitize( robj.balance_owed() )]));
-										if (under_btn) under_btn.setAttribute('value', 
+        obj.network.simple_request(
+         'FM_MOUS_RETRIEVE.authoritative',
+         [ ses(), obj.patron.id() ],
+         function(req) {
+          JSAN.use('util.money');
+          var robj = req.getResultObject();
+          e.setAttribute('value', patronStrings.getFormattedString('staff.patron.summary.patron_bill.money', [util.money.sanitize( robj.balance_owed() )]));
+          if (under_btn) under_btn.setAttribute('value', 
                                             patronStrings.getFormattedString('staff.patron.summary.patron_bill.money', [util.money.sanitize( robj.balance_owed() )]));
-									}
-								);
-								/*
-								obj.network.simple_request(
-									'FM_MBTS_IDS_RETRIEVE_ALL_HAVING_BALANCE.authoritative',
-									[ ses(), obj.patron.id() ],
-									function(req) {
-										JSAN.use('util.money');
-										var list = req.getResultObject();
-										if (typeof list.ilsevent != 'undefined') {
-											e.setAttribute('value', '??? See Bills');
-											return;
-										}
-										var sum = 0;
-										for (var i = 0; i < list.length; i++) {
-											var robj = typeof list[i] == 'object' ? list[i] : obj.network.simple_request('FM_MBTS_RETRIEVE.authoritative',[ses(),list[i]]);
-											sum += util.money.dollars_float_to_cents_integer( robj.balance_owed() );
-										} 
-										if (sum > 0) addCSSClass(document.documentElement,'PATRON_HAS_BILLS');
-										JSAN.use('util.money');
-										e.setAttribute('value', '$' + util.money.sanitize( util.money.cents_as_dollars( sum ) ));
-									}
-								);
-								*/
-							};
-						}
-					],
-					'patron_checkouts' : [
-						['render'],
-						function(e) {
-							return function() { 
-								e.setAttribute('value','...');
-								var e2 = document.getElementById( 'patron_overdue' ); if (e2) e2.setAttribute('value','...');
-								var e3 = document.getElementById( 'patron_claimed_returned' ); if (e3) e3.setAttribute('value','...');
-								var e4 = document.getElementById( 'patron_long_overdue' ); if (e4) e4.setAttribute('value','...');
-								var e5 = document.getElementById( 'patron_lost' ); if (e5) e5.setAttribute('value','...');
-								var e6 = document.getElementById( 'patron_noncat' ); if (e6) e6.setAttribute('value','...');
+         }
+        );
+        /*
+        obj.network.simple_request(
+         'FM_MBTS_IDS_RETRIEVE_ALL_HAVING_BALANCE.authoritative',
+         [ ses(), obj.patron.id() ],
+         function(req) {
+          JSAN.use('util.money');
+          var list = req.getResultObject();
+          if (typeof list.ilsevent != 'undefined') {
+           e.setAttribute('value', '??? See Bills');
+           return;
+          }
+          var sum = 0;
+          for (var i = 0; i < list.length; i++) {
+           var robj = typeof list[i] == 'object' ? list[i] : obj.network.simple_request('FM_MBTS_RETRIEVE.authoritative',[ses(),list[i]]);
+           sum += util.money.dollars_float_to_cents_integer( robj.balance_owed() );
+          } 
+          if (sum > 0) addCSSClass(document.documentElement,'PATRON_HAS_BILLS');
+          JSAN.use('util.money');
+          e.setAttribute('value', '$' + util.money.sanitize( util.money.cents_as_dollars( sum ) ));
+         }
+        );
+        */
+       };
+      }
+     ],
+     'patron_checkouts' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        e.setAttribute('value','...');
+        var e2 = document.getElementById( 'patron_overdue' ); if (e2) e2.setAttribute('value','...');
+        var e3 = document.getElementById( 'patron_claimed_returned' ); if (e3) e3.setAttribute('value','...');
+        var e4 = document.getElementById( 'patron_long_overdue' ); if (e4) e4.setAttribute('value','...');
+        var e5 = document.getElementById( 'patron_lost' ); if (e5) e5.setAttribute('value','...');
+        var e6 = document.getElementById( 'patron_noncat' ); if (e6) e6.setAttribute('value','...');
                                 var under_btn; 
                                 if (xulG) {
                                     if (xulG.display_window) {
@@ -248,52 +248,52 @@ patron.summary.prototype = {
                                         if (under_btn) under_btn.setAttribute('value','...');
                                     }
                                 }
-								obj.network.simple_request(
-									'FM_CIRC_COUNT_RETRIEVE_VIA_USER.authoritative',
-									[ ses(), obj.patron.id() ],
-									function(req) {
-										try {
-											var robj = req.getResultObject();
-											e.setAttribute('value', robj.out + robj.overdue + robj.claims_returned + robj.long_overdue );
-											if (e2) e2.setAttribute('value', robj.overdue	);
-											if (e3) e3.setAttribute('value', robj.claims_returned	);
-											if (e4) e4.setAttribute('value', robj.long_overdue	);
-											if (e5) e5.setAttribute('value', robj.lost	);
+        obj.network.simple_request(
+         'FM_CIRC_COUNT_RETRIEVE_VIA_USER.authoritative',
+         [ ses(), obj.patron.id() ],
+         function(req) {
+          try {
+           var robj = req.getResultObject();
+           e.setAttribute('value', robj.out + robj.overdue + robj.claims_returned + robj.long_overdue );
+           if (e2) e2.setAttribute('value', robj.overdue );
+           if (e3) e3.setAttribute('value', robj.claims_returned );
+           if (e4) e4.setAttribute('value', robj.long_overdue );
+           if (e5) e5.setAttribute('value', robj.lost );
                                             if (under_btn) under_btn.setAttribute('value', 
                                                 String( robj.out + robj.overdue + robj.claims_returned + robj.long_overdue) + 
                                                 ( robj.overdue > 0 || robj.claims_returned > 0 || robj.long_overdue > 0 ? '*' : '' )
                                             );
-										} catch(E) {
-											alert(E);
-										}
-									}
-								);
-								obj.network.simple_request(
-									'FM_ANCC_RETRIEVE_VIA_USER.authoritative',
-									[ ses(), obj.patron.id() ],
-									function(req) {
-										var robj = req.getResultObject();
-										if (e6) e6.setAttribute('value',robj.length);
-									}
-								);
-							};
-						}
-					],
-					'patron_overdue' : [
-						['render'],
-						function(e) {
-							return function() { 
-								/* handled by 'patron_checkouts' */
-							};
-						}
-					],
-					'patron_holds' : [
-						['render'],
-						function(e) {
-							return function() { 
-								e.setAttribute('value','...');
-								var e2 = document.getElementById('patron_holds_available');
-								if (e2) e2.setAttribute('value','...');
+          } catch(E) {
+           alert(E);
+          }
+         }
+        );
+        obj.network.simple_request(
+         'FM_ANCC_RETRIEVE_VIA_USER.authoritative',
+         [ ses(), obj.patron.id() ],
+         function(req) {
+          var robj = req.getResultObject();
+          if (e6) e6.setAttribute('value',robj.length);
+         }
+        );
+       };
+      }
+     ],
+     'patron_overdue' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        /* handled by 'patron_checkouts' */
+       };
+      }
+     ],
+     'patron_holds' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        e.setAttribute('value','...');
+        var e2 = document.getElementById('patron_holds_available');
+        if (e2) e2.setAttribute('value','...');
                                 var under_btn; 
                                 if (xulG) {
                                     if (xulG.display_window) {
@@ -301,114 +301,114 @@ patron.summary.prototype = {
                                         if (under_btn) under_btn.setAttribute('value','...');
                                     }
                                 }
-								obj.network.simple_request(
-									'FM_AHR_COUNT_RETRIEVE.authoritative',
-									[ ses(), obj.patron.id() ],
-									function(req) {
-										e.setAttribute('value',
-											req.getResultObject().total
-										);
-										if (e2) e2.setAttribute('value',
-											req.getResultObject().ready
-										);
+        obj.network.simple_request(
+         'FM_AHR_COUNT_RETRIEVE.authoritative',
+         [ ses(), obj.patron.id() ],
+         function(req) {
+          e.setAttribute('value',
+           req.getResultObject().total
+          );
+          if (e2) e2.setAttribute('value',
+           req.getResultObject().ready
+          );
                                         if (under_btn) under_btn.setAttribute( 'value', req.getResultObject().ready + '/' + req.getResultObject().total );
-									}
-								);
-							};
-						}
-					],
-					'patron_holds_available' : [
-						['render'],
-						function(e) {
-							return function() { 
-								/* handled by 'patron_holds' */
-							};
-						}
-					],
-					'patron_card' : [
-						['render'],
-						function(e) {
-							return function() { 
-								e.setAttribute('value',
-									obj.patron.card().barcode()
-								);
-							};
-						}
-					],
-					'patron_ident_type_1' : [
-						['render'],
-						function(e) {
-							return function() { 
-								var ident_string = '';
-								var ident = obj.OpenILS.data.hash.cit[
-									obj.patron.ident_type()
-								];
-								if (ident) ident_string = ident.name()
-								e.setAttribute('value',
-									ident_string
-								);
-							};
-						}
-					],
-					'patron_ident_value_1' : [
-						['render'],
-						function(e) {
-							return function() { 
-								var val = obj.patron.ident_value();
-								val = val.replace(/.+(\d\d\d\d)$/,'xxxx$1');
-								e.setAttribute('value', val);
-							};
-						}
-					],
-					'patron_ident_type_2' : [
-						['render'],
-						function(e) {
-							return function() { 
-								var ident_string = '';
-								var ident = obj.OpenILS.data.hash.cit[
-									obj.patron.ident_type2()
-								];
-								if (ident) ident_string = ident.name()
-								e.setAttribute('value',
-									ident_string
-								);
-							};
-						}
-					],
-					'patron_ident_value_2' : [
-						['render'],
-						function(e) {
-							return function() { 
-								var val = obj.patron.ident_value2();
-								val = val.replace(/.+(\d\d\d\d)$/,'xxxx$1');
-								e.setAttribute('value', val);
-							};
-						}
-					],
-					'patron_date_of_exp' : [
-						['render'],
-						function(e) {
-							return function() { 
-								e.setAttribute('value',
-									patronStrings.getString('staff.patron.summary.expires_on') + ' ' + (
-										obj.patron.expire_date() ?
-										obj.patron.expire_date().substr(0,10) :
-									    patronStrings.getString('staff.patron.field.unset') 
-									)
-								);
-							};
-						}
-					],
-					'patron_date_of_birth' : [
-						['render'],
-						function(e) {
-							return function() { 
+         }
+        );
+       };
+      }
+     ],
+     'patron_holds_available' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        /* handled by 'patron_holds' */
+       };
+      }
+     ],
+     'patron_card' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        e.setAttribute('value',
+         obj.patron.card().barcode()
+        );
+       };
+      }
+     ],
+     'patron_ident_type_1' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        var ident_string = '';
+        var ident = obj.OpenILS.data.hash.cit[
+         obj.patron.ident_type()
+        ];
+        if (ident) ident_string = ident.name()
+        e.setAttribute('value',
+         ident_string
+        );
+       };
+      }
+     ],
+     'patron_ident_value_1' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        var val = obj.patron.ident_value();
+        val = val.replace(/.+(\d\d\d\d)$/,'xxxx$1');
+        e.setAttribute('value', val);
+       };
+      }
+     ],
+     'patron_ident_type_2' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        var ident_string = '';
+        var ident = obj.OpenILS.data.hash.cit[
+         obj.patron.ident_type2()
+        ];
+        if (ident) ident_string = ident.name()
+        e.setAttribute('value',
+         ident_string
+        );
+       };
+      }
+     ],
+     'patron_ident_value_2' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        var val = obj.patron.ident_value2();
+        val = val.replace(/.+(\d\d\d\d)$/,'xxxx$1');
+        e.setAttribute('value', val);
+       };
+      }
+     ],
+     'patron_date_of_exp' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        e.setAttribute('value',
+         patronStrings.getString('staff.patron.summary.expires_on') + ' ' + (
+          obj.patron.expire_date() ?
+          obj.patron.expire_date().substr(0,10) :
+             patronStrings.getString('staff.patron.field.unset') 
+         )
+        );
+       };
+      }
+     ],
+     'patron_date_of_birth' : [
+      ['render'],
+      function(e) {
+       return function() { 
                                 var hide_value = e.getAttribute('hide_value');
-								e.setAttribute( hide_value == 'true' ? 'hidden_value' : 'value',
-									obj.patron.dob() ?
-									obj.patron.dob().substr(0,10) :
+        e.setAttribute( hide_value == 'true' ? 'hidden_value' : 'value',
+         obj.patron.dob() ?
+         obj.patron.dob().substr(0,10) :
                                     patronStrings.getString('staff.patron.field.unset') 
-								);
+        );
                                 e.setAttribute( hide_value == 'false' ? 'hidden_value' : 'value',
                                     patronStrings.getString('staff.patron.field.hidden') 
                                 );
@@ -426,377 +426,377 @@ patron.summary.prototype = {
                                         }
                                     }
                                 }
-							};
-						}
-					],
-					'patron_day_phone' : [
-						['render'],
-						function(e) {
-							return function() { 
-								e.setAttribute('value',
-									obj.patron.day_phone()
-								);
-							};
-						}
-					],
-					'patron_evening_phone' : [
-						['render'],
-						function(e) {
-							return function() { 
-								e.setAttribute('value',
-									obj.patron.evening_phone()
-								);
-							};
-						}
-					],
-					'patron_other_phone' : [
-						['render'],
-						function(e) {
-							return function() { 
-								e.setAttribute('value',
-									obj.patron.other_phone()
-								);
-							};
-						}
-					],
-					'patron_email' : [
-						['render'],
-						function(e) {
-							return function() { 
-								e.setAttribute('value',
-									obj.patron.email()
-								);
-							};
-						}
-					],
-					'patron_alias' : [
-						['render'],
-						function(e) {
-							return function() { 
-								e.setAttribute('value',
-									obj.patron.alias()
-								);
-							};
-						}
-					],
-					'patron_photo_url' : [
-						['render'],
-						function(e) {
-							return function() { 
-								e.setAttribute('src',
-									obj.patron.photo_url()
-								);
-							};
-						}
-					],
-					'patron_library' : [
-						['render'],
-						function(e) {
-							return function() { 
-								e.setAttribute('value',
-									obj.OpenILS.data.hash.aou[
-										obj.patron.home_ou()
-									].shortname()
-								);
-								e.setAttribute('tooltiptext',
-									obj.OpenILS.data.hash.aou[
-										obj.patron.home_ou()
-									].name()
-								);
-							};
-						}
-					],
-					'patron_last_library' : [
-						['render'],
-						function(e) {
-							return function() { 
-								e.setAttribute('value',
-									obj.OpenILS.data.hash.aou[
-										obj.patron.home_ou()
-									].shortname()
-								);
-								e.setAttribute('tooltiptext',
-									obj.OpenILS.data.hash.aou[
-										obj.patron.home_ou()
-									].name()
-								);
-							};
-						}
-					],
-					'patron_mailing_address_street1' : [
-						['render'],
-						function(e) {
-							return function() { 
-								e.setAttribute('value',
-									obj.patron.mailing_address().street1()
-								);
-								if (!get_bool(obj.patron.mailing_address().valid())){e.setAttribute('style','color: red');}
-							};
-						}
-					],
-					'patron_mailing_address_street2' : [
-						['render'],
-						function(e) {
-							return function() { 
-								e.setAttribute('value',
-									obj.patron.mailing_address().street2()
-								);
-								if (!get_bool(obj.patron.mailing_address().valid())){e.setAttribute('style','color: red');}
-							};
-						}
-					],
-					'patron_mailing_address_city' : [
-						['render'],
-						function(e) {
-							return function() { 
-								e.setAttribute('value',
-									obj.patron.mailing_address().city()
-								);
-								if (!get_bool(obj.patron.mailing_address().valid())){e.setAttribute('style','color: red');}
-							};
-						}
-					],
-					'patron_mailing_address_state' : [
-						['render'],
-						function(e) {
-							return function() { 
-								e.setAttribute('value',
-									obj.patron.mailing_address().state()
-								);
-								if (!get_bool(obj.patron.mailing_address().valid())){e.setAttribute('style','color: red');}
-							};
-						}
-					],
-					'patron_mailing_address_post_code' : [
-						['render'],
-						function(e) {
-							return function() { 
-								e.setAttribute('value',
-									obj.patron.mailing_address().post_code()
-								);
-								if (!get_bool(obj.patron.mailing_address().valid())){e.setAttribute('style','color: red');}
-							};
-						}
-					],
-					'patron_physical_address_street1' : [
-						['render'],
-						function(e) {
-							return function() { 
-								e.setAttribute('value',
-									obj.patron.billing_address().street1()
-								);
-								if (!get_bool(obj.patron.billing_address().valid())){e.setAttribute('style','color: red');}
-							};
-						}
-					],
-					'patron_physical_address_street2' : [
-						['render'],
-						function(e) {
-							return function() { 
-								e.setAttribute('value',
-									obj.patron.billing_address().street2()
-								);
-								if (!get_bool(obj.patron.billing_address().valid())){e.setAttribute('style','color: red');}
-							};
-						}
-					],
-					'patron_physical_address_city' : [
-						['render'],
-						function(e) {
-							return function() { 
-								e.setAttribute('value',
-									obj.patron.billing_address().city()
-								);
-								if (!get_bool(obj.patron.billing_address().valid())){e.setAttribute('style','color: red');}
-							};
-						}
-					],
-					'patron_physical_address_state' : [
-						['render'],
-						function(e) {
-							return function() { 
-								e.setAttribute('value',
-									obj.patron.billing_address().state()
-								);
-								if (!get_bool(obj.patron.billing_address().valid())){e.setAttribute('style','color: red');}
-							};
-						}
-					],
-					'patron_physical_address_post_code' : [
-						['render'],
-						function(e) {
-							return function() { 
-								e.setAttribute('value',
-									obj.patron.billing_address().post_code()
-								);
-								if (!get_bool(obj.patron.billing_address().valid())){e.setAttribute('style','color: red');}
-							};
-						}
-					]
-				}
-			}
-		);
-
-		obj.retrieve();
-
-		try {
-			var caption = document.getElementById("PatronSummaryContact_caption");
-			var arrow = document.getAnonymousNodes(caption)[0];
-			var gb_content = document.getAnonymousNodes(caption.parentNode)[1];
-			arrow.addEventListener(
-				'click',
-				function() {
-					setTimeout(
-						function() {
-							//alert('setting shrink_state to ' + gb_content.hidden);
-							//caption.setAttribute('shrink_state',gb_content.hidden);
-							netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-							JSAN.use('util.file'); var file = new util.file('patron_id_shrink');
-							file.set_object(String(gb_content.hidden)); file.close();
-						}, 0
-					);
-				}, false
-			);
-			//var shrink_state = caption.getAttribute('shrink_state');
-			var shrink_state = false;
-			netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-			JSAN.use('util.file'); var file = new util.file('patron_id_shrink');
-			if (file._file.exists()) {
-				shrink_state = file.get_object(); file.close();
-			}
-			//alert('shrink_state retrieved as ' + shrink_state);
-			if (shrink_state != 'false' && shrink_state) {
-				JSAN.use('util.widgets');
-				//alert('clicking the widget');
-				util.widgets.click( arrow );
-			}
-		} catch(E) {
-			obj.error.sdump('D_ERROR','with shrink_state in summary.js: ' + E);
-		}
-	},
-
-	'retrieve' : function() {
-
-		try {
-
-			var obj = this;
-
-			var chain = [];
-
-			// Retrieve the patron
-				function blah_retrieve() {
-					try {
-						var robj;
-						if (obj.barcode && obj.barcode != 'null') {
-							robj = obj.network.simple_request(
-								'FM_AU_RETRIEVE_VIA_BARCODE.authoritative',
-								[ ses(), obj.barcode ]
-							);
-						} else if (obj.id && obj.id != 'null') {
-							robj = obj.network.simple_request(
-								'FM_AU_FLESHED_RETRIEVE_VIA_ID',
-								[ ses(), obj.id ]
-							);
-						} else {
-							throw(patronStrings.getString('staff.patron.summary.retrieve.no_barcode'));
-						}
-						if (robj) {
-
-							if (instanceOf(robj,au)) {
-
-								obj.patron = robj;
-								JSAN.use('patron.util');
-								document.getElementById('patron_name').setAttribute('value',
-									( obj.patron.prefix() ? obj.patron.prefix() + ' ' : '') + 
-									obj.patron.family_name() + ', ' + 
-									obj.patron.first_given_name() + ' ' +
-									( obj.patron.second_given_name() ? obj.patron.second_given_name() + ' ' : '' ) +
-									( obj.patron.suffix() ? obj.patron.suffix() : '')
-								);
-								patron.util.set_penalty_css(obj.patron);
-								JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-								data.last_patron = obj.patron.id(); data.stash('last_patron');
-
-							} else {
-
-								throw(robj);
-
-							}
-						} else {
-
-							throw(robj);
-
-						}
-
-					} catch(E) {
-						throw(E);
-					}
-				};
-				blah_retrieve();
-
-			/*
-			// Retrieve the survey responses for required surveys
-			chain.push(
-				function() {
-					try {
-						var surveys = obj.OpenILS.data.list.my_asv;
-						var survey_responses = {};
-						for (var i = 0; i < surveys.length; i++) {
-							var s = obj.network.request(
-								api.FM_ASVR_RETRIEVE.app,
-								api.FM_ASVR_RETRIEVE.method,
-								[ ses(), surveys[i].id(), obj.patron.id() ]
-							);
-							survey_responses[ surveys[i].id() ] = s;
-						}
-						obj.patron.survey_responses( survey_responses );
-					} catch(E) {
-						var error = ('patron.summary.retrieve : ' + js2JSON(E));
-						obj.error.sdump('D_ERROR',error);
-						throw(error);
-					}
-				}
-			);
-			*/
-
-			// Update the screen
-			chain.push( function() { obj.controller.render(); } );
-
-			// On Complete
-
-			chain.push( function() {
-
-				if (typeof window.xulG == 'object' && typeof window.xulG.on_finished == 'function') {
-					obj.error.sdump('D_PATRON_SUMMARY',
-						'patron.summary: Calling external .on_finished()\n');
-					window.xulG.on_finished(obj.patron);
-				} else {
-					obj.error.sdump('D_PATRON_SUMMARY','patron.summary: No external .on_finished()\n');
-				}
-
-			} );
-
-			// Do it
-			JSAN.use('util.exec'); obj.exec = new util.exec();
-			obj.exec.on_error = function(E) {
-
-				if (typeof window.xulG == 'object' && typeof window.xulG.on_error == 'function') {
-					window.xulG.on_error(E);
-				} else {
-					alert(js2JSON(E));
-				}
-
-			}
-			this.exec.chain( chain );
-
-		} catch(E) {
-			if (typeof window.xulG == 'object' && typeof window.xulG.on_error == 'function') {
-				window.xulG.on_error(E);
-			} else {
-				alert(js2JSON(E));
-			}
-		}
-	}
+       };
+      }
+     ],
+     'patron_day_phone' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        e.setAttribute('value',
+         obj.patron.day_phone()
+        );
+       };
+      }
+     ],
+     'patron_evening_phone' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        e.setAttribute('value',
+         obj.patron.evening_phone()
+        );
+       };
+      }
+     ],
+     'patron_other_phone' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        e.setAttribute('value',
+         obj.patron.other_phone()
+        );
+       };
+      }
+     ],
+     'patron_email' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        e.setAttribute('value',
+         obj.patron.email()
+        );
+       };
+      }
+     ],
+     'patron_alias' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        e.setAttribute('value',
+         obj.patron.alias()
+        );
+       };
+      }
+     ],
+     'patron_photo_url' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        e.setAttribute('src',
+         obj.patron.photo_url()
+        );
+       };
+      }
+     ],
+     'patron_library' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        e.setAttribute('value',
+         obj.OpenILS.data.hash.aou[
+          obj.patron.home_ou()
+         ].shortname()
+        );
+        e.setAttribute('tooltiptext',
+         obj.OpenILS.data.hash.aou[
+          obj.patron.home_ou()
+         ].name()
+        );
+       };
+      }
+     ],
+     'patron_last_library' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        e.setAttribute('value',
+         obj.OpenILS.data.hash.aou[
+          obj.patron.home_ou()
+         ].shortname()
+        );
+        e.setAttribute('tooltiptext',
+         obj.OpenILS.data.hash.aou[
+          obj.patron.home_ou()
+         ].name()
+        );
+       };
+      }
+     ],
+     'patron_mailing_address_street1' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        e.setAttribute('value',
+         obj.patron.mailing_address().street1()
+        );
+        if (!get_bool(obj.patron.mailing_address().valid())){e.setAttribute('style','color: red');}
+       };
+      }
+     ],
+     'patron_mailing_address_street2' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        e.setAttribute('value',
+         obj.patron.mailing_address().street2()
+        );
+        if (!get_bool(obj.patron.mailing_address().valid())){e.setAttribute('style','color: red');}
+       };
+      }
+     ],
+     'patron_mailing_address_city' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        e.setAttribute('value',
+         obj.patron.mailing_address().city()
+        );
+        if (!get_bool(obj.patron.mailing_address().valid())){e.setAttribute('style','color: red');}
+       };
+      }
+     ],
+     'patron_mailing_address_state' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        e.setAttribute('value',
+         obj.patron.mailing_address().state()
+        );
+        if (!get_bool(obj.patron.mailing_address().valid())){e.setAttribute('style','color: red');}
+       };
+      }
+     ],
+     'patron_mailing_address_post_code' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        e.setAttribute('value',
+         obj.patron.mailing_address().post_code()
+        );
+        if (!get_bool(obj.patron.mailing_address().valid())){e.setAttribute('style','color: red');}
+       };
+      }
+     ],
+     'patron_physical_address_street1' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        e.setAttribute('value',
+         obj.patron.billing_address().street1()
+        );
+        if (!get_bool(obj.patron.billing_address().valid())){e.setAttribute('style','color: red');}
+       };
+      }
+     ],
+     'patron_physical_address_street2' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        e.setAttribute('value',
+         obj.patron.billing_address().street2()
+        );
+        if (!get_bool(obj.patron.billing_address().valid())){e.setAttribute('style','color: red');}
+       };
+      }
+     ],
+     'patron_physical_address_city' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        e.setAttribute('value',
+         obj.patron.billing_address().city()
+        );
+        if (!get_bool(obj.patron.billing_address().valid())){e.setAttribute('style','color: red');}
+       };
+      }
+     ],
+     'patron_physical_address_state' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        e.setAttribute('value',
+         obj.patron.billing_address().state()
+        );
+        if (!get_bool(obj.patron.billing_address().valid())){e.setAttribute('style','color: red');}
+       };
+      }
+     ],
+     'patron_physical_address_post_code' : [
+      ['render'],
+      function(e) {
+       return function() { 
+        e.setAttribute('value',
+         obj.patron.billing_address().post_code()
+        );
+        if (!get_bool(obj.patron.billing_address().valid())){e.setAttribute('style','color: red');}
+       };
+      }
+     ]
+    }
+   }
+  );
+
+  obj.retrieve();
+
+  try {
+   var caption = document.getElementById("PatronSummaryContact_caption");
+   var arrow = document.getAnonymousNodes(caption)[0];
+   var gb_content = document.getAnonymousNodes(caption.parentNode)[1];
+   arrow.addEventListener(
+    'click',
+    function() {
+     setTimeout(
+      function() {
+       //alert('setting shrink_state to ' + gb_content.hidden);
+       //caption.setAttribute('shrink_state',gb_content.hidden);
+       netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+       JSAN.use('util.file'); var file = new util.file('patron_id_shrink');
+       file.set_object(String(gb_content.hidden)); file.close();
+      }, 0
+     );
+    }, false
+   );
+   //var shrink_state = caption.getAttribute('shrink_state');
+   var shrink_state = false;
+   netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+   JSAN.use('util.file'); var file = new util.file('patron_id_shrink');
+   if (file._file.exists()) {
+    shrink_state = file.get_object(); file.close();
+   }
+   //alert('shrink_state retrieved as ' + shrink_state);
+   if (shrink_state != 'false' && shrink_state) {
+    JSAN.use('util.widgets');
+    //alert('clicking the widget');
+    util.widgets.click( arrow );
+   }
+  } catch(E) {
+   obj.error.sdump('D_ERROR','with shrink_state in summary.js: ' + E);
+  }
+ },
+
+ 'retrieve' : function() {
+
+  try {
+
+   var obj = this;
+
+   var chain = [];
+
+   // Retrieve the patron
+    function blah_retrieve() {
+     try {
+      var robj;
+      if (obj.barcode && obj.barcode != 'null') {
+       robj = obj.network.simple_request(
+        'FM_AU_RETRIEVE_VIA_BARCODE.authoritative',
+        [ ses(), obj.barcode ]
+       );
+      } else if (obj.id && obj.id != 'null') {
+       robj = obj.network.simple_request(
+        'FM_AU_FLESHED_RETRIEVE_VIA_ID',
+        [ ses(), obj.id ]
+       );
+      } else {
+       throw(patronStrings.getString('staff.patron.summary.retrieve.no_barcode'));
+      }
+      if (robj) {
+
+       if (instanceOf(robj,au)) {
+
+        obj.patron = robj;
+        JSAN.use('patron.util');
+        document.getElementById('patron_name').setAttribute('value',
+         ( obj.patron.prefix() ? obj.patron.prefix() + ' ' : '') + 
+         obj.patron.family_name() + ', ' + 
+         obj.patron.first_given_name() + ' ' +
+         ( obj.patron.second_given_name() ? obj.patron.second_given_name() + ' ' : '' ) +
+         ( obj.patron.suffix() ? obj.patron.suffix() : '')
+        );
+        patron.util.set_penalty_css(obj.patron);
+        JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+        data.last_patron = obj.patron.id(); data.stash('last_patron');
+
+       } else {
+
+        throw(robj);
+
+       }
+      } else {
+
+       throw(robj);
+
+      }
+
+     } catch(E) {
+      throw(E);
+     }
+    };
+    blah_retrieve();
+
+   /*
+   // Retrieve the survey responses for required surveys
+   chain.push(
+    function() {
+     try {
+      var surveys = obj.OpenILS.data.list.my_asv;
+      var survey_responses = {};
+      for (var i = 0; i < surveys.length; i++) {
+       var s = obj.network.request(
+        api.FM_ASVR_RETRIEVE.app,
+        api.FM_ASVR_RETRIEVE.method,
+        [ ses(), surveys[i].id(), obj.patron.id() ]
+       );
+       survey_responses[ surveys[i].id() ] = s;
+      }
+      obj.patron.survey_responses( survey_responses );
+     } catch(E) {
+      var error = ('patron.summary.retrieve : ' + js2JSON(E));
+      obj.error.sdump('D_ERROR',error);
+      throw(error);
+     }
+    }
+   );
+   */
+
+   // Update the screen
+   chain.push( function() { obj.controller.render(); } );
+
+   // On Complete
+
+   chain.push( function() {
+
+    if (typeof window.xulG == 'object' && typeof window.xulG.on_finished == 'function') {
+     obj.error.sdump('D_PATRON_SUMMARY',
+      'patron.summary: Calling external .on_finished()\n');
+     window.xulG.on_finished(obj.patron);
+    } else {
+     obj.error.sdump('D_PATRON_SUMMARY','patron.summary: No external .on_finished()\n');
+    }
+
+   } );
+
+   // Do it
+   JSAN.use('util.exec'); obj.exec = new util.exec();
+   obj.exec.on_error = function(E) {
+
+    if (typeof window.xulG == 'object' && typeof window.xulG.on_error == 'function') {
+     window.xulG.on_error(E);
+    } else {
+     alert(js2JSON(E));
+    }
+
+   }
+   this.exec.chain( chain );
+
+  } catch(E) {
+   if (typeof window.xulG == 'object' && typeof window.xulG.on_error == 'function') {
+    window.xulG.on_error(E);
+   } else {
+    alert(js2JSON(E));
+   }
+  }
+ }
 }
 
 dump('exiting patron.summary.js\n');
diff --git a/Open-ILS/xul/staff_client/server/patron/summary.xul b/Open-ILS/xul/staff_client/server/patron/summary.xul
index 1aa10444d8..04df8e6f59 100644
--- a/Open-ILS/xul/staff_client/server/patron/summary.xul
+++ b/Open-ILS/xul/staff_client/server/patron/summary.xul
@@ -13,7 +13,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -21,93 +21,93 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="patron_summary_win" 
-	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }" onunload="try { observer.unregister(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }" onunload="try { observer.unregister(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		function $(id) { return document.getElementById(id); }
-		
-		var observer;
-		function myObserver() { this.register(); }
-		myObserver.prototype = {
-			register: function() {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
-				observerService.addObserver(this, "xul-overlay-merged", false);
-			},
-			unregister: function() {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
-				observerService.removeObserver(this, "xul-overlay-merged");
-			},
-			observe: function(subject,topic,data) {
-				dump('observe: <'+subject+','+topic+','+data+'>\n');
-				// setTimeout is needed here for xulrunner 1.8
-				setTimeout( function() { try { post_overlay(); } catch(E) { alert(E); } }, 0 );
-			}
-		}
-				
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for patron_summary.xul');
-				
-				JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.stash_retrieve();
-				
-				var horizontal_interface = String( g.data.hash.aous['ui.circ.patron_summary.horizontal'] ) == 'true';
-				var url = horizontal_interface ? '/xul/server/patron/summary_overlay_horiz.xul' : '/xul/server/patron/summary_overlay.xul';
-				
-				observer = new myObserver();
-				document.loadOverlay(location.protocol + '//' + location.hostname + url,observer)
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/summary.xul:my_init()', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-		
-		function post_overlay() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  function $(id) { return document.getElementById(id); }
+  
+  var observer;
+  function myObserver() { this.register(); }
+  myObserver.prototype = {
+   register: function() {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
+    observerService.addObserver(this, "xul-overlay-merged", false);
+   },
+   unregister: function() {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
+    observerService.removeObserver(this, "xul-overlay-merged");
+   },
+   observe: function(subject,topic,data) {
+    dump('observe: <'+subject+','+topic+','+data+'>\n');
+    // setTimeout is needed here for xulrunner 1.8
+    setTimeout( function() { try { post_overlay(); } catch(E) { alert(E); } }, 0 );
+   }
+  }
+    
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for patron_summary.xul');
+    
+    JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.stash_retrieve();
+    
+    var horizontal_interface = String( g.data.hash.aous['ui.circ.patron_summary.horizontal'] ) == 'true';
+    var url = horizontal_interface ? '/xul/server/patron/summary_overlay_horiz.xul' : '/xul/server/patron/summary_overlay.xul';
+    
+    observer = new myObserver();
+    document.loadOverlay(location.protocol + '//' + location.hostname + url,observer)
+   } catch(E) {
+    var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/summary.xul:my_init()', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+  
+  function post_overlay() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
-				var patron_id = xul_param('id'); 
-				var patron_bc = xul_param('barcode'); 
+    var patron_id = xul_param('id'); 
+    var patron_bc = xul_param('barcode'); 
 
-				JSAN.use('patron.summary'); g.summary = new patron.summary();
-				g.summary.init( { 
-					'barcode' : patron_bc,
-					'id' : patron_id,
-					'show_name' : xul_param('show_name'),
-				} );
+    JSAN.use('patron.summary'); g.summary = new patron.summary();
+    g.summary.init( { 
+     'barcode' : patron_bc,
+     'id' : patron_id,
+     'show_name' : xul_param('show_name'),
+    } );
 
-				window.refresh = function () { g.summary.retrieve(); }
-				font_helper();
-			} catch(E) {
-				var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/summary.xul:post_overlay()', E]);
-				try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-				alert(err_msg);
-			}
-		}
-	]]>
-	</script>
-	
-	<messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    window.refresh = function () { g.summary.retrieve(); }
+    font_helper();
+   } catch(E) {
+    var err_msg = $("commonStrings").getFormattedString('common.exception', ['patron/summary.xul:post_overlay()', E]);
+    try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
+    alert(err_msg);
+   }
+  }
+ ]]>
+ </script>
+ 
+ <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
-	<commandset id="patron_summary_cmds">
-	</commandset>
+ <commandset id="patron_summary_cmds">
+ </commandset>
 
-	<box id="patron_summary_main" />
+ <box id="patron_summary_main" />
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul b/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul
index cddc5a4287..2ef29f0e1b 100644
--- a/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul
@@ -1,229 +1,229 @@
 <?xml version="1.0"?>
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 <overlay id="patron_summary_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading patron/summary_overlay.xul\n');</script>
 
 <commandset id="patron_summary_cmds" />
 
 <box id="patron_summary_main" flex="1" orient="vertical" class="my_overflow">
-	<vbox id="patron_info_sidebar" />
+ <vbox id="patron_info_sidebar" />
 </box>
 
 <vbox id="patron_info_sidebar" flex="1">
-	<label id="patron_name" hidden="true" class="patronNameLarge"/>
-	<groupbox id="PatronSummaryAlert_groupbox" flex="0" hidden="true" class="alert">
-		<caption id="psagbc" label="&staff.patron.summary_overlay.psagbc.alert.label;" class="shrinkable_groupbox"/>
-		<description id="patron_alert"/>
-	</groupbox>
-	<groupbox id="PatronSummaryStanding_groupbox" flex="0" class="standing">
-		<caption id="pssgbc" label="&staff.patron.summary_overlay.pssgbc.standing.label;" class="shrinkable_groupbox"/>
+ <label id="patron_name" hidden="true" class="patronNameLarge"/>
+ <groupbox id="PatronSummaryAlert_groupbox" flex="0" hidden="true" class="alert">
+  <caption id="psagbc" label="&staff.patron.summary_overlay.psagbc.alert.label;" class="shrinkable_groupbox"/>
+  <description id="patron_alert"/>
+ </groupbox>
+ <groupbox id="PatronSummaryStanding_groupbox" flex="0" class="standing">
+  <caption id="pssgbc" label="&staff.patron.summary_overlay.pssgbc.standing.label;" class="shrinkable_groupbox"/>
         <vbox id="pssgbvb">
             <grid><columns><column/><column/></columns>
                 <rows id="patron_standing_penalties"/>
             </grid>
         </vbox>
         <spacer/>
-	</groupbox>
-	<groupbox id="PatronSummaryStatus_groupbox" flex="0" class="status"/>
-	<!--
-	<groupbox id="PatronSummarySurvey_groupbox" flex="0">
-		<caption id="pdsgbc" label="Surveys" class="shrinkable_groupbox"/>
-		<vbox id="patron_surveys" />
-	</groupbox>
-	-->
-	<groupbox id="PatronSummaryContact_groupbox" flex="0" class="contact"/>
+ </groupbox>
+ <groupbox id="PatronSummaryStatus_groupbox" flex="0" class="status"/>
+ <!--
+ <groupbox id="PatronSummarySurvey_groupbox" flex="0">
+  <caption id="pdsgbc" label="Surveys" class="shrinkable_groupbox"/>
+  <vbox id="patron_surveys" />
+ </groupbox>
+ -->
+ <groupbox id="PatronSummaryContact_groupbox" flex="0" class="contact"/>
 </vbox>
 
 <groupbox id="PatronSummaryStatus_groupbox" orient="vertical">
-	<caption label="&staff.patron_display.status.caption;" class="shrinkable_groupbox" />
-	<grid style="border: solid thin"><columns><column/></columns><rows>
-		<row hidden="true">
-			<label id="patron_standing" />
-		</row>
-		<row id="pdsgr1">
-			<label id="patron_profile" class="profile value"/>
-		</row>
-		<row id="pdsgr5">
-			<label id="patron_library" class="homelib value"/>
-		</row>
-		<row id="pdsgr5a">
-			<label id="patron_net_access" class="net_access value"/>
-		</row>
-		<row id="pdsgr5aa">
-			<label id="patron_date_of_exp" class="expire_date value"/>
-		</row>
-	</rows></grid>
-	<grid id="PatronSummaryStatus_grid" flex="1"/>
+ <caption label="&staff.patron_display.status.caption;" class="shrinkable_groupbox" />
+ <grid style="border: solid thin"><columns><column/></columns><rows>
+  <row hidden="true">
+   <label id="patron_standing" />
+  </row>
+  <row id="pdsgr1">
+   <label id="patron_profile" class="profile value"/>
+  </row>
+  <row id="pdsgr5">
+   <label id="patron_library" class="homelib value"/>
+  </row>
+  <row id="pdsgr5a">
+   <label id="patron_net_access" class="net_access value"/>
+  </row>
+  <row id="pdsgr5aa">
+   <label id="patron_date_of_exp" class="expire_date value"/>
+  </row>
+ </rows></grid>
+ <grid id="PatronSummaryStatus_grid" flex="1"/>
 
 </groupbox>
 
 <grid id="PatronSummaryStatus_grid">
-	<columns id="pdsgc">
-		<column id="pdsgc1" />
-		<column id="pdsgc2" />
-		<column id="pdsgc3" />
-		<column id="pdsgc4" />
-	</columns>
-	<rows id="pdsgr" flex="1">
-		<row id="pdsgr4">
-			<label id="PatronSummaryStatus_holds_label" class="text_left holds label"
-				value="&staff.patron_display.holds.label;" />
-			<label id="patron_holds" class="holds value"/>
-		</row><row>
-			<label id="PatronSummaryStatus_holds_available_label" class="text_right holds_ready label"
-				value="&staff.patron_display.holds_available.label;"  style="background: grey"/>
-			<label id="patron_holds_available" class="holds_ready label" style="background: grey"/>
-		</row>
-		<row id="pdsgr2" class="hide_patron_credit" hidden="true">
-			<label id="PatronSummaryStatus_credit_label" class="text_left credit label"
-				value="&staff.patron_display.credit.label;" />
-			<label id="patron_credit" class="credit value"/>
-		</row><row>
-			<label id="PatronSummaryStatus_bills_label" class="text_left bill label"
-				value="&staff.patron_display.bills.label;" />
-			<label id="patron_bill" class="bill value"/>
-		</row>
-		<row id="pdsgr3">
-			<label id="PatronSummaryStatus_checkouts_label" class="text_left items_out label"
-				value="&staff.patron_display.checkouts.label;" />
-			<label id="patron_checkouts" class="items_out value"/>
-		</row>
-		<row>
-			<label id="PatronSummaryStatus_checkouts_overdue_label" class="text_right items_overdue label"
-				value="&staff.patron_display.checkouts_overdue.label;" style="background: grey"/>
-			<label id="patron_overdue" class="items_overdue value" style="background: grey"/>
-		</row>
-		<row id="pdsgr5">
-			<label id="PatronSummaryStatus_long_overdue_label" value="&staff.patron.summary_overlay.overdue.value;" class="text_right items_long_overdue label" style="background: grey"/>
-			<label id="patron_long_overdue" class="items_long_overdue value" style="background: grey"/>
-		</row>
-		<row id="pdsgr7">
-			<label id="PatronSummaryStatus_claimed_returned_label" value="&staff.patron.summary_overlay.claimed_returned.value;" class="text_right items_long_overdue label" style="background: grey"/>
-			<label id="patron_claimed_returned" class="items_claimed_returned value" style="background: grey"/>
-		</row>
-		<row id="pdsgr6">
-			<label id="PatronSummaryStatus_lost_label" value="&staff.patron.summary_overlay.lost_label.value;" class="text_left items_lost label"/>
-			<label id="patron_lost" class="items_lost value"/>
-		</row>
-		<row id="pdsgr6a">
-			<label id="PatronSummaryStatus_noncat_label" value="&staff.patron.summary_overlay.noncat_label.value;" class="text_left items_noncat label"/>
-			<label id="patron_noncat" class="items_noncat value"/>
-		</row>
-	</rows>
+ <columns id="pdsgc">
+  <column id="pdsgc1" />
+  <column id="pdsgc2" />
+  <column id="pdsgc3" />
+  <column id="pdsgc4" />
+ </columns>
+ <rows id="pdsgr" flex="1">
+  <row id="pdsgr4">
+   <label id="PatronSummaryStatus_holds_label" class="text_left holds label"
+    value="&staff.patron_display.holds.label;" />
+   <label id="patron_holds" class="holds value"/>
+  </row><row>
+   <label id="PatronSummaryStatus_holds_available_label" class="text_right holds_ready label"
+    value="&staff.patron_display.holds_available.label;"  style="background: grey"/>
+   <label id="patron_holds_available" class="holds_ready label" style="background: grey"/>
+  </row>
+  <row id="pdsgr2" class="hide_patron_credit" hidden="true">
+   <label id="PatronSummaryStatus_credit_label" class="text_left credit label"
+    value="&staff.patron_display.credit.label;" />
+   <label id="patron_credit" class="credit value"/>
+  </row><row>
+   <label id="PatronSummaryStatus_bills_label" class="text_left bill label"
+    value="&staff.patron_display.bills.label;" />
+   <label id="patron_bill" class="bill value"/>
+  </row>
+  <row id="pdsgr3">
+   <label id="PatronSummaryStatus_checkouts_label" class="text_left items_out label"
+    value="&staff.patron_display.checkouts.label;" />
+   <label id="patron_checkouts" class="items_out value"/>
+  </row>
+  <row>
+   <label id="PatronSummaryStatus_checkouts_overdue_label" class="text_right items_overdue label"
+    value="&staff.patron_display.checkouts_overdue.label;" style="background: grey"/>
+   <label id="patron_overdue" class="items_overdue value" style="background: grey"/>
+  </row>
+  <row id="pdsgr5">
+   <label id="PatronSummaryStatus_long_overdue_label" value="&staff.patron.summary_overlay.overdue.value;" class="text_right items_long_overdue label" style="background: grey"/>
+   <label id="patron_long_overdue" class="items_long_overdue value" style="background: grey"/>
+  </row>
+  <row id="pdsgr7">
+   <label id="PatronSummaryStatus_claimed_returned_label" value="&staff.patron.summary_overlay.claimed_returned.value;" class="text_right items_long_overdue label" style="background: grey"/>
+   <label id="patron_claimed_returned" class="items_claimed_returned value" style="background: grey"/>
+  </row>
+  <row id="pdsgr6">
+   <label id="PatronSummaryStatus_lost_label" value="&staff.patron.summary_overlay.lost_label.value;" class="text_left items_lost label"/>
+   <label id="patron_lost" class="items_lost value"/>
+  </row>
+  <row id="pdsgr6a">
+   <label id="PatronSummaryStatus_noncat_label" value="&staff.patron.summary_overlay.noncat_label.value;" class="text_left items_noncat label"/>
+   <label id="patron_noncat" class="items_noncat value"/>
+  </row>
+ </rows>
 </grid>
 
 <groupbox id="PatronSummaryContact_groupbox" orient="vertical">
-	<!--
-	<caption label="&staff.patron_display.contact.caption;"/>
-	-->
-	<caption id="PatronSummaryContact_caption" label="&staff.patron.summary_overlay.summary_contact.label;" class="shrinkable_groupbox" />
-	<hbox id="pdcgbhb1">
-		<grid id="PatronSummaryContact_grid" />
-		<spacer id="pdcgbhbs1" flex="1"/>
-		<image id="patron_photo_url" />
-	</hbox>
-	<grid id="PatronSummaryContact_grid_phone" />
-	<groupbox id="PatronSummaryContact_mailing_address" class="mailing_address"/>
-	<groupbox id="PatronSummaryContact_physical_address" class="physical_address"/>
+ <!--
+ <caption label="&staff.patron_display.contact.caption;"/>
+ -->
+ <caption id="PatronSummaryContact_caption" label="&staff.patron.summary_overlay.summary_contact.label;" class="shrinkable_groupbox" />
+ <hbox id="pdcgbhb1">
+  <grid id="PatronSummaryContact_grid" />
+  <spacer id="pdcgbhbs1" flex="1"/>
+  <image id="patron_photo_url" />
+ </hbox>
+ <grid id="PatronSummaryContact_grid_phone" />
+ <groupbox id="PatronSummaryContact_mailing_address" class="mailing_address"/>
+ <groupbox id="PatronSummaryContact_physical_address" class="physical_address"/>
 </groupbox>
 
 <grid id="PatronSummaryContact_grid">
-	<columns id="pdsgc">
-		<column id="pdsgc1" />
-		<column id="pdsgc2" />
-	</columns>
-	<rows id="pdsgr" flex="1">
-		<row id="pdsgr0">
-			<label id="PatronSummaryContact_library_card_label" class="text_left card label"
-				value="&staff.patron_display.library_card.label;"/>
-			<label id="patron_card" class="card value click_link" onclick="try { copy_to_clipboard(event); } catch(E) { alert(E); }"/>
-		</row>
-		<row id="pdsgr1">
-			<label id="PatronSummaryContact_ident_label" class="text_left"
-				value="&staff.patron_display.ident1.label;"/>
-			<vbox id="pdsgr0h">
-				<label id="patron_ident_type_1" class="ident ident_type ident1 value"/>
-				<label id="patron_ident_value_1" class="ident ident_value ident1 value"/>
-			</vbox>
-		</row>
-		<row id="pdsgr2">
-			<label id="PatronSummaryContact_ident_label2" class="text_left"
-				value="&staff.patron_display.ident2.label;"/>
-			<vbox id="pdsgr0ah">
-				<label id="patron_ident_type_2" class="ident ident_type ident2 value"/>
-				<label id="patron_ident_value_2" class="ident ident_value ident2 value"/>
-			</vbox>
-		</row>
-		<row id="pdsgr3">
-			<label id="PatronSummaryContact_date_of_birth_label" class="text_left dob label"
-				value="&staff.patron_display.date_of_birth.label;"/>
-			<label id="patron_date_of_birth" class="dob value"/>
-		</row>
-		<row id="pdsgr4"><label id="pdsgr4l" value=" "/></row>
-	</rows>
+ <columns id="pdsgc">
+  <column id="pdsgc1" />
+  <column id="pdsgc2" />
+ </columns>
+ <rows id="pdsgr" flex="1">
+  <row id="pdsgr0">
+   <label id="PatronSummaryContact_library_card_label" class="text_left card label"
+    value="&staff.patron_display.library_card.label;"/>
+   <label id="patron_card" class="card value click_link" onclick="try { copy_to_clipboard(event); } catch(E) { alert(E); }"/>
+  </row>
+  <row id="pdsgr1">
+   <label id="PatronSummaryContact_ident_label" class="text_left"
+    value="&staff.patron_display.ident1.label;"/>
+   <vbox id="pdsgr0h">
+    <label id="patron_ident_type_1" class="ident ident_type ident1 value"/>
+    <label id="patron_ident_value_1" class="ident ident_value ident1 value"/>
+   </vbox>
+  </row>
+  <row id="pdsgr2">
+   <label id="PatronSummaryContact_ident_label2" class="text_left"
+    value="&staff.patron_display.ident2.label;"/>
+   <vbox id="pdsgr0ah">
+    <label id="patron_ident_type_2" class="ident ident_type ident2 value"/>
+    <label id="patron_ident_value_2" class="ident ident_value ident2 value"/>
+   </vbox>
+  </row>
+  <row id="pdsgr3">
+   <label id="PatronSummaryContact_date_of_birth_label" class="text_left dob label"
+    value="&staff.patron_display.date_of_birth.label;"/>
+   <label id="patron_date_of_birth" class="dob value"/>
+  </row>
+  <row id="pdsgr4"><label id="pdsgr4l" value=" "/></row>
+ </rows>
 </grid>
 
 <grid id="PatronSummaryContact_grid_phone">
-	<columns id="pdcgpc">
-		<column id="pdcgpc1" />
-		<column id="pdcgpc2" />
-	</columns>
-	<rows id="pdcgpr" flex="1">
-		<row id="pdcgpr1">
-			<label id="PatronSummaryContact_day_phone_label" class="text_left phone label day_phone"
-				value="&staff.patron_display.day_phone.label;" />
-			<label id="patron_day_phone" class="phone value day_phone"/> 
-		</row>
-		<row id="pdcgpr2">
-			<label id="PatronSummaryContact_evening_phone_label" class="text_left phone label evening_phone"
-				value="&staff.patron_display.evening_phone.label;" />
-			<label id="patron_evening_phone" class="phone value evening_phone"/>
-		</row>
-		<row id="pdcgpr3">
-			<label id="PatronSummaryContact_other_phone_label" class="text_left phone label other_phone"
-				value="&staff.patron_display.other_phone.label;" />
-			<label id="patron_other_phone" class="phone value other_phone"/> 
-		</row>
-		<row id="pdsgpr4"><label id="pdsgpr4l" value=" "/></row>
-		<row id="pdsgpr4a">
-			<label id="PatronSummaryContact_usrname_label" class="text_left usrname label"
-				value="&staff.patron.summary_overlay.opac_login.value;" />
-			<label id="patron_usrname" class="usrname value"/>
-		</row>
-		<row id="pdcgpr5">
-			<label id="PatronSummaryContact_email_label" class="text_left email label"
-				value="&staff.patron_display.email.label;" />
-			<label id="patron_email" class="email value" style="text-decoration: underline; color: blue; -moz-user-focus: normal;" onclick="copy_to_clipboard(event)"/>
-		</row>
-		<row id="pdsgpr6"><label id="pdsgpr6l" value=" "/></row>
+ <columns id="pdcgpc">
+  <column id="pdcgpc1" />
+  <column id="pdcgpc2" />
+ </columns>
+ <rows id="pdcgpr" flex="1">
+  <row id="pdcgpr1">
+   <label id="PatronSummaryContact_day_phone_label" class="text_left phone label day_phone"
+    value="&staff.patron_display.day_phone.label;" />
+   <label id="patron_day_phone" class="phone value day_phone"/> 
+  </row>
+  <row id="pdcgpr2">
+   <label id="PatronSummaryContact_evening_phone_label" class="text_left phone label evening_phone"
+    value="&staff.patron_display.evening_phone.label;" />
+   <label id="patron_evening_phone" class="phone value evening_phone"/>
+  </row>
+  <row id="pdcgpr3">
+   <label id="PatronSummaryContact_other_phone_label" class="text_left phone label other_phone"
+    value="&staff.patron_display.other_phone.label;" />
+   <label id="patron_other_phone" class="phone value other_phone"/> 
+  </row>
+  <row id="pdsgpr4"><label id="pdsgpr4l" value=" "/></row>
+  <row id="pdsgpr4a">
+   <label id="PatronSummaryContact_usrname_label" class="text_left usrname label"
+    value="&staff.patron.summary_overlay.opac_login.value;" />
+   <label id="patron_usrname" class="usrname value"/>
+  </row>
+  <row id="pdcgpr5">
+   <label id="PatronSummaryContact_email_label" class="text_left email label"
+    value="&staff.patron_display.email.label;" />
+   <label id="patron_email" class="email value" style="text-decoration: underline; color: blue; -moz-user-focus: normal;" onclick="copy_to_clipboard(event)"/>
+  </row>
+  <row id="pdsgpr6"><label id="pdsgpr6l" value=" "/></row>
 
-	</rows>
+ </rows>
 </grid>
 
 <groupbox id="PatronSummaryContact_mailing_address" orient="vertical">
-	<caption id="pdcmac" label="&staff.patron_display.mailing_address;" class="shrinkable_groupbox"/>
-	<label id="patron_mailing_address_street1" tooltiptext="&staff.patron_display.mailing.street1.label;" class="address street street1 mailing"/>
-	<label id="patron_mailing_address_street2" tooltiptext="&staff.patron_display.mailing.street2.label;" class="address street street2 mailing"/>
-	<hbox id="pdcmah">
-		<label id="patron_mailing_address_city" tooltiptext="&staff.patron_display.mailing.city.label;" class="address city mailing"/>
-		<label id="patron_mailing_address_state" tooltiptext="&staff.patron_display.mailing.state.label;" class="address state mailing"/>
-		<label id="patron_mailing_address_post_code" tooltiptext="&staff.patron_display.mailing.post_code.label;" class="address post_code mailing"/>
-	</hbox>
+ <caption id="pdcmac" label="&staff.patron_display.mailing_address;" class="shrinkable_groupbox"/>
+ <label id="patron_mailing_address_street1" tooltiptext="&staff.patron_display.mailing.street1.label;" class="address street street1 mailing"/>
+ <label id="patron_mailing_address_street2" tooltiptext="&staff.patron_display.mailing.street2.label;" class="address street street2 mailing"/>
+ <hbox id="pdcmah">
+  <label id="patron_mailing_address_city" tooltiptext="&staff.patron_display.mailing.city.label;" class="address city mailing"/>
+  <label id="patron_mailing_address_state" tooltiptext="&staff.patron_display.mailing.state.label;" class="address state mailing"/>
+  <label id="patron_mailing_address_post_code" tooltiptext="&staff.patron_display.mailing.post_code.label;" class="address post_code mailing"/>
+ </hbox>
 </groupbox>
 
 <groupbox id="PatronSummaryContact_physical_address" orient="vertical">
-	<caption id="pdcpac" label="&staff.patron_display.physical_address;" class="shrinkable_groupbox"/>
-	<label id="patron_physical_address_street1" tooltiptext="&staff.patron_display.physical.street1.label;" class="address street street1 physical" />
-	<label id="patron_physical_address_street2" tooltiptext="&staff.patron_display.physical.street2.label;"  class="address street street2 physical"/>
-	<hbox id="pdcpah">
-		<label id="patron_physical_address_city" tooltiptext="&staff.patron_display.physical.city.label;" class="address city physical"/>
-		<label id="patron_physical_address_state" tooltiptext="&staff.patron_display.physical.state.label;" class="address state physical"/>
-		<label id="patron_physical_address_post_code" tooltiptext="&staff.patron_display.physical.post_code.label;" class="address post_code physical"/>
-	</hbox>
+ <caption id="pdcpac" label="&staff.patron_display.physical_address;" class="shrinkable_groupbox"/>
+ <label id="patron_physical_address_street1" tooltiptext="&staff.patron_display.physical.street1.label;" class="address street street1 physical" />
+ <label id="patron_physical_address_street2" tooltiptext="&staff.patron_display.physical.street2.label;"  class="address street street2 physical"/>
+ <hbox id="pdcpah">
+  <label id="patron_physical_address_city" tooltiptext="&staff.patron_display.physical.city.label;" class="address city physical"/>
+  <label id="patron_physical_address_state" tooltiptext="&staff.patron_display.physical.state.label;" class="address state physical"/>
+  <label id="patron_physical_address_post_code" tooltiptext="&staff.patron_display.physical.post_code.label;" class="address post_code physical"/>
+ </hbox>
 </groupbox>
 
 </overlay>
diff --git a/Open-ILS/xul/staff_client/server/patron/summary_overlay_horiz.xul b/Open-ILS/xul/staff_client/server/patron/summary_overlay_horiz.xul
index 6db5608000..1a5de1d6c5 100644
--- a/Open-ILS/xul/staff_client/server/patron/summary_overlay_horiz.xul
+++ b/Open-ILS/xul/staff_client/server/patron/summary_overlay_horiz.xul
@@ -1,21 +1,21 @@
 <?xml version="1.0"?>
 <!DOCTYPE overlay PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 <overlay id="patron_summary_overlay" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>dump('loading patron/summary_overlay.xul\n');</script>
 
 <commandset id="patron_summary_cmds" />
 
 <box id="patron_summary_main" flex="1" orient="vertical" class="my_overflow">
-	<hbox id="patron_info_sidebar" flex="1"/>
+ <hbox id="patron_info_sidebar" flex="1"/>
 </box>
 
 <hbox id="patron_info_sidebar">
-	<image id="patron_photo_url" />
-	<vbox id="patron_info" flex="1">
+ <image id="patron_photo_url" />
+ <vbox id="patron_info" flex="1">
         <groupbox flex="1">
             <caption label="Patron Info"/>
             <label id="patron_name" />
@@ -49,7 +49,7 @@
             <spacer/><!-- bug workaround.. for some reason.. maybe timing with the overlay inserting children.. the patron_name label shows up beneath the grid when rendered -->
         </groupbox>
     </vbox>
-	<vbox id="contact_info" flex="1">
+ <vbox id="contact_info" flex="1">
         <groupbox flex="1">
             <caption>
                 <button id="contact_info_btn" label="Mailing Address" type="menu">
@@ -62,19 +62,19 @@
                 </button>
             </caption>
             <deck id="contact_info_deck">
-    		    <vbox id="PatronSummaryContact_mailing_address" orient="vertical"/>
+          <vbox id="PatronSummaryContact_mailing_address" orient="vertical"/>
                 <vbox id="PatronSummaryContact_physical_address" orient="vertical"/>
                 <grid id="PatronSummaryContact_grid_phone" />
-		        <grid id="PatronSummaryContact_grid" flex="1"/>
+          <grid id="PatronSummaryContact_grid" flex="1"/>
             </deck>
         </groupbox>
-	</vbox>
+ </vbox>
     <vbox>
         <groupbox flex="1">
             <caption label="Circ Info"/>
-        	<grid id="PatronSummaryStatus_grid" flex="1"/>
+         <grid id="PatronSummaryStatus_grid" flex="1"/>
         </groupbox>
-	</vbox>
+ </vbox>
     <vbox>
         <groupbox flex="1">
             <caption label="Account Info"/>
@@ -101,142 +101,142 @@
                 </rows>
             </grid>
         </groupbox>
-	</vbox>
+ </vbox>
 </hbox>
 
 <grid id="PatronSummaryStatus_grid">
-	<columns id="pdsgc">
-		<column id="pdsgc1" />
-		<column id="pdsgc2" />
-		<column id="pdsgc3" />
-		<column id="pdsgc4" />
-	</columns>
-	<rows id="pdsgr" flex="1">
-		<row id="pdsgr4">
-			<label id="PatronSummaryStatus_holds_label" class="text_left holds label"
-				value="&staff.patron_display.holds.label;" />
+ <columns id="pdsgc">
+  <column id="pdsgc1" />
+  <column id="pdsgc2" />
+  <column id="pdsgc3" />
+  <column id="pdsgc4" />
+ </columns>
+ <rows id="pdsgr" flex="1">
+  <row id="pdsgr4">
+   <label id="PatronSummaryStatus_holds_label" class="text_left holds label"
+    value="&staff.patron_display.holds.label;" />
             <hbox>
-    			<label id="patron_holds_available" class="holds_ready label" />
+       <label id="patron_holds_available" class="holds_ready label" />
                 <label value="/" class="holds" /> <!-- Would it be better to consolidate this into one label and use .getFormattedString? -->
-    			<label id="patron_holds" class="holds value"/>
+       <label id="patron_holds" class="holds value"/>
             </hbox>
-		</row>
-		<row id="pdsgr2" class="hide_patron_credit" hidden="true">
-			<label id="PatronSummaryStatus_credit_label" class="text_left credit label"
-				value="&staff.patron_display.credit.label;" />
-			<label id="patron_credit" class="credit value"/>
-		</row><row>
-			<label id="PatronSummaryStatus_bills_label" class="text_left bill label"
-				value="&staff.patron_display.bills.label;" />
-			<label id="patron_bill" class="bill value"/>
-		</row>
-		<row id="pdsgr3">
-			<label id="PatronSummaryStatus_checkouts_label" class="text_left items_out label"
-				value="&staff.patron_display.checkouts.label;" />
-			<label id="patron_checkouts" class="items_out value"/>
-		</row>
-		<row>
+  </row>
+  <row id="pdsgr2" class="hide_patron_credit" hidden="true">
+   <label id="PatronSummaryStatus_credit_label" class="text_left credit label"
+    value="&staff.patron_display.credit.label;" />
+   <label id="patron_credit" class="credit value"/>
+  </row><row>
+   <label id="PatronSummaryStatus_bills_label" class="text_left bill label"
+    value="&staff.patron_display.bills.label;" />
+   <label id="patron_bill" class="bill value"/>
+  </row>
+  <row id="pdsgr3">
+   <label id="PatronSummaryStatus_checkouts_label" class="text_left items_out label"
+    value="&staff.patron_display.checkouts.label;" />
+   <label id="patron_checkouts" class="items_out value"/>
+  </row>
+  <row>
             <hbox>
-    			<label id="PatronSummaryStatus_checkouts_overdue_label" class="text_right items_overdue label" value="&staff.patron_display.checkouts_overdue.label;" />
+       <label id="PatronSummaryStatus_checkouts_overdue_label" class="text_right items_overdue label" value="&staff.patron_display.checkouts_overdue.label;" />
                 <label value="/"/>
-			    <label id="PatronSummaryStatus_long_overdue_label" value="&staff.patron.summary_overlay.overdue.value;" class="text_right items_long_overdue label" />
+       <label id="PatronSummaryStatus_long_overdue_label" value="&staff.patron.summary_overlay.overdue.value;" class="text_right items_long_overdue label" />
             </hbox>
             <hbox>
-    			<label id="patron_overdue" class="items_overdue value" />
+       <label id="patron_overdue" class="items_overdue value" />
                 <label value="/"/>
-			    <label id="patron_long_overdue" class="items_long_overdue value" />
+       <label id="patron_long_overdue" class="items_long_overdue value" />
             </hbox>
-		</row>
-		<row id="pdsgr7">
+  </row>
+  <row id="pdsgr7">
             <hbox>
-    			<label id="PatronSummaryStatus_claimed_returned_label" value="&staff.patron.summary_overlay.claimed_returned.value;" class="text_right items_long_overdue label" />
+       <label id="PatronSummaryStatus_claimed_returned_label" value="&staff.patron.summary_overlay.claimed_returned.value;" class="text_right items_long_overdue label" />
                 <label value="/"/>
-    			<label id="PatronSummaryStatus_lost_label" value="&staff.patron.summary_overlay.lost_label.value;" class="text_left items_lost label"/>
+       <label id="PatronSummaryStatus_lost_label" value="&staff.patron.summary_overlay.lost_label.value;" class="text_left items_lost label"/>
             </hbox>
             <hbox>
-    			<label id="patron_claimed_returned" class="items_claimed_returned value" />
+       <label id="patron_claimed_returned" class="items_claimed_returned value" />
                 <label value="/"/>
-    			<label id="patron_lost" class="items_lost value"/>
+       <label id="patron_lost" class="items_lost value"/>
             </hbox>
-		</row>
-		<row id="pdsgr6a">
-			<label id="PatronSummaryStatus_noncat_label" value="&staff.patron.summary_overlay.noncat_label.value;" class="text_left items_noncat label"/>
-			<label id="patron_noncat" class="items_noncat value"/>
-		</row>
-	</rows>
+  </row>
+  <row id="pdsgr6a">
+   <label id="PatronSummaryStatus_noncat_label" value="&staff.patron.summary_overlay.noncat_label.value;" class="text_left items_noncat label"/>
+   <label id="patron_noncat" class="items_noncat value"/>
+  </row>
+ </rows>
 </grid>
 
 <grid id="PatronSummaryContact_grid">
-	<columns id="pdsgc">
-		<column id="pdsgc1" />
-		<column id="pdsgc2" />
-	</columns>
-	<rows id="pdsgr" flex="1">
-		<row id="pdsgr1">
-			<label id="PatronSummaryContact_ident_label" class="text_left"
-				value="&staff.patron_display.ident1.label;"/>
-			<vbox id="pdsgr0h">
-				<label id="patron_ident_type_1" class="ident ident_type ident1 value"/>
-				<label id="patron_ident_value_1" class="ident ident_value ident1 value"/>
-			</vbox>
-		</row>
-		<row id="pdsgr2">
-			<label id="PatronSummaryContact_ident_label2" class="text_left"
-				value="&staff.patron_display.ident2.label;"/>
-			<vbox id="pdsgr0ah">
-				<label id="patron_ident_type_2" class="ident ident_type ident2 value"/>
-				<label id="patron_ident_value_2" class="ident ident_value ident2 value"/>
-			</vbox>
-		</row>
-		<row id="pdsgr4"><label id="pdsgr4l" value=" "/></row>
-	</rows>
+ <columns id="pdsgc">
+  <column id="pdsgc1" />
+  <column id="pdsgc2" />
+ </columns>
+ <rows id="pdsgr" flex="1">
+  <row id="pdsgr1">
+   <label id="PatronSummaryContact_ident_label" class="text_left"
+    value="&staff.patron_display.ident1.label;"/>
+   <vbox id="pdsgr0h">
+    <label id="patron_ident_type_1" class="ident ident_type ident1 value"/>
+    <label id="patron_ident_value_1" class="ident ident_value ident1 value"/>
+   </vbox>
+  </row>
+  <row id="pdsgr2">
+   <label id="PatronSummaryContact_ident_label2" class="text_left"
+    value="&staff.patron_display.ident2.label;"/>
+   <vbox id="pdsgr0ah">
+    <label id="patron_ident_type_2" class="ident ident_type ident2 value"/>
+    <label id="patron_ident_value_2" class="ident ident_value ident2 value"/>
+   </vbox>
+  </row>
+  <row id="pdsgr4"><label id="pdsgr4l" value=" "/></row>
+ </rows>
 </grid>
 
 <grid id="PatronSummaryContact_grid_phone">
-	<columns id="pdcgpc">
-		<column id="pdcgpc1" />
-		<column id="pdcgpc2" />
-	</columns>
-	<rows id="pdcgpr" flex="1">
-		<row id="pdcgpr1">
-			<label id="PatronSummaryContact_day_phone_label" class="text_left phone label day_phone"
-				value="&staff.patron_display.day_phone.label;" />
-			<label id="patron_day_phone" class="phone value day_phone"/> 
-		</row>
-		<row id="pdcgpr2">
-			<label id="PatronSummaryContact_evening_phone_label" class="text_left phone label evening_phone"
-				value="&staff.patron_display.evening_phone.label;" />
-			<label id="patron_evening_phone" class="phone value evening_phone"/>
-		</row>
-		<row id="pdcgpr3">
-			<label id="PatronSummaryContact_other_phone_label" class="text_left phone label other_phone"
-				value="&staff.patron_display.other_phone.label;" />
-			<label id="patron_other_phone" class="phone value other_phone"/> 
-		</row>
-		<row id="pdsgpr4"><label id="pdsgpr4l" value=" "/></row>
-		<row id="pdsgpr6"><label id="pdsgpr6l" value=" "/></row>
+ <columns id="pdcgpc">
+  <column id="pdcgpc1" />
+  <column id="pdcgpc2" />
+ </columns>
+ <rows id="pdcgpr" flex="1">
+  <row id="pdcgpr1">
+   <label id="PatronSummaryContact_day_phone_label" class="text_left phone label day_phone"
+    value="&staff.patron_display.day_phone.label;" />
+   <label id="patron_day_phone" class="phone value day_phone"/> 
+  </row>
+  <row id="pdcgpr2">
+   <label id="PatronSummaryContact_evening_phone_label" class="text_left phone label evening_phone"
+    value="&staff.patron_display.evening_phone.label;" />
+   <label id="patron_evening_phone" class="phone value evening_phone"/>
+  </row>
+  <row id="pdcgpr3">
+   <label id="PatronSummaryContact_other_phone_label" class="text_left phone label other_phone"
+    value="&staff.patron_display.other_phone.label;" />
+   <label id="patron_other_phone" class="phone value other_phone"/> 
+  </row>
+  <row id="pdsgpr4"><label id="pdsgpr4l" value=" "/></row>
+  <row id="pdsgpr6"><label id="pdsgpr6l" value=" "/></row>
 
-	</rows>
+ </rows>
 </grid>
 
 <vbox id="PatronSummaryContact_mailing_address">
-	<label id="patron_mailing_address_street1" tooltiptext="&staff.patron_display.mailing.street1.label;" class="address street street1 mailing"/>
-	<label id="patron_mailing_address_street2" tooltiptext="&staff.patron_display.mailing.street2.label;" class="address street street2 mailing"/>
-	<hbox id="pdcmah">
-		<label id="patron_mailing_address_city" tooltiptext="&staff.patron_display.mailing.city.label;" class="address city mailing"/>
-		<label id="patron_mailing_address_state" tooltiptext="&staff.patron_display.mailing.state.label;" class="address state mailing"/>
-		<label id="patron_mailing_address_post_code" tooltiptext="&staff.patron_display.mailing.post_code.label;" class="address post_code mailing"/>
-	</hbox>
+ <label id="patron_mailing_address_street1" tooltiptext="&staff.patron_display.mailing.street1.label;" class="address street street1 mailing"/>
+ <label id="patron_mailing_address_street2" tooltiptext="&staff.patron_display.mailing.street2.label;" class="address street street2 mailing"/>
+ <hbox id="pdcmah">
+  <label id="patron_mailing_address_city" tooltiptext="&staff.patron_display.mailing.city.label;" class="address city mailing"/>
+  <label id="patron_mailing_address_state" tooltiptext="&staff.patron_display.mailing.state.label;" class="address state mailing"/>
+  <label id="patron_mailing_address_post_code" tooltiptext="&staff.patron_display.mailing.post_code.label;" class="address post_code mailing"/>
+ </hbox>
 </vbox>
 
 <vbox id="PatronSummaryContact_physical_address">
-	<label id="patron_physical_address_street1" tooltiptext="&staff.patron_display.physical.street1.label;" class="address street street1 physical" />
-	<label id="patron_physical_address_street2" tooltiptext="&staff.patron_display.physical.street2.label;"  class="address street street2 physical"/>
-	<hbox id="pdcpah">
-		<label id="patron_physical_address_city" tooltiptext="&staff.patron_display.physical.city.label;" class="address city physical"/>
-		<label id="patron_physical_address_state" tooltiptext="&staff.patron_display.physical.state.label;" class="address state physical"/>
-		<label id="patron_physical_address_post_code" tooltiptext="&staff.patron_display.physical.post_code.label;" class="address post_code physical"/>
-	</hbox>
+ <label id="patron_physical_address_street1" tooltiptext="&staff.patron_display.physical.street1.label;" class="address street street1 physical" />
+ <label id="patron_physical_address_street2" tooltiptext="&staff.patron_display.physical.street2.label;"  class="address street street2 physical"/>
+ <hbox id="pdcpah">
+  <label id="patron_physical_address_city" tooltiptext="&staff.patron_display.physical.city.label;" class="address city physical"/>
+  <label id="patron_physical_address_state" tooltiptext="&staff.patron_display.physical.state.label;" class="address state physical"/>
+  <label id="patron_physical_address_post_code" tooltiptext="&staff.patron_display.physical.post_code.label;" class="address post_code physical"/>
+ </hbox>
 </vbox>
 
 </overlay>
diff --git a/Open-ILS/xul/staff_client/server/patron/ue.js b/Open-ILS/xul/staff_client/server/patron/ue.js
index 8de0aba185..d1b2d8113c 100644
--- a/Open-ILS/xul/staff_client/server/patron/ue.js
+++ b/Open-ILS/xul/staff_client/server/patron/ue.js
@@ -1,17 +1,17 @@
-var cgi							= null;
-var clone						= false;
-var patron						= null;
-var counter						= 0;
-var identTypesCache			= {};
-var statCatsCache				= {};
-var surveysCache				= {};
-var surveyQuestionsCache	= {};
-var surveyAnswersCache		= {};
-var userCache					= {};
-var groupsCache				= {};
-var netLevelsCache			= {};
+var cgi       = null;
+var clone      = false;
+var patron      = null;
+var counter      = 0;
+var identTypesCache   = {};
+var statCatsCache    = {};
+var surveysCache    = {};
+var surveyQuestionsCache = {};
+var surveyAnswersCache  = {};
+var userCache     = {};
+var groupsCache    = {};
+var netLevelsCache   = {};
 var orgSettings             = [];
-//var guardianNote				= null;
+//var guardianNote    = null;
 var uEditUsePhonePw = false;
 
 if(!window.xulG) var xulG = null;
@@ -21,22 +21,22 @@ function $(id) { return document.getElementById(id); }
 /* fetch the necessary data to start off */
 function uEditInit() {
 
-	_debug('uEditInit(): ' + location.search);
+ _debug('uEditInit(): ' + location.search);
 
-	cgi		= new CGI();
-	session	= cgi.param('ses'); 
-	if (xulG) if (xulG.ses) session = xulG.ses;
-	if (xulG) if (xulG.params) if (xulG.params.ses) session = xulG.params.ses;
-	clone		= cgi.param('clone'); 
-	if (xulG) if (xulG.clone) clone = xulG.clone;
-	if (xulG) if (xulG.params) if (xulG.params.clone) clone = xulG.params.clone;
-	if(!session) throw $("patronStrings").getString('web.staff.patron.ue.session_no_defined');
+ cgi  = new CGI();
+ session = cgi.param('ses'); 
+ if (xulG) if (xulG.ses) session = xulG.ses;
+ if (xulG) if (xulG.params) if (xulG.params.ses) session = xulG.params.ses;
+ clone  = cgi.param('clone'); 
+ if (xulG) if (xulG.clone) clone = xulG.clone;
+ if (xulG) if (xulG.params) if (xulG.params.clone) clone = xulG.params.clone;
+ if(!session) throw $("patronStrings").getString('web.staff.patron.ue.session_no_defined');
 
-	fetchUser(session);
-	$('uedit_user').appendChild(text(USER.usrname()));
+ fetchUser(session);
+ $('uedit_user').appendChild(text(USER.usrname()));
 
-	setTimeout( function() { 
-		uEditBuild(); uEditShowPage('uedit_userid'); }, 20 );
+ setTimeout( function() { 
+  uEditBuild(); uEditShowPage('uedit_userid'); }, 20 );
 }
 
 function uEditSetUnload() {
@@ -59,53 +59,53 @@ function uEditClearUnload() {
 /* Fetch code
 /* ------------------------------------------------------------------------------ */
 function uEditFetchIdentTypes() {
-	_debug("uEditFetchIdentTypes()");
-	var s = fetchXULStash(); 
-	if (typeof s.list != 'undefined') 
-		if (typeof s.list.cit != 'undefined') return s.list.cit;
-	var req = new Request(FETCH_ID_TYPES);
-	req.send(true);
-	return req.result();
+ _debug("uEditFetchIdentTypes()");
+ var s = fetchXULStash(); 
+ if (typeof s.list != 'undefined') 
+  if (typeof s.list.cit != 'undefined') return s.list.cit;
+ var req = new Request(FETCH_ID_TYPES);
+ req.send(true);
+ return req.result();
 }
 
 function uEditFetchStatCats() {
-	_debug("uEditFetchStatCats()");
-	var s = fetchXULStash(); 
-	if (typeof s.list != 'undefined') 
-		if (typeof s.list.my_actsc != 'undefined') return s.list.my_actsc;
-	var req = new Request(SC_FETCH_ALL, SESSION);
-	req.send(true);
-	return req.result();
+ _debug("uEditFetchStatCats()");
+ var s = fetchXULStash(); 
+ if (typeof s.list != 'undefined') 
+  if (typeof s.list.my_actsc != 'undefined') return s.list.my_actsc;
+ var req = new Request(SC_FETCH_ALL, SESSION);
+ req.send(true);
+ return req.result();
 }
 
 function uEditFetchSurveys() {
-	_debug("uEditFetchSurveys()");
-	var s = fetchXULStash(); 
-	if (typeof s.list != 'undefined') 
-		if (typeof s.list.asv != 'undefined') return s.list.asv;
-	var req = new Request(SV_FETCH_ALL, SESSION);
-	req.send(true);
-	return req.result();
+ _debug("uEditFetchSurveys()");
+ var s = fetchXULStash(); 
+ if (typeof s.list != 'undefined') 
+  if (typeof s.list.asv != 'undefined') return s.list.asv;
+ var req = new Request(SV_FETCH_ALL, SESSION);
+ req.send(true);
+ return req.result();
 }
 
 function uEditFetchGroups() {
-	_debug("uEditFetchGroups()");
-	var s = fetchXULStash(); 
-	if (typeof s.tree != 'undefined') 
-		if (typeof s.tree.pgt != 'undefined') return s.tree.pgt;
-	var req = new Request(FETCH_GROUPS);
-	req.send(true);
-	return req.result();
+ _debug("uEditFetchGroups()");
+ var s = fetchXULStash(); 
+ if (typeof s.tree != 'undefined') 
+  if (typeof s.tree.pgt != 'undefined') return s.tree.pgt;
+ var req = new Request(FETCH_GROUPS);
+ req.send(true);
+ return req.result();
 }
 
 function uEditFetchNetLevels() {
-	_debug("uEditFetchNetLevels()");
-	var s = fetchXULStash(); 
-	if (typeof s.list != 'undefined') 
-		if (typeof s.list.cnal != 'undefined') return s.list.cnal;
-	var req = new Request(FETCH_NET_LEVELS, SESSION);
-	req.send(true);
-	return req.result();
+ _debug("uEditFetchNetLevels()");
+ var s = fetchXULStash(); 
+ if (typeof s.list != 'undefined') 
+  if (typeof s.list.cnal != 'undefined') return s.list.cnal;
+ var req = new Request(FETCH_NET_LEVELS, SESSION);
+ req.send(true);
+ return req.result();
 }
 
 /* ------------------------------------------------------------------------------ */
@@ -116,8 +116,8 @@ function uEditFetchNetLevels() {
  * provided by descending through the group tree 
  */
 function buildAppPermList(list, group) {
-	if(!group) return;
-	if(group.application_perm() ) 
+ if(!group) return;
+ if(group.application_perm() ) 
         list.push(group.application_perm());
     for(i in group.children()) {
         buildAppPermList(list, group.children()[i]);
@@ -141,12 +141,12 @@ function uEditBuild() {
            perms.push(myPerms[p]);
     myPerms = perms;
         
-	fetchHighestPermOrgs( SESSION, USER.id(), myPerms );
+ fetchHighestPermOrgs( SESSION, USER.id(), myPerms );
 
-	uEditBuildLibSelector();
-	var usr = cgi.param('usr'); 
-	if (xulG) if (xulG.usr) usr = xulG.usr;
-	if (xulG) if (xulG.params) if (xulG.params.usr) usr = xulG.params.usr;
+ uEditBuildLibSelector();
+ var usr = cgi.param('usr'); 
+ if (xulG) if (xulG.usr) usr = xulG.usr;
+ if (xulG) if (xulG.params) if (xulG.params.usr) usr = xulG.params.usr;
 
     orgSettings = fetchBatchOrgSetting(USER.ws_ou(), [
         'global.juvenile_age_threshold',
@@ -156,41 +156,41 @@ function uEditBuild() {
     uEditUsePhonePw = (orgSettings['patron.password.use_phone'] && 
         orgSettings['patron.password.use_phone'].value);
 
-	patron = fetchFleshedUser(usr);
-	if(!patron) patron = uEditNewPatron(); 
+ patron = fetchFleshedUser(usr);
+ if(!patron) patron = uEditNewPatron(); 
     
     // jscalendar doesn't like the date format.  trim the time data
     if(patron.dob()) patron.dob( patron.dob().replace(/T.*/, '') );
     if(patron.expire_date()) patron.expire_date( patron.expire_date().replace(/T.*/, '') );
-	
-	uEditDraw( 
-		uEditFetchIdentTypes(),
+ 
+ uEditDraw( 
+  uEditFetchIdentTypes(),
         groups,
-		uEditFetchStatCats(),
-		uEditFetchSurveys(),
-		uEditFetchNetLevels()
-		);
+  uEditFetchStatCats(),
+  uEditFetchSurveys(),
+  uEditFetchNetLevels()
+  );
 
-	if(patron.isnew()) {
-		if(clone) uEditClone(clone);
-		else uEditCreateNewAddr();
+ if(patron.isnew()) {
+  if(clone) uEditClone(clone);
+  else uEditCreateNewAddr();
 
-	} else {
+ } else {
 
-		/* do we need to display the parent / gurdian field? */
-		uEditCheckDOB(uEditFindFieldByKey('dob'));
+  /* do we need to display the parent / gurdian field? */
+  uEditCheckDOB(uEditFindFieldByKey('dob'));
 
-		$('ue_barcode').disabled = true;
-		unHideMe($('ue_mark_card_lost'));
-		unHideMe($('ue_reset_pw'));
-		uEditCheckEditPerm();
-	}
+  $('ue_barcode').disabled = true;
+  unHideMe($('ue_mark_card_lost'));
+  unHideMe($('ue_reset_pw'));
+  uEditCheckEditPerm();
+ }
 
     uEditCheckBarredPerm();
 }
 
 function uEditCheckBarredPerm() {
-	if(PERMS['BAR_PATRON'] != -1) 
+ if(PERMS['BAR_PATRON'] != -1) 
         return;
 
     if(isTrue(patron.barred()) && PERMS['UNBAR_PATRON'] != -1) 
@@ -201,76 +201,76 @@ function uEditCheckBarredPerm() {
 
 
 /* if this user does not have permission to put users into
-	the edited users group, they do not have permission to 
-	edit this user */
+ the edited users group, they do not have permission to 
+ edit this user */
 function uEditCheckEditPerm() {
 
-	var perm = uEditFindGroupPerm(groupsCache[patron.profile()]);	
-	/*
-	_debug("editing user with group app perm "+patron.profile()+' : '+
-		groupsCache[patron.profile()].name() +', and perm = ' + perm);
-		*/
+ var perm = uEditFindGroupPerm(groupsCache[patron.profile()]); 
+ /*
+ _debug("editing user with group app perm "+patron.profile()+' : '+
+  groupsCache[patron.profile()].name() +', and perm = ' + perm);
+  */
 
-	if(PERMS[perm] != -1) return;
+ if(PERMS[perm] != -1) return;
 
-	/* we can edit our own account, but not others in our group */
-	if( patron.id() != USER.id() ){
-		_debug("we are not allowed to edit this user");
-	
-		$('ue_save').disabled = true;
-		$('ue_save_clone').disabled = true;
-		$('ue_mark_card_lost').disabled = true;
-		$('ue_reset_pw').disabled = true;
-	
-		uEditIterateFields(
-			function(f) {
-				if( f && f.widget && f.widget.node )
-					f.widget.node.disabled = true;
-			}	
-		);	
+ /* we can edit our own account, but not others in our group */
+ if( patron.id() != USER.id() ){
+  _debug("we are not allowed to edit this user");
+ 
+  $('ue_save').disabled = true;
+  $('ue_save_clone').disabled = true;
+  $('ue_mark_card_lost').disabled = true;
+  $('ue_reset_pw').disabled = true;
+ 
+  uEditIterateFields(
+   function(f) {
+    if( f && f.widget && f.widget.node )
+     f.widget.node.disabled = true;
+   } 
+  ); 
 
-	}
+ }
 
-	var node = $('ue_profile').parentNode;
-	node.removeChild($('ue_profile'));
-	node.appendChild(elem('span',null,groupsCache[patron.profile()].name()));
+ var node = $('ue_profile').parentNode;
+ node.removeChild($('ue_profile'));
+ node.appendChild(elem('span',null,groupsCache[patron.profile()].name()));
 
-	var field = uEditFindFieldByKey('profile');
-	field.required = false;
-	removeCSSClass(field.widget.node, CSS_INVALID_DATA);
-	uEditCheckErrors();
+ var field = uEditFindFieldByKey('profile');
+ field.required = false;
+ removeCSSClass(field.widget.node, CSS_INVALID_DATA);
+ uEditCheckErrors();
 }
 
 
 /* creates a new patron object with card attached */
 var uEditCardVirtId = -1;
 function uEditNewPatron() {
-	var patron = new au(); 
-	patron.isnew(1);
-	patron.id(-1);
-	card = new ac();
-	card.id(uEditCardVirtId--);
-	card.isnew(1);
-	patron.card(card);
-	patron.cards([card]);
+ var patron = new au(); 
+ patron.isnew(1);
+ patron.id(-1);
+ card = new ac();
+ card.id(uEditCardVirtId--);
+ card.isnew(1);
+ patron.card(card);
+ patron.cards([card]);
     patron.net_access_level(defaultNetLevel);
-	patron.stat_cat_entries([]);
-	patron.survey_responses([]);
-	patron.addresses([]);
-	patron.home_ou(USER.ws_ou());
-	uEditMakeRandomPw(patron);
-	return patron;
+ patron.stat_cat_entries([]);
+ patron.survey_responses([]);
+ patron.addresses([]);
+ patron.home_ou(USER.ws_ou());
+ uEditMakeRandomPw(patron);
+ return patron;
 }
 
 function uEditMakeRandomPw(patron) {
     if(uEditUsePhonePw) return;
-	var rand  = Math.random();
-	rand = parseInt(rand * 10000) + '';
-	while(rand.length < 4) rand += '0';
-	appendClear($('ue_password_plain'),text(rand));
-	unHideMe($('ue_password_gen'));
-	patron.passwd(rand);
-	return rand;
+ var rand  = Math.random();
+ rand = parseInt(rand * 10000) + '';
+ while(rand.length < 4) rand += '0';
+ appendClear($('ue_password_plain'),text(rand));
+ unHideMe($('ue_password_gen'));
+ patron.passwd(rand);
+ return rand;
 }
 
 function uEditMakePhonePw() {
@@ -279,328 +279,328 @@ function uEditMakePhonePw() {
         (pw = patron.evening_phone()) || (pw = patron.other_phone()) ) {
             pw = pw.substring(pw.length - 4); // this is iffy
             uEditResetPw(pw);
-	        appendClear($('ue_password_plain'), text(pw));
-	        unHideMe($('ue_password_gen'));
-	        patron.passwd(pw);
+         appendClear($('ue_password_plain'), text(pw));
+         unHideMe($('ue_password_gen'));
+         patron.passwd(pw);
     }
 }
 
 function uEditResetPw(pw) { 
-    if(!pw) pw = uEditMakeRandomPw(patron);	
-	$('ue_password1').value = pw;
-	$('ue_password2').value = pw;
+    if(!pw) pw = uEditMakeRandomPw(patron); 
+ $('ue_password1').value = pw;
+ $('ue_password2').value = pw;
     $('ue_password1').onchange();
 }
 
 function uEditClone(clone) {
 
-	var cloneUser = fetchFleshedUser(clone);
-	patron.usrgroup(cloneUser.usrgroup());
+ var cloneUser = fetchFleshedUser(clone);
+ patron.usrgroup(cloneUser.usrgroup());
 
-	if( cloneUser.day_phone() ) {
-		$('ue_day_phone').value = cloneUser.day_phone();
-	    $('ue_day_phone').onchange();
+ if( cloneUser.day_phone() ) {
+  $('ue_day_phone').value = cloneUser.day_phone();
+     $('ue_day_phone').onchange();
     }
 
-	if( cloneUser.evening_phone() ) {
-		$('ue_night_phone').value = cloneUser.evening_phone();
-		$('ue_night_phone').onchange();
+ if( cloneUser.evening_phone() ) {
+  $('ue_night_phone').value = cloneUser.evening_phone();
+  $('ue_night_phone').onchange();
     }
 
-	if( cloneUser.other_phone() ) {
-		$('ue_other_phone').value = cloneUser.other_phone();
-		$('ue_other_phone').onchange();
+ if( cloneUser.other_phone() ) {
+  $('ue_other_phone').value = cloneUser.other_phone();
+  $('ue_other_phone').onchange();
     }
 
-	setSelector($('ue_org_selector'), cloneUser.home_ou());
-	setSelector($('ue_profile'), cloneUser.profile());
+ setSelector($('ue_org_selector'), cloneUser.home_ou());
+ setSelector($('ue_profile'), cloneUser.profile());
 
-	/* force the expire date to be set */
-	$('ue_profile').onchange();
-	$('ue_org_selector').onchange();
+ /* force the expire date to be set */
+ $('ue_profile').onchange();
+ $('ue_org_selector').onchange();
 
-	for( var a in cloneUser.addresses() ) {
-		var addr = cloneUser.addresses()[a];
-		if( cloneUser.mailing_address && 
-				addr.id() == cloneUser.mailing_address().id() )
-			patron.mailing_address(addr);
-		if( cloneUser.billing_address() &&
-				addr.id() == cloneUser.billing_address().id() )
-			patron.billing_address(addr);
-		patron.addresses().push(addr);
-	}
+ for( var a in cloneUser.addresses() ) {
+  var addr = cloneUser.addresses()[a];
+  if( cloneUser.mailing_address && 
+    addr.id() == cloneUser.mailing_address().id() )
+   patron.mailing_address(addr);
+  if( cloneUser.billing_address() &&
+    addr.id() == cloneUser.billing_address().id() )
+   patron.billing_address(addr);
+  patron.addresses().push(addr);
+ }
 
-	uEditBuildAddrs(patron);
+ uEditBuildAddrs(patron);
 }
 
 
 /* Creates a new blank address, 
-	adds it to the user and the fields array */
+ adds it to the user and the fields array */
 var uEditVirtualAddrId = -1;
 function uEditCreateNewAddr() {
-	var addr = new aua();
+ var addr = new aua();
 
-	addr.id(uEditVirtualAddrId--);
-	addr.isnew(1);
-	addr.usr(patron.id());
-	addr.country(defaultCountry);
+ addr.id(uEditVirtualAddrId--);
+ addr.isnew(1);
+ addr.usr(patron.id());
+ addr.country(defaultCountry);
 
-	if(!patron.addresses()) 
-		patron.addresses([]);
+ if(!patron.addresses()) 
+  patron.addresses([]);
 
-	if(patron.addresses().length == 0) {
-		patron.mailing_address(addr);
-		patron.billing_address(addr);
-	}
+ if(patron.addresses().length == 0) {
+  patron.mailing_address(addr);
+  patron.billing_address(addr);
+ }
 
-	addr.valid(1);
-	addr.within_city_limits(1);
+ addr.valid(1);
+ addr.within_city_limits(1);
 
-	uEditBuildAddrFields(patron, addr);
-	patron.addresses().push(addr);
-	uEditIterateFields(function(f) { uEditCheckValid(f); });
-	uEditCheckErrors();
+ uEditBuildAddrFields(patron, addr);
+ patron.addresses().push(addr);
+ uEditIterateFields(function(f) { uEditCheckValid(f); });
+ uEditCheckErrors();
 }
 
 
 /* kicks off the UI drawing */
 function uEditDraw(identTypes, groups, statCats, surveys, netLevels ) {
-	hideMe($('uedit_loading'));
-	unHideMe($('ue_maintd'));
+ hideMe($('uedit_loading'));
+ unHideMe($('ue_maintd'));
 
-	dataFields = [];
-	uEditDrawIDTypes(identTypes);
-	uEditDrawGroups(groups, null, null, true);
-	uEditDrawStatCats(statCats);
-	uEditDrawSurveys(surveys);
-	uEditDrawNetLevels(netLevels);
-	uEditDefineData(patron);
+ dataFields = [];
+ uEditDrawIDTypes(identTypes);
+ uEditDrawGroups(groups, null, null, true);
+ uEditDrawStatCats(statCats);
+ uEditDrawSurveys(surveys);
+ uEditDrawNetLevels(netLevels);
+ uEditDefineData(patron);
 
-	uEditIterateFields(function(f) { uEditActivateField(f) });
-	uEditIterateFields(function(f) { uEditCheckValid(f); });
-	uEditCheckErrors();
+ uEditIterateFields(function(f) { uEditActivateField(f) });
+ uEditIterateFields(function(f) { uEditCheckValid(f); });
+ uEditCheckErrors();
 }
 
 
 /** Applies the event handlers and sets the data for the field */
 function uEditActivateField(field) {
 
-	if( field.widget.id ) {
-		field.widget.node = $(field.widget.id);
+ if( field.widget.id ) {
+  field.widget.node = $(field.widget.id);
 
-	} else {
-		field.widget.node = 
-			$n(field.widget.base, field.widget.name);
-	}
+ } else {
+  field.widget.node = 
+   $n(field.widget.base, field.widget.name);
+ }
 
-	uEditSetOnchange(field);
+ uEditSetOnchange(field);
 
-	if(field.widget.onblur) {
-		field.widget.node.onblur = 
-			function() { field.widget.onblur(field); };
-	}
+ if(field.widget.onblur) {
+  field.widget.node.onblur = 
+   function() { field.widget.onblur(field); };
+ }
 
-	field.widget.node.disabled = field.widget.disabled;
-	if(field.object == null) return;
-	var val = field.object[field.key]();
-	if(val == null) return;
+ field.widget.node.disabled = field.widget.disabled;
+ if(field.object == null) return;
+ var val = field.object[field.key]();
+ if(val == null) return;
 
-	if( field.widget.type == 'input' )
-		field.widget.node.value = val;
+ if( field.widget.type == 'input' )
+  field.widget.node.value = val;
 
-	if( field.widget.type == 'select' )
-		setSelector(field.widget.node, val);
+ if( field.widget.type == 'select' )
+  setSelector(field.widget.node, val);
 
-	if( field.widget.type == 'checkbox' )
-		field.widget.node.checked = 
-			(val && val != 'f') ? true : false;
+ if( field.widget.type == 'checkbox' )
+  field.widget.node.checked = 
+   (val && val != 'f') ? true : false;
 
-	if( field.widget.onload ) 
-		field.widget.onload(val);
+ if( field.widget.onload ) 
+  field.widget.onload(val);
 }
 
 
 /* set up the onchange event for the field */
 function uEditSetOnchange(field) {
-	var func = function() {uEditOnChange( field );}
-	field.widget.node.onchange = func;
+ var func = function() {uEditOnChange( field );}
+ field.widget.node.onchange = func;
 
-	if(field.widget.type != 'select')
-		field.widget.node.onkeyup = func;
+ if(field.widget.type != 'select')
+  field.widget.node.onkeyup = func;
 }
 
 /* find the current value of the field object's widget */
 function uEditNodeVal(field) {
-	if(field.widget.type == 'input')
-		return field.widget.node.value;
+ if(field.widget.type == 'input')
+  return field.widget.node.value;
 
-	if(field.widget.type == 'checkbox')
-		return field.widget.node.checked;
+ if(field.widget.type == 'checkbox')
+  return field.widget.node.checked;
 
-	if(field.widget.type == 'select')
-		return getSelectorVal(field.widget.node);
+ if(field.widget.type == 'select')
+  return getSelectorVal(field.widget.node);
 }
 
 
 /* update a field value */
 function uEditOnChange(field) {
 
-	var newval = uEditNodeVal(field);
-	field.object[field.key](newval);
-	field.object.ischanged(1);
+ var newval = uEditNodeVal(field);
+ field.object[field.key](newval);
+ field.object.ischanged(1);
 
-	if(field.widget.onpostchange)
-		field.widget.onpostchange(field, newval);
+ if(field.widget.onpostchange)
+  field.widget.onpostchange(field, newval);
 
-	//_debug(field.key+' = '+newval);
+ //_debug(field.key+' = '+newval);
 
-	uEditIterateFields(function(f) { uEditCheckValid(f); });
-	uEditCheckErrors();
+ uEditIterateFields(function(f) { uEditCheckValid(f); });
+ uEditCheckErrors();
 
    uEditSetUnload();
 }
 
 
 function uEditCheckValid(field) {
-	var newval = uEditNodeVal(field);
+ var newval = uEditNodeVal(field);
 
-	if(newval) {
+ if(newval) {
 
-		if(field.widget.regex) { 
-			if(newval.match(field.widget.regex)) 
-				removeCSSClass(field.widget.node, CSS_INVALID_DATA);
-			else
-				addCSSClass(field.widget.node, CSS_INVALID_DATA);
+  if(field.widget.regex) { 
+   if(newval.match(field.widget.regex)) 
+    removeCSSClass(field.widget.node, CSS_INVALID_DATA);
+   else
+    addCSSClass(field.widget.node, CSS_INVALID_DATA);
 
-		} else {
-			removeCSSClass(field.widget.node, CSS_INVALID_DATA);
-		}
+  } else {
+   removeCSSClass(field.widget.node, CSS_INVALID_DATA);
+  }
 
-	} else {
+ } else {
 
-		if(field.required) {
-			addCSSClass(field.widget.node, CSS_INVALID_DATA);
+  if(field.required) {
+   addCSSClass(field.widget.node, CSS_INVALID_DATA);
 
-		} else {
-			removeCSSClass(field.widget.node, CSS_INVALID_DATA);
-		}
-	}
+  } else {
+   removeCSSClass(field.widget.node, CSS_INVALID_DATA);
+  }
+ }
 
 }
 
 /* find a field object by object key */
 function uEditFindFieldByKey(key) {
-	var fields = grep( dataFields,
-		function(item) { return (item.key == key); });
-	return (fields) ? fields[0] : null;
+ var fields = grep( dataFields,
+  function(item) { return (item.key == key); });
+ return (fields) ? fields[0] : null;
 }
 
 /* find a list of fields by object key */
 function uEditFindFieldsByKey(key) {
-	return grep( dataFields,
-		function(item) { return (item.key == key); });
+ return grep( dataFields,
+  function(item) { return (item.key == key); });
 }
 
 /* find a field object by widget id */
 function uEditFindFieldByWId(id) {
-	var fields = grep( dataFields,
-		function(item) { return (item.widget.id == id); });
-	return (fields) ? fields[0] : null;
+ var fields = grep( dataFields,
+  function(item) { return (item.widget.id == id); });
+ return (fields) ? fields[0] : null;
 }
 
 
 function uEditIterateFields(callback) {
-	for( var f in dataFields ) 
-		callback(dataFields[f]);
+ for( var f in dataFields ) 
+  callback(dataFields[f]);
 }
 
 
 function uEditGetErrorStrings() {
-	var errors = [];
-	uEditIterateFields(
-		function(field) { 
-			if(field.errkey) {
-				if( !field.object.isdeleted() ) {
-					if( field.widget.node.className.indexOf(CSS_INVALID_DATA) != -1) {
-						var str = $(field.errkey).innerHTML;
-						if(str) errors.push(str);
-					}
-				}
-			}
-		}
-	);
-
-	/* munge up something for all of the required surveys 
-		(which are not registered with the fields) */
-	if( patron.isnew() ) {
-		var sel = $('ue_survey_table');
-
-		if( sel ) {
-			var rows = sel.getElementsByTagName('tr');
-
-			for( var r in rows ) {
-		
-				var row = rows[r];
-				var sel = $n(row, 'ue_survey_answer');
-				if(!sel) continue;
-				var qstn = row.getAttribute('question');
-		
-				if(qstn) {
-					qstn		= surveyQuestionsCache[qstn];
-					survey	= surveysCache[qstn.survey()];
-					var val	= getSelectorVal(sel);
-					if(!val && isTrue(survey.required()))
-						errors.push($('ue_bad_survey').innerHTML + ' : ' + qstn.question());
-				}
-			}
-		}
-	}
-
-	/* ------------------------------------------------------------ */
-
-	if(errors[0]) return errors;
-	return null;
+ var errors = [];
+ uEditIterateFields(
+  function(field) { 
+   if(field.errkey) {
+    if( !field.object.isdeleted() ) {
+     if( field.widget.node.className.indexOf(CSS_INVALID_DATA) != -1) {
+      var str = $(field.errkey).innerHTML;
+      if(str) errors.push(str);
+     }
+    }
+   }
+  }
+ );
+
+ /* munge up something for all of the required surveys 
+  (which are not registered with the fields) */
+ if( patron.isnew() ) {
+  var sel = $('ue_survey_table');
+
+  if( sel ) {
+   var rows = sel.getElementsByTagName('tr');
+
+   for( var r in rows ) {
+  
+    var row = rows[r];
+    var sel = $n(row, 'ue_survey_answer');
+    if(!sel) continue;
+    var qstn = row.getAttribute('question');
+  
+    if(qstn) {
+     qstn  = surveyQuestionsCache[qstn];
+     survey = surveysCache[qstn.survey()];
+     var val = getSelectorVal(sel);
+     if(!val && isTrue(survey.required()))
+      errors.push($('ue_bad_survey').innerHTML + ' : ' + qstn.question());
+    }
+   }
+  }
+ }
+
+ /* ------------------------------------------------------------ */
+
+ if(errors[0]) return errors;
+ return null;
 }
 
 function uEditAlertErrors() {
-	var errors = uEditGetErrorStrings();
-	if(!errors) return false;
-	alert(errors.join("\n"));
-	return true;
+ var errors = uEditGetErrorStrings();
+ if(!errors) return false;
+ alert(errors.join("\n"));
+ return true;
 }
 
 
 /* send the user to the database */
 function uEditSaveUser(cloneme) {
 
-	if(uEditGetErrorStrings()) {
-		uEditAlertErrors();
-		return;
-	}
+ if(uEditGetErrorStrings()) {
+  uEditAlertErrors();
+  return;
+ }
 
-	/* null is unique in the db, but '' is not */
-	if( ! patron.ident_value() ) patron.ident_value(null);
-	//if( ! patron.ident_type2() ) patron.ident_type2(null);
-	if( ! patron.ident_value2() ) patron.ident_value2(null);
-	patron.ident_type2(null);
+ /* null is unique in the db, but '' is not */
+ if( ! patron.ident_value() ) patron.ident_value(null);
+ //if( ! patron.ident_type2() ) patron.ident_type2(null);
+ if( ! patron.ident_value2() ) patron.ident_value2(null);
+ patron.ident_type2(null);
 
-	if(! patron.dob() ) patron.dob(null);
+ if(! patron.dob() ) patron.dob(null);
 
-	_debug("Saving patron with card: " + js2JSON(patron.card()));
-	_debug("Saving full patron: " + js2JSON(patron));
+ _debug("Saving patron with card: " + js2JSON(patron.card()));
+ _debug("Saving full patron: " + js2JSON(patron));
 
-	//for( var c in patron
+ //for( var c in patron
 
-	var req = new Request(UPDATE_PATRON, SESSION, patron);
-	req.alertEvent = false;
-	req.send(true);
-	var newuser = req.result();
+ var req = new Request(UPDATE_PATRON, SESSION, patron);
+ req.alertEvent = false;
+ req.send(true);
+ var newuser = req.result();
 
    uEditClearUnload();
 
-	var evt;
-	if( (evt = checkILSEvent(newuser)) || ! newuser ) {
-		if(evt) {
+ var evt;
+ if( (evt = checkILSEvent(newuser)) || ! newuser ) {
+  if(evt) {
             evt = newuser;
             if( evt.textcode == 'XACT_COLLISION' ) {
                 if( confirmId('ue_xact_collision') )
@@ -608,75 +608,75 @@ function uEditSaveUser(cloneme) {
                 return;
             }
             var j = js2JSON(evt);
-			alert(j);
-			_debug("USER UPDATE FAILED:\n" + j);
-		}
-		return;
-	} 
+   alert(j);
+   _debug("USER UPDATE FAILED:\n" + j);
+  }
+  return;
+ } 
 
-	alert($('ue_success').innerHTML);
+ alert($('ue_success').innerHTML);
 
-	if(cloneme) {
-		/* if the user we just created was a clone, and we want to clone it,
-		we really want to clone the original */
-		if( clone ) cloneme = clone;
-		else cloneme = newuser.id();
-	}
+ if(cloneme) {
+  /* if the user we just created was a clone, and we want to clone it,
+  we really want to clone the original */
+  if( clone ) cloneme = clone;
+  else cloneme = newuser.id();
+ }
 
 
-	if( cloneme ) {
+ if( cloneme ) {
 
-		if(window.xulG &&
-			typeof window.xulG.spawn_editor == 'function' && 
+  if(window.xulG &&
+   typeof window.xulG.spawn_editor == 'function' && 
 
-			!patron.isnew() ) {
-				_debug("xulG clone spawning new interface...");
-				var ses = cgi.param('ses'); 
-				if (xulG) if (xulG.ses) ses = xulG.ses;
-				if (xulG) if (xulG.params) if (xulG.params.ses) ses = xulG.params.ses;
-				window.xulG.spawn_editor({ses:ses,clone:cloneme});
-				uEditRefresh();
+   !patron.isnew() ) {
+    _debug("xulG clone spawning new interface...");
+    var ses = cgi.param('ses'); 
+    if (xulG) if (xulG.ses) ses = xulG.ses;
+    if (xulG) if (xulG.params) if (xulG.params.ses) ses = xulG.params.ses;
+    window.xulG.spawn_editor({ses:ses,clone:cloneme});
+    uEditRefresh();
 
-		} else {
+  } else {
 
-			var href = location.href;
-			href = href.replace(/\&?usr=\d+/, '');
-			href = href.replace(/\&?clone=\d+/, '');
-			href += '&clone=' + cloneme;
-			location.href = href;
-		}
+   var href = location.href;
+   href = href.replace(/\&?usr=\d+/, '');
+   href = href.replace(/\&?clone=\d+/, '');
+   href += '&clone=' + cloneme;
+   location.href = href;
+  }
 
-	} else {
+ } else {
 
-		uEditRefresh();
-	}
+  uEditRefresh();
+ }
 
-	uEditRefreshXUL(newuser);
+ uEditRefreshXUL(newuser);
 }
 
 
 function uEditRefreshXUL(newuser) {
-	if (window.xulG && typeof window.xulG.on_save == 'function') 
-		window.xulG.on_save(newuser);
+ if (window.xulG && typeof window.xulG.on_save == 'function') 
+  window.xulG.on_save(newuser);
 }
 
 function uEditRefresh() {
-	var href = location.href;
-	href = href.replace(/\&?clone=\d+/, '');
-	location.href = href;
+ var href = location.href;
+ href = href.replace(/\&?clone=\d+/, '');
+ location.href = href;
 }
 
 
 function uEditCancel() {
-	var href = location.href;
-	href = href.replace(/\&?usr=\d+/, '');
-	href = href.replace(/\&?clone=\d+/, '');
-	var id = cgi.param('usr'); 
-	if (xulG) if (xulG.usr) id = xulG.usr;
-	if (xulG) if (xulG.params) if (xulG.params.usr) id = xulG.params.usr;
-	/* reload the current user if available */
-	if( id ) href += (href.match(/\?/) ? "&" : "?") + "usr=" + id;
-	location.href = href;
+ var href = location.href;
+ href = href.replace(/\&?usr=\d+/, '');
+ href = href.replace(/\&?clone=\d+/, '');
+ var id = cgi.param('usr'); 
+ if (xulG) if (xulG.usr) id = xulG.usr;
+ if (xulG) if (xulG.params) if (xulG.params.usr) id = xulG.params.usr;
+ /* reload the current user if available */
+ if( id ) href += (href.match(/\?/) ? "&" : "?") + "usr=" + id;
+ location.href = href;
 }
 
 
@@ -685,131 +685,131 @@ var uEditDupTemplate;
 
 function uEditRunDupeSearch(type, search_hash) {
 
-	if(!patron.isnew()) return;
+ if(!patron.isnew()) return;
 
-	_debug('dup search: ' + js2JSON(search_hash));
+ _debug('dup search: ' + js2JSON(search_hash));
 
-	var req = new Request(PATRON_SEARCH, SESSION, search_hash);
+ var req = new Request(PATRON_SEARCH, SESSION, search_hash);
 
-	var container = $('dup_div_container');
-	if(!uEditDupTemplate)
-		uEditDupTemplate = container.removeChild($('dup_div'));
+ var container = $('dup_div_container');
+ if(!uEditDupTemplate)
+  uEditDupTemplate = container.removeChild($('dup_div'));
 
-	/* clear any existing dups for this type */
-	iterate( container.getElementsByTagName('div'),
-		function(d) {
-			if( d.getAttribute('type') == type ) {
-				container.removeChild(d)
-				return;
-			}
-		}
-	);
+ /* clear any existing dups for this type */
+ iterate( container.getElementsByTagName('div'),
+  function(d) {
+   if( d.getAttribute('type') == type ) {
+    container.removeChild(d)
+    return;
+   }
+  }
+ );
 
-	req.callback(
-		function(r) {
-			uEditHandleDupResults( r.getResultObject(), search_hash, type, container );
-		}
-	);
-	req.send();
+ req.callback(
+  function(r) {
+   uEditHandleDupResults( r.getResultObject(), search_hash, type, container );
+  }
+ );
+ req.send();
 }
 
 
 function uEditHandleDupResults(ids, search_hash, type, container) {
 
-	_debug('dup search results: ' + js2JSON(ids));
+ _debug('dup search results: ' + js2JSON(ids));
 
-	if(!(ids && ids[0]))  /* no results */
-		return uEditDupHashes[type] = null;
+ if(!(ids && ids[0]))  /* no results */
+  return uEditDupHashes[type] = null;
 
-	/* add a dup link to the UI and plug in the data */
-	var node = uEditDupTemplate.cloneNode(true);
-	container.appendChild(node);
-	node.setAttribute('type', type);
+ /* add a dup link to the UI and plug in the data */
+ var node = uEditDupTemplate.cloneNode(true);
+ container.appendChild(node);
+ node.setAttribute('type', type);
 
-	var link = $n(node, 'link');
-	link.setAttribute('type', type);
-	unHideMe(link);
-	$n(node,'count').appendChild(text(ids.length));
+ var link = $n(node, 'link');
+ link.setAttribute('type', type);
+ unHideMe(link);
+ $n(node,'count').appendChild(text(ids.length));
 
-	for( var o in search_hash ) 
-		$n(node, 'data').appendChild(
-			text(search_hash[o].value + ' '));
+ for( var o in search_hash ) 
+  $n(node, 'data').appendChild(
+   text(search_hash[o].value + ' '));
 
-	uEditDupHashes[type] = search_hash;
+ uEditDupHashes[type] = search_hash;
 
-	switch(type) {
-		case 'ident' :
-			if(confirm($('ue_dup_ident1').innerHTML)) 
-				uEditShowSearch(null, type);
-			break;
-	}
+ switch(type) {
+  case 'ident' :
+   if(confirm($('ue_dup_ident1').innerHTML)) 
+    uEditShowSearch(null, type);
+   break;
+ }
 }
 
 
 function uEditShowSearch(link,type) {
-	if(!type) type = link.getAttribute('type');
-	if(window.xulG)
-		window.xulG.spawn_search(uEditDupHashes[type]);	
-	else alert($("patronStrings").getString('web.staff.patron.ue.uedit_show_search.search_would_be', js2JSON(uEditDupHashes[type])));
+ if(!type) type = link.getAttribute('type');
+ if(window.xulG)
+  window.xulG.spawn_search(uEditDupHashes[type]); 
+ else alert($("patronStrings").getString('web.staff.patron.ue.uedit_show_search.search_would_be', js2JSON(uEditDupHashes[type])));
 }
 
 function uEditMarkCardLost() {
 
-	for( var c in patron.cards() ) {
+ for( var c in patron.cards() ) {
 
-		var card = patron.cards()[c];
-		if( patron.card().id() == card.id() ) {
+  var card = patron.cards()[c];
+  if( patron.card().id() == card.id() ) {
 
-			/* de-activite the current card */
-			card.ischanged(1);
-			card.active(0);
+   /* de-activite the current card */
+   card.ischanged(1);
+   card.active(0);
 
-			if( !card.barcode() ) {
-				/* a card exists in the array with no barcode */
-				ueRemoveCard(card.id());
+   if( !card.barcode() ) {
+    /* a card exists in the array with no barcode */
+    ueRemoveCard(card.id());
 
-			} else if( card.isnew() && card.active() == 0 ) {
-				/* a new card was created, then never used, removing.. */
-				_debug("removing new inactive card "+card.barcode());
-				ueRemoveCard(card.id());
-			}
+   } else if( card.isnew() && card.active() == 0 ) {
+    /* a new card was created, then never used, removing.. */
+    _debug("removing new inactive card "+card.barcode());
+    ueRemoveCard(card.id());
+   }
 
-			/* create a new card for the patron */
-			var newcard = new ac();
-			newcard.id(uEditCardVirtId--);
-			newcard.isnew(1);
-			patron.card(newcard);
-			patron.cards().push(newcard);
+   /* create a new card for the patron */
+   var newcard = new ac();
+   newcard.id(uEditCardVirtId--);
+   newcard.isnew(1);
+   patron.card(newcard);
+   patron.cards().push(newcard);
 
 
-			/* reset the widget */
-			var field = uEditFindFieldByWId('ue_barcode');
-			field.widget.node.disabled = false;
-			field.widget.node.value = "";
-			field.widget.node.onchange();
-			field.object = newcard;
-			_debug("uEditMarkCardLost(): created new card object for user");
-		}
-	}
+   /* reset the widget */
+   var field = uEditFindFieldByWId('ue_barcode');
+   field.widget.node.disabled = false;
+   field.widget.node.value = "";
+   field.widget.node.onchange();
+   field.object = newcard;
+   _debug("uEditMarkCardLost(): created new card object for user");
+  }
+ }
 }
 
 
 function ueRemoveCard(id) {
-	_debug("removing card from cards() array: " + id);
-	var cds = grep( patron.cards(), function(c){return (c.id() != id)});
-	if(!cds) cds = [];
-	for( var j = 0; j < cds.length; j++ )
-		_debug("patron card array now has :  "+cds[j].id());
-	patron.cards(cds);
+ _debug("removing card from cards() array: " + id);
+ var cds = grep( patron.cards(), function(c){return (c.id() != id)});
+ if(!cds) cds = [];
+ for( var j = 0; j < cds.length; j++ )
+  _debug("patron card array now has :  "+cds[j].id());
+ patron.cards(cds);
 }
 
 
 
 function compactArray(arr) {
-	var a = [];
-	for( var i = 0; arr && i < arr.length; i++ ) {
-		if( arr[i] != null )
-			a.push(arr[i]);
-	}
-	return a;
+ var a = [];
+ for( var i = 0; arr && i < arr.length; i++ ) {
+  if( arr[i] != null )
+   a.push(arr[i]);
+ }
+ return a;
 }
diff --git a/Open-ILS/xul/staff_client/server/patron/ue.xhtml b/Open-ILS/xul/staff_client/server/patron/ue.xhtml
index 951b0893dd..28417ac1f9 100644
--- a/Open-ILS/xul/staff_client/server/patron/ue.xhtml
+++ b/Open-ILS/xul/staff_client/server/patron/ue.xhtml
@@ -1,1009 +1,1009 @@
 <?xml version='1.0' encoding="UTF-8"?>
 
 <!DOCTYPE html PUBLIC 
-	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
-	<!ENTITY nbsp " "> <!-- calendar needs this entity -->
+ "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!ENTITY nbsp " "> <!-- calendar needs this entity -->
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
 
-	<head>
-		<title>&ev.staff.patron.ue_xhtml.ev_user_editor.label;</title>
-		<script language='javascript' src='/opac/common/js/utils.js'> </script>
-		<script language='javascript' src='/opac/common/js//config.js'> </script> 
-		<script language='javascript' src='/opac/common/js/CGI.js'> </script>
-	
-		<script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
-		<script language='javascript' src='/opac/common/js/fmall.js'> </script>
-		<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
-		<script language='javascript' src='/opac/common/js/Cookies.js'> </script>
-		<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
-		<script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
-		<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
-		<script language='javascript' src='/opac/common/js/init.js'> </script>
-		<script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
-
-
-
-		<!--
-		<script language='javascript' src='/opac/common/js/date.js'> </script>
-		-->
-		<script language='javascript' src='../admin/adminlib.js'> </script>
-		<script language='javascript' src='ue_config.js'> </script>
-		<script language='javascript' src='ue_ui.js'> </script>
-		<script language='javascript' src='ue.js'> </script>
-		<link type='text/css' rel='stylesheet' href='../admin/admin.css'/>
+ <head>
+  <title>&ev.staff.patron.ue_xhtml.ev_user_editor.label;</title>
+  <script language='javascript' src='/opac/common/js/utils.js'> </script>
+  <script language='javascript' src='/opac/common/js//config.js'> </script> 
+  <script language='javascript' src='/opac/common/js/CGI.js'> </script>
+ 
+  <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
+  <script language='javascript' src='/opac/common/js/fmall.js'> </script>
+  <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
+  <script language='javascript' src='/opac/common/js/Cookies.js'> </script>
+  <script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
+  <script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
+  <script language='javascript' src='/opac/common/js/org_utils.js'> </script>
+  <script language='javascript' src='/opac/common/js/init.js'> </script>
+  <script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
+
+
+
+  <!--
+  <script language='javascript' src='/opac/common/js/date.js'> </script>
+  -->
+  <script language='javascript' src='../admin/adminlib.js'> </script>
+  <script language='javascript' src='ue_config.js'> </script>
+  <script language='javascript' src='ue_ui.js'> </script>
+  <script language='javascript' src='ue.js'> </script>
+  <link type='text/css' rel='stylesheet' href='../admin/admin.css'/>
   
-		<link rel="stylesheet" type="text/css" media="all" 
-			href="/opac/common/js/jscalendar/calendar-brown.css" title="win2k-cold-1" />
-		<script type="text/javascript" src="/opac/common/js/jscalendar/calendar.js"></script>
-		<script type="text/javascript" src="/opac/common/js/jscalendar/lang/calendar-en.js"></script>
-		<script type="text/javascript" src="/opac/common/js/jscalendar/calendar-setup.js"></script>
-
-
-		<style type='text/css'>
-			.messagecatalog { -moz-binding: url( /xul/server/main/bindings.xml#messagecatalog ) }
-			.main_table { width: 98%; border-collapse: collapse;}
-			.main_table td { border: 1px solid #E0F0E0; text-align: center; padding: 4px;}
-			#uedit_nav_bar { border: 2px solid #E0F0E0; padding: 6px;}
-			.nav_link { padding-left: 90px; padding-right: 90px; }
-			.main_nav_link { -moz-border-radius: 7px; height: 13%;}
-			/*
-			.main_div { height: 480px; padding-left: 15px; 
-				text-align: center; vertical-align: middle; overflow: auto;}
-				*/
-
-			.main_div { min-height: 450px; padding-left: 15px; 
-				text-align: center; vertical-align: middle; }
-
-			.nav_link_table { height: 480px;}
-			.label_active { background: #E0F0E0; }
-			.right { text-align: right; padding-right: 3px;}
-			.left { text-align: left; padding-left: 3px;}
-			.wide { width: 98%;}
-			.pad { padding-left: 3px; padding-right: 3px; }
-			.no_border td { border: none; }
-			.uedit_table { width: 80% }
-			.address_table { -moz-border-radius: 4px; border: 4px solid #E0E0F0; padding: 4px; }
-			.shared_address { background : #E0F0F0; }
-			.address_table td { border: none; width: auto; padding: 1px; }
-			.addr_info_checked { -moz-border-radius: 6px; background: #F0E0E0; }
-			.button_row { width: 95%; text-align: center; margin-top: 7px; border: 1px solid #E0E0E0; }
-			/*.required_field { background: #F0E0E0; }*/
-			.invalid_value { background: red; }
-
-			/* all text inputs that don't have the .invalid_value 
-				class applied and are currently focused */
-			input:focus:not(.invalid_value) { background: #E0F0E0; color: darkblue;}
-
-			.deleted { background: #FF6666; }
-
-			.dup_link { padding-left: 5px; color: red; }
-
-
-		</style>
-	</head>
-	
-	<div class="messagecatalog" id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
-
-	<body onload='uEditInit();'>
-
-	<center>
-
-		<h2>&ev.staff.patron.ue_xhtml.ev_user_editor.label;</h2>
-
-		<div style='position:absolute; top: 5px; right: 5px;'>
-			<span>&ev.staff.patron.ue_xhtml.welcome.label;</span><b><span id='uedit_user'/></b>
-		</div>
-
-		<hr/><br/>
-
-		<div id='main_div_container'>
-
-		<table style='margin-bottom: 5px; width:100%;'>
-			<tbody>
-				<tr>
-					<td align='left' width='80%'>
-						<b>
-							<span>&staff.patron.ue.interface_note.label;</span>
-						</b>
-					</td>
-					<td align='right' width='20%'>
-						<a class='hide_me' id='ue_errors' href='javascript:void(0);' 
-							style='color: red; font-size: 12pt; font-weight: bold' onclick='uEditAlertErrors();'>
-							&ev.staff.patron.ue_xhtml.view_errors.label;
-						</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-
-		<table class='main_table'>
-			<tbody>
-				<tr>
-					<td width='15%' valign='top'>
-						<!-- ************************************************************** -->
-						<!--  Top Navigation Links -->
-						<!-- ************************************************************** -->
-						<table height='100%' class='nav_link_table'>
-							<tbody>
-								<tr>
-									<td id='uedit_userid_label' class='main_nav_link'>
-										<a href='javascript:uEditShowPage("uedit_userid");'>&ev.staff.patron.ue_xhtml.user_id.label;</a>
-									</td>
-								</tr>
-								<tr>
-									<td id='uedit_contact_info_label' class='main_nav_link'>	
-										<a href='javascript:uEditShowPage("uedit_contact_info");'>&ev.staff.patron.ue_xhtml.contact_info.label;</a>
-									</td>
-								</tr>
-								<tr>
-									<td id='uedit_addresses_label' class='main_nav_link'>		
-										<a href='javascript:uEditShowPage("uedit_addresses");'>&ev.staff.patron.ue_xhtml.addresses.label;</a>
-									</td>
-								</tr>
-								<tr>
-									<td id='uedit_groups_label' class='main_nav_link'>			
-										<a href='javascript:uEditShowPage("uedit_groups");'>&ev.staff.patron.ue_xhtml.groups_permissions.label;</a>
-									</td>
-								</tr>
-								<tr>
-									<td id='uedit_stat_cats_label' class='main_nav_link'>		
-										<a href='javascript:uEditShowPage("uedit_stat_cats");'>&ev.staff.patron.ue_xhtml.statistical_categories.label;</a>
-									</td>
-								</tr>
-								<tr>
-									<td id='uedit_surveys_label' class='main_nav_link'>			
-										<a href='javascript:uEditShowPage("uedit_surveys");'>&ev.staff.patron.ue_xhtml.surveys.label;</a>
-									</td>
-								</tr>
-								<tr>
-									<td id='uedit_finalize_label' class='main_nav_link'>			
-										<a href='javascript:uEditShowPage("uedit_finalize");'>&ev.staff.patron.ue_xhtml.finish.label;</a>
-									</td>
-								</tr>
-							</tbody>
-						</table>
-					</td>
-
-					<td width='85%' id='uedit_loading'>
-						<div class='main_div has_color' 
-							style='padding: 50px; vertical-align: middle;'>
-							<b>&ev.staff.patron.ue_xhtml.loading_data.label;</b>
-						</div>
-					</td>
-
-
-					<td width='85%' id='ue_maintd' class='hide_me'>
-
-						<div id='dup_div_container'>
-							<div id='dup_div' name='dup_div'>
-								<a name='link' class='dup_link hide_me'
-									href='javascript:void(0);' onclick='uEditShowSearch(this);'>
-									&ev.staff.patron.ue_xhtml.found_duplicate_patron.label; <b name='count'/>
-									<b name='data'/>
-								</a>
-							</div>
-						</div>
-
-
-						<!-- ************************************************************** -->
-						<!--  Identification Pane -->
-						<!-- ************************************************************** -->
-						<div id='uedit_userid' class='main_div'>
-							<table class='uedit_table'>
-								<tbody>
-									<tr class='required_field'>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.barcode.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<input type='text' id='ue_barcode' />
-													<!--
-													onblur=' 
-														var node = uEditFindFieldByWId("ue_username");
-														if(!node.widget.node.value) {
-															node.widget.node.value = this.value;
-															node.widget.node.onchange();
-														}'
-														/> -->
-														<button style='padding-left: 5px;' class='hide_me' id='ue_mark_card_lost'
-													onclick='uEditMarkCardLost();'>&ev.staff.patron.ue_xhtml.mark_lost.label;</button>
-											</div>
-										</td>
-									</tr>
-									<tr class='required_field'>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.username.label;</div></td>
-										<td><div class='wide left'><input type='text' id='ue_username'/></div></td>
-									</tr>
-									<tr class='required_field'>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.password.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<input type='password' id='ue_password1'/>
-												<button class='hide_me' onclick='uEditResetPw();' id='ue_reset_pw'>&ev.staff.patron.ue_xhtml.reset.label;</button>
-												<span style='padding-left: 10px;' class='hide_me' id='ue_password_gen'>
-													&ev.staff.patron.ue_xhtml.re_password.label;
-													<span style='text-decoration:underline;' id='ue_password_plain'/>
-												</span>
-											</div>
-										</td>
-									</tr>
-									<tr class='required_field'>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.verify_password.label;</div></td>
-										<td><div class='wide left'><input type='password' id='ue_password2'/></div></td>
-									</tr>
-									<tr class='required_field'>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.first_name.label;</div></td>
-										<td><div class='wide left'><input type='text' id='ue_firstname'/></div></td>
-									</tr>
-									<tr>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.middle_name.label;</div></td>
-										<td><div class='wide left'><input type='text' id='ue_middlename'/></div></td>
-									</tr>
-									<tr class='required_field'>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.last_name.label;</div></td>
-										<td><div class='wide left'><input type='text' id='ue_lastname'/></div></td>
-									</tr>
-									<tr>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.suffix.label;</div></td>
-										<td><div class='wide left'>
-											<input type='text' id='ue_suffix'/>
-											<select id='ue_suffix_selector' style='width: 6em;'
-												onclick='$("ue_suffix").value = this.options[this.selectedIndex].value;$("ue_suffix").onchange();'
-												onchange='$("ue_suffix").value = this.options[this.selectedIndex].value;$("ue_suffix").onchange();'>
-												<option value=''>&ev.staff.patron.ue_xhtml.pick_suffix.label;</option>
-												<option value='Jr'>Jr</option>
-												<option value='Sr'>Sr</option>
-												<option value='II'>II</option>
-												<option value='III'>III</option>
-												<option value='AA'>AA</option>
-												<option value='AS'>AS</option>
-												<option value='AAS'>AAS</option>
-												<option value='BA'>BA</option>
-												<option value='BS'>BS</option>
-												<option value='CFPIM'>CFPIM</option>
-												<option value='CPA'>CPA</option>
-												<option value='CPIM'>CPIM</option>
-												<option value='CPM'>CPM</option>
-												<option value='CXE'>CXE</option>
-												<option value='DC'>DC</option>
-												<option value='DDS'>DDS</option>
-												<option value='DO '>DO</option>
-												<option value='DPM'>DPM</option>
-												<option value='DVM'>DVM</option>
-												<option value='Esq'>Esq</option>
-												<option value='FACAAI'>FACAAI</option>
-												<option value='FACP'>FACP</option>
-												<option value='FACS'>FACS</option>
-												<option value='FACEP'>FACEP</option>
-												<option value='FCP'>FCP</option>
-												<option value='FICS'>FICS</option>
-												<option value='GYN'>GYN</option>
-												<option value='JD'>JD</option>
-												<option value='LPN'>LPN</option>
-												<option value='MA'>MA</option>
-												<option value='MCSE'>MCSE</option>
-												<option value='MD'>MD</option>
-												<option value='MS'>MS</option>
-												<option value='NMD'>NMD</option>
-												<option value='OB'>OB</option>
-												<option value='PhD'>PhD</option>
-												<option value='RN'>RN</option>
-											</select>
-										</div></td>
-									</tr>
-									<tr>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.alias.label;</div></td>
-										<td><div class='wide left'><input type='text' id='ue_alias'/></div></td>
-									</tr>
-
-									<tr class='required_field'>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.dob.label;</div></td>
-										<td>
-											<div class='wide left'>
-	
-												<input type='text' id='ue_dob' size='10' maxlength='10' 
-													onfocus='/*$("ue_dob_trigger").onclick(event);*/'>1980-01-01</input>
-	
-												<button style='padding: 0px;' id='ue_dob_trigger'>
-													<img src="/opac/common/js/jscalendar/img.gif" 
-														style="cursor: pointer; border: 1px solid red; padding: 0px; margin: -3px;" 
-														title="Date selector"
-														onmouseover="this.style.background='red';" 
-														onmouseout="this.style.background=''" />
-												</button>
-
-												<span class='pad' style='font-size: 8pt;'>(YYYY-MM-DD)</span>
-	
-												<script type="text/javascript">
-													Calendar.setup({
-														inputField	: "ue_dob",				// id of the input field
-														ifFormat		: "%Y-%m-%d",			// format of the input field
-														button		: "ue_dob_trigger",  // trigger for the calendar (button ID)
-														align			: "Tl",					// alignment (defaults to "Bl")
-														singleClick	: true
-													});
-												</script>
-	
-											</div>
-										</td>
-									</tr>
-									<tr>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.juvenile.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<input id='ue_juvenile' type='checkbox'/>
-											</div>
-										</td>
-									</tr>
-									<tr class='required_field'>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.primary_id_type.label;</div></td>
-										<td><div class='wide left'>
-												<select id='ue_primary_ident_type'>
-													<option value=''>&ev.staff.patron.ue_xhtml.required.label;</option>
-												</select>
-											</div>
-										</td>
-									</tr>
-									<tr class='required_field'>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.primary_id.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<input type='text' id='ue_primary_ident'/>
-												<span id='primary_ident_ssn_help' 
-													style='padding-left: 2px; font-size: 8pt;' class='hide_me'>
-													&ev.staff.patron.ue_xhtml.primary_ident_ssn_help.label;
-												</span>
-												<span id='primary_ident_dl_help' 
-													style='padding-left: 2px; font-size: 8pt;' class='hide_me'>
-													&ev.staff.patron.ue_xhtml.primary_ident_dl_help.label;	
-												</span>
-											</div>
-										</td>
-									</tr>
-									<!--
-									<tr>
-										<td><div class='wide right'>Secondary Identification Type</div></td>
-										<td><div class='wide left'>
-												<select id='ue_secondary_ident_type'>
-													<option value=''>  None Selected  </option>
-												</select>
-											</div>
-										</td>
-									</tr>
-									-->
-									<tr class='hide_me'>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.parent_guardian.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<input type='text' id='ue_secondary_ident'/>
-											</div>
-										</td>
-									</tr>
-									<!--
-									<tr class='hide_me' id='ue_guardian_row'>
-										<td><div class='wide right'><b>Parent / Guardian</b></div></td>
-										<td>
-											<div class='wide left'>
-												<span id='ue_guardian_field'/>
-											</div>
-										</td>
-									</tr>
-									-->
-								</tbody>
-							</table>
-						</div>
-
-						<!-- ************************************************************** -->
-						<!-- Contact Info Pane -->
-						<!-- ************************************************************** -->
-						<div id='uedit_contact_info' class='main_div hide_me'>
-
-							<table class='uedit_table'>
-								<tbody>
-									<tr>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.email_address.label;</div></td>
-										<td><div class='wide left'><input type='text' id='ue_email' size='32'/></div></td>
-									</tr>
-									<tr>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.daytime_phone.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<input class='pad' type='text' id='ue_day_phone' size='18'/>
-												<span style='font-size: 9pt;'>&ev.staff.patron.ue_xhtml.phone_example;</span>
-											</div>
-										</td>
-									</tr>
-									<tr>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.evening_phone.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<input class='pad' type='text' id='ue_night_phone' size='18'/>
-											</div>
-										</td>
-									</tr>
-									<tr>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.other_phone.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<input class='pad' type='text' id='ue_other_phone' size='18'/>
-											</div>
-										</td>
-									</tr>
-									<tr class='required_field'>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.home_library.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<select style='width: 20em;' id='ue_org_selector'/>
-											</div>
-										</td>
-									</tr>
-								</tbody>
-							</table>
-						</div>
-	
-						<!-- ************************************************************** -->
-						<!-- Addresses Pane -->
-						<!-- ************************************************************** -->
-						<div id='uedit_addresses' class='main_div hide_me' >
-							<table class='uedit_table' style='width: 98%; padding: 1px;'>
-								<thead>
-									<tr>
-										<td>&ev.staff.patron.ue_xhtml.address.label;</td>
-										<td>&ev.staff.patron.ue_xhtml.in_city_limits.label;</td>
-										<td>&ev.staff.patron.ue_xhtml.valid.label;</td>
-										<td>&ev.staff.patron.ue_xhtml.mailing_address.label;</td>
-										<td>&ev.staff.patron.ue_xhtml.physical_address.label;</td>
-									</tr>
-								</thead>
-								<tbody id='ue_address_tbody'>
-									<tr id='ue_address_template'>
-										<td>
-											<table class='address_table'>
-												<tbody>
-													<tr name='shared_row' class='hide_me'>
-														<td colspan='6'>
-															<div style='padding: 8px;'>
-																<span style='color:red;'>*</span>
-																&ev.staff.patron.ue_xhtml.address_owned_by.label;
-																<span name='addr_owner_name'/>
-																<span name='owner_link_div'>
-																	(<a name='addr_owner' href='javascript:void(0);'>&ev.staff.patron.ue_xhtml.edit.label;</a>)
-																</span>
-															</div>
-														</td>
-													</tr>
-													<tr>
-														<td><div class='wide right'>&ev.staff.patron.ue_xhtml.label.label;</div></td>
-														<td colspan='3'>
-															<div class='wide left'>
-																<input type='text' name='ue_addr_label' id='ue_addr_label'/>
-															</div>
-														</td>
-														<td><div class='wide right'>&ev.staff.patron.ue_xhtml.zip.label;</div></td>
-														<td>
-															<div class='wide left'>
-																<input type='text' name='ue_addr_zip' size='10' maxlength='10'/>
-															</div>
-														</td>
-													</tr>
-													<tr>
-														<td><div class='wide right'>&ev.staff.patron.ue_xhtml.street1.label;</div></td>
-														<td colspan='5'>
-															<div class='wide left'>
-																<input type='text' name='ue_addr_street1' size='42'/>
-															</div>
-														</td>
-													</tr>
-													<tr>
-														<td><div class='wide right'>&ev.staff.patron.ue_xhtml.street2.label;</div></td>
-														<td colspan='5'>
-															<div class='wide left'>
-																<input type='text' name='ue_addr_street2' size='42'/>
-															</div>
-														</td>
-													</tr>
-													<tr>
-														<td><div class='wide right'>&ev.staff.patron.ue_xhtml.city.label;</div></td>
-														<td colspan='3'>
-															<div class='wide left'>
-																<input type='text' name='ue_addr_city' size='17'/>
-															</div>
-														</td>
-														<td><div class='wide right'>&ev.staff.patron.ue_xhtml.conuty.label;</div></td>
-														<td>
-															<div class='wide left'>
-																<input type='text' name='ue_addr_county' size='17'/>
-															</div>
-														</td>
-													</tr>
-													<tr>
-														<td><div class='wide right'>&ev.staff.patron.ue_xhtml.state.label;</div></td>
-														<td colspan='3'>
-															<div class='wide left'>
-																<input type='text' name='ue_addr_state' size='3' maxlength='3'/>
-															</div>
-														</td>
-														<!--
-														<td><div class='wide right'>Zip</div></td>
-														<td>
-															<div class='wide left'>
-																<input type='text' name='ue_addr_zip' size='6' maxlength='6'/>
-															</div>
-														</td>
-														-->
-														<td><div class='wide right'>&ev.staff.patron.ue_xhtml.country.label;</div></td>
-														<td>
-															<div class='wide left'>
-																<input type='text' name='ue_addr_country' size='6'/>
-															</div>
-														</td>
-													</tr>
-													<tr>
-														<td colspan='6'>
-															<div class='button_row'>
-																<input type='submit' name='ue_addr_delete' 
-																	value='&ev.staff.patron.ue_xhtml.ue_addr_delete.label;'/>
-																<span style='padding-left: 10px;'> </span>
-																<input type='submit' name='ue_addr_detach' 
-																	value='&ev.staff.patron.ue_xhtml.ue_addr_detach.label;' class='hide_me'/>
-																<input type='submit' name='ue_addr_approve' 
-																	value='&ev.staff.patron.ue_xhtml.ue_addr_approve.label;' class='hide_me'/>
-															</div>
-														</td>
-													</tr>
-													<tr class='hide_me' name='ue_addr_replaced_row'>
-														<td colspan='6'>
-															<div class='button_row' name='ue_addr_replaced_div'>
+  <link rel="stylesheet" type="text/css" media="all" 
+   href="/opac/common/js/jscalendar/calendar-brown.css" title="win2k-cold-1" />
+  <script type="text/javascript" src="/opac/common/js/jscalendar/calendar.js"></script>
+  <script type="text/javascript" src="/opac/common/js/jscalendar/lang/calendar-en.js"></script>
+  <script type="text/javascript" src="/opac/common/js/jscalendar/calendar-setup.js"></script>
+
+
+  <style type='text/css'>
+   .messagecatalog { -moz-binding: url( /xul/server/main/bindings.xml#messagecatalog ) }
+   .main_table { width: 98%; border-collapse: collapse;}
+   .main_table td { border: 1px solid #E0F0E0; text-align: center; padding: 4px;}
+   #uedit_nav_bar { border: 2px solid #E0F0E0; padding: 6px;}
+   .nav_link { padding-left: 90px; padding-right: 90px; }
+   .main_nav_link { -moz-border-radius: 7px; height: 13%;}
+   /*
+   .main_div { height: 480px; padding-left: 15px; 
+    text-align: center; vertical-align: middle; overflow: auto;}
+    */
+
+   .main_div { min-height: 450px; padding-left: 15px; 
+    text-align: center; vertical-align: middle; }
+
+   .nav_link_table { height: 480px;}
+   .label_active { background: #E0F0E0; }
+   .right { text-align: right; padding-right: 3px;}
+   .left { text-align: left; padding-left: 3px;}
+   .wide { width: 98%;}
+   .pad { padding-left: 3px; padding-right: 3px; }
+   .no_border td { border: none; }
+   .uedit_table { width: 80% }
+   .address_table { -moz-border-radius: 4px; border: 4px solid #E0E0F0; padding: 4px; }
+   .shared_address { background : #E0F0F0; }
+   .address_table td { border: none; width: auto; padding: 1px; }
+   .addr_info_checked { -moz-border-radius: 6px; background: #F0E0E0; }
+   .button_row { width: 95%; text-align: center; margin-top: 7px; border: 1px solid #E0E0E0; }
+   /*.required_field { background: #F0E0E0; }*/
+   .invalid_value { background: red; }
+
+   /* all text inputs that don't have the .invalid_value 
+    class applied and are currently focused */
+   input:focus:not(.invalid_value) { background: #E0F0E0; color: darkblue;}
+
+   .deleted { background: #FF6666; }
+
+   .dup_link { padding-left: 5px; color: red; }
+
+
+  </style>
+ </head>
+ 
+ <div class="messagecatalog" id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+
+ <body onload='uEditInit();'>
+
+ <center>
+
+  <h2>&ev.staff.patron.ue_xhtml.ev_user_editor.label;</h2>
+
+  <div style='position:absolute; top: 5px; right: 5px;'>
+   <span>&ev.staff.patron.ue_xhtml.welcome.label;</span><b><span id='uedit_user'/></b>
+  </div>
+
+  <hr/><br/>
+
+  <div id='main_div_container'>
+
+  <table style='margin-bottom: 5px; width:100%;'>
+   <tbody>
+    <tr>
+     <td align='left' width='80%'>
+      <b>
+       <span>&staff.patron.ue.interface_note.label;</span>
+      </b>
+     </td>
+     <td align='right' width='20%'>
+      <a class='hide_me' id='ue_errors' href='javascript:void(0);' 
+       style='color: red; font-size: 12pt; font-weight: bold' onclick='uEditAlertErrors();'>
+       &ev.staff.patron.ue_xhtml.view_errors.label;
+      </a>
+     </td>
+    </tr>
+   </tbody>
+  </table>
+
+  <table class='main_table'>
+   <tbody>
+    <tr>
+     <td width='15%' valign='top'>
+      <!-- ************************************************************** -->
+      <!--  Top Navigation Links -->
+      <!-- ************************************************************** -->
+      <table height='100%' class='nav_link_table'>
+       <tbody>
+        <tr>
+         <td id='uedit_userid_label' class='main_nav_link'>
+          <a href='javascript:uEditShowPage("uedit_userid");'>&ev.staff.patron.ue_xhtml.user_id.label;</a>
+         </td>
+        </tr>
+        <tr>
+         <td id='uedit_contact_info_label' class='main_nav_link'> 
+          <a href='javascript:uEditShowPage("uedit_contact_info");'>&ev.staff.patron.ue_xhtml.contact_info.label;</a>
+         </td>
+        </tr>
+        <tr>
+         <td id='uedit_addresses_label' class='main_nav_link'>  
+          <a href='javascript:uEditShowPage("uedit_addresses");'>&ev.staff.patron.ue_xhtml.addresses.label;</a>
+         </td>
+        </tr>
+        <tr>
+         <td id='uedit_groups_label' class='main_nav_link'>   
+          <a href='javascript:uEditShowPage("uedit_groups");'>&ev.staff.patron.ue_xhtml.groups_permissions.label;</a>
+         </td>
+        </tr>
+        <tr>
+         <td id='uedit_stat_cats_label' class='main_nav_link'>  
+          <a href='javascript:uEditShowPage("uedit_stat_cats");'>&ev.staff.patron.ue_xhtml.statistical_categories.label;</a>
+         </td>
+        </tr>
+        <tr>
+         <td id='uedit_surveys_label' class='main_nav_link'>   
+          <a href='javascript:uEditShowPage("uedit_surveys");'>&ev.staff.patron.ue_xhtml.surveys.label;</a>
+         </td>
+        </tr>
+        <tr>
+         <td id='uedit_finalize_label' class='main_nav_link'>   
+          <a href='javascript:uEditShowPage("uedit_finalize");'>&ev.staff.patron.ue_xhtml.finish.label;</a>
+         </td>
+        </tr>
+       </tbody>
+      </table>
+     </td>
+
+     <td width='85%' id='uedit_loading'>
+      <div class='main_div has_color' 
+       style='padding: 50px; vertical-align: middle;'>
+       <b>&ev.staff.patron.ue_xhtml.loading_data.label;</b>
+      </div>
+     </td>
+
+
+     <td width='85%' id='ue_maintd' class='hide_me'>
+
+      <div id='dup_div_container'>
+       <div id='dup_div' name='dup_div'>
+        <a name='link' class='dup_link hide_me'
+         href='javascript:void(0);' onclick='uEditShowSearch(this);'>
+         &ev.staff.patron.ue_xhtml.found_duplicate_patron.label; <b name='count'/>
+         <b name='data'/>
+        </a>
+       </div>
+      </div>
+
+
+      <!-- ************************************************************** -->
+      <!--  Identification Pane -->
+      <!-- ************************************************************** -->
+      <div id='uedit_userid' class='main_div'>
+       <table class='uedit_table'>
+        <tbody>
+         <tr class='required_field'>
+          <td><div class='wide right'>&ev.staff.patron.ue_xhtml.barcode.label;</div></td>
+          <td>
+           <div class='wide left'>
+            <input type='text' id='ue_barcode' />
+             <!--
+             onblur=' 
+              var node = uEditFindFieldByWId("ue_username");
+              if(!node.widget.node.value) {
+               node.widget.node.value = this.value;
+               node.widget.node.onchange();
+              }'
+              /> -->
+              <button style='padding-left: 5px;' class='hide_me' id='ue_mark_card_lost'
+             onclick='uEditMarkCardLost();'>&ev.staff.patron.ue_xhtml.mark_lost.label;</button>
+           </div>
+          </td>
+         </tr>
+         <tr class='required_field'>
+          <td><div class='wide right'>&ev.staff.patron.ue_xhtml.username.label;</div></td>
+          <td><div class='wide left'><input type='text' id='ue_username'/></div></td>
+         </tr>
+         <tr class='required_field'>
+          <td><div class='wide right'>&ev.staff.patron.ue_xhtml.password.label;</div></td>
+          <td>
+           <div class='wide left'>
+            <input type='password' id='ue_password1'/>
+            <button class='hide_me' onclick='uEditResetPw();' id='ue_reset_pw'>&ev.staff.patron.ue_xhtml.reset.label;</button>
+            <span style='padding-left: 10px;' class='hide_me' id='ue_password_gen'>
+             &ev.staff.patron.ue_xhtml.re_password.label;
+             <span style='text-decoration:underline;' id='ue_password_plain'/>
+            </span>
+           </div>
+          </td>
+         </tr>
+         <tr class='required_field'>
+          <td><div class='wide right'>&ev.staff.patron.ue_xhtml.verify_password.label;</div></td>
+          <td><div class='wide left'><input type='password' id='ue_password2'/></div></td>
+         </tr>
+         <tr class='required_field'>
+          <td><div class='wide right'>&ev.staff.patron.ue_xhtml.first_name.label;</div></td>
+          <td><div class='wide left'><input type='text' id='ue_firstname'/></div></td>
+         </tr>
+         <tr>
+          <td><div class='wide right'>&ev.staff.patron.ue_xhtml.middle_name.label;</div></td>
+          <td><div class='wide left'><input type='text' id='ue_middlename'/></div></td>
+         </tr>
+         <tr class='required_field'>
+          <td><div class='wide right'>&ev.staff.patron.ue_xhtml.last_name.label;</div></td>
+          <td><div class='wide left'><input type='text' id='ue_lastname'/></div></td>
+         </tr>
+         <tr>
+          <td><div class='wide right'>&ev.staff.patron.ue_xhtml.suffix.label;</div></td>
+          <td><div class='wide left'>
+           <input type='text' id='ue_suffix'/>
+           <select id='ue_suffix_selector' style='width: 6em;'
+            onclick='$("ue_suffix").value = this.options[this.selectedIndex].value;$("ue_suffix").onchange();'
+            onchange='$("ue_suffix").value = this.options[this.selectedIndex].value;$("ue_suffix").onchange();'>
+            <option value=''>&ev.staff.patron.ue_xhtml.pick_suffix.label;</option>
+            <option value='Jr'>Jr</option>
+            <option value='Sr'>Sr</option>
+            <option value='II'>II</option>
+            <option value='III'>III</option>
+            <option value='AA'>AA</option>
+            <option value='AS'>AS</option>
+            <option value='AAS'>AAS</option>
+            <option value='BA'>BA</option>
+            <option value='BS'>BS</option>
+            <option value='CFPIM'>CFPIM</option>
+            <option value='CPA'>CPA</option>
+            <option value='CPIM'>CPIM</option>
+            <option value='CPM'>CPM</option>
+            <option value='CXE'>CXE</option>
+            <option value='DC'>DC</option>
+            <option value='DDS'>DDS</option>
+            <option value='DO '>DO</option>
+            <option value='DPM'>DPM</option>
+            <option value='DVM'>DVM</option>
+            <option value='Esq'>Esq</option>
+            <option value='FACAAI'>FACAAI</option>
+            <option value='FACP'>FACP</option>
+            <option value='FACS'>FACS</option>
+            <option value='FACEP'>FACEP</option>
+            <option value='FCP'>FCP</option>
+            <option value='FICS'>FICS</option>
+            <option value='GYN'>GYN</option>
+            <option value='JD'>JD</option>
+            <option value='LPN'>LPN</option>
+            <option value='MA'>MA</option>
+            <option value='MCSE'>MCSE</option>
+            <option value='MD'>MD</option>
+            <option value='MS'>MS</option>
+            <option value='NMD'>NMD</option>
+            <option value='OB'>OB</option>
+            <option value='PhD'>PhD</option>
+            <option value='RN'>RN</option>
+           </select>
+          </div></td>
+         </tr>
+         <tr>
+          <td><div class='wide right'>&ev.staff.patron.ue_xhtml.alias.label;</div></td>
+          <td><div class='wide left'><input type='text' id='ue_alias'/></div></td>
+         </tr>
+
+         <tr class='required_field'>
+          <td><div class='wide right'>&ev.staff.patron.ue_xhtml.dob.label;</div></td>
+          <td>
+           <div class='wide left'>
+ 
+            <input type='text' id='ue_dob' size='10' maxlength='10' 
+             onfocus='/*$("ue_dob_trigger").onclick(event);*/'>1980-01-01</input>
+ 
+            <button style='padding: 0px;' id='ue_dob_trigger'>
+             <img src="/opac/common/js/jscalendar/img.gif" 
+              style="cursor: pointer; border: 1px solid red; padding: 0px; margin: -3px;" 
+              title="Date selector"
+              onmouseover="this.style.background='red';" 
+              onmouseout="this.style.background=''" />
+            </button>
+
+            <span class='pad' style='font-size: 8pt;'>(YYYY-MM-DD)</span>
+ 
+            <script type="text/javascript">
+             Calendar.setup({
+              inputField : "ue_dob",    // id of the input field
+              ifFormat  : "%Y-%m-%d",   // format of the input field
+              button  : "ue_dob_trigger",  // trigger for the calendar (button ID)
+              align   : "Tl",     // alignment (defaults to "Bl")
+              singleClick : true
+             });
+            </script>
+ 
+           </div>
+          </td>
+         </tr>
+         <tr>
+          <td><div class='wide right'>&ev.staff.patron.ue_xhtml.juvenile.label;</div></td>
+          <td>
+           <div class='wide left'>
+            <input id='ue_juvenile' type='checkbox'/>
+           </div>
+          </td>
+         </tr>
+         <tr class='required_field'>
+          <td><div class='wide right'>&ev.staff.patron.ue_xhtml.primary_id_type.label;</div></td>
+          <td><div class='wide left'>
+            <select id='ue_primary_ident_type'>
+             <option value=''>&ev.staff.patron.ue_xhtml.required.label;</option>
+            </select>
+           </div>
+          </td>
+         </tr>
+         <tr class='required_field'>
+          <td><div class='wide right'>&ev.staff.patron.ue_xhtml.primary_id.label;</div></td>
+          <td>
+           <div class='wide left'>
+            <input type='text' id='ue_primary_ident'/>
+            <span id='primary_ident_ssn_help' 
+             style='padding-left: 2px; font-size: 8pt;' class='hide_me'>
+             &ev.staff.patron.ue_xhtml.primary_ident_ssn_help.label;
+            </span>
+            <span id='primary_ident_dl_help' 
+             style='padding-left: 2px; font-size: 8pt;' class='hide_me'>
+             &ev.staff.patron.ue_xhtml.primary_ident_dl_help.label; 
+            </span>
+           </div>
+          </td>
+         </tr>
+         <!--
+         <tr>
+          <td><div class='wide right'>Secondary Identification Type</div></td>
+          <td><div class='wide left'>
+            <select id='ue_secondary_ident_type'>
+             <option value=''>  None Selected  </option>
+            </select>
+           </div>
+          </td>
+         </tr>
+         -->
+         <tr class='hide_me'>
+          <td><div class='wide right'>&ev.staff.patron.ue_xhtml.parent_guardian.label;</div></td>
+          <td>
+           <div class='wide left'>
+            <input type='text' id='ue_secondary_ident'/>
+           </div>
+          </td>
+         </tr>
+         <!--
+         <tr class='hide_me' id='ue_guardian_row'>
+          <td><div class='wide right'><b>Parent / Guardian</b></div></td>
+          <td>
+           <div class='wide left'>
+            <span id='ue_guardian_field'/>
+           </div>
+          </td>
+         </tr>
+         -->
+        </tbody>
+       </table>
+      </div>
+
+      <!-- ************************************************************** -->
+      <!-- Contact Info Pane -->
+      <!-- ************************************************************** -->
+      <div id='uedit_contact_info' class='main_div hide_me'>
+
+       <table class='uedit_table'>
+        <tbody>
+         <tr>
+          <td><div class='wide right'>&ev.staff.patron.ue_xhtml.email_address.label;</div></td>
+          <td><div class='wide left'><input type='text' id='ue_email' size='32'/></div></td>
+         </tr>
+         <tr>
+          <td><div class='wide right'>&ev.staff.patron.ue_xhtml.daytime_phone.label;</div></td>
+          <td>
+           <div class='wide left'>
+            <input class='pad' type='text' id='ue_day_phone' size='18'/>
+            <span style='font-size: 9pt;'>&ev.staff.patron.ue_xhtml.phone_example;</span>
+           </div>
+          </td>
+         </tr>
+         <tr>
+          <td><div class='wide right'>&ev.staff.patron.ue_xhtml.evening_phone.label;</div></td>
+          <td>
+           <div class='wide left'>
+            <input class='pad' type='text' id='ue_night_phone' size='18'/>
+           </div>
+          </td>
+         </tr>
+         <tr>
+          <td><div class='wide right'>&ev.staff.patron.ue_xhtml.other_phone.label;</div></td>
+          <td>
+           <div class='wide left'>
+            <input class='pad' type='text' id='ue_other_phone' size='18'/>
+           </div>
+          </td>
+         </tr>
+         <tr class='required_field'>
+          <td><div class='wide right'>&ev.staff.patron.ue_xhtml.home_library.label;</div></td>
+          <td>
+           <div class='wide left'>
+            <select style='width: 20em;' id='ue_org_selector'/>
+           </div>
+          </td>
+         </tr>
+        </tbody>
+       </table>
+      </div>
+ 
+      <!-- ************************************************************** -->
+      <!-- Addresses Pane -->
+      <!-- ************************************************************** -->
+      <div id='uedit_addresses' class='main_div hide_me' >
+       <table class='uedit_table' style='width: 98%; padding: 1px;'>
+        <thead>
+         <tr>
+          <td>&ev.staff.patron.ue_xhtml.address.label;</td>
+          <td>&ev.staff.patron.ue_xhtml.in_city_limits.label;</td>
+          <td>&ev.staff.patron.ue_xhtml.valid.label;</td>
+          <td>&ev.staff.patron.ue_xhtml.mailing_address.label;</td>
+          <td>&ev.staff.patron.ue_xhtml.physical_address.label;</td>
+         </tr>
+        </thead>
+        <tbody id='ue_address_tbody'>
+         <tr id='ue_address_template'>
+          <td>
+           <table class='address_table'>
+            <tbody>
+             <tr name='shared_row' class='hide_me'>
+              <td colspan='6'>
+               <div style='padding: 8px;'>
+                <span style='color:red;'>*</span>
+                &ev.staff.patron.ue_xhtml.address_owned_by.label;
+                <span name='addr_owner_name'/>
+                <span name='owner_link_div'>
+                 (<a name='addr_owner' href='javascript:void(0);'>&ev.staff.patron.ue_xhtml.edit.label;</a>)
+                </span>
+               </div>
+              </td>
+             </tr>
+             <tr>
+              <td><div class='wide right'>&ev.staff.patron.ue_xhtml.label.label;</div></td>
+              <td colspan='3'>
+               <div class='wide left'>
+                <input type='text' name='ue_addr_label' id='ue_addr_label'/>
+               </div>
+              </td>
+              <td><div class='wide right'>&ev.staff.patron.ue_xhtml.zip.label;</div></td>
+              <td>
+               <div class='wide left'>
+                <input type='text' name='ue_addr_zip' size='10' maxlength='10'/>
+               </div>
+              </td>
+             </tr>
+             <tr>
+              <td><div class='wide right'>&ev.staff.patron.ue_xhtml.street1.label;</div></td>
+              <td colspan='5'>
+               <div class='wide left'>
+                <input type='text' name='ue_addr_street1' size='42'/>
+               </div>
+              </td>
+             </tr>
+             <tr>
+              <td><div class='wide right'>&ev.staff.patron.ue_xhtml.street2.label;</div></td>
+              <td colspan='5'>
+               <div class='wide left'>
+                <input type='text' name='ue_addr_street2' size='42'/>
+               </div>
+              </td>
+             </tr>
+             <tr>
+              <td><div class='wide right'>&ev.staff.patron.ue_xhtml.city.label;</div></td>
+              <td colspan='3'>
+               <div class='wide left'>
+                <input type='text' name='ue_addr_city' size='17'/>
+               </div>
+              </td>
+              <td><div class='wide right'>&ev.staff.patron.ue_xhtml.conuty.label;</div></td>
+              <td>
+               <div class='wide left'>
+                <input type='text' name='ue_addr_county' size='17'/>
+               </div>
+              </td>
+             </tr>
+             <tr>
+              <td><div class='wide right'>&ev.staff.patron.ue_xhtml.state.label;</div></td>
+              <td colspan='3'>
+               <div class='wide left'>
+                <input type='text' name='ue_addr_state' size='3' maxlength='3'/>
+               </div>
+              </td>
+              <!--
+              <td><div class='wide right'>Zip</div></td>
+              <td>
+               <div class='wide left'>
+                <input type='text' name='ue_addr_zip' size='6' maxlength='6'/>
+               </div>
+              </td>
+              -->
+              <td><div class='wide right'>&ev.staff.patron.ue_xhtml.country.label;</div></td>
+              <td>
+               <div class='wide left'>
+                <input type='text' name='ue_addr_country' size='6'/>
+               </div>
+              </td>
+             </tr>
+             <tr>
+              <td colspan='6'>
+               <div class='button_row'>
+                <input type='submit' name='ue_addr_delete' 
+                 value='&ev.staff.patron.ue_xhtml.ue_addr_delete.label;'/>
+                <span style='padding-left: 10px;'> </span>
+                <input type='submit' name='ue_addr_detach' 
+                 value='&ev.staff.patron.ue_xhtml.ue_addr_detach.label;' class='hide_me'/>
+                <input type='submit' name='ue_addr_approve' 
+                 value='&ev.staff.patron.ue_xhtml.ue_addr_approve.label;' class='hide_me'/>
+               </div>
+              </td>
+             </tr>
+             <tr class='hide_me' name='ue_addr_replaced_row'>
+              <td colspan='6'>
+               <div class='button_row' name='ue_addr_replaced_div'>
                                                             </div>
                                                         </td>
                                                     </tr>
-												</tbody>
-											</table>
-										</td>
-										<td><input type='checkbox' name='ue_addr_inc_yes' checked='checked'/></td>
-										<td><input type='checkbox' name='ue_addr_valid_yes' checked='checked'/></td>
-										<td>
-											<div style='width: 100%; -moz-border-radius: 8px;'>
-												<input type='radio' name='ue_addr_mailing_yes'
-													onchange='uEditAddrTypeClick(this, "mailing");'
-													onclick='uEditAddrTypeClick(this, "mailing");'/>
-											</div>
-										</td>
-										<td>
-											<div style='width: 100%; -moz-border-radius: 8px;'>
-												<input type='radio' name='ue_addr_billing_yes'
-													onchange='uEditAddrTypeClick(this, "billing");'
-													onclick='uEditAddrTypeClick(this, "billing");'/>
-											</div>
-										</td>
-									</tr>
-								</tbody>
-							</table>
-
-							<div class='button_row' style='margin-top: 20px;'>
-								<!--
-								<input type='submit' value='Create a New Address' id='ue_address_new'/>
-								-->
-								<input type='submit' value='&staff.patron.ue.create_address.label;' onclick='uEditCreateNewAddr();'/>
-							</div>
-						</div>
-	
-						<!-- ************************************************************** -->
-						<!-- Groups Pane -->
-						<!-- ************************************************************** -->
-						<div id='uedit_groups' class='main_div hide_me'>
-							<table class='uedit_table'>
-								<tbody>
-									<tr class='required_field'>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.profile_group.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<select id='ue_profile' class='select_big'>
-													<option value=''>&ev.staff.patron.ue_xhtml.required.label;</option>
-												</select>
-											</div>
-										</td>
-									</tr>
-									<tr class='required_field'>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.account_expiration_date.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<input type='text' id='ue_expire' size='10' maxlength='10'/>
-	
-												<button style='padding: 0px;' id='ue_expire_trigger'>
-													<img src="/opac/common/js/jscalendar/img.gif" 
-														style="cursor: pointer; border: 1px solid red; padding: 0px; margin: -3px;" 
-														title="&ev.staff.patron.ue_xhtml.date_selector.label;"
-														onmouseover="this.style.background='red';" 
-														onmouseout="this.style.background=''" />
-												</button>
-
-												<span class='pad' style='font-size: 8pt;'>(YYYY-MM-DD)</span>
-												<script type="text/javascript">
-													Calendar.setup({
-														inputField	: "ue_expire",				// id of the input field
-														ifFormat		: "%Y-%m-%d",				// format of the input field
-														button		: "ue_expire_trigger",  // trigger for the calendar (button ID)
-														align			: "Tl",						// alignment (defaults to "Bl")
-														singleClick	: true
-													});
-												</script>
-											</div>
-										</td>
-									</tr>
-									<tr>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.net_access_level.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<select id='ue_net_level'>
-												</select>
-											</div>
-										</td>
-									</tr>
-									<tr>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.active.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<input id='ue_active' type='checkbox' checked='checked'/>
-											</div>
-										</td>
-									</tr>
-									<tr>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.barred.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<input id='ue_barred' type='checkbox'/>
-											</div>
-										</td>
-									</tr>
-									<tr>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.set_family_group_lead_account.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<input id='ue_group_lead' type='checkbox'/>
-											</div>
-										</td>
-									</tr>
-									<tr>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.claims_returned_count.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<input id='ue_claims_returned' type='text' disabled='disabled' size='6'/>
-												<script>
-													$('ue_claims_returned').value = 0;
-													$('ue_claims_returned').disabled = true;
-												</script>
-												<input class='pad' id='ue_claims_returned_reset' type='submit' value='&ev.staff.patron.ue_xhtml.reset.label;' 
-													onclick="
-														if( confirmId('ue_claims_return_confirm') ) {
-															$('ue_claims_returned').value = 0;
-															$('ue_claims_returned').onchange();
-														}
-													"/>
-											</div>
-										</td>
-									</tr>
-									<tr>
-										<td><div class='wide right'>&ev.staff.patron.ue_xhtml.alert_message.label;</div></td>
-										<td>
-											<div class='wide left'>
-												<textarea wrap='soft' cols='30' rows='4' id='ue_alert_message'/>
-												<input class='pad' id='ue_alert_message_reset' 
-													type='submit' value='&ev.staff.patron.ue_xhtml.alert_message_reset.value;' 
-														onclick='
-														var node = $("ue_alert_message");
-														node.value = "";
-														if(node.onchange) node.onchange();'/>
-											</div>
-										</td>
-									</tr>
-								</tbody>
-							</table>
-						</div>
-	
-						<!-- ************************************************************** -->
-						<!-- Stat Cats Pane -->
-						<!-- ************************************************************** -->
-						<div id='uedit_stat_cats' class='main_div hide_me'>
-							<table class='uedit_table' style='width: 98%'>
-								<thead>
-									<tr style='font-weight: bold;'>
-										<td>&ev.staff.patron.ue_xhtml.stat_cat_name.label;</td>
-										<td>&ev.staff.patron.ue_xhtml.owner.label;</td>
-										<td>&ev.staff.patron.ue_xhtml.value.label;</td>
-									</tr>
-								</thead>
-								<tbody id='ue_stat_cat_tbody'>
-									<tr id='ue_stat_cat_row'>
-										<td><div class='wide right' name='ue_stat_cat_name'/></td>
-										<td><div class='wide right' style='font-size: 8pt' name='ue_stat_cat_owner'/></td>
-										<td>
-											<div class='wide left'>
-												<select name='ue_stat_cat_selector'>
-													<option value=''>&ev.staff.patron.ue_xhtml.none_selected.label;</option>
-												</select>
-												<span class='pad'> or </span>
-												<input class='pad' type='text' name='ue_stat_cat_newval'/>
-											</div>
-										</td>
-									</tr>
-								</tbody>
-							</table>
-
-						</div>
-	
-						<!-- ************************************************************** -->
-						<!-- Surveys Pane -->
-						<!-- ************************************************************** -->
-						<div id='uedit_surveys' class='main_div hide_me'>
-							<div id='uedit_no_surveys' class='hide_me'>
-								<b>&ev.staff.patron.ue_xhtml.no_surveys_for_location.label;</b>
-							</div>
-							<table id='ue_survey_table' 
-								class='uedit_table data_grid' style='width: 95%; margin-top: 17px;'>
-								<thead>
-									<tr>
-										<td colspan='2' style='text-align: left; padding-left: 20px;'>
-											<span class='pad' name='ue_survey_name' style='font-weight: bold;'/>
-											<span class='pad' name='ue_survey_desc'> : </span>
-										</td>
-									</tr>
-								</thead>
-								<tbody name='ue_survey_tbody'>
-									<tr name='ue_survey_row'>
-										<td name='ue_survey_question' 
-											style='width: 60%; text-align: left; padding-left: 40px;'/>
-										<td>
-											<select name='ue_survey_answer'>
-												<option value=''>&ev.staff.patron.ue_xhtml.none_selected.label;</option>
-											</select>
-										</td>
-									</tr>
-								</tbody>
-							</table>
-						</div>
-
-						<!-- ************************************************************** -->
-						<!-- Finish Up -->
-						<!-- ************************************************************** -->
-						<div id='uedit_finalize' class='main_div hide_me'>
-							<div class='has_color' style='width: 95%; margin-top: 40px; text-align: center'>
-								<div style='padding: 5px;'>
-									&ev.staff.patron.ue_xhtml.finishing_message.label;
-								</div>
-								<br/>
-								<div style='margin-bottom: 15px;'>
-									<a style='margin-right: 30px;' id='ue_view_summary' 
-										href='javascript:uEditShowSummary();'>View Summary</a>
-								</div>
-								<input style='margin-left: 5px; margin-right: 5px;' id='ue_save'
-									type='submit' value='&ev.staff.patron.ue_xhtml.save_user.value;' onclick='uEditSaveUser();'/>
-								<input style='margin-left: 5px; margin-right: 5px;' id='ue_save_clone'
-									type='submit' value='&ev.staff.patron.ue_xhtml.save_clone_user.value;' onclick='uEditSaveUser(true);'/>
-								<button style='margin-left: 5px; margin-right: 5px;' 
-									onclick='if(confirm($("ue_cancel_confirm").innerHTML)) uEditCancel();'>&ev.staff.patron.ue_xhtml.cancel.value;</button>
-							</div>
-						</div>
-					</td>
-				</tr>
-
-				<tr>
-					<td colspan='2'>
-						<!-- ************************************************************** -->
-						<!-- Bottom Navigation Links -->
-						<!-- ************************************************************** -->
-						<table width='100%' class='no_border'>
-							<tbody>
-								<tr id='uedit_nav_bar'>
-									<td width='10%'/>
-									<td width='40%'>
-										<a id='ue_back' class='nav_link hide_me' 
-											href='javascript:uEditPrev()'>&#x2190;&ev.staff.patron.ue_xhtml.back.label;</a>
-									</td>
-									<td width='40%'>
-										<a id='ue_fwd' class='nav_link' 
-											href='javascript:uEditNext()'>&ev.staff.patron.ue_xhtml.forward.label;&#x2192;</a>
-									</td>
-									<td width='10%'/>
-								</tr>
-							</tbody>
-						</table>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-	</div>
-
-	</center>
-
-	<div id='summary_div_container' class='hide_me'>
-
-	<div id='ue_summary_page'>
-		<table id='ue_summary_table' class='data_grid' width='55%'>
-			<thead>
-				<tr>
-					<td colspan='2'>
-						<span>&staff.patron.ue.user_summary.label;</span>
-					</td>
-				</tr>
-			</thead>
-			<tbody name='ue_summary_page_tbody'>
-
-				<tr>
-
-					<td colspan='2' align='center'>
-						<input style='margin-right: 15px;' type='submit' value='&ev.staff.patron.ue_xhtml.print_page.label;' onclick='window.print();'/>
-						<input style='margin-left: 15px;' type='submit' value='&ev.staff.patron.ue_xhtml.return_to_editor.label;' 
-							onclick=' unHideMe($("main_div_container")); 
-								hideMe($("summary_div_container"));'/>
-					</td>
-				</tr>
-
-				<tr><td>&ev.staff.patron.ue_xhtml.barcode.label;</td><td id='ue_summary_barcode'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.username.label;</td><td id='ue_summary_usrname'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.first_name.label;</td><td id='ue_summary_first_given_name'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.middle_name.label;</td><td id='ue_summary_second_given_name'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.last_name.label;</td><td id='ue_summary_family_name'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.alias.label;</td><td id='ue_summary_alias'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.suffix.label;</td><td id='ue_summary_suffix'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.dob.label;</td><td id='ue_summary_dob'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.primary_id_type.label;</td><td id='ue_summary_ident_type'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.primary_id.label;</td><td id='ue_summary_ident_value'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.secondary_id_type.label;</td><td id='ue_summary_ident_type2'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.secondary_id.label;</td><td id='ue_summary_ident_value2'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.email_address.label;</td><td id='ue_summary_email'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.daytime_phone.label;</td><td id='ue_summary_day_phone'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.evening_phone.label;</td><td id='ue_summary_evening_phone'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.other_phone.label;</td><td id='ue_summary_other_phone'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.home_library.label;</td><td id='ue_summary_home_ou'/></tr>
-
-				<tr>
-					<td colspan='2'>
-						<table width='100%' style='margin-top: 15px; margin-bottom: 15px;'>
-							<thead><tr><td>&ev.staff.patron.ue_xhtml.addresses.label;</td></tr></thead>
-							<tbody name='ue_summary_addr_tbody'>
-								<tr name='ue_summary_addr_row'>
-									<td>
-										<table name='ue_summary_addr_table' width='100%'>
-											<thead><tr><td colspan='4'/><span> </span></tr></thead>
-											<tbody>
-												<tr>
-													<td><b>&ev.staff.patron.ue_xhtml.address_label.label;</b></td><td name='label'/>
-													<td><b>&ev.staff.patron.ue_xhtml.zip.label;</b></td><td name='zip'/>
-												</tr>
-												<tr>
-													<td><b>&ev.staff.patron.ue_xhtml.street1.label;</b></td><td name='street1'/>
-													<td><b>&ev.staff.patron.ue_xhtml.country.label;</b></td><td name='country'/>
-												</tr>
-												<tr>
-													<td><b>&ev.staff.patron.ue_xhtml.street2.label;</b></td><td name='street2'/>
-													<td><b>&ev.staff.patron.ue_xhtml.mailing.label;</b></td><td name='mailing'/>
-												</tr>
-												<tr>
-													<td><b>&ev.staff.patron.ue_xhtml.city.label;</b></td><td name='city'/>
-													<td><b>&ev.staff.patron.ue_xhtml.billing.label;</b></td><td name='billing'/>
-												</tr>
-												<tr>
-													<td><b>&ev.staff.patron.ue_xhtml.county.label;</b></td><td name='county'/>
-													<td><b>&ev.staff.patron.ue_xhtml.valid.label;</b></td><td name='valid'/>
-												</tr>
-												<tr>
-													<td><b>&ev.staff.patron.ue_xhtml.state.label;</b></td><td name='state'/>
-													<td><b>&ev.staff.patron.ue_xhtml.in_city_limits.label;</b></td><td name='incorporated'/>
-												</tr>
-											</tbody>
-										</table>
-									</td>
-								</tr>
-							</tbody>
-						</table>
-					</td>
-				</tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.profile.label;</td><td id='ue_summary_profile'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.active.label;</td><td id='ue_summary_active'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.barred.label;</td><td id='ue_summary_barred'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.expire_date.label;</td><td id='ue_summary_expire_date'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.family_lead_account.label;</td><td id='ue_summary_master_account'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.claims_returned_count.label;</td><td id='ue_summary_claims_returned_count'/></tr>
-				<tr><td>&ev.staff.patron.ue_xhtml.alert_message.label;</td><td id='ue_summary_alert_message'/></tr>
-				<tr name='ue_summary_stat_cat_td'>
-					<td colspan='2' >
-						<table width='100%' style='margin-top: 15px; margin-bottom: 15px;'>
-							<thead><tr><td colspan='2'>&ev.staff.patron.ue_xhtml.stat_categories.label;</td></tr></thead>
-							<tbody name='ue_summary_stats_tbody'>
-								<tr name='ue_summary_stats_row'>
-									<td name='ue_summary_stat_name'/><td name='ue_summary_stat_value'/>
-								</tr>
-							</tbody>
-						</table>
-					</td>
-				</tr>
-				<tr name='ue_summary_survey_td'>
-					<td colspan='2'>
-						<table width='100%' style='margin-top: 15px; margin-bottom: 15px;'>
-							<thead>
-								<tr>
-									<td>&ev.staff.patron.ue_xhtml.survey.label;</td>
-									<td>&ev.staff.patron.ue_xhtml.question.label;</td>
-									<td>&ev.staff.patron.ue_xhtml.answer.label;</td>
-								</tr>
-							</thead>
-							<tbody name='ue_summary_survey_tbody'>
-								<tr name='ue_summary_survey_row'>
-									<td name='ue_summary_survey_name'/>
-									<td name='ue_summary_survey_question'/>
-									<td name='ue_summary_survey_answer'/>
-								</tr>
-							</tbody>
-						</table>
-					</td>
-				</tr>
-				<tr>
-					<td colspan='2' align='center'>
-						<input style='margin-right: 15px;' type='submit' value='&ev.staff.patron.ue_xhtml.print_page.label;' onclick='window.print();'/>
-						<input style='margin-left: 15px;' type='submit' value='&ev.staff.patron.ue_xhtml.return_to_editor.label;' 
-							onclick=' unHideMe($("main_div_container")); 
-								hideMe($("summary_div_container"));'/>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-	</div>
-	</div>
-
-
-	<!-- ************************************************************** -->
-	<!-- This holds all of the strings we may have to alert to the user -->
-	<!-- ************************************************************** -->
-	<div class='hide_me'>
-		<span id='ue_bad_dob'>&staff.patron.ue.bad_dob.label;</span>
-		<span id='ue_bad_username'>&staff.patron.ue.bad_username.label;</span>
-		<span id='ue_bad_password'>&staff.patron.ue.bad_passwords.label;</span>
-		<span id='ue_bad_firstname'>&staff.patron.ue.bad_firstname.label;</span>
-		<span id='ue_bad_middlename'>&staff.patron.ue.bad_middlename.label;</span>
-		<span id='ue_bad_lastname'>&staff.patron.ue.bad_lastname.label;</span>
-		<span id='ue_bad_barcode'>&staff.patron.ue.bad_barcode.label;</span>
-		<span id='ue_duplicate_barcode'>&staff.patron.ue.duplicate_barcode.label;</span>
-		<span id='ue_new_barcode_warn'>&staff.patron.ue.new_barcode_warn.label;</span>
-		<span id='ue_no_ident'>&staff.patron.ue.no_ident.label;</span>
-		<span id='ue_bad_ident_dl'>&staff.patron.ue.bad_ident_dl.label;</span>
-		<span id='ue_bad_ident_ssn'>&staff.patron.ue.bad_ident_ssn.label;</span>
-		<span id='ue_bad_email'>&staff.patron.ue.bad_email.label;</span>
-		<span id='ue_bad_phone'>&staff.patron.ue.bad_phone.label;</span>
-		<span id='ue_no_profile'>&staff.patron.ue.no_profile.label;</span>
-		<span id='ue_bad_expire'>&staff.patron.ue.bad_expire.label;</span>
-		<span id='ue_bad_claims_returned'>&staff.patron.ue.bad_claims_returned.label;</span>
-		<span id='ue_no_profile'>&ev.staff.patron.ue_xhtml.no_profile.label;</span>
-		<span id='ue_unknown_error'>&staff.patron.ue.unknown_error.label;</span>
-		<span id='ue_bad_addr_label'>&staff.patron.ue.bad_addr_label.label;</span>
-		<span id='ue_bad_addr_street'>&staff.patron.ue.bad_addr_street.label;</span>
-		<span id='ue_bad_addr_city'>&staff.patron.ue.bad_addr_city.label;</span>
-		<span id='ue_bad_addr_county'>&staff.patron.ue.bad_addr_county.label;</span>
-		<span id='ue_bad_addr_state'>&staff.patron.ue.bad_addr_state.label;</span>
-		<span id='ue_bad_addr_country'>&staff.patron.ue.bad_addr_country.label;</span>
-		<span id='ue_bad_addr_zip'>&staff.patron.ue.bad_addr_zip.label;</span>
-		<span id='ue_bad_survey'>&staff.patron.ue.bad_survey.label;</span>
-		<span id='ue_delete_addr_warn'>&staff.patron.ue.delete_addr_warn.label;</span>
-		<span id='yes'>&staff.patron.ue.yes.label;</span>
-		<span id='no'>&staff.patron.ue.no.label;</span>
-		<span id='ue_summary_window'>&staff.patron.ue.summary_window.label;</span>
-		<span id='ue_success'>&staff.patron.ue.success.label;</span>
-		<span id='ue_dup_ident1'>&staff.patron.ue.dup_ident1.label;</span>
-		<span id='ue_dup_username'>&staff.patron.ue.dup_username.label;</span>
-		<span id='ue_dup_barcode'>&staff.patron.ue.dup_barcode.label;</span>
-		<span class='hide_me' id='ue_cancel_confirm'>&staff.patron.ue.cancel_confirm.label;</span>
-		<span class='hide_me' id='ue_juv_guardian'>&staff.patron.ue.juv_guardian.label;</span>
-		<span class='hide_me' id='ue_bad_date'>&staff.patron.ue.bad_date.label;</span>
-		<span class='hide_me' id='ue_made_barred'>&staff.patron.ue.made_barred.label;</span>
-		<span class='hide_me' id='ue_claims_return_confirm'>&ev.staff.patron.ue_xhtml.claims_return_confirm.label;</span>
-		<span class='hide_me' id='ue_unsaved_changes'>&ev.staff.patron.ue_xhtml.unsaved_changes.label;</span>
-		<span class='hide_me' id='ue_xact_collision'>&ev.staff.patron.ue_xhtml.xact_collision.label;</span>
-		<span class='hide_me' id='ue_add_approve_confirm'>&ev.staff.patron.ue_xhtml.ue_addr_approve_confirm.label;</span>
-	</div>
-
-	</body>
+            </tbody>
+           </table>
+          </td>
+          <td><input type='checkbox' name='ue_addr_inc_yes' checked='checked'/></td>
+          <td><input type='checkbox' name='ue_addr_valid_yes' checked='checked'/></td>
+          <td>
+           <div style='width: 100%; -moz-border-radius: 8px;'>
+            <input type='radio' name='ue_addr_mailing_yes'
+             onchange='uEditAddrTypeClick(this, "mailing");'
+             onclick='uEditAddrTypeClick(this, "mailing");'/>
+           </div>
+          </td>
+          <td>
+           <div style='width: 100%; -moz-border-radius: 8px;'>
+            <input type='radio' name='ue_addr_billing_yes'
+             onchange='uEditAddrTypeClick(this, "billing");'
+             onclick='uEditAddrTypeClick(this, "billing");'/>
+           </div>
+          </td>
+         </tr>
+        </tbody>
+       </table>
+
+       <div class='button_row' style='margin-top: 20px;'>
+        <!--
+        <input type='submit' value='Create a New Address' id='ue_address_new'/>
+        -->
+        <input type='submit' value='&staff.patron.ue.create_address.label;' onclick='uEditCreateNewAddr();'/>
+       </div>
+      </div>
+ 
+      <!-- ************************************************************** -->
+      <!-- Groups Pane -->
+      <!-- ************************************************************** -->
+      <div id='uedit_groups' class='main_div hide_me'>
+       <table class='uedit_table'>
+        <tbody>
+         <tr class='required_field'>
+          <td><div class='wide right'>&ev.staff.patron.ue_xhtml.profile_group.label;</div></td>
+          <td>
+           <div class='wide left'>
+            <select id='ue_profile' class='select_big'>
+             <option value=''>&ev.staff.patron.ue_xhtml.required.label;</option>
+            </select>
+           </div>
+          </td>
+         </tr>
+         <tr class='required_field'>
+          <td><div class='wide right'>&ev.staff.patron.ue_xhtml.account_expiration_date.label;</div></td>
+          <td>
+           <div class='wide left'>
+            <input type='text' id='ue_expire' size='10' maxlength='10'/>
+ 
+            <button style='padding: 0px;' id='ue_expire_trigger'>
+             <img src="/opac/common/js/jscalendar/img.gif" 
+              style="cursor: pointer; border: 1px solid red; padding: 0px; margin: -3px;" 
+              title="&ev.staff.patron.ue_xhtml.date_selector.label;"
+              onmouseover="this.style.background='red';" 
+              onmouseout="this.style.background=''" />
+            </button>
+
+            <span class='pad' style='font-size: 8pt;'>(YYYY-MM-DD)</span>
+            <script type="text/javascript">
+             Calendar.setup({
+              inputField : "ue_expire",    // id of the input field
+              ifFormat  : "%Y-%m-%d",    // format of the input field
+              button  : "ue_expire_trigger",  // trigger for the calendar (button ID)
+              align   : "Tl",      // alignment (defaults to "Bl")
+              singleClick : true
+             });
+            </script>
+           </div>
+          </td>
+         </tr>
+         <tr>
+          <td><div class='wide right'>&ev.staff.patron.ue_xhtml.net_access_level.label;</div></td>
+          <td>
+           <div class='wide left'>
+            <select id='ue_net_level'>
+            </select>
+           </div>
+          </td>
+         </tr>
+         <tr>
+          <td><div class='wide right'>&ev.staff.patron.ue_xhtml.active.label;</div></td>
+          <td>
+           <div class='wide left'>
+            <input id='ue_active' type='checkbox' checked='checked'/>
+           </div>
+          </td>
+         </tr>
+         <tr>
+          <td><div class='wide right'>&ev.staff.patron.ue_xhtml.barred.label;</div></td>
+          <td>
+           <div class='wide left'>
+            <input id='ue_barred' type='checkbox'/>
+           </div>
+          </td>
+         </tr>
+         <tr>
+          <td><div class='wide right'>&ev.staff.patron.ue_xhtml.set_family_group_lead_account.label;</div></td>
+          <td>
+           <div class='wide left'>
+            <input id='ue_group_lead' type='checkbox'/>
+           </div>
+          </td>
+         </tr>
+         <tr>
+          <td><div class='wide right'>&ev.staff.patron.ue_xhtml.claims_returned_count.label;</div></td>
+          <td>
+           <div class='wide left'>
+            <input id='ue_claims_returned' type='text' disabled='disabled' size='6'/>
+            <script>
+             $('ue_claims_returned').value = 0;
+             $('ue_claims_returned').disabled = true;
+            </script>
+            <input class='pad' id='ue_claims_returned_reset' type='submit' value='&ev.staff.patron.ue_xhtml.reset.label;' 
+             onclick="
+              if( confirmId('ue_claims_return_confirm') ) {
+               $('ue_claims_returned').value = 0;
+               $('ue_claims_returned').onchange();
+              }
+             "/>
+           </div>
+          </td>
+         </tr>
+         <tr>
+          <td><div class='wide right'>&ev.staff.patron.ue_xhtml.alert_message.label;</div></td>
+          <td>
+           <div class='wide left'>
+            <textarea wrap='soft' cols='30' rows='4' id='ue_alert_message'/>
+            <input class='pad' id='ue_alert_message_reset' 
+             type='submit' value='&ev.staff.patron.ue_xhtml.alert_message_reset.value;' 
+              onclick='
+              var node = $("ue_alert_message");
+              node.value = "";
+              if(node.onchange) node.onchange();'/>
+           </div>
+          </td>
+         </tr>
+        </tbody>
+       </table>
+      </div>
+ 
+      <!-- ************************************************************** -->
+      <!-- Stat Cats Pane -->
+      <!-- ************************************************************** -->
+      <div id='uedit_stat_cats' class='main_div hide_me'>
+       <table class='uedit_table' style='width: 98%'>
+        <thead>
+         <tr style='font-weight: bold;'>
+          <td>&ev.staff.patron.ue_xhtml.stat_cat_name.label;</td>
+          <td>&ev.staff.patron.ue_xhtml.owner.label;</td>
+          <td>&ev.staff.patron.ue_xhtml.value.label;</td>
+         </tr>
+        </thead>
+        <tbody id='ue_stat_cat_tbody'>
+         <tr id='ue_stat_cat_row'>
+          <td><div class='wide right' name='ue_stat_cat_name'/></td>
+          <td><div class='wide right' style='font-size: 8pt' name='ue_stat_cat_owner'/></td>
+          <td>
+           <div class='wide left'>
+            <select name='ue_stat_cat_selector'>
+             <option value=''>&ev.staff.patron.ue_xhtml.none_selected.label;</option>
+            </select>
+            <span class='pad'> or </span>
+            <input class='pad' type='text' name='ue_stat_cat_newval'/>
+           </div>
+          </td>
+         </tr>
+        </tbody>
+       </table>
+
+      </div>
+ 
+      <!-- ************************************************************** -->
+      <!-- Surveys Pane -->
+      <!-- ************************************************************** -->
+      <div id='uedit_surveys' class='main_div hide_me'>
+       <div id='uedit_no_surveys' class='hide_me'>
+        <b>&ev.staff.patron.ue_xhtml.no_surveys_for_location.label;</b>
+       </div>
+       <table id='ue_survey_table' 
+        class='uedit_table data_grid' style='width: 95%; margin-top: 17px;'>
+        <thead>
+         <tr>
+          <td colspan='2' style='text-align: left; padding-left: 20px;'>
+           <span class='pad' name='ue_survey_name' style='font-weight: bold;'/>
+           <span class='pad' name='ue_survey_desc'> : </span>
+          </td>
+         </tr>
+        </thead>
+        <tbody name='ue_survey_tbody'>
+         <tr name='ue_survey_row'>
+          <td name='ue_survey_question' 
+           style='width: 60%; text-align: left; padding-left: 40px;'/>
+          <td>
+           <select name='ue_survey_answer'>
+            <option value=''>&ev.staff.patron.ue_xhtml.none_selected.label;</option>
+           </select>
+          </td>
+         </tr>
+        </tbody>
+       </table>
+      </div>
+
+      <!-- ************************************************************** -->
+      <!-- Finish Up -->
+      <!-- ************************************************************** -->
+      <div id='uedit_finalize' class='main_div hide_me'>
+       <div class='has_color' style='width: 95%; margin-top: 40px; text-align: center'>
+        <div style='padding: 5px;'>
+         &ev.staff.patron.ue_xhtml.finishing_message.label;
+        </div>
+        <br/>
+        <div style='margin-bottom: 15px;'>
+         <a style='margin-right: 30px;' id='ue_view_summary' 
+          href='javascript:uEditShowSummary();'>View Summary</a>
+        </div>
+        <input style='margin-left: 5px; margin-right: 5px;' id='ue_save'
+         type='submit' value='&ev.staff.patron.ue_xhtml.save_user.value;' onclick='uEditSaveUser();'/>
+        <input style='margin-left: 5px; margin-right: 5px;' id='ue_save_clone'
+         type='submit' value='&ev.staff.patron.ue_xhtml.save_clone_user.value;' onclick='uEditSaveUser(true);'/>
+        <button style='margin-left: 5px; margin-right: 5px;' 
+         onclick='if(confirm($("ue_cancel_confirm").innerHTML)) uEditCancel();'>&ev.staff.patron.ue_xhtml.cancel.value;</button>
+       </div>
+      </div>
+     </td>
+    </tr>
+
+    <tr>
+     <td colspan='2'>
+      <!-- ************************************************************** -->
+      <!-- Bottom Navigation Links -->
+      <!-- ************************************************************** -->
+      <table width='100%' class='no_border'>
+       <tbody>
+        <tr id='uedit_nav_bar'>
+         <td width='10%'/>
+         <td width='40%'>
+          <a id='ue_back' class='nav_link hide_me' 
+           href='javascript:uEditPrev()'>&#x2190;&ev.staff.patron.ue_xhtml.back.label;</a>
+         </td>
+         <td width='40%'>
+          <a id='ue_fwd' class='nav_link' 
+           href='javascript:uEditNext()'>&ev.staff.patron.ue_xhtml.forward.label;&#x2192;</a>
+         </td>
+         <td width='10%'/>
+        </tr>
+       </tbody>
+      </table>
+     </td>
+    </tr>
+   </tbody>
+  </table>
+ </div>
+
+ </center>
+
+ <div id='summary_div_container' class='hide_me'>
+
+ <div id='ue_summary_page'>
+  <table id='ue_summary_table' class='data_grid' width='55%'>
+   <thead>
+    <tr>
+     <td colspan='2'>
+      <span>&staff.patron.ue.user_summary.label;</span>
+     </td>
+    </tr>
+   </thead>
+   <tbody name='ue_summary_page_tbody'>
+
+    <tr>
+
+     <td colspan='2' align='center'>
+      <input style='margin-right: 15px;' type='submit' value='&ev.staff.patron.ue_xhtml.print_page.label;' onclick='window.print();'/>
+      <input style='margin-left: 15px;' type='submit' value='&ev.staff.patron.ue_xhtml.return_to_editor.label;' 
+       onclick=' unHideMe($("main_div_container")); 
+        hideMe($("summary_div_container"));'/>
+     </td>
+    </tr>
+
+    <tr><td>&ev.staff.patron.ue_xhtml.barcode.label;</td><td id='ue_summary_barcode'/></tr>
+    <tr><td>&ev.staff.patron.ue_xhtml.username.label;</td><td id='ue_summary_usrname'/></tr>
+    <tr><td>&ev.staff.patron.ue_xhtml.first_name.label;</td><td id='ue_summary_first_given_name'/></tr>
+    <tr><td>&ev.staff.patron.ue_xhtml.middle_name.label;</td><td id='ue_summary_second_given_name'/></tr>
+    <tr><td>&ev.staff.patron.ue_xhtml.last_name.label;</td><td id='ue_summary_family_name'/></tr>
+    <tr><td>&ev.staff.patron.ue_xhtml.alias.label;</td><td id='ue_summary_alias'/></tr>
+    <tr><td>&ev.staff.patron.ue_xhtml.suffix.label;</td><td id='ue_summary_suffix'/></tr>
+    <tr><td>&ev.staff.patron.ue_xhtml.dob.label;</td><td id='ue_summary_dob'/></tr>
+    <tr><td>&ev.staff.patron.ue_xhtml.primary_id_type.label;</td><td id='ue_summary_ident_type'/></tr>
+    <tr><td>&ev.staff.patron.ue_xhtml.primary_id.label;</td><td id='ue_summary_ident_value'/></tr>
+    <tr><td>&ev.staff.patron.ue_xhtml.secondary_id_type.label;</td><td id='ue_summary_ident_type2'/></tr>
+    <tr><td>&ev.staff.patron.ue_xhtml.secondary_id.label;</td><td id='ue_summary_ident_value2'/></tr>
+    <tr><td>&ev.staff.patron.ue_xhtml.email_address.label;</td><td id='ue_summary_email'/></tr>
+    <tr><td>&ev.staff.patron.ue_xhtml.daytime_phone.label;</td><td id='ue_summary_day_phone'/></tr>
+    <tr><td>&ev.staff.patron.ue_xhtml.evening_phone.label;</td><td id='ue_summary_evening_phone'/></tr>
+    <tr><td>&ev.staff.patron.ue_xhtml.other_phone.label;</td><td id='ue_summary_other_phone'/></tr>
+    <tr><td>&ev.staff.patron.ue_xhtml.home_library.label;</td><td id='ue_summary_home_ou'/></tr>
+
+    <tr>
+     <td colspan='2'>
+      <table width='100%' style='margin-top: 15px; margin-bottom: 15px;'>
+       <thead><tr><td>&ev.staff.patron.ue_xhtml.addresses.label;</td></tr></thead>
+       <tbody name='ue_summary_addr_tbody'>
+        <tr name='ue_summary_addr_row'>
+         <td>
+          <table name='ue_summary_addr_table' width='100%'>
+           <thead><tr><td colspan='4'/><span> </span></tr></thead>
+           <tbody>
+            <tr>
+             <td><b>&ev.staff.patron.ue_xhtml.address_label.label;</b></td><td name='label'/>
+             <td><b>&ev.staff.patron.ue_xhtml.zip.label;</b></td><td name='zip'/>
+            </tr>
+            <tr>
+             <td><b>&ev.staff.patron.ue_xhtml.street1.label;</b></td><td name='street1'/>
+             <td><b>&ev.staff.patron.ue_xhtml.country.label;</b></td><td name='country'/>
+            </tr>
+            <tr>
+             <td><b>&ev.staff.patron.ue_xhtml.street2.label;</b></td><td name='street2'/>
+             <td><b>&ev.staff.patron.ue_xhtml.mailing.label;</b></td><td name='mailing'/>
+            </tr>
+            <tr>
+             <td><b>&ev.staff.patron.ue_xhtml.city.label;</b></td><td name='city'/>
+             <td><b>&ev.staff.patron.ue_xhtml.billing.label;</b></td><td name='billing'/>
+            </tr>
+            <tr>
+             <td><b>&ev.staff.patron.ue_xhtml.county.label;</b></td><td name='county'/>
+             <td><b>&ev.staff.patron.ue_xhtml.valid.label;</b></td><td name='valid'/>
+            </tr>
+            <tr>
+             <td><b>&ev.staff.patron.ue_xhtml.state.label;</b></td><td name='state'/>
+             <td><b>&ev.staff.patron.ue_xhtml.in_city_limits.label;</b></td><td name='incorporated'/>
+            </tr>
+           </tbody>
+          </table>
+         </td>
+        </tr>
+       </tbody>
+      </table>
+     </td>
+    </tr>
+    <tr><td>&ev.staff.patron.ue_xhtml.profile.label;</td><td id='ue_summary_profile'/></tr>
+    <tr><td>&ev.staff.patron.ue_xhtml.active.label;</td><td id='ue_summary_active'/></tr>
+    <tr><td>&ev.staff.patron.ue_xhtml.barred.label;</td><td id='ue_summary_barred'/></tr>
+    <tr><td>&ev.staff.patron.ue_xhtml.expire_date.label;</td><td id='ue_summary_expire_date'/></tr>
+    <tr><td>&ev.staff.patron.ue_xhtml.family_lead_account.label;</td><td id='ue_summary_master_account'/></tr>
+    <tr><td>&ev.staff.patron.ue_xhtml.claims_returned_count.label;</td><td id='ue_summary_claims_returned_count'/></tr>
+    <tr><td>&ev.staff.patron.ue_xhtml.alert_message.label;</td><td id='ue_summary_alert_message'/></tr>
+    <tr name='ue_summary_stat_cat_td'>
+     <td colspan='2' >
+      <table width='100%' style='margin-top: 15px; margin-bottom: 15px;'>
+       <thead><tr><td colspan='2'>&ev.staff.patron.ue_xhtml.stat_categories.label;</td></tr></thead>
+       <tbody name='ue_summary_stats_tbody'>
+        <tr name='ue_summary_stats_row'>
+         <td name='ue_summary_stat_name'/><td name='ue_summary_stat_value'/>
+        </tr>
+       </tbody>
+      </table>
+     </td>
+    </tr>
+    <tr name='ue_summary_survey_td'>
+     <td colspan='2'>
+      <table width='100%' style='margin-top: 15px; margin-bottom: 15px;'>
+       <thead>
+        <tr>
+         <td>&ev.staff.patron.ue_xhtml.survey.label;</td>
+         <td>&ev.staff.patron.ue_xhtml.question.label;</td>
+         <td>&ev.staff.patron.ue_xhtml.answer.label;</td>
+        </tr>
+       </thead>
+       <tbody name='ue_summary_survey_tbody'>
+        <tr name='ue_summary_survey_row'>
+         <td name='ue_summary_survey_name'/>
+         <td name='ue_summary_survey_question'/>
+         <td name='ue_summary_survey_answer'/>
+        </tr>
+       </tbody>
+      </table>
+     </td>
+    </tr>
+    <tr>
+     <td colspan='2' align='center'>
+      <input style='margin-right: 15px;' type='submit' value='&ev.staff.patron.ue_xhtml.print_page.label;' onclick='window.print();'/>
+      <input style='margin-left: 15px;' type='submit' value='&ev.staff.patron.ue_xhtml.return_to_editor.label;' 
+       onclick=' unHideMe($("main_div_container")); 
+        hideMe($("summary_div_container"));'/>
+     </td>
+    </tr>
+   </tbody>
+  </table>
+ </div>
+ </div>
+
+
+ <!-- ************************************************************** -->
+ <!-- This holds all of the strings we may have to alert to the user -->
+ <!-- ************************************************************** -->
+ <div class='hide_me'>
+  <span id='ue_bad_dob'>&staff.patron.ue.bad_dob.label;</span>
+  <span id='ue_bad_username'>&staff.patron.ue.bad_username.label;</span>
+  <span id='ue_bad_password'>&staff.patron.ue.bad_passwords.label;</span>
+  <span id='ue_bad_firstname'>&staff.patron.ue.bad_firstname.label;</span>
+  <span id='ue_bad_middlename'>&staff.patron.ue.bad_middlename.label;</span>
+  <span id='ue_bad_lastname'>&staff.patron.ue.bad_lastname.label;</span>
+  <span id='ue_bad_barcode'>&staff.patron.ue.bad_barcode.label;</span>
+  <span id='ue_duplicate_barcode'>&staff.patron.ue.duplicate_barcode.label;</span>
+  <span id='ue_new_barcode_warn'>&staff.patron.ue.new_barcode_warn.label;</span>
+  <span id='ue_no_ident'>&staff.patron.ue.no_ident.label;</span>
+  <span id='ue_bad_ident_dl'>&staff.patron.ue.bad_ident_dl.label;</span>
+  <span id='ue_bad_ident_ssn'>&staff.patron.ue.bad_ident_ssn.label;</span>
+  <span id='ue_bad_email'>&staff.patron.ue.bad_email.label;</span>
+  <span id='ue_bad_phone'>&staff.patron.ue.bad_phone.label;</span>
+  <span id='ue_no_profile'>&staff.patron.ue.no_profile.label;</span>
+  <span id='ue_bad_expire'>&staff.patron.ue.bad_expire.label;</span>
+  <span id='ue_bad_claims_returned'>&staff.patron.ue.bad_claims_returned.label;</span>
+  <span id='ue_no_profile'>&ev.staff.patron.ue_xhtml.no_profile.label;</span>
+  <span id='ue_unknown_error'>&staff.patron.ue.unknown_error.label;</span>
+  <span id='ue_bad_addr_label'>&staff.patron.ue.bad_addr_label.label;</span>
+  <span id='ue_bad_addr_street'>&staff.patron.ue.bad_addr_street.label;</span>
+  <span id='ue_bad_addr_city'>&staff.patron.ue.bad_addr_city.label;</span>
+  <span id='ue_bad_addr_county'>&staff.patron.ue.bad_addr_county.label;</span>
+  <span id='ue_bad_addr_state'>&staff.patron.ue.bad_addr_state.label;</span>
+  <span id='ue_bad_addr_country'>&staff.patron.ue.bad_addr_country.label;</span>
+  <span id='ue_bad_addr_zip'>&staff.patron.ue.bad_addr_zip.label;</span>
+  <span id='ue_bad_survey'>&staff.patron.ue.bad_survey.label;</span>
+  <span id='ue_delete_addr_warn'>&staff.patron.ue.delete_addr_warn.label;</span>
+  <span id='yes'>&staff.patron.ue.yes.label;</span>
+  <span id='no'>&staff.patron.ue.no.label;</span>
+  <span id='ue_summary_window'>&staff.patron.ue.summary_window.label;</span>
+  <span id='ue_success'>&staff.patron.ue.success.label;</span>
+  <span id='ue_dup_ident1'>&staff.patron.ue.dup_ident1.label;</span>
+  <span id='ue_dup_username'>&staff.patron.ue.dup_username.label;</span>
+  <span id='ue_dup_barcode'>&staff.patron.ue.dup_barcode.label;</span>
+  <span class='hide_me' id='ue_cancel_confirm'>&staff.patron.ue.cancel_confirm.label;</span>
+  <span class='hide_me' id='ue_juv_guardian'>&staff.patron.ue.juv_guardian.label;</span>
+  <span class='hide_me' id='ue_bad_date'>&staff.patron.ue.bad_date.label;</span>
+  <span class='hide_me' id='ue_made_barred'>&staff.patron.ue.made_barred.label;</span>
+  <span class='hide_me' id='ue_claims_return_confirm'>&ev.staff.patron.ue_xhtml.claims_return_confirm.label;</span>
+  <span class='hide_me' id='ue_unsaved_changes'>&ev.staff.patron.ue_xhtml.unsaved_changes.label;</span>
+  <span class='hide_me' id='ue_xact_collision'>&ev.staff.patron.ue_xhtml.xact_collision.label;</span>
+  <span class='hide_me' id='ue_add_approve_confirm'>&ev.staff.patron.ue_xhtml.ue_addr_approve_confirm.label;</span>
+ </div>
+
+ </body>
 </html>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/ue_config.js b/Open-ILS/xul/staff_client/server/patron/ue_config.js
index 1dacfd3a52..ae11cd0567 100644
--- a/Open-ILS/xul/staff_client/server/patron/ue_config.js
+++ b/Open-ILS/xul/staff_client/server/patron/ue_config.js
@@ -1,300 +1,300 @@
 /* -----------------------------------------------------------------------
-	----------------------------------------------------------------------- */
-const SC_FETCH_ALL		= 'open-ils.circ:open-ils.circ.stat_cat.actor.retrieve.all';
-const SC_CREATE_MAP		= 'open-ils.circ:open-ils.circ.stat_cat.actor.user_map.create';
-const SV_FETCH_ALL		= 'open-ils.circ:open-ils.circ.survey.retrieve.all';
-const FETCH_ID_TYPES		= 'open-ils.actor:open-ils.actor.user.ident_types.retrieve';
-const FETCH_GROUPS		= 'open-ils.actor:open-ils.actor.groups.tree.retrieve';
-const FETCH_NET_LEVELS	= 'open-ils.actor:open-ils.actor.net_access_level.retrieve.all';
-const UPDATE_PATRON		= 'open-ils.actor:open-ils.actor.patron.update';
-const PATRON_SEARCH		= 'open-ils.actor:open-ils.actor.patron.search.advanced';
-const ZIP_SEARCH			= 'open-ils.search:open-ils.search.zip';
-const APPROVE_ADDR		= 'open-ils.actor:open-ils.actor.user.pending_address.approve';
-const FETCH_ADDR_MEMS	= 'open-ils.actor:open-ils.actor.address.members';
-const FETCH_GRP_MEMS		= 'open-ils.actor:open-ils.actor.usergroup.members.retrieve';
-const CREATE_USER_NOTE	= 'open-ils.actor:open-ils.actor.note.create';
-const CHECK_BARCODE		= 'open-ils.actor:open-ils.actor.barcode.exists';
-const defaultState		= 'GA';
-const defaultCountry		= 'USA';
-const defaultNetAccess	= 'None';
+ ----------------------------------------------------------------------- */
+const SC_FETCH_ALL  = 'open-ils.circ:open-ils.circ.stat_cat.actor.retrieve.all';
+const SC_CREATE_MAP  = 'open-ils.circ:open-ils.circ.stat_cat.actor.user_map.create';
+const SV_FETCH_ALL  = 'open-ils.circ:open-ils.circ.survey.retrieve.all';
+const FETCH_ID_TYPES  = 'open-ils.actor:open-ils.actor.user.ident_types.retrieve';
+const FETCH_GROUPS  = 'open-ils.actor:open-ils.actor.groups.tree.retrieve';
+const FETCH_NET_LEVELS = 'open-ils.actor:open-ils.actor.net_access_level.retrieve.all';
+const UPDATE_PATRON  = 'open-ils.actor:open-ils.actor.patron.update';
+const PATRON_SEARCH  = 'open-ils.actor:open-ils.actor.patron.search.advanced';
+const ZIP_SEARCH   = 'open-ils.search:open-ils.search.zip';
+const APPROVE_ADDR  = 'open-ils.actor:open-ils.actor.user.pending_address.approve';
+const FETCH_ADDR_MEMS = 'open-ils.actor:open-ils.actor.address.members';
+const FETCH_GRP_MEMS  = 'open-ils.actor:open-ils.actor.usergroup.members.retrieve';
+const CREATE_USER_NOTE = 'open-ils.actor:open-ils.actor.note.create';
+const CHECK_BARCODE  = 'open-ils.actor:open-ils.actor.barcode.exists';
+const defaultState  = 'GA';
+const defaultCountry  = 'USA';
+const defaultNetAccess = 'None';
 const defaultNetLevel   = 1;
-const CSS_INVALID_DATA	= 'invalid_value';
+const CSS_INVALID_DATA = 'invalid_value';
 
 // if no org setting exists
-const DEFAULT_ADULT_AGE			= '18 years';
+const DEFAULT_ADULT_AGE   = '18 years';
 
-//const GUARDIAN_NOTE		= 'SYSTEM: Parent/Guardian';
+//const GUARDIAN_NOTE  = 'SYSTEM: Parent/Guardian';
 
 var dataFields;
-const numRegex		= /^\d+$/;
-const wordRegex	= /^[\w-]+$/;
-const unameRegex	= /^\w[\.\w\@-]*$/;
-const ssnRegex		= /^\d{3}-\d{2}-\d{4}$/;
-const dlRegex		= /^[a-zA-Z]{2}-\w+/; /* driver's license */
-const phoneRegex	= /^\d{3}-\d{3}-\d{4}(| \S+.*)$/i;
-const nonumRegex	= /^[^\d\s]\D*$/; /* no numbers, no beginning whitespace */
-const dateRegex	= /^\d{4}-\d{2}-\d{2}/;
-const zipRegex		= /^\d{5}(-\d{4}|-?$)|(^[ABCEGHJKLMNPRSTVXY]{1}\d{1}[A-Z]{1} *\d{1}[A-Z]{1}\d{1}$)/;
+const numRegex  = /^\d+$/;
+const wordRegex = /^[\w-]+$/;
+const unameRegex = /^\w[\.\w\@-]*$/;
+const ssnRegex  = /^\d{3}-\d{2}-\d{4}$/;
+const dlRegex  = /^[a-zA-Z]{2}-\w+/; /* driver's license */
+const phoneRegex = /^\d{3}-\d{3}-\d{4}(| \S+.*)$/i;
+const nonumRegex = /^[^\d\s]\D*$/; /* no numbers, no beginning whitespace */
+const dateRegex = /^\d{4}-\d{2}-\d{2}/;
+const zipRegex  = /^\d{5}(-\d{4}|-?$)|(^[ABCEGHJKLMNPRSTVXY]{1}\d{1}[A-Z]{1} *\d{1}[A-Z]{1}\d{1}$)/;
 
 var barredAlerted = false;
 
 
 function uEditUsrnameBlur(field) {
-	var usrname = uEditNodeVal(field);
-	if (!usrname) { return; }
-	var req = new Request(CHECK_USERNAME, SESSION, usrname);
-	req.callback( 
-		function(r) {
-			var res = r.getResultObject();
-			if( res !== null && res != patron.id() ) {
-				field.widget.onblur = null; /* prevent alert storm */
-				alertId('ue_dup_username');
-				field.widget.onblur = uEditUsrnameBlur;
-				setTimeout( 
-					function() {
-						field.widget.node.focus();
-						field.widget.node.select();
-					}, 10 
-				);
-			}
-		}
-	);
-	req.send();
+ var usrname = uEditNodeVal(field);
+ if (!usrname) { return; }
+ var req = new Request(CHECK_USERNAME, SESSION, usrname);
+ req.callback( 
+  function(r) {
+   var res = r.getResultObject();
+   if( res !== null && res != patron.id() ) {
+    field.widget.onblur = null; /* prevent alert storm */
+    alertId('ue_dup_username');
+    field.widget.onblur = uEditUsrnameBlur;
+    setTimeout( 
+     function() {
+      field.widget.node.focus();
+      field.widget.node.select();
+     }, 10 
+    );
+   }
+  }
+ );
+ req.send();
 }
 
 
 function uEditBarcodeBlur(field) {
-	var barcode = uEditNodeVal(field);
-	if(!barcode) return;
-	_debug("blurring card with new value " + barcode);
-	var req = new Request(CHECK_BARCODE, SESSION, barcode);
-	req.callback( 
-		function(r) {
-			var res = r.getResultObject();
-			if( res == 1 ) {
-				field.widget.onblur = null; /* prevent alert storm */
-				alertId('ue_dup_barcode');
-				field.widget.onblur = uEditBarcodeBlur;
-				setTimeout( 
-					function() {
-						field.widget.node.focus();
-						field.widget.node.select();
-					}, 10 
-				);
-			} else {
-				var node = uEditFindFieldByWId("ue_username");
-				if(!node.widget.node.value) {
-					node.widget.node.value = barcode;
-					node.widget.node.onchange();
-				}
-			}
-		}
-	);
-	req.send();
+ var barcode = uEditNodeVal(field);
+ if(!barcode) return;
+ _debug("blurring card with new value " + barcode);
+ var req = new Request(CHECK_BARCODE, SESSION, barcode);
+ req.callback( 
+  function(r) {
+   var res = r.getResultObject();
+   if( res == 1 ) {
+    field.widget.onblur = null; /* prevent alert storm */
+    alertId('ue_dup_barcode');
+    field.widget.onblur = uEditBarcodeBlur;
+    setTimeout( 
+     function() {
+      field.widget.node.focus();
+      field.widget.node.select();
+     }, 10 
+    );
+   } else {
+    var node = uEditFindFieldByWId("ue_username");
+    if(!node.widget.node.value) {
+     node.widget.node.value = barcode;
+     node.widget.node.onchange();
+    }
+   }
+  }
+ );
+ req.send();
 }
 
 
 function uEditDefineData(patron) {
 
-	var fields = [
-		{
-			required : true,
-			object	: patron.card(),
-			key		: 'barcode',
-			errkey	: 'ue_bad_barcode',
-			widget	: {
-				id		: 'ue_barcode',
-				regex	: wordRegex,
-				type	: 'input',
-				onblur : uEditBarcodeBlur
-			}
-		},
-		{
-			required : true,
-			object	: patron,
-			key		: 'usrname',
-			errkey	: 'ue_bad_username',
-			widget	: {
-				id		: 'ue_username',
-				regex	: unameRegex,
-				type	: 'input',
-				onblur : uEditUsrnameBlur
-			}
-		},
-		{
-			required : (patron.isnew()) ? true : false,
-			object	: patron,
-			key		: 'passwd',
-			errkey	: 'ue_bad_password',
-			widget	: {
-				id		: 'ue_password1',
-				type	: 'input',
-				onpostchange : function(field, newval) {
-					var pw2 = uEditFindFieldByWId('ue_password2');
-					/* tell the second passsword input to re-validate */
-					pw2.widget.node.onchange();
-				}
-
-			}
-		},
-		{
-			required : (patron.isnew()) ? true : false,
-			object	: patron,
-			key		: 'passwd',
-			errkey	: 'ue_bad_password',
-			widget	: {
-				id		: 'ue_password2',
-				type	: 'input',
-				onpostchange : function(field, newval) {
-					var pw1f = uEditFindFieldByWId('ue_password1');
-					var pw1 = uEditNodeVal(pw1f);
-					field.widget.regex = new RegExp('^'+pw1+'$');
-					if( pw1 ) field.required = true;
-					else {
-						if(!patron.isnew())
-							field.required = false;
-					}
-				}
-			}
-		},
-		{
-			required : true,
-			object	: patron,
-			key		: 'first_given_name',
-			errkey	: 'ue_bad_firstname',
-			widget	: {
-				id		: 'ue_firstname',
-				regex	: nonumRegex,
-				type	: 'input',
-				onblur : function(field) {
-					uEditCheckNamesDup('first', field );
-				}
-			}
-		},
-		{
-			required : false,
-			object	: patron,
-			key		: 'second_given_name',
-			errkey	: 'ue_bad_middlename',
-			widget	: {
-				id		: 'ue_middlename',
-				regex	: nonumRegex,
-				type	: 'input'
-			}
-		},
-		{
-			required : true,
-			object	: patron,
-			key		: 'family_name',
-			errkey	: 'ue_bad_lastname',
-			widget	: {
-				id		: 'ue_lastname',
-				regex	: nonumRegex,
-				type	: 'input',
-				onblur : function(field) {
-					uEditCheckNamesDup('last', field );
-				}
-			}
-		},
-		{
-			required : false,
-			object	: patron,
-			key		: 'suffix',
-			widget	: {
-				id			: 'ue_suffix',
-				type		: 'input',
-				onload	: function(val) {
-					setSelector($('ue_suffix_selector'), val);
-					$('ue_suffix_selector').onchange = function() {
-						uEditFindFieldByKey('suffix').widget.node.onchange();
-					}
-				},
-			}
-		},
-		{
-			required : false,
-			object	: patron,
-			key		: 'alias',
-			widget	: {
-				id		: 'ue_alias',
-				type	: 'input',
-			}
-		},
-		{
-			required : false,
-			object	: patron,
-			key		: 'dob',
-			errkey	: 'ue_bad_dob',
-			widget	: {
-				id			: 'ue_dob',
-				regex		: dateRegex,
-				type		: 'input',
-				onpostchange	: function(field) { uEditCheckDOB(field); },
-				onblur	: function(field) { uEditCheckDOB(field); }
-			}
-		},
-		{
-			required : true,
-			object	: patron,
-			key		: 'ident_type',
-			errkey	: 'ue_no_ident',
-			widget	: {
-				id		: 'ue_primary_ident_type',
-				regex	: numRegex,
-				type	: 'select',
-				onpostchange : function(field, newval) 
-					{ _uEditIdentPostchange('primary', field, newval); }
-			}
-		},
-		{
-			required : false,
-			object	: patron,
-			key		: 'ident_value',
-			widget	: {
-				id			: 'ue_primary_ident',
-				type		: 'input',
-				onblur : function(field) {
-					uEditCheckIdentDup(field);
-				}
-			}
-		},
-		{
-			required : false,
-			object	: patron,
-			key		: 'ident_value2',
-			widget	: {
-				id			: 'ue_secondary_ident',
-				type		: 'input'
-			}
-		},
-		{
-			required : false,
-			object	: patron,
-			key		: 'email',
-			errkey	: 'ue_bad_email',
-			widget	: {
-				id			: 'ue_email',
-				type		: 'input',
-				regex		:  /.+\@.+\..+/,  /* make me better */
-				onblur	: function(field) {
-					var val = uEditNodeVal(field);
-					if( val && val != field.oldemail ) {
-						uEditRunDupeSearch('email',
-							{ email : { value : val, group : 0 } });
-						field.oldemail = val;
-					}
-				}
-			}
-		},
-		{
-			required : false,
-			object	: patron,
-			key		: 'day_phone',
-			errkey	: 'ue_bad_phone',
-			widget	: {
-				id			: 'ue_day_phone',
-				type		: 'input',
-				regex		:  phoneRegex,
+ var fields = [
+  {
+   required : true,
+   object : patron.card(),
+   key  : 'barcode',
+   errkey : 'ue_bad_barcode',
+   widget : {
+    id  : 'ue_barcode',
+    regex : wordRegex,
+    type : 'input',
+    onblur : uEditBarcodeBlur
+   }
+  },
+  {
+   required : true,
+   object : patron,
+   key  : 'usrname',
+   errkey : 'ue_bad_username',
+   widget : {
+    id  : 'ue_username',
+    regex : unameRegex,
+    type : 'input',
+    onblur : uEditUsrnameBlur
+   }
+  },
+  {
+   required : (patron.isnew()) ? true : false,
+   object : patron,
+   key  : 'passwd',
+   errkey : 'ue_bad_password',
+   widget : {
+    id  : 'ue_password1',
+    type : 'input',
+    onpostchange : function(field, newval) {
+     var pw2 = uEditFindFieldByWId('ue_password2');
+     /* tell the second passsword input to re-validate */
+     pw2.widget.node.onchange();
+    }
+
+   }
+  },
+  {
+   required : (patron.isnew()) ? true : false,
+   object : patron,
+   key  : 'passwd',
+   errkey : 'ue_bad_password',
+   widget : {
+    id  : 'ue_password2',
+    type : 'input',
+    onpostchange : function(field, newval) {
+     var pw1f = uEditFindFieldByWId('ue_password1');
+     var pw1 = uEditNodeVal(pw1f);
+     field.widget.regex = new RegExp('^'+pw1+'$');
+     if( pw1 ) field.required = true;
+     else {
+      if(!patron.isnew())
+       field.required = false;
+     }
+    }
+   }
+  },
+  {
+   required : true,
+   object : patron,
+   key  : 'first_given_name',
+   errkey : 'ue_bad_firstname',
+   widget : {
+    id  : 'ue_firstname',
+    regex : nonumRegex,
+    type : 'input',
+    onblur : function(field) {
+     uEditCheckNamesDup('first', field );
+    }
+   }
+  },
+  {
+   required : false,
+   object : patron,
+   key  : 'second_given_name',
+   errkey : 'ue_bad_middlename',
+   widget : {
+    id  : 'ue_middlename',
+    regex : nonumRegex,
+    type : 'input'
+   }
+  },
+  {
+   required : true,
+   object : patron,
+   key  : 'family_name',
+   errkey : 'ue_bad_lastname',
+   widget : {
+    id  : 'ue_lastname',
+    regex : nonumRegex,
+    type : 'input',
+    onblur : function(field) {
+     uEditCheckNamesDup('last', field );
+    }
+   }
+  },
+  {
+   required : false,
+   object : patron,
+   key  : 'suffix',
+   widget : {
+    id   : 'ue_suffix',
+    type  : 'input',
+    onload : function(val) {
+     setSelector($('ue_suffix_selector'), val);
+     $('ue_suffix_selector').onchange = function() {
+      uEditFindFieldByKey('suffix').widget.node.onchange();
+     }
+    },
+   }
+  },
+  {
+   required : false,
+   object : patron,
+   key  : 'alias',
+   widget : {
+    id  : 'ue_alias',
+    type : 'input',
+   }
+  },
+  {
+   required : false,
+   object : patron,
+   key  : 'dob',
+   errkey : 'ue_bad_dob',
+   widget : {
+    id   : 'ue_dob',
+    regex  : dateRegex,
+    type  : 'input',
+    onpostchange : function(field) { uEditCheckDOB(field); },
+    onblur : function(field) { uEditCheckDOB(field); }
+   }
+  },
+  {
+   required : true,
+   object : patron,
+   key  : 'ident_type',
+   errkey : 'ue_no_ident',
+   widget : {
+    id  : 'ue_primary_ident_type',
+    regex : numRegex,
+    type : 'select',
+    onpostchange : function(field, newval) 
+     { _uEditIdentPostchange('primary', field, newval); }
+   }
+  },
+  {
+   required : false,
+   object : patron,
+   key  : 'ident_value',
+   widget : {
+    id   : 'ue_primary_ident',
+    type  : 'input',
+    onblur : function(field) {
+     uEditCheckIdentDup(field);
+    }
+   }
+  },
+  {
+   required : false,
+   object : patron,
+   key  : 'ident_value2',
+   widget : {
+    id   : 'ue_secondary_ident',
+    type  : 'input'
+   }
+  },
+  {
+   required : false,
+   object : patron,
+   key  : 'email',
+   errkey : 'ue_bad_email',
+   widget : {
+    id   : 'ue_email',
+    type  : 'input',
+    regex  :  /.+\@.+\..+/,  /* make me better */
+    onblur : function(field) {
+     var val = uEditNodeVal(field);
+     if( val && val != field.oldemail ) {
+      uEditRunDupeSearch('email',
+       { email : { value : val, group : 0 } });
+      field.oldemail = val;
+     }
+    }
+   }
+  },
+  {
+   required : false,
+   object : patron,
+   key  : 'day_phone',
+   errkey : 'ue_bad_phone',
+   widget : {
+    id   : 'ue_day_phone',
+    type  : 'input',
+    regex  :  phoneRegex,
                 onblur      : function() {
                     if(uEditUsePhonePw)
                         uEditMakePhonePw();
@@ -308,274 +308,274 @@ function uEditDefineData(patron) {
                         uEditMakePhonePw();
                     }
                 }
-			}
-		},
-		{
-			required : false,
-			object	: patron,
-			key		: 'evening_phone',
-			errkey	: 'ue_bad_phone',
-			widget	: {
-				id			: 'ue_night_phone',
-				type		: 'input',
-				regex		:  phoneRegex,
+   }
+  },
+  {
+   required : false,
+   object : patron,
+   key  : 'evening_phone',
+   errkey : 'ue_bad_phone',
+   widget : {
+    id   : 'ue_night_phone',
+    type  : 'input',
+    regex  :  phoneRegex,
                 onblur      : function() {
                     if(uEditUsePhonePw)
                         uEditMakePhonePw();
                 }
-			}
-		},
-		{
-			required : false,
-			object	: patron,
-			key		: 'other_phone',
-			errkey	: 'ue_bad_phone',
-			widget	: {
-				id			: 'ue_other_phone',
-				type		: 'input',
-				regex		:  phoneRegex,
+   }
+  },
+  {
+   required : false,
+   object : patron,
+   key  : 'other_phone',
+   errkey : 'ue_bad_phone',
+   widget : {
+    id   : 'ue_other_phone',
+    type  : 'input',
+    regex  :  phoneRegex,
                 onblur      : function() {
                     if(uEditUsePhonePw)
                         uEditMakePhonePw();
                 }
-			}
-		},
-		{
-			required : true,
-			object	: patron,
-			key		: 'home_ou',
-			widget	: {
-				id			: 'ue_org_selector',
-				type		: 'select',
-				regex		:  numRegex,
-			}
-		},
-		{
-			required : true,
-			object	: patron,
-			key		: 'expire_date',
-			errkey	: 'ue_bad_expire',
-			widget	: {
-				id			: 'ue_expire',
-				type		: 'input',
-				regex		:  dateRegex,
-			}
-		},
-		{
-			required : false,
-			object	: patron,
-			key		: 'active',
-			widget	: {
-				id			: 'ue_active',
-				type		: 'checkbox',
-			}
-		},
-		{
-			required : false,
-			object	: patron,
-			key		: 'juvenile',
-			widget	: {
-				id			: 'ue_juvenile',
-				type		: 'checkbox',
-				onpostchange	: function(field) { uEditCheckDOB(uEditFindFieldByKey('dob')); },
-				onblur	: function(field) { uEditCheckDOB(uEditFindFieldByKey('dob')); }
-			}
-		},
-		{
-			required : false,
-			object	: patron,
-			key		: 'barred',
-			widget	: {
-				id			: 'ue_barred',
-				type		: 'checkbox',
-				onpostchange : function(field, val) {
-					var afield = uEditFindFieldByKey('alert_message');
-					if( val ) {
-						if( !barredAlerted ) {
-							barredAlerted = true;
-							alertId('ue_made_barred');
-						}
-						afield.required = true;	
-					} else {
-						afield.required = false;
-					}
-				}
-			}
-		},
-		{
-			required : true,
-			object	: patron,
-			key		: 'profile',
-			errkey	: 'ue_no_profile',
-			widget	: {
-				id			: 'ue_profile',
-				type		: 'select',
-				regex		: numRegex,
-				onpostchange : function(field, value) {
-					var type			= groupsCache[value];
-					if(!type) return;
-					var interval	= type.perm_interval();
-
-					/* interval_to_seconds expects 'M' for months, 'm' for minutes */
-					interval			= interval.replace(/mon/, 'Mon'); 
-					var intsecs		= parseInt(interval_to_seconds(interval));
-
-					var expdate		= new Date();
-					var exptime		= expdate.getTime();
-					exptime			+= intsecs * 1000;
-					expdate.setTime(exptime);
-
-					_debug("profile change (interval= '"+interval+"', seconds="+intsecs+")\n\tgenerated a date of " + expdate);
-
-					var year			= expdate.getYear() + 1900;
-					var month		= (expdate.getMonth() + 1) + '';
-					var day			= (expdate.getDate()) + '';
-
-					if(!month.match(/\d{2}/)) month = '0' + month;
-					if(!day.match(/\d{2}/)) day = '0' + day;
-
-
-					var node = $('ue_expire');
-					node.value = year+'-'+month+'-'+day;
-
-					_debug("profile change formatted date to "+ node.value);
-					node.onchange();
-				}
-			}
-		},
-		{
-			required : false,
-			object	: patron,
-			key		: 'net_access_level',
-			widget	: {
-				id		: 'ue_net_level',
-				type	: 'select'
-			}
-		},
-		{
-			required : false,
-			object	: patron,
-			key		: 'master_account',
-			widget	: {
-				id			: 'ue_group_lead',
-				type		: 'checkbox',
-			}
-		},
-		{
-			required : true,
-			object	: patron,
-			key		: 'claims_returned_count',
-			widget	: {
-				id			: 'ue_claims_returned',
-				type		: 'input',
-				regex		: numRegex,
-				disabled : true
-			}
-		},
-		{
-			required : false,
-			object	: patron,
-			key		: 'alert_message',
-			widget	: {
-				id			: 'ue_alert_message',
-				type		: 'input',
-			}
-		}
-	];
-
-	for( var f in fields ) 
-		dataFields.push(fields[f]);
-
-	uEditBuildAddrs(patron);
-	uEditBuildPatronSCM(patron);
+   }
+  },
+  {
+   required : true,
+   object : patron,
+   key  : 'home_ou',
+   widget : {
+    id   : 'ue_org_selector',
+    type  : 'select',
+    regex  :  numRegex,
+   }
+  },
+  {
+   required : true,
+   object : patron,
+   key  : 'expire_date',
+   errkey : 'ue_bad_expire',
+   widget : {
+    id   : 'ue_expire',
+    type  : 'input',
+    regex  :  dateRegex,
+   }
+  },
+  {
+   required : false,
+   object : patron,
+   key  : 'active',
+   widget : {
+    id   : 'ue_active',
+    type  : 'checkbox',
+   }
+  },
+  {
+   required : false,
+   object : patron,
+   key  : 'juvenile',
+   widget : {
+    id   : 'ue_juvenile',
+    type  : 'checkbox',
+    onpostchange : function(field) { uEditCheckDOB(uEditFindFieldByKey('dob')); },
+    onblur : function(field) { uEditCheckDOB(uEditFindFieldByKey('dob')); }
+   }
+  },
+  {
+   required : false,
+   object : patron,
+   key  : 'barred',
+   widget : {
+    id   : 'ue_barred',
+    type  : 'checkbox',
+    onpostchange : function(field, val) {
+     var afield = uEditFindFieldByKey('alert_message');
+     if( val ) {
+      if( !barredAlerted ) {
+       barredAlerted = true;
+       alertId('ue_made_barred');
+      }
+      afield.required = true; 
+     } else {
+      afield.required = false;
+     }
+    }
+   }
+  },
+  {
+   required : true,
+   object : patron,
+   key  : 'profile',
+   errkey : 'ue_no_profile',
+   widget : {
+    id   : 'ue_profile',
+    type  : 'select',
+    regex  : numRegex,
+    onpostchange : function(field, value) {
+     var type   = groupsCache[value];
+     if(!type) return;
+     var interval = type.perm_interval();
+
+     /* interval_to_seconds expects 'M' for months, 'm' for minutes */
+     interval   = interval.replace(/mon/, 'Mon'); 
+     var intsecs  = parseInt(interval_to_seconds(interval));
+
+     var expdate  = new Date();
+     var exptime  = expdate.getTime();
+     exptime   += intsecs * 1000;
+     expdate.setTime(exptime);
+
+     _debug("profile change (interval= '"+interval+"', seconds="+intsecs+")\n\tgenerated a date of " + expdate);
+
+     var year   = expdate.getYear() + 1900;
+     var month  = (expdate.getMonth() + 1) + '';
+     var day   = (expdate.getDate()) + '';
+
+     if(!month.match(/\d{2}/)) month = '0' + month;
+     if(!day.match(/\d{2}/)) day = '0' + day;
+
+
+     var node = $('ue_expire');
+     node.value = year+'-'+month+'-'+day;
+
+     _debug("profile change formatted date to "+ node.value);
+     node.onchange();
+    }
+   }
+  },
+  {
+   required : false,
+   object : patron,
+   key  : 'net_access_level',
+   widget : {
+    id  : 'ue_net_level',
+    type : 'select'
+   }
+  },
+  {
+   required : false,
+   object : patron,
+   key  : 'master_account',
+   widget : {
+    id   : 'ue_group_lead',
+    type  : 'checkbox',
+   }
+  },
+  {
+   required : true,
+   object : patron,
+   key  : 'claims_returned_count',
+   widget : {
+    id   : 'ue_claims_returned',
+    type  : 'input',
+    regex  : numRegex,
+    disabled : true
+   }
+  },
+  {
+   required : false,
+   object : patron,
+   key  : 'alert_message',
+   widget : {
+    id   : 'ue_alert_message',
+    type  : 'input',
+   }
+  }
+ ];
+
+ for( var f in fields ) 
+  dataFields.push(fields[f]);
+
+ uEditBuildAddrs(patron);
+ uEditBuildPatronSCM(patron);
 }
 
 var uEditOldFirstName;
 var uEditOldMiddleName; /* future */
 var uEditOldLastName;
 function uEditCheckNamesDup(type, field) {
-	var newval = uEditNodeVal(field);
-	if(!newval) return;
-
-	var dosearch = false;
-
-	if(type =='first') {
-		if( newval != uEditOldFirstName )
-			dosearch = true;
-		uEditOldFirstName = newval;
-	}
-
-	if(type =='last') {
-		if( newval != uEditOldLastName )
-			dosearch = true;
-		uEditOldLastName = newval;
-	}
-
-	if( dosearch && uEditOldFirstName && uEditOldLastName ) {
-		var search_hash = {};
-		search_hash['first_given_name'] = { value : uEditOldFirstName, group : 0 };
-		search_hash['family_name'] = { value : uEditOldLastName, group : 0 };
-		uEditRunDupeSearch('names', search_hash);
-	}
+ var newval = uEditNodeVal(field);
+ if(!newval) return;
+
+ var dosearch = false;
+
+ if(type =='first') {
+  if( newval != uEditOldFirstName )
+   dosearch = true;
+  uEditOldFirstName = newval;
+ }
+
+ if(type =='last') {
+  if( newval != uEditOldLastName )
+   dosearch = true;
+  uEditOldLastName = newval;
+ }
+
+ if( dosearch && uEditOldFirstName && uEditOldLastName ) {
+  var search_hash = {};
+  search_hash['first_given_name'] = { value : uEditOldFirstName, group : 0 };
+  search_hash['family_name'] = { value : uEditOldLastName, group : 0 };
+  uEditRunDupeSearch('names', search_hash);
+ }
 }
 
 var uEditOldIdentValue;
 function uEditCheckIdentDup(field) {
-	var newval = uEditNodeVal(field);
-	if( newval && newval != uEditOldIdentValue ) {
-		/* searches all ident_value fields */
-		var search_hash  = { ident : { value : newval, group : 2 } };
-		uEditRunDupeSearch('ident', search_hash);
-		uEditOldIdentValue = newval;
-	}
+ var newval = uEditNodeVal(field);
+ if( newval && newval != uEditOldIdentValue ) {
+  /* searches all ident_value fields */
+  var search_hash  = { ident : { value : newval, group : 2 } };
+  uEditRunDupeSearch('ident', search_hash);
+  uEditOldIdentValue = newval;
+ }
 }
 
 
 /* Adds all of the addresses attached to the patron object
-	to the fields array */
+ to the fields array */
 var uEditAddrTemplate;
 function uEditBuildAddrs(patron) {
-	var tbody = $('ue_address_tbody');
-	if(!uEditAddrTemplate)
-		uEditAddrTemplate = tbody.removeChild($('ue_address_template'));
-	for( var a in patron.addresses() ) 
-		uEditBuildAddrFields( patron, patron.addresses()[a]);
+ var tbody = $('ue_address_tbody');
+ if(!uEditAddrTemplate)
+  uEditAddrTemplate = tbody.removeChild($('ue_address_template'));
+ for( var a in patron.addresses() ) 
+  uEditBuildAddrFields( patron, patron.addresses()[a]);
 }
 
 
 function uEditDeleteAddr( tbody, row, address, detach ) {
-	if(!confirm($('ue_delete_addr_warn').innerHTML)) return;
-	if(address.isnew()) { 
-		patron.addresses(
-			grep( patron.addresses(), 
-				function(i) {
-					return (i.id() != address.id());
-				}
-			)
-		);
+ if(!confirm($('ue_delete_addr_warn').innerHTML)) return;
+ if(address.isnew()) { 
+  patron.addresses(
+   grep( patron.addresses(), 
+    function(i) {
+     return (i.id() != address.id());
+    }
+   )
+  );
         if(!patron.addresses())
             patron.addresses([]);
 
-		/* XXX */
-		for( var f in dataFields ) {
-			if( dataFields[f].object == address ) {
-				dataFields[f] = null;
-			}
-		}
-
-		dataFields = compactArray(dataFields);
-
-	} else {
-
-		if( detach ) { /* remove the offending address from the list */
-			patron.addresses(
-				grep( 
-					patron.addresses(), 
-					function(i) {
-						return (i.id() != address.id());
-					}
-				)
-			);
+  /* XXX */
+  for( var f in dataFields ) {
+   if( dataFields[f].object == address ) {
+    dataFields[f] = null;
+   }
+  }
+
+  dataFields = compactArray(dataFields);
+
+ } else {
+
+  if( detach ) { /* remove the offending address from the list */
+   patron.addresses(
+    grep( 
+     patron.addresses(), 
+     function(i) {
+      return (i.id() != address.id());
+     }
+    )
+   );
             if(!patron.addresses()) {                                      
                 patron.addresses([]);                                      
                 patron.billing_address(null);                              
@@ -584,49 +584,49 @@ function uEditDeleteAddr( tbody, row, address, detach ) {
             }
 
 
-		} else {
-			address.isdeleted(1);
-		}
-	}
+  } else {
+   address.isdeleted(1);
+  }
+ }
 
-	tbody.removeChild(row);
+ tbody.removeChild(row);
 
-	var bid = patron.billing_address();
+ var bid = patron.billing_address();
     bid = (bid != null && typeof bid == 'object') ? bid.id() : bid;
 
-	var mid = patron.mailing_address();
+ var mid = patron.mailing_address();
     mid = (mid != null && typeof mid == 'object') ? mid.id() : mid;
 
 
-	/* -----------------------------------------------------------------------
-		if we're deleting a billing or mailing address 
-		make sure some other address is automatically
-		assigned as the billing or mailng address 
-		----------------------------------------------------------------------- */
-
-	if( bid == address.id() ) {
-		for( var a in patron.addresses() ) {
-			var addr = patron.addresses()[a];
-			if(!addr.isdeleted() && addr.id() != address.id()) {
-				var node = uEditFindAddrInput('billing', addr.id());
-				node.checked = true;
-				uEditAddrTypeClick(node, 'billing');
-				break;
-			}
-		}
-	}
-
-	if( mid == address.id() ) {
-		for( var a in patron.addresses() ) {
-			var addr = patron.addresses()[a];
-			if(!addr.isdeleted() && addr.id() != address.id()) {
-				var node = uEditFindAddrInput('mailing', addr.id());
-				node.checked = true;
-				uEditAddrTypeClick(node, 'mailing');
-				break;
-			}
-		}
-	}
+ /* -----------------------------------------------------------------------
+  if we're deleting a billing or mailing address 
+  make sure some other address is automatically
+  assigned as the billing or mailng address 
+  ----------------------------------------------------------------------- */
+
+ if( bid == address.id() ) {
+  for( var a in patron.addresses() ) {
+   var addr = patron.addresses()[a];
+   if(!addr.isdeleted() && addr.id() != address.id()) {
+    var node = uEditFindAddrInput('billing', addr.id());
+    node.checked = true;
+    uEditAddrTypeClick(node, 'billing');
+    break;
+   }
+  }
+ }
+
+ if( mid == address.id() ) {
+  for( var a in patron.addresses() ) {
+   var addr = patron.addresses()[a];
+   if(!addr.isdeleted() && addr.id() != address.id()) {
+    var node = uEditFindAddrInput('mailing', addr.id());
+    node.checked = true;
+    uEditAddrTypeClick(node, 'mailing');
+    break;
+   }
+  }
+ }
 
 }
 
@@ -638,17 +638,17 @@ function uEditApproveAddr( tbody, row, address ) {
             var oldId = r.getResultObject();
             if(oldId != null) {
                 // remove the replaced address 
-		        patron.addresses(
-			        grep( patron.addresses(), 
-				        function(i) { return (i.id() != oldId); }
-			        )
-		        );
+          patron.addresses(
+           grep( patron.addresses(), 
+            function(i) { return (i.id() != oldId); }
+           )
+          );
                 // update the ID on the new address
                 address.id(oldId);
                 address.replaces(null);
                 address.pending('f');
                 removeChildren($('ue_address_tbody'));
-	            uEditBuildAddrs(patron);
+             uEditBuildAddrs(patron);
             }
         }
     );
@@ -657,31 +657,31 @@ function uEditApproveAddr( tbody, row, address ) {
 
 
 function uEditFindAddrInput(type, id) {
-	var tbody = $('ue_address_tbody');
-	var rows = tbody.getElementsByTagName('tr');
-	for( var r in rows ) {
-		var row = rows[r];
-		if(row.parentNode != tbody) continue;
-		var node = $n(row, 'ue_addr_'+type+'_yes');
-		if( node.getAttribute('address') == id )
-			return node;
-	}
+ var tbody = $('ue_address_tbody');
+ var rows = tbody.getElementsByTagName('tr');
+ for( var r in rows ) {
+  var row = rows[r];
+  if(row.parentNode != tbody) continue;
+  var node = $n(row, 'ue_addr_'+type+'_yes');
+  if( node.getAttribute('address') == id )
+   return node;
+ }
 }
 
 
 function uEditAddrTypeClick(input, type) {
-	var tbody = $('ue_address_tbody');
-	var rows = tbody.getElementsByTagName('tr');
-	for( var r in rows ) {
-		var row = rows[r];
-		if(row.parentNode != tbody) continue;
-		var node = $n(row, 'ue_addr_'+type+'_yes');
-		removeCSSClass(node.parentNode,'addr_info_checked');
-	}
-
-	addCSSClass(input.parentNode,'addr_info_checked');
-	patron[type+'_address'](input.getAttribute('address'));
-	patron.ischanged(1);
+ var tbody = $('ue_address_tbody');
+ var rows = tbody.getElementsByTagName('tr');
+ for( var r in rows ) {
+  var row = rows[r];
+  if(row.parentNode != tbody) continue;
+  var node = $n(row, 'ue_addr_'+type+'_yes');
+  removeCSSClass(node.parentNode,'addr_info_checked');
+ }
+
+ addCSSClass(input.parentNode,'addr_info_checked');
+ patron[type+'_address'](input.getAttribute('address'));
+ patron.ischanged(1);
 }
 
 
@@ -690,12 +690,12 @@ function uEditAddrTypeClick(input, type) {
 /* Creates the field entries for an address object. */
 function uEditBuildAddrFields(patron, address) {
 
-	var tbody = $('ue_address_tbody');
+ var tbody = $('ue_address_tbody');
 
-	var row	= tbody.appendChild(
-		uEditAddrTemplate.cloneNode(true));
+ var row = tbody.appendChild(
+  uEditAddrTemplate.cloneNode(true));
 
-	uEditCheckSharedAddr(patron, address, tbody, row);
+ uEditCheckSharedAddr(patron, address, tbody, row);
     
     // see if this is a pending address
     if( isTrue(address.pending()) ) {
@@ -719,271 +719,271 @@ function uEditBuildAddrFields(patron, address) {
         }
     }
 
-	$n(row, 'ue_addr_delete').onclick = 
-		function() { 
-			uEditDeleteAddr(tbody, row, address); 
-			uEditCheckErrors();
-		};
-
-	if( patron.billing_address() &&
-			address.id() == patron.billing_address().id() ) 
-		$n(row, 'ue_addr_billing_yes').checked = true;
-
-	if( patron.mailing_address() &&
-			address.id() == patron.mailing_address().id() ) 
-		$n(row, 'ue_addr_mailing_yes').checked = true;
-
-	$n(row, 'ue_addr_billing_yes').setAttribute('address', address.id());
-	$n(row, 'ue_addr_mailing_yes').setAttribute('address', address.id());
-
-	/* currently, non-owners cannot edit an address */
-	var disabled = (address.usr() != patron.id())
-
-	var fields = [
-		{ 
-			required : false,
-			object	: address, 
-			key		: 'address_type', 
-			widget	: {
-				base	: row,
-				name	: 'ue_addr_label',
-				type	: 'input',
-				disabled : disabled,
-			}
-		},
-		{ 
-			required : true,
-			object	: address, 
-			key		: 'street1', 
-			errkey	: 'ue_bad_addr_street',
-			widget	: {
-				base	: row,
-				name	: 'ue_addr_street1',
-				type	: 'input',
-				disabled : disabled,
-			}
-		},
-		{ 
-			required : false,
-			object	: address, 
-			key		: 'street2', 
-			errkey	: 'ue_bad_addr_street',
-			widget	: {
-				base	: row,
-				name	: 'ue_addr_street2',
-				type	: 'input',
-				disabled : disabled,
-			}
-		},
-		{ 
-			required : true,
-			object	: address, 
-			key		: 'city', 
-			errkey	: 'ue_bad_addr_city',
-			widget	: {
-				base	: row,
-				name	: 'ue_addr_city',
-				type	: 'input',
-				disabled : disabled,
-			}
-		},
-		{ 
-			required : false,
-			object	: address, 
-			key		: 'county', 
-			widget	: {
-				base	: row,
-				name	: 'ue_addr_county',
-				type	: 'input',
-				disabled : disabled,
-			}
-		},
-		{ 
-			required : true,
-			object	: address, 
-			key		: 'state', 
-			errkey	: 'ue_bad_addr_state',
-			widget	: {
-				base	: row,
-				name	: 'ue_addr_state',
-				type	: 'input',
-				disabled : disabled,
-			}
-		},
-		{ 
-			required : true,
-			object	: address, 
-			key		: 'country', 
-			errkey	: 'ue_bad_addr_country',
-			widget	: {
-				base	: row,
-				name	: 'ue_addr_country',
-				type	: 'input',
-				disabled : disabled,
-			}
-		},
-		{ 
-			required : true,
-			object	: address, 
-			key		: 'post_code',
-			errkey	: 'ue_bad_addr_zip',
-			widget	: {
-				base	: row,
-				name	: 'ue_addr_zip',
-				type	: 'input',
-				disabled : disabled,
-				regex	: zipRegex,
-				onblur : function(f) {
-					var v = uEditNodeVal(f);
-					var req = new Request(ZIP_SEARCH, v);
-					req.callback( 
-						function(r) {
-							var info = r.getResultObject();
-							if(!info) return;
-							var state = $n(f.widget.base, 'ue_addr_state');
-							var county = $n(f.widget.base, 'ue_addr_county');
-							var city = $n(f.widget.base, 'ue_addr_city');
-							state.value = info.state;
-							state.onchange();
-							county.value = info.county;
-							county.onchange();
-							city.value = info.city;
-							city.onchange();
-						}
-					);
-					req.send();
-				}
-			}
-		},
-		{ 
-			required : false,
-			object	: address, 
-			key		: 'within_city_limits',
-			widget	: {
-				base	: row,
-				name	: 'ue_addr_inc_yes',
-				type	: 'checkbox',
-				disabled : disabled,
-			}
-		},
-		{ 
-			required : false,
-			object	: address, 
-			key		: 'valid',
-			widget	: {
-				base	: row,
-				name	: 'ue_addr_valid_yes',
-				type	: 'checkbox',
-				disabled : disabled,
-			}
-		}
-	];
-
-	for( var f in fields ) {
-		dataFields.push(fields[f]);
-		uEditActivateField(fields[f]);
-	}
+ $n(row, 'ue_addr_delete').onclick = 
+  function() { 
+   uEditDeleteAddr(tbody, row, address); 
+   uEditCheckErrors();
+  };
+
+ if( patron.billing_address() &&
+   address.id() == patron.billing_address().id() ) 
+  $n(row, 'ue_addr_billing_yes').checked = true;
+
+ if( patron.mailing_address() &&
+   address.id() == patron.mailing_address().id() ) 
+  $n(row, 'ue_addr_mailing_yes').checked = true;
+
+ $n(row, 'ue_addr_billing_yes').setAttribute('address', address.id());
+ $n(row, 'ue_addr_mailing_yes').setAttribute('address', address.id());
+
+ /* currently, non-owners cannot edit an address */
+ var disabled = (address.usr() != patron.id())
+
+ var fields = [
+  { 
+   required : false,
+   object : address, 
+   key  : 'address_type', 
+   widget : {
+    base : row,
+    name : 'ue_addr_label',
+    type : 'input',
+    disabled : disabled,
+   }
+  },
+  { 
+   required : true,
+   object : address, 
+   key  : 'street1', 
+   errkey : 'ue_bad_addr_street',
+   widget : {
+    base : row,
+    name : 'ue_addr_street1',
+    type : 'input',
+    disabled : disabled,
+   }
+  },
+  { 
+   required : false,
+   object : address, 
+   key  : 'street2', 
+   errkey : 'ue_bad_addr_street',
+   widget : {
+    base : row,
+    name : 'ue_addr_street2',
+    type : 'input',
+    disabled : disabled,
+   }
+  },
+  { 
+   required : true,
+   object : address, 
+   key  : 'city', 
+   errkey : 'ue_bad_addr_city',
+   widget : {
+    base : row,
+    name : 'ue_addr_city',
+    type : 'input',
+    disabled : disabled,
+   }
+  },
+  { 
+   required : false,
+   object : address, 
+   key  : 'county', 
+   widget : {
+    base : row,
+    name : 'ue_addr_county',
+    type : 'input',
+    disabled : disabled,
+   }
+  },
+  { 
+   required : true,
+   object : address, 
+   key  : 'state', 
+   errkey : 'ue_bad_addr_state',
+   widget : {
+    base : row,
+    name : 'ue_addr_state',
+    type : 'input',
+    disabled : disabled,
+   }
+  },
+  { 
+   required : true,
+   object : address, 
+   key  : 'country', 
+   errkey : 'ue_bad_addr_country',
+   widget : {
+    base : row,
+    name : 'ue_addr_country',
+    type : 'input',
+    disabled : disabled,
+   }
+  },
+  { 
+   required : true,
+   object : address, 
+   key  : 'post_code',
+   errkey : 'ue_bad_addr_zip',
+   widget : {
+    base : row,
+    name : 'ue_addr_zip',
+    type : 'input',
+    disabled : disabled,
+    regex : zipRegex,
+    onblur : function(f) {
+     var v = uEditNodeVal(f);
+     var req = new Request(ZIP_SEARCH, v);
+     req.callback( 
+      function(r) {
+       var info = r.getResultObject();
+       if(!info) return;
+       var state = $n(f.widget.base, 'ue_addr_state');
+       var county = $n(f.widget.base, 'ue_addr_county');
+       var city = $n(f.widget.base, 'ue_addr_city');
+       state.value = info.state;
+       state.onchange();
+       county.value = info.county;
+       county.onchange();
+       city.value = info.city;
+       city.onchange();
+      }
+     );
+     req.send();
+    }
+   }
+  },
+  { 
+   required : false,
+   object : address, 
+   key  : 'within_city_limits',
+   widget : {
+    base : row,
+    name : 'ue_addr_inc_yes',
+    type : 'checkbox',
+    disabled : disabled,
+   }
+  },
+  { 
+   required : false,
+   object : address, 
+   key  : 'valid',
+   widget : {
+    base : row,
+    name : 'ue_addr_valid_yes',
+    type : 'checkbox',
+    disabled : disabled,
+   }
+  }
+ ];
+
+ for( var f in fields ) {
+  dataFields.push(fields[f]);
+  uEditActivateField(fields[f]);
+ }
 }
 
 function uEditBuildPatronSCM(patron) {
-	/* get the list of pre-defined maps */
-	var fields = uEditFindFieldsByKey('stat_cat_entry');
-	var map;
-	var newmaps = [];
-
-	/* for each user stat cat, pop it off the list,
-	updated the existing stat map field to match
-	the popped map and shove the existing stat
-	map field onto the user's list of stat maps */
-	while( (map = patron.stat_cat_entries().pop()) ) {
-
-		var field = grep(fields, 
-			function(item) {
-				return (item.object.stat_cat() == map.stat_cat());
-			}
-		);
-
-		if(field) {
-			var val = map.stat_cat_entry();
-			field = field[0];
-			$n(field.widget.base, field.widget.name).value = val;
-			setSelector($n(field.widget.base, 'ue_stat_cat_selector'), val );
-			field.object.stat_cat_entry(val);
-			field.object.id(map.id());
-			newmaps.push(field.object);
-		}
-	}
-
-	for( var m in newmaps ) 
-		patron.stat_cat_entries().push(newmaps[m]);
+ /* get the list of pre-defined maps */
+ var fields = uEditFindFieldsByKey('stat_cat_entry');
+ var map;
+ var newmaps = [];
+
+ /* for each user stat cat, pop it off the list,
+ updated the existing stat map field to match
+ the popped map and shove the existing stat
+ map field onto the user's list of stat maps */
+ while( (map = patron.stat_cat_entries().pop()) ) {
+
+  var field = grep(fields, 
+   function(item) {
+    return (item.object.stat_cat() == map.stat_cat());
+   }
+  );
+
+  if(field) {
+   var val = map.stat_cat_entry();
+   field = field[0];
+   $n(field.widget.base, field.widget.name).value = val;
+   setSelector($n(field.widget.base, 'ue_stat_cat_selector'), val );
+   field.object.stat_cat_entry(val);
+   field.object.id(map.id());
+   newmaps.push(field.object);
+  }
+ }
+
+ for( var m in newmaps ) 
+  patron.stat_cat_entries().push(newmaps[m]);
 }
 
 
 function uEditBuildSCMField(statcat, row) {
 
-	var map = new actscecm();
-	map.stat_cat(statcat.id());
-	map.target_usr(patron.id());
-
-	var field = {
-		required : false,
-		object	: map,
-		key		: 'stat_cat_entry',
-		widget	: {
-			base	: row,
-			name	: 'ue_stat_cat_newval',
-			type	: 'input',
-
-			onpostchange : function( field, newval ) {
-
-				/* see if the current map already resides in 
-					the patron entry list */
-				var exists = grep( patron.stat_cat_entries(),
-					function(item) {
-						return (item.stat_cat() == statcat.id()); 
-					}
-				);
-
-				if(newval) {
-					map.isdeleted(0);
-					setSelector($n(row, 'ue_stat_cat_selector'), newval);
-				}
-
-				if(exists) {
-					if(!newval) {
-
-						/* if the map is new but currently contains no value
-							remove it from the set of new maps */
-						if(map.isnew()) {
-							patron.stat_cat_entries(
-								grep( patron.stat_cat_entries(),
-									function(item) {
-										return (item.stat_cat() != map.stat_cat());
-									}
-								)
-							);
-
-						} else {
-							map.isdeleted(1);
-							map.ischanged(0);
-						}
-					} 
-
-				} else {
-
-					/* map does not exist in the map array but now has data */
-					if(newval) { 
-						map.isnew(1);
-						if(!patron.stat_cat_entries())
-							patron.stat_cat_entries([]);
-						patron.stat_cat_entries().push(map);
-					}
-				}
-			}
-		}
-	}
-
-	dataFields.push(field);
+ var map = new actscecm();
+ map.stat_cat(statcat.id());
+ map.target_usr(patron.id());
+
+ var field = {
+  required : false,
+  object : map,
+  key  : 'stat_cat_entry',
+  widget : {
+   base : row,
+   name : 'ue_stat_cat_newval',
+   type : 'input',
+
+   onpostchange : function( field, newval ) {
+
+    /* see if the current map already resides in 
+     the patron entry list */
+    var exists = grep( patron.stat_cat_entries(),
+     function(item) {
+      return (item.stat_cat() == statcat.id()); 
+     }
+    );
+
+    if(newval) {
+     map.isdeleted(0);
+     setSelector($n(row, 'ue_stat_cat_selector'), newval);
+    }
+
+    if(exists) {
+     if(!newval) {
+
+      /* if the map is new but currently contains no value
+       remove it from the set of new maps */
+      if(map.isnew()) {
+       patron.stat_cat_entries(
+        grep( patron.stat_cat_entries(),
+         function(item) {
+          return (item.stat_cat() != map.stat_cat());
+         }
+        )
+       );
+
+      } else {
+       map.isdeleted(1);
+       map.ischanged(0);
+      }
+     } 
+
+    } else {
+
+     /* map does not exist in the map array but now has data */
+     if(newval) { 
+      map.isnew(1);
+      if(!patron.stat_cat_entries())
+       patron.stat_cat_entries([]);
+      patron.stat_cat_entries().push(map);
+     }
+    }
+   }
+  }
+ }
+
+ dataFields.push(field);
 }
 
 
@@ -991,41 +991,41 @@ function uEditBuildSCMField(statcat, row) {
 /** Run this after a new ident type is selected */
 function _uEditIdentPostchange(type, field, newval) {
 
-	if(!newval) return;
-
-	/* When the ident type is changed, we change the
-	regex on the ident_value to match the selected type */
-	var vfname = 'ident_value';
-	if(type == 'secondary') vfname = 'ident_value2';
-	var vfield = uEditFindFieldByKey(vfname);
-	var name = identTypesCache[uEditNodeVal(field)].name();
-
-	hideMe($(type+'_ident_ssn_help'));
-	hideMe($(type+'_ident_dl_help'));
-
-	if(name.match(/ssn/i)) {
-		vfield.widget.regex = ssnRegex;
-		vfield.errkey = 'ue_bad_ident_ssn';
-		unHideMe($(type+'_ident_ssn_help'));
-
-	} else {
-
-		if(name.match(/driver/i)) {
-			vfield.widget.regex = dlRegex;
-			vfield.errkey = 'ue_bad_ident_dl';
-			unHideMe($(type+'_ident_dl_help'));
-			if(!uEditNodeVal(vfield))
-				vfield.widget.node.value = defaultState + '-';
-
-		} else {
-			vfield.widget.regex = null;
-			vfield.errkey = null;
-		}
-	}
-
-	/* focus then valdate the value field */
-	vfield.widget.node.onchange();
-	vfield.widget.node.focus();
+ if(!newval) return;
+
+ /* When the ident type is changed, we change the
+ regex on the ident_value to match the selected type */
+ var vfname = 'ident_value';
+ if(type == 'secondary') vfname = 'ident_value2';
+ var vfield = uEditFindFieldByKey(vfname);
+ var name = identTypesCache[uEditNodeVal(field)].name();
+
+ hideMe($(type+'_ident_ssn_help'));
+ hideMe($(type+'_ident_dl_help'));
+
+ if(name.match(/ssn/i)) {
+  vfield.widget.regex = ssnRegex;
+  vfield.errkey = 'ue_bad_ident_ssn';
+  unHideMe($(type+'_ident_ssn_help'));
+
+ } else {
+
+  if(name.match(/driver/i)) {
+   vfield.widget.regex = dlRegex;
+   vfield.errkey = 'ue_bad_ident_dl';
+   unHideMe($(type+'_ident_dl_help'));
+   if(!uEditNodeVal(vfield))
+    vfield.widget.node.value = defaultState + '-';
+
+  } else {
+   vfield.widget.regex = null;
+   vfield.errkey = null;
+  }
+ }
+
+ /* focus then valdate the value field */
+ vfield.widget.node.onchange();
+ vfield.widget.node.focus();
 }
 
 
@@ -1035,80 +1035,80 @@ function _uEditIdentPostchange(type, field, newval) {
 
 function uEditCheckSharedAddr(patron, address, tbody, row) {
 
-	if( address.isnew() || (patron.isnew() && !clone) ) return;
-
-	var req = new Request(FETCH_ADDR_MEMS, SESSION, address.id());
-	req.callback( 
-		function(r) {
-
-			var members = r.getResultObject();
-			var shared = false;
-
-			for( var m in members ) {
-				var id = members[m];
-
-				if( id != patron.id() ) {
-
-					addCSSClass(row.getElementsByTagName('table')[0], 'shared_address');
-					unHideMe($n(row, 'shared_row'));
-					$n(row, 'ue_addr_delete').disabled = true;
-
-					if( address.usr() != patron.id() ) {
-						var button = $n(row, 'ue_addr_detach');
-						unHideMe(button);
-						button.onclick = 
-							function() { uEditDeleteAddr( tbody, row, address, true ); }
-					}
-
-					shared = true;
-					break;
-				}
-			}
-
-			if( shared ) {
-
-				/* if this is a shared address, set the owner field and 
-					give the staff a chance to edit the owner if it's not this user */
-
-				var nnode = $n(row, 'addr_owner_name');
-				var link = $n(row, 'addr_owner');
-				var id = address.usr();
-			
-				if( id == patron.id() ) {
-			
-					nnode.appendChild(text(
-						patron.first_given_name() + ' ' + patron.family_name()));
-					hideMe($n(row, 'owner_link_div'));
-			
-				} else {
-			
-					var ses = cgi.param('ses'); 
-					if (xulG) if (xulG.ses) ses = xulG.ses;
-					if (xulG) if (xulG.params) if (xulG.params.ses) ses = xulG.params.ses;
-					link.onclick = 
-						function() { window.xulG.spawn_editor({ses:ses,usr:id}) };
-				
-					if( userCache[id] ) {
+ if( address.isnew() || (patron.isnew() && !clone) ) return;
+
+ var req = new Request(FETCH_ADDR_MEMS, SESSION, address.id());
+ req.callback( 
+  function(r) {
+
+   var members = r.getResultObject();
+   var shared = false;
+
+   for( var m in members ) {
+    var id = members[m];
+
+    if( id != patron.id() ) {
+
+     addCSSClass(row.getElementsByTagName('table')[0], 'shared_address');
+     unHideMe($n(row, 'shared_row'));
+     $n(row, 'ue_addr_delete').disabled = true;
+
+     if( address.usr() != patron.id() ) {
+      var button = $n(row, 'ue_addr_detach');
+      unHideMe(button);
+      button.onclick = 
+       function() { uEditDeleteAddr( tbody, row, address, true ); }
+     }
+
+     shared = true;
+     break;
+    }
+   }
+
+   if( shared ) {
+
+    /* if this is a shared address, set the owner field and 
+     give the staff a chance to edit the owner if it's not this user */
+
+    var nnode = $n(row, 'addr_owner_name');
+    var link = $n(row, 'addr_owner');
+    var id = address.usr();
+   
+    if( id == patron.id() ) {
+   
+     nnode.appendChild(text(
+      patron.first_given_name() + ' ' + patron.family_name()));
+     hideMe($n(row, 'owner_link_div'));
+   
+    } else {
+   
+     var ses = cgi.param('ses'); 
+     if (xulG) if (xulG.ses) ses = xulG.ses;
+     if (xulG) if (xulG.params) if (xulG.params.ses) ses = xulG.params.ses;
+     link.onclick = 
+      function() { window.xulG.spawn_editor({ses:ses,usr:id}) };
+    
+     if( userCache[id] ) {
                         var usr = userCache[id];
-						nnode.appendChild(text(
-							usr.first_given_name() + ' ' +  usr.family_name()));
-				
-					} else {
-				
-						fetchFleshedUser( id, 
-							function(usr) {
-								userCache[usr.id()] = usr;
-								nnode.appendChild(text(
-									usr.first_given_name() + ' ' + usr.family_name()));
-							}
-						);
-					}
-				}
-			}
-		}
-	);
-
-	req.send();
+      nnode.appendChild(text(
+       usr.first_given_name() + ' ' +  usr.family_name()));
+    
+     } else {
+    
+      fetchFleshedUser( id, 
+       function(usr) {
+        userCache[usr.id()] = usr;
+        nnode.appendChild(text(
+         usr.first_given_name() + ' ' + usr.family_name()));
+       }
+      );
+     }
+    }
+   }
+  }
+ );
+
+ req.send();
 }
 
 
@@ -1117,7 +1117,7 @@ function uEditCheckSharedAddr(patron, address, tbody, row) {
 var __lastdob;
 function uEditCheckDOB(field) {
 
-	var dob = uEditNodeVal(field);
+ var dob = uEditNodeVal(field);
     var ident_field = uEditFindFieldByKey('ident_value2');
 
     if(dob) {
@@ -1153,7 +1153,7 @@ function uEditCheckDOB(field) {
         unHideMe(ident_field.widget.node.parentNode.parentNode.parentNode);
         if( dob < base ) { /* patron is of age */
             ident_field.required = false;
-	        uEditFindFieldByKey('juvenile').widget.node.checked = false;
+         uEditFindFieldByKey('juvenile').widget.node.checked = false;
             if(!uEditNodeVal(ident_field))
                 hideMe(ident_field.widget.node.parentNode.parentNode.parentNode);
             return;
@@ -1170,9 +1170,9 @@ function uEditCheckDOB(field) {
 
     unHideMe(ident_field.widget.node.parentNode.parentNode.parentNode);
     if(!uEditFindFieldByKey('juvenile').widget.node.checked)
-	    uEditFindFieldByKey('juvenile').widget.node.checked = true;
-	ident_field.required = true;
-	uEditCheckErrors();
+     uEditFindFieldByKey('juvenile').widget.node.checked = true;
+ ident_field.required = true;
+ uEditCheckErrors();
 }
 
 
diff --git a/Open-ILS/xul/staff_client/server/patron/ue_ui.js b/Open-ILS/xul/staff_client/server/patron/ue_ui.js
index afa17ca67e..58da868c91 100644
--- a/Open-ILS/xul/staff_client/server/patron/ue_ui.js
+++ b/Open-ILS/xul/staff_client/server/patron/ue_ui.js
@@ -1,46 +1,46 @@
 /* -----------------------------------------------------------------------
-	UI code for the user editor.  Handles breaking up the components
-	into a wizard-like interface.
-	----------------------------------------------------------------------- */
+ UI code for the user editor.  Handles breaking up the components
+ into a wizard-like interface.
+ ----------------------------------------------------------------------- */
 
 
 var pages = [ 
-	'uedit_userid', 
-	'uedit_contact_info', 
-	'uedit_addresses', 
-	'uedit_groups', 
-	'uedit_stat_cats', 
-	'uedit_surveys',
-	'uedit_finalize',
-	];
+ 'uedit_userid', 
+ 'uedit_contact_info', 
+ 'uedit_addresses', 
+ 'uedit_groups', 
+ 'uedit_stat_cats', 
+ 'uedit_surveys',
+ 'uedit_finalize',
+ ];
 
 /* ID's of objects that should be focused when their page is made visible */
 var pageFocus = [
-	'ue_barcode',
-	'ue_email',
-	'ue_addr_label_1',
-	'ue_profile',
-	'ue_stat_cat_selector_1',
-	'ue_survey_selector_1',
-	'ue_view_summary'
+ 'ue_barcode',
+ 'ue_email',
+ 'ue_addr_label_1',
+ 'ue_profile',
+ 'ue_stat_cat_selector_1',
+ 'ue_survey_selector_1',
+ 'ue_view_summary'
 ];
 
 
 function uEditNext() {
-	var i = _findActive();
-	if( i < (pages.length - 1)) uEditShowPage(pages[i+1]);
+ var i = _findActive();
+ if( i < (pages.length - 1)) uEditShowPage(pages[i+1]);
 }
 
 
 function uEditPrev() {
-	var i = _findActive();
-	if( i > 0 ) uEditShowPage(pages[i-1]);
+ var i = _findActive();
+ if( i > 0 ) uEditShowPage(pages[i-1]);
 }
 
 function uEditCheckErrors() {
-	var errors = uEditGetErrorStrings();
-	if(errors) unHideMe($('ue_errors'));
-	else hideMe($('ue_errors'));
+ var errors = uEditGetErrorStrings();
+ if(errors) unHideMe($('ue_errors'));
+ else hideMe($('ue_errors'));
 }
 
 /*
@@ -48,51 +48,51 @@ function uEditFetchError(id) { if($(id)) return $(id).innerHTML + "\n"; return "
 */
 
 function uEditShowPage(id) {
-	if( id == null ) return;
+ if( id == null ) return;
 
-	for( var p in pages ) {
-		var page = pages[p];
-		hideMe($(page));
-		removeCSSClass($(page+'_label'), 'label_active');
-	}
+ for( var p in pages ) {
+  var page = pages[p];
+  hideMe($(page));
+  removeCSSClass($(page+'_label'), 'label_active');
+ }
 
-	var idx = _findPageIdx(id);
+ var idx = _findPageIdx(id);
 
-	unHideMe($(id));
-	addCSSClass($(id+'_label'), 'label_active');
-	var fpage = pageFocus[idx];
+ unHideMe($(id));
+ addCSSClass($(id+'_label'), 'label_active');
+ var fpage = pageFocus[idx];
 
-	var pnode = $(fpage);
-	if( id == 'uedit_addresses' ) 
-		pnode = $n( $('ue_address_tbody').
-			getElementsByTagName('tr')[0], 'ue_addr_label');
+ var pnode = $(fpage);
+ if( id == 'uedit_addresses' ) 
+  pnode = $n( $('ue_address_tbody').
+   getElementsByTagName('tr')[0], 'ue_addr_label');
 
-	if(pnode) { 
-		pnode.focus(); 
-		try{pnode.select()}catch(e){} 
-	}
+ if(pnode) { 
+  pnode.focus(); 
+  try{pnode.select()}catch(e){} 
+ }
 
-	unHideMe($('ue_back'));
-	unHideMe($('ue_fwd'));
+ unHideMe($('ue_back'));
+ unHideMe($('ue_fwd'));
 
-	if(idx == 0) hideMe($('ue_back'));
-	if(idx == (pages.length-1)) hideMe($('ue_fwd'));
+ if(idx == 0) hideMe($('ue_back'));
+ if(idx == (pages.length-1)) hideMe($('ue_fwd'));
 }
 
 function _findActive() {
-	for( var p in pages ) {
-		if(! $(pages[p]).className.match(/hide_me/) )
-			return parseInt(p);
-	}
-	return null;
+ for( var p in pages ) {
+  if(! $(pages[p]).className.match(/hide_me/) )
+   return parseInt(p);
+ }
+ return null;
 }
 
 function _findPageIdx(name) {
-	for( var i in pages ) {
-		var page = pages[i];
-		if( page == name ) return i;
-	}
-	return -1;
+ for( var i in pages ) {
+  var page = pages[i];
+  if( page == name ) return i;
+ }
+ return -1;
 }
 
 /* ------------------------------------------------------------------------------ */
@@ -102,202 +102,202 @@ function _findPageIdx(name) {
 
 /* org selector */
 function uEditBuildLibSelector( node, depth, selector ) {
-	if(!selector) selector = $('ue_org_selector');
-	if(!node) { depth = 0; node = globalOrgTree; }
-	var opt = insertSelectorVal( 
-		selector, -1, node.name(), node.id(), null, depth++ );
-	if(!findOrgType(node.ou_type()).can_have_users()) opt.disabled = true; 
-	if( node.id() == USER.ws_ou() ) 
-		setSelector(selector, node.id());
-
-	for( var c in node.children() ) 
-		uEditBuildLibSelector(node.children()[c], depth, selector);
+ if(!selector) selector = $('ue_org_selector');
+ if(!node) { depth = 0; node = globalOrgTree; }
+ var opt = insertSelectorVal( 
+  selector, -1, node.name(), node.id(), null, depth++ );
+ if(!findOrgType(node.ou_type()).can_have_users()) opt.disabled = true; 
+ if( node.id() == USER.ws_ou() ) 
+  setSelector(selector, node.id());
+
+ for( var c in node.children() ) 
+  uEditBuildLibSelector(node.children()[c], depth, selector);
 }
 
 
 /* group tree selector */
 function uEditDrawGroups(tree, depth, selector, drawme) {
-	if(!selector) {
-		selector = $('ue_profile');
-		depth = 0;
-	}
-	groupsCache[tree.id()] = tree;
-
-	/* if the staff does not have perms to access this group, 
-		remove it from the tree and don't add it's children */
-	var perm = uEditFindGroupPerm(tree);
-	var org = PERMS[perm];
-	if( org == -1 ) drawme = false;
-
-	if( drawme ) {
-		var opt = insertSelectorVal( selector, -1, tree.name(), tree.id(), null, depth++ );	
-		if(!isTrue(tree.usergroup())) opt.disabled = true;
-	}
-
-	for( var c in tree.children() ) 
-		uEditDrawGroups( tree.children()[c], depth, selector, drawme );
+ if(!selector) {
+  selector = $('ue_profile');
+  depth = 0;
+ }
+ groupsCache[tree.id()] = tree;
+
+ /* if the staff does not have perms to access this group, 
+  remove it from the tree and don't add it's children */
+ var perm = uEditFindGroupPerm(tree);
+ var org = PERMS[perm];
+ if( org == -1 ) drawme = false;
+
+ if( drawme ) {
+  var opt = insertSelectorVal( selector, -1, tree.name(), tree.id(), null, depth++ ); 
+  if(!isTrue(tree.usergroup())) opt.disabled = true;
+ }
+
+ for( var c in tree.children() ) 
+  uEditDrawGroups( tree.children()[c], depth, selector, drawme );
 }
 
 
 function uEditFindGroupPerm(group) {
-	if(!group) return null;
-	if( group.application_perm() ) 
-		return group.application_perm();
-	return uEditFindGroupPerm(groupsCache[group.parent()]);
+ if(!group) return null;
+ if( group.application_perm() ) 
+  return group.application_perm();
+ return uEditFindGroupPerm(groupsCache[group.parent()]);
 }
 
 
 /* user identification types */
 function uEditDrawIDTypes(types) {
-	var pri_sel = $('ue_primary_ident_type');
-	//var sec_sel = $('ue_secondary_ident_type');
-	var idx = 1;
-	for( var t in types ) {
-		var type = types[t];
-		if(!type.name()) continue;
-		identTypesCache[type.id()] = type;
-		setSelectorVal( pri_sel, idx, type.name(), type.id() );
-		//setSelectorVal( sec_sel, idx++, type.name(), type.id() );
-		idx++;
-	}
+ var pri_sel = $('ue_primary_ident_type');
+ //var sec_sel = $('ue_secondary_ident_type');
+ var idx = 1;
+ for( var t in types ) {
+  var type = types[t];
+  if(!type.name()) continue;
+  identTypesCache[type.id()] = type;
+  setSelectorVal( pri_sel, idx, type.name(), type.id() );
+  //setSelectorVal( sec_sel, idx++, type.name(), type.id() );
+  idx++;
+ }
 }
 
 /* user statistical catagories */
 function uEditDrawStatCats(cats) {
-	var tbody = $('ue_stat_cat_tbody');
-	var templ = tbody.removeChild($('ue_stat_cat_row'));
-
-	for( var c in cats ) {
-		var row = templ.cloneNode(true);
-		uEditInsertCat( row, cats[c], c );
-		tbody.appendChild(row);
-	}
+ var tbody = $('ue_stat_cat_tbody');
+ var templ = tbody.removeChild($('ue_stat_cat_row'));
+
+ for( var c in cats ) {
+  var row = templ.cloneNode(true);
+  uEditInsertCat( row, cats[c], c );
+  tbody.appendChild(row);
+ }
 }
 
 
 function uEditInsertCat( row, cat, idx ) {
 
-	cat.entries().sort(  /* sort the entries by value */
-		function( a, b ) { 
-			if( !a.value() ) return -1;
-			if( !b.value() ) return 1;
-			if( (a.value()+'').toLowerCase() > (b.value()+'').toLowerCase()) return 1;
-			if( (a.value()+'').toLowerCase() < (b.value()+'').toLowerCase()) return -1;
-			return 0;
-		}
-	);
+ cat.entries().sort(  /* sort the entries by value */
+  function( a, b ) { 
+   if( !a.value() ) return -1;
+   if( !b.value() ) return 1;
+   if( (a.value()+'').toLowerCase() > (b.value()+'').toLowerCase()) return 1;
+   if( (a.value()+'').toLowerCase() < (b.value()+'').toLowerCase()) return -1;
+   return 0;
+  }
+ );
 
-	statCatsCache[cat.id()] = cat;
+ statCatsCache[cat.id()] = cat;
 
-	/* register the new map object */
-	uEditBuildSCMField(cat, row);
+ /* register the new map object */
+ uEditBuildSCMField(cat, row);
 
-	var newval = $n(row, 'ue_stat_cat_newval');
-	var selector = $n(row, 'ue_stat_cat_selector');
+ var newval = $n(row, 'ue_stat_cat_newval');
+ var selector = $n(row, 'ue_stat_cat_selector');
 
-	selector.onchange = function() { 
-		newval.value = getSelectorVal(selector);
-		if(newval.onchange) newval.onchange();
-	}
+ selector.onchange = function() { 
+  newval.value = getSelectorVal(selector);
+  if(newval.onchange) newval.onchange();
+ }
 
-	if( idx == 0 ) selector.id = 'ue_stat_cat_selector_1'; 
+ if( idx == 0 ) selector.id = 'ue_stat_cat_selector_1'; 
 
-	$n(row, 'ue_stat_cat_name').appendChild(text(cat.name()));
-	$n(row, 'ue_stat_cat_owner').appendChild(
-		text(fetchOrgUnit(cat.owner()).shortname()));
+ $n(row, 'ue_stat_cat_name').appendChild(text(cat.name()));
+ $n(row, 'ue_stat_cat_owner').appendChild(
+  text(fetchOrgUnit(cat.owner()).shortname()));
 
-	for( var e in cat.entries() ) {
-		var entry = cat.entries()[e];
-		setSelectorVal( selector, 
-			(parseInt(e)+1), entry.value(), entry.value() );
-	}
+ for( var e in cat.entries() ) {
+  var entry = cat.entries()[e];
+  setSelectorVal( selector, 
+   (parseInt(e)+1), entry.value(), entry.value() );
+ }
 }
 
 /* draw the surveys */
 function uEditDrawSurveys(surveys) {
 
-	var div = $('uedit_surveys');
-	var table = div.removeChild($('ue_survey_table'));
-	if( surveys.length == 0 ) unHideMe($('uedit_no_surveys'));
-
-	for( var s in surveys ) {
-		var survey = surveys[s];
-		surveysCache[survey.id()] = survey;
-		var clone = table.cloneNode(true);
-		uEditInsertSurvey( div, clone, survey, s );
-		div.appendChild(clone);
-	}
+ var div = $('uedit_surveys');
+ var table = div.removeChild($('ue_survey_table'));
+ if( surveys.length == 0 ) unHideMe($('uedit_no_surveys'));
+
+ for( var s in surveys ) {
+  var survey = surveys[s];
+  surveysCache[survey.id()] = survey;
+  var clone = table.cloneNode(true);
+  uEditInsertSurvey( div, clone, survey, s );
+  div.appendChild(clone);
+ }
 }
 
 /* insert the servey then insert each of that surveys questions */
 function uEditInsertSurvey( div, table, survey, sidx ) {
 
-	$n(table, 'ue_survey_name').appendChild(text(survey.name()));
-	$n(table, 'ue_survey_desc').appendChild(text(survey.description()));
+ $n(table, 'ue_survey_name').appendChild(text(survey.name()));
+ $n(table, 'ue_survey_desc').appendChild(text(survey.description()));
 
-	var tbody = $n(table, 'ue_survey_tbody');
-	var templ = tbody.removeChild($n(table, 'ue_survey_row'));
+ var tbody = $n(table, 'ue_survey_tbody');
+ var templ = tbody.removeChild($n(table, 'ue_survey_row'));
 
-	for( var q in survey.questions() ) {
-		var row = templ.cloneNode(true);
-		var quest = survey.questions()[q];
-		uEditInsertSurveyQuestion( row, survey, quest );
-		tbody.appendChild(row);
-	}
+ for( var q in survey.questions() ) {
+  var row = templ.cloneNode(true);
+  var quest = survey.questions()[q];
+  uEditInsertSurveyQuestion( row, survey, quest );
+  tbody.appendChild(row);
+ }
 }
 
 function uEditInsertSurveyQuestion( row, survey, question ) {
 
-	var selector = $n(row, 'ue_survey_answer');
-	row.setAttribute('question', question.id());
-	$n(row, 'ue_survey_question').appendChild(text(question.question()));
+ var selector = $n(row, 'ue_survey_answer');
+ row.setAttribute('question', question.id());
+ $n(row, 'ue_survey_question').appendChild(text(question.question()));
 
-	for( var a in question.answers() ) {
-		var answer = question.answers()[a];
-		surveyAnswersCache[answer.id()] = answer;
-		insertSelectorVal(selector, -1, answer.answer(), answer.id() );
-	}
+ for( var a in question.answers() ) {
+  var answer = question.answers()[a];
+  surveyAnswersCache[answer.id()] = answer;
+  insertSelectorVal(selector, -1, answer.answer(), answer.id() );
+ }
 
-	surveyQuestionsCache[question.id()] = question;
+ surveyQuestionsCache[question.id()] = question;
 
-	if( patron.isnew() && isTrue(survey.required()) ) 
-		addCSSClass(selector, 'invalid_value');
+ if( patron.isnew() && isTrue(survey.required()) ) 
+  addCSSClass(selector, 'invalid_value');
 
-	selector.onchange = function() {
+ selector.onchange = function() {
 
-		/* remove any existing responses for this survey */
-		patron.survey_responses(
-			grep( patron.survey_responses(),
-				function(item) {
-					return (item.survey() != survey.id());
-				}
-			)
-		);
+  /* remove any existing responses for this survey */
+  patron.survey_responses(
+   grep( patron.survey_responses(),
+    function(item) {
+     return (item.survey() != survey.id());
+    }
+   )
+  );
 
 
-		if(!patron.survey_responses())
-			patron.survey_responses([]);
+  if(!patron.survey_responses())
+   patron.survey_responses([]);
 
-		var val = getSelectorVal(selector);
+  var val = getSelectorVal(selector);
 
-		if( patron.isnew() && isTrue(survey.required()) ) {
-			if(val)
-				removeCSSClass(selector, 'invalid_value');
-			else 
-				addCSSClass(selector, 'invalid_value');
-			uEditCheckErrors();
-		}
+  if( patron.isnew() && isTrue(survey.required()) ) {
+   if(val)
+    removeCSSClass(selector, 'invalid_value');
+   else 
+    addCSSClass(selector, 'invalid_value');
+   uEditCheckErrors();
+  }
 
-		if(!val) return;
+  if(!val) return;
 
-		var resp	= new asvr();
-		resp.isnew(1);
-		resp.survey(survey.id());
-		resp.usr(patron.id());
-		resp.question(row.getAttribute('question'));
-		resp.answer(val);
-		patron.survey_responses().push( resp );
-	}
+  var resp = new asvr();
+  resp.isnew(1);
+  resp.survey(survey.id());
+  resp.usr(patron.id());
+  resp.question(row.getAttribute('question'));
+  resp.answer(val);
+  patron.survey_responses().push( resp );
+ }
 }
 
 
@@ -305,41 +305,41 @@ function uEditInsertSurveyQuestion( row, survey, question ) {
 
 
 /* -----------------------------------------------------------------------
-	Spit out the patron info to the summary display tables...
-	----------------------------------------------------------------------- */
+ Spit out the patron info to the summary display tables...
+ ----------------------------------------------------------------------- */
 
 function uEditShowSummary() {
-	hideMe($('main_div_container'));
-	unHideMe($('summary_div_container'));
+ hideMe($('main_div_container'));
+ unHideMe($('summary_div_container'));
 
-	for( var f in dataFields ) {
+ for( var f in dataFields ) {
 
-		var field = dataFields[f];
-		if( field.object == patron ) {
+  var field = dataFields[f];
+  if( field.object == patron ) {
 
-			var val = uEditNodeVal(field);
+   var val = uEditNodeVal(field);
 
-			if(	field.key == 'profile'		||
-					field.key == 'home_ou'		||
-					field.key == 'ident_type'	||
-					field.key == 'ident_type2') {
+   if( field.key == 'profile'  ||
+     field.key == 'home_ou'  ||
+     field.key == 'ident_type' ||
+     field.key == 'ident_type2') {
 
-				val = getSelectorName($(field.widget.id));
-			}
+    val = getSelectorName($(field.widget.id));
+   }
 
-			var node = $('ue_summary_'+field.key);
-			if(node) appendClear(node, text(val));
-		}
+   var node = $('ue_summary_'+field.key);
+   if(node) appendClear(node, text(val));
+  }
 
-		if( field.object == patron.card() )
-			appendClear($('ue_summary_barcode'), text(uEditNodeVal(field)));
+  if( field.object == patron.card() )
+   appendClear($('ue_summary_barcode'), text(uEditNodeVal(field)));
 
-	}
+ }
 
-	var table = $('ue_summary_table');
-	uEditFleshSummaryAddresses( table, patron );
-	uEditFleshSummaryStatCats( table, patron );
-	uEditFleshSummarySurveys( table, patron );
+ var table = $('ue_summary_table');
+ uEditFleshSummaryAddresses( table, patron );
+ uEditFleshSummaryStatCats( table, patron );
+ uEditFleshSummarySurveys( table, patron );
 }
 
 
@@ -347,76 +347,76 @@ function uEditShowSummary() {
 var uEditSummaryAddrRow;
 function uEditFleshSummaryAddresses( table, patron ) {
 
-	var addrtbody = $n(table, 'ue_summary_addr_tbody');
-	if(!uEditSummaryAddrRow)
-		uEditSummaryAddrRow = 
-			addrtbody.removeChild($n(addrtbody, 'ue_summary_addr_row'));
-	var rowtmpl = uEditSummaryAddrRow;
-	removeChildren(addrtbody);
-
-	for( var a in patron.addresses() ) {
-		var address = patron.addresses()[a];
-		var row = rowtmpl.cloneNode(true);
-		uEditFleshSummaryAddr( address, patron, row );
-		addrtbody.appendChild(row);
-		if(address.isdeleted()) addCSSClass(row, 'deleted');
-	}
+ var addrtbody = $n(table, 'ue_summary_addr_tbody');
+ if(!uEditSummaryAddrRow)
+  uEditSummaryAddrRow = 
+   addrtbody.removeChild($n(addrtbody, 'ue_summary_addr_row'));
+ var rowtmpl = uEditSummaryAddrRow;
+ removeChildren(addrtbody);
+
+ for( var a in patron.addresses() ) {
+  var address = patron.addresses()[a];
+  var row = rowtmpl.cloneNode(true);
+  uEditFleshSummaryAddr( address, patron, row );
+  addrtbody.appendChild(row);
+  if(address.isdeleted()) addCSSClass(row, 'deleted');
+ }
 }
 
 
 function uEditFleshSummaryAddr( address, patron, row ) {
-	var yes = $('yes').innerHTML;
-	var no = $('no').innerHTML;
-
-	$n(row, 'label').appendChild(text(address.address_type()));
-	$n(row, 'street1').appendChild(text(address.street1()));
-	$n(row, 'street2').appendChild(text(address.street2()));
-	$n(row, 'city').appendChild(text(address.city()));
-	$n(row, 'county').appendChild(text(address.county()));
-	$n(row, 'state').appendChild(text(address.state()));
-	$n(row, 'country').appendChild(text(address.country()));
-	$n(row, 'zip').appendChild(text(address.post_code()));
-	$n(row, 'valid').appendChild(text( (isTrue(address.valid())) ? yes : no ));
-	$n(row, 'incorporated').appendChild(text( (isTrue(address.within_city_limits())) ? yes : no ));
-
-	var mid = patron.mailing_address();
-	if( typeof patron.mailing_address() == 'object' ) 
-		mid = patron.mailing_address().id();
-	$n(row, 'mailing').appendChild(text((mid == address.id()) ? yes : no ));
-
-	var bid = patron.billing_address();
-	if( typeof patron.billing_address() == 'object' ) 
-		bid = patron.billing_address().id();
-	$n(row, 'billing').appendChild(text((bid == address.id()) ? yes : no ));
+ var yes = $('yes').innerHTML;
+ var no = $('no').innerHTML;
+
+ $n(row, 'label').appendChild(text(address.address_type()));
+ $n(row, 'street1').appendChild(text(address.street1()));
+ $n(row, 'street2').appendChild(text(address.street2()));
+ $n(row, 'city').appendChild(text(address.city()));
+ $n(row, 'county').appendChild(text(address.county()));
+ $n(row, 'state').appendChild(text(address.state()));
+ $n(row, 'country').appendChild(text(address.country()));
+ $n(row, 'zip').appendChild(text(address.post_code()));
+ $n(row, 'valid').appendChild(text( (isTrue(address.valid())) ? yes : no ));
+ $n(row, 'incorporated').appendChild(text( (isTrue(address.within_city_limits())) ? yes : no ));
+
+ var mid = patron.mailing_address();
+ if( typeof patron.mailing_address() == 'object' ) 
+  mid = patron.mailing_address().id();
+ $n(row, 'mailing').appendChild(text((mid == address.id()) ? yes : no ));
+
+ var bid = patron.billing_address();
+ if( typeof patron.billing_address() == 'object' ) 
+  bid = patron.billing_address().id();
+ $n(row, 'billing').appendChild(text((bid == address.id()) ? yes : no ));
 }
 
 
 
 var uEditSummaryStatCatRow;
 function uEditFleshSummaryStatCats( table, patron ) {
-	var tbody = $n(table, 'ue_summary_stats_tbody');
-
-	if(!uEditSummaryStatCatRow)
-		uEditSummaryStatCatRow = 
-			tbody.removeChild($n(tbody, 'ue_summary_stats_row'));
-	var rowtmpl = uEditSummaryStatCatRow;
-	removeChildren(tbody);
-
-	for( var s in patron.stat_cat_entries() ) {
-		row = rowtmpl.cloneNode(true);
-		var entry = patron.stat_cat_entries()[s];
-		var cat = statCatsCache[entry.stat_cat()];
-		$n(row, 'ue_summary_stat_name').appendChild(text(cat.name()));
-		$n(row, 'ue_summary_stat_value').appendChild(text(entry.stat_cat_entry()));
-		row.setAttribute('statcat', entry.stat_cat());
-		if( entry.isdeleted() ) addCSSClass(row, 'deleted'); 
-		tbody.appendChild(row);
-	}
-
-	if( ! getElementsByTagNameFlat( tbody, 'tr' )[0] )
-		hideMe(tbody.parentNode);
-	else
-		unHideMe(tbody.parentNode);
+ var tbody = $n(table, 'ue_summary_stats_tbody');
+
+ if(!uEditSummaryStatCatRow)
+  uEditSummaryStatCatRow = 
+   tbody.removeChild($n(tbody, 'ue_summary_stats_row'));
+ var rowtmpl = uEditSummaryStatCatRow;
+ removeChildren(tbody);
+
+ for( var s in patron.stat_cat_entries() ) {
+  row = rowtmpl.cloneNode(true);
+  var entry = patron.stat_cat_entries()[s];
+  var cat = statCatsCache[entry.stat_cat()];
+  $n(row, 'ue_summary_stat_name').appendChild(text(cat.name()));
+  $n(row, 'ue_summary_stat_value').appendChild(text(entry.stat_cat_entry()));
+  row.setAttribute('statcat', entry.stat_cat());
+  if( entry.isdeleted() ) addCSSClass(row, 'deleted'); 
+  tbody.appendChild(row);
+ }
+
+ if( ! getElementsByTagNameFlat( tbody, 'tr' )[0] )
+  hideMe(tbody.parentNode);
+ else
+  unHideMe(tbody.parentNode);
 }
 
 
@@ -424,41 +424,41 @@ function uEditFleshSummaryStatCats( table, patron ) {
 var uEditSummarySurveyRow;
 function uEditFleshSummarySurveys( table, patron ) {
 
-	var tbody	= $n(table, 'ue_summary_survey_tbody');
-	if(!uEditSummarySurveyRow)
-		uEditSummarySurveyRow = 
-			tbody.removeChild($n(tbody, 'ue_summary_survey_row'));
-	var rowtmpl = uEditSummarySurveyRow;
-
-	removeChildren(tbody);
-
-	for( var r in patron.survey_responses() ) {
-		var row		= rowtmpl.cloneNode(true);
-		var resp		= patron.survey_responses()[r];
-		var survey	= surveysCache[resp.survey()];
-		var quest	= surveyQuestionsCache[resp.question()];
-		var answer	= surveyAnswersCache[resp.answer()];
-		$n(row, 'ue_summary_survey_name').appendChild(text(survey.name()));
-		$n(row, 'ue_summary_survey_question').appendChild(text(quest.question()));
-		$n(row, 'ue_summary_survey_answer').appendChild(text(answer.answer()));
-		tbody.appendChild(row);
-	}
-
-	if( ! getElementsByTagNameFlat(tbody, 'tr')[0])
-		hideMe(tbody.parentNode);
-	else
-		unHideMe(tbody.parentNode);
+ var tbody = $n(table, 'ue_summary_survey_tbody');
+ if(!uEditSummarySurveyRow)
+  uEditSummarySurveyRow = 
+   tbody.removeChild($n(tbody, 'ue_summary_survey_row'));
+ var rowtmpl = uEditSummarySurveyRow;
+
+ removeChildren(tbody);
+
+ for( var r in patron.survey_responses() ) {
+  var row  = rowtmpl.cloneNode(true);
+  var resp  = patron.survey_responses()[r];
+  var survey = surveysCache[resp.survey()];
+  var quest = surveyQuestionsCache[resp.question()];
+  var answer = surveyAnswersCache[resp.answer()];
+  $n(row, 'ue_summary_survey_name').appendChild(text(survey.name()));
+  $n(row, 'ue_summary_survey_question').appendChild(text(quest.question()));
+  $n(row, 'ue_summary_survey_answer').appendChild(text(answer.answer()));
+  tbody.appendChild(row);
+ }
+
+ if( ! getElementsByTagNameFlat(tbody, 'tr')[0])
+  hideMe(tbody.parentNode);
+ else
+  unHideMe(tbody.parentNode);
 }
 
 
 function uEditDrawNetLevels(netLevels) {
-	var sel = $('ue_net_level');
-	iterate( netLevels, 
-		function(i) {
-			insertSelectorVal( sel, -1, i.name(), i.id() );
-		}
-	);
-	setSelector(sel, defaultNetLevel);
+ var sel = $('ue_net_level');
+ iterate( netLevels, 
+  function(i) {
+   insertSelectorVal( sel, -1, i.name(), i.id() );
+  }
+ );
+ setSelector(sel, defaultNetLevel);
 }
 
 
diff --git a/Open-ILS/xul/staff_client/server/patron/user_buckets.xul b/Open-ILS/xul/staff_client/server/patron/user_buckets.xul
index 8efd29da06..e185a64b8e 100644
--- a/Open-ILS/xul/staff_client/server/patron/user_buckets.xul
+++ b/Open-ILS/xul/staff_client/server/patron/user_buckets.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -19,49 +19,49 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
 <window id="example_template_win" 
-	onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-	<!-- BEHAVIOR -->
+ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
+ <!-- BEHAVIOR -->
         <script type="text/javascript">
-		var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
-	</script>
+  var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};
+ </script>
         <scripts id="openils_util_scripts"/>
 
-	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-	<script>
-	<![CDATA[
-		var patronStrings;
+ <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+ <script>
+ <![CDATA[
+  var patronStrings;
 
-		function $(id) { return document.getElementById(id); }
-		
-		function my_init() {
-			try {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  function $(id) { return document.getElementById(id); }
+  
+  function my_init() {
+   try {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
-				/* load translatable strings for patron interfaces */
+    /* load translatable strings for patron interfaces */
                 patronStrings = document.getElementById('patronStrings');
 
-				if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
-				JSAN.errorLevel = "die"; // none, warn, or die
-				JSAN.addRepository('/xul/server/');
-				JSAN.use('util.error'); g.error = new util.error();
-				g.error.sdump('D_TRACE','my_init() for patron/user_buckets.xul');
+    if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+    JSAN.errorLevel = "die"; // none, warn, or die
+    JSAN.addRepository('/xul/server/');
+    JSAN.use('util.error'); g.error = new util.error();
+    g.error.sdump('D_TRACE','my_init() for patron/user_buckets.xul');
 
-				if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
-					try { window.xulG.set_tab_name(patronStrings.getString('staff.patron.user_buckets.tab_name')); } catch(E) { alert(E); }
-				}
+    if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') {
+     try { window.xulG.set_tab_name(patronStrings.getString('staff.patron.user_buckets.tab_name')); } catch(E) { alert(E); }
+    }
 
-			} catch(E) {
-				try { g.error.standard_unexpected_error_alert('patron/user_buckets.xul',E); } catch(F) { alert(E); }
-			}
-		}
+   } catch(E) {
+    try { g.error.standard_unexpected_error_alert('patron/user_buckets.xul',E); } catch(F) { alert(E); }
+   }
+  }
 
-	]]>
-	</script>
+ ]]>
+ </script>
 
-	<label value="&staff.patron.user_buckets.stub_not_implemented;"/>
+ <label value="&staff.patron.user_buckets.stub_not_implemented;"/>
 
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/user_edit.js b/Open-ILS/xul/staff_client/server/patron/user_edit.js
index cf1999ce13..d9ef501c69 100644
--- a/Open-ILS/xul/staff_client/server/patron/user_edit.js
+++ b/Open-ILS/xul/staff_client/server/patron/user_edit.js
@@ -48,432 +48,432 @@ function set_work_ou(row) {
 }
 
 function set_perm(row) {
-	var pid = findNodeByName(row,'p.code').getAttribute('permid');
-	var papply = findNodeByName(row,'p.id').checked;
-	var pdepth = findNodeByName(row,'p.depth').options[findNodeByName(row,'p.depth').selectedIndex].value;
-	var pgrant = findNodeByName(row,'p.grantable').checked;
-
-	var p;
-	for (var i in user_perms) {
-		if (user_perms[i].perm() == pid) {
-			p = user_perms[i];
-			if (papply) {
-				p.isdeleted(0);
-				p.ischanged(1);
-				p.depth(pdepth);
-				p.grantable(pgrant ? 1 : 0);
-			} else {
-				if (p.isnew()) {
-					user_perms[i] = null;
-				} else {
-					p.isdeleted(1);
-				}
-			}
-			break;
-		}
-	}
-
-	if (!p) {
-		if (papply) {
-			p = new pupm();
-			p.isnew(1);
-			p.perm(pid);
-			p.usr(user.id());
-			p.depth('' + pdepth);
-			p.grantable(pgrant ? 1 : 0);
-
-			user_perms.push(p);
-		}
-	}
+ var pid = findNodeByName(row,'p.code').getAttribute('permid');
+ var papply = findNodeByName(row,'p.id').checked;
+ var pdepth = findNodeByName(row,'p.depth').options[findNodeByName(row,'p.depth').selectedIndex].value;
+ var pgrant = findNodeByName(row,'p.grantable').checked;
+
+ var p;
+ for (var i in user_perms) {
+  if (user_perms[i].perm() == pid) {
+   p = user_perms[i];
+   if (papply) {
+    p.isdeleted(0);
+    p.ischanged(1);
+    p.depth(pdepth);
+    p.grantable(pgrant ? 1 : 0);
+   } else {
+    if (p.isnew()) {
+     user_perms[i] = null;
+    } else {
+     p.isdeleted(1);
+    }
+   }
+   break;
+  }
+ }
+
+ if (!p) {
+  if (papply) {
+   p = new pupm();
+   p.isnew(1);
+   p.perm(pid);
+   p.usr(user.id());
+   p.depth('' + pdepth);
+   p.grantable(pgrant ? 1 : 0);
+
+   user_perms.push(p);
+  }
+ }
 
 }
 
 function save_user () {
 
-	try {
+ try {
 
-		var save_perms = [];
-		for (var i in user_perms) {
-			// Group based perm? skip it.
-			if (user_perms[i].id() < 0) continue;
+  var save_perms = [];
+  for (var i in user_perms) {
+   // Group based perm? skip it.
+   if (user_perms[i].id() < 0) continue;
 
-			if (user_perms[i].depth() == null) {
-				var p;
-				for (var j in perm_list) {
-					if (perm_list[j].id() == user_perms[i].perm()) {
-						p = perm_list[j];
-						break;
-					}
-				}
-				throw $("patronStrings").getFormattedString('staff.patron.user_edit.save_user.depth_required', [p.code()]);
-			}
+   if (user_perms[i].depth() == null) {
+    var p;
+    for (var j in perm_list) {
+     if (perm_list[j].id() == user_perms[i].perm()) {
+      p = perm_list[j];
+      break;
+     }
+    }
+    throw $("patronStrings").getFormattedString('staff.patron.user_edit.save_user.depth_required', [p.code()]);
+   }
 
-			save_perms.push( user_perms[i] );
-		}
+   save_perms.push( user_perms[i] );
+  }
 
-		var save_ous = [];
-		for (var i in user_work_ous) {
-			if (!user_work_ous[i]) continue;
-			save_ous.push( user_work_ous[i] );
-		}
+  var save_ous = [];
+  for (var i in user_work_ous) {
+   if (!user_work_ous[i]) continue;
+   save_ous.push( user_work_ous[i] );
+  }
 
-		var req = new RemoteRequest( 'open-ils.actor', 'open-ils.actor.user.work_ous.update', ses_id, save_ous );
-		req.send(true);
-		var wok = req.getResultObject();
+  var req = new RemoteRequest( 'open-ils.actor', 'open-ils.actor.user.work_ous.update', ses_id, save_ous );
+  req.send(true);
+  var wok = req.getResultObject();
 
-		if (wok.ilsevent) throw wok;
+  if (wok.ilsevent) throw wok;
 
-		req = new RemoteRequest( 'open-ils.actor', 'open-ils.actor.user.permissions.update', ses_id, save_perms );
-		req.send(true);
-		var pok = req.getResultObject();
+  req = new RemoteRequest( 'open-ils.actor', 'open-ils.actor.user.permissions.update', ses_id, save_perms );
+  req.send(true);
+  var pok = req.getResultObject();
 
-		if (pok.ilsevent) throw pok;
+  if (pok.ilsevent) throw pok;
 
-		if (pok || wok) {
-			alert($("patronStrings").getFormattedString('staff.patron.user_edit.save_user.user_modified_successfully', [user.usrname(), user.card().barcode(), pok, wok]));
-		}
+  if (pok || wok) {
+   alert($("patronStrings").getFormattedString('staff.patron.user_edit.save_user.user_modified_successfully', [user.usrname(), user.card().barcode(), pok, wok]));
+  }
 
-		init_editor();
+  init_editor();
 
-	} catch (e) {
-		dump( js2JSON( e ));
-		alert( js2JSON( e ));
-	};
+ } catch (e) {
+  dump( js2JSON( e ));
+  alert( js2JSON( e ));
+ };
 
 
 
-	return false;
+ return false;
 }
 
 var adv_mode = true;
 function apply_adv_mode (root) {
-	adv_items = findNodesByClass(root,'advanced');
-	for (var i in adv_items) {
-		adv_mode ?
-			removeCSSClass(adv_items[i], 'hideme') :
-			addCSSClass(adv_items[i], 'hideme');
-	}
+ adv_items = findNodesByClass(root,'advanced');
+ for (var i in adv_items) {
+  adv_mode ?
+   removeCSSClass(adv_items[i], 'hideme') :
+   addCSSClass(adv_items[i], 'hideme');
+ }
 }
 
 function init_editor (u) {
-	
-	var x = document.getElementById('editor').elements;
-	
-	cgi = new CGI();
-	if (cgi.param('adv')) adv_mode = true; 
-	try {
-		if (xulG) if (xulG.adv) adv_mode = true;
-		if (xulG) if (xulG.params) if (xulG.params.adv) adv_mode = true;
-	} catch (e) {}
-
-	apply_adv_mode(document.getElementById('editor'));
-
-	ses_id = cgi.param('ses'); 
-	try {
-		if (xulG) if (xulG.ses) ses_id = xulG.ses;
-		if (xulG) if (xulG.params) if (xulG.params.ses) ses_id = xulG.params.ses;
-	} catch (e) {}
-
-	var usr_id = cgi.param('usr'); 
-	try {
-		if (xulG) if (xulG.usr_id) usr_id = xulG.usr_id;
-		if (xulG) if (xulG.params) if (xulG.params.usr_id) usr_id = xulG.params.usr_id;
-	} catch (e) {}
-
-	var usr_barcode = cgi.param('barcode'); 
-	try {
-		if (xulG) if (xulG.usr_barcode) usr_ibarcode = xulG.usr_barcode;
-		if (xulG) if (xulG.params) if (xulG.params.usr_barcode) usr_ibarcode = xulG.params.usr_barcode;
-	} catch (e) {}
-
-	try {
-		var req;
-		if (usr_id) {
-			req = new RemoteRequest( 'open-ils.actor', 'open-ils.actor.user.fleshed.retrieve', ses_id, usr_id );
-		} else {
-			req = new RemoteRequest( 'open-ils.actor', 'open-ils.actor.user.fleshed.retrieve_by_barcode', ses_id, usr_barcode );
-		}
-		req.send(true);
-		user = req.getResultObject();
-	} catch (E) {
-		alert(E);
-	}
-
-	if (user.usrname()) x['user.usrname'].value = user.usrname();
-	x['user.usrname'].setAttribute('onchange','user.usrname(this.value)');
-
-	if (user.card() && user.card().barcode()) x['user.card.barcode'].value = user.card().barcode();
-	x['user.card.barcode'].setAttribute('onchange','user.card().barcode(this.value)');
-
-	if (user.first_given_name()) x['user.first_given_name'].value = user.first_given_name();
-	x['user.first_given_name'].setAttribute('onchange','user.first_given_name(this.value)');
-
-	if (user.second_given_name()) x['user.second_given_name'].value = user.second_given_name();
-	x['user.second_given_name'].setAttribute('onchange','user.second_given_name(this.value);');
-
-	if (user.family_name()) x['user.family_name'].value = user.family_name();
-	x['user.family_name'].setAttribute('onchange','user.family_name(this.value)');
-
-	// grab the editing staff user object
-	req = new RemoteRequest( 'open-ils.auth', 'open-ils.auth.session.retrieve', ses_id );
-	req.send(true);
-	var staff = req.getResultObject();
-
-	req = new RemoteRequest( 'open-ils.actor', 'open-ils.actor.permissions.user_perms.retrieve', ses_id );
-	req.send(true);
-	var staff_perms = req.getResultObject();
-
-	// Get the top of the staff perm org for ASSIGN_WORK_ORG_UNIT
-	req = new RemoteRequest( 'open-ils.actor', 'open-ils.actor.user.perm.highest_org', ses_id, staff.id(), 'ASSIGN_WORK_ORG_UNIT' );
-	req.send(true);
-	var top_work_ou = req.getResultObject();
-
-	// and now, the orgs where this staff member can apply the perms
-	req = new RemoteRequest( 'open-ils.actor', 'open-ils.actor.org_tree.descendants.retrieve', top_work_ou);
-	req.send(true);
-	var work_ou_tree = req.getResultObject();
-
-	// and now, the orgs where this staff member can apply the perms
-	req = new RemoteRequest( 'open-ils.actor', 'open-ils.actor.user.get_work_ous', ses_id, user.id());
-	req.send(true);
-	user_work_ous = req.getResultObject();
-
-	// and finally, the ou types
-	req = new RemoteRequest( 'open-ils.actor', 'open-ils.actor.org_types.retrieve' );
-	req.send(true);
-	ou_type_list = req.getResultObject();
-
-	user_perms = [];
-	perm_list = [];
-	if (user.id() > 0) {
-		req = new RemoteRequest( 'open-ils.actor', 'open-ils.actor.permissions.user_perms.retrieve', ses_id, user.id() );
-		req.send(true);
-		user_perms = req.getResultObject();
-
-		req = new RemoteRequest( 'open-ils.actor', 'open-ils.actor.permissions.retrieve' );
-		req.send(true);
-		perm_list = req.getResultObject();
-	}
-
-	f = document.getElementById('permissions');
-	while (f.firstChild) f.removeChild(f.lastChild);
-
-	var rcount = 0;
-	for (var i in perm_list.sort(function(a,b){ if (a.code() < b.code()) return -1;return 1; }))
-		display_perm(f,perm_list[i],staff_perms, rcount++);
-
-	f = document.getElementById('work_ous');
-	while (f.firstChild) f.removeChild(f.lastChild);
-
-	//flatten the ou tree, keep only those with can_hav_users = true
-	work_ou_list = [];
-	trim_ou_tree( [work_ou_tree], work_ou_list );
-
-	rcount = 0;
-	for (var i in work_ou_list.sort( function(a,b){ if (a.name() < b.name()) return -1;return 1; }) )
-		display_work_ou(f,work_ou_list[i], rcount++);
-
-	return true;
+ 
+ var x = document.getElementById('editor').elements;
+ 
+ cgi = new CGI();
+ if (cgi.param('adv')) adv_mode = true; 
+ try {
+  if (xulG) if (xulG.adv) adv_mode = true;
+  if (xulG) if (xulG.params) if (xulG.params.adv) adv_mode = true;
+ } catch (e) {}
+
+ apply_adv_mode(document.getElementById('editor'));
+
+ ses_id = cgi.param('ses'); 
+ try {
+  if (xulG) if (xulG.ses) ses_id = xulG.ses;
+  if (xulG) if (xulG.params) if (xulG.params.ses) ses_id = xulG.params.ses;
+ } catch (e) {}
+
+ var usr_id = cgi.param('usr'); 
+ try {
+  if (xulG) if (xulG.usr_id) usr_id = xulG.usr_id;
+  if (xulG) if (xulG.params) if (xulG.params.usr_id) usr_id = xulG.params.usr_id;
+ } catch (e) {}
+
+ var usr_barcode = cgi.param('barcode'); 
+ try {
+  if (xulG) if (xulG.usr_barcode) usr_ibarcode = xulG.usr_barcode;
+  if (xulG) if (xulG.params) if (xulG.params.usr_barcode) usr_ibarcode = xulG.params.usr_barcode;
+ } catch (e) {}
+
+ try {
+  var req;
+  if (usr_id) {
+   req = new RemoteRequest( 'open-ils.actor', 'open-ils.actor.user.fleshed.retrieve', ses_id, usr_id );
+  } else {
+   req = new RemoteRequest( 'open-ils.actor', 'open-ils.actor.user.fleshed.retrieve_by_barcode', ses_id, usr_barcode );
+  }
+  req.send(true);
+  user = req.getResultObject();
+ } catch (E) {
+  alert(E);
+ }
+
+ if (user.usrname()) x['user.usrname'].value = user.usrname();
+ x['user.usrname'].setAttribute('onchange','user.usrname(this.value)');
+
+ if (user.card() && user.card().barcode()) x['user.card.barcode'].value = user.card().barcode();
+ x['user.card.barcode'].setAttribute('onchange','user.card().barcode(this.value)');
+
+ if (user.first_given_name()) x['user.first_given_name'].value = user.first_given_name();
+ x['user.first_given_name'].setAttribute('onchange','user.first_given_name(this.value)');
+
+ if (user.second_given_name()) x['user.second_given_name'].value = user.second_given_name();
+ x['user.second_given_name'].setAttribute('onchange','user.second_given_name(this.value);');
+
+ if (user.family_name()) x['user.family_name'].value = user.family_name();
+ x['user.family_name'].setAttribute('onchange','user.family_name(this.value)');
+
+ // grab the editing staff user object
+ req = new RemoteRequest( 'open-ils.auth', 'open-ils.auth.session.retrieve', ses_id );
+ req.send(true);
+ var staff = req.getResultObject();
+
+ req = new RemoteRequest( 'open-ils.actor', 'open-ils.actor.permissions.user_perms.retrieve', ses_id );
+ req.send(true);
+ var staff_perms = req.getResultObject();
+
+ // Get the top of the staff perm org for ASSIGN_WORK_ORG_UNIT
+ req = new RemoteRequest( 'open-ils.actor', 'open-ils.actor.user.perm.highest_org', ses_id, staff.id(), 'ASSIGN_WORK_ORG_UNIT' );
+ req.send(true);
+ var top_work_ou = req.getResultObject();
+
+ // and now, the orgs where this staff member can apply the perms
+ req = new RemoteRequest( 'open-ils.actor', 'open-ils.actor.org_tree.descendants.retrieve', top_work_ou);
+ req.send(true);
+ var work_ou_tree = req.getResultObject();
+
+ // and now, the orgs where this staff member can apply the perms
+ req = new RemoteRequest( 'open-ils.actor', 'open-ils.actor.user.get_work_ous', ses_id, user.id());
+ req.send(true);
+ user_work_ous = req.getResultObject();
+
+ // and finally, the ou types
+ req = new RemoteRequest( 'open-ils.actor', 'open-ils.actor.org_types.retrieve' );
+ req.send(true);
+ ou_type_list = req.getResultObject();
+
+ user_perms = [];
+ perm_list = [];
+ if (user.id() > 0) {
+  req = new RemoteRequest( 'open-ils.actor', 'open-ils.actor.permissions.user_perms.retrieve', ses_id, user.id() );
+  req.send(true);
+  user_perms = req.getResultObject();
+
+  req = new RemoteRequest( 'open-ils.actor', 'open-ils.actor.permissions.retrieve' );
+  req.send(true);
+  perm_list = req.getResultObject();
+ }
+
+ f = document.getElementById('permissions');
+ while (f.firstChild) f.removeChild(f.lastChild);
+
+ var rcount = 0;
+ for (var i in perm_list.sort(function(a,b){ if (a.code() < b.code()) return -1;return 1; }))
+  display_perm(f,perm_list[i],staff_perms, rcount++);
+
+ f = document.getElementById('work_ous');
+ while (f.firstChild) f.removeChild(f.lastChild);
+
+ //flatten the ou tree, keep only those with can_hav_users = true
+ work_ou_list = [];
+ trim_ou_tree( [work_ou_tree], work_ou_list );
+
+ rcount = 0;
+ for (var i in work_ou_list.sort( function(a,b){ if (a.name() < b.name()) return -1;return 1; }) )
+  display_work_ou(f,work_ou_list[i], rcount++);
+
+ return true;
 }
 
 function grep ( code, list ) {
-	var ret = [];
-	for (var i in list) {
-		if (code(list[i])) ret.push(list[i]);
-	}
-	return ret;
+ var ret = [];
+ for (var i in list) {
+  if (code(list[i])) ret.push(list[i]);
+ }
+ return ret;
 }
 
 function trim_ou_tree (tree, list) {
-	for (var i in tree) {
-		if (!tree[i]) continue;
+ for (var i in tree) {
+  if (!tree[i]) continue;
 
-		var type = grep( function(x) {return x.id() == tree[i].ou_type()}, ou_type_list )[0];
-		if ( type && type.can_have_users() == 't' )
-			list.push(tree[i]);
+  var type = grep( function(x) {return x.id() == tree[i].ou_type()}, ou_type_list )[0];
+  if ( type && type.can_have_users() == 't' )
+   list.push(tree[i]);
 
-		if (tree[i].children()) trim_ou_tree(tree[i].children(), list);
-	}
+  if (tree[i].children()) trim_ou_tree(tree[i].children(), list);
+ }
 }
 
 function display_work_ou (root,ou_def,r) {
 
-	var wrow = findNodeByName(document.getElementById('work_ou-tmpl'), 'wrow').cloneNode(true);
-	root.appendChild(wrow);
+ var wrow = findNodeByName(document.getElementById('work_ou-tmpl'), 'wrow').cloneNode(true);
+ root.appendChild(wrow);
 
-	var label_cell = findNodeByName(wrow,'label');
-	findNodeByName(label_cell,'a.name').appendChild(text(ou_def.name()));
-	findNodeByName(label_cell,'a.shortname').appendChild(text(ou_def.shortname()));
-	if (r % 2) label_cell.className += ' odd';
+ var label_cell = findNodeByName(wrow,'label');
+ findNodeByName(label_cell,'a.name').appendChild(text(ou_def.name()));
+ findNodeByName(label_cell,'a.shortname').appendChild(text(ou_def.shortname()));
+ if (r % 2) label_cell.className += ' odd';
 
-	var apply_cell = findNodeByName(wrow,'wapply');
-	findNodeByName(apply_cell,'a.id').setAttribute('workou_id', ou_def.id());
-	if (r % 2) apply_cell.className += ' odd';
+ var apply_cell = findNodeByName(wrow,'wapply');
+ findNodeByName(apply_cell,'a.id').setAttribute('workou_id', ou_def.id());
+ if (r % 2) apply_cell.className += ' odd';
 
-	var has_it = grep(
-		function(x){ return x.work_ou() == ou_def.id() },
-		user_work_ous
-	).length;
+ var has_it = grep(
+  function(x){ return x.work_ou() == ou_def.id() },
+  user_work_ous
+ ).length;
 
-	findNodeByName(apply_cell,'a.id').checked = has_it > 0 ? true : false;
+ findNodeByName(apply_cell,'a.id').checked = has_it > 0 ? true : false;
 }
 
 function display_perm (root,perm_def,staff_perms, r) {
 
-	var prow = findNodeByName(document.getElementById('permission-tmpl'), 'prow').cloneNode(true);
-	root.appendChild(prow);
-
-	var all = false;
-	for (var i in staff_perms) {
-		if (staff_perms[i].perm() == -1) {
-			all = true;
-			break;
-		}
-	}
-
-
-	var sp,up;
-	if (!all) {
-		for (var i in staff_perms) {
-			if (perm_def.id() == staff_perms[i].perm() || staff_perms[i].perm() == -1) {
-				sp = staff_perms[i];
-				break;
-			}
-		}
-	}
-
-	for (var i in user_perms) {
-		if (perm_def.id() == user_perms[i].perm())
-			up = user_perms[i];
-	}
-
-
-	var dis = false;
-	if ((up && up.id() < 0) || !sp || !sp.grantable()) dis = true; 
-	if (all) dis = false; 
-
-	var label_cell = findNodeByName(prow,'plabel');
-	findNodeByName(label_cell,'p.code').appendChild(text(perm_def.code()));
-	findNodeByName(label_cell,'p.code').setAttribute('title', perm_def.description());
-	findNodeByName(label_cell,'p.code').setAttribute('permid', perm_def.id());
-	if (r % 2) label_cell.className += ' odd';
-
-	var apply_cell = findNodeByName(prow,'papply');
-	findNodeByName(apply_cell,'p.id').disabled = dis;
-	findNodeByName(apply_cell,'p.id').checked = up ? true : false;
-	if (r % 2) apply_cell.className += ' odd';
-
-	var depth_cell = findNodeByName(prow,'pdepth');
-	findNodeByName(depth_cell,'p.depth').disabled = dis;
-	findNodeByName(depth_cell,'p.depth').id = 'perm-depth-' + perm_def.id();
-	if (r % 2) depth_cell.className += ' odd';
-	selectBuilder(
-		'perm-depth-' + perm_def.id(),
-		globalOrgTypes,
-		(up ? up.depth() : findOrgDepth(user.home_ou())),
-		{ label_field		: 'name',
-		  value_field		: 'depth',
-		  empty_label		: $("patronStrings").getString('staff.patron.user_edit.display_perm.select_one'),
-		  empty_value		: '',
-		  clear			: true }
-	);
-	
-	var grant_cell = findNodeByName(prow,'pgrant');
-	findNodeByName(grant_cell,'p.grantable').disabled = dis;
-	findNodeByName(grant_cell,'p.grantable').checked = up ? (up.grantable() ? true : false) : false;
-	if (r % 2) grant_cell.className += ' odd';
+ var prow = findNodeByName(document.getElementById('permission-tmpl'), 'prow').cloneNode(true);
+ root.appendChild(prow);
+
+ var all = false;
+ for (var i in staff_perms) {
+  if (staff_perms[i].perm() == -1) {
+   all = true;
+   break;
+  }
+ }
+
+
+ var sp,up;
+ if (!all) {
+  for (var i in staff_perms) {
+   if (perm_def.id() == staff_perms[i].perm() || staff_perms[i].perm() == -1) {
+    sp = staff_perms[i];
+    break;
+   }
+  }
+ }
+
+ for (var i in user_perms) {
+  if (perm_def.id() == user_perms[i].perm())
+   up = user_perms[i];
+ }
+
+
+ var dis = false;
+ if ((up && up.id() < 0) || !sp || !sp.grantable()) dis = true; 
+ if (all) dis = false; 
+
+ var label_cell = findNodeByName(prow,'plabel');
+ findNodeByName(label_cell,'p.code').appendChild(text(perm_def.code()));
+ findNodeByName(label_cell,'p.code').setAttribute('title', perm_def.description());
+ findNodeByName(label_cell,'p.code').setAttribute('permid', perm_def.id());
+ if (r % 2) label_cell.className += ' odd';
+
+ var apply_cell = findNodeByName(prow,'papply');
+ findNodeByName(apply_cell,'p.id').disabled = dis;
+ findNodeByName(apply_cell,'p.id').checked = up ? true : false;
+ if (r % 2) apply_cell.className += ' odd';
+
+ var depth_cell = findNodeByName(prow,'pdepth');
+ findNodeByName(depth_cell,'p.depth').disabled = dis;
+ findNodeByName(depth_cell,'p.depth').id = 'perm-depth-' + perm_def.id();
+ if (r % 2) depth_cell.className += ' odd';
+ selectBuilder(
+  'perm-depth-' + perm_def.id(),
+  globalOrgTypes,
+  (up ? up.depth() : findOrgDepth(user.home_ou())),
+  { label_field  : 'name',
+    value_field  : 'depth',
+    empty_label  : $("patronStrings").getString('staff.patron.user_edit.display_perm.select_one'),
+    empty_value  : '',
+    clear   : true }
+ );
+ 
+ var grant_cell = findNodeByName(prow,'pgrant');
+ findNodeByName(grant_cell,'p.grantable').disabled = dis;
+ findNodeByName(grant_cell,'p.grantable').checked = up ? (up.grantable() ? true : false) : false;
+ if (r % 2) grant_cell.className += ' odd';
 
 }
 
 
 function selectBuilder (id, objects, def, args) {
-	var label_field = args['label_field'];
-	var value_field = args['value_field'];
-	var depth = args['depth'];
-
-	if (!depth) depth = 0;
-
-	args['depth'] = parseInt(depth) + 1;
-
-	var child_field_name = args['child_field_name'];
-
-	var sel = id;
-	if (typeof sel != 'object')
-		sel = document.getElementById(sel);
-
-	if (args['clear']) {
-		for (var o in sel.options) {
-			sel.options[o] = null;
-		}
-		args['clear'] = false;
-		if (args['empty_label']) {
-			sel.options[0] = new Option( args['empty_label'], args['empty_value'] );
-			sel.selectedIndex = 0;
-		}
-	}
-
-	for (var i in objects) {
-		var l = objects[i][label_field];
-		var v = objects[i][value_field];
-
-		if (typeof l == 'function')
-			l = objects[i][label_field]();
-
-		if (typeof v == 'function')
-			v = objects[i][value_field]();
-
-		var opt = new Option( l, v );
-
-		if (depth) {
-			var d = 10 * depth;
-			opt.style.paddingLeft = '' + d + 'px';
-		}
-
-		sel.options[sel.options.length] = opt;
-
-
-		if (typeof def == 'object') {
-			for (var j in def) {
-				if (v == def[j]) {
-					opt.selected = true;
-					sel.value = v;
-				}
-			}
-		} else {
-			if (v == def) {
-				opt.selected = true;
-				sel.value = v;
-			}
-		}
-
-		if (child_field_name) {
-			var c = objects[i][child_field_name];
-			if (typeof c == 'function')
-				c = objects[i][child_field_name]();
-
-			selectBuilder(
-				id,
-				c,
-				def,
-				{ label_field		: args['label_field'],
-				  value_field		: args['value_field'],
-				  depth			: args['depth'],
-				  child_field_name	: args['child_field_name'] }
-			);
-		}
-
-	}
-}	
+ var label_field = args['label_field'];
+ var value_field = args['value_field'];
+ var depth = args['depth'];
+
+ if (!depth) depth = 0;
+
+ args['depth'] = parseInt(depth) + 1;
+
+ var child_field_name = args['child_field_name'];
+
+ var sel = id;
+ if (typeof sel != 'object')
+  sel = document.getElementById(sel);
+
+ if (args['clear']) {
+  for (var o in sel.options) {
+   sel.options[o] = null;
+  }
+  args['clear'] = false;
+  if (args['empty_label']) {
+   sel.options[0] = new Option( args['empty_label'], args['empty_value'] );
+   sel.selectedIndex = 0;
+  }
+ }
+
+ for (var i in objects) {
+  var l = objects[i][label_field];
+  var v = objects[i][value_field];
+
+  if (typeof l == 'function')
+   l = objects[i][label_field]();
+
+  if (typeof v == 'function')
+   v = objects[i][value_field]();
+
+  var opt = new Option( l, v );
+
+  if (depth) {
+   var d = 10 * depth;
+   opt.style.paddingLeft = '' + d + 'px';
+  }
+
+  sel.options[sel.options.length] = opt;
+
+
+  if (typeof def == 'object') {
+   for (var j in def) {
+    if (v == def[j]) {
+     opt.selected = true;
+     sel.value = v;
+    }
+   }
+  } else {
+   if (v == def) {
+    opt.selected = true;
+    sel.value = v;
+   }
+  }
+
+  if (child_field_name) {
+   var c = objects[i][child_field_name];
+   if (typeof c == 'function')
+    c = objects[i][child_field_name]();
+
+   selectBuilder(
+    id,
+    c,
+    def,
+    { label_field  : args['label_field'],
+      value_field  : args['value_field'],
+      depth   : args['depth'],
+      child_field_name : args['child_field_name'] }
+   );
+  }
+
+ }
+} 
 
 function findNodesByClass(root, nodeClass, list) {
-	if(!list) list = [];
+ if(!list) list = [];
         if( !root || !nodeClass) {
-		return null;
-	}
+  return null;
+ }
         
         if(root.nodeType != 1) {
-		return null;
-	}
+  return null;
+ }
         
         if(root.className.match(nodeClass)) list.push( root );
 
diff --git a/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml b/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml
index 06975e00c7..59b3a96aa0 100644
--- a/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml
+++ b/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml
@@ -3,7 +3,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -28,136 +28,136 @@
                 <script language='javascript' src='user_edit.js'> </script>
 
 
-		<style>
+  <style>
 
-			.messagecatalog { -moz-binding: url( /xul/server/main/bindings.xml#messagecatalog ) }
+   .messagecatalog { -moz-binding: url( /xul/server/main/bindings.xml#messagecatalog ) }
 
-			.stay_hidden {		visibility: hidden;
-						display: none;
+   .stay_hidden {  visibility: hidden;
+      display: none;
 
-			}
+   }
 
-			.hideme {		visibility: hidden;
-						display: none;
-			}
+   .hideme {  visibility: hidden;
+      display: none;
+   }
 
-			table {		border-collapse: collapse;
-					margin-bottom: 10px;
-					margin-top: 10px;
-			}
+   table {  border-collapse: collapse;
+     margin-bottom: 10px;
+     margin-top: 10px;
+   }
 
-			th {		
-					white-space: nowrap;
-					padding-top: 15px;
-					padding-bottom: 10px;
-					text-align: center;
-					border-top: solid black 1px;
-			}
+   th {  
+     white-space: nowrap;
+     padding-top: 15px;
+     padding-bottom: 10px;
+     text-align: center;
+     border-top: solid black 1px;
+   }
 
-			td.odd {	background-color: lightcyan; }
+   td.odd { background-color: lightcyan; }
 
-			td.label {	text-align: right;
-					padding-right: 10px;
-			}
+   td.label { text-align: right;
+     padding-right: 10px;
+   }
 
-			td.value {	text-align: left;
-					padding-left: 10px;
-			}
+   td.value { text-align: left;
+     padding-left: 10px;
+   }
 
-			input[disabled='true'] { color: black; }
+   input[disabled='true'] { color: black; }
 
-		</style>
+  </style>
         </head>
 
-	<div class="messagecatalog" id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
-
-	<body onload="try { init_editor() } catch(E) { alert(js2JSON(E)); }">
-		<form method="GET" name="editor" id="editor" >
-
-		<table width="100%">
-			<tr>
-				<td class="label">&staff.patron.user_edit.user_name.label;</td>
-				<td class="value"><input disabled="true" type="text" name="user.usrname" id="user.usrname"/></td>
-				<td class="label">&staff.patron.user_edit.barcode.label;</td>
-				<td class="value"><input type="text" name="user.card.barcode" id="user.card.barcode" disabled="true"/></td>
-			</tr>
-			<tr>
-				<td class="label">&staff.patron.user_edit.firstname.label;</td>
-				<td class="value"><input disabled="true" type="text" name="user.first_given_name" id="user.first_given_name"/></td>
-				<td class="label">&staff.patron.user_edit.middlename.label;</td>
-				<td class="value"><input disabled="true" type="text" name="user.second_given_name" id="user.second_given_name"/></td>
-				<td class="label">&staff.patron.user_edit.lastname.label;</td>
-				<td class="value"><input disabled="true" type="text" name="user.family_name" id="user.family_name"/></td>
-			</tr>
-			<tr class='advanced hideme'>
-				<td class="value" colspan="6">
-					<table width="100%">
-						<thead>
-							<tr>
-								<th></th>
-								<th>&staff.patron.user_edit.working_location.label;</th>
-							</tr>
-						</thead>
-						<tbody id="work_ous" name="work_ous"/>
-					</table>
-				</td>
-			</tr>
-			<tr class='advanced hideme'>
-				<td class="value" colspan="6">
-					<table width="100%">
-						<thead>
-							<tr>
-								<th>&staff.patron.user_edit.permission.label;</th>
-								<th>&staff.patron.user_edit.applied.label;</th>
-								<th>&staff.patron.user_edit.depth.label;</th>
-								<th>&staff.patron.user_edit.grantable.label;</th>
-							</tr>
-						</thead>
-						<tbody id="permissions" name="permissions"/>
-					</table>
-				</td>
-			</tr>
-
-		</table>
-
-		<button onclick="save_user(); return false;">&staff.patron.user_edit.save.label;</button>
-		</form>
-
-
-		<div class='hideme' id="permission-tmpl">
-			<table>
-				<tr name='prow'>
-					<td class="value" name='plabel'>
-						<span name="p.code"/>
-					</td>
-					<td class="value" name='papply'>
-						<input type="checkbox" name="p.id" onclick="set_perm(this.parentNode.parentNode);"/>
-					</td>
-					<td class="value" name='pdepth'>
-						<select onchange="set_perm(this.parentNode.parentNode);" name="p.depth"/>
-					</td>
-					<td class="value" name='pgrant'>
-						<input type="checkbox" name="p.grantable" onclick="set_perm(this.parentNode.parentNode);"/>
-					</td>
-				</tr>
-			</table>
-		</div>
-
-
-		<div class='hideme' id="work_ou-tmpl">
-			<table>
-				<tr name='wrow'>
-					<td class="value" name='wapply'>
-						<input type="checkbox" name="a.id" onclick="set_work_ou(this.parentNode.parentNode);"/>
-					</td>
-					<td class="value" name='label'>
-						<span name="a.name"/>
-						(<span name="a.shortname"/>)
-					</td>
-				</tr>
-			</table>
-		</div>
-
-	</body>
+ <div class="messagecatalog" id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+
+ <body onload="try { init_editor() } catch(E) { alert(js2JSON(E)); }">
+  <form method="GET" name="editor" id="editor" >
+
+  <table width="100%">
+   <tr>
+    <td class="label">&staff.patron.user_edit.user_name.label;</td>
+    <td class="value"><input disabled="true" type="text" name="user.usrname" id="user.usrname"/></td>
+    <td class="label">&staff.patron.user_edit.barcode.label;</td>
+    <td class="value"><input type="text" name="user.card.barcode" id="user.card.barcode" disabled="true"/></td>
+   </tr>
+   <tr>
+    <td class="label">&staff.patron.user_edit.firstname.label;</td>
+    <td class="value"><input disabled="true" type="text" name="user.first_given_name" id="user.first_given_name"/></td>
+    <td class="label">&staff.patron.user_edit.middlename.label;</td>
+    <td class="value"><input disabled="true" type="text" name="user.second_given_name" id="user.second_given_name"/></td>
+    <td class="label">&staff.patron.user_edit.lastname.label;</td>
+    <td class="value"><input disabled="true" type="text" name="user.family_name" id="user.family_name"/></td>
+   </tr>
+   <tr class='advanced hideme'>
+    <td class="value" colspan="6">
+     <table width="100%">
+      <thead>
+       <tr>
+        <th></th>
+        <th>&staff.patron.user_edit.working_location.label;</th>
+       </tr>
+      </thead>
+      <tbody id="work_ous" name="work_ous"/>
+     </table>
+    </td>
+   </tr>
+   <tr class='advanced hideme'>
+    <td class="value" colspan="6">
+     <table width="100%">
+      <thead>
+       <tr>
+        <th>&staff.patron.user_edit.permission.label;</th>
+        <th>&staff.patron.user_edit.applied.label;</th>
+        <th>&staff.patron.user_edit.depth.label;</th>
+        <th>&staff.patron.user_edit.grantable.label;</th>
+       </tr>
+      </thead>
+      <tbody id="permissions" name="permissions"/>
+     </table>
+    </td>
+   </tr>
+
+  </table>
+
+  <button onclick="save_user(); return false;">&staff.patron.user_edit.save.label;</button>
+  </form>
+
+
+  <div class='hideme' id="permission-tmpl">
+   <table>
+    <tr name='prow'>
+     <td class="value" name='plabel'>
+      <span name="p.code"/>
+     </td>
+     <td class="value" name='papply'>
+      <input type="checkbox" name="p.id" onclick="set_perm(this.parentNode.parentNode);"/>
+     </td>
+     <td class="value" name='pdepth'>
+      <select onchange="set_perm(this.parentNode.parentNode);" name="p.depth"/>
+     </td>
+     <td class="value" name='pgrant'>
+      <input type="checkbox" name="p.grantable" onclick="set_perm(this.parentNode.parentNode);"/>
+     </td>
+    </tr>
+   </table>
+  </div>
+
+
+  <div class='hideme' id="work_ou-tmpl">
+   <table>
+    <tr name='wrow'>
+     <td class="value" name='wapply'>
+      <input type="checkbox" name="a.id" onclick="set_work_ou(this.parentNode.parentNode);"/>
+     </td>
+     <td class="value" name='label'>
+      <span name="a.name"/>
+      (<span name="a.shortname"/>)
+     </td>
+    </tr>
+   </table>
+  </div>
+
+ </body>
 </html>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/util.js b/Open-ILS/xul/staff_client/server/patron/util.js
index 2cbdd12025..a9f3739426 100644
--- a/Open-ILS/xul/staff_client/server/patron/util.js
+++ b/Open-ILS/xul/staff_client/server/patron/util.js
@@ -3,739 +3,739 @@ dump('entering patron/util.js\n');
 if (typeof patron == 'undefined') var patron = {};
 patron.util = {};
 
-patron.util.EXPORT_OK	= [ 
-	'columns', 'mbts_columns', 'mb_columns', 'mp_columns', /*'std_map_row_to_column',*/ 'std_map_row_to_columns',
-	'retrieve_au_via_id', 'retrieve_fleshed_au_via_id', 'retrieve_fleshed_au_via_barcode', 'set_penalty_css', 'retrieve_name_via_id',
+patron.util.EXPORT_OK = [ 
+ 'columns', 'mbts_columns', 'mb_columns', 'mp_columns', /*'std_map_row_to_column',*/ 'std_map_row_to_columns',
+ 'retrieve_au_via_id', 'retrieve_fleshed_au_via_id', 'retrieve_fleshed_au_via_barcode', 'set_penalty_css', 'retrieve_name_via_id',
     'merge', 'ausp_columns'
 ];
-patron.util.EXPORT_TAGS	= { ':all' : patron.util.EXPORT_OK };
+patron.util.EXPORT_TAGS = { ':all' : patron.util.EXPORT_OK };
 
 patron.util.mbts_columns = function(modify,params) {
 
-	JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-	JSAN.use('util.money'); JSAN.use('util.date');
+ JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+ JSAN.use('util.money'); JSAN.use('util.date');
 
     var commonStrings = document.getElementById('commonStrings');
 
-	var c = [
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'id', 'label' : commonStrings.getString('staff.mbts_id_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : false, 'render' : function(my) { return my.mbts.id(); }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'usr', 'label' : commonStrings.getString('staff.mbts_usr_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.mbts.usr() ? "Id = " + my.mbts.usr() : ""; }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'xact_type', 'label' : commonStrings.getString('staff.mbts_xact_type_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : false, 'render' : function(my) { return my.mbts.xact_type(); }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'balance_owed', 'label' : commonStrings.getString('staff.mbts_balance_owed_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : false, 'render' : function(my) { return util.money.sanitize( my.mbts.balance_owed() ); },
-			'sort_type' : 'money'
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'total_owed', 'label' : commonStrings.getString('staff.mbts_total_owed_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : false, 'render' : function(my) { return util.money.sanitize( my.mbts.total_owed() ); },
-			'sort_type' : 'money'
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'total_paid', 'label' : commonStrings.getString('staff.mbts_total_paid_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : false, 'render' : function(my) { return util.money.sanitize( my.mbts.total_paid() ); },
-			'sort_type' : 'money'
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'last_billing_note', 'label' : commonStrings.getString('staff.mbts_last_billing_note_label'), 'flex' : 2,
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.mbts.last_billing_note(); }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'last_billing_type', 'label' : commonStrings.getString('staff.mbts_last_billing_type_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.mbts.last_billing_type(); }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'last_billing_ts', 'label' : commonStrings.getString('staff.mbts_last_billing_timestamp_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return util.date.formatted_date( my.mbts.last_billing_ts(), "" ); }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'last_payment_note', 'label' : commonStrings.getString('staff.mbts_last_payment_note_label'), 'flex' : 2,
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.mbts.last_payment_note(); }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'last_payment_type', 'label' : commonStrings.getString('staff.mbts_last_payment_type_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.mbts.last_payment_type(); }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'last_payment_ts', 'label' : commonStrings.getString('staff.mbts_last_payment_timestamp_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return util.date.formatted_date( my.mbts.last_payment_ts(), "" ); }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'xact_start', 'label' : commonStrings.getString('staff.mbts_xact_start_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : false, 'render' : function(my) { return my.mbts.xact_start() ? my.mbts.xact_start().toString().substr(0,10) : ""; }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'xact_finish', 'label' : commonStrings.getString('staff.mbts_xact_finish_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : false, 'render' : function(my) { return my.mbts.xact_finish() ? my.mbts.xact_finish().toString().substr(0,10) : ""; }
-		},
-	];
-	for (var i = 0; i < c.length; i++) {
-		if (modify[ c[i].id ]) {
-			for (var j in modify[ c[i].id ]) {
-				c[i][j] = modify[ c[i].id ][j];
-			}
-		}
-	}
-	if (params) {
-		if (params.just_these) {
-			JSAN.use('util.functional');
-			var new_c = [];
-			for (var i = 0; i < params.just_these.length; i++) {
-				var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
-				new_c.push( function(y){ return y; }( x ) );
-			}
-			c = new_c;
-		}
-		if (params.except_these) {
-			JSAN.use('util.functional');
-			var new_c = [];
-			for (var i = 0; i < c.length; i++) {
-				var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);});
-				if (!x) new_c.push(c[i]);
-			}
-			c = new_c;
-		}
-	}
-	return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } );
+ var c = [
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'id', 'label' : commonStrings.getString('staff.mbts_id_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : false, 'render' : function(my) { return my.mbts.id(); }
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'usr', 'label' : commonStrings.getString('staff.mbts_usr_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.mbts.usr() ? "Id = " + my.mbts.usr() : ""; }
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'xact_type', 'label' : commonStrings.getString('staff.mbts_xact_type_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : false, 'render' : function(my) { return my.mbts.xact_type(); }
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'balance_owed', 'label' : commonStrings.getString('staff.mbts_balance_owed_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : false, 'render' : function(my) { return util.money.sanitize( my.mbts.balance_owed() ); },
+   'sort_type' : 'money'
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'total_owed', 'label' : commonStrings.getString('staff.mbts_total_owed_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : false, 'render' : function(my) { return util.money.sanitize( my.mbts.total_owed() ); },
+   'sort_type' : 'money'
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'total_paid', 'label' : commonStrings.getString('staff.mbts_total_paid_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : false, 'render' : function(my) { return util.money.sanitize( my.mbts.total_paid() ); },
+   'sort_type' : 'money'
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'last_billing_note', 'label' : commonStrings.getString('staff.mbts_last_billing_note_label'), 'flex' : 2,
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.mbts.last_billing_note(); }
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'last_billing_type', 'label' : commonStrings.getString('staff.mbts_last_billing_type_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.mbts.last_billing_type(); }
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'last_billing_ts', 'label' : commonStrings.getString('staff.mbts_last_billing_timestamp_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return util.date.formatted_date( my.mbts.last_billing_ts(), "" ); }
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'last_payment_note', 'label' : commonStrings.getString('staff.mbts_last_payment_note_label'), 'flex' : 2,
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.mbts.last_payment_note(); }
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'last_payment_type', 'label' : commonStrings.getString('staff.mbts_last_payment_type_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.mbts.last_payment_type(); }
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'last_payment_ts', 'label' : commonStrings.getString('staff.mbts_last_payment_timestamp_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return util.date.formatted_date( my.mbts.last_payment_ts(), "" ); }
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'xact_start', 'label' : commonStrings.getString('staff.mbts_xact_start_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : false, 'render' : function(my) { return my.mbts.xact_start() ? my.mbts.xact_start().toString().substr(0,10) : ""; }
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'xact_finish', 'label' : commonStrings.getString('staff.mbts_xact_finish_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : false, 'render' : function(my) { return my.mbts.xact_finish() ? my.mbts.xact_finish().toString().substr(0,10) : ""; }
+  },
+ ];
+ for (var i = 0; i < c.length; i++) {
+  if (modify[ c[i].id ]) {
+   for (var j in modify[ c[i].id ]) {
+    c[i][j] = modify[ c[i].id ][j];
+   }
+  }
+ }
+ if (params) {
+  if (params.just_these) {
+   JSAN.use('util.functional');
+   var new_c = [];
+   for (var i = 0; i < params.just_these.length; i++) {
+    var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
+    new_c.push( function(y){ return y; }( x ) );
+   }
+   c = new_c;
+  }
+  if (params.except_these) {
+   JSAN.use('util.functional');
+   var new_c = [];
+   for (var i = 0; i < c.length; i++) {
+    var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);});
+    if (!x) new_c.push(c[i]);
+   }
+   c = new_c;
+  }
+ }
+ return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } );
 }
 
 patron.util.mb_columns = function(modify,params) {
 
-	JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-	JSAN.use('util.money'); JSAN.use('util.date');
+ JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+ JSAN.use('util.money'); JSAN.use('util.date');
 
     var commonStrings = document.getElementById('commonStrings');
 
-	var c = [
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'id', 'label' : commonStrings.getString('staff.mb_id_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.mb.id(); }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'voided', 'label' : commonStrings.getString('staff.mb_voided_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : false, 'render' : function(my) { return get_bool( my.mb.voided() ) ? "Yes" : "No"; }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'voider', 'label' : commonStrings.getString('staff.mb_voider_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.mb.voider() ? "Id = " + my.mb.voider() : ""; }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'void_time', 'label' : commonStrings.getString('staff.mb_void_time_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.mb.void_time(); }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'amount', 'label' : commonStrings.getString('staff.mb_amount_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : false, 'render' : function(my) { return util.money.sanitize( my.mb.amount() ); },
-			'sort_type' : 'money'
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'billing_type', 'label' : commonStrings.getString('staff.mb_billing_type_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : false, 'render' : function(my) { return my.mb.billing_type(); }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'billing_ts', 'label' : commonStrings.getString('staff.mb_billing_ts_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : false, 'render' : function(my) { return util.date.formatted_date( my.mb.billing_ts(), "" ); }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'note', 'label' : commonStrings.getString('staff.mb_note_label'), 'flex' : 2,
-			'primary' : false, 'hidden' : false, 'render' : function(my) { return my.mb.note(); }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'xact', 'label' : commonStrings.getString('staff.mb_xact_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.mb.xact(); }
-		},
-	];
-	for (var i = 0; i < c.length; i++) {
-		if (modify[ c[i].id ]) {
-			for (var j in modify[ c[i].id ]) {
-				c[i][j] = modify[ c[i].id ][j];
-			}
-		}
-	}
-	if (params) {
-		if (params.just_these) {
-			JSAN.use('util.functional');
-			var new_c = [];
-			for (var i = 0; i < params.just_these.length; i++) {
-				var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
-				new_c.push( function(y){ return y; }( x ) );
-			}
-			c = new_c;
-		}
-		if (params.except_these) {
-			JSAN.use('util.functional');
-			var new_c = [];
-			for (var i = 0; i < c.length; i++) {
-				var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);});
-				if (!x) new_c.push(c[i]);
-			}
-			c = new_c;
-		}
-
-	}
-	return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } );
+ var c = [
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'id', 'label' : commonStrings.getString('staff.mb_id_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.mb.id(); }
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'voided', 'label' : commonStrings.getString('staff.mb_voided_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : false, 'render' : function(my) { return get_bool( my.mb.voided() ) ? "Yes" : "No"; }
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'voider', 'label' : commonStrings.getString('staff.mb_voider_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.mb.voider() ? "Id = " + my.mb.voider() : ""; }
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'void_time', 'label' : commonStrings.getString('staff.mb_void_time_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.mb.void_time(); }
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'amount', 'label' : commonStrings.getString('staff.mb_amount_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : false, 'render' : function(my) { return util.money.sanitize( my.mb.amount() ); },
+   'sort_type' : 'money'
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'billing_type', 'label' : commonStrings.getString('staff.mb_billing_type_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : false, 'render' : function(my) { return my.mb.billing_type(); }
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'billing_ts', 'label' : commonStrings.getString('staff.mb_billing_ts_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : false, 'render' : function(my) { return util.date.formatted_date( my.mb.billing_ts(), "" ); }
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'note', 'label' : commonStrings.getString('staff.mb_note_label'), 'flex' : 2,
+   'primary' : false, 'hidden' : false, 'render' : function(my) { return my.mb.note(); }
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'xact', 'label' : commonStrings.getString('staff.mb_xact_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.mb.xact(); }
+  },
+ ];
+ for (var i = 0; i < c.length; i++) {
+  if (modify[ c[i].id ]) {
+   for (var j in modify[ c[i].id ]) {
+    c[i][j] = modify[ c[i].id ][j];
+   }
+  }
+ }
+ if (params) {
+  if (params.just_these) {
+   JSAN.use('util.functional');
+   var new_c = [];
+   for (var i = 0; i < params.just_these.length; i++) {
+    var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
+    new_c.push( function(y){ return y; }( x ) );
+   }
+   c = new_c;
+  }
+  if (params.except_these) {
+   JSAN.use('util.functional');
+   var new_c = [];
+   for (var i = 0; i < c.length; i++) {
+    var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);});
+    if (!x) new_c.push(c[i]);
+   }
+   c = new_c;
+  }
+
+ }
+ return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } );
 }
 
 patron.util.mp_columns = function(modify,params) {
 
-	JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-	JSAN.use('util.money'); JSAN.use('util.date'); JSAN.use('patron.util');
+ JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+ JSAN.use('util.money'); JSAN.use('util.date'); JSAN.use('patron.util');
 
     var commonStrings = document.getElementById('commonStrings');
 
-	var c = [
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'mp_id', 'label' : commonStrings.getString('staff.mp_id_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.mp.id(); }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'mp_amount', 'label' : commonStrings.getString('staff.mp_amount_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : false, 'render' : function(my) { return util.money.sanitize( my.mp.amount() ); },
-			'sort_type' : 'money'
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'mp_payment_type', 'label' : commonStrings.getString('staff.mp_payment_type_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : false, 'render' : function(my) { return my.mp.payment_type(); }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'mp_payment_ts', 'label' : commonStrings.getString('staff.mp_payment_timestamp_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : false, 'render' : function(my) { return util.date.formatted_date( my.mp.payment_ts(), "" ); }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'mp_note', 'label' : commonStrings.getString('staff.mp_note_label'), 'flex' : 2,
-			'primary' : false, 'hidden' : false, 'render' : function(my) { return my.mp.note(); }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'mp_ws', 'label' : commonStrings.getString('staff.mp_cash_drawer_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : false, 'render' : function(my) { return my.mp.cash_drawer().name(); }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'mp_staff', 'label' : commonStrings.getString('staff.mp_accepting_usr_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : false, 'render' : function(my) { var s = my.mp.accepting_usr(); if (s && typeof s != "object") s = patron.util.retrieve_fleshed_au_via_id(ses(),s); return s.family_name() + " (" + s.card().barcode() + ") @ " + data.hash.aou[ s.home_ou() ].shortname(); }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'mp_xact', 'label' : commonStrings.getString('staff.mp_xact_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.mp.xact(); }
-		},
-	];
-	for (var i = 0; i < c.length; i++) {
-		if (modify[ c[i].id ]) {
-			for (var j in modify[ c[i].id ]) {
-				c[i][j] = modify[ c[i].id ][j];
-			}
-		}
-	}
-	if (params) {
-		if (params.just_these) {
-			JSAN.use('util.functional');
-			var new_c = [];
-			for (var i = 0; i < params.just_these.length; i++) {
-				var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
-				new_c.push( function(y){ return y; }( x ) );
-			}
-			c = new_c;
-		}
-		if (params.except_these) {
-			JSAN.use('util.functional');
-			var new_c = [];
-			for (var i = 0; i < c.length; i++) {
-				var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);});
-				if (!x) new_c.push(c[i]);
-			}
-			c = new_c;
-		}
-
-	}
-	return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } );
+ var c = [
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'mp_id', 'label' : commonStrings.getString('staff.mp_id_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.mp.id(); }
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'mp_amount', 'label' : commonStrings.getString('staff.mp_amount_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : false, 'render' : function(my) { return util.money.sanitize( my.mp.amount() ); },
+   'sort_type' : 'money'
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'mp_payment_type', 'label' : commonStrings.getString('staff.mp_payment_type_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : false, 'render' : function(my) { return my.mp.payment_type(); }
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'mp_payment_ts', 'label' : commonStrings.getString('staff.mp_payment_timestamp_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : false, 'render' : function(my) { return util.date.formatted_date( my.mp.payment_ts(), "" ); }
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'mp_note', 'label' : commonStrings.getString('staff.mp_note_label'), 'flex' : 2,
+   'primary' : false, 'hidden' : false, 'render' : function(my) { return my.mp.note(); }
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'mp_ws', 'label' : commonStrings.getString('staff.mp_cash_drawer_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : false, 'render' : function(my) { return my.mp.cash_drawer().name(); }
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'mp_staff', 'label' : commonStrings.getString('staff.mp_accepting_usr_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : false, 'render' : function(my) { var s = my.mp.accepting_usr(); if (s && typeof s != "object") s = patron.util.retrieve_fleshed_au_via_id(ses(),s); return s.family_name() + " (" + s.card().barcode() + ") @ " + data.hash.aou[ s.home_ou() ].shortname(); }
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'mp_xact', 'label' : commonStrings.getString('staff.mp_xact_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.mp.xact(); }
+  },
+ ];
+ for (var i = 0; i < c.length; i++) {
+  if (modify[ c[i].id ]) {
+   for (var j in modify[ c[i].id ]) {
+    c[i][j] = modify[ c[i].id ][j];
+   }
+  }
+ }
+ if (params) {
+  if (params.just_these) {
+   JSAN.use('util.functional');
+   var new_c = [];
+   for (var i = 0; i < params.just_these.length; i++) {
+    var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
+    new_c.push( function(y){ return y; }( x ) );
+   }
+   c = new_c;
+  }
+  if (params.except_these) {
+   JSAN.use('util.functional');
+   var new_c = [];
+   for (var i = 0; i < c.length; i++) {
+    var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);});
+    if (!x) new_c.push(c[i]);
+   }
+   c = new_c;
+  }
+
+ }
+ return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } );
 }
 
 patron.util.ausp_columns = function(modify,params) {
 
-	JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+ JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
     JSAN.use('util.functional');
 
     var commonStrings = document.getElementById('commonStrings');
 
-	var c = [
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'csp_id', 'label' : commonStrings.getString('staff.csp_id_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.csp.id(); }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'csp_name', 'label' : commonStrings.getString('staff.csp_name_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : false, 'render' : function(my) { return my.csp.name(); }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'csp_label', 'label' : commonStrings.getString('staff.csp_label_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : false, 'render' : function(my) { return my.csp.label(); }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'csp_block_list', 'label' : commonStrings.getString('staff.csp_block_list_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.csp.block_list(); }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'csp_block_circ', 'label' : commonStrings.getString('staff.csp_block_circ_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : true, 'render' : function(my) { 
+ var c = [
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'csp_id', 'label' : commonStrings.getString('staff.csp_id_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.csp.id(); }
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'csp_name', 'label' : commonStrings.getString('staff.csp_name_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : false, 'render' : function(my) { return my.csp.name(); }
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'csp_label', 'label' : commonStrings.getString('staff.csp_label_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : false, 'render' : function(my) { return my.csp.label(); }
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'csp_block_list', 'label' : commonStrings.getString('staff.csp_block_list_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.csp.block_list(); }
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'csp_block_circ', 'label' : commonStrings.getString('staff.csp_block_circ_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : true, 'render' : function(my) { 
                 return String( my.csp.block_list() ).match('CIRC') ? commonStrings.getString('staff.csp_block_circ_yes') : commonStrings.getString('staff.csp_block_circ_no'); 
             }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'csp_block_renew', 'label' : commonStrings.getString('staff.csp_block_renew_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : true, 'render' : function(my) { 
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'csp_block_renew', 'label' : commonStrings.getString('staff.csp_block_renew_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : true, 'render' : function(my) { 
                 return String( my.csp.block_list() ).match('RENEW') ? commonStrings.getString('staff.csp_block_renew_yes') : commonStrings.getString('staff.csp_block_renew_no'); 
 
             }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'csp_block_hold', 'label' : commonStrings.getString('staff.csp_block_hold_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : true, 'render' : function(my) { 
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'csp_block_hold', 'label' : commonStrings.getString('staff.csp_block_hold_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : true, 'render' : function(my) { 
                 return String( my.csp.block_list() ).match('HOLD') ?  commonStrings.getString('staff.csp_block_hold_yes') : commonStrings.getString('staff.csp_block_hold_no'); 
             }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'ausp_staff', 'label' : commonStrings.getString('staff.ausp_staff_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : true, 'render' : function(my) { 
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'ausp_staff', 'label' : commonStrings.getString('staff.ausp_staff_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : true, 'render' : function(my) { 
                 return my.ausp ? my.ausp.staff() : '';
             }
         },
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'ausp_set_date', 'label' : commonStrings.getString('staff.ausp_set_date_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : false, 'render' : function(my) { 
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'ausp_set_date', 'label' : commonStrings.getString('staff.ausp_set_date_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : false, 'render' : function(my) { 
                 return my.ausp ? my.ausp.set_date() : '';
             }
         },
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'ausp_note', 'label' : commonStrings.getString('staff.ausp_note_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : false, 'render' : function(my) { 
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'ausp_note', 'label' : commonStrings.getString('staff.ausp_note_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : false, 'render' : function(my) { 
                 return my.ausp ? my.ausp.note() : '';
             }
         },
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'ausp_org_unit', 'label' : commonStrings.getString('staff.ausp_org_unit_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : false, 'render' : function(my) { 
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'ausp_org_unit', 'label' : commonStrings.getString('staff.ausp_org_unit_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : false, 'render' : function(my) { 
                 return my.ausp ? data.hash.aou[ my.ausp.org_unit() ].shortname() : '';
             }
         }
-	];
-	for (var i = 0; i < c.length; i++) {
-		if (modify[ c[i].id ]) {
-			for (var j in modify[ c[i].id ]) {
-				c[i][j] = modify[ c[i].id ][j];
-			}
-		}
-	}
-	if (params) {
-		if (params.just_these) {
-			var new_c = [];
-			for (var i = 0; i < params.just_these.length; i++) {
-				var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
-				new_c.push( function(y){ return y; }( x ) );
-			}
-			c = new_c;
-		}
-		if (params.except_these) {
-			var new_c = [];
-			for (var i = 0; i < c.length; i++) {
-				var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);});
-				if (!x) new_c.push(c[i]);
-			}
-			c = new_c;
-		}
-
-	}
-	return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } );
+ ];
+ for (var i = 0; i < c.length; i++) {
+  if (modify[ c[i].id ]) {
+   for (var j in modify[ c[i].id ]) {
+    c[i][j] = modify[ c[i].id ][j];
+   }
+  }
+ }
+ if (params) {
+  if (params.just_these) {
+   var new_c = [];
+   for (var i = 0; i < params.just_these.length; i++) {
+    var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
+    new_c.push( function(y){ return y; }( x ) );
+   }
+   c = new_c;
+  }
+  if (params.except_these) {
+   var new_c = [];
+   for (var i = 0; i < c.length; i++) {
+    var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);});
+    if (!x) new_c.push(c[i]);
+   }
+   c = new_c;
+  }
+
+ }
+ return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } );
 }
 
 
 patron.util.columns = function(modify,params) {
-	
-	JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+ 
+ JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
 
     var commonStrings = document.getElementById('commonStrings');
 
-	var c = [
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'barcode', 'label' : commonStrings.getString('staff.card_barcode_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.card().barcode(); }
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'usrname', 'label' : commonStrings.getString('staff.au_usrname_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.usrname(); }
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'profile', 'label' : commonStrings.getString('staff.au_profile_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return data.hash.pgt[ my.au.profile() ].name(); }
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'active', 'label' : commonStrings.getString('staff.au_active_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return get_bool( my.au.active() ) ? "Yes" : "No"; }
-		},
-		{
-			'persist' : 'hidden width ordinal', 'id' : 'barred', 'label' : commonStrings.getString('staff.au_barred_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return get_bool( my.au.barred() ) ? "Yes" : "No"; }
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'id', 'label' : document.getElementById('commonStrings').getString('staff.au_id_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.id(); }
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'prefix', 'label' : document.getElementById('commonStrings').getString('staff.au_name_prefix_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.prefix(); }
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'family_name', 'label' : document.getElementById('commonStrings').getString('staff.au_family_name_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.family_name(); }
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'first_given_name', 'label' : document.getElementById('commonStrings').getString('staff.au_first_given_name_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.first_given_name(); }
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'second_given_name', 'label' : document.getElementById('commonStrings').getString('staff.au_second_given_name_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.second_given_name(); }
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'suffix', 'label' : document.getElementById('commonStrings').getString('staff.au_name_suffix_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.suffix(); }
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'alert_message', 'label' : commonStrings.getString('staff.au_alert_message_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.alert_message(); }
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'claims_returned_count', 'label' : commonStrings.getString('staff.au_claims_returned_count_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.claims_returned_count(); },
-			'sort_type' : 'number'
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'create_date', 'label' : commonStrings.getString('staff.au_create_date_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.create_date(); }
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'expire_date', 'label' : commonStrings.getString('staff.au_expire_date_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.expire_date().substr(0,10); }
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'home_ou', 'label' : commonStrings.getString('staff.au_home_library_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return data.hash.aou[ my.au.home_ou() ].shortname(); }
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'home_ou_fullname', 'label' : commonStrings.getString('staff.au_home_library_fullname_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return data.hash.aou[ my.au.home_ou() ].name(); }
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'credit_forward_balance', 'label' : commonStrings.getString('staff.au_credit_forward_balance_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.credit_forward_balance(); },
-			'sort_type' : 'money'
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'day_phone', 'label' : commonStrings.getString('staff.au_day_phone_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.day_phone(); }
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'evening_phone', 'label' : commonStrings.getString('staff.au_evening_phone_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.evening_phone(); }
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'other_phone', 'label' : commonStrings.getString('staff.au_other_phone_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.other_phone(); }
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'email', 'label' : commonStrings.getString('staff.au_email_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.email(); }
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'alias', 'label' : commonStrings.getString('staff.au_alias_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.alias(); }
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'dob', 'label' : commonStrings.getString('staff.au_birth_date_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.dob().substr(0,10); }
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'ident_type', 'label' : commonStrings.getString('staff.au_ident_type_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return data.hash.cit[ my.au.ident_type() ].name(); }
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'ident_value', 'label' : commonStrings.getString('staff.au_ident_value_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.ident_value(); }
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'ident_type2', 'label' : commonStrings.getString('staff.au_ident_type2_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return data.hash.cit[ my.au.ident_type2() ].name(); }
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'ident_value2', 'label' : commonStrings.getString('staff.au_ident_value2_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.ident_value2(); }
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'net_access_level', 'label' : commonStrings.getString('staff.au_net_access_level_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.net_access_level(); }
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'master_account', 'label' : commonStrings.getString('staff.au_master_account_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return get_bool( my.au.master_account() ) ? "Yes" : "No"; }
-		},
-		{ 
-			'persist' : 'hidden width ordinal', 'id' : 'usrgroup', 'label' : commonStrings.getString('staff.au_group_id_label'), 'flex' : 1, 
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.usrgroup(); }
-		},
-	];
-	for (var i = 0; i < c.length; i++) {
-		if (modify[ c[i].id ]) {
-			for (var j in modify[ c[i].id ]) {
-				c[i][j] = modify[ c[i].id ][j];
-			}
-		}
-	}
-	if (params) {
-		if (params.just_these) {
-			JSAN.use('util.functional');
-			var new_c = [];
-			for (var i = 0; i < params.just_these.length; i++) {
-				var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
-				new_c.push( function(y){ return y; }( x ) );
-			}
-			c = new_c;
-		}
-		if (params.except_these) {
-			JSAN.use('util.functional');
-			var new_c = [];
-			for (var i = 0; i < c.length; i++) {
-				var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);});
-				if (!x) new_c.push(c[i]);
-			}
-			c = new_c;
-		}
-
-	}
-	return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } );
+ var c = [
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'barcode', 'label' : commonStrings.getString('staff.card_barcode_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.card().barcode(); }
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'usrname', 'label' : commonStrings.getString('staff.au_usrname_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.usrname(); }
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'profile', 'label' : commonStrings.getString('staff.au_profile_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return data.hash.pgt[ my.au.profile() ].name(); }
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'active', 'label' : commonStrings.getString('staff.au_active_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return get_bool( my.au.active() ) ? "Yes" : "No"; }
+  },
+  {
+   'persist' : 'hidden width ordinal', 'id' : 'barred', 'label' : commonStrings.getString('staff.au_barred_label'), 'flex' : 1,
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return get_bool( my.au.barred() ) ? "Yes" : "No"; }
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'id', 'label' : document.getElementById('commonStrings').getString('staff.au_id_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.id(); }
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'prefix', 'label' : document.getElementById('commonStrings').getString('staff.au_name_prefix_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.prefix(); }
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'family_name', 'label' : document.getElementById('commonStrings').getString('staff.au_family_name_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.family_name(); }
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'first_given_name', 'label' : document.getElementById('commonStrings').getString('staff.au_first_given_name_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.first_given_name(); }
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'second_given_name', 'label' : document.getElementById('commonStrings').getString('staff.au_second_given_name_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.second_given_name(); }
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'suffix', 'label' : document.getElementById('commonStrings').getString('staff.au_name_suffix_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.suffix(); }
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'alert_message', 'label' : commonStrings.getString('staff.au_alert_message_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.alert_message(); }
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'claims_returned_count', 'label' : commonStrings.getString('staff.au_claims_returned_count_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.claims_returned_count(); },
+   'sort_type' : 'number'
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'create_date', 'label' : commonStrings.getString('staff.au_create_date_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.create_date(); }
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'expire_date', 'label' : commonStrings.getString('staff.au_expire_date_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.expire_date().substr(0,10); }
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'home_ou', 'label' : commonStrings.getString('staff.au_home_library_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return data.hash.aou[ my.au.home_ou() ].shortname(); }
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'home_ou_fullname', 'label' : commonStrings.getString('staff.au_home_library_fullname_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return data.hash.aou[ my.au.home_ou() ].name(); }
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'credit_forward_balance', 'label' : commonStrings.getString('staff.au_credit_forward_balance_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.credit_forward_balance(); },
+   'sort_type' : 'money'
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'day_phone', 'label' : commonStrings.getString('staff.au_day_phone_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.day_phone(); }
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'evening_phone', 'label' : commonStrings.getString('staff.au_evening_phone_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.evening_phone(); }
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'other_phone', 'label' : commonStrings.getString('staff.au_other_phone_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.other_phone(); }
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'email', 'label' : commonStrings.getString('staff.au_email_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.email(); }
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'alias', 'label' : commonStrings.getString('staff.au_alias_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.alias(); }
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'dob', 'label' : commonStrings.getString('staff.au_birth_date_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.dob().substr(0,10); }
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'ident_type', 'label' : commonStrings.getString('staff.au_ident_type_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return data.hash.cit[ my.au.ident_type() ].name(); }
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'ident_value', 'label' : commonStrings.getString('staff.au_ident_value_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.ident_value(); }
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'ident_type2', 'label' : commonStrings.getString('staff.au_ident_type2_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return data.hash.cit[ my.au.ident_type2() ].name(); }
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'ident_value2', 'label' : commonStrings.getString('staff.au_ident_value2_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.ident_value2(); }
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'net_access_level', 'label' : commonStrings.getString('staff.au_net_access_level_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.net_access_level(); }
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'master_account', 'label' : commonStrings.getString('staff.au_master_account_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return get_bool( my.au.master_account() ) ? "Yes" : "No"; }
+  },
+  { 
+   'persist' : 'hidden width ordinal', 'id' : 'usrgroup', 'label' : commonStrings.getString('staff.au_group_id_label'), 'flex' : 1, 
+   'primary' : false, 'hidden' : true, 'render' : function(my) { return my.au.usrgroup(); }
+  },
+ ];
+ for (var i = 0; i < c.length; i++) {
+  if (modify[ c[i].id ]) {
+   for (var j in modify[ c[i].id ]) {
+    c[i][j] = modify[ c[i].id ][j];
+   }
+  }
+ }
+ if (params) {
+  if (params.just_these) {
+   JSAN.use('util.functional');
+   var new_c = [];
+   for (var i = 0; i < params.just_these.length; i++) {
+    var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);});
+    new_c.push( function(y){ return y; }( x ) );
+   }
+   c = new_c;
+  }
+  if (params.except_these) {
+   JSAN.use('util.functional');
+   var new_c = [];
+   for (var i = 0; i < c.length; i++) {
+    var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);});
+    if (!x) new_c.push(c[i]);
+   }
+   c = new_c;
+  }
+
+ }
+ return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } );
 }
 
 patron.util.std_map_row_to_columns = function(error_value) {
-	return function(row,cols) {
-		// row contains { 'my' : { 'au' : {} } }
-		// cols contains all of the objects listed above in columns
-		
-		var obj = {}; obj.OpenILS = {}; 
-		JSAN.use('util.error'); obj.error = new util.error();
-		JSAN.use('OpenILS.data'); obj.OpenILS.data = new OpenILS.data(); obj.OpenILS.data.init({'via':'stash'});
-		JSAN.use('util.date'); JSAN.use('util.money');
-
-		var my = row.my;
-		var values = [];
-		var cmd = '';
-		try { 
-			for (var i = 0; i < cols.length; i++) {
-				switch (typeof cols[i].render) {
-					case 'function': try { values[i] = cols[i].render(my); } catch(E) { values[i] = error_value; obj.error.sdump('D_COLUMN_RENDER_ERROR',E); } break;
-					case 'string' : cmd += 'try { ' + cols[i].render + '; values['+i+'] = v; } catch(E) { values['+i+'] = error_value; }'; break;
-					default: cmd += 'values['+i+'] = "??? '+(typeof cols[i].render)+'"; ';
-				}
-			}
-			if (cmd) eval( cmd );
-		} catch(E) {
-			obj.error.sdump('D_WARN','map_row_to_column: ' + E);
-			if (error_value) { value = error_value; } else { value = '   ' };
-		}
-		return values;
-	}
+ return function(row,cols) {
+  // row contains { 'my' : { 'au' : {} } }
+  // cols contains all of the objects listed above in columns
+  
+  var obj = {}; obj.OpenILS = {}; 
+  JSAN.use('util.error'); obj.error = new util.error();
+  JSAN.use('OpenILS.data'); obj.OpenILS.data = new OpenILS.data(); obj.OpenILS.data.init({'via':'stash'});
+  JSAN.use('util.date'); JSAN.use('util.money');
+
+  var my = row.my;
+  var values = [];
+  var cmd = '';
+  try { 
+   for (var i = 0; i < cols.length; i++) {
+    switch (typeof cols[i].render) {
+     case 'function': try { values[i] = cols[i].render(my); } catch(E) { values[i] = error_value; obj.error.sdump('D_COLUMN_RENDER_ERROR',E); } break;
+     case 'string' : cmd += 'try { ' + cols[i].render + '; values['+i+'] = v; } catch(E) { values['+i+'] = error_value; }'; break;
+     default: cmd += 'values['+i+'] = "??? '+(typeof cols[i].render)+'"; ';
+    }
+   }
+   if (cmd) eval( cmd );
+  } catch(E) {
+   obj.error.sdump('D_WARN','map_row_to_column: ' + E);
+   if (error_value) { value = error_value; } else { value = '   ' };
+  }
+  return values;
+ }
 }
 
 patron.util.retrieve_au_via_id = function(session, id, f) {
-	JSAN.use('util.network');
-	var network = new util.network();
-	var patron_obj = network.simple_request(
-		'FM_AU_RETRIEVE_VIA_ID',
-		[ session, id ],
-		f
-	);
-	return patron_obj;
+ JSAN.use('util.network');
+ var network = new util.network();
+ var patron_obj = network.simple_request(
+  'FM_AU_RETRIEVE_VIA_ID',
+  [ session, id ],
+  f
+ );
+ return patron_obj;
 }
 
 patron.util.retrieve_name_via_id = function(session, id) {
-	JSAN.use('util.network');
-	var network = new util.network();
-	var parts = network.simple_request(
-		'BLOB_AU_PARTS_RETRIEVE',
-		[ session, id, ['family_name', 'first_given_name', 'second_given_name', 'home_ou' ] ]
-	);
-	return parts;
+ JSAN.use('util.network');
+ var network = new util.network();
+ var parts = network.simple_request(
+  'BLOB_AU_PARTS_RETRIEVE',
+  [ session, id, ['family_name', 'first_given_name', 'second_given_name', 'home_ou' ] ]
+ );
+ return parts;
 }
 
 patron.util.retrieve_fleshed_au_via_id = function(session, id) {
-	JSAN.use('util.network');
-	var network = new util.network();
-	var patron_obj = network.simple_request(
-		'FM_AU_FLESHED_RETRIEVE_VIA_ID',
-		[ session, id ]
-	);
-	patron.util.set_penalty_css(patron_obj);
-	return patron_obj;
+ JSAN.use('util.network');
+ var network = new util.network();
+ var patron_obj = network.simple_request(
+  'FM_AU_FLESHED_RETRIEVE_VIA_ID',
+  [ session, id ]
+ );
+ patron.util.set_penalty_css(patron_obj);
+ return patron_obj;
 }
 
 patron.util.retrieve_fleshed_au_via_barcode = function(session, id) {
-	JSAN.use('util.network');
-	var network = new util.network();
-	var patron_obj = network.simple_request(
-		'FM_AU_RETRIEVE_VIA_BARCODE.authoritative',
-		[ session, id ]
-	);
-	patron.util.set_penalty_css(patron_obj);
-	return patron_obj;
+ JSAN.use('util.network');
+ var network = new util.network();
+ var patron_obj = network.simple_request(
+  'FM_AU_RETRIEVE_VIA_BARCODE.authoritative',
+  [ session, id ]
+ );
+ patron.util.set_penalty_css(patron_obj);
+ return patron_obj;
 }
 
 var TIME = { minute : 60, hour : 60*60, day : 60*60*24, year : 60*60*24*365 };
 
 patron.util.set_penalty_css = function(patron) {
-	try {
-							removeCSSClass(document.documentElement,'PATRON_HAS_BILLS');
-							removeCSSClass(document.documentElement,'PATRON_HAS_OVERDUES');
-							removeCSSClass(document.documentElement,'PATRON_HAS_NOTES');
-							removeCSSClass(document.documentElement,'PATRON_EXCEEDS_CHECKOUT_COUNT');
-							removeCSSClass(document.documentElement,'PATRON_EXCEEDS_OVERDUE_COUNT');
-							removeCSSClass(document.documentElement,'PATRON_EXCEEDS_FINES');
-							removeCSSClass(document.documentElement,'NO_PENALTIES');
-							removeCSSClass(document.documentElement,'ONE_PENALTY');
-							removeCSSClass(document.documentElement,'MULTIPLE_PENALTIES');
-							removeCSSClass(document.documentElement,'PATRON_HAS_ALERT');
-							removeCSSClass(document.documentElement,'PATRON_BARRED');
-							removeCSSClass(document.documentElement,'PATRON_INACTIVE');
-							removeCSSClass(document.documentElement,'PATRON_EXPIRED');
-							removeCSSClass(document.documentElement,'PATRON_HAS_INVALID_DOB');
-							removeCSSClass(document.documentElement,'PATRON_HAS_INVALID_ADDRESS');
-							removeCSSClass(document.documentElement,'PATRON_AGE_GE_65');
-							removeCSSClass(document.documentElement,'PATRON_AGE_LT_65');
-							removeCSSClass(document.documentElement,'PATRON_AGE_GE_24');
-							removeCSSClass(document.documentElement,'PATRON_AGE_LT_24');
-							removeCSSClass(document.documentElement,'PATRON_AGE_GE_21');
-							removeCSSClass(document.documentElement,'PATRON_AGE_LT_21');
-							removeCSSClass(document.documentElement,'PATRON_AGE_GE_18');
-							removeCSSClass(document.documentElement,'PATRON_AGE_LT_18');
-							removeCSSClass(document.documentElement,'PATRON_AGE_GE_13');
-							removeCSSClass(document.documentElement,'PATRON_AGE_LT_13');
-							removeCSSClass(document.documentElement,'PATRON_NET_ACCESS_1');
-							removeCSSClass(document.documentElement,'PATRON_NET_ACCESS_2');
-							removeCSSClass(document.documentElement,'PATRON_NET_ACCESS_3');
-
-		JSAN.use('util.network'); var net = new util.network();
-		net.simple_request('FM_MOUS_RETRIEVE.authoritative',[ ses(), patron.id() ], function(req) {
-			if (req.getResultObject().balance_owed() > 0) addCSSClass(document.documentElement,'PATRON_HAS_BILLS');
-		});
-		net.simple_request('FM_CIRC_COUNT_RETRIEVE_VIA_USER.authoritative',[ ses(), patron.id() ], function(req) {
-			try {
-				var co = req.getResultObject();
-				if (co.overdue > 0 || co.long_overdue > 0) addCSSClass(document.documentElement,'PATRON_HAS_OVERDUES');
-			} catch(E) {
-				alert(E);
-			}
-		});
-		net.simple_request('FM_AUN_RETRIEVE_ALL.authoritative',[ ses(), { 'patronid' : patron.id() } ], function(req) {
-			var notes = req.getResultObject();
-			if (notes.length > 0) addCSSClass(document.documentElement,'PATRON_HAS_NOTES');
-		});
-
-		/*
-		JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-		data.last_patron = patron.id(); data.stash('last_patron');
-		*/
-
-		var penalties = patron.standing_penalties();
-		for (var i = 0; i < penalties.length; i++) {
-			/* this comes from /opac/common/js/utils.js */
-			addCSSClass(document.documentElement,penalties[i].standing_penalty().name());
-		}
-
-		switch(penalties.length) {
-			case 0: addCSSClass(document.documentElement,'NO_PENALTIES'); break;
-			case 1: addCSSClass(document.documentElement,'ONE_PENALTY'); break;
-			default: addCSSClass(document.documentElement,'MULTIPLE_PENALTIES'); break;
-		}
-
-		if (patron.alert_message()) {
-			addCSSClass(document.documentElement,'PATRON_HAS_ALERT');
-		}
-
-		if (get_bool( patron.barred() )) {
-			addCSSClass(document.documentElement,'PATRON_BARRED');
-		}
-
-		if (!get_bool( patron.active() )) {
-			addCSSClass(document.documentElement,'PATRON_INACTIVE');
-		}
-
-		try { addCSSClass(document.documentElement,'PATRON_NET_ACCESS_' + patron.net_access_level()); } catch(E) {}
-
-		var now = new Date();
-		now = now.getTime()/1000;
-
-		var expire_parts = patron.expire_date().substr(0,10).split('-');
-		expire_parts[1] = expire_parts[1] - 1;
-
-		var expire = new Date();
-		expire.setFullYear(expire_parts[0], expire_parts[1], expire_parts[2]);
-		expire = expire.getTime()/1000
-
-		if (expire < now) addCSSClass(document.documentElement,'PATRON_EXPIRED');
-
-		if (patron.dob()) {
-			var age_parts = patron.dob().substr(0,10).split('-');
-			age_parts[1] = age_parts[1] - 1;
-
-			var born = new Date();
-			born.setFullYear(age_parts[0], age_parts[1], age_parts[2]);
-			born = born.getTime()/1000
-
-			var patron_age = now - born;
-			var years_old = Number(patron_age / TIME.year);
-
-			addCSSClass(document.documentElement,'PATRON_AGE_IS_' + years_old);
-
-			if ( years_old >= 65 ) addCSSClass(document.documentElement,'PATRON_AGE_GE_65');
-			if ( years_old < 65 )  addCSSClass(document.documentElement,'PATRON_AGE_LT_65');
-		
-			if ( years_old >= 24 ) addCSSClass(document.documentElement,'PATRON_AGE_GE_24');
-			if ( years_old < 24 )  addCSSClass(document.documentElement,'PATRON_AGE_LT_24');
-			
-			if ( years_old >= 21 ) addCSSClass(document.documentElement,'PATRON_AGE_GE_21');
-			if ( years_old < 21 )  addCSSClass(document.documentElement,'PATRON_AGE_LT_21');
-		
-			if ( years_old >= 18 ) addCSSClass(document.documentElement,'PATRON_AGE_GE_18');
-			if ( years_old < 18 )  addCSSClass(document.documentElement,'PATRON_AGE_LT_18');
-		
-			if ( years_old >= 13 ) addCSSClass(document.documentElement,'PATRON_AGE_GE_13');
-			if ( years_old < 13 )  addCSSClass(document.documentElement,'PATRON_AGE_LT_13');
-		} else {
-			addCSSClass(document.documentElement,'PATRON_HAS_INVALID_DOB');
-		}
+ try {
+       removeCSSClass(document.documentElement,'PATRON_HAS_BILLS');
+       removeCSSClass(document.documentElement,'PATRON_HAS_OVERDUES');
+       removeCSSClass(document.documentElement,'PATRON_HAS_NOTES');
+       removeCSSClass(document.documentElement,'PATRON_EXCEEDS_CHECKOUT_COUNT');
+       removeCSSClass(document.documentElement,'PATRON_EXCEEDS_OVERDUE_COUNT');
+       removeCSSClass(document.documentElement,'PATRON_EXCEEDS_FINES');
+       removeCSSClass(document.documentElement,'NO_PENALTIES');
+       removeCSSClass(document.documentElement,'ONE_PENALTY');
+       removeCSSClass(document.documentElement,'MULTIPLE_PENALTIES');
+       removeCSSClass(document.documentElement,'PATRON_HAS_ALERT');
+       removeCSSClass(document.documentElement,'PATRON_BARRED');
+       removeCSSClass(document.documentElement,'PATRON_INACTIVE');
+       removeCSSClass(document.documentElement,'PATRON_EXPIRED');
+       removeCSSClass(document.documentElement,'PATRON_HAS_INVALID_DOB');
+       removeCSSClass(document.documentElement,'PATRON_HAS_INVALID_ADDRESS');
+       removeCSSClass(document.documentElement,'PATRON_AGE_GE_65');
+       removeCSSClass(document.documentElement,'PATRON_AGE_LT_65');
+       removeCSSClass(document.documentElement,'PATRON_AGE_GE_24');
+       removeCSSClass(document.documentElement,'PATRON_AGE_LT_24');
+       removeCSSClass(document.documentElement,'PATRON_AGE_GE_21');
+       removeCSSClass(document.documentElement,'PATRON_AGE_LT_21');
+       removeCSSClass(document.documentElement,'PATRON_AGE_GE_18');
+       removeCSSClass(document.documentElement,'PATRON_AGE_LT_18');
+       removeCSSClass(document.documentElement,'PATRON_AGE_GE_13');
+       removeCSSClass(document.documentElement,'PATRON_AGE_LT_13');
+       removeCSSClass(document.documentElement,'PATRON_NET_ACCESS_1');
+       removeCSSClass(document.documentElement,'PATRON_NET_ACCESS_2');
+       removeCSSClass(document.documentElement,'PATRON_NET_ACCESS_3');
+
+  JSAN.use('util.network'); var net = new util.network();
+  net.simple_request('FM_MOUS_RETRIEVE.authoritative',[ ses(), patron.id() ], function(req) {
+   if (req.getResultObject().balance_owed() > 0) addCSSClass(document.documentElement,'PATRON_HAS_BILLS');
+  });
+  net.simple_request('FM_CIRC_COUNT_RETRIEVE_VIA_USER.authoritative',[ ses(), patron.id() ], function(req) {
+   try {
+    var co = req.getResultObject();
+    if (co.overdue > 0 || co.long_overdue > 0) addCSSClass(document.documentElement,'PATRON_HAS_OVERDUES');
+   } catch(E) {
+    alert(E);
+   }
+  });
+  net.simple_request('FM_AUN_RETRIEVE_ALL.authoritative',[ ses(), { 'patronid' : patron.id() } ], function(req) {
+   var notes = req.getResultObject();
+   if (notes.length > 0) addCSSClass(document.documentElement,'PATRON_HAS_NOTES');
+  });
+
+  /*
+  JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+  data.last_patron = patron.id(); data.stash('last_patron');
+  */
+
+  var penalties = patron.standing_penalties();
+  for (var i = 0; i < penalties.length; i++) {
+   /* this comes from /opac/common/js/utils.js */
+   addCSSClass(document.documentElement,penalties[i].standing_penalty().name());
+  }
+
+  switch(penalties.length) {
+   case 0: addCSSClass(document.documentElement,'NO_PENALTIES'); break;
+   case 1: addCSSClass(document.documentElement,'ONE_PENALTY'); break;
+   default: addCSSClass(document.documentElement,'MULTIPLE_PENALTIES'); break;
+  }
+
+  if (patron.alert_message()) {
+   addCSSClass(document.documentElement,'PATRON_HAS_ALERT');
+  }
+
+  if (get_bool( patron.barred() )) {
+   addCSSClass(document.documentElement,'PATRON_BARRED');
+  }
+
+  if (!get_bool( patron.active() )) {
+   addCSSClass(document.documentElement,'PATRON_INACTIVE');
+  }
+
+  try { addCSSClass(document.documentElement,'PATRON_NET_ACCESS_' + patron.net_access_level()); } catch(E) {}
+
+  var now = new Date();
+  now = now.getTime()/1000;
+
+  var expire_parts = patron.expire_date().substr(0,10).split('-');
+  expire_parts[1] = expire_parts[1] - 1;
+
+  var expire = new Date();
+  expire.setFullYear(expire_parts[0], expire_parts[1], expire_parts[2]);
+  expire = expire.getTime()/1000
+
+  if (expire < now) addCSSClass(document.documentElement,'PATRON_EXPIRED');
+
+  if (patron.dob()) {
+   var age_parts = patron.dob().substr(0,10).split('-');
+   age_parts[1] = age_parts[1] - 1;
+
+   var born = new Date();
+   born.setFullYear(age_parts[0], age_parts[1], age_parts[2]);
+   born = born.getTime()/1000
+
+   var patron_age = now - born;
+   var years_old = Number(patron_age / TIME.year);
+
+   addCSSClass(document.documentElement,'PATRON_AGE_IS_' + years_old);
+
+   if ( years_old >= 65 ) addCSSClass(document.documentElement,'PATRON_AGE_GE_65');
+   if ( years_old < 65 )  addCSSClass(document.documentElement,'PATRON_AGE_LT_65');
+  
+   if ( years_old >= 24 ) addCSSClass(document.documentElement,'PATRON_AGE_GE_24');
+   if ( years_old < 24 )  addCSSClass(document.documentElement,'PATRON_AGE_LT_24');
+   
+   if ( years_old >= 21 ) addCSSClass(document.documentElement,'PATRON_AGE_GE_21');
+   if ( years_old < 21 )  addCSSClass(document.documentElement,'PATRON_AGE_LT_21');
+  
+   if ( years_old >= 18 ) addCSSClass(document.documentElement,'PATRON_AGE_GE_18');
+   if ( years_old < 18 )  addCSSClass(document.documentElement,'PATRON_AGE_LT_18');
+  
+   if ( years_old >= 13 ) addCSSClass(document.documentElement,'PATRON_AGE_GE_13');
+   if ( years_old < 13 )  addCSSClass(document.documentElement,'PATRON_AGE_LT_13');
+  } else {
+   addCSSClass(document.documentElement,'PATRON_HAS_INVALID_DOB');
+  }
 
         if ( get_bool( patron.juvenile() ) ) addCSSClass(document.documentElement,'PATRON_JUVENILE');
         else removeCSSClass(document.documentElement,'PATRON_JUVENILE');
 
-		if (patron.mailing_address()) {
-			if (!get_bool(patron.mailing_address().valid())) {
-				addCSSClass(document.documentElement,'PATRON_HAS_INVALID_ADDRESS');
-			}
-		}
-		if (patron.billing_address()) {
-			if (!get_bool(patron.billing_address().valid())) {
-				addCSSClass(document.documentElement,'PATRON_HAS_INVALID_ADDRESS');
-			}
-		}
-
-	} catch(E) {
-		dump('patron.util.set_penalty_css: ' + E + '\n');
-		alert('patron.util.set_penalty_css: ' + E + '\n');
-	}
+  if (patron.mailing_address()) {
+   if (!get_bool(patron.mailing_address().valid())) {
+    addCSSClass(document.documentElement,'PATRON_HAS_INVALID_ADDRESS');
+   }
+  }
+  if (patron.billing_address()) {
+   if (!get_bool(patron.billing_address().valid())) {
+    addCSSClass(document.documentElement,'PATRON_HAS_INVALID_ADDRESS');
+   }
+  }
+
+ } catch(E) {
+  dump('patron.util.set_penalty_css: ' + E + '\n');
+  alert('patron.util.set_penalty_css: ' + E + '\n');
+ }
 }
 
 patron.util.merge = function(record_ids) {
@@ -795,7 +795,7 @@ patron.util.merge = function(record_ids) {
         if (Number(robj) != 1) { throw(robj); }
         return fancy_prompt_data.lead;
     } catch(E) {
-		dump('patron.util.merge: ' + js2JSON(E) + '\n');
+  dump('patron.util.merge: ' + js2JSON(E) + '\n');
         try { error.standard_unexpected_error_alert('Error in patron.util.merge',E); } catch(F) { alert('patron.util.merge: ' + E + '\n'); }
         return false;
     }
diff --git a/Open-ILS/xul/staff_client/server/skin/global.css b/Open-ILS/xul/staff_client/server/skin/global.css
index 8690a86874..c647079b75 100644
--- a/Open-ILS/xul/staff_client/server/skin/global.css
+++ b/Open-ILS/xul/staff_client/server/skin/global.css
@@ -55,13 +55,13 @@ Enable for the windows build.  This slows linux down too much.
 */
 
 .nav { 
-	-moz-appearance: none;
-	margin: 0px;
-	min-width: 6.3em;
-	color: #000000;
-	font-family: arial, san-serif;
-	font-weight: bold;
-	height: 26px;
+ -moz-appearance: none;
+ margin: 0px;
+ min-width: 6.3em;
+ color: #000000;
+ font-family: arial, san-serif;
+ font-weight: bold;
+ height: 26px;
 }
 
 .my_overflow { overflow: auto; }
diff --git a/docs/TechRef/JSONGrammar.html b/docs/TechRef/JSONGrammar.html
index ba6ac3b477..a3f54e46e0 100644
--- a/docs/TechRef/JSONGrammar.html
+++ b/docs/TechRef/JSONGrammar.html
@@ -1,434 +1,434 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
    <title>Grammar of JSON Queries</title><meta name="generator" content="DocBook XSL-NS Stylesheets V1.74.3-pre"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="d0e1"></a>Grammar of JSON Queries</h2></div></div><hr></div><p>
-		<span class="author"><span class="firstname">Scott</span> <span class="surname">McKellar</span></span>
-	</p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="d0e19"></a>Introduction</h3></div></div></div><p> The format of this grammar approximates Extended Backus-Naur notation. However it is
-			intended as input to human beings, not to parser generators such as Lex or Yacc. Do not
-			expect formal rigor. Sometimes narrative text will explain things that are clumsy to
-			express in formal notation. More often, the text will restate or summarize the formal
-			productions. </p><p> Conventions: </p><div class="orderedlist"><ol type="1"><li><p>The grammar is a series of productions.</p></li><li><p>A production consists of a name, followed by "::=", followed by a definition
-					for the name. The name identifies a grammatical construct that can appear on the
-					right side of another production.</p></li><li><p>Literals (including punctuation) are enclosed in 'single quotes', or in
-					"double quotes" if case is not significant.</p></li><li><p>A single quotation mark within a literal is escaped with a preceding
-					backslash: 'dog\'s tail'.</p></li><li><p>If a construct can be defined more than one way, then the alternatives may
-					appear in separate productions; or, they may appear in the same production,
-					separated by pipe symbols. The choice between these representations is of only
-					cosmetic significance.</p></li><li><p>A construct enclosed within square brackets is optional.</p></li><li><p>A construct enclosed within curly braces may be repeated zero or more
-					times.</p></li><li><p>JSON allows arbitrary white space between tokens. To avoid ugly clutter, this
-					grammar ignores the optional white space. </p></li><li><p>In many cases a production defines a JSON object, i.e. a list of name-value
-					pairs, separated by commas. Since the order of these name/value pairs is not
-					significant, the grammar will not try to show all the possible sequences. In
-					general it will present the required pairs first, if any, followed by any
-					optional elements.</p></li></ol></div><p> Since both EBNF and JSON use curly braces and square brackets, pay close attention to
-			whether these characters are in single quotes. If they're in single quotes, they are
-			literal elements of the JSON notation. Otherwise they are elements of the EBNF notation.
-		</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="d0e56"></a>Primitives</h3></div></div></div><p> We'll start by defining some primitives, to get them out of the way. They're mostly
-			just what you would expect. </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[1]</td><td align="right" valign="top" width="10%"><a name="ebnf.string"></a> string </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '"' chars '"' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[2]</td><td align="right" valign="top" width="10%"><a name="ebnf.chars"></a> chars </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> any valid sequence of UTF-8 characters, with certain special characters
-					escaped according to JSON rules </td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[3]</td><td align="right" valign="top" width="10%"><a name="ebnf.integer_literal"></a> integer_literal </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> [ sign ] digit { digit } </td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[4]</td><td align="right" valign="top" width="10%"><a name="ebnf.sign"></a> sign </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '+' | '-' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[5]</td><td align="right" valign="top" width="10%"><a name="ebnf.digit"></a> digit </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%">digit = '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9'</td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[6]</td><td align="right" valign="top" width="10%"><a name="ebnf.integer_string"></a> integer_string </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '"' integer_literal '"' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[7]</td><td align="right" valign="top" width="10%"><a name="ebnf.integer"></a> integer </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> integer_literal | integer_string </td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[8]</td><td align="right" valign="top" width="10%"><a name="ebnf.number"></a> number </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> any valid character sequence that is numeric according to JSON rules </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> When json_query requires an integral value, it will usually accept a quoted string
-			and convert it to an integer by brute force &#8211; to zero if necessary. Likewise it may
-			truncate a floating point number to an integral value. Scientific notation will be
-			accepted but may not give the intended results. </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[9]</td><td align="right" valign="top" width="10%"><a name="ebnf.boolean"></a> boolean </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> 'true' | 'false' | string | number </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> The preferred way to encode a boolean is with the JSON reserved word true or false,
-			in lower case without quotation marks. The string <code class="literal">true</code>, in upper,
-			lower, or mixed case, is another way to encode true. Any other string evaluates to
-			false. </p><p> As an accommodation to perl, numbers may be used as booleans. A numeric value of 1
-			means true, and any other numeric value means false. </p><p> Any other valid JSON value, such as an array, will be accepted as a boolean but
-			interpreted as false. </p><p> The last couple of primitives aren't really very primitive, but we introduce them
-			here for convenience: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[10]</td><td align="right" valign="top" width="10%"><a name="ebnf.class_name"></a> class_name </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> string </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> A class_name is a special case of a string: the name of a class as defined by the
-			IDL. The class may refer either to a database table or to a source_definition, which is
-			a subquery. </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[11]</td><td align="right" valign="top" width="10%"><a name="ebnf.field_name"></a> field_name </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> string </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> A field_name is another special case of a string: the name of a non-virtual field as
-			defined by the IDL. A field_name is also a column name for the table corresponding to
-			the relevant class. </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="d0e185"></a>Query</h3></div></div></div><p> The following production applies not only to the main query but also to most
-			subqueries. </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[12]</td><td align="right" valign="top" width="10%"><a name="ebnf.query"></a> query </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{'<br> '"from"' ':' from_list<br> [ ',' '"select"' ':' select_list
-					]<br> [ ',' '"where"' ':' where_condition ]<br> [ ',' '"having"' ':'
-					where_condition ]<br> [ ',' '"order_by"' ':' order_by_list ]<br> [ ','
-					'"limit"' ':' integer ]<br> [ ',' '"offset"' ':' integer ]<br> [ ','
-					'"distinct"' ':' boolean ]<br> [ ',' '"no_i18n"' ':' boolean ]<br> '}'
-				</td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> Except for the <code class="literal">"distinct"</code> and <code class="literal">no_i18n</code> entries,
-			each name/value pair represents a major clause of the SELECT statement. The name/value
-			pairs may appear in any order. </p><p> There is no name/value pair for the GROUP BY clause, because json_query generates it
-			automatically according to information encoded elsewhere. </p><p> The <code class="literal">"distinct"</code> entry, if present and true, tells json_query that
-			it may have to create a GROUP BY clause. If not present, it defaults to false. </p><p> The <code class="literal">"no_i18n"</code> entry, if present and true, tells json_query to
-			suppress internationalization. If not present, it defaults to false. (Note that
-				<code class="literal">"no_i18n"</code> contains the digit one, not the letter ell.) </p><p> The values for <code class="literal">limit</code> and <code class="literal">offset</code> provide the
-			arguments of the LIMIT and OFFSET clauses, respectively, of the SQL statement. Each
-			value should be non-negative, if present, or else the SQL won't work. </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="d0e252"></a>FROM Clause</h3></div></div></div><p>
-			The object identified by <code class="literal">&#8220;from&#8221;</code> encodes the FROM clause of
-			the SQL.  The associated value may be a string, an array, or a JSON object.
-		</p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[13]</td><td align="right" valign="top" width="10%"><a name="ebnf.from_list_0"></a> from_list </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> class_name </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p>
-			If <code class="literal">from_list</code> is a <code class="literal">class_name</code>, the
-			json_query inserts the corresponding table name or subquery into the FROM
-			clause, using the <code class="literal">class_name</code> as an alias for the table
-			or subquery.  The class must be defined as non-virtual in the IDL.
-		</p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[14]</td><td align="right" valign="top" width="10%"><a name="ebnf.from_list_1"></a> from_list </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '['  string  {  ','  parameter  }  ']' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[15]</td><td align="right" valign="top" width="10%"><a name="ebnf.parameter"></a> parameter </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> string  |  number  |  'null' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p>
-			If from_list is a JSON array, then it represents a table-like function from
-			which the SQL statement will select rows, using a SELECT clause consisting
-			of &#8220;SELECT *&#8221; (regardless of the select_list supplied by the method parameter).
-		</p><p>
-			The first entry in the array is the name of the function.  It must be a string
-			naming a stored function.  Each subsequent entry is a function parameter.  If
-			it is a string or a number, json_query will insert it into a comma-separated
-			parameter list, enclosed in quotes, with any special characters escaped as needed.
-			If it is the JSON reserved word <code class="literal">null</code>, json_query will insert
-			it into the parameter list as a null value.
-		</p><p>
-			If <code class="literal">from_list</code> is a JSON object, it must contain exactly one entry.
-			The key of this entry must be the name of a non-virtual class defined in the IDL.
-			This class will be the top-level class of the FROM clause, the only one named
-			outside of a JOIN clause.
-		</p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[16]</td><td align="right" valign="top" width="10%"><a name="ebnf.from_list_2"></a> from_list </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{' class_name ':' join_list '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[17]</td><td align="right" valign="top" width="10%"><a name="ebnf.join_list_0"></a> join_list </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> class_name </td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[18]</td><td align="right" valign="top" width="10%"><a name="ebnf.join_list_1"></a> join_list </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{' join_def { ',' join_def } '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p>
-			If the associated data is a <code class="literal">class_name</code>, json_query will
-			construct an INNER JOIN clause joining the class to the top-level clause,
-			using the columns specified by the IDL for such a join.
-		</p><p>
-			Otherwise, the associated data must be a JSON object with one or more entries,
-			each entry defining a join:
-		</p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[19]</td><td align="right" valign="top" width="10%"><a name="ebnf.join_def"></a> join_def </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%">
-					class_name  ':'<br>
-					'{'<br>
-					[  '&#8221;type&#8221;'      ':'  string      ]<br>
-					[  '&#8221;field&#8221;'     ':'  field_name  ]<br>
-					[  '&#8221;fkey&#8221;'      ':'  field_name  ]<br>
-					[  '&#8221;filter&#8221;'    ':'  where_condition  ]<br>
-					[  '&#8221;filter_op&#8221;' ':'  string      ]<br>
-					[  '&#8221;join&#8221;'      ':'  join_list   ]<br>
-					'}'
-				</td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p>
-			The data portion of the <code class="literal">&#8220;join_type&#8221;</code> entry tells json_query
-			whether to use a left join, right join, full join, or inner join.  The values
-			<code class="literal">&#8220;left&#8221;</code>, <code class="literal">&#8220;right&#8221;</code>, and <code class="literal">&#8220;full&#8221;</code>,
-			in upper, lower, or mixed case, have the obvious meanings.  If the
-			<code class="literal">&#8220;join_type&#8221;</code> entry has any other value, or is not present,
-			json_query constructs an inner join.
-		</p><p>
-			The <code class="literal">&#8220;field&#8221;</code> and <code class="literal">&#8220;fkey&#8221;</code> attributes specify the
-			columns to be equated in the join condition.  The <code class="literal">&#8220;field&#8221;</code>
-			attribute refers to the column in the joined table, i.e. the one named by the
-			<code class="literal">join_def</code>.  The <code class="literal">&#8220;fkey&#8221;</code> attribute refers to the
-			corresponding column in the other table, i.e. the one named outside the
-			<code class="literal">join_def</code> &#8211; either the top-level table or a table named by some
-			other <code class="literal">join_def</code>.
-		</p><p>
-			It may be tempting to suppose that <code class="literal">&#8220;fkey&#8221;</code> stands for &#8220;foreign key&#8221;,
-			and therefore refers to a column in the child table that points to the key of a
-			parent table.  Resist the temptation; the labels are arbitrary.  The json_query
-			method doesn't care which table is the parent and which is the child.
-		</p><p>
-			These relationships are best explained with an example.  The following
-			<code class="literal">from_list</code>:
-		</p><div class="informalexample"><pre class="programlisting">
-	{
-	    "aou": {
-	        "asv": {
-	            "type" : "left",
-	            "fkey" : "id",
-	            "field" : "owner"
-	        }
-	    }
-	}
-			</pre></div><p>
-			...turns into the following FROM clause:
-		</p><div class="informalexample"><pre class="programlisting">
-	FROM
-	    actor.org_unit AS "aou"
-	        LEFT JOIN action.survey AS "asv"
-	            ON ( "asv".owner = "aou".id )
-			</pre></div><p>
-			Note in this example that <code class="literal">&#8220;fkey&#8221;</code> refers to a column of the
-			class <code class="literal">&#8220;aou&#8221;</code>, and <code class="literal">&#8220;field&#8221;</code> refers to a
-			column of the class <code class="literal">&#8220;asv&#8221;</code>.
-		</p><p>
-			If you specify only one of the two columns, json_query will try to identify the
-			other one from the IDL. However, if you specify only the column from the parent
-			table, this attempt will probably fail.
-		</p><p>
-			If you specify both columns, json_query will use the column names you specify,
-			without verifying them with a lookup in the IDL.  By this means you can perform
-			a join using a linkage that the IDL doesn't define.  Of course, if the columns
-			don't exist in the database, the query will fail when json_query tries to execute it.
-		</p><p>
-			Using the columns specified, either explicitly or implicitly, the json_query
-			method constructs a join condition.  With raw SQL it is possible (though
-			rarely useful) to join two tables by an inequality.  However the json_query
-			method always uses a simple equality condition.
-		</p><p>
-			Using a <code class="literal">&#8220;filter&#8221;</code> entry in the join_def, you can apply one
-			or more additional conditions to the JOIN clause, typically to restrict the
-			join to certain rows of the joined table.  The data associated with the
-			<code class="literal">&#8220;filter&#8221;</code> key is the same sort of
-			<code class="literal">where_condition</code> that you use for a WHERE clause
-			(discussed below).
-		</p><p>
-			If the string associated with the <code class="literal">&#8220;filter_op&#8221;</code> entry is
-			<code class="literal">&#8220;OR&#8221;</code> in upper, lower, or mixed case, then the json_query
-			method uses OR to connect the standard join condition to any additional
-			conditions supplied by a <code class="literal">&#8220;filter&#8221;</code> entry.
-		</p><p>
-			(Note that if the <code class="literal">where_condition</code> supplies multiple
-			conditions, they will be connected by AND.  You will probably want to move
-			them down a layer &#8211; enclose them in parentheses, in effect &#8211; to avoid a
-			confusing mixture of ANDs and ORs.)
-		</p><p>
-			If the <code class="literal">&#8220;filter_op&#8221;</code> entry carries any other value, or if
-			it is absent, then the json_query method uses AND.  In the absence of a
-			<code class="literal">&#8220;filter&#8221;</code> entry, <code class="literal">&#8220;filter_op&#8221;</code> has no effect.
-		</p><p>
-			A <code class="literal">&#8220;join&#8221;</code> entry in a <code class="literal">join_def</code> specifies
-			another layer of join.  The class named in the subjoin is joined to the class
-			named by the <code class="literal">join_def</code> to which it is subordinate.  By this
-			means you can encode multiple joins in a hierarchy.
-		</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="d0e504"></a>SELECT Clause</h3></div></div></div><p>
-			If a query does not contain an entry for <code class="literal">&#8220;select&#8221;</code>, json_query
-			will construct a default SELECT clause.  The default includes every non-virtual
-			field from the top-level class of the FROM clause, as defined by the IDL.  The
-			result is similar to SELECT *, except:
-		</p><div class="itemizedlist"><ul type="disc"><li><p>The default includes only the fields defined in the IDL.</p></li><li><p>The columns will appear in the same order in which they appear in the IDL,
-				regardless of the order in which the database defines them.</p></li></ul></div><p>
-			There are other ways to specify a default SELECT list, as shown below.
-		</p><p>
-			If a <code class="literal">"select"</code> entry is present, the associated value must
-			be a JSON object, keyed on class names:
-		</p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[20]</td><td align="right" valign="top" width="10%"><a name="ebnf.select_list"></a> select_list </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{' class_name ':' field_list { ',' class_name ':' field_list } '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p>
-			The <code class="literal">class_name</code> must identify either the top-level class or
-			a class belonging to one of the joins.  Otherwise json_query will silently
-			ignore the <code class="literal">select_list</code>.
-		</p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[21]</td><td align="right" valign="top" width="10%"><a name="ebnf.field_list_0"></a> field_list </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> 'null'  |  '&#8221;*&#8221;' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p>
-			If a field_list is either the JSON reserved word <code class="literal">null</code>
-			(in lower case) or an asterisk in double quotes, json_query constructs a
-			default SELECT list &#8211; provided that the class is the top-level class of the
-			query.  If the class belongs to a join somewhere, json_query ignores the
-			<code class="literal">field_list</code>.
-		</p><p>
-			More commonly, the <code class="literal">field_list</code> is a JSON array of zero or
-			more field specifications:
-		</p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[22]</td><td align="right" valign="top" width="10%"><a name="ebnf.field_list_1"></a> field_list </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '['  [  field_spec  {  ','  field_spec  }  ]  ']' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p>
-			If the array is empty, json_query will construct a default SELECT list for
-			the class &#8211; again, provided that the class is the top-level class in the query.
-		</p><p>
-			In the simplest case, a field specification may name a non-virtual field
-			defined in the IDL:
-		</p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[23]</td><td align="right" valign="top" width="10%"><a name="ebnf.field_spec_0"></a> field_spec </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> field_name </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p>
-			In some cases json_query constructs a call to the
-			<code class="literal">oils_i18n_xlate</code> function to internationalize the value of the
-			selected column.  Specifically, it does so if all the following are true:
-		</p><div class="itemizedlist"><ul type="disc"><li><p>the settings file defines a locale;</p></li><li><p>in the field definition for the field in the IDL, the tag
-				<code class="literal">&#8220;il8n&#8221;</code> is present and true;</p></li><li><p>the query does <span class="emphasis"><em>not</em></span> include the
-				<code class="literal">"no_il8n"</code> tag (or includes it with a value of false).</p></li></ul></div><p>
-			A field specification may be a JSON object:
-		</p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[24]</td><td align="right" valign="top" width="10%"><a name="ebnf.field_spec_1"></a> field_spec </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%">
-					'{'<br>
-					'&#8221;column&#8221;'  ':'  <br>
-					[ ',' '&#8221;alias&#8221;'  ':'  string  ]<br>
-					[ ',' '&#8221;aggregate&#8221;'  ':'  boolean  ]<br>
-					[ ',' transform_spec  ]<br>
-					'}'
-				</td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p>
-			The <code class="literal">&#8220;column&#8221;</code> entry provides the column name, which must
-			be defined as non-virtual in the IDL.
-		</p><p>
-			The <code class="literal">&#8220;alias&#8221;</code> entry provides a column alias.  If no alias
-			is specified, json_query uses the column name as its own alias.
-		</p><p>
-			The <code class="literal">&#8220;aggregate&#8221;</code> entry has no effect on the SELECT clause
-			itself.  Rather, it affects the construction of a GROUP BY class.  If there
-			is an <code class="literal">&#8220;aggregate&#8221;</code> entry for any field, then json_query builds
-			a GROUP BY clause listing every column that is <span class="emphasis"><em>not</em></span> tagged
-			for aggregation (or that carries an <code class="literal">&#8220;aggregate&#8221;</code> entry with
-			a value of false).  If <span class="emphasis"><em>all</em></span> columns are tagged for
-			aggregation, then json_query omits the GROUP BY clause.
-		</p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[25]</td><td align="right" valign="top" width="10%"><a name="ebnf.transform_spec_0"></a> transform_spec </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%">
-					'&#8221;transform&#8221;'  ':'  string  ]<br>
-					[ ',' '&#8221;result_field&#8221;  ':'  string  ]<br>
-					[ ',' '&#8221;params&#8221;  ':' param_list  ]
-				</td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p>
-			When a <code class="literal">transform_spec</code> is present, json_query selects the
-			return value of a function instead of selecting the column directly.  The entry
-			for <code class="literal">&#8220;transform&#8221;</code> provides the name of the function, and the
-			column name (as specified by the <code class="literal">&#8220;column&#8221;</code> tag), qualified by
-			the class name, is the argument to the function.  For example, you might use such
-			a function to format a date or time, or otherwise transform a column value.
-			You might also use an aggregate function such as SUM, COUNT, or MAX (possibly
-			together with the <code class="literal">&#8220;aggregate&#8221;</code> tag).
-		</p><p>
-			The <code class="literal">&#8220;result_field&#8221;</code> entry, when present, specifies a subcolumn
-			of the function's return value.  The resulting SQL encloses the function call
-			in parentheses, and follows it with a period and the subcolumn name.
-		</p><p>
-			The <code class="literal">&#8220;params&#8221;</code> entry, if present, provides a possibly empty
-			array of additional parameter values, either strings, numbers, or nulls:
-		</p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[26]</td><td align="right" valign="top" width="10%"><a name="ebnf.param_list"></a> param_list </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '['  [  parameter  {  ','  parameter  }  ]  ']' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p>
-			Such parameter values are enclosed in single quotes, with any special characters
-			escaped as needed, and inserted after the column name as additional parameters
-			to the function.  You might, for example, use an additional parameter to provide
-			a format string for a reformatting function.
-		</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="d0e721"></a>WHERE Clause</h3></div></div></div><p> There are two types of <code class="literal">where_condition</code>: objects and arrays.
-			Of these, the object type is the more fundamental, and occurs at some level in every
-			<code class="literal">where_condition</code>.  The array type is mainly a way of circumventing
-			a limitation of the object type. </p><p> The object type of <code class="literal">where_condition</code> is a comma-separated list
-			of one or more <code class="literal">conditions</code>: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[27]</td><td align="right" valign="top" width="10%"><a name="ebnf.where_condition_0"></a> where_condition </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{' condition { ',' condition } '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> The generated SQL will include a code fragment for each <code class="literal">condition</code>,
-			joined by AND (or in some cases by OR, as described below). </p><p> As usual for entries in a JSON object, each <code class="literal">condition</code> consists
-			of a unique string to serve as a key, a colon, and an associated value. </p><p> The key string may be the name of a column belonging to the relevant table, or
-			it may be an operator string.  In order to distinguish it from any possible column
-			name, an operator string always begins with a plus sign or minus sign. </p><p> JSON requires that every key string be unique within an object.  This requirement
-			imposes some awkward limitations on a JSON query.  For example, you might want to
-			express two conditions for the same column: id &gt; 10 and id != 25.  Since each of
-			those conditions would have the same key string, namely &#8220;id&#8221;, you can't put them
-			into the same JSON object. </p><p> The solution is to put such conflicting conditions in separate JSON objects, and
-			put the objects into an array: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[28]</td><td align="right" valign="top" width="10%"><a name="ebnf.where_condition_1"></a> where_condition </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '[' where_condition { ',' where_condition } ']' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> The resulting SQL encloses each subordinate set of <code class="literal">conditions</code>
-			in parentheses, and connects the sets with AND (or in some cases OR, as described
-			below).  It's possible to put only a single <code class="literal">where_condition</code> in
-			the array; the result is to add a layer of parentheses around the condition. </p><p> There are two kinds of <code class="literal">condition</code> where the operator begins
-			with a plus sign.  In the simpler case, the associated data is simply a column name:
-		</p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[29]</td><td align="right" valign="top" width="10%"><a name="ebnf.condition_0"></a> condition </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> plus_class ':' field_name </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> A <code class="literal">plus_class</code> is a string that begins with a plus sign.
-			The rest of the string, after the plus sign, must be the class name for the table
-			to which the column belongs. </p><p> If the column is a boolean, then the resulting SQL uses it (as qualified by the
-			class name) as a stand-alone condition. </p><p> Otherwise, this kind of syntax provides a way to place a column on the right side
-			of a comparison operator.  For example: </p><div class="informalexample"><pre class="programlisting">
-	{
-	    "from":"aou",
-	    "select": { "aou":[ "id", "name" ] },
-	    "where": {
-	        "id": {
-	            "&gt;": { "+aou":"parent_ou" }
-	        }
-	    }
-	}
-			</pre></div><p> The resulting SQL: </p><div class="informalexample"><pre class="programlisting">
-	SELECT
-	    "aou".id AS "id",
-	    "aou".name AS "name"
-	FROM
-	    actor.org_unit AS "aou"
-	WHERE
-	    (
-	        "aou".id &gt; (  "aou".parent_ou  )
-	    );
-			</pre></div><p> The other type of <code class="literal">condition</code> that uses a
-			<code class="literal">plus_class</code> applies a specified class name to a
-			<code class="literal">where_condition</code>: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[30]</td><td align="right" valign="top" width="10%"><a name="ebnf.condition_1"></a> condition </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> plus_class ':' where_condition </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> The resulting SQL is enclosed in parentheses, and qualifies the columns with
-			the specified class name.  This syntax provides a mechanism to shift the class
-			context &#8211; i.e. to refer to one class in a context that would otherwise refer to
-			a different class. </p><p> Ordinarily the class name must be a valid non-virtual class defined in the IDL,
-			and applicable to the associated <code class="literal">where_condition</code>.  There is at
-			least one peculiar exception.  The JSON fragment: </p><div class="informalexample"><pre class="programlisting">
-	"+abc": { "+xyz":"frobozz" }
-			</pre></div><p> ...is rendered as: </p><div class="informalexample"><pre class="programlisting">
-	(  "xyz".frobozz  )
-			</pre></div><p> ...even though neither <code class="literal">&#8220;abc&#8221;</code>, nor <code class="literal">&#8220;xyz&#8221;</code>,
-			nor <code class="literal">&#8220;frobozz&#8221;</code> is defined in the IDL.  The class name
-			<code class="literal">&#8220;abc&#8221;</code> isn't used at all because the <code class="literal">&#8220;+xyz&#8221;</code>
-			operator overrides it.  Such a query won't fail until json_query tries
-			to execute it in the database. </p><p> The other operators that may occur at this level all begin with a minus sign,
-			and they all represent familiar SQL operators.  For example, the
-			<code class="literal">&#8220;-or&#8221;</code> operator joins the conditions within a
-			<code class="literal">where_condition</code> by OR (instead of the default AND), and
-			encloses them all in parentheses: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[31]</td><td align="right" valign="top" width="10%"><a name="ebnf.condition_2"></a> condition </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '&#8221;-or&#8221;' ':' where_condition </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> In fact the <code class="literal">&#8220;-or&#8221;</code> operator is the only way to get OR into
-			the WHERE clause. </p><p> The <code class="literal">&#8220;-and&#8221;</code> operator is similar, except that it uses AND: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[32]</td><td align="right" valign="top" width="10%"><a name="ebnf.condition_3"></a> condition </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '&#8221;-and&#8221;' ':'  where_condition </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> Arguably the <code class="literal">&#8220;-and&#8221;</code> operator is redundant, because you can
-			get the same effect by wrapping the subordinate <code class="literal">where_condition</code>
-			in a JSON array.  Either technique merely adds a layer of parentheses, since AND
-			connects successive conditions by default. </p><p> The <code class="literal">&#8220;-not&#8221;</code> operator expands the subordinate
-			<code class="literal">where_condition</code> within parentheses, and prefaces the result
-			with NOT: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[33]</td><td align="right" valign="top" width="10%"><a name="ebnf.condition_4"></a> condition </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '&#8221;-not&#8221;' ':'  where_condition </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> The <code class="literal">&#8220;-exists&#8221;</code> or <code class="literal">&#8220;-not-exists&#8221;</code> operator
-			constructs a subquery within an EXISTS  or NOT EXISTS clause, respectively: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[34]</td><td align="right" valign="top" width="10%"><a name="ebnf.condition_5"></a> condition </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '&#8221;-exists&#8221;' ':' query </td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[35]</td><td align="right" valign="top" width="10%"><a name="ebnf.condition_6"></a> condition </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '&#8221;-not-exists&#8221;' ':' query </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> The remaining kinds of <code class="literal">condition</code> all have a
-			<code class="literal">field_name</code> on the left and some kind of <code class="literal">predicate</code>
-			on the right.  A <code class="literal">predicate</code> places a constraint on the value of
-			the column &#8211; or, in some cases, on the value of the column as transformed by some
-			function call: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[36]</td><td align="right" valign="top" width="10%"><a name="ebnf.condition_7"></a> condition </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> field_name ':' predicate </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> The simplest such constraint is to require that the column have a specific value,
-			or be null: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[37]</td><td align="right" valign="top" width="10%"><a name="ebnf.predicate_0"></a> predicate </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> lit_value | 'null' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[38]</td><td align="right" valign="top" width="10%"><a name="ebnf.lit_value"></a> lit_value </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> string | number </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> You can also compare a column to a literal value using some kind of inequality.
-			However it's a bit more complicated because you have to specify what kind of comparison
-			to make: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[39]</td><td align="right" valign="top" width="10%"><a name="ebnf.compare_op_0"></a> predicate </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{' compare_op ':' lit_value '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[40]</td><td align="right" valign="top" width="10%"><a name="ebnf.compare_op_1"></a> compare_op </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> string </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> A <code class="literal">compare_op</code> is a string that defines a comparison operator.
-			Valid values include the following: </p><pre class="programlisting">
-	=    &lt;&gt;   !=
-	&lt;    &gt;    &lt;=   &gt;=
-	~    ~*   !~   !~*
-	like      ilike
-	similar to
-		</pre><p> Strictly speaking, json_query accepts any <code class="literal">compare_op</code>
-			that doesn't contain semicolons or white space (or
-			<code class="literal">&#8220;similar to&#8221;</code> as a special exception).  As a result, it
-			is possible &#8211; and potentially useful &#8211; to use a custom operator like
-			<code class="literal">&#8220;&gt;100*&#8221;</code> in order to insert an expression that would
-			otherwise be difficult or impossible to create through a JSON query.  The ban
-			on semicolons and white space prevents certain kinds of SQL injection. </p><p> Note that json_query does <span class="emphasis"><em>not</em></span> accept two operators that
-			PostgreSQL <span class="emphasis"><em>does</em></span> accept: <code class="literal">&#8220;is distinct from&#8221;</code>
-			and <code class="literal">&#8220;is not distinct from&#8221;</code>. </p><p> You can also compare a column to a null value: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[41]</td><td align="right" valign="top" width="10%"><a name="ebnf.predicate_1"></a> predicate </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{' compare_op ':' 'null' '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> The equality operator <code class="literal">&#8220;=&#8221;</code> turns into IS NULL.  Any other
-			operator turns into IS NOT NULL. </p><p> When a <code class="literal">compare_op</code> is paired with an array, it defines a
-			function call: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[42]</td><td align="right" valign="top" width="10%"><a name="ebnf.predicate_2"></a> predicate </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{' compare_op ':' '[' string { ',' parameter } ']' '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> The first entry in the array is the function's name.  Subsequent entries in
-			the array, if any, represent the parameters of the function call.  They may be
-			strings, numbers, or nulls.  In the generated SQL, the function call appears on
-			the right of the comparison. </p><p> The <code class="literal">&#8220;between&#8221;</code> operator creates a BETWEEN clause: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[43]</td><td align="right" valign="top" width="10%"><a name="ebnf.predicate_3"></a> predicate </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{'  &#8220;between&#8221;  ':'  '['  lit_value  ','  lit_value  ']'  '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> Although PostgreSQL allows a null value in a BETWEEN clause, json_query
-			requires literal non-null values.  It isn't sensible to use null values in a
-			BETWEEN clause.  A few experiments show that the results of the comparison are
-			peculiar and erratic. </p><p> There are two ways to create an IN list of allowed values.  The simplest is
-			to put literal values into a JSON array: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[44]</td><td align="right" valign="top" width="10%"><a name="ebnf.predicate_4"></a> predicate </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '[' lit_value { ',' lit_value }  ']' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> As with BETWEEN clauses, json_query does not accept null values in an IN list,
-			even though PostgreSQL does allow them.  Nulls are not sensible in this context
-			because they never match anything. </p><p>  </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="d0e1140"></a>Having Clause</h3></div></div></div><p>For the HAVING clause, json_query accepts exactly the same syntax as it accepts for
-			the WHERE clause.</p><p> The other way to create an IN list is to use an explicit
-			<code class="literal">&#8220;in&#8221;</code> operator with an array of literal values.  This format
-			also works for the <code class="literal">&#8220;not in&#8221;</code> operator: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[45]</td><td align="right" valign="top" width="10%"><a name="ebnf.predicate_5"></a> predicate </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{' in_operator ';'  '[' lit_value [ ',' lit_value ]  ']'  '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[46]</td><td align="right" valign="top" width="10%"><a name="ebnf.in_operator"></a> in_operator </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> &#8220;in&#8221;  |  &#8220;not in&#8221; </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> Another kind of IN or NOT IN clause uses a subquery instead of a list of
-			values: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[47]</td><td align="right" valign="top" width="10%"><a name="ebnf.predicate_6"></a> predicate </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{' in_operator ':'  query  '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> The remaining types of <code class="literal">predicate</code> can put a function call on
-			the left of the comparison, by using a <code class="literal">transform_spec</code> together
-			with a <code class="literal">&#8220;value&#8221;</code> tag.   The <code class="literal">transform_spec</code> is
-			optional, and if you don't need it, the same SQL would in many cases be easier to
-			express by other means. </p><p> The <code class="literal">transform_spec</code> construct was described earlier in
-			connection with the SELECT clause, but here it is again: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[48]</td><td align="right" valign="top" width="10%"><a name="ebnf.transform_spec_1"></a> transform_spec </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%">
-					'&#8221;transform&#8221;'  ':'  string  ]<br>
-					[ ',' '&#8221;result_field&#8221;  ':'  string  ]<br>
-					[ ',' '&#8221;params&#8221;  ':' param_list  ]
-				</td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> As in the SELECT clause, the <code class="literal">&#8220;transform&#8221;</code> string names the
-			function.  The first parameter is always the column identified by the field_name.
-			Additional parameters, if any, appear in the <code class="literal">param_list</code>.  The
-			<code class="literal">&#8220;result_field&#8221;</code> string, if present, identifies one column of a
-			multicolumn return value. </p><p> Here's a second way to compare a value to a literal value (but not to a null
-			value): </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[49]</td><td align="right" valign="top" width="10%"><a name="ebnf.predicate_7"></a> predicate </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{' compare_op ':' '{' '&#8221;value&#8221;' ':' lit_value<br>
-					[ transform_spec ] '}' '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> ...and a way to compare a value to a boolean expression: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[50]</td><td align="right" valign="top" width="10%"><a name="ebnf.predicate_8"></a> predicate </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{' compare_op ':' '{' '&#8221;value&#8221;' ':' '{'<br>
-					condition { ',' condition } [ transform_spec ] '}' '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> The final predicate is another way to put a function call on the right side
-			of the comparison: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[51]</td><td align="right" valign="top" width="10%"><a name="ebnf.predicate_9"></a> predicate </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{' compare_op ':' '{' '&#8221;value&#8221;' ':' '['<br>
-					string { ',' parameter } ']' [ transform_spec ] '}' '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> This format is available for the sake of consistency, but offers no advantage
-			over the simpler version. </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="d0e1278"></a>ORDER BY Clause</h3></div></div></div><p> There are two ways to encode an ORDER BY clause: as an array, or as a list.
-			Either may be empty, in which case the generated SQL will not include an ORDER BY
-			clause: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[52]</td><td align="right" valign="top" width="10%"><a name="ebnf.order_by_list_0"></a> order_by_list </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '['  ']'  |  '{'  '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> If not empty, the array contains one or more objects, each defining a sort
-			field: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[53]</td><td align="right" valign="top" width="10%"><a name="ebnf.order_by_list_1"></a> order_by_list </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{' sort_field_def  {  ','  sort_field_def }  '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[54]</td><td align="right" valign="top" width="10%"><a name="ebnf.sort_field_def"></a> sort_field_def </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{'<br>
-					'&#8221;class&#8221;'  ':'  class_name<br>
-					','  '&#8221;field&#8221;'  ':'  field_name<br>
-					[  ','  '&#8221;direction&#8221;'  ':'  lit_value  ]<br>
-					[  ','  transform_spec  ]<br>
-					'}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> The <code class="literal">&#8220;class&#8221;</code> and <code class="literal">&#8220;field&#8221;</code> entries are
-			required, and of course the field must belong to the class.  Furthermore, at
-			least one field from the class must appear in the SELECT clause. </p><p> The <code class="literal">&#8220;direction&#8221;</code> entry, if present, specifies whether the
-			sort will be ascending or descending for the column in question.  If the associated
-			value begins with &#8220;D&#8221; or &#8220;d&#8221;, the sort will be descending; otherwise the sort will
-			be ascending.  If the value is a number, it will be treated as a string that does not
-			start with &#8220;D&#8221; or &#8220;d&#8221;, resulting in an ascending sort. </p><p> In the absence of a <code class="literal">&#8220;direction&#8221;</code> entry, the sort will be
-			ascending. </p><p> The <code class="literal">transform_spec</code> works here the same way it works in the
-			SELECT clause and the WHERE clause, enabling you to pass the column through a
-			transforming function before the sort: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[55]</td><td align="right" valign="top" width="10%"><a name="ebnf.transform_spec_2"></a> transform_spec </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%">
-					'&#8221;transform&#8221;'  ':'  string  ]<br>
-					[ ',' '&#8221;result_field&#8221;  ':'  string  ]<br>
-					[ ',' '&#8221;params&#8221;  ':' param_list  ]
-				</td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> When the <code class="literal">order_by_list</code> is an object instead of an array,
-			the syntax is less verbose, but also less flexible.  The keys for the object are
-			class names: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[56]</td><td align="right" valign="top" width="10%"><a name="ebnf.order_by_list_2"></a> order_by_list </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{' class_name ':' sort_class_def<br>
-					{ ',' class_name ':' sort_class_def } '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> Each class must be referenced in the SELECT clause. </p><p> As in the SELECT clause, all the fields for a given class must be grouped
-			together.  You can't sort by a column from one table, then a column from a second
-			table, then another column from the first table. If you need this kind of sort,
-			you must encode the ORDER BY clause as an array instead of an object. </p><p> The data associated with a <code class="literal">class_name</code> may be either an array
-			or an object.  If an array, it's simply a list of field names, and each field must
-			belong to the class: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[57]</td><td align="right" valign="top" width="10%"><a name="ebnf.sort_class_def_0"></a> sort_class_def </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '['  field_name  { ','  field_name }  ']' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> With this syntax, the direction of sorting will always be ascending. </p><p> If the data is an object, the keys are field names, and as usual the fields
-			must belong to the class: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[58]</td><td align="right" valign="top" width="10%"><a name="ebnf.sort_class_def_1"></a> sort_class_def </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{'  field_name  ':' sort_class_subdef<br>
-					{ ','  field_name  ':' sort_class_subdef  }  '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> Since the <code class="literal">field_name</code> is the key for the object, it cannot
-			appear more than once.  As a result, some kinds of sorts are not possible with this
-			syntax.  For example, one might want to sort by UPPER( family_name ), and then by
-			family_name with case unchanged, to make sure that &#8220;diBona&#8221; comes before &#8220;Dibona&#8221;.
-			For situations like this, you must encode the ORDER BY clause as an array rather
-			than an object. </p><p> The data associated with each <code class="literal">field_name</code> may take either of
-			two forms.  In the simplest case, it's a literal value to specify the direction
-			of sorting: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[59]</td><td align="right" valign="top" width="10%"><a name="ebnf.sort_class_subdef_0"></a> sort_class_subdef </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> lit_value </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> If the literal is a string starting with &#8220;D&#8221; or &#8220;d&#8221;, json_query sorts the field
-			in descending order.  Otherwise it sorts the field in ascending order. </p><p> In other cases, the <code class="literal">field_name</code> may be paired with an object
-			to specify more details: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[60]</td><td align="right" valign="top" width="10%"><a name="ebnf.sort_class_subdef_1"></a> sort_class_subdef </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{'<br>
-					[  '&#8221;direction&#8221;'  ':'  lit_value ]<br>
-					[  transform_spec  ]<br>
-					'}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> As before, the value tagged as <code class="literal">&#8220;direction&#8221;</code> specifies the
-			direction of the sort, depending on the first character.  If not otherwise
-			specified, the sort direction defaults to ascending. </p><p> Also as before, the <code class="literal">transform_spec</code> may specify a function
-			through which to pass the column. </p><p> Since both the <code class="literal">&#8220;direction&#8221;</code> tag and the
-			<code class="literal">transform_spec</code> are optional, the object may be empty: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[61]</td><td align="right" valign="top" width="10%"><a name="ebnf.sort_class_subdef_2"></a> sort_class_subdef </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{'  '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table></div></div></body></html>
\ No newline at end of file
+  <span class="author"><span class="firstname">Scott</span> <span class="surname">McKellar</span></span>
+ </p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="d0e19"></a>Introduction</h3></div></div></div><p> The format of this grammar approximates Extended Backus-Naur notation. However it is
+   intended as input to human beings, not to parser generators such as Lex or Yacc. Do not
+   expect formal rigor. Sometimes narrative text will explain things that are clumsy to
+   express in formal notation. More often, the text will restate or summarize the formal
+   productions. </p><p> Conventions: </p><div class="orderedlist"><ol type="1"><li><p>The grammar is a series of productions.</p></li><li><p>A production consists of a name, followed by "::=", followed by a definition
+     for the name. The name identifies a grammatical construct that can appear on the
+     right side of another production.</p></li><li><p>Literals (including punctuation) are enclosed in 'single quotes', or in
+     "double quotes" if case is not significant.</p></li><li><p>A single quotation mark within a literal is escaped with a preceding
+     backslash: 'dog\'s tail'.</p></li><li><p>If a construct can be defined more than one way, then the alternatives may
+     appear in separate productions; or, they may appear in the same production,
+     separated by pipe symbols. The choice between these representations is of only
+     cosmetic significance.</p></li><li><p>A construct enclosed within square brackets is optional.</p></li><li><p>A construct enclosed within curly braces may be repeated zero or more
+     times.</p></li><li><p>JSON allows arbitrary white space between tokens. To avoid ugly clutter, this
+     grammar ignores the optional white space. </p></li><li><p>In many cases a production defines a JSON object, i.e. a list of name-value
+     pairs, separated by commas. Since the order of these name/value pairs is not
+     significant, the grammar will not try to show all the possible sequences. In
+     general it will present the required pairs first, if any, followed by any
+     optional elements.</p></li></ol></div><p> Since both EBNF and JSON use curly braces and square brackets, pay close attention to
+   whether these characters are in single quotes. If they're in single quotes, they are
+   literal elements of the JSON notation. Otherwise they are elements of the EBNF notation.
+  </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="d0e56"></a>Primitives</h3></div></div></div><p> We'll start by defining some primitives, to get them out of the way. They're mostly
+   just what you would expect. </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[1]</td><td align="right" valign="top" width="10%"><a name="ebnf.string"></a> string </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '"' chars '"' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[2]</td><td align="right" valign="top" width="10%"><a name="ebnf.chars"></a> chars </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> any valid sequence of UTF-8 characters, with certain special characters
+     escaped according to JSON rules </td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[3]</td><td align="right" valign="top" width="10%"><a name="ebnf.integer_literal"></a> integer_literal </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> [ sign ] digit { digit } </td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[4]</td><td align="right" valign="top" width="10%"><a name="ebnf.sign"></a> sign </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '+' | '-' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[5]</td><td align="right" valign="top" width="10%"><a name="ebnf.digit"></a> digit </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%">digit = '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9'</td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[6]</td><td align="right" valign="top" width="10%"><a name="ebnf.integer_string"></a> integer_string </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '"' integer_literal '"' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[7]</td><td align="right" valign="top" width="10%"><a name="ebnf.integer"></a> integer </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> integer_literal | integer_string </td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[8]</td><td align="right" valign="top" width="10%"><a name="ebnf.number"></a> number </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> any valid character sequence that is numeric according to JSON rules </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> When json_query requires an integral value, it will usually accept a quoted string
+   and convert it to an integer by brute force &#8211; to zero if necessary. Likewise it may
+   truncate a floating point number to an integral value. Scientific notation will be
+   accepted but may not give the intended results. </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[9]</td><td align="right" valign="top" width="10%"><a name="ebnf.boolean"></a> boolean </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> 'true' | 'false' | string | number </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> The preferred way to encode a boolean is with the JSON reserved word true or false,
+   in lower case without quotation marks. The string <code class="literal">true</code>, in upper,
+   lower, or mixed case, is another way to encode true. Any other string evaluates to
+   false. </p><p> As an accommodation to perl, numbers may be used as booleans. A numeric value of 1
+   means true, and any other numeric value means false. </p><p> Any other valid JSON value, such as an array, will be accepted as a boolean but
+   interpreted as false. </p><p> The last couple of primitives aren't really very primitive, but we introduce them
+   here for convenience: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[10]</td><td align="right" valign="top" width="10%"><a name="ebnf.class_name"></a> class_name </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> string </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> A class_name is a special case of a string: the name of a class as defined by the
+   IDL. The class may refer either to a database table or to a source_definition, which is
+   a subquery. </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[11]</td><td align="right" valign="top" width="10%"><a name="ebnf.field_name"></a> field_name </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> string </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> A field_name is another special case of a string: the name of a non-virtual field as
+   defined by the IDL. A field_name is also a column name for the table corresponding to
+   the relevant class. </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="d0e185"></a>Query</h3></div></div></div><p> The following production applies not only to the main query but also to most
+   subqueries. </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[12]</td><td align="right" valign="top" width="10%"><a name="ebnf.query"></a> query </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{'<br> '"from"' ':' from_list<br> [ ',' '"select"' ':' select_list
+     ]<br> [ ',' '"where"' ':' where_condition ]<br> [ ',' '"having"' ':'
+     where_condition ]<br> [ ',' '"order_by"' ':' order_by_list ]<br> [ ','
+     '"limit"' ':' integer ]<br> [ ',' '"offset"' ':' integer ]<br> [ ','
+     '"distinct"' ':' boolean ]<br> [ ',' '"no_i18n"' ':' boolean ]<br> '}'
+    </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> Except for the <code class="literal">"distinct"</code> and <code class="literal">no_i18n</code> entries,
+   each name/value pair represents a major clause of the SELECT statement. The name/value
+   pairs may appear in any order. </p><p> There is no name/value pair for the GROUP BY clause, because json_query generates it
+   automatically according to information encoded elsewhere. </p><p> The <code class="literal">"distinct"</code> entry, if present and true, tells json_query that
+   it may have to create a GROUP BY clause. If not present, it defaults to false. </p><p> The <code class="literal">"no_i18n"</code> entry, if present and true, tells json_query to
+   suppress internationalization. If not present, it defaults to false. (Note that
+    <code class="literal">"no_i18n"</code> contains the digit one, not the letter ell.) </p><p> The values for <code class="literal">limit</code> and <code class="literal">offset</code> provide the
+   arguments of the LIMIT and OFFSET clauses, respectively, of the SQL statement. Each
+   value should be non-negative, if present, or else the SQL won't work. </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="d0e252"></a>FROM Clause</h3></div></div></div><p>
+   The object identified by <code class="literal">&#8220;from&#8221;</code> encodes the FROM clause of
+   the SQL.  The associated value may be a string, an array, or a JSON object.
+  </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[13]</td><td align="right" valign="top" width="10%"><a name="ebnf.from_list_0"></a> from_list </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> class_name </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p>
+   If <code class="literal">from_list</code> is a <code class="literal">class_name</code>, the
+   json_query inserts the corresponding table name or subquery into the FROM
+   clause, using the <code class="literal">class_name</code> as an alias for the table
+   or subquery.  The class must be defined as non-virtual in the IDL.
+  </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[14]</td><td align="right" valign="top" width="10%"><a name="ebnf.from_list_1"></a> from_list </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '['  string  {  ','  parameter  }  ']' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[15]</td><td align="right" valign="top" width="10%"><a name="ebnf.parameter"></a> parameter </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> string  |  number  |  'null' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p>
+   If from_list is a JSON array, then it represents a table-like function from
+   which the SQL statement will select rows, using a SELECT clause consisting
+   of &#8220;SELECT *&#8221; (regardless of the select_list supplied by the method parameter).
+  </p><p>
+   The first entry in the array is the name of the function.  It must be a string
+   naming a stored function.  Each subsequent entry is a function parameter.  If
+   it is a string or a number, json_query will insert it into a comma-separated
+   parameter list, enclosed in quotes, with any special characters escaped as needed.
+   If it is the JSON reserved word <code class="literal">null</code>, json_query will insert
+   it into the parameter list as a null value.
+  </p><p>
+   If <code class="literal">from_list</code> is a JSON object, it must contain exactly one entry.
+   The key of this entry must be the name of a non-virtual class defined in the IDL.
+   This class will be the top-level class of the FROM clause, the only one named
+   outside of a JOIN clause.
+  </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[16]</td><td align="right" valign="top" width="10%"><a name="ebnf.from_list_2"></a> from_list </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{' class_name ':' join_list '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[17]</td><td align="right" valign="top" width="10%"><a name="ebnf.join_list_0"></a> join_list </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> class_name </td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[18]</td><td align="right" valign="top" width="10%"><a name="ebnf.join_list_1"></a> join_list </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{' join_def { ',' join_def } '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p>
+   If the associated data is a <code class="literal">class_name</code>, json_query will
+   construct an INNER JOIN clause joining the class to the top-level clause,
+   using the columns specified by the IDL for such a join.
+  </p><p>
+   Otherwise, the associated data must be a JSON object with one or more entries,
+   each entry defining a join:
+  </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[19]</td><td align="right" valign="top" width="10%"><a name="ebnf.join_def"></a> join_def </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%">
+     class_name  ':'<br>
+     '{'<br>
+     [  '&#8221;type&#8221;'      ':'  string      ]<br>
+     [  '&#8221;field&#8221;'     ':'  field_name  ]<br>
+     [  '&#8221;fkey&#8221;'      ':'  field_name  ]<br>
+     [  '&#8221;filter&#8221;'    ':'  where_condition  ]<br>
+     [  '&#8221;filter_op&#8221;' ':'  string      ]<br>
+     [  '&#8221;join&#8221;'      ':'  join_list   ]<br>
+     '}'
+    </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p>
+   The data portion of the <code class="literal">&#8220;join_type&#8221;</code> entry tells json_query
+   whether to use a left join, right join, full join, or inner join.  The values
+   <code class="literal">&#8220;left&#8221;</code>, <code class="literal">&#8220;right&#8221;</code>, and <code class="literal">&#8220;full&#8221;</code>,
+   in upper, lower, or mixed case, have the obvious meanings.  If the
+   <code class="literal">&#8220;join_type&#8221;</code> entry has any other value, or is not present,
+   json_query constructs an inner join.
+  </p><p>
+   The <code class="literal">&#8220;field&#8221;</code> and <code class="literal">&#8220;fkey&#8221;</code> attributes specify the
+   columns to be equated in the join condition.  The <code class="literal">&#8220;field&#8221;</code>
+   attribute refers to the column in the joined table, i.e. the one named by the
+   <code class="literal">join_def</code>.  The <code class="literal">&#8220;fkey&#8221;</code> attribute refers to the
+   corresponding column in the other table, i.e. the one named outside the
+   <code class="literal">join_def</code> &#8211; either the top-level table or a table named by some
+   other <code class="literal">join_def</code>.
+  </p><p>
+   It may be tempting to suppose that <code class="literal">&#8220;fkey&#8221;</code> stands for &#8220;foreign key&#8221;,
+   and therefore refers to a column in the child table that points to the key of a
+   parent table.  Resist the temptation; the labels are arbitrary.  The json_query
+   method doesn't care which table is the parent and which is the child.
+  </p><p>
+   These relationships are best explained with an example.  The following
+   <code class="literal">from_list</code>:
+  </p><div class="informalexample"><pre class="programlisting">
+ {
+     "aou": {
+         "asv": {
+             "type" : "left",
+             "fkey" : "id",
+             "field" : "owner"
+         }
+     }
+ }
+   </pre></div><p>
+   ...turns into the following FROM clause:
+  </p><div class="informalexample"><pre class="programlisting">
+ FROM
+     actor.org_unit AS "aou"
+         LEFT JOIN action.survey AS "asv"
+             ON ( "asv".owner = "aou".id )
+   </pre></div><p>
+   Note in this example that <code class="literal">&#8220;fkey&#8221;</code> refers to a column of the
+   class <code class="literal">&#8220;aou&#8221;</code>, and <code class="literal">&#8220;field&#8221;</code> refers to a
+   column of the class <code class="literal">&#8220;asv&#8221;</code>.
+  </p><p>
+   If you specify only one of the two columns, json_query will try to identify the
+   other one from the IDL. However, if you specify only the column from the parent
+   table, this attempt will probably fail.
+  </p><p>
+   If you specify both columns, json_query will use the column names you specify,
+   without verifying them with a lookup in the IDL.  By this means you can perform
+   a join using a linkage that the IDL doesn't define.  Of course, if the columns
+   don't exist in the database, the query will fail when json_query tries to execute it.
+  </p><p>
+   Using the columns specified, either explicitly or implicitly, the json_query
+   method constructs a join condition.  With raw SQL it is possible (though
+   rarely useful) to join two tables by an inequality.  However the json_query
+   method always uses a simple equality condition.
+  </p><p>
+   Using a <code class="literal">&#8220;filter&#8221;</code> entry in the join_def, you can apply one
+   or more additional conditions to the JOIN clause, typically to restrict the
+   join to certain rows of the joined table.  The data associated with the
+   <code class="literal">&#8220;filter&#8221;</code> key is the same sort of
+   <code class="literal">where_condition</code> that you use for a WHERE clause
+   (discussed below).
+  </p><p>
+   If the string associated with the <code class="literal">&#8220;filter_op&#8221;</code> entry is
+   <code class="literal">&#8220;OR&#8221;</code> in upper, lower, or mixed case, then the json_query
+   method uses OR to connect the standard join condition to any additional
+   conditions supplied by a <code class="literal">&#8220;filter&#8221;</code> entry.
+  </p><p>
+   (Note that if the <code class="literal">where_condition</code> supplies multiple
+   conditions, they will be connected by AND.  You will probably want to move
+   them down a layer &#8211; enclose them in parentheses, in effect &#8211; to avoid a
+   confusing mixture of ANDs and ORs.)
+  </p><p>
+   If the <code class="literal">&#8220;filter_op&#8221;</code> entry carries any other value, or if
+   it is absent, then the json_query method uses AND.  In the absence of a
+   <code class="literal">&#8220;filter&#8221;</code> entry, <code class="literal">&#8220;filter_op&#8221;</code> has no effect.
+  </p><p>
+   A <code class="literal">&#8220;join&#8221;</code> entry in a <code class="literal">join_def</code> specifies
+   another layer of join.  The class named in the subjoin is joined to the class
+   named by the <code class="literal">join_def</code> to which it is subordinate.  By this
+   means you can encode multiple joins in a hierarchy.
+  </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="d0e504"></a>SELECT Clause</h3></div></div></div><p>
+   If a query does not contain an entry for <code class="literal">&#8220;select&#8221;</code>, json_query
+   will construct a default SELECT clause.  The default includes every non-virtual
+   field from the top-level class of the FROM clause, as defined by the IDL.  The
+   result is similar to SELECT *, except:
+  </p><div class="itemizedlist"><ul type="disc"><li><p>The default includes only the fields defined in the IDL.</p></li><li><p>The columns will appear in the same order in which they appear in the IDL,
+    regardless of the order in which the database defines them.</p></li></ul></div><p>
+   There are other ways to specify a default SELECT list, as shown below.
+  </p><p>
+   If a <code class="literal">"select"</code> entry is present, the associated value must
+   be a JSON object, keyed on class names:
+  </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[20]</td><td align="right" valign="top" width="10%"><a name="ebnf.select_list"></a> select_list </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{' class_name ':' field_list { ',' class_name ':' field_list } '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p>
+   The <code class="literal">class_name</code> must identify either the top-level class or
+   a class belonging to one of the joins.  Otherwise json_query will silently
+   ignore the <code class="literal">select_list</code>.
+  </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[21]</td><td align="right" valign="top" width="10%"><a name="ebnf.field_list_0"></a> field_list </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> 'null'  |  '&#8221;*&#8221;' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p>
+   If a field_list is either the JSON reserved word <code class="literal">null</code>
+   (in lower case) or an asterisk in double quotes, json_query constructs a
+   default SELECT list &#8211; provided that the class is the top-level class of the
+   query.  If the class belongs to a join somewhere, json_query ignores the
+   <code class="literal">field_list</code>.
+  </p><p>
+   More commonly, the <code class="literal">field_list</code> is a JSON array of zero or
+   more field specifications:
+  </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[22]</td><td align="right" valign="top" width="10%"><a name="ebnf.field_list_1"></a> field_list </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '['  [  field_spec  {  ','  field_spec  }  ]  ']' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p>
+   If the array is empty, json_query will construct a default SELECT list for
+   the class &#8211; again, provided that the class is the top-level class in the query.
+  </p><p>
+   In the simplest case, a field specification may name a non-virtual field
+   defined in the IDL:
+  </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[23]</td><td align="right" valign="top" width="10%"><a name="ebnf.field_spec_0"></a> field_spec </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> field_name </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p>
+   In some cases json_query constructs a call to the
+   <code class="literal">oils_i18n_xlate</code> function to internationalize the value of the
+   selected column.  Specifically, it does so if all the following are true:
+  </p><div class="itemizedlist"><ul type="disc"><li><p>the settings file defines a locale;</p></li><li><p>in the field definition for the field in the IDL, the tag
+    <code class="literal">&#8220;il8n&#8221;</code> is present and true;</p></li><li><p>the query does <span class="emphasis"><em>not</em></span> include the
+    <code class="literal">"no_il8n"</code> tag (or includes it with a value of false).</p></li></ul></div><p>
+   A field specification may be a JSON object:
+  </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[24]</td><td align="right" valign="top" width="10%"><a name="ebnf.field_spec_1"></a> field_spec </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%">
+     '{'<br>
+     '&#8221;column&#8221;'  ':'  <br>
+     [ ',' '&#8221;alias&#8221;'  ':'  string  ]<br>
+     [ ',' '&#8221;aggregate&#8221;'  ':'  boolean  ]<br>
+     [ ',' transform_spec  ]<br>
+     '}'
+    </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p>
+   The <code class="literal">&#8220;column&#8221;</code> entry provides the column name, which must
+   be defined as non-virtual in the IDL.
+  </p><p>
+   The <code class="literal">&#8220;alias&#8221;</code> entry provides a column alias.  If no alias
+   is specified, json_query uses the column name as its own alias.
+  </p><p>
+   The <code class="literal">&#8220;aggregate&#8221;</code> entry has no effect on the SELECT clause
+   itself.  Rather, it affects the construction of a GROUP BY class.  If there
+   is an <code class="literal">&#8220;aggregate&#8221;</code> entry for any field, then json_query builds
+   a GROUP BY clause listing every column that is <span class="emphasis"><em>not</em></span> tagged
+   for aggregation (or that carries an <code class="literal">&#8220;aggregate&#8221;</code> entry with
+   a value of false).  If <span class="emphasis"><em>all</em></span> columns are tagged for
+   aggregation, then json_query omits the GROUP BY clause.
+  </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[25]</td><td align="right" valign="top" width="10%"><a name="ebnf.transform_spec_0"></a> transform_spec </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%">
+     '&#8221;transform&#8221;'  ':'  string  ]<br>
+     [ ',' '&#8221;result_field&#8221;  ':'  string  ]<br>
+     [ ',' '&#8221;params&#8221;  ':' param_list  ]
+    </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p>
+   When a <code class="literal">transform_spec</code> is present, json_query selects the
+   return value of a function instead of selecting the column directly.  The entry
+   for <code class="literal">&#8220;transform&#8221;</code> provides the name of the function, and the
+   column name (as specified by the <code class="literal">&#8220;column&#8221;</code> tag), qualified by
+   the class name, is the argument to the function.  For example, you might use such
+   a function to format a date or time, or otherwise transform a column value.
+   You might also use an aggregate function such as SUM, COUNT, or MAX (possibly
+   together with the <code class="literal">&#8220;aggregate&#8221;</code> tag).
+  </p><p>
+   The <code class="literal">&#8220;result_field&#8221;</code> entry, when present, specifies a subcolumn
+   of the function's return value.  The resulting SQL encloses the function call
+   in parentheses, and follows it with a period and the subcolumn name.
+  </p><p>
+   The <code class="literal">&#8220;params&#8221;</code> entry, if present, provides a possibly empty
+   array of additional parameter values, either strings, numbers, or nulls:
+  </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[26]</td><td align="right" valign="top" width="10%"><a name="ebnf.param_list"></a> param_list </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '['  [  parameter  {  ','  parameter  }  ]  ']' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p>
+   Such parameter values are enclosed in single quotes, with any special characters
+   escaped as needed, and inserted after the column name as additional parameters
+   to the function.  You might, for example, use an additional parameter to provide
+   a format string for a reformatting function.
+  </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="d0e721"></a>WHERE Clause</h3></div></div></div><p> There are two types of <code class="literal">where_condition</code>: objects and arrays.
+   Of these, the object type is the more fundamental, and occurs at some level in every
+   <code class="literal">where_condition</code>.  The array type is mainly a way of circumventing
+   a limitation of the object type. </p><p> The object type of <code class="literal">where_condition</code> is a comma-separated list
+   of one or more <code class="literal">conditions</code>: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[27]</td><td align="right" valign="top" width="10%"><a name="ebnf.where_condition_0"></a> where_condition </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{' condition { ',' condition } '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> The generated SQL will include a code fragment for each <code class="literal">condition</code>,
+   joined by AND (or in some cases by OR, as described below). </p><p> As usual for entries in a JSON object, each <code class="literal">condition</code> consists
+   of a unique string to serve as a key, a colon, and an associated value. </p><p> The key string may be the name of a column belonging to the relevant table, or
+   it may be an operator string.  In order to distinguish it from any possible column
+   name, an operator string always begins with a plus sign or minus sign. </p><p> JSON requires that every key string be unique within an object.  This requirement
+   imposes some awkward limitations on a JSON query.  For example, you might want to
+   express two conditions for the same column: id &gt; 10 and id != 25.  Since each of
+   those conditions would have the same key string, namely &#8220;id&#8221;, you can't put them
+   into the same JSON object. </p><p> The solution is to put such conflicting conditions in separate JSON objects, and
+   put the objects into an array: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[28]</td><td align="right" valign="top" width="10%"><a name="ebnf.where_condition_1"></a> where_condition </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '[' where_condition { ',' where_condition } ']' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> The resulting SQL encloses each subordinate set of <code class="literal">conditions</code>
+   in parentheses, and connects the sets with AND (or in some cases OR, as described
+   below).  It's possible to put only a single <code class="literal">where_condition</code> in
+   the array; the result is to add a layer of parentheses around the condition. </p><p> There are two kinds of <code class="literal">condition</code> where the operator begins
+   with a plus sign.  In the simpler case, the associated data is simply a column name:
+  </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[29]</td><td align="right" valign="top" width="10%"><a name="ebnf.condition_0"></a> condition </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> plus_class ':' field_name </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> A <code class="literal">plus_class</code> is a string that begins with a plus sign.
+   The rest of the string, after the plus sign, must be the class name for the table
+   to which the column belongs. </p><p> If the column is a boolean, then the resulting SQL uses it (as qualified by the
+   class name) as a stand-alone condition. </p><p> Otherwise, this kind of syntax provides a way to place a column on the right side
+   of a comparison operator.  For example: </p><div class="informalexample"><pre class="programlisting">
+ {
+     "from":"aou",
+     "select": { "aou":[ "id", "name" ] },
+     "where": {
+         "id": {
+             "&gt;": { "+aou":"parent_ou" }
+         }
+     }
+ }
+   </pre></div><p> The resulting SQL: </p><div class="informalexample"><pre class="programlisting">
+ SELECT
+     "aou".id AS "id",
+     "aou".name AS "name"
+ FROM
+     actor.org_unit AS "aou"
+ WHERE
+     (
+         "aou".id &gt; (  "aou".parent_ou  )
+     );
+   </pre></div><p> The other type of <code class="literal">condition</code> that uses a
+   <code class="literal">plus_class</code> applies a specified class name to a
+   <code class="literal">where_condition</code>: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[30]</td><td align="right" valign="top" width="10%"><a name="ebnf.condition_1"></a> condition </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> plus_class ':' where_condition </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> The resulting SQL is enclosed in parentheses, and qualifies the columns with
+   the specified class name.  This syntax provides a mechanism to shift the class
+   context &#8211; i.e. to refer to one class in a context that would otherwise refer to
+   a different class. </p><p> Ordinarily the class name must be a valid non-virtual class defined in the IDL,
+   and applicable to the associated <code class="literal">where_condition</code>.  There is at
+   least one peculiar exception.  The JSON fragment: </p><div class="informalexample"><pre class="programlisting">
+ "+abc": { "+xyz":"frobozz" }
+   </pre></div><p> ...is rendered as: </p><div class="informalexample"><pre class="programlisting">
+ (  "xyz".frobozz  )
+   </pre></div><p> ...even though neither <code class="literal">&#8220;abc&#8221;</code>, nor <code class="literal">&#8220;xyz&#8221;</code>,
+   nor <code class="literal">&#8220;frobozz&#8221;</code> is defined in the IDL.  The class name
+   <code class="literal">&#8220;abc&#8221;</code> isn't used at all because the <code class="literal">&#8220;+xyz&#8221;</code>
+   operator overrides it.  Such a query won't fail until json_query tries
+   to execute it in the database. </p><p> The other operators that may occur at this level all begin with a minus sign,
+   and they all represent familiar SQL operators.  For example, the
+   <code class="literal">&#8220;-or&#8221;</code> operator joins the conditions within a
+   <code class="literal">where_condition</code> by OR (instead of the default AND), and
+   encloses them all in parentheses: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[31]</td><td align="right" valign="top" width="10%"><a name="ebnf.condition_2"></a> condition </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '&#8221;-or&#8221;' ':' where_condition </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> In fact the <code class="literal">&#8220;-or&#8221;</code> operator is the only way to get OR into
+   the WHERE clause. </p><p> The <code class="literal">&#8220;-and&#8221;</code> operator is similar, except that it uses AND: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[32]</td><td align="right" valign="top" width="10%"><a name="ebnf.condition_3"></a> condition </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '&#8221;-and&#8221;' ':'  where_condition </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> Arguably the <code class="literal">&#8220;-and&#8221;</code> operator is redundant, because you can
+   get the same effect by wrapping the subordinate <code class="literal">where_condition</code>
+   in a JSON array.  Either technique merely adds a layer of parentheses, since AND
+   connects successive conditions by default. </p><p> The <code class="literal">&#8220;-not&#8221;</code> operator expands the subordinate
+   <code class="literal">where_condition</code> within parentheses, and prefaces the result
+   with NOT: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[33]</td><td align="right" valign="top" width="10%"><a name="ebnf.condition_4"></a> condition </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '&#8221;-not&#8221;' ':'  where_condition </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> The <code class="literal">&#8220;-exists&#8221;</code> or <code class="literal">&#8220;-not-exists&#8221;</code> operator
+   constructs a subquery within an EXISTS  or NOT EXISTS clause, respectively: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[34]</td><td align="right" valign="top" width="10%"><a name="ebnf.condition_5"></a> condition </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '&#8221;-exists&#8221;' ':' query </td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[35]</td><td align="right" valign="top" width="10%"><a name="ebnf.condition_6"></a> condition </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '&#8221;-not-exists&#8221;' ':' query </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> The remaining kinds of <code class="literal">condition</code> all have a
+   <code class="literal">field_name</code> on the left and some kind of <code class="literal">predicate</code>
+   on the right.  A <code class="literal">predicate</code> places a constraint on the value of
+   the column &#8211; or, in some cases, on the value of the column as transformed by some
+   function call: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[36]</td><td align="right" valign="top" width="10%"><a name="ebnf.condition_7"></a> condition </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> field_name ':' predicate </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> The simplest such constraint is to require that the column have a specific value,
+   or be null: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[37]</td><td align="right" valign="top" width="10%"><a name="ebnf.predicate_0"></a> predicate </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> lit_value | 'null' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[38]</td><td align="right" valign="top" width="10%"><a name="ebnf.lit_value"></a> lit_value </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> string | number </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> You can also compare a column to a literal value using some kind of inequality.
+   However it's a bit more complicated because you have to specify what kind of comparison
+   to make: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[39]</td><td align="right" valign="top" width="10%"><a name="ebnf.compare_op_0"></a> predicate </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{' compare_op ':' lit_value '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[40]</td><td align="right" valign="top" width="10%"><a name="ebnf.compare_op_1"></a> compare_op </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> string </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> A <code class="literal">compare_op</code> is a string that defines a comparison operator.
+   Valid values include the following: </p><pre class="programlisting">
+ =    &lt;&gt;   !=
+ &lt;    &gt;    &lt;=   &gt;=
+ ~    ~*   !~   !~*
+ like      ilike
+ similar to
+  </pre><p> Strictly speaking, json_query accepts any <code class="literal">compare_op</code>
+   that doesn't contain semicolons or white space (or
+   <code class="literal">&#8220;similar to&#8221;</code> as a special exception).  As a result, it
+   is possible &#8211; and potentially useful &#8211; to use a custom operator like
+   <code class="literal">&#8220;&gt;100*&#8221;</code> in order to insert an expression that would
+   otherwise be difficult or impossible to create through a JSON query.  The ban
+   on semicolons and white space prevents certain kinds of SQL injection. </p><p> Note that json_query does <span class="emphasis"><em>not</em></span> accept two operators that
+   PostgreSQL <span class="emphasis"><em>does</em></span> accept: <code class="literal">&#8220;is distinct from&#8221;</code>
+   and <code class="literal">&#8220;is not distinct from&#8221;</code>. </p><p> You can also compare a column to a null value: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[41]</td><td align="right" valign="top" width="10%"><a name="ebnf.predicate_1"></a> predicate </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{' compare_op ':' 'null' '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> The equality operator <code class="literal">&#8220;=&#8221;</code> turns into IS NULL.  Any other
+   operator turns into IS NOT NULL. </p><p> When a <code class="literal">compare_op</code> is paired with an array, it defines a
+   function call: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[42]</td><td align="right" valign="top" width="10%"><a name="ebnf.predicate_2"></a> predicate </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{' compare_op ':' '[' string { ',' parameter } ']' '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> The first entry in the array is the function's name.  Subsequent entries in
+   the array, if any, represent the parameters of the function call.  They may be
+   strings, numbers, or nulls.  In the generated SQL, the function call appears on
+   the right of the comparison. </p><p> The <code class="literal">&#8220;between&#8221;</code> operator creates a BETWEEN clause: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[43]</td><td align="right" valign="top" width="10%"><a name="ebnf.predicate_3"></a> predicate </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{'  &#8220;between&#8221;  ':'  '['  lit_value  ','  lit_value  ']'  '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> Although PostgreSQL allows a null value in a BETWEEN clause, json_query
+   requires literal non-null values.  It isn't sensible to use null values in a
+   BETWEEN clause.  A few experiments show that the results of the comparison are
+   peculiar and erratic. </p><p> There are two ways to create an IN list of allowed values.  The simplest is
+   to put literal values into a JSON array: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[44]</td><td align="right" valign="top" width="10%"><a name="ebnf.predicate_4"></a> predicate </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '[' lit_value { ',' lit_value }  ']' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> As with BETWEEN clauses, json_query does not accept null values in an IN list,
+   even though PostgreSQL does allow them.  Nulls are not sensible in this context
+   because they never match anything. </p><p>  </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="d0e1140"></a>Having Clause</h3></div></div></div><p>For the HAVING clause, json_query accepts exactly the same syntax as it accepts for
+   the WHERE clause.</p><p> The other way to create an IN list is to use an explicit
+   <code class="literal">&#8220;in&#8221;</code> operator with an array of literal values.  This format
+   also works for the <code class="literal">&#8220;not in&#8221;</code> operator: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[45]</td><td align="right" valign="top" width="10%"><a name="ebnf.predicate_5"></a> predicate </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{' in_operator ';'  '[' lit_value [ ',' lit_value ]  ']'  '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[46]</td><td align="right" valign="top" width="10%"><a name="ebnf.in_operator"></a> in_operator </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> &#8220;in&#8221;  |  &#8220;not in&#8221; </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> Another kind of IN or NOT IN clause uses a subquery instead of a list of
+   values: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[47]</td><td align="right" valign="top" width="10%"><a name="ebnf.predicate_6"></a> predicate </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{' in_operator ':'  query  '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> The remaining types of <code class="literal">predicate</code> can put a function call on
+   the left of the comparison, by using a <code class="literal">transform_spec</code> together
+   with a <code class="literal">&#8220;value&#8221;</code> tag.   The <code class="literal">transform_spec</code> is
+   optional, and if you don't need it, the same SQL would in many cases be easier to
+   express by other means. </p><p> The <code class="literal">transform_spec</code> construct was described earlier in
+   connection with the SELECT clause, but here it is again: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[48]</td><td align="right" valign="top" width="10%"><a name="ebnf.transform_spec_1"></a> transform_spec </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%">
+     '&#8221;transform&#8221;'  ':'  string  ]<br>
+     [ ',' '&#8221;result_field&#8221;  ':'  string  ]<br>
+     [ ',' '&#8221;params&#8221;  ':' param_list  ]
+    </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> As in the SELECT clause, the <code class="literal">&#8220;transform&#8221;</code> string names the
+   function.  The first parameter is always the column identified by the field_name.
+   Additional parameters, if any, appear in the <code class="literal">param_list</code>.  The
+   <code class="literal">&#8220;result_field&#8221;</code> string, if present, identifies one column of a
+   multicolumn return value. </p><p> Here's a second way to compare a value to a literal value (but not to a null
+   value): </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[49]</td><td align="right" valign="top" width="10%"><a name="ebnf.predicate_7"></a> predicate </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{' compare_op ':' '{' '&#8221;value&#8221;' ':' lit_value<br>
+     [ transform_spec ] '}' '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> ...and a way to compare a value to a boolean expression: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[50]</td><td align="right" valign="top" width="10%"><a name="ebnf.predicate_8"></a> predicate </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{' compare_op ':' '{' '&#8221;value&#8221;' ':' '{'<br>
+     condition { ',' condition } [ transform_spec ] '}' '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> The final predicate is another way to put a function call on the right side
+   of the comparison: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[51]</td><td align="right" valign="top" width="10%"><a name="ebnf.predicate_9"></a> predicate </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{' compare_op ':' '{' '&#8221;value&#8221;' ':' '['<br>
+     string { ',' parameter } ']' [ transform_spec ] '}' '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> This format is available for the sake of consistency, but offers no advantage
+   over the simpler version. </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="d0e1278"></a>ORDER BY Clause</h3></div></div></div><p> There are two ways to encode an ORDER BY clause: as an array, or as a list.
+   Either may be empty, in which case the generated SQL will not include an ORDER BY
+   clause: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[52]</td><td align="right" valign="top" width="10%"><a name="ebnf.order_by_list_0"></a> order_by_list </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '['  ']'  |  '{'  '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> If not empty, the array contains one or more objects, each defining a sort
+   field: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[53]</td><td align="right" valign="top" width="10%"><a name="ebnf.order_by_list_1"></a> order_by_list </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{' sort_field_def  {  ','  sort_field_def }  '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr><tr><td align="left" valign="top" width="3%">[54]</td><td align="right" valign="top" width="10%"><a name="ebnf.sort_field_def"></a> sort_field_def </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{'<br>
+     '&#8221;class&#8221;'  ':'  class_name<br>
+     ','  '&#8221;field&#8221;'  ':'  field_name<br>
+     [  ','  '&#8221;direction&#8221;'  ':'  lit_value  ]<br>
+     [  ','  transform_spec  ]<br>
+     '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> The <code class="literal">&#8220;class&#8221;</code> and <code class="literal">&#8220;field&#8221;</code> entries are
+   required, and of course the field must belong to the class.  Furthermore, at
+   least one field from the class must appear in the SELECT clause. </p><p> The <code class="literal">&#8220;direction&#8221;</code> entry, if present, specifies whether the
+   sort will be ascending or descending for the column in question.  If the associated
+   value begins with &#8220;D&#8221; or &#8220;d&#8221;, the sort will be descending; otherwise the sort will
+   be ascending.  If the value is a number, it will be treated as a string that does not
+   start with &#8220;D&#8221; or &#8220;d&#8221;, resulting in an ascending sort. </p><p> In the absence of a <code class="literal">&#8220;direction&#8221;</code> entry, the sort will be
+   ascending. </p><p> The <code class="literal">transform_spec</code> works here the same way it works in the
+   SELECT clause and the WHERE clause, enabling you to pass the column through a
+   transforming function before the sort: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[55]</td><td align="right" valign="top" width="10%"><a name="ebnf.transform_spec_2"></a> transform_spec </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%">
+     '&#8221;transform&#8221;'  ':'  string  ]<br>
+     [ ',' '&#8221;result_field&#8221;  ':'  string  ]<br>
+     [ ',' '&#8221;params&#8221;  ':' param_list  ]
+    </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> When the <code class="literal">order_by_list</code> is an object instead of an array,
+   the syntax is less verbose, but also less flexible.  The keys for the object are
+   class names: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[56]</td><td align="right" valign="top" width="10%"><a name="ebnf.order_by_list_2"></a> order_by_list </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{' class_name ':' sort_class_def<br>
+     { ',' class_name ':' sort_class_def } '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> Each class must be referenced in the SELECT clause. </p><p> As in the SELECT clause, all the fields for a given class must be grouped
+   together.  You can't sort by a column from one table, then a column from a second
+   table, then another column from the first table. If you need this kind of sort,
+   you must encode the ORDER BY clause as an array instead of an object. </p><p> The data associated with a <code class="literal">class_name</code> may be either an array
+   or an object.  If an array, it's simply a list of field names, and each field must
+   belong to the class: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[57]</td><td align="right" valign="top" width="10%"><a name="ebnf.sort_class_def_0"></a> sort_class_def </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '['  field_name  { ','  field_name }  ']' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> With this syntax, the direction of sorting will always be ascending. </p><p> If the data is an object, the keys are field names, and as usual the fields
+   must belong to the class: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[58]</td><td align="right" valign="top" width="10%"><a name="ebnf.sort_class_def_1"></a> sort_class_def </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{'  field_name  ':' sort_class_subdef<br>
+     { ','  field_name  ':' sort_class_subdef  }  '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> Since the <code class="literal">field_name</code> is the key for the object, it cannot
+   appear more than once.  As a result, some kinds of sorts are not possible with this
+   syntax.  For example, one might want to sort by UPPER( family_name ), and then by
+   family_name with case unchanged, to make sure that &#8220;diBona&#8221; comes before &#8220;Dibona&#8221;.
+   For situations like this, you must encode the ORDER BY clause as an array rather
+   than an object. </p><p> The data associated with each <code class="literal">field_name</code> may take either of
+   two forms.  In the simplest case, it's a literal value to specify the direction
+   of sorting: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[59]</td><td align="right" valign="top" width="10%"><a name="ebnf.sort_class_subdef_0"></a> sort_class_subdef </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> lit_value </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> If the literal is a string starting with &#8220;D&#8221; or &#8220;d&#8221;, json_query sorts the field
+   in descending order.  Otherwise it sorts the field in ascending order. </p><p> In other cases, the <code class="literal">field_name</code> may be paired with an object
+   to specify more details: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[60]</td><td align="right" valign="top" width="10%"><a name="ebnf.sort_class_subdef_1"></a> sort_class_subdef </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{'<br>
+     [  '&#8221;direction&#8221;'  ':'  lit_value ]<br>
+     [  transform_spec  ]<br>
+     '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table><p> As before, the value tagged as <code class="literal">&#8220;direction&#8221;</code> specifies the
+   direction of the sort, depending on the first character.  If not otherwise
+   specified, the sort direction defaults to ascending. </p><p> Also as before, the <code class="literal">transform_spec</code> may specify a function
+   through which to pass the column. </p><p> Since both the <code class="literal">&#8220;direction&#8221;</code> tag and the
+   <code class="literal">transform_spec</code> are optional, the object may be empty: </p><table width="100%" cellpadding="5" bgcolor="#F5DCB3" border="1" class="productionset" summary="EBNF"><tr><td><table border="0" width="99%" cellpadding="0" bgcolor="#F5DCB3" class="productionset" summary="EBNF productions"><tr><td align="left" valign="top" width="3%">[61]</td><td align="right" valign="top" width="10%"><a name="ebnf.sort_class_subdef_2"></a> sort_class_subdef </td><td valign="top" width="5%" align="center"><code>::=</code></td><td valign="top" width="52%"> '{'  '}' </td><td align="left" valign="top" width="30%">&nbsp;</td></tr></table></td></tr></table></div></div></body></html>
\ No newline at end of file