From 28cd1266dd18fc1e81f110db2ca6e9a05155b9ff Mon Sep 17 00:00:00 2001
From: Thomas Berezansky <tsbere@mvlc.org>
Date: Tue, 27 Sep 2011 13:02:14 -0400
Subject: [PATCH] More self-closing cleanup

All div and span tags in tt2, js, html, and xhtml files.

Ignored .xml files, as they are not (to my knowledge) served as text/html.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
---
 Open-ILS/src/templates/acq/invoice/view.tt2   |  24 ++--
 .../src/templates/acq/lineitem/findbib.tt2    |   4 +-
 .../src/templates/acq/lineitem/related.tt2    |   4 +-
 .../src/templates/acq/lineitem/worksheet.tt2  |   2 +-
 .../templates/acq/picklist/brief_record.tt2   |   4 +-
 Open-ILS/src/templates/acq/picklist/list.tt2  |   2 +-
 .../templates/acq/picklist/user_request.tt2   |   2 +-
 Open-ILS/src/templates/acq/po/view.tt2        |  12 +-
 Open-ILS/src/templates/acq/search/unified.tt2 |   2 +-
 .../src/templates/actor/user/register.tt2     |   2 +-
 .../src/templates/circ/selfcheck/main.tt2     |   2 +-
 .../action_trigger/event_definition_data.tt2  |   2 +-
 .../global/asset/copy_location_order.tt2      |   2 +-
 .../global/config/barcode_completion.tt2      |   2 +-
 .../global/config/circ_matrix_matchpoint.tt2  |   2 +-
 .../conify/global/config/coded_value_map.tt2  |   2 +-
 .../src/templates/vandelay/inc/progress.tt2   |   2 +-
 Open-ILS/src/templates/vandelay/inc/queue.tt2 |  18 +--
 .../src/templates/vandelay/inc/upload.tt2     |   4 +-
 .../web/conify/global/actor/org_unit.html     | 114 +++++++++---------
 Open-ILS/web/conify/global/admin.html         |   2 +-
 .../dojo/openils/widget/GridColumnPicker.js   |   2 +-
 .../js/dojo/openils/widget/TranslatorPopup.js |   2 +-
 Open-ILS/web/reports/oils_rpt.xhtml           |  14 +--
 Open-ILS/web/reports/oils_rpt_builder.xhtml   |  16 +--
 Open-ILS/web/reports/oils_rpt_editor.xhtml    |  10 +-
 .../web/reports/oils_rpt_folder_window.xhtml  |   6 +-
 .../web/reports/oils_rpt_param_editor.xhtml   |   6 +-
 .../server/admin/cash_reports.xhtml           |   6 +-
 .../server/admin/closed_dates.xhtml           |   8 +-
 .../server/admin/copy_locations.xhtml         |   2 +-
 .../server/admin/hold_pull_list.xhtml         |   4 +-
 .../server/admin/hold_pull_list_classic.xhtml |  18 +--
 .../server/admin/non_cat_types.xhtml          |   2 +-
 .../server/admin/org_unit_settings.xhtml      |  18 +--
 .../server/admin/stat_cat_editor.xhtml        |   4 +-
 .../xul/staff_client/server/patron/ue.xhtml   |  14 +--
 .../server/patron/user_edit.xhtml             |   6 +-
 38 files changed, 174 insertions(+), 174 deletions(-)

diff --git a/Open-ILS/src/templates/acq/invoice/view.tt2 b/Open-ILS/src/templates/acq/invoice/view.tt2
index a6289e3089..38ca8736cd 100644
--- a/Open-ILS/src/templates/acq/invoice/view.tt2
+++ b/Open-ILS/src/templates/acq/invoice/view.tt2
@@ -9,7 +9,7 @@
     </div>
 
     <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-        <div id='acq-view-invoice-div'/>
+        <div id='acq-view-invoice-div'></div>
     </div>
 
     <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
@@ -41,8 +41,8 @@
                     <td class='acq-invoice-center-col'>
                         <span name='inv_item_count'></span>&nbsp;/&nbsp;<span name='phys_item_count'></span>
                     </td>
-                    <td class='acq-invoice-billed-col'><div name='cost_billed'/></td>
-                    <td class='acq-invoice-paid-col'><div name='amount_paid'/></td>
+                    <td class='acq-invoice-billed-col'><div name='cost_billed'></div></td>
+                    <td class='acq-invoice-paid-col'><div name='amount_paid'></div></td>
                     <td class='acq-invoice-center-col hide-complete'><a href='javascript:void(0);' name='detach'>Detach</a></td>
                 </tr>
             </tbody>
@@ -66,11 +66,11 @@
             </thead>
             <tbody id='acq-invoice-item-tbody'>
                 <tr id='acq-invoice-item-template' class='acq-invoice-row acq-invoice-item-row'>
-                    <td><div name='inv_item_type'/></td>
-                    <td class='acq-invoice-center-col'><div name='fund'/></td>
-                    <td><div name='title'/></td>
-                    <td class='acq-invoice-center-col' class='acq-invoice-billed-col'><div name='cost_billed'/></td>
-                    <td class='acq-invoice-paid-col'><div name='amount_paid'/></td>
+                    <td><div name='inv_item_type'></div></td>
+                    <td class='acq-invoice-center-col'><div name='fund'></div></td>
+                    <td><div name='title'></div></td>
+                    <td class='acq-invoice-center-col' class='acq-invoice-billed-col'><div name='cost_billed'></div></td>
+                    <td class='acq-invoice-paid-col'><div name='amount_paid'></div></td>
                     <td class='acq-invoice-center-col hide-complete'><a href='javascript:void(0);' name='delete'>Delete</a></td>
                 </tr>
             </tbody>
@@ -110,15 +110,15 @@
                                 dojoType='dijit.form.Button' onclick='saveChanges(false, false, true);'>Reopen Invoice</button>
                         </span>
                     </td>
-                    <td class='acq-invoice-center-col'><div jsId='totalInvoicedBox' dojoType='dijit.form.CurrencyTextBox' style='width:9em;'/></td>
-                    <td class='acq-invoice-paid-col'><div jsId='totalPaidBox' dojoType='dijit.form.CurrencyTextBox' style='width:9em;'/></td>
-                    <td class='acq-invoice-center-col'><div jsId='balanceOwedBox' dojoType='dijit.form.CurrencyTextBox' style='width:9em;'/></td>
+                    <td class='acq-invoice-center-col'><div jsId='totalInvoicedBox' dojoType='dijit.form.CurrencyTextBox' style='width:9em;'></div></td>
+                    <td class='acq-invoice-paid-col'><div jsId='totalPaidBox' dojoType='dijit.form.CurrencyTextBox' style='width:9em;'></div></td>
+                    <td class='acq-invoice-center-col'><div jsId='balanceOwedBox' dojoType='dijit.form.CurrencyTextBox' style='width:9em;'></div></td>
                 </tr>
             </tbody>
         </table>
     </div>
 </div>
-<div dojoType='openils.widget.ProgressDialog' jsId='progressDialog'/>
+<div dojoType='openils.widget.ProgressDialog' jsId='progressDialog'></div>
 <div jsId='extraItemsDialog' dojoType="dijit.Dialog" title="Extra Items">
     <div dojoType="dijit.layout.ContentPane" style='text-align:center;'>
         <div id='acq-invoice-extra-copies-message'></div>
diff --git a/Open-ILS/src/templates/acq/lineitem/findbib.tt2 b/Open-ILS/src/templates/acq/lineitem/findbib.tt2
index 7eedc44d77..57c1142166 100644
--- a/Open-ILS/src/templates/acq/lineitem/findbib.tt2
+++ b/Open-ILS/src/templates/acq/lineitem/findbib.tt2
@@ -64,10 +64,10 @@
 <div id='marc-div' class='hidden'>
     <button dojoType='dijit.form.Button' onclick='openils.Util.hide("marc-div");'>Hide</button>
     <div style='text-align:left;'>
-        <div id='marc-html-div'/>
+        <div id='marc-html-div'></div>
     </div>
 </div>
-<div jsId='progressDialog' dojoType='openils.widget.ProgressDialog' message='Searching....'/>
+<div jsId='progressDialog' dojoType='openils.widget.ProgressDialog' message='Searching....'></div>
 
 <script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/acq/lineitem/findbib.js"></script>
 [% END %]
diff --git a/Open-ILS/src/templates/acq/lineitem/related.tt2 b/Open-ILS/src/templates/acq/lineitem/related.tt2
index 487baafb4c..43a82d43c6 100644
--- a/Open-ILS/src/templates/acq/lineitem/related.tt2
+++ b/Open-ILS/src/templates/acq/lineitem/related.tt2
@@ -18,7 +18,7 @@
             </div>
         </li>
         <li>
-            <div type='opac/slot-data' query='datafield[tag=100] subfield[code=a]'/>
+            <div type='opac/slot-data' query='datafield[tag=100] subfield[code=a]'></div>
         </li>
         <li>
             <div type='opac/slot-data' query='datafield[tag=020]'>
@@ -32,7 +32,7 @@
             </div>
         </li>
         <li>
-            <div type='opac/slot-data' query='datafield[tag=260] subfield[code=c]'/>
+            <div type='opac/slot-data' query='datafield[tag=260] subfield[code=c]'></div>
         </li>
     </ul>
 
diff --git a/Open-ILS/src/templates/acq/lineitem/worksheet.tt2 b/Open-ILS/src/templates/acq/lineitem/worksheet.tt2
index 58548f62eb..262c2700a8 100644
--- a/Open-ILS/src/templates/acq/lineitem/worksheet.tt2
+++ b/Open-ILS/src/templates/acq/lineitem/worksheet.tt2
@@ -5,7 +5,7 @@
 <br/>
 <div id="acq-worksheet-contents"></div>
 <div class='hidden'>
-    <div jsId='progressDialog' dojoType='openils.widget.ProgressDialog' message='Loading Worksheet...'/>
+    <div jsId='progressDialog' dojoType='openils.widget.ProgressDialog' message='Loading Worksheet...'></div>
 </div>
 <script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/acq/lineitem/worksheet.js"></script>
 [% END %]
diff --git a/Open-ILS/src/templates/acq/picklist/brief_record.tt2 b/Open-ILS/src/templates/acq/picklist/brief_record.tt2
index 9e10102133..0a126da44c 100644
--- a/Open-ILS/src/templates/acq/picklist/brief_record.tt2
+++ b/Open-ILS/src/templates/acq/picklist/brief_record.tt2
@@ -15,8 +15,8 @@
                 <td><input dojoType='dijit.form.TextBox' jsId='poNumber' disabled='disabled'/></td>
             </tr>
             <tr id='acq-brief-record-row'>
-                <td><div name='name'/></td>
-                <td><div name='widget'/></td>
+                <td><div name='name'></div></td>
+                <td><div name='widget'></div></td>
             </tr>
         </tbody>
         <tbody>
diff --git a/Open-ILS/src/templates/acq/picklist/list.tt2 b/Open-ILS/src/templates/acq/picklist/list.tt2
index 1fd98a6f9a..250e2c277a 100644
--- a/Open-ILS/src/templates/acq/picklist/list.tt2
+++ b/Open-ILS/src/templates/acq/picklist/list.tt2
@@ -86,7 +86,7 @@
         </thead>
     </table>
     <div class='hidden'>
-        <div jsId='progressDialog' dojoType='openils.widget.ProgressDialog'/>
+        <div jsId='progressDialog' dojoType='openils.widget.ProgressDialog'></div>
     </div>
 </div>
 
diff --git a/Open-ILS/src/templates/acq/picklist/user_request.tt2 b/Open-ILS/src/templates/acq/picklist/user_request.tt2
index a478fdc895..2a392c0f7f 100644
--- a/Open-ILS/src/templates/acq/picklist/user_request.tt2
+++ b/Open-ILS/src/templates/acq/picklist/user_request.tt2
@@ -81,7 +81,7 @@
                     </span>
                 </div>
             </div>
-            <div id="detail_content_pane" />
+            <div id="detail_content_pane" ></div>
         </div>
     </div>
 <script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/picklist/user_request.js'></script>
diff --git a/Open-ILS/src/templates/acq/po/view.tt2 b/Open-ILS/src/templates/acq/po/view.tt2
index 55f66797f8..ec2c9ea8d8 100644
--- a/Open-ILS/src/templates/acq/po/view.tt2
+++ b/Open-ILS/src/templates/acq/po/view.tt2
@@ -11,7 +11,7 @@
                 <tr>
                     <th>ID</th><td><a id="acq-po-view-id"/></td>
                     <th>Prepayment Required?</th>
-                    <td><span id="acq-po-view-prepay"/></td>
+                    <td><span id="acq-po-view-prepay"></span></td>
                 </tr>
                 <tr>
                     <th>Name</th>
@@ -25,7 +25,7 @@
                 </tr>
                 <tr>
                     <th>Provider</th>
-                    <td><span id="acq-po-view-provider"/></td>
+                    <td><span id="acq-po-view-provider"></span></td>
                     <th>Notes</th>
                     <td>
                         <a href="javascript:void(0);"
@@ -34,7 +34,7 @@
                 </tr>
                 <tr>
                     <th>Total Lineitems</th>
-                    <td><span id="acq-po-view-total-li"/></td>
+                    <td><span id="acq-po-view-total-li"></span></td>
                     <th>EDI Messages</th>
                     <td>
                         <a href="javascript:void(0);"
@@ -43,7 +43,7 @@
                 </tr>
                 <tr>
                     <th>Total Estimated</th>
-                    <td>$<span id="acq-po-view-total-estimated"/></td>
+                    <td>$<span id="acq-po-view-total-estimated"></span></td>
                     <th>History</th>
                     <td>
                         <a class="hidden" href="javascript:void(0);"
@@ -52,7 +52,7 @@
                 </tr>
                 <tr>
                     <th>Total Encumbered</th>
-                    <td>$<span id="acq-po-view-total-enc"/></td>
+                    <td>$<span id="acq-po-view-total-enc"></span></td>
                     <th>Invoicing</th>
                     <td id="acq-po-invoice-stuff" class="hidden">
                         <button dojoType="dijit.form.Button"
@@ -84,7 +84,7 @@
                 </tr>
                 <tr>
                     <th>Total Spent</th>
-                    <td>$<span id="acq-po-view-total-spent"/></td>
+                    <td>$<span id="acq-po-view-total-spent"></span></td>
                     <th id="acq-po-cancel-label"></th>
                     <td>
                         <span id="acq-po-view-cancel-reason"></span>
diff --git a/Open-ILS/src/templates/acq/search/unified.tt2 b/Open-ILS/src/templates/acq/search/unified.tt2
index 68e7dcdb2f..41b3a6018e 100644
--- a/Open-ILS/src/templates/acq/search/unified.tt2
+++ b/Open-ILS/src/templates/acq/search/unified.tt2
@@ -241,6 +241,6 @@
         [% INCLUDE "acq/common/li_table_pager.tt2" %]
         [% INCLUDE "acq/common/li_table.tt2" %]
     </div>
-    <div jsId='progressDialog' dojoType='openils.widget.ProgressDialog'/>
+    <div jsId='progressDialog' dojoType='openils.widget.ProgressDialog'></div>
 </div>
 [% END %]
diff --git a/Open-ILS/src/templates/actor/user/register.tt2 b/Open-ILS/src/templates/actor/user/register.tt2
index 71f0f4e7a9..b03047be27 100644
--- a/Open-ILS/src/templates/actor/user/register.tt2
+++ b/Open-ILS/src/templates/actor/user/register.tt2
@@ -28,7 +28,7 @@
 <a class='hidden' id='uedit-help-template'><img src='/opac/images/advancedsearch-icon.png'></img></a>
 <fieldset id='uedit-help-div' class='hidden'>
     <legend id='uedit-help-field'/>
-    <div id='uedit-help-text'/>
+    <div id='uedit-help-text'></div>
 </fieldset>
 
 <!-- duplicate patron search results -->
diff --git a/Open-ILS/src/templates/circ/selfcheck/main.tt2 b/Open-ILS/src/templates/circ/selfcheck/main.tt2
index 3c2be14f88..6790bb8b41 100644
--- a/Open-ILS/src/templates/circ/selfcheck/main.tt2
+++ b/Open-ILS/src/templates/circ/selfcheck/main.tt2
@@ -41,7 +41,7 @@
             <tr>
                 <td>Choose a location</td>
                 <td><div dojoType='openils.widget.OrgUnitFilteringSelect' jsId='oilsSelfckWsLocSelector' 
-                    searchAttr='shortname' labelAttr='shortname'/></td>
+                    searchAttr='shortname' labelAttr='shortname'></div></td>
             </tr>
             <tr>
                 <td>Enter a workstation name</td>
diff --git a/Open-ILS/src/templates/conify/global/action_trigger/event_definition_data.tt2 b/Open-ILS/src/templates/conify/global/action_trigger/event_definition_data.tt2
index a435757508..19c504a05c 100644
--- a/Open-ILS/src/templates/conify/global/action_trigger/event_definition_data.tt2
+++ b/Open-ILS/src/templates/conify/global/action_trigger/event_definition_data.tt2
@@ -61,7 +61,7 @@
                 <table class='oils-generic-table'>
                     <tr>
                         <td>Barcode of Circulating Copy</td>
-                        <td><div dojoType='dijit.form.TextBox' jsId='circTestBarcode'/></td>
+                        <td><div dojoType='dijit.form.TextBox' jsId='circTestBarcode'></div></td>
                     </tr>
                     <tr>
                         <td colspan='2'><button dojoType='dijit.form.Button' onclick='evtTestCirc'>Go</button></td>
diff --git a/Open-ILS/src/templates/conify/global/asset/copy_location_order.tt2 b/Open-ILS/src/templates/conify/global/asset/copy_location_order.tt2
index 281eff7860..ba4223f9a1 100644
--- a/Open-ILS/src/templates/conify/global/asset/copy_location_order.tt2
+++ b/Open-ILS/src/templates/conify/global/asset/copy_location_order.tt2
@@ -24,7 +24,7 @@
 </div>
 
 <div class='hidden'>
-    <div dojoType='openils.widget.ProgressDialog' jsId='progressDialog'/>
+    <div dojoType='openils.widget.ProgressDialog' jsId='progressDialog'></div>
 </div>
 
 [% END %]
diff --git a/Open-ILS/src/templates/conify/global/config/barcode_completion.tt2 b/Open-ILS/src/templates/conify/global/config/barcode_completion.tt2
index 37c8bbf2d0..6928b9472c 100644
--- a/Open-ILS/src/templates/conify/global/config/barcode_completion.tt2
+++ b/Open-ILS/src/templates/conify/global/config/barcode_completion.tt2
@@ -20,7 +20,7 @@
     </table>
 </div>
 
-<div class='hidden'><div dojoType='openils.widget.ProgressDialog' jsId='progressDialog'/></div>
+<div class='hidden'><div dojoType='openils.widget.ProgressDialog' jsId='progressDialog'></div></div>
 
 [% END %]
 
diff --git a/Open-ILS/src/templates/conify/global/config/circ_matrix_matchpoint.tt2 b/Open-ILS/src/templates/conify/global/config/circ_matrix_matchpoint.tt2
index be33bdb5ce..b1d71501d2 100644
--- a/Open-ILS/src/templates/conify/global/config/circ_matrix_matchpoint.tt2
+++ b/Open-ILS/src/templates/conify/global/config/circ_matrix_matchpoint.tt2
@@ -55,7 +55,7 @@
     </div>
 </div>
 
-<div class='hidden'><div dojoType='openils.widget.ProgressDialog' jsId='progressDialog'/></div>
+<div class='hidden'><div dojoType='openils.widget.ProgressDialog' jsId='progressDialog'></div></div>
 
 <script type="text/javascript">
     function format_hard_due_date(name, id) {
diff --git a/Open-ILS/src/templates/conify/global/config/coded_value_map.tt2 b/Open-ILS/src/templates/conify/global/config/coded_value_map.tt2
index cf831e1e57..b49804fb7a 100644
--- a/Open-ILS/src/templates/conify/global/config/coded_value_map.tt2
+++ b/Open-ILS/src/templates/conify/global/config/coded_value_map.tt2
@@ -10,7 +10,7 @@
 </div>
 
 <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <span>Record Attribute Type: </span><div id='attr-def-div'/>
+    <span>Record Attribute Type: </span><div id='attr-def-div'></div>
 </div>
 
 <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
diff --git a/Open-ILS/src/templates/vandelay/inc/progress.tt2 b/Open-ILS/src/templates/vandelay/inc/progress.tt2
index b92455f77f..71e979969e 100644
--- a/Open-ILS/src/templates/vandelay/inc/progress.tt2
+++ b/Open-ILS/src/templates/vandelay/inc/progress.tt2
@@ -10,7 +10,7 @@
         <h3>[% l('Uploading...') %]</h3>
     </div>
     <div id='vl-upload-status-processing' class='hidden'>
-        <h3>[% l('Processing... ') %]<span id='vl-upload-status-count'/></h3>
+        <h3>[% l('Processing... ') %]<span id='vl-upload-status-count'></span></h3>
     </div>
 </div>
 
diff --git a/Open-ILS/src/templates/vandelay/inc/queue.tt2 b/Open-ILS/src/templates/vandelay/inc/queue.tt2
index 3abf678575..b645f33378 100644
--- a/Open-ILS/src/templates/vandelay/inc/queue.tt2
+++ b/Open-ILS/src/templates/vandelay/inc/queue.tt2
@@ -1,6 +1,6 @@
 <div dojoType="dijit.layout.ContentPane" layoutAlign='client' style='margin-top:10px;'>
     <fieldset id='vl-queue-filter-fieldset'>
-        <legend>Queue <span style='font-style:italic;' id='vl-queue-summary-name'/></legend>
+        <legend>Queue <span style='font-style:italic;' id='vl-queue-summary-name'></span></legend>
         <table width='100%'><tr>
             <td> <!-- big left td -->
             <table>
@@ -24,12 +24,12 @@
                         <table  id='vl-queue-summary-table' class='queue-nav-table'>
                             <thead><tr><th colspan='2' class='queue-nav-table-label'>Queue Summary</th></tr></thead>
                             <tbody>
-                                <tr><td>[% l('Records in Queue:') %]</td><td> <span style='font-weight:bold;' id='vl-queue-summary-total-count'/></td></tr>
-                                <tr><td>[% l('Records Imported:') %]</td><td> <span style='font-weight:bold;' id='vl-queue-summary-import-count'/></td></tr>
-                                <tr><td>Record Import Failures</td><td> <span style='font-weight:bold;' id='vl-queue-summary-rec-error-count'/></td></tr>
-                                <tr><td>Items in Queue</td><td> <span style='font-weight:bold;' id='vl-queue-summary-import-item-count'/></td></tr>
-                                <tr><td>Items Imported</td><td> <span style='font-weight:bold;' id='vl-queue-summary-import-item-imported-count'/></td></tr>
-                                <tr><td>Item Import Failures</td><td> <span style='font-weight:bold;' id='vl-queue-summary-item-error-count'/></td></tr>
+                                <tr><td>[% l('Records in Queue:') %]</td><td> <span style='font-weight:bold;' id='vl-queue-summary-total-count'></span></td></tr>
+                                <tr><td>[% l('Records Imported:') %]</td><td> <span style='font-weight:bold;' id='vl-queue-summary-import-count'></span></td></tr>
+                                <tr><td>Record Import Failures</td><td> <span style='font-weight:bold;' id='vl-queue-summary-rec-error-count'></span></td></tr>
+                                <tr><td>Items in Queue</td><td> <span style='font-weight:bold;' id='vl-queue-summary-import-item-count'></span></td></tr>
+                                <tr><td>Items Imported</td><td> <span style='font-weight:bold;' id='vl-queue-summary-import-item-imported-count'></span></td></tr>
+                                <tr><td>Item Import Failures</td><td> <span style='font-weight:bold;' id='vl-queue-summary-item-error-count'></span></td></tr>
                             </tbody>
                         </table>
                     </td>
@@ -198,7 +198,7 @@
                     <td>[% l('Merge Profile') %]</td>
                     <td colspan='4'>
                         <div jsId='vlUploadMergeProfile2' 
-                            dojoType='dijit.form.FilteringSelect' required='false' labelAttr='name' searchAttr='name'/>
+                            dojoType='dijit.form.FilteringSelect' required='false' labelAttr='name' searchAttr='name'></div>
                     </td>
                 </tr>
                 <tr>
@@ -233,7 +233,7 @@
                 <tr>
                     <td>[% l('Insufficient Quality Fall-Through Profile') %]</td>
                     <td colspan='4'>
-                        <div jsId='vlUploadFtMergeProfile2' dojoType='dijit.form.FilteringSelect' required='false' labelAttr='name' searchAttr='name'/>
+                        <div jsId='vlUploadFtMergeProfile2' dojoType='dijit.form.FilteringSelect' required='false' labelAttr='name' searchAttr='name'></div>
                     </td>
                 </tr>
                 <tr>
diff --git a/Open-ILS/src/templates/vandelay/inc/upload.tt2 b/Open-ILS/src/templates/vandelay/inc/upload.tt2
index cd5b3b12af..25d42e6209 100644
--- a/Open-ILS/src/templates/vandelay/inc/upload.tt2
+++ b/Open-ILS/src/templates/vandelay/inc/upload.tt2
@@ -50,7 +50,7 @@
         <tr>
             <td>[% l('Merge Profile') %]</td>
             <td colspan='4'>
-                <div jsId='vlUploadMergeProfile' dojoType='dijit.form.FilteringSelect' required='false' labelAttr='name' searchAttr='name'/>
+                <div jsId='vlUploadMergeProfile' dojoType='dijit.form.FilteringSelect' required='false' labelAttr='name' searchAttr='name'></div>
             </td>
         </tr>
         <tr>
@@ -85,7 +85,7 @@
         <tr>
             <td>[% l('Insufficient Quality Fall-Through Profile') %]</td>
             <td colspan='4'>
-                <div jsId='vlUploadFtMergeProfile' dojoType='dijit.form.FilteringSelect' required='false' labelAttr='name' searchAttr='name'/>
+                <div jsId='vlUploadFtMergeProfile' dojoType='dijit.form.FilteringSelect' required='false' labelAttr='name' searchAttr='name'></div>
             </td>
         </tr>
 
diff --git a/Open-ILS/web/conify/global/actor/org_unit.html b/Open-ILS/web/conify/global/actor/org_unit.html
index 1c71ea4bf9..e839bdd1bb 100644
--- a/Open-ILS/web/conify/global/actor/org_unit.html
+++ b/Open-ILS/web/conify/global/actor/org_unit.html
@@ -466,39 +466,39 @@
 						<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>
+								<td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_0_open" onChange="current_ou_hoo.dow_0_open( this.getDisplayedValue() );"></span></td>
+								<td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_0_close" onChange="current_ou_hoo.dow_0_close( this.getDisplayedValue() );"></span></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') );"></span></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>
+								<td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_1_open" onChange="current_ou_hoo.dow_1_open( this.getDisplayedValue() );"></span></td>
+								<td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_1_close" onChange="current_ou_hoo.dow_1_close( this.getDisplayedValue() );"></span></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') );"></span></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>
+								<td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_2_open" onChange="current_ou_hoo.dow_2_open( this.getDisplayedValue() );"></span></td>
+								<td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_2_close" onChange="current_ou_hoo.dow_2_close( this.getDisplayedValue() );"></span></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') );"></span></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>
+								<td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_3_open" onChange="current_ou_hoo.dow_3_open( this.getDisplayedValue() );"></span></td>
+								<td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_3_close" onChange="current_ou_hoo.dow_3_close( this.getDisplayedValue() );"></span></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') );"></span></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>
+								<td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_4_open" onChange="current_ou_hoo.dow_4_open( this.getDisplayedValue() );"></span></td>
+								<td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_4_close" onChange="current_ou_hoo.dow_4_close( this.getDisplayedValue() );"></span></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') );"></span></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>
+								<td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_5_open" onChange="current_ou_hoo.dow_5_open( this.getDisplayedValue() );"></span></td>
+								<td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_5_close" onChange="current_ou_hoo.dow_5_close( this.getDisplayedValue() );"></span></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') );"></span></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>
+								<td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_6_open" onChange="current_ou_hoo.dow_6_open( this.getDisplayedValue() );"></span></td>
+								<td><span dojoType="dijit.form.TimeTextBox" style="width:8em;" jsId="dow_6_close" onChange="current_ou_hoo.dow_6_close( this.getDisplayedValue() );"></span></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') );"></span></td>
 							</tr>
 						</table>
 	
@@ -547,7 +547,7 @@
 									<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() )"/>
+											<span jsId="billing_addr_type" style="width:100%;" dojoType="dijit.form.TextBox" onChange="current_billing_address.address_type( this.getValue() )"></span>
 										</td>
 										<th>&conify.org_unit.addresses_pane.valid;</th><td>
 											<input
@@ -560,22 +560,22 @@
 										</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>
+										<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"></span></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>
+										<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() )"></span></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>
+										<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"></span></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"></span></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"></span></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>
+										<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"></span></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"></span></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>
+										<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"></span></td>
 									</tr>
 								</table>
 	
@@ -618,7 +618,7 @@
 							<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.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() )"></span></td>
 										<th>&conify.org_unit.addresses_pane.valid;</th><td>
 											<input
 											  type="checkbox"
@@ -630,22 +630,22 @@
 										</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>
+										<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"></span></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>
+										<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() )"></span></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>
+										<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"></span></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"></span></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"></span></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>
+										<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"></span></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"></span></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>
+										<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"></span></td>
 									</tr>
 								</table>
 	
@@ -688,7 +688,7 @@
 							<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.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() )"></span></td>
 										<th>&conify.org_unit.addresses_pane.valid;</th><td>
 											<input
 											  type="checkbox"
@@ -699,22 +699,22 @@
 										</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>
+										<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"></span></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>
+										<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() )"></span></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>
+										<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"></span></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"></span></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"></span></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>
+										<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"></span></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"></span></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>
+										<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"></span></td>
 									</tr>
 								</table>
 	
@@ -757,7 +757,7 @@
 							<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.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() )"></span></td>
 										<th>&conify.org_unit.addresses_pane.valid;</th><td>
 											<input
 											  type="checkbox"
@@ -768,22 +768,22 @@
 										</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>
+										<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"></span></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>
+										<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() )"></span></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>
+										<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"></span></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"></span></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"></span></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>
+										<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"></span></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"></span></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>
+										<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"></span></td>
 									</tr>
 								</table>
 	
diff --git a/Open-ILS/web/conify/global/admin.html b/Open-ILS/web/conify/global/admin.html
index a1c1b4d1cd..d91d03a960 100644
--- a/Open-ILS/web/conify/global/admin.html
+++ b/Open-ILS/web/conify/global/admin.html
@@ -78,7 +78,7 @@
 				<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"/>
+				<span id="status_text"></span>
 			</div>
 		</div>
 	</body>
diff --git a/Open-ILS/web/js/dojo/openils/widget/GridColumnPicker.js b/Open-ILS/web/js/dojo/openils/widget/GridColumnPicker.js
index 377b934a90..f9f858ea8f 100644
--- a/Open-ILS/web/js/dojo/openils/widget/GridColumnPicker.js
+++ b/Open-ILS/web/js/dojo/openils/widget/GridColumnPicker.js
@@ -59,7 +59,7 @@ if(!dojo._hasResource["openils.widget.GridColumnPicker"]) {
             var dialog = new dijit.Dialog({title : 'Column Picker'});
             var table = dojo.create('table', {'class':'oils-generic-table', innerHTML : 
                 "<thead><tr><th width='33%'>Column</th><th width='33%'>Display</th><th width='33%'>Auto Width</th></tr></thead>" +
-                "<tbody><tr><td><div name='cancel_button'/></td><td><div name='save_button'/></td></tr></tbody></table>" });
+                "<tbody><tr><td><div name='cancel_button'></div></td><td><div name='save_button'></div></td></tr></tbody></table>" });
 
             dialog.containerNode.appendChild(table);
 
diff --git a/Open-ILS/web/js/dojo/openils/widget/TranslatorPopup.js b/Open-ILS/web/js/dojo/openils/widget/TranslatorPopup.js
index 96f14a6ce7..5c0be1eb09 100644
--- a/Open-ILS/web/js/dojo/openils/widget/TranslatorPopup.js
+++ b/Open-ILS/web/js/dojo/openils/widget/TranslatorPopup.js
@@ -39,7 +39,7 @@ if(!dojo._hasResource["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>",
+			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'></span></button><button class='update_button' style='display:none; visibility:hidden;'><span dojoAttachPoint='updateButtonNode'></span></button><button class='delete_button' style='display:none; visibility:hidden;'><span dojoAttachPoint='removeButtonNode'></span></button></td></tr></tbody><tbody class='translation_tbody'></tbody></table></div></div></div></span>",
 
 			widgetsInTemplate: true,
 			field : "",
diff --git a/Open-ILS/web/reports/oils_rpt.xhtml b/Open-ILS/web/reports/oils_rpt.xhtml
index 967060e99f..9aa70a554d 100644
--- a/Open-ILS/web/reports/oils_rpt.xhtml
+++ b/Open-ILS/web/reports/oils_rpt.xhtml
@@ -27,7 +27,7 @@
 
 	<body>
 		<div class='welcome_box'>
-			<span>&reports.common.logged_in_as;</span><b><span id='oils_rpt_user'/></b>
+			<span>&reports.common.logged_in_as;</span><b><span id='oils_rpt_user'></span></b>
 		</div>
 
 		<div id='oils_rpt_permission_denied' class='hide_me'>
@@ -50,15 +50,15 @@
 					<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 id='oils_rpt_template_folder_tree' class='oils_rpt_folder_tree'></div>
+							<div id='oils_rpt_report_folder_tree' class='oils_rpt_folder_tree'></div>
+							<div id='oils_rpt_output_folder_tree' class='oils_rpt_folder_tree'></div>
 						</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 id='oils_rpt_template_shared_folder_tree' class='oils_rpt_folder_tree'></div>
+							<div id='oils_rpt_report_shared_folder_tree' class='oils_rpt_folder_tree'></div>
+							<div id='oils_rpt_output_shared_folder_tree' class='oils_rpt_folder_tree'></div>
 						</div>
 					</td>
 					<td/>
diff --git a/Open-ILS/web/reports/oils_rpt_builder.xhtml b/Open-ILS/web/reports/oils_rpt_builder.xhtml
index b65246f92e..3107750720 100644
--- a/Open-ILS/web/reports/oils_rpt_builder.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_builder.xhtml
@@ -24,13 +24,13 @@
 	<body>
 
 		<div class='welcome_box'>
-			<span>&reports.common.logged_in_as;</span><b><span id='oils_rpt_user'/></b>
+			<span>&reports.common.logged_in_as;</span><b><span id='oils_rpt_user'></span></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>)
+				(<b>&reports.oils_rpt_builder.cloning_template; "<span id='oils_rpt_build_cloning_name'></span>"</b>)
 			</span>
 		</div>
 
@@ -115,13 +115,13 @@
 
 			<div style='margin-bottom: 10px;'>
 				<b style='padding-right: 8px;' id='oils_rpt_editor_window_label'/>
-				(<span id='oils_rpt_editor_window_datatype'/>)
+				(<span id='oils_rpt_editor_window_datatype'></span>)
 			</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 id='oils_rpt_tform_table'></div>
 				</div>
 				<br/><br/>
 				<button id='oils_rpt_tform_submit'>&reports.oils_rpt_builder.add_item;</button>
@@ -134,13 +134,13 @@
 						<table><tbody><tr>
 							<td>&reports.oils_rpt_builder.choose_a_transform;</td>
 							<td>
-								<div id='oils_rpt_filter_tform_table'/>
+								<div id='oils_rpt_filter_tform_table'></div>
 							</td>
 						</tr>
 						<tr>	
 							<td>&reports.oils_rpt_builder.choose_a_filter;</td>
 							<td>
-								<div id='oils_rpt_filter_op_table'/>
+								<div id='oils_rpt_filter_op_table'></div>
 							</td>
 						</tr></tbody></table>
 					</div>
@@ -158,13 +158,13 @@
 						<table><tbody><tr>
 							<td>&reports.oils_rpt_builder.choose_a_transform;</td>
 							<td>
-								<div id='oils_rpt_agg_filter_tform_table'/>
+								<div id='oils_rpt_agg_filter_tform_table'></div>
 							</td>
 						</tr>
 						<tr>	
 							<td>&reports.oils_rpt_builder.choose_a_filter;</td>
 							<td>
-								<div id='oils_rpt_agg_filter_op_table'/>
+								<div id='oils_rpt_agg_filter_op_table'></div>
 							</td>
 						</tr></tbody></table>
 					</div>
diff --git a/Open-ILS/web/reports/oils_rpt_editor.xhtml b/Open-ILS/web/reports/oils_rpt_editor.xhtml
index 3ae9436636..0c5dcc7df6 100644
--- a/Open-ILS/web/reports/oils_rpt_editor.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_editor.xhtml
@@ -3,15 +3,15 @@
 		<tbody>
 			<tr>
 				<th>&reports.oils_rpt_editor.template_name;</th>
-				<td><span id='oils_rpt_report_editor_template_name'/></td>
+				<td><span id='oils_rpt_report_editor_template_name'></span></td>
 			</tr>
 			<tr>
 				<th>&reports.oils_rpt_editor.template_creator;</th>
-				<td><span id='oils_rpt_report_editor_template_creator'/></td>
+				<td><span id='oils_rpt_report_editor_template_creator'></span></td>
 			</tr>
 			<tr>
 				<th>&reports.oils_rpt_editor.template_description;</th>
-				<td><span id='oils_rpt_report_editor_template_description'/></td>
+				<td><span id='oils_rpt_report_editor_template_description'></span></td>
 			</tr>
 
 			<tr>
@@ -62,7 +62,7 @@
 						<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'/>
+					<span id='oils_rpt_report_editor_dest_folder'></span>
 				</td>
 			</tr>
 			<!--
@@ -231,7 +231,7 @@
 						<span>&reports.oils_rpt_editor.selected_folder;</span>
 						<b id='oils_rpt_output_selected_folder'/>
 					</div>
-					<span id='oils_rpt_output_dest_folder'/>
+					<span id='oils_rpt_output_dest_folder'></span>
 				</td>
 			</tr>
 
diff --git a/Open-ILS/web/reports/oils_rpt_folder_window.xhtml b/Open-ILS/web/reports/oils_rpt_folder_window.xhtml
index df1ee86475..cfed1042a3 100644
--- a/Open-ILS/web/reports/oils_rpt_folder_window.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_folder_window.xhtml
@@ -52,7 +52,7 @@
 
 			<tr class='oils_rpt_folder_window_contents_row' id='oils_rpt_content_row'>
 				<td colspan='2'>
-					<div id='oils_rpt_folder_contents_selector'/>
+					<div id='oils_rpt_folder_contents_selector'></div>
 				</td>
 			</tr>
 
@@ -82,7 +82,7 @@
 
 			<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'/>
+					<div id='oils_rpt_folder_contents_selector_2'></div>
 				</td>
 			</tr>
 			<!-- =================================================================== -->
@@ -93,7 +93,7 @@
 	<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'/>
+		<div id='oils_rpt_move_folder_picker'></div>
 		<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'/>
diff --git a/Open-ILS/web/reports/oils_rpt_param_editor.xhtml b/Open-ILS/web/reports/oils_rpt_param_editor.xhtml
index 9cbeb5be36..3e5bf197f7 100644
--- a/Open-ILS/web/reports/oils_rpt_param_editor.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_param_editor.xhtml
@@ -72,13 +72,13 @@
 				<td name='action'/>
 				<td>
 					<div>
-						<span name='hint'/>
-						<span name='widget'/>
+						<span name='hint'></span>
+						<span name='widget'></span>
 					</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 name='reldate'></div>
 					</div>
 				</td>
 			</tr>
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 eadabca99f..afae90a7f1 100644
--- a/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml
@@ -44,7 +44,7 @@
     <body onload='crInit();'>
 
         <div class='welcome_box'>
-            <span>&staff.server.admin.cash.welcome;</span><b><span id='user'/></b>
+            <span>&staff.server.admin.cash.welcome;</span><b><span id='user'></span></b>
         </div>
 
         <center>
@@ -77,14 +77,14 @@
 
             <div id='cr_desk_payments_div'>
                 <h2>&staff.server.admin.cash.desk;</h2>
-                <div id='cr_desk_payments'/>
+                <div id='cr_desk_payments'></div>
             </div>
             
             <br/><hr/><br/>
 
             <div id='cr_user_payments_div'>
                 <h2>&staff.server.admin.cash.user;</h2>
-                <div id='cr_user_payments'/>
+                <div id='cr_user_payments'></div>
             </div>
 
         </center>
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 a3af761c2e..23299c1b16 100644
--- a/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
@@ -42,7 +42,7 @@
     <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>
+            <span>&staff.server.admin.closed_dates.welcome;</span><b><span id='cd_user'></span></b>
         </div>
 
         <center>
@@ -69,7 +69,7 @@
                             <span> through </span>
                             <b name='end_date'/> at <b name='end_time'/>
                         </td>
-                        <td><div name='note'/></td>
+                        <td><div name='note'></div></td>
                         <td><button name='delete'>delete</button></td>
                     </tr>
 
@@ -77,7 +77,7 @@
                         <td align='left'>
                             All Day <b name='start_date'/>
                         </td>
-                        <td><div name='note'/></td>
+                        <td><div name='note'></div></td>
                         <td><button name='delete'>delete</button></td>
                     </tr>
 
@@ -86,7 +86,7 @@
                         <td align='left'>
                             Every Day From <b name='start_date'/> through <b name='end_date'/>
                         </td>
-                        <td><div name='note'/></td>
+                        <td><div name='note'></div></td>
                         <td><button name='delete'>&staff.server.admin.closed_dates.editor.allmultiday.delete;</button></td>
                     </tr>
 
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 189df60ab6..d42234bfb9 100644
--- a/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml
@@ -36,7 +36,7 @@
     <body onload='try{clEditorInit();}catch(e){alert(js2JSON(e));}'>
 
         <div class='welcome_box'>
-            <span>&staff.server.admin.copy_locations.editor.welcome; </span><b><span id='user'/></b>
+            <span>&staff.server.admin.copy_locations.editor.welcome; </span><b><span id='user'></span></b>
         </div>
 
         <center>
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 e0fad8aa15..0979ae4542 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
@@ -37,10 +37,10 @@
     <body onload='try{pullListInit();}catch(e){alert(js2JSON(e));}'>
 
         <center>
-            <h2>&staff.server.admin.hold_pull.header;<span id='pl_org'/></h2>
+            <h2>&staff.server.admin.hold_pull.header;<span id='pl_org'></span></h2>
 
             <div style='position:absolute; top: 5px; right: 5px;'>
-                <span>&staff.server.admin.hold_pull.greeting;</span><b><span id='pl_user'/></b>
+                <span>&staff.server.admin.hold_pull.greeting;</span><b><span id='pl_user'></span></b>
             </div>
         
             <hr/><br/>
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 c689400e48..631e62eceb 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
@@ -40,23 +40,23 @@
     <body onload='try{pullListInit();}catch(e){alert(js2JSON(e));}'>
 
         <center>
-            <h2>Evergreen Holds Pull List : <span id='pl_org'/></h2>
+            <h2>Evergreen Holds Pull List : <span id='pl_org'></span></h2>
 
             <div style='position:absolute; top: 5px; right: 5px;'>
-                <span>Welcome </span><b><span id='pl_user'/></b>
+                <span>Welcome </span><b><span id='pl_user'></span></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'/>
-<span name='title'/>
-<span name='author'/>
-<b>Copy:</b> <span name='copy_number'/>   <b>Location:</b> <span name='copy_location'/>   <b>Item ID:</b> <span name='barcode'/>
-<b>Item Type:</b> <span name='item_type'><span name='format_at' class='hide_me'>Book               </span><span name='format_at-d' class='hide_me'>Large Print Book   </span><span name='format_i' class='hide_me'>Audiobook          </span><span name='format_g' class='hide_me'>Video Recording    </span><span name='format_j' class='hide_me'>Music              </span><span name='format_m' class='hide_me'>Electronic Resource</span></span>   <b>Patron ID:</b> <span name='patron'/>
-<b>Requested:</b> <span name='date'/>            <b>Hold Type:</b> <span name='copy_hold' class='hide_me'>Copy Hold</span><span name='volume_hold' class='hide_me'>Volume Hold</span><span name='title_hold' class='hide_me'>Title Hold</span><span name='mr_hold' class='hide_me'>Metarecord Hold</span>
-<b>Pickup:</b> <span name='pickup'/>            <span name="age_protect_span" class='hide_me'><b>Hold Protection:</b> <span name="age_protect"/></span>
+<span name='call_number'></span>
+<span name='title'></span>
+<span name='author'></span>
+<b>Copy:</b> <span name='copy_number'></span>   <b>Location:</b> <span name='copy_location'></span>   <b>Item ID:</b> <span name='barcode'></span>
+<b>Item Type:</b> <span name='item_type'><span name='format_at' class='hide_me'>Book               </span><span name='format_at-d' class='hide_me'>Large Print Book   </span><span name='format_i' class='hide_me'>Audiobook          </span><span name='format_g' class='hide_me'>Video Recording    </span><span name='format_j' class='hide_me'>Music              </span><span name='format_m' class='hide_me'>Electronic Resource</span></span>   <b>Patron ID:</b> <span name='patron'></span>
+<b>Requested:</b> <span name='date'></span>            <b>Hold Type:</b> <span name='copy_hold' class='hide_me'>Copy Hold</span><span name='volume_hold' class='hide_me'>Volume Hold</span><span name='title_hold' class='hide_me'>Title Hold</span><span name='mr_hold' class='hide_me'>Metarecord Hold</span>
+<b>Pickup:</b> <span name='pickup'></span>            <span name="age_protect_span" class='hide_me'><b>Hold Protection:</b> <span name="age_protect"></span></span>
 </pre>
 </div>
     </body>
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 803b8caad7..6b6689dce1 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
@@ -31,7 +31,7 @@
     <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>
+            <span>&staff.server.admin.non_cat_types.greeting;</span><b><span id='nc_user'></span></b>
         </div>
 
         <center>
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 df6d7da66f..e54a639c26 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
@@ -79,13 +79,13 @@
                 <div id="toolbar1" dojoType="dijit.Toolbar">
                     <h2>&staff.server.admin.org_unit_settings.title;</h2>
                     
-                    <span dojoType="dijit.ToolbarSeparator" />
+                    <span dojoType="dijit.ToolbarSeparator" ></span>
                     
                     <span>&staff.server.admin.org_unit_settings.context_loc;</span>
                     <select dojoType='openils.widget.OrgUnitFilteringSelect' jsId='osContextSelector'
                             searchAttr='shortname' autocomplete='true' labelAttr='shortname' onchange='osChangeContext();' />
                     
-                    <span dojoType="dijit.ToolbarSeparator" />
+                    <span dojoType="dijit.ToolbarSeparator" ></span>
                     
                     <form id='searchform' onSubmit='return doSearch()'>
                             <input type='text' dojoType='dijit.form.TextBox' id='searchBox' onkeypress='osSearchChange();' />
@@ -93,7 +93,7 @@
                             <button dojoType='dijit.form.Button' onClick='clearSearch();'>&staff.server.admin.org_unit_settings.clear_filter;</button>
                     </form>
                     
-                    <span dojoType="dijit.ToolbarSeparator" />
+                    <span dojoType="dijit.ToolbarSeparator" ></span>
 
                     <button dojoType='dijit.form.Button' onClick='osToJson();'>&staff.server.admin.org_unit_settings.export;</button>
                     <button dojoType='dijit.form.Button' onClick='osFromJson();'>&staff.server.admin.org_unit_settings.import;</button>
@@ -125,7 +125,7 @@
                         ]]
                     }];
                 </script>
-                <div dojoType='dojox.Grid' jsId='osGrid' />
+                <div dojoType='dojox.Grid' jsId='osGrid' ></div>
             </div>
         </div>
 
@@ -133,8 +133,8 @@
         <div dojoType="dijit.Dialog" jsId='osEditDialog' title="&staff.server.admin.org_unit_settings.edit_setting;">
             <table class='form_table'>
                 <thead>
-                    <tr><td colspan='2' align='center'><div id='os-edit-name'/></td></tr>
-                    <tr><td colspan='2' align='center'><div id='os-edit-desc' style='max-width:600px;'/></td></tr>
+                    <tr><td colspan='2' align='center'><div id='os-edit-name'></div></td></tr>
+                    <tr><td colspan='2' align='center'><div id='os-edit-desc' style='max-width:600px;'></div></td></tr>
                 </thead>
                 <tbody>
                     <tr>
@@ -169,7 +169,7 @@
             </table>
         </div> <!-- /edit dialog -->
         
-        <div dojoType="openils.widget.ProgressDialog" jsId="progressDialog" indeterminate="true" />
+        <div dojoType="openils.widget.ProgressDialog" jsId="progressDialog" indeterminate="true" ></div>
         
         <!--i18n, use the &translation; here, then grab innerHTML in JS later.-->
         <div id='proci18n' class='hidden'>&staff.server.admin.org_unit_settings.processing;</div>
@@ -200,7 +200,7 @@
         
         <!--History Dialog-->
         <div id="historyDialog" dojoType="dijit.Dialog" jsId="osHistDialog" title="&staff.server.admin.org_unit_settings.history;">
-            <span id='osHistName' />
+            <span id='osHistName' ></span>
             
             <!--Headers grabbed from this table are put in the next one by the js.-->
             <table id="histTitle" class="hidden">
@@ -217,7 +217,7 @@
         
         <!--Displays alerts at the top of the screen, much nicer than alert() or dojo equiv.-->
         <div class="message_container" id="msgCont">
-            <div class="message" id='msgInner' />
+            <div class="message" id='msgInner' ></div>
         </div>
     </body>
 </html>
\ No newline at end of file
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 c1341ebe75..c1d794bc23 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
@@ -31,7 +31,7 @@
 
 
         <div style='position:absolute; top: 5px; right: 5px;'>
-            <span>&staff.server.admin.stat_cat.greeting;</span><b><span id='sc_user'/></b>
+            <span>&staff.server.admin.stat_cat.greeting;</span><b><span id='sc_user'></span></b>
         </div>
 
         <center>
@@ -183,7 +183,7 @@
                             </td>
                             <td>
                                 <span class='hide_me' name='sc_sip_field_none'>&staff.server.admin.stat_cat.sip_field.none.label;</span>
-                                <span class='hide_me' name='sc_sip_field_value' />
+                                <span class='hide_me' name='sc_sip_field_value' ></span>
                             </td>
                             <td name='sc_sip_format_td'/>
                             <td>
diff --git a/Open-ILS/xul/staff_client/server/patron/ue.xhtml b/Open-ILS/xul/staff_client/server/patron/ue.xhtml
index 37b807db2f..60fe9a40d0 100644
--- a/Open-ILS/xul/staff_client/server/patron/ue.xhtml
+++ b/Open-ILS/xul/staff_client/server/patron/ue.xhtml
@@ -94,7 +94,7 @@
         <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>
+            <span>&ev.staff.patron.ue_xhtml.welcome.label;</span><b><span id='uedit_user'></span></b>
         </div>
 
         <hr/><br/>
@@ -224,7 +224,7 @@
                                                 <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 style='text-decoration:underline;' id='ue_password_plain'></span>
                                                 </span>
                                             </div>
                                         </td>
@@ -386,7 +386,7 @@
                                         <td><div class='wide right'><b>Parent / Guardian</b></div></td>
                                         <td>
                                             <div class='wide left'>
-                                                <span id='ue_guardian_field'/>
+                                                <span id='ue_guardian_field'></span>
                                             </div>
                                         </td>
                                     </tr>
@@ -467,7 +467,7 @@
                                                             <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='addr_owner_name'></span>
                                                                 <span name='owner_link_div'>
                                                                     (<a name='addr_owner' href='javascript:void(0);'>&ev.staff.patron.ue_xhtml.edit.label;</a>)
                                                                 </span>
@@ -717,8 +717,8 @@
                                 </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 right' name='ue_stat_cat_name'></div></td>
+                                        <td><div class='wide right' style='font-size: 8pt' name='ue_stat_cat_owner'></div></td>
                                         <td>
                                             <div class='wide left'>
                                                 <select name='ue_stat_cat_selector'>
@@ -746,7 +746,7 @@
                                 <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_name' style='font-weight: bold;'></span>
                                             <span class='pad' name='ue_survey_desc'> : </span>
                                         </td>
                                     </tr>
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 8bdf628b73..b93686d7a1 100644
--- a/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml
+++ b/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml
@@ -127,7 +127,7 @@
             <table>
                 <tr name='prow'>
                     <td class="value" name='plabel'>
-                        <span name="p.code"/>
+                        <span name="p.code"></span>
                     </td>
                     <td class="value" name='papply'>
                         <input type="checkbox" name="p.id" onclick="set_perm(this.parentNode.parentNode);"/>
@@ -150,8 +150,8 @@
                         <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"/>)
+                        <span name="a.name"></span>
+                        (<span name="a.shortname"></span>)
                     </td>
                 </tr>
             </table>
-- 
2.43.2