[open-ils-commits] r12856 - in trunk/Open-ILS: web/opac/locale/en-US xul/staff_client/server/main (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2009-04-13 22:14:56 -0400 (Mon, 13 Apr 2009)
New Revision: 12856

Modified:
   trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
   trunk/Open-ILS/xul/staff_client/server/main/ws_info.xul
Log:
workstation registration tweaks.. layout, help, and NO_SESSION handling

Modified: trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
===================================================================
--- trunk/Open-ILS/web/opac/locale/en-US/lang.dtd	2009-04-14 01:31:37 UTC (rev 12855)
+++ trunk/Open-ILS/web/opac/locale/en-US/lang.dtd	2009-04-14 02:14:56 UTC (rev 12856)
@@ -1838,10 +1838,13 @@
 <!ENTITY staff.circ.print_list.line_item.label "Line Item">
 <!ENTITY staff.circ.print_list.footer.label "Footer">
 <!ENTITY staff.main.data.loading "Loading data...">
-<!ENTITY staff.main.ws_info.entry "Enter a workstation name and library to register this client under:">
-<!ENTITY staff.main.ws_info.name "Name">
+<!ENTITY staff.main.ws_info.entry "Enter a workstation name and organization to register this client under.  This will be used for statistics and auditing, and for determining the 'place' where check-ins and check-outs occur.">
+<!ENTITY staff.main.ws_info.name "WS Name">
+<!ENTITY staff.main.ws_info.organization "Organization">
 <!ENTITY staff.main.ws_info.register_btn.label "Register">
 <!ENTITY staff.main.ws_info.register_btn.accesskey "R">
+<!ENTITY staff.main.ws_info.help_btn.label "Help">
+<!ENTITY staff.main.ws_info.help_btn.accesskey "H">
 <!ENTITY staff.cat.bib_brief.record_summary "Record Summary">
 <!ENTITY staff.cat.bib_brief.title "Title:">
 <!ENTITY staff.cat.bib_brief.view_marc "View MARC">

Modified: trunk/Open-ILS/xul/staff_client/server/main/ws_info.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/main/ws_info.xul	2009-04-14 01:31:37 UTC (rev 12855)
+++ trunk/Open-ILS/xul/staff_client/server/main/ws_info.xul	2009-04-14 02:14:56 UTC (rev 12856)
@@ -162,6 +162,7 @@
 					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 {
@@ -184,18 +185,30 @@
 	]]>
 	</script>
 
-	<vbox flex="1" style="background: #993333">
-		<description>
-			&staff.main.ws_info.entry;
-		</description>
-		<hbox>
-			<label value="&staff.main.ws_info.name;" control="wsname"/>
-			<textbox id="wsname"  context="clipboard"/>
-		</hbox>
-		<vbox>
-			<hbox id="placeholder"/>
-			<button id="register_btn" label="&staff.main.ws_info.register_btn.label;" accesskey="&staff.main.ws_info.register_btn.accesskey;" oncommand="register();"/>
-		</vbox>
-	</vbox>
+    <vbox flex="1" class="my_overflow">
+        <description id="desc" hidden="true">
+            &staff.main.ws_info.entry;
+        </description>
+            <grid style="border: solid thick red;">
+                <columns>
+                    <column/>
+                    <column/>
+                </columns>
+                <rows>
+                    <row>
+                        <label value="&staff.main.ws_info.name;" control="wsname"/>
+                        <textbox id="wsname"  context="clipboard"/>
+                    </row>
+                    <row>
+                        <label value="&staff.main.ws_info.organization;" control="placeholder"/>
+                        <hbox id="placeholder" flex="1"/>
+                    </row>
+                    <row>
+                        <button id="register_btn" label="&staff.main.ws_info.register_btn.label;" accesskey="&staff.main.ws_info.register_btn.accesskey;" oncommand="register();"/>
+                        <button id="help_btn" label="&staff.main.ws_info.help_btn.label;" accesskey="&staff.main.ws_info.help_btn.accesskey;" oncommand="alert(document.getElementById('desc').textContent); document.getElementById('wsname').focus();"/>
+                    </row>
+                </rows>
+            </grid>
+    </vbox>
 </window>