From 1b1eef1d60fecfd09a4953abac937a4ad430d27b Mon Sep 17 00:00:00 2001
From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 14 Jul 2005 07:13:13 +0000
Subject: [PATCH] filter console, refactor, and hideable page tree navbar

git-svn-id: svn://svn.open-ils.org/ILS/trunk@1180 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 .../main/app_shell_menus_overlay.xul          | 10 +++---
 .../evergreen/main/app_shell_overlay.xul      | 12 +++----
 .../content/evergreen/main/paged_tree.js      | 31 +++++++++++++------
 .../content/evergreen/main/paged_tree.xul     |  1 +
 4 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_menus_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_menus_overlay.xul
index d3d4543a5b..d3a3cd1781 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_menus_overlay.xul
+++ b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_menus_overlay.xul
@@ -127,11 +127,11 @@
 		<menuitem label="Survey Wizard" accesskey="S" command="cmd_survey_wizard"/>
 		<menuitem label="Copy Stat-Cat Editor" accesskey="C" command="cmd_copy_stat_cat_edit"/>
 		<menuitem label="Patron Stat-Cat Editor" accesskey="P" command="cmd_patron_stat_cat_edit"/>
-		<menuitem label="stub" />
-		<menuitem label="Test Module" command="cmd_test"/>
-		<menuitem label="Javscript Console" command="cmd_console"/>
-		<menuitem label="Javscript Shell" command="cmd_shell"/>
-		<menuitem label="XUL Test" command="cmd_xuleditor"/>
+		<menuitem label="Test Module" accesskey="T" command="cmd_test"/>
+		<menuitem label="XUL Test" accesskey="X" command="cmd_xuleditor"/>
+		<menuitem label="Javscript Console" accesskey="J" command="cmd_console"/>
+		<menuitem label="Filterable Console" accesskey="F" command="cmd_filter_console"/>
+		<menuitem label="Javscript Shell" accesskey="H" command="cmd_shell"/>
 	</menupopup>
 </menu>
 
diff --git a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul
index 1d4ce7fbe7..89db78e164 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul
+++ b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul
@@ -63,15 +63,11 @@
 	<command id="cmd_xuleditor" oncommand="
 		mw.spawn_xuleditor(document,'new_tab','main_tabbox',{}); "/>
 
+	<command id="cmd_filter_console" oncommand="
+		mw.spawn_filter_console(document,'new_tab','main_tabbox',{}); "/>
+
 	<command id="cmd_test" oncommand="
-		mw.spawn_interface(
-			document,
-			'new_tab',
-			'main_tabbox',
-			'chrome://evergreen/content/patron/patron_display.xul',
-			'test',
-			{ }
-		); "/>
+		alert('Not Yet Implemented'); "/>
 
 	<command id="cmd_broken" oncommand="
 		alert('Not Yet Implemented'); "/>
diff --git a/Evergreen/staff_client/chrome/content/evergreen/main/paged_tree.js b/Evergreen/staff_client/chrome/content/evergreen/main/paged_tree.js
index 20a0f6a9fe..57fa3a2d2e 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/main/paged_tree.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/main/paged_tree.js
@@ -4,15 +4,23 @@ function paged_tree_init(p) {
 	sdump('D_PAGED_TREE',"TESTING: paged_tree.js: " + mw.G['main_test_variable'] + '\n');
 	sdump('D_TRACE_ENTER',arg_dump(arguments));
 
-	p.w.display_count = 10;
 	p.w.current_idx = 0;
 
 	p.w.results_label = get_widget( p.w.document, p.nav_results );
 	p.w.range_label = get_widget( p.w.document, p.nav_range );
+
 	p.w.hits_per_page_menu = get_widget( p.w.document, p.nav_hits_per_page );
+	if (p.hits_per_page) 
+		p.w.display_count = parseInt( p.hits_per_page );
+	else 
+		p.w.display_count = parseInt( p.w.hits_per_page_menu.getAttribute('value') );
+
 	p.w.next_button = get_widget( p.w.document, p.nav_next );
 	p.w.prev_button = get_widget( p.w.document, p.nav_prev );
 
+	p.w.nav_bar = get_widget( p.w.document, p.nav_bar );
+	if (p.hide_nav) p.w.nav_bar.hidden = p.hide_nav;
+
 	/*
 	// Doesn't work for some reason
 	var cmd_set_hits_per_page = get_widget( p.w.document, 'cmd_set_hits_per_page' );
@@ -109,14 +117,19 @@ function paged_tree_init(p) {
 
 	p.w.map_cols_to_treeitem = map_array_to_treecells_via_treeitem;
 
-        if (p.onload) {
-                try {
-                        sdump('D_TRACE','trying psuedo-onload: ' + p.onload + '\n');
-                        p.onload(p.w);
-                } catch(E) {
-                        sdump('D_ERROR', js2JSON(E) + '\n' );
-                }
-        }
+	setTimeout(
+		function() {
+			sdump('D_TIMEOUT','***** timeout occured paged_tree.js');
+		        if (p.onload) {
+		                try {
+		                        sdump('D_TRACE','trying psuedo-onload: ' + p.onload + '\n');
+		                        p.onload(p.w);
+		                } catch(E) {
+		                        sdump('D_ERROR', js2JSON(E) + '\n' );
+		                }
+		        }
+		}, 0
+	);
 	sdump('D_TRACE_EXIT',arg_dump(arguments));
 	return;
 }
diff --git a/Evergreen/staff_client/chrome/content/evergreen/main/paged_tree.xul b/Evergreen/staff_client/chrome/content/evergreen/main/paged_tree.xul
index bea9904e03..e1e877ef09 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/main/paged_tree.xul
+++ b/Evergreen/staff_client/chrome/content/evergreen/main/paged_tree.xul
@@ -10,6 +10,7 @@
 	onload="
 		params.paged_tree = 'PagedTree_tree'; 
 		params.popup = 'PagedTree_popup';
+		params.nav_bar = 'PagedTree_nav';
 		params.nav_range = 'PagedTree_label_range'; 
 		params.nav_results = 'PagedTree_label_results'; 
 		params.nav_hits_per_page = 'PagedTree_menulist_hits_per_page';
-- 
2.43.2