[open-ils-commits] [GIT] Evergreen ILS branch master updated. 41358314b81a6d238f5433da70963aaed00a70f5

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  41358314b81a6d238f5433da70963aaed00a70f5 (commit)
      from  41c3152852132cfba79899d099678e6f9ee5dc5c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 41358314b81a6d238f5433da70963aaed00a70f5
Author: James Fournie <jfournie at sitka.bclibraries.ca>
Date:   Thu Jul 28 12:08:18 2011 -0700

    This adds a SAN box to the org unit editor's address editor pane.
    
    Signed-off-by: James Fournie <jfournie at sitka.bclibraries.ca>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/web/conify/global/actor/org_unit.html b/Open-ILS/web/conify/global/actor/org_unit.html
index 726898b..1c71ea4 100644
--- a/Open-ILS/web/conify/global/actor/org_unit.html
+++ b/Open-ILS/web/conify/global/actor/org_unit.html
@@ -574,6 +574,9 @@
 										<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>
+									<tr>
+										<th>&conify.org_unit.addresses_pane.san;</th><td colspan="2"><span jsId="billing_addr_san" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_billing_address.san( this.getValue() )" required="true"/></td>
+									</tr>
 								</table>
 	
 								<button jsId="save_billing_address" dojoType="dijit.form.Button" label="&conify.save_button.label;">
@@ -641,6 +644,9 @@
 										<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>
+									<tr>
+										<th>&conify.org_unit.addresses_pane.san;</th><td colspan="2"><span jsId="holds_addr_san" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_holds_address.san( this.getValue() )" required="true"/></td>
+									</tr>
 								</table>
 	
 								<button jsId="save_holds_address" dojoType="dijit.form.Button" label="&conify.save_button.label;">
@@ -707,6 +713,9 @@
 										<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>
+									<tr>
+										<th>&conify.org_unit.addresses_pane.san;</th><td colspan="2"><span jsId="mailing_addr_san" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_mailing_address.san( this.getValue() )" required="true"/></td>
+									</tr>
 								</table>
 	
 								<button jsId="save_mailing_address" dojoType="dijit.form.Button" label="&conify.save_button.label;">
@@ -773,6 +782,9 @@
 										<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>
+									<tr>
+										<th>&conify.org_unit.addresses_pane.san;</th><td colspan="2"><span jsId="ill_addr_san" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_ill_address.san( this.getValue() )" required="true"/></td>
+									</tr>
 								</table>
 	
 								<button jsId="save_ill_address" dojoType="dijit.form.Button" label="&conify.save_button.label;">
diff --git a/Open-ILS/web/conify/global/actor/org_unit.js b/Open-ILS/web/conify/global/actor/org_unit.js
index 12f9139..066dedd 100644
--- a/Open-ILS/web/conify/global/actor/org_unit.js
+++ b/Open-ILS/web/conify/global/actor/org_unit.js
@@ -159,5 +159,6 @@ function set_addr_inputs (type) {
     window[type + '_addr_country'].setValue( window['current_' + type + '_address'].country() || '' );
     window[type + '_addr_state'].setValue( window['current_' + type + '_address'].state() || '' );
     window[type + '_addr_post_code'].setValue( window['current_' + type + '_address'].post_code() || '' );
+    window[type + '_addr_san'].setValue( window['current_' + type + '_address'].san() || '' );
 }
 
diff --git a/Open-ILS/web/opac/locale/en-US/conify.dtd b/Open-ILS/web/opac/locale/en-US/conify.dtd
index 3e6a9db..c0cf5a7 100644
--- a/Open-ILS/web/opac/locale/en-US/conify.dtd
+++ b/Open-ILS/web/opac/locale/en-US/conify.dtd
@@ -60,6 +60,7 @@
 <!ENTITY conify.org_unit.addresses_pane.zip "Zip">
 <!ENTITY conify.org_unit.addresses_pane.country "Country">
 <!ENTITY conify.org_unit.addresses_pane.county "County">
+<!ENTITY conify.org_unit.addresses_pane.san "SAN">
 <!-- This is a highlighted label that is followed by the name of the organizational unit -->
 <!ENTITY conify.org_unit.status_bar "Now editing:">
 

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/web/conify/global/actor/org_unit.html |   12 ++++++++++++
 Open-ILS/web/conify/global/actor/org_unit.js   |    1 +
 Open-ILS/web/opac/locale/en-US/conify.dtd      |    1 +
 3 files changed, 14 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Evergreen ILS