From 7a539a2c265a2f44adf6a857652e2348fc5080e7 Mon Sep 17 00:00:00 2001
From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Fri, 22 Jul 2005 15:44:15 +0000
Subject: [PATCH] debugging alerts for use in Window.  cash drawer stub.  bill
 pay call.  redraws vs refresh.  broken patron edit.  css.   Will bring in the
 legacy patron edit/registration interfaces now, and work on this one later. 
 I don't need to eval the code like I'm doing, just pass in the au and call
 them directly, and use the rows array to just manage them

git-svn-id: svn://svn.open-ils.org/ILS/trunk@1357 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Evergreen/staff_client/Makefile               |   4 +-
 Evergreen/staff_client/application.ini        |   2 +-
 .../evergreen/Open-ILS/OpenILS_overlay.xul    |  26 ++-
 .../content/evergreen/auth/auth_overlay.xul   |   1 +
 .../content/evergreen/patron/patron_bills.js  |   1 +
 .../evergreen/patron/patron_display.js        |  29 +--
 .../content/evergreen/patron/patron_edit.js   |   8 +-
 .../content/evergreen/patron/patron_utils.js  | 197 +++++++++++-------
 .../chrome/locale/en-US/evergreen/auth.dtd    |   2 +-
 .../chrome/skin/evergreen/evergreen.css       |   7 +
 10 files changed, 178 insertions(+), 99 deletions(-)

diff --git a/Evergreen/staff_client/Makefile b/Evergreen/staff_client/Makefile
index ab177f5b80..a52934c691 100644
--- a/Evergreen/staff_client/Makefile
+++ b/Evergreen/staff_client/Makefile
@@ -1,7 +1,7 @@
 VERSION=0.0.9
 PACKAGE=Evergreen
 DESCRIPTION=Evergreen Staff Client Pre-Alpha
-BUILD=2005071911
+BUILD=2005072208
 
 ILS_DIR=${PWD}/../..
 
@@ -59,7 +59,7 @@ circ:
 evergreen.xpi: evergreen.jar
 	@echo
 	@echo make the xpi file
-	zip -r evergreen.xpi chrome/ defaults/ install.js install.rdf Makefile LICENSE README -x \*CVS\* > /dev/null
+	zip -r evergreen.xpi chrome/ defaults/ install.js install.rdf application.ini Makefile LICENSE README -x \*CVS\* > /dev/null
 
 evergreen.jar: generated open-ils patron circ
 	@echo
diff --git a/Evergreen/staff_client/application.ini b/Evergreen/staff_client/application.ini
index e9744af36f..484ae54e0b 100644
--- a/Evergreen/staff_client/application.ini
+++ b/Evergreen/staff_client/application.ini
@@ -14,7 +14,7 @@ Version=0.0.9
 ;
 ; This field specifies your application's build ID (timestamp).  This field is
 ; required.
-BuildID=2005071911
+BuildID=2005072208
 ;
 ; This field specifies a compact copyright notice for your application.  This
 ; field is optional.
diff --git a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_overlay.xul
index 9211260ae5..c4de7cd1f9 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_overlay.xul
+++ b/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_overlay.xul
@@ -11,7 +11,31 @@
 	<OpenILS id="OpenILS_js">
 
 		<!-- OpenSRF -->
-		<script>var myPackageDir = "evergreen"; var ses; dump('Loading all the js in the OpenILS overlay...\n');</script>
+		<script>
+		<![CDATA[
+			var myPackageDir = "evergreen"; var ses; dump('Loading all the js in the OpenILS overlay...\n');
+			Components.classes['@mozilla.org/consoleservice;1'].getService(Components.interfaces.nsIConsoleService).registerListener(
+				{ 
+					observe: function( msg ) { 
+						if (! msg.message.match( /delta/ ) ) {
+							var s = '';
+							for (var i in msg) {
+								s += 'msg.' + i + ' = ' + msg[i] + '\n';
+							}
+							alert(s); 
+						}
+					},
+					QueryInterface: function (iid) { 
+						if (!iid.equals(Components.interfaces.nsIConsoleListener) 
+							&& !iid.equals(Components.interfaces.nsISupports)) { 
+							throw Components.results.NS_ERROR_NO_INTERFACE; 
+						} 
+						return this; 
+					}
+				}
+			);
+		]]>
+		</script>
 		<OpenSRF id="OpenSRF_js" />
 
 		<util id="util_js" />
diff --git a/Evergreen/staff_client/chrome/content/evergreen/auth/auth_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/auth/auth_overlay.xul
index a31b40c50b..4fc1e94f86 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/auth/auth_overlay.xul
+++ b/Evergreen/staff_client/chrome/content/evergreen/auth/auth_overlay.xul
@@ -30,6 +30,7 @@
 		<iframe id="scratch_pad" flex="1"/>
 	</deck>
 	<button label="Console" accesskey="C" oncommand="try {mw.spawn_javascript_console(mw.document,'new_window','',{}); } catch(E) { alert(E); }"/>
+	<button label="FConsole" accesskey="F" oncommand="try {mw.spawn_filter_console(mw.document,'new_window','',{}); } catch(E) { alert(E); }"/>
 </box>
 
 <groupbox id="main_groupbox" flex="1">
diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_bills.js b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_bills.js
index b980d60df3..4b3337aefc 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_bills.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_bills.js
@@ -119,6 +119,7 @@ function patron_bills_init(p) {
 		'command',
 		function() { 
 			var payment_blob = {};
+			payment_blob.cash_drawer = 1; // FIXME: get new Config() to work
 			payment_blob.payment_type = p.control_box.payment_type.value;
 			payment_blob.payments = [];
 			payment_blob.patron_credit = p.control_box.bill_credit_amount.value;
diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js
index e27556977d..2f4c957048 100755
--- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js
@@ -27,29 +27,31 @@ function patron_display_init(p) {
 		return p._patron = au;
 	}
 
-	p.display_patron = function (au) {
-		if (au) p.set_patron(au);
-		p.redraw_patron_checkout_items();
-		p.redraw_patron_items();
-		p.redraw_patron_holds();
-		p.redraw_patron_bills();
-		p.redraw_patron_edit();
+	p.display_patron = function (exceptions) {
+		if (!exceptions) exceptions = {};
+		if (!exceptions.all) {
+			if (!exceptions.patron_checkout_items) p.redraw_patron_checkout_items();
+			if (!exceptions.patron_items) p.redraw_patron_items();
+			if (!exceptions.patron_holds) p.redraw_patron_holds();
+			if (!exceptions.patron_bills) p.redraw_patron_bills();
+			if (!exceptions.patron_edit) p.redraw_patron_edit();
+		}
 		return render_fm(p.w.document, { 'au' : p._patron });
 	}
 
 	p.retrieve_patron_via_barcode = function (barcode) {
 		if (!barcode) barcode = patron_get_barcode( p._patron );
 		p.set_patron( retrieve_patron_by_barcode( barcode ) );
-		return p.display_patron();
+		return p.display_patron( {} );
 	}
 
-	p.retrieve_patron_via_id = function (id) {
+	p.retrieve_patron_via_id = function (id, exceptions) {
 		p.set_patron( retrieve_patron_by_id( id ) );
-		return p.display_patron();
+		return p.display_patron(exceptions);
 	}
 
-	p.refresh = function() {
-		if (p._patron) p.retrieve_patron_via_id( p._patron.id() );
+	p.refresh = function(exceptions) {
+		if (p._patron) p.retrieve_patron_via_id( p._patron.id(), exceptions );
 	}
 
 	set_patron_display_widgets(p);
@@ -513,7 +515,8 @@ function patron_display_patron_edit_init(p) {
 		'debug' : p.app
 	} );
 
-	p.patron_edit.refresh = function() { p.refresh(); }
+	p.patron_edit.redisplay = function() { p.display_patron( {'patron_edit':true} ); }
+	p.patron_edit.refresh = function() { p.refresh( {'patron_edit':true} ); }
 
 	p.redraw_patron_edit = function() {
 		try {
diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_edit.js b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_edit.js
index 148465c2c4..770cd206bf 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_edit.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_edit.js
@@ -101,7 +101,11 @@ function patron_edit_add_rows(p, au) {
 						break;
 				}
 			}
+			if (row.entry_event && row.entry_code) {
+				obj.addEventListener( row.entry_event, new Function('ev',row.entry_code), false);
+			}
 		} catch(E) {
+			alert(E + '\n' + js2JSON(E) + '\n');
 			sdump('D_ERROR',E + '\n');
 			obj = 'error';
 		}
@@ -152,8 +156,10 @@ function patron_edit_add_rows(p, au) {
 					cols.push( listcell );
 				}
 
+				if (!row['style']) row['style'] = '';
+				if (!row['class']) row['class'] = '';
 				var listitem = p.list_box.add_row(
-					cols, {}
+					cols, { 'style' : row['style'], 'class' : row['class'] }
 				);
 
 				if (p.list_box.apply_to_each_listitem) {
diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_utils.js b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_utils.js
index b7e6c14350..94de01d652 100755
--- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_utils.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_utils.js
@@ -303,7 +303,13 @@ function patron_get_standing_css_style( value ) {
 function patron_pay_bills( payment_blob ) {
 	sdump('D_PATRON_UTILS',arg_dump(arguments,{0:true}));
 	try {
-		alert("Bill's API call goes here.  payment_blob = \n" + pretty_print( js2JSON( payment_blob ) ) + '\n');
+		//alert("Bill's API call goes here.  payment_blob = \n" + pretty_print( js2JSON( payment_blob ) ) + '\n');
+		var result = user_request(
+			'open-ils.circ',
+			'open-ils.circ.money.payment',
+			[ mw.G.auth_ses[0], payment_blob ]
+		)[0];
+		alert( pretty_print( js2JSON( result ) ) );
 		return true;
 	} catch(E) {
 		handle_error(E);
@@ -343,166 +349,197 @@ function save_patron( au, f ) {
 function patron_edit_rows() {
 	var rows = [
 {
-	'id' : 'create_date', 'label' : getString('au_create_date_label'), 'flex' : 1,
-	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.create_date()',
-	'entry_widget' : 'textbox', 'entry_widget_attributes' : { 'readonly' : 'true' }, 'rdefault' : '.create_date()'
+	'id' : 'standing', 'label' : getString('au_standing_label'), 'flex' : 1, 'class' : 'pale_violet_red',
+	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : 'mw.G.cst_hash[ $$.standing() ].value()',
+	'entry_widget' : 'menulist', 'populate_with' : map_object(mw.G.cst_hash,function(key,value){return [value.value(), key];}),
+	'entry_event' : 'command', 'entry_code' : '{ au.standing( ev.target.value ); }',
+	'rdefault' : '.standing()'
 },
 {
-	'id' : 'expire_date', 'label' : getString('au_expire_date_label'), 'flex' : 1,
-	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.expire_date()',
-	'entry_widget' : 'textbox', 'rdefault' : '.expire_date()'
+	'id' : 'alert_message', 'label' : getString('au_alert_message_label'), 'flex' : 1, 'class' : 'pale_violet_red',
+	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.alert_message()',
+	'entry_widget' : 'textbox', 'rdefault' : '.alert_message()',
+	'entry_event' : 'change', 'entry_code' : '{ alert(js2JSON(au)); au.alert_message( ev.target.value ); }'
 },
 {
-	'id' : 'active', 'label' : getString('au_active_label'), 'flex' : 1,
-	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : 'yesno($$.active())',
-	'entry_widget' : 'menulist', 'populate_with' : { 'Yes' : 1 , 'No' : 0 }, 'rdefault' : '.active()'
+	'id' : 'create_date', 'label' : getString('au_create_date_label'), 'flex' : 1, 'class' : 'peach_puff',
+	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.create_date()',
+	'entry_widget' : 'textbox', 'entry_widget_attributes' : { 'readonly' : 'true' }, 'rdefault' : '.create_date()',
+	'entry_event' : 'change', 'entry_code' : '{ au.create_date( ev.target.value ); }'
 },
 {
-	'id' : 'card', 'label' : getString('au_card_label'), 'flex' : 1,
-	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.card().barcode()',
-	'entry_widget' : 'button', 'entry_widget_attributes' : { 'label' : 'New Card', 'oncommand' : 'alert("test");' }
+	'id' : 'expire_date', 'label' : getString('au_expire_date_label'), 'flex' : 1, 'class' : 'peach_puff',
+	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.expire_date()',
+	'entry_widget' : 'textbox', 'rdefault' : '.expire_date()',
+	'entry_event' : 'change', 'entry_code' : '{ au.expire_date( ev.target.value ); }'
 },
 {
-	'id' : 'alert_message', 'label' : getString('au_alert_message_label'), 'flex' : 1,
-	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.alert_message()',
-	'entry_widget' : 'textbox', 'rdefault' : '.alert_message()'
+	'id' : 'active', 'label' : getString('au_active_label'), 'flex' : 1, 'class' : 'peach_puff',
+	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : 'yesno($$.active())',
+	'entry_widget' : 'menulist', 'populate_with' : { 'Yes' : 1 , 'No' : 0 }, 'rdefault' : '.active()',
+	'entry_event' : 'command', 'entry_code' : '{ au.active( ev.target.value ); }'
 },
 {
-	'id' : 'ident_type', 'label' : getString('au_ident_type_label'), 'flex' : 1,
-	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : 'mw.G.cit_hash[ $$.ident_type() ].name()',
-	'entry_widget' : 'menulist', 'populate_with' : map_object(mw.G.cit_hash,function(key,value){return [value.name(), key];}), 
-	'rdefault' : '.ident_type()'
+	'id' : 'card', 'label' : getString('au_card_label'), 'flex' : 1, 'class' : 'peach_puff',
+	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.card().barcode()',
+	'entry_widget' : 'button', 'entry_widget_attributes' : { 'label' : 'New Card', 'oncommand' : 'alert("test");' },
+	'entry_event' : 'command', 'entry_code' : '{ new_card(au); }'
 },
 {
-	'id' : 'ident_value', 'label' : getString('au_ident_value_label'), 'flex' : 1,
-	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.ident_value()',
-	'entry_widget' : 'textbox', 'rdefault' : '.ident_value()'
+	'id' : 'home_ou', 'label' : getString('au_home_ou_label'), 'flex' : 1, 'class' : 'peach_puff',
+	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : 'mw.G.org_tree_hash[ $$.home_ou() ].shortname()',
+	'entry_widget' : 'menulist', 'populate_with' : map_object(mw.G.org_tree_hash,function(key,value){return [value.shortname(), key];}),
+	'entry_event' : 'command', 'entry_code' : '{ au.home_ou( ev.target.value ); }',
+	'rdefault' : '.home_ou()'
 },
 {
-	'id' : 'ident_type2', 'label' : getString('au_ident_type2_label'), 'flex' : 1,
-	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : 'mw.G.cit_hash[ $$.ident_type2() ].name()',
-	'entry_widget' : 'menulist', 'populate_with' : map_object(mw.G.cit_hash,function(key,value){return [value.name(), key];}), 
-	'rdefault' : '.ident_type2()'
+	'id' : 'profile', 'label' : getString('au_profile_label'), 'flex' : 1, 'class' : 'peach_puff',
+	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : 'ap_hash[ $$.profile() ].name()',
+	'entry_widget' : 'menulist', 'populate_with' : map_object(mw.G.ap_hash,function(key,value){return [value.name(), key];}),
+	'entry_event' : 'command', 'entry_code' : '{ au.profile( ev.target.value ); }',
+	'rdefault' : '.profile()'
 },
 {
-	'id' : 'ident_value2', 'label' : getString('au_ident_value2_label'), 'flex' : 1,
-	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.ident_value2()',
-	'entry_widget' : 'textbox', 'rdefault' : '.ident_value2()'
+	'id' : 'prefix', 'label' : getString('au_prefix_label'), 'flex' : 1, 'class' : 'dark_salmon',
+	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.prefix()',
+	'entry_widget' : 'menulist', 'entry_widget_attributes' : { 'editable' : 'true' },
+	'entry_event' : 'command', 'entry_code' : '{ au.prefix( ev.target.value ); }',
+	'populate_with' : { 'Mr.' : 'Mr.' , 'Mrs.' : 'Mrs.' }, 'rdefault' : '.prefix()'
 },
 {
-	'id' : 'family_name', 'label' : getString('au_family_name_label'), 'flex' : 1,
+	'id' : 'family_name', 'label' : getString('au_family_name_label'), 'flex' : 1, 'class' : 'dark_salmon',
 	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.family_name()',
-	'entry_widget' : 'textbox', 'rdefault' : '.family_name()'
+	'entry_widget' : 'textbox', 'rdefault' : '.family_name()',
+	'entry_event' : 'change', 'entry_code' : '{ au.family_name( ev.target.value ); }'
 },
 {
-	'id' : 'first_given_name', 'label' : getString('au_first_given_name_label'), 'flex' : 1,
+	'id' : 'first_given_name', 'label' : getString('au_first_given_name_label'), 'flex' : 1, 'class' : 'dark_salmon',
 	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.first_given_name()',
-	'entry_widget' : 'textbox', 'rdefault' : '.first_given_name()'
+	'entry_widget' : 'textbox', 'rdefault' : '.first_given_name()',
+	'entry_event' : 'change', 'entry_code' : '{ au.frist_given_name( ev.target.value ); }'
 },
 {
-	'id' : 'second_given_name', 'label' : getString('au_second_given_name_label'), 'flex' : 1,
+	'id' : 'second_given_name', 'label' : getString('au_second_given_name_label'), 'flex' : 1, 'class' : 'dark_salmon',
 	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.second_given_name()',
-	'entry_widget' : 'textbox', 'rdefault' : '.second_given_name()'
+	'entry_widget' : 'textbox', 'rdefault' : '.second_given_name()',
+	'entry_event' : 'change', 'entry_code' : '{ au.second_given_name( ev.target.value ); }'
 },
 {
-	'id' : 'prefix', 'label' : getString('au_prefix_label'), 'flex' : 1,
-	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.prefix()',
+	'id' : 'suffix', 'label' : getString('au_suffix_label'), 'flex' : 1, 'class' : 'dark_salmon',
+	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.suffix()',
 	'entry_widget' : 'menulist', 'entry_widget_attributes' : { 'editable' : 'true' },
-	'populate_with' : { 'Mr.' : 'Mr.' , 'Mrs.' : 'Mrs.' }, 'rdefault' : '.prefix()'
+	'populate_with' : { 'Sr.' : 'Sr.' , 'Jr.' : 'Jr.' }, 'rdefault' : '.suffix()',
+	'entry_event' : 'command', 'entry_code' : '{ au.suffix( ev.target.value ); }'
 },
 {
-	'id' : 'suffix', 'label' : getString('au_suffix_label'), 'flex' : 1,
-	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.suffix()',
-	'entry_widget' : 'menulist', 'entry_widget_attributes' : { 'editable' : 'true' },
-	'populate_with' : { 'Sr.' : 'Sr.' , 'Jr.' : 'Jr.' }, 'rdefault' : '.suffix()'
+	'id' : 'dob', 'label' : getString('au_dob_label'), 'flex' : 1, 'class' : 'cadet_blue',
+	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.dob()',
+	'entry_widget' : 'textbox', 'rdefault' : '.dob()',
+	'entry_event' : 'change', 'entry_code' : '{ au.dob( ev.target.value ); }'
 },
 {
-	'id' : 'home_ou', 'label' : getString('au_home_ou_label'), 'flex' : 1,
-	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : 'mw.G.org_tree_hash[ $$.home_ou() ].shortname()',
-	'entry_widget' : 'menulist', 'populate_with' : map_object(mw.G.org_tree_hash,function(key,value){return [value.shortname(), key];}),
-	'rdefault' : '.home_ou()'
+	'id' : 'ident_type', 'label' : getString('au_ident_type_label'), 'flex' : 1, 'class' : 'cadet_blue',
+	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : 'mw.G.cit_hash[ $$.ident_type() ].name()',
+	'entry_widget' : 'menulist', 'populate_with' : map_object(mw.G.cit_hash,function(key,value){return [value.name(), key];}), 
+	'rdefault' : '.ident_type()',
+	'entry_event' : 'command', 'entry_code' : '{ au.ident_type( ev.target.value ); }'
 },
 {
-	'id' : 'profile', 'label' : getString('au_profile_label'), 'flex' : 1,
-	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : 'ap_hash[ $$.profile() ].name()',
-	'entry_widget' : 'menulist', 'populate_with' : map_object(mw.G.ap_hash,function(key,value){return [value.name(), key];}),
-	'rdefault' : '.profile()'
+	'id' : 'ident_value', 'label' : getString('au_ident_value_label'), 'flex' : 1, 'class' : 'cadet_blue',
+	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.ident_value()',
+	'entry_widget' : 'textbox', 'rdefault' : '.ident_value()',
+	'entry_event' : 'change', 'entry_code' : '{ au.ident_value( ev.target.value ); }'
 },
 {
-	'id' : 'addresses', 'label' : getString('au_addresses_label'), 'flex' : 1,
+	'id' : 'ident_type2', 'label' : getString('au_ident_type2_label'), 'flex' : 1, 'class' : 'cadet_blue',
+	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : 'mw.G.cit_hash[ $$.ident_type2() ].name()',
+	'entry_widget' : 'menulist', 'populate_with' : map_object(mw.G.cit_hash,function(key,value){return [value.name(), key];}), 
+	'rdefault' : '.ident_type2()',
+	'entry_event' : 'command', 'entry_code' : '{ au.ident_type2( ev.target.value ); }'
+},
+{
+	'id' : 'ident_value2', 'label' : getString('au_ident_value2_label'), 'flex' : 1, 'class' : 'cadet_blue',
+	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.ident_value2()',
+	'entry_widget' : 'textbox', 'rdefault' : '.ident_value2()',
+	'entry_event' : 'change', 'entry_code' : '{ au.ident_value2( ev.target.value ); }'
+},
+{
+	'id' : 'addresses', 'label' : getString('au_addresses_label'), 'flex' : 1, 'class' : 'coral',
 	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.addresses().length + " addresses"',
-	'entry_widget' : 'button', 'entry_widget_attributes' : { 'label' : 'Edit' }
+	'entry_widget' : 'button', 'entry_widget_attributes' : { 'label' : 'View/Edit/New' },
+	'entry_event' : 'command', 'entry_code' : '{ edit_addresses(au); }'
 },
 {
-	'id' : 'day_phone', 'label' : getString('au_day_phone_label'), 'flex' : 1,
+	'id' : 'day_phone', 'label' : getString('au_day_phone_label'), 'flex' : 1, 'class' : 'coral',
 	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.day_phone()',
-	'entry_widget' : 'textbox', 'rdefault' : '.day_phone()'
+	'entry_widget' : 'textbox', 'rdefault' : '.day_phone()',
+	'entry_event' : 'change', 'entry_code' : '{ au.day_phone( ev.target.value ); }'
 },
 {
-	'id' : 'evening_phone', 'label' : getString('au_evening_phone_label'), 'flex' : 1,
+	'id' : 'evening_phone', 'label' : getString('au_evening_phone_label'), 'flex' : 1, 'class' : 'coral',
 	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.evening_phone()',
-	'entry_widget' : 'textbox', 'rdefault' : '.evening_phone()'
+	'entry_widget' : 'textbox', 'rdefault' : '.evening_phone()',
+	'entry_event' : 'change', 'entry_code' : '{ au.evening_phone( ev.target.value ); }'
 },
 {
-	'id' : 'other_phone', 'label' : getString('au_other_phone_label'), 'flex' : 1,
+	'id' : 'other_phone', 'label' : getString('au_other_phone_label'), 'flex' : 1, 'class' : 'coral',
 	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.other_phone()',
-	'entry_widget' : 'textbox', 'rdefault' : '.other_phone()'
+	'entry_widget' : 'textbox', 'rdefault' : '.other_phone()',
+	'entry_event' : 'change', 'entry_code' : '{ au.other_phone( ev.target.value ); }'
 },
 {
-	'id' : 'email', 'label' : getString('au_email_label'), 'flex' : 1,
+	'id' : 'email', 'label' : getString('au_email_label'), 'flex' : 1, 'class' : 'coral',
 	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.email()',
-	'entry_widget' : 'textbox', 'rdefault' : '.email()'
-},
-{
-	'id' : 'dob', 'label' : getString('au_dob_label'), 'flex' : 1,
-	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.dob()',
-	'entry_widget' : 'textbox', 'rdefault' : '.dob()'
+	'entry_widget' : 'textbox', 'rdefault' : '.email()',
+	'entry_event' : 'change', 'entry_code' : '{ au.email( ev.target.value ); }'
 },
 {
 	'id' : 'master_account', 'label' : getString('au_master_account_label'), 'flex' : 1,
 	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.master_account()',
-	'entry_widget' : 'textbox', 'rdefault' : '.master_account()'
+	'entry_widget' : 'textbox', 'rdefault' : '.master_account()',
+	'entry_event' : 'change', 'entry_code' : '{ au.master_account( ev.target.value ); }'
 },
 {
 	'id' : 'net_access_level', 'label' : getString('au_net_access_level_label'), 'flex' : 1,
 	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.net_access_level()',
-	'entry_widget' : 'textbox', 'rdefault' : '.net_access_level()'
+	'entry_widget' : 'textbox', 'rdefault' : '.net_access_level()',
+	'entry_event' : 'change', 'entry_code' : '{ au.net_access_level( ev.target.value ); }'
 },
 {
 	'id' : 'passwd', 'label' : getString('au_passwd_label'), 'flex' : 1,
 	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.passwd()',
-	'entry_widget' : 'textbox', 'rdefault' : '.passwd()'
+	'entry_widget' : 'textbox', 'rdefault' : '.passwd()',
+	'entry_event' : 'change', 'entry_code' : '{ au.passwd( ev.target.value ); }'
 },
 {
 	'id' : 'photo_url', 'label' : getString('au_photo_url_label'), 'flex' : 1,
 	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.photo_url()',
-	'entry_widget' : 'textbox', 'rdefault' : '.photo_url()'
-},
-{
-	'id' : 'standing', 'label' : getString('au_standing_label'), 'flex' : 1,
-	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : 'mw.G.cst_hash[ $$.standing() ].value()',
-	'entry_widget' : 'menulist', 'populate_with' : map_object(mw.G.cst_hash,function(key,value){return [value.value(), key];}),
-	'rdefault' : '.standing()'
+	'entry_widget' : 'textbox', 'rdefault' : '.photo_url()',
+	'entry_event' : 'change', 'entry_code' : '{ au.photo_url( ev.target.value ); }'
 },
 {
 	'id' : 'stat_cat_entries', 'label' : getString('au_stat_cat_entries_label'), 'flex' : 1,
 	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.stat_cat_entries().length + " entries"',
-	'entry_widget' : 'button', 'entry_widget_attributes' : { 'label' : 'Edit' }
+	'entry_widget' : 'button', 'entry_widget_attributes' : { 'label' : 'View/Edit' },
+	'entry_event' : 'command', 'entry_code' : '{ edit_stat_cat_entries(au); }'
 },
 {
 	'id' : 'survey_responses', 'label' : getString('au_survey_responses_label'), 'flex' : 1,
 	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.survey_responses().length + " responses"',
-	'entry_widget' : 'button', 'entry_widget_attributes' : { 'label' : 'Edit' }
+	'entry_widget' : 'button', 'entry_widget_attributes' : { 'label' : 'View/New' },
+	'entry_event' : 'command', 'entry_code' : '{ new_survey_responses(au); }'
 },
 {
 	'id' : 'usrgroup', 'label' : getString('au_usrgroup_label'), 'flex' : 1,
 	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.usrgroup()',
-	'entry_widget' : 'textbox', 'rdefault' : '.usrgroup()'
+	'entry_widget' : 'textbox', 'rdefault' : '.usrgroup()',
+	'entry_event' : 'change', 'entry_code' : '{ au.usrgroup( ev.target.value ); }'
 },
 {
 	'id' : 'usrname', 'label' : getString('au_usrname_label'), 'flex' : 1,
 	'primary' : false, 'hidden' : false, 'fm_class' : 'au', 'fm_field_render' : '.usrname()',
-	'entry_widget' : 'textbox', 'rdefault' : '.usrname()'
+	'entry_widget' : 'textbox', 'rdefault' : '.usrname()',
+	'entry_event' : 'change', 'entry_code' : '{ au.usrname( ev.target.value ); }'
 },
 ];
 
diff --git a/Evergreen/staff_client/chrome/locale/en-US/evergreen/auth.dtd b/Evergreen/staff_client/chrome/locale/en-US/evergreen/auth.dtd
index 7402b97b93..e296c831bf 100644
--- a/Evergreen/staff_client/chrome/locale/en-US/evergreen/auth.dtd
+++ b/Evergreen/staff_client/chrome/locale/en-US/evergreen/auth.dtd
@@ -1,5 +1,5 @@
 <!ENTITY auth.title "Evergreen Staff Client Pre-Alpha">
-<!ENTITY auth.version "Evergreen 0.0.9 2005071911">
+<!ENTITY auth.version "Evergreen 0.0.9 2005072208">
 
 <!ENTITY auth.login_header "Login">
 <!ENTITY auth.name_prompt "Name:"><!ENTITY auth.name_prompt.key "N">
diff --git a/Evergreen/staff_client/chrome/skin/evergreen/evergreen.css b/Evergreen/staff_client/chrome/skin/evergreen/evergreen.css
index 5adece6e7a..c29f969f84 100644
--- a/Evergreen/staff_client/chrome/skin/evergreen/evergreen.css
+++ b/Evergreen/staff_client/chrome/skin/evergreen/evergreen.css
@@ -9,3 +9,10 @@ tabpanel { border: 2px groove black; }
 .text_center { text-align: center; }
 .text_justify { text-align: justify; }
 
+.tan { background-color: #D2B48C; }
+.sandy_brown { background-color: #F4A460; }
+.peach_puff { background-color: #FFDAB9; }
+.pale_violet_red { background-color: #D87093; }
+.cadet_blue { background-color: #5F9EA0; }
+.dark_salmon { background-color: #E9967A; }
+.coral { background-color: #FF7F50; }
-- 
2.43.2